ETH connector #59

mrLSD · 2021-05-05T16:42:48Z

ETH connector contains fugible token logic for specific flow.
To verify logic:

DIagram - represent Diagram of algorithm and process flow
Formal specification - represent algorithm in a formal way as functional style code with full type inference.

… prover

* EIP712-Withdraw: fixed encoding rules and order. * EIP712-Withdraw: `verify_withdraw_eip712` returns `true` only if the sender address equals to the address of message signer. * EIP712-Withdraw: update tests. * EIP712-Withdraw: refactoring. * ethabit::encode_token_packed: use right-padded encoding for `Address`. * WithdrawFromEthCallArgs: fixed `amount` type conversion.

…ra-engine into evm-deposit-withdraw

mrLSD · 2021-05-20T20:14:47Z

Improvements & proposals:
#98 #104

sept-en · 2021-05-20T21:01:16Z

src/fungible_token.rs

+        } else {
+            None
+        }


This is wrong as according to the NEP-145 specs: If the account is unknown to the contract then the total account storage balance returned will be zero.
So we need to always return StorageBalance, and zero for unknown accounts.

Fixed at #98

Please note the appropriate issue in near-sdk-rs.

src/fungible_token.rs

* Eugene's review 2021-05-08 * Eth connector improvements after review 2021-05-18 (#98) * Adde improvements afterreview - account checking, msg len check, json lib * Added json parser. Changed balance_of * Fixed balance_of test * json for ft_transfer & fix test * Json args for ft_transfer_call & fixed tests * Added json for FT storage methods * Fix ft_resolve transfer promise result check. Removed total_supply_near * Fix to NEP-145: storage_balance_of * Fix storage_balance_of to NEP-145 * Eth connector statistic (#104) * Added get_accounts_counter & tests * Clippy fix * Fixed: check accounts_contains_key & added comments * Lint: cargo fmt * Chanched key for Statistics * Update src/connector.rs Imptove comments Co-authored-by: Michael Birch <michael@near.org> * Changed: - get_accounts_counter - return le_bytes Added: - test_get_accounts_counter_and_transfer - check recalculation accounts Co-authored-by: Michael Birch <michael@near.org> Co-authored-by: Michael Birch <michael@near.org> Co-authored-by: Evgeny Ukhanov <mrlsd@ya.ru> Co-authored-by: Michael Birch <michael@near.org>

sept-en · 2021-05-27T14:40:48Z

src/storage.rs

+    Contract = 0x0,
+    FungibleToken = 0x1,
+    UsedEvent = 0x2,
+    StatisticsAuroraAccountsCounter = 0x3,


It makes sense to start statistics Id from something like 0xF or 0x10. So if other fields related to the contract itself are added in the future, they will come in order and not going to be mixed with Ids for Statistics.

I'll create a PR for that.

* Added tests: * test_deposit_near_with_zero_fee * test_deposit_evm_with_zero_fee * Added: * test_deposit_evm_amount_equal_fee_non_zero * check_execution_status_failure * Improved: * test_deposit_with_same_proof Added: * test_deposit_wrong_custodian_address * Added tests: * test_deposit_near_amount_less_fee * test_deposit_evm_amount_less_fee * test_deposit_near_amount_zero_fee_non_zero * test_deposit_evm_amount_zero_fee_non_zero * test_deposit_near_amount_equal_fee_non_zero * Changed: test_deposit_wrong_custodian_address

* EthConnector: make AdminControlled and pausable. * EthConnector: add AdminControlled&pausability tests. * Stylystic fixes. * AdminControlled: add panic message when paused. * AdminControlled: minor refactoring. * AdminControlled: add errors. Naming improvements. * AdminControlled: doc improvements. * Test fixes. * Fix fmt * AdminControlled: make IO in main contract module. * AdminControlled:explicitly check panic msg in tests.

* Rename `check_execution_status_failure()` method to `assert_execution_status_failure()`; * `assert_execution_status_failure()`: accept panic message as an arg. * Explicitly specify the panic message for each `assert_execution_status_failure()` if the promise didn't fail with the provided error message. * Eth-connector tests: improve checks for failure msg. * Usually the converted to string has either of the following two messages formats: "Action #0: Smart contract panicked: ERR_MSG [src/some_file.rs:LINE_NUMBER:COLUMN_NUMBER]" "right: 'MISMATCHED_DATA': ERR_MSG [src/some_file.rs:LINE_NUMBER:COLUMN_NUMBER]" So the ": ERR_MSG [" pattern should catch all invariants of error, even if one of the errors message is a subset of another one (e.g. `ERR_MSG_FAILED` is a subset of `ERR_MSG_FAILED_FOO`).

* Document `aurora encode-address` usage. * Cache cargo artifacts between CI runs. (#92) * Address comments from audit. (#86) * Validate register length in `read_input_arr20()` * Only read register length in `Engine::get_code_size` * Add `read_input_borsh()` * Ensure `method.args.len() == args_decoded.len()` * Ensure register size is 8 in `read_u64` * Use constant to specify the register ID used in `read_input()` * Reduce size of `cargo cache` in CI. (#95) * Define a `Wei` newtype for balances. (#96) * Fix evm-bully builds after recent refactoring. (#100) * Refactor `Engine::get_state` to return a `Result`. (#99) * Ensure that `Cargo.lock` in the repo is valid. (#101) * Remove unneeded nightly feature. (#102) * Dispatch precompiles on the full address. (#107) * Support state migration on upgrade. (#103) * Remove resolved TODOs * Fix state migration test * Conditional compilation minor improvements. Co-authored-by: Arto Bendiken <arto@aurora.dev> Co-authored-by: Michael Birch <michael@near.org> Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

* Add `set_eth_connector_contract_data()` method. * Minor refactoring: `init_contract()` method now accepts `InitCallArgs` instead of making IO operations in it.

…gine into eth-connector-merge-develop-after-target-change

* Base precompile code between connectors (#73) * Base precompile code between connectors * Handle errors and validate input * Use proper result * Document `aurora encode-address` usage. * Cache cargo artifacts between CI runs. (#92) * Address comments from audit. (#86) * Validate register length in `read_input_arr20()` * Only read register length in `Engine::get_code_size` * Add `read_input_borsh()` * Ensure `method.args.len() == args_decoded.len()` * Ensure register size is 8 in `read_u64` * Use constant to specify the register ID used in `read_input()` * Reduce size of `cargo cache` in CI. (#95) * Define a `Wei` newtype for balances. (#96) * Fix evm-bully builds after recent refactoring. (#100) * Refactor `Engine::get_state` to return a `Result`. (#99) * Ensure that `Cargo.lock` in the repo is valid. (#101) * Remove unneeded nightly feature. (#102) * Implement BC generational storage. * fix address input * remove note * put key on the end of the storage key * remove pub from methods * Dispatch precompiles on the full address. (#107) * Support state migration on upgrade. (#103) * Implement the ETH connector. (#59) * Move when to call `set_generation` * Fix arg Co-authored-by: Marcelo Fornet <mfornet94@gmail.com> Co-authored-by: Arto Bendiken <arto@aurora.dev> Co-authored-by: Michael Birch <michael@near.org> Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com> Co-authored-by: Evgeny Ukhanov <mrlsd@ya.ru>

* Add tests for state check after selfdestruct * Aurora runner tracks storage usage to avoid underflow when storage is released in future transactions (#85) * Implement generational storage (#87) * Base precompile code between connectors (#73) * Base precompile code between connectors * Handle errors and validate input * Use proper result * Document `aurora encode-address` usage. * Cache cargo artifacts between CI runs. (#92) * Address comments from audit. (#86) * Validate register length in `read_input_arr20()` * Only read register length in `Engine::get_code_size` * Add `read_input_borsh()` * Ensure `method.args.len() == args_decoded.len()` * Ensure register size is 8 in `read_u64` * Use constant to specify the register ID used in `read_input()` * Reduce size of `cargo cache` in CI. (#95) * Define a `Wei` newtype for balances. (#96) * Fix evm-bully builds after recent refactoring. (#100) * Refactor `Engine::get_state` to return a `Result`. (#99) * Ensure that `Cargo.lock` in the repo is valid. (#101) * Remove unneeded nightly feature. (#102) * Implement BC generational storage. * fix address input * remove note * put key on the end of the storage key * remove pub from methods * Dispatch precompiles on the full address. (#107) * Support state migration on upgrade. (#103) * Implement the ETH connector. (#59) * Move when to call `set_generation` * Fix arg Co-authored-by: Marcelo Fornet <mfornet94@gmail.com> Co-authored-by: Arto Bendiken <arto@aurora.dev> Co-authored-by: Michael Birch <michael@near.org> Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com> Co-authored-by: Evgeny Ukhanov <mrlsd@ya.ru> * Fix layout of the key * Fix all tests (don't wipe the storage all the time) * Use correct generation in writing storage * Remove unnecessary references Co-authored-by: Michael Birch <michael@near.org> Co-authored-by: Joshua J. Bouw <dev@joshuajbouw.com> Co-authored-by: Arto Bendiken <arto@aurora.dev> Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com> Co-authored-by: Evgeny Ukhanov <mrlsd@ya.ru> Co-authored-by: Michael Birch <michael.birch@aurora.dev>

mrLSD and others added 30 commits April 1, 2021 19:48

Added prover & extended types

98b302a

Mode Borsh args from types to parameters

97a3759

Merge branch 'master' of github.com:aurora-is-near/aurora-engine into…

a889328

… prover

Added fungible tokens

25154f0

Added eth-connector

a0942a2

Modify assert for fee

5876814

Fix formatting

facc786

Extend eth-conenctor with EVM token logic

b055a54

Changed eth-connector deposit logic

eb9e361

Added changes for ETH deposit/withdraw and Engine changes

fcc1332

Mint ETH-tokens

978474b

Added: transfer_eth

041879e

ETH withdraw basic method

b5ffb23

eth-withdraw validation structure & modified Deposit-eth fields

a7e73f4

eth transfer and withdraw logic

45a5ca9

eip712 message verifier - started encoding

676a86c

added encode-packed

e345d71

virefy EIP712 message for withdraw

de7f36d

Changed EIP712 message fields

f1f6479

Modify logs for EIP712 messages

944b6e2

Test EIP712

1201a39

Tests EIP712

11dec10

Integration tests for encode_withdraw_eip712

89f572c

Integration tests for encode_withdraw_eip712

d6830ea

Extend tests for eth-connector

96b3c0e

Merge branch 'evm-deposit-withdraw' of github.com:aurora-is-near/auro…

348e5cc

…ra-engine into evm-deposit-withdraw

eth-connector test deposit & balance & total_supply

80f033b

Imporved tests

07251fd

FT tests

2de5af8

mrLSD and others added 6 commits May 13, 2021 21:12

Early checking for ft_transfer_call message data

f2a24fe

Changed finish_deposit_near - asserts before save Proof hash

d7298dd

Use storage::bytes_to_key in EthConnectorContract::get_contract_key

3b3e2f2

Added test_ft_transfer_call_without_relayer

d7d902e

Added test_ft_transfer_call_fee_greater_than_amount

19fa058

Added overflow check: ft_transfer_call

f180a08

sept-en suggested changes May 20, 2021

View reviewed changes

EVM on MainNet automation moved this from In progress to Review in progress May 20, 2021

Evgeny Kuzyakov and others added 2 commits May 26, 2021 10:16

Fix tests for eth-connector

b4a5d1e

sept-en reviewed May 27, 2021

View reviewed changes

mrLSD and others added 7 commits May 27, 2021 23:26

EthConnector: restrict connector init to owner. (#112)

29785ce

Add compilation feature for exit precompiles. (#111)

f86197d

Eth-connector:add the way to upgrade contract data. (#113)

ab69d39

* Add `set_eth_connector_contract_data()` method. * Minor refactoring: `init_contract()` method now accepts `InitCallArgs` instead of making IO operations in it.

artob changed the base branch from master to develop May 28, 2021 19:25

artob assigned sept-en and unassigned mrLSD May 28, 2021

Merge branch 'develop' of https://github.com/aurora-is-near/aurora-en…

60374b6

…gine into eth-connector-merge-develop-after-target-change

artob assigned artob and unassigned sept-en May 28, 2021

artob merged commit 5144281 into develop May 28, 2021

artob deleted the eth-connector branch May 28, 2021 20:16

EVM on MainNet automation moved this from Review in progress to Done May 28, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ETH connector #59

ETH connector #59

mrLSD commented May 5, 2021 •

edited

mrLSD commented May 20, 2021 •

edited

sept-en May 20, 2021

mrLSD May 20, 2021

sept-en May 20, 2021

sept-en May 27, 2021

ETH connector #59

ETH connector #59

Conversation

mrLSD commented May 5, 2021 • edited

mrLSD commented May 20, 2021 • edited

sept-en May 20, 2021

Choose a reason for hiding this comment

mrLSD May 20, 2021

Choose a reason for hiding this comment

sept-en May 20, 2021

Choose a reason for hiding this comment

sept-en May 27, 2021

Choose a reason for hiding this comment

mrLSD commented May 5, 2021 •

edited

mrLSD commented May 20, 2021 •

edited