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

[CCCP-295] Migrate to alloy #168

Open
wants to merge 59 commits into
base: main
Choose a base branch
from
+3,851 −4,857
Open

[CCCP-295] Migrate to alloy #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
efd6f4d
CCCP-295, chore: update abi
alstjd0921 Dec 3, 2024
9605726
CCCP-295, chore: fix typo
alstjd0921 Dec 3, 2024
18a60da
CCCP-295, feature: migrate into alloy-rs (WIP)
alstjd0921 Dec 3, 2024
6901066
CCCP-295, fix: remove redundant find
alstjd0921 Dec 3, 2024
b5027d6
CCCP-295, chore: move deps to mod
alstjd0921 Dec 3, 2024
53cd8bc
CCCP-295, refactor: `fn get_sorted_signatures()`
alstjd0921 Dec 5, 2024
1b0d54b
CCCP-295, refactor: remove unused dependencies and simplify transacti…
alstjd0921 Dec 10, 2024
be91ccf
CCCP-295, refactor: streamline transaction management and clean up code
alstjd0921 Dec 10, 2024
ff437e9
CCCP-295, refactor: restart tasks separately on error (WIP)
alstjd0921 Dec 10, 2024
45f0ce2
CCCP-295, feat: move retry transport layer & add `br_metrics::increas…
alstjd0921 Dec 10, 2024
4be9881
CCCP-295, feature: implement txpool flushing mechanism
alstjd0921 Dec 11, 2024
f7ee4fc
CCCP-295, chore: remove unnecessary locking
alstjd0921 Dec 11, 2024
6039e69
Merge branch 'main' into CCCP-295-migrate-to-alloy
dnjscksdn98 Dec 11, 2024
5225d8a
CCCP-476, feat: support core
dnjscksdn98 Dec 5, 2024
774aaab
CCCP-295, deps: update polkadot-sdk
dnjscksdn98 Dec 11, 2024
63df523
CCCP-295, chore: update alloy to 0.8
alstjd0921 Dec 11, 2024
419599c
CCCP-295, refactor: simplify signature recovery in `recover_message` …
alstjd0921 Dec 12, 2024
d09577d
CCCP-295, refactor: migrate to AnyNetwork for improved flexibility in…
alstjd0921 Dec 12, 2024
a544c10
CCCP-295, chore: keypair_migrator never return
alstjd0921 Dec 12, 2024
d4ab5f2
CCCP-295, chore: update doc comment
alstjd0921 Dec 12, 2024
efa5d7f
CCCP-295, chore: add missing sleep
alstjd0921 Dec 12, 2024
6e62b38
CCCP-295, fix: check every chainlink feed existence
dnjscksdn98 Dec 13, 2024
831904e
CCCP-295, fix: add missing tickers
dnjscksdn98 Dec 13, 2024
271cd63
CCCP-295, refactor: impl From trait for EthereumSignature
dnjscksdn98 Dec 13, 2024
42c9d9b
CCCP-295, fix: correct gas fee assignment in send_transaction functio…
alstjd0921 Dec 13, 2024
3370c40
CCCP-295, fix: use DynSolValue to encode poll input
alstjd0921 Dec 13, 2024
1081613
CCCP-295, refactor: use max()
dnjscksdn98 Dec 13, 2024
e1f7ecb
CCCP-295, fix: padding issue
alstjd0921 Dec 13, 2024
c815003
CCCP-295, chore: gas coefficient
alstjd0921 Dec 13, 2024
109cd1e
CCCP-295, chore: resolve clippy
alstjd0921 Dec 13, 2024
7e8551f
CCCP-295, chore: debug_mode
alstjd0921 Dec 16, 2024
f31e397
feat: rollback barrier count
alstjd0921 Dec 17, 2024
eebfc73
fix: is sequentially increased
alstjd0921 Dec 17, 2024
f556126
CCCP-295, rollback sequential check and roundup barrier
dnjscksdn98 Dec 17, 2024
c34a01a
CCCP-295, fix: use right encode
alstjd0921 Dec 17, 2024
c5018d7
CCCP-295, fix: no relay to non relay target
alstjd0921 Dec 17, 2024
c201ac2
CCCP-295, fix: bsc `estimateGas` issue
alstjd0921 Dec 19, 2024
7afde28
CCCP-295, fix: round relay sequential issue
alstjd0921 Dec 19, 2024
e0532dd
CCCP-295, fix: add missing condition
alstjd0921 Dec 19, 2024
8be9f6a
CCCP-295, feature: flush txpool when tx fails to confirmed while 3 bl…
alstjd0921 Dec 19, 2024
2613094
CCCP-295, feature: synchronous send transaction on bootstrap roundup …
alstjd0921 Dec 19, 2024
3af6039
CCCP-295, fix: add flush condition
alstjd0921 Dec 19, 2024
cc99b59
CCCP-295, refactor: simplify log processing in roundup relay handler
alstjd0921 Dec 19, 2024
80a0013
CCCP-295, refactor: streamline event handling and bootstrap state syn…
alstjd0921 Dec 19, 2024
7250a89
CCCP-295, fix: state check location
alstjd0921 Dec 19, 2024
340528b
CCCP-295, fix: recursive issue
alstjd0921 Dec 19, 2024
0555270
CCCP-295, fix: add transaction flushing on nonce too low error in rou…
alstjd0921 Dec 19, 2024
d0052ba
CCCP-295, feat: retry on already known
dnjscksdn98 Dec 20, 2024
fdfde67
CCCP-295, deps: bump sentry
dnjscksdn98 Dec 23, 2024
70d880e
CCCP-295, fix: use `CachedNonceManager`
alstjd0921 Dec 23, 2024
ba5412b
CCCP-295, fix: fill chain_id
alstjd0921 Dec 23, 2024
fb55d6b
CCCP-295, chore: print sentry client init log
dnjscksdn98 Dec 23, 2024
7235e0e
CCCP-295, fix: fillers
alstjd0921 Dec 23, 2024
53d508d
CCCP-295, refactor: roundup phase2 bootstrap
alstjd0921 Dec 23, 2024
6383157
CCCP-295, refactor: bootstrap
alstjd0921 Dec 23, 2024
6547ffd
CCCP-295, refactor:
alstjd0921 Dec 27, 2024
84f6bce
CCCP-295, fix: comparison by ord for bootstrapstate
alstjd0921 Jan 2, 2025
889855d
CCCP-295, fix: skip bootstrap when start from NormalStart
alstjd0921 Jan 2, 2025
2b0a352
CCCP-295, fix: use signature constant
dnjscksdn98 Jan 2, 2025
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
31 changes: 20 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repository = "https://github.com/bifrost-platform/bifrost-relayer.rs"
# General
log = "0.4.20"
env_logger = "0.10.0"
sentry = { version = "0.32.1", default-features = false, features = [
sentry = { version = "0.35.0", default-features = false, features = [
"reqwest",
"rustls",
"backtrace",
Expand All @@ -47,13 +47,22 @@ rand = "0.8.5"
lazy_static = "1.4.0"
url = "2.5.0"
array-bytes = "6.1"
eyre = "0.6"
tower = "0.5.0"

serde_yaml = "0.9.25"
serde = "1.0.188"
serde_json = "1.0.107"

hex = "0.4.3"
ethers = { git = "https://github.com/bifrost-platform/ethers-rs", tag = "ethers-v2.0.10-arbitrum-support" }
alloy = { version = "0.8", features = [
"full",
"reqwest-rustls-tls",
"provider-txpool-api",
"json-rpc",
"transports",
"k256",
] }
k256 = "0.13.1"
sha3 = "0.10.8"

Expand All @@ -66,19 +75,19 @@ tokio-stream = "0.1.14"
subxt = "0.37.0"

# Substrate Clients
sc-cli = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-v1.12.0" }
sc-utils = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-v1.12.0" }
sc-service = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-v1.12.0" }
sc-sysinfo = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-v1.12.0" }
sc-keystore = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-v1.12.0" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-v1.12.0" }
sc-cli = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-stable2407" }
sc-utils = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-stable2407" }
sc-service = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-stable2407" }
sc-sysinfo = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-stable2407" }
sc-keystore = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-stable2407" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", default-features = false, git = "https://github.com/bifrost-platform/polkadot-sdk", branch = "bifrost-polkadot-stable2407" }

# Substrate Primitives
sp-core = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-v1.12.0" }
sp-application-crypto = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-v1.12.0" }
sp-core = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-stable2407" }
sp-application-crypto = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-stable2407" }

# Substrate Builds
substrate-build-script-utils = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-v1.12.0" }
substrate-build-script-utils = { git = "https://github.com/bifrost-platform/polkadot-sdk", default-features = false, branch = "bifrost-polkadot-stable2407" }

[profile.production]
inherits = "release"
42 changes: 21 additions & 21 deletions abi/abi.socket.bitcoin.json
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions abi/abi.socket.merged.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
Expand All @@ -170,13 +170,13 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
"internalType": "RBCmethod",
"name": "method",
"internalType": "bytes16",
"name": "RBCmethod",
"type": "bytes16"
}
],
Expand All @@ -187,12 +187,12 @@
{
"components": [
{
"internalType": "Asset_Index",
"internalType": "bytes32",
"name": "tokenIDX0",
"type": "bytes32"
},
{
"internalType": "Asset_Index",
"internalType": "bytes32",
"name": "tokenIDX1",
"type": "bytes32"
},
Expand Down Expand Up @@ -272,8 +272,8 @@
"name": "BFC_MAIN",
"outputs": [
{
"internalType": "ChainIndex",
"name": "",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
}
],
Expand Down Expand Up @@ -496,8 +496,8 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
Expand Down Expand Up @@ -537,8 +537,8 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
Expand Down Expand Up @@ -626,8 +626,8 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
Expand Down Expand Up @@ -818,8 +818,8 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
Expand All @@ -845,13 +845,13 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
"internalType": "RBCmethod",
"name": "method",
"internalType": "bytes16",
"name": "RBCmethod",
"type": "bytes16"
}
],
Expand All @@ -862,12 +862,12 @@
{
"components": [
{
"internalType": "Asset_Index",
"internalType": "bytes32",
"name": "tokenIDX0",
"type": "bytes32"
},
{
"internalType": "Asset_Index",
"internalType": "bytes32",
"name": "tokenIDX1",
"type": "bytes32"
},
Expand Down Expand Up @@ -1354,8 +1354,8 @@
{
"inputs": [
{
"internalType": "ChainIndex",
"name": "_this",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
}
],
Expand Down Expand Up @@ -1447,8 +1447,8 @@
"name": "this_chain",
"outputs": [
{
"internalType": "ChainIndex",
"name": "",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
}
],
Expand All @@ -1460,8 +1460,8 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
Expand All @@ -1484,13 +1484,13 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
"internalType": "RBCmethod",
"name": "method",
"internalType": "bytes16",
"name": "RBCmethod",
"type": "bytes16"
}
],
Expand All @@ -1501,12 +1501,12 @@
{
"components": [
{
"internalType": "Asset_Index",
"internalType": "bytes32",
"name": "tokenIDX0",
"type": "bytes32"
},
{
"internalType": "Asset_Index",
"internalType": "bytes32",
"name": "tokenIDX1",
"type": "bytes32"
},
Expand Down Expand Up @@ -1578,13 +1578,13 @@
{
"components": [
{
"internalType": "ChainIndex",
"name": "chain",
"internalType": "bytes4",
"name": "ChainIndex",
"type": "bytes4"
},
{
"internalType": "RBCmethod",
"name": "method",
"internalType": "bytes16",
"name": "RBCmethod",
"type": "bytes16"
}
],
Expand All @@ -1595,12 +1595,12 @@
{
"components": [
{
"internalType": "Asset_Index",
"internalType": "bytes32",
"name": "tokenIDX0",
"type": "bytes32"
},
{
"internalType": "Asset_Index",
"internalType": "bytes32",
"name": "tokenIDX1",
"type": "bytes32"
},
Expand Down
5 changes: 3 additions & 2 deletions client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ repository = { workspace = true }
bitcoincore-rpc = { workspace = true }
miniscript = { workspace = true }
log = { workspace = true }
rand = { workspace = true }
sentry = { workspace = true }
ethers = { workspace = true }
serde_json = { workspace = true }
serde_yaml = { workspace = true }
tokio-stream = { workspace = true }
Expand All @@ -32,6 +30,9 @@ sha3 = { workspace = true }
subxt = { workspace = true }
url = { workspace = true }
array-bytes = { workspace = true }
alloy = { workspace = true }
tower = { workspace = true }
eyre = { workspace = true }

# subs
sc-keystore = { workspace = true }
Expand Down
Loading