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

Feat: Eth wallet contract implementation #10850

Merged
merged 14 commits into from
Apr 8, 2024
Merged

Feat: Eth wallet contract implementation #10850

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1079258
feat: eth wallet contract implementation
birchmd Mar 19, 2024
abfc04b
Integration test for wallet contract on eth implicit accounts
birchmd Mar 20, 2024
8ae8cb7
Merge branch 'master' into eth-wallet-contract
birchmd Apr 3, 2024
54992b1
cargo fmt
birchmd Apr 3, 2024
447feef
Add doc comments to public contract methods
birchmd Apr 3, 2024
9bb90c0
Remove unused Near actions
birchmd Apr 3, 2024
7ed4741
Rename hash_to_address -> account_id_to_address; add test
birchmd Apr 3, 2024
ee16f2b
Add comment about account suffix
birchmd Apr 3, 2024
fc96b2e
Update TODO comments
birchmd Apr 3, 2024
b900f78
Remove usage of git in tests
birchmd Apr 4, 2024
24bd574
Fix typo
birchmd Apr 4, 2024
3eacedc
Merge branch 'master' into eth-wallet-contract
birchmd Apr 4, 2024
fd8e664
Merge branch 'master' into eth-wallet-contract
birchmd Apr 5, 2024
37175d3
Merge branch 'master' into eth-wallet-contract
birchmd Apr 8, 2024
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
671 changes: 628 additions & 43 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ arbitrary = { version = "1.2.3", features = ["derive"] }
arc-swap = "1.5"
assert_matches = "1.5.0"
async-trait = "0.1.58"
aurora-engine-transactions = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.1" }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there a reason these are a git dependency?

We should avoid git dependencies where possible. The fact that this is referencing a tag suggests to me that these should be on crates.io.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Aurora doesn't have a regular process for releasing crates to crates.io. So for now a git dep is required to use the crate. But this is easy to update in the future if Aurora does start releasing crates.

Copy link
Collaborator

@nagisa nagisa Mar 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I think it should really be a not "if Aurora starts", but rather "integrating with the rest of the ecosystem ought to be a very strong incentive for Aurora to start releasing crates."

We can't really audit git tags, they are not reproducible and might just make the build process slower every time as cargo can't cache git repositories globally.

Does it block this PR? Probably not. But waiting for Aurora to realize these problems on their own before an action is taken is also not great.

aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.1" }
awc = { version = "3", features = ["openssl"] }
backtrace = "0.3"
base64 = "0.21"
Expand Down Expand Up @@ -170,6 +172,7 @@ ed25519-dalek = { version = "2.1.0", default-features = false, features = [
elastic-array = "0.11"
enum-map = "2.1.0"
enumset = "1.0"
ethabi = "18"
expect-test = "1.3.0"
finite-wasm = "0.5.0"
fs2 = "0.4"
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,14 @@ testlib.workspace = true

[dev-dependencies]
assert_matches.workspace = true
aurora-engine-transactions.workspace = true
aurora-engine-types.workspace = true
derive-enum-from-into.workspace = true
ethabi.workspace = true
insta.workspace = true
near-undo-block.workspace = true
rlp.workspace = true
sha3.workspace = true

[features]
performance_stats = [
Expand Down
368 changes: 258 additions & 110 deletions integration-tests/src/tests/client/features/wallet_contract.rs
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading