Skip to content

Commit

Permalink
Chore(eth-wallet-contract): Use crates.io deps (#11106)
Browse files Browse the repository at this point in the history
Aurora has published its libraries to crates.io, so we can now replace
the git dependencies. This is not a functional change just a change in
the source for the dependencies only.
  • Loading branch information
birchmd authored Apr 23, 2024
1 parent f95087b commit 73c59dc
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 92 deletions.
94 changes: 29 additions & 65 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +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" }
aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.1" }
aurora-engine-transactions = "1.1"
aurora-engine-types = "1.1"
awc = { version = "3", features = ["openssl"] }
backtrace = "0.3"
base64 = "0.21"
Expand Down
43 changes: 26 additions & 17 deletions runtime/near-wallet-contract/implementation/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions runtime/near-wallet-contract/implementation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "CC0-1.0"


[workspace.dependencies]
aurora-engine-transactions = { git = "https://github.com/aurora-is-near/aurora-engine.git", rev = "c03a2d8610cd27a9decb91b3bddb107db2177b29", default-features = false, features = ["contract"]}
aurora-engine-transactions = { version = "1.1", default-features = false, features = ["contract"]}
base64 = "0.21"
ethabi = { version = "18", default-features = false }
hex = "0.4"
Expand All @@ -18,7 +18,7 @@ serde = { version = "1", features = ["derive"] }

# dev-dependencies
anyhow = "1"
aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", rev = "c03a2d8610cd27a9decb91b3bddb107db2177b29", default-features = false }
aurora-engine-types = { version = "1.1", default-features = false }
near-crypto = "0.21"
near-workspaces = "0.10"
rlp = { version = "0.5", default-features = false }
Expand Down
Binary file modified runtime/near-wallet-contract/res/wallet_contract_localnet.wasm
Binary file not shown.
Binary file modified runtime/near-wallet-contract/res/wallet_contract_mainnet.wasm
Binary file not shown.
Binary file modified runtime/near-wallet-contract/res/wallet_contract_testnet.wasm
Binary file not shown.
12 changes: 6 additions & 6 deletions runtime/near-wallet-contract/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,24 +74,24 @@ mod tests {

#[test]
fn check_mainnet_wallet_contract() {
const WALLET_CONTRACT_HASH: &'static str = "G1tEPtdS2ffvbqx8iMjBS4Tqg5sCZF1X22tvgnMfk91R";
const MAGIC_BYTES_HASH: &'static str = "AsdzRwGoYZwvNsC5Eb3TJze92rLHefCxd6rmttTyCiNP";
const WALLET_CONTRACT_HASH: &'static str = "Ai2kwfsF9pNqq4ngErx4HeoB4EJyyLB2R2i1s6Na9VS";
const MAGIC_BYTES_HASH: &'static str = "FAUvvE5sejk9tQ5sGeZzXJ4bgJ7GzxjNdd2V2snNbT6X";
check_wallet_contract(MAINNET, WALLET_CONTRACT_HASH);
check_wallet_contract_magic_bytes(MAINNET, WALLET_CONTRACT_HASH, MAGIC_BYTES_HASH);
}

#[test]
fn check_testnet_wallet_contract() {
const WALLET_CONTRACT_HASH: &'static str = "6zgiNrGnV2LfVxc7uDARPXm7qwGmJLBsJRWbYnNfvgF2";
const MAGIC_BYTES_HASH: &'static str = "CmE5sZBRrJXqhBQEvWiH1ioPWMFE5GeK2Sofr4iedWxC";
const WALLET_CONTRACT_HASH: &'static str = "7FcYSUBNto2q7NkAbvLQ8Lv2kbeFqHcoAWFHqzJHqi9a";
const MAGIC_BYTES_HASH: &'static str = "DPZnYabhPgsiqHiR83mSKvdVK97JPMTEPw4knLSBEvg5";
check_wallet_contract(TESTNET, WALLET_CONTRACT_HASH);
check_wallet_contract_magic_bytes(TESTNET, WALLET_CONTRACT_HASH, MAGIC_BYTES_HASH);
}

#[test]
fn check_localnet_wallet_contract() {
const WALLET_CONTRACT_HASH: &'static str = "AW2bzCGgMAgQeifG52N817KhGRUQVvxKygmbM2HdTxvy";
const MAGIC_BYTES_HASH: &'static str = "EXJnccvEKmm1Fea7UTEvoUwCCKWgEiJvfjpCZ4L2vmyu";
const WALLET_CONTRACT_HASH: &'static str = "283Zi5Gt6SMWcjLT68DGcM9XRKcztMcMBgtMMEuhcJuY";
const MAGIC_BYTES_HASH: &'static str = "CNnw7N4HmsEeij9KE3pYPpqATrg9HgQUN84gVaJtQHoV";
const LOCALNET: &str = "localnet";
check_wallet_contract(LOCALNET, WALLET_CONTRACT_HASH);
check_wallet_contract_magic_bytes(LOCALNET, WALLET_CONTRACT_HASH, MAGIC_BYTES_HASH);
Expand Down

0 comments on commit 73c59dc

Please sign in to comment.