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.

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

[EPROD-552] Migrate from ethers-core to alloy #208

Merged
merged 88 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from 83 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
b074259
migrate did to alloy -> part 1
ufoscout Nov 23, 2024
d76c561
migrate did to alloy -> part 2
ufoscout Nov 23, 2024
49a01b0
migrate did to alloy -> part 3
ufoscout Nov 23, 2024
eb6bb9c
migrate did to alloy -> part 4
ufoscout Nov 23, 2024
5350bf1
migrate did to alloy -> part 5
ufoscout Nov 23, 2024
6e6e31b
migrate did to alloy -> part 6
ufoscout Nov 23, 2024
9c2c20a
migrate did to alloy -> part 7
ufoscout Nov 23, 2024
19aa310
migrate did to alloy -> part 8
ufoscout Nov 23, 2024
3c4fffa
migrate did to alloy -> part 9
ufoscout Nov 23, 2024
c042513
migrate did to alloy -> part 10
ufoscout Nov 23, 2024
dcdcc3e
migrate did to alloy -> part 11
ufoscout Nov 23, 2024
472e3ed
migrate did to alloy -> part 12
ufoscout Nov 23, 2024
958e67e
migrate did to alloy -> part 13 - All did tests pass
ufoscout Nov 23, 2024
8013430
migrate did to alloy -> part 13
ufoscout Nov 24, 2024
f81583f
migrate did to alloy -> part 14
ufoscout Nov 24, 2024
15abaaa
migrate did to alloy -> part 15
ufoscout Nov 24, 2024
1faa9bc
migrate did to alloy -> part 16
ufoscout Nov 24, 2024
5367a70
migrate did to alloy -> part 17 - eth-signer-alloy compiles
ufoscout Nov 24, 2024
cfadd86
migrate did to alloy -> part 18
ufoscout Nov 24, 2024
c9b4f4c
migrate did to alloy -> part 19
ufoscout Nov 25, 2024
f0bd12e
migrate did to alloy -> part 20
ufoscout Nov 25, 2024
dc06c76
migrate did to alloy -> part 21 - signer compiles
ufoscout Nov 25, 2024
14780e1
migrate did to alloy -> part 22
ufoscout Nov 25, 2024
bc62011
migrate did to alloy -> part 23
ufoscout Nov 25, 2024
5826d8d
migrate did to alloy -> part 24
ufoscout Nov 25, 2024
d5e518b
migrate did to alloy -> part 25
ufoscout Nov 25, 2024
a240d7d
migrate did to alloy -> part 26
ufoscout Nov 25, 2024
0cfb8d5
remove_old_signer
ufoscout Nov 25, 2024
a3a3b71
migrate did to alloy -> part 27
ufoscout Nov 26, 2024
05de8a3
migrate did to alloy -> part 28
ufoscout Nov 26, 2024
610f061
migrate did to alloy -> part 29
ufoscout Nov 26, 2024
85be913
migrate did to alloy -> part 30
ufoscout Nov 26, 2024
fc614cd
migrate did to alloy -> part 31
ufoscout Nov 26, 2024
497d213
Merge remote-tracking branch 'origin/main' into alloy
ufoscout Nov 26, 2024
94947d2
remove ethers from deps
ufoscout Nov 26, 2024
38496df
remove unused code
ufoscout Nov 26, 2024
d4b4afd
remove unused code
ufoscout Nov 26, 2024
122408e
migrate did to alloy -> part 32
ufoscout Nov 27, 2024
7ed8419
migrate did to alloy -> part 33
ufoscout Nov 27, 2024
e2d2225
migrate did to alloy -> part 34
ufoscout Nov 27, 2024
f764d73
migrate did to alloy -> part 35
ufoscout Nov 27, 2024
2a99ba2
clippy
ufoscout Nov 27, 2024
6665219
clippy
ufoscout Nov 27, 2024
e5a5048
fmt
ufoscout Nov 27, 2024
98d3fc4
Merge branch 'main' into alloy
ufoscout Nov 27, 2024
9fccfc7
Fix test using ethabi
ufoscout Nov 29, 2024
71e6ef8
fix_contract_call_test
ufoscout Nov 29, 2024
4d6c088
fmt
ufoscout Nov 29, 2024
7093c67
clippy
ufoscout Nov 29, 2024
aa41557
clippy
ufoscout Nov 29, 2024
8d8d246
fix_deps
ufoscout Nov 29, 2024
1ad64fd
alloy 0.7
ufoscout Nov 29, 2024
c240e2b
fmt
ufoscout Nov 29, 2024
8557ed1
refactor TX hash
ufoscout Dec 3, 2024
5541bcb
Add from/to usize for integers
ufoscout Dec 3, 2024
8d500e7
fmt
ufoscout Dec 4, 2024
68f4288
Fix compilation
ufoscout Dec 4, 2024
0fd3cc3
Merge remote-tracking branch 'origin/main' into alloy
ufoscout Dec 4, 2024
6cafc67
fix_tests
ufoscout Dec 4, 2024
1998597
fmt
ufoscout Dec 4, 2024
0f8f3d5
avoid TX ownership on signature verification call
ufoscout Dec 4, 2024
4253852
Merge branch 'main' into alloy
ufoscout Dec 4, 2024
99a6d62
refactor
ufoscout Dec 4, 2024
c18bc0f
add TxEvelop convertions
ufoscout Dec 4, 2024
9a3c85b
add U64.as_u64()
ufoscout Dec 4, 2024
23df1c9
add logs convertion
ufoscout Dec 4, 2024
ff29838
Add rlp encodable for Tx executionlog
ufoscout Dec 4, 2024
4ce3d6f
Add block rlp encoding
ufoscout Dec 4, 2024
6b62640
Fix Block hash overflow
ufoscout Dec 4, 2024
b37ae46
improve from_hex_str convertion for intergers
ufoscout Dec 4, 2024
2a7ed87
Fix block rlp encoding
ufoscout Dec 5, 2024
2b28dde
fmt
ufoscout Dec 5, 2024
f5f3239
to_u64
ufoscout Dec 5, 2024
acc04ff
add rlp error
ufoscout Dec 5, 2024
20bbee0
implement send raw transaction
ufoscout Dec 5, 2024
0538782
remove unwrap in serde deserialization
ufoscout Dec 5, 2024
a73e2db
clippy
ufoscout Dec 5, 2024
65a70ba
revamp TransactionBuilder
ufoscout Dec 5, 2024
22bfde4
add from rlp
ufoscout Dec 6, 2024
b3376c1
remove panics on block rlp decode
ufoscout Dec 6, 2024
cd5d320
fmt
ufoscout Dec 6, 2024
edfdde5
test_tx_rlp_hash
ufoscout Dec 6, 2024
d919940
Use bytes for rlp
ufoscout Dec 6, 2024
e90319e
remove deprecated alloy types
ufoscout Dec 10, 2024
4826c43
fmt
ufoscout Dec 10, 2024
0975919
Implement review comments
ufoscout Dec 10, 2024
1634c00
review comments
ufoscout Dec 10, 2024
8e0566c
upgrade alloy to 0.8
ufoscout Dec 10, 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
19 changes: 13 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@ repository = "https://github.com/bitfinity-network/bitfinity-evm-sdk"
version = "0.37.0"

