Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EVM tokens deposit & withdraw #24

Merged
merged 38 commits into from
Apr 21, 2021
Merged

EVM tokens deposit & withdraw #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
98b302a
Added prover & extended types
mrLSD Apr 2, 2021
97a3759
Mode Borsh args from types to parameters
mrLSD Apr 2, 2021
a889328
Merge branch 'master' of github.com:aurora-is-near/aurora-engine into…
mrLSD Apr 5, 2021
25154f0
Added fungible tokens
mrLSD Apr 5, 2021
a0942a2
Added eth-connector
mrLSD Apr 6, 2021
5876814
Modify assert for fee
mrLSD Apr 6, 2021
facc786
Fix formatting
mrLSD Apr 6, 2021
b055a54
Extend eth-conenctor with EVM token logic
mrLSD Apr 6, 2021
eb9e361
Changed eth-connector deposit logic
mrLSD Apr 6, 2021
fcc1332
Added changes for ETH deposit/withdraw and Engine changes
mrLSD Apr 6, 2021
978474b
Mint ETH-tokens
mrLSD Apr 7, 2021
041879e
Added: transfer_eth
mrLSD Apr 7, 2021
b5ffb23
ETH withdraw basic method
mrLSD Apr 7, 2021
a7e73f4
eth-withdraw validation structure & modified Deposit-eth fields
mrLSD Apr 8, 2021
45a5ca9
eth transfer and withdraw logic
mrLSD Apr 8, 2021
676a86c
eip712 message verifier - started encoding
mrLSD Apr 8, 2021
e345d71
added encode-packed
mrLSD Apr 9, 2021
de7f36d
virefy EIP712 message for withdraw
mrLSD Apr 9, 2021
f1f6479
Changed EIP712 message fields
mrLSD Apr 9, 2021
944b6e2
Modify logs for EIP712 messages
mrLSD Apr 9, 2021
1201a39
Test EIP712
mrLSD Apr 12, 2021
11dec10
Tests EIP712
mrLSD Apr 13, 2021
89f572c
Integration tests for encode_withdraw_eip712
mrLSD Apr 13, 2021
d6830ea
Integration tests for encode_withdraw_eip712
mrLSD Apr 13, 2021
dd1f8e1
EIP712-Withdraw: improvements and fixes.
sept-en Apr 14, 2021
96b3c0e
Extend tests for eth-connector
mrLSD Apr 14, 2021
348e5cc
Merge branch 'evm-deposit-withdraw' of github.com:aurora-is-near/auro…
mrLSD Apr 14, 2021
80f033b
eth-connector test deposit & balance & total_supply
mrLSD Apr 14, 2021
07251fd
Imporved tests
mrLSD Apr 15, 2021
2de5af8
FT tests
mrLSD Apr 15, 2021
e71d52a
Fixed verify_transfer_eip712
mrLSD Apr 16, 2021
09b79c1
Change test_withdraw_near
mrLSD Apr 16, 2021
f2e1f11
Tests for: ft_transfer, ft_transfer_call
mrLSD Apr 16, 2021
356ad42
test_eth_deposit_balance_total_supply
mrLSD Apr 16, 2021
6cae502
test and ifx: deposit_eth, withdraw_near
mrLSD Apr 17, 2021
d920662
References in fungible token (#29)
birchmd Apr 19, 2021
27f90ef
Fix: hide logging behind feature flag
birchmd Apr 19, 2021
f875d36
Fix: clippy errors in eth-connector (#32)
birchmd Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,5 @@ default = ["sha2", "std"]
std = ["borsh/std", "evm/std", "primitive-types/std", "rlp/std", "sha3/std", "ethabi/std", "lunarity-lexer/std"]
contract = []
evm_bully = []
log = []
integration-test = ["log"]
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CARGO = cargo
NEAR = near
FEATURES = contract
FEATURES = contract,integration-test
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what our release pipeline looks like, but if it uses make release then I think we should not be including the integration-test feature by default. That feature should only be enabled when compiling the contract for testing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I said @artob we should remove it from Make file


ifeq ($(evm-bully),yes)
FEATURES := $(FEATURES),evm_bully
Expand All @@ -15,6 +15,7 @@ release.wasm: target/wasm32-unknown-unknown/release/aurora_engine.wasm

target/wasm32-unknown-unknown/release/aurora_engine.wasm: Cargo.toml Cargo.lock $(wildcard src/*.rs)
RUSTFLAGS='-C link-arg=-s' $(CARGO) build --target wasm32-unknown-unknown --release --no-default-features --features=$(FEATURES) -Z avoid-dev-deps
ls -l target/wasm32-unknown-unknown/release/aurora_engine.wasm

debug: debug.wasm

Expand Down
Loading