Problem: unreleased ethers dependency (#176)

Solution: change to the ethers 1.0 version * bump dockerfile to the latest rust stable * regenerate abi files
crypto-org-chain · Dec 9, 2022 · 6883d68 · 6883d68
1 parent 52445f4
commit 6883d68
Show file tree

Hide file tree

Showing 15 changed files with 354 additions and 313 deletions.
diff --git a/orchestrator/Cargo.lock b/orchestrator/Cargo.lock
diff --git a/orchestrator/Cargo.toml b/orchestrator/Cargo.toml
@@ -50,6 +50,3 @@ ethermint = [
     "gorc/ethermint",
     "register_delegate_keys/ethermint",
 ]
-
-[patch.crates-io]
-eth-keystore = { git = "https://github.com/crypto-org-chain/eth-keystore-rs.git", rev = "1e32f6f279c1878ce5be0750e5fd346e50f0fc12" }
diff --git a/orchestrator/Dockerfile b/orchestrator/Dockerfile
@@ -1,6 +1,6 @@
 # Reference: https://www.lpalmieri.com/posts/fast-rust-docker-builds/
 
-FROM rust:1.58 as cargo-chef-rust
+FROM rust:1.65 as cargo-chef-rust
 RUN cargo install cargo-chef
 
 FROM cargo-chef-rust as planner

diff --git a/orchestrator/cosmos_gravity/Cargo.toml b/orchestrator/cosmos_gravity/Cargo.toml
@@ -12,7 +12,7 @@ ethereum_gravity = {path = "../ethereum_gravity"}
 gravity_proto = {path = "../gravity_proto/"}
 
 deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch = "update/deps" }
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 thiserror = "1"
 clarity = "0.4.11"
 serde = "1.0"

diff --git a/orchestrator/ethereum_gravity/Cargo.toml b/orchestrator/ethereum_gravity/Cargo.toml
@@ -12,7 +12,7 @@ gravity_utils = { path = "../gravity_utils" }
 gravity_proto = { path = "../gravity_proto" }
 
 deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch = "update/deps" }
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 clarity = "0.4.11"
 web30 = "0.15.4"
 log = "0.4"

diff --git a/orchestrator/gorc/Cargo.toml b/orchestrator/gorc/Cargo.toml
@@ -26,7 +26,7 @@ orchestrator = { path = "../orchestrator" }
 relayer = { path = "../relayer" }
 
 deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch = "update/deps" }
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 clarity = "0.4.12"
 actix-rt = "2.5"
 rpassword = "5"

diff --git a/orchestrator/gravity_abi/Cargo.toml b/orchestrator/gravity_abi/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0.69"
diff --git a/orchestrator/gravity_abi/src/erc20.rs b/orchestrator/gravity_abi/src/erc20.rs
diff --git a/orchestrator/gravity_abi/src/gravity.rs b/orchestrator/gravity_abi/src/gravity.rs
diff --git a/orchestrator/gravity_abi_build/Cargo.toml b/orchestrator/gravity_abi_build/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 serde_derive = "1.0"
 serde_json = "1.0.69"
 serde = "1.0"
diff --git a/orchestrator/gravity_utils/Cargo.toml b/orchestrator/gravity_utils/Cargo.toml
@@ -11,7 +11,7 @@ gravity_abi = { path = "../gravity_abi" }
 gravity_proto = { path = "../gravity_proto" }
 cosmos-sdk-proto = "0.6.3"
 deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch = "update/deps" }
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 web30 = "0.15"
 clarity = "0.4.11"
 lazy_static = "1.4.0"

diff --git a/orchestrator/orchestrator/Cargo.toml b/orchestrator/orchestrator/Cargo.toml
@@ -17,7 +17,7 @@ gravity_utils = { path = "../gravity_utils" }
 gravity_proto = { path = "../gravity_proto" }
 
 deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch = "update/deps" }
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 serde_derive = "1.0"
 clarity = "0.4.11"
 docopt = "1"

diff --git a/orchestrator/register_delegate_keys/Cargo.toml b/orchestrator/register_delegate_keys/Cargo.toml
@@ -16,7 +16,7 @@ gravity_utils = {path = "../gravity_utils"}
 gravity_proto = {path = "../gravity_proto/"}
 
 deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch = "update/deps" }
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 contact = "0.4"
 serde_derive = "1.0"
 clarity = "0.4.11"

diff --git a/orchestrator/relayer/Cargo.toml b/orchestrator/relayer/Cargo.toml
@@ -20,7 +20,7 @@ gravity_utils = { path = "../gravity_utils" }
 gravity_proto = { path = "../gravity_proto" }
 
 deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch = "update/deps" }
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 serde_derive = "1.0"
 clarity = "0.4.11"
 docopt = "1"

diff --git a/orchestrator/test_runner/Cargo.toml b/orchestrator/test_runner/Cargo.toml
@@ -21,7 +21,7 @@ deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch =
 serde_derive = "1.0"
 clarity = "0.4.11"
 docopt = "1"
-ethers = { git = "https://github.com/gakonst/ethers-rs.git", branch = "master", features = ["abigen"] }
+ethers = { version = "1", features = ["abigen"] }
 serde = "1.0"
 actix = "0.12"
 actix-web = {version = "3", features=["openssl"]}