[workspace.dependencies]
alloy-primitives = { version = "0.8", default-features = false }
did = { path = "src/did" }
eth-signer = { path = "src/eth-signer" }
icrc-client = { path = "src/icrc-client" }
ethereum-json-rpc-client = { path = "src/ethereum-json-rpc-client" }
evm-block-extractor = { path = "src/evm-block-extractor" }
evm-canister-client = { path = "src/evm-canister-client" }
evm-log-extractor = { path = "src/evm-log-extractor" }
register-evm-agent-core = { path = "src/register-evm-agent-core" }
register-evm-agent = { path = "src/register-evm-agent" }
signature-verification-canister-client = { path = "src/signature-verification-canister-client" }

alloy = { version = "0.7", features = ["consensus", "k256", "eips", "rpc-types-eth", "rlp", "serde"] }
anyhow = "1.0"
async-trait = "0.1"
bincode = "1.3"
Expand All @@ -36,10 +47,7 @@ clap = { version = "4", features = ["derive", "env"] }
chrono = { version = "0.4", default-features = false }
derive_more = { version = "1", features = ["display", "from", "into"] }
env_logger = { version = "0.11.4", default-features = false }
ethereum-types = "0.14"
ethers-core = "2.0"
futures = { version = "0.3", default-features = false }
hex = "0.4"
ic-canister = { git = "https://github.com/bitfinity-network/canister-sdk", package = "ic-canister", tag = "v0.23.x" }
ic-canister-client = { git = "https://github.com/bitfinity-network/canister-sdk", package = "ic-canister-client", tag = "v0.23.x" }
ic-exports = { git = "https://github.com/bitfinity-network/canister-sdk", package = "ic-exports", tag = "v0.23.x" }
Expand All @@ -54,7 +62,6 @@ num = "0.4"
port_check = "0.2"
rand = { version = "0.8", features = ["std_rng", "small_rng"] }
reqwest = { version = "0.12", default-features = false }
rlp = "0.5"
serial_test = "3"
serde = "1.0"
serde_bytes = "0.11"
Expand All @@ -73,7 +80,7 @@ testcontainers = { package = "testcontainers-modules", version = "0.11", feature
"postgres",
] }
thiserror = "2.0"
tokio = { version = "1.39", features = ["macros", "rt", "signal"] }
tokio = { version = "1.39", features = ["macros", "rt-multi-thread", "signal"] }
url = "2.5"

[profile.dev]
Expand Down
19 changes: 0 additions & 19 deletions src/did/.gitignore

This file was deleted.

9 changes: 3 additions & 6 deletions src/did/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,16 @@ repository.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
alloy-primitives = { workspace = true }
alloy = { workspace = true }
bincode = { workspace = true }
bytes = { workspace = true }
candid = { workspace = true }
derive_more = { workspace = true }
ethereum-types = { workspace = true }
ethers-core = { workspace = true }
hex = { workspace = true }
ic-log = { workspace = true }
ic-stable-structures = { workspace = true }
jsonrpc-core = { workspace = true }
log = { workspace = true }
num = { workspace = true }
rlp = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serde_with = { workspace = true }
Expand All @@ -36,6 +32,7 @@ sha3 = { workspace = true }
thiserror = { workspace = true }

[dev-dependencies]
eth-signer = { path = "../eth-signer" }
alloy = { workspace = true, features = ["rand"]}
eth-signer = { workspace = true }
rand = { workspace = true }
tokio = { workspace = true }
148 changes: 0 additions & 148 deletions src/did/src/alloy_primitives.rs

This file was deleted.

Loading
Loading