JSON accounts: allow loading code from a file #4783

chfast · 2018-01-17T18:44:04Z

chfast · 2018-01-17T18:44:26Z

libethereum/ChainParams.cpp

-};
+set<string> const c_knownParamNames = {c_minGasLimit, c_maxGasLimit, c_gasLimitBoundDivisor,
+    c_homesteadForkBlock, c_EIP150ForkBlock, c_EIP158ForkBlock, c_accountStartNonce,
+    c_maximumExtraDataSize, c_tieBreakingGas, c_blockReward, c_byzantiumForkBlock, c_eWASMForkBlock,


Here c_eWASMForkBlock is added. I missed it previously.

Do you want this into another pull request and merge it now?

winsvega · 2018-01-17T18:56:23Z

libethereum/Account.cpp

 	string const c_storage = "storage";
 	string const c_shouldnotexist = "shouldnotexist";
 	string const c_precompiled = "precompiled";
 	std::set<string> const c_knownAccountFields = {
-		c_wei, c_finney, c_balance, c_nonce, c_code, c_storage, c_shouldnotexist,
+		c_wei, c_finney, c_balance, c_nonce, c_code, c_file, c_storage, c_shouldnotexist,


you put path to the file with code as an attribute of account object?

I thought the idea was to load code from file upon loading genesis.json
why would we need to change logic of Accont.h ?

Load a code from a file what do what with it?

so as I understand currently account's code is loaded from genesis.
could we change it so that upon loading that genesis account code will just be read from external file? other then that it is the same genesis config file loading.

I don't understand

in jsonToAccountMap at

if (o[c_code].type() == json_spirit::str_type) { if (o[c_code].get_str().substr(0,2) == "//") read code from file in this link and parse it. }

I thought we could just do it that way.
so in genesis config file at accounts code it will be

"code": "//path/to/file"

I think it is better making it more explicit than hiding it via special expressions.

axic · 2018-01-17T21:07:36Z

libethereum/Account.cpp

@@ -88,11 +90,12 @@ namespace
 	string const c_balance = "balance";
 	string const c_nonce = "nonce";
 	string const c_code = "code";
+	string const c_file = "file";  ///< A file containg a code as bytes.


I think file may be misleading to mean loading an account JSON from a file, e.g{accounts: { "0x0044...": { file: "/path" } } }

Back to "codeInFile" or "codeFromFile"?

I don't mind, probably the second is more readable.

codecov-io · 2018-01-18T09:55:31Z

Codecov Report

Merging #4783 into develop will decrease coverage by <.01%.
The diff coverage is 41.02%.

@@            Coverage Diff             @@
##           develop   #4783      +/-   ##
==========================================
- Coverage     60.7%   60.7%   -0.01%     
==========================================
  Files          348     348              
  Lines        27384   27405      +21     
  Branches      2845    2850       +5     
==========================================
+ Hits         16624   16636      +12     
- Misses        9761    9780      +19     
+ Partials       999     989      -10

winsvega · 2018-01-18T11:45:30Z

libethereum/Account.cpp

+                if (codeObj.type() == json_spirit::str_type)
+                {
+                    auto& codeStr = codeObj.get_str();
+                    if (codeStr.find("0x") != 0 && !codeStr.empty())


codeStr.find("0x") could produce an error.
0x should be at located at first 2 bytes of the code field.

If you look at the diff, this code is as is before. No changes.

I know. I just saw an issue.
11220x3345
will pass.

I think that could be addressed in a separate PR then?

chfast · 2018-01-22T21:51:03Z

Ready?

axic · 2018-01-22T22:00:38Z

The field name wasn't changed from file.

chfast · 2018-01-22T22:24:31Z

Changed and rebased. One commit less.

axic · 2018-01-23T14:11:32Z

@pirapira okay to merge?

pirapira · 2018-01-24T08:37:37Z

I couldn't spot the offending failure in AppVeyor with a quick look. Coming back later.

axic · 2018-01-24T10:23:42Z

Test Case "bcRandomBlockhashTest": 
.
randomStatetest165BC_EIP158Error importing block from fields to blockchain: C:\projects\cpp-ethereum\libdevcore\TransientDirectory.cpp(41): Throw in function __cdecl dev::TransientDirectory::TransientDirectory(const class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > &)
Dynamic exception type: class boost::exception_detail::clone_impl<struct dev::FileError>
std::exception::what: FileError
C:/projects/cpp-ethereum/test/tools/jsontests/BlockChainTests.cpp(566): error: in "BlockchainTests/bcRandomBlockhashTest": randomStatetest165BC_EIP158State root in chain from RLP blocks != State root in chain from Field blocks!
C:/projects/cpp-ethereum/test/tools/libtesteth/ImportTest.cpp(496): error: in "BlockchainTests/bcRandomBlockhashTest": randomStatetest165BC_EIP158 Check State: a94f5374fce5edbc8e2a8697c15331677e6ebf0b: incorrect balance 1000000000000000000, expected 999999999999858890

Can you restart Appveyor? It is in the "random" tests, perhaps the failure is actually random :)

pirapira · 2018-01-24T10:28:46Z

I cannot restart it.

chfast · 2018-01-24T10:37:52Z

Restarted.

winsvega · 2018-01-24T10:44:55Z

this is probably the issue with blockchain tmp files collision.

axic · 2018-01-24T12:10:38Z

@pirapira appveyor suceeded 🍾

chfast requested review from axic and winsvega January 17, 2018 18:44

chfast commented Jan 17, 2018

View reviewed changes

chfast force-pushed the json-accounts branch from 911ceaf to 52903a1 Compare January 17, 2018 18:52

winsvega reviewed Jan 17, 2018

View reviewed changes

axic reviewed Jan 17, 2018

View reviewed changes

winsvega reviewed Jan 18, 2018

View reviewed changes

chfast added 3 commits January 22, 2018 23:19

Add option to load account code from external file

ed2ac3c

Pass config path to account loading

a154d8a

Inline ChainParams::loadGenesisState()

d0288f5

chfast force-pushed the json-accounts branch from 52903a1 to d0288f5 Compare January 22, 2018 22:24

axic approved these changes Jan 23, 2018

View reviewed changes

pirapira merged commit 2716b63 into develop Jan 24, 2018

pirapira deleted the json-accounts branch January 24, 2018 14:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JSON accounts: allow loading code from a file #4783

JSON accounts: allow loading code from a file #4783

chfast commented Jan 17, 2018 •

edited by axic

Loading

chfast Jan 17, 2018

axic Jan 17, 2018

winsvega Jan 17, 2018

chfast Jan 17, 2018

winsvega Jan 17, 2018

chfast Jan 17, 2018

winsvega Jan 17, 2018

chfast Jan 18, 2018

winsvega Jan 18, 2018 •

edited

Loading

axic Jan 20, 2018

axic Jan 17, 2018

chfast Jan 17, 2018

axic Jan 17, 2018

codecov-io commented Jan 18, 2018 •

edited

Loading

winsvega Jan 18, 2018

axic Jan 20, 2018

winsvega Jan 20, 2018 •

edited

Loading

axic Jan 20, 2018

chfast commented Jan 22, 2018

axic commented Jan 22, 2018

chfast commented Jan 22, 2018

axic commented Jan 23, 2018

pirapira commented Jan 24, 2018

axic commented Jan 24, 2018

pirapira commented Jan 24, 2018

chfast commented Jan 24, 2018

winsvega commented Jan 24, 2018

axic commented Jan 24, 2018

JSON accounts: allow loading code from a file #4783

JSON accounts: allow loading code from a file #4783

Conversation

chfast commented Jan 17, 2018 • edited by axic Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

winsvega Jan 18, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Jan 18, 2018 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

winsvega Jan 20, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chfast commented Jan 22, 2018

axic commented Jan 22, 2018

chfast commented Jan 22, 2018

axic commented Jan 23, 2018

pirapira commented Jan 24, 2018

axic commented Jan 24, 2018

pirapira commented Jan 24, 2018

chfast commented Jan 24, 2018

winsvega commented Jan 24, 2018

axic commented Jan 24, 2018

chfast commented Jan 17, 2018 •

edited by axic

Loading

winsvega Jan 18, 2018 •

edited

Loading

codecov-io commented Jan 18, 2018 •

edited

Loading

winsvega Jan 20, 2018 •

edited

Loading