Add option to preload system contracts from file before execution #289
Conversation
jakelang
force-pushed
the
syscontract-cli
branch
from
3c20d32
to
956d925
Compare
|
I think as milestone 1, this should just replace the So it is only two pieces of code added here:
Later we can think about how to deploy and replace more. In milestone 1 it will be possible to:
|
jakelang
force-pushed
the
syscontract-cli
branch
from
4be85ee
to
a07f38e
Compare
|
Rebased. |
|
@axic updated this to override the code at runtime, without CREATEing system contracts |
jakelang
force-pushed
the
syscontract-cli
branch
3 times, most recently
from
604fcca
to
9149571
Compare
src/hera.cpp
Outdated
| #endif | ||
|
|
||
| //Check the "sys:" syntax by comparing substring | ||
| if (evmc_option_raw.length() < 4 || evmc_option_raw.substr(0, 4).compare("sys:") != 0) { |
There was a problem hiding this comment.
Canno you just use evmc_option_raw.find("sys:") == 0 here?
Codecov Report
@@ Coverage Diff @@
## master #289 +/- ##
==========================================
- Coverage 72.06% 62.34% -9.72%
==========================================
Files 8 5 -3
Lines 970 964 -6
Branches 118 139 +21
==========================================
- Hits 699 601 -98
- Misses 241 331 +90
- Partials 30 32 +2 |
jakelang
force-pushed
the
syscontract-cli
branch
from
d749608
to
3be644c
Compare
src/hera.cpp
Outdated
| @@ -61,6 +61,7 @@ struct hera_instance : evmc_instance { | |||
| hera_wasm_engine wasm_engine = hera_wasm_engine::binaryen; | |||
| hera_evm_mode evm_mode = hera_evm_mode::reject; | |||
| bool metering = false; | |||
| vector<pair<evmc_address, string>> contract_preload_list; | |||
src/hera.cpp
Outdated
| #endif | ||
|
|
||
| //Check the "sys:" syntax by comparing substring | ||
| if (evmc_option_raw.length() < 4 || evmc_option_raw.find("sys:") != 0) { |
There was a problem hiding this comment.
I think there isn't a need to check the length if using find.
| return pair<evmc_address, bool>(ret, true); | ||
| } | ||
|
|
||
| pair<evmc_address, bool> parse_preload_addr(const char *name) |
There was a problem hiding this comment.
I think we need a helper which does the entire string parsing and returns a pair<address, filename>, where if either of them is empty that means it failed. This should not do alias resolution.
There was a problem hiding this comment.
address is a string and can contain an alias or a hex string.
jakelang
force-pushed
the
syscontract-cli
branch
4 times, most recently
from
bc65111
to
09558f1
Compare
src/hera.cpp
Outdated
| @@ -64,6 +64,7 @@ struct hera_instance : evmc_instance { | |||
| hera_wasm_engine wasm_engine = hera_wasm_engine::binaryen; | |||
| hera_evm_mode evm_mode = hera_evm_mode::reject; | |||
| bool metering = false; | |||
| vector<pair<evmc_address, string>> contract_preload_list; | |||
There was a problem hiding this comment.
I think this should be vector<pair<evmc_address, vector<uint8_t>>> so that the at runtime it doesn't need to be loaded every time.
axic
force-pushed
the
syscontract-cli
branch
3 times, most recently
from
b7db68a
to
435fcf6
Compare
axic
changed the title
Closes #288
Syntax:
--evmc sys:<address or alias>=<filepath>Hex address must be formatted with a leading
0xand must be 40 characters long (all nibbles must be explicitly specified, including leading zeroes).