Skip to content

Commit 243f570

Browse files
icodezjbicodezjb
authored
Fix sync (#679)
* Replace substrate dependencies source * Use custom wasm substitute to fix block sync * Add aarch64 compilation support * Bump version to v5.2.0 --------- Co-authored-by: icodezjb <[email protected]>
1 parent c989780 commit 243f570

File tree

56 files changed

+685
-678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+685
-678
lines changed

‎Cargo.lock

+201-201
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "chainx"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66
description = "Fully Decentralized Interchain Crypto Asset Management on Polkadot"

‎Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ build:
2727
release:
2828
@cargo build --release #--features "${ENABLE_FEATURES}"
2929

30+
release-arm64:
31+
@BINDGEN_EXTRA_CLANG_ARGS='--sysroot /usr/aarch64-linux-gnu' \
32+
cargo build --release --target=aarch64-unknown-linux-gnu
33+
3034
test-opreturn:
3135
cargo test --release -p xp-gateway-bitcoin --lib -- --test-threads 1
3236

‎cli/Cargo.toml

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "chainx-cli"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
description = "Implementation of protocol https://chainx.org in Rust based on the Substrate framework."
66
edition = "2021"
@@ -18,38 +18,38 @@ serde_json = "1.0"
1818
clap = { version = "3.0", features = ["derive"] }
1919

2020
# Substrate client
21-
sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
22-
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
23-
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
24-
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
25-
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
26-
sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
27-
sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
28-
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
29-
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
30-
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
31-
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
32-
sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
33-
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
34-
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
21+
sc-authority-discovery = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
22+
sc-basic-authorship = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
23+
sc-chain-spec = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
24+
sc-client-api = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
25+
sc-consensus = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
26+
sc-consensus-babe = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
27+
sc-consensus-slots = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
28+
sc-executor = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
29+
sc-finality-grandpa = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
30+
sc-network = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
31+
sc-rpc = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
32+
sc-sync-state-rpc = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
33+
sc-transaction-pool = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
34+
sc-telemetry = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
3535

36-
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true }
37-
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true }
38-
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true }
39-
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true }
36+
frame-benchmarking-cli = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", optional = true }
37+
sc-cli = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", optional = true }
38+
sc-service = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", optional = true }
39+
try-runtime-cli = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", optional = true }
4040

4141
# Substrate primitives
42-
sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
43-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
44-
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
45-
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
46-
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
47-
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
48-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
49-
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
42+
sp-authority-discovery = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
43+
sp-core = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
44+
sp-consensus = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
45+
sp-consensus-babe = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
46+
sp-finality-grandpa = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
47+
sp-inherents = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
48+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
49+
sp-transaction-pool = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
5050

5151
# Substrate pallets
52-
pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
52+
pallet-im-online = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
5353

5454
chainx-executor = { path = "../executor" }
5555
chainx-primitives = { path = "../primitives" }
@@ -67,7 +67,7 @@ xpallet-gateway-common = { path = "../xpallets/gateway/common" }
6767
xpallet-btc-ledger = { path = "../xpallets/btc-ledger" }
6868

6969
[build-dependencies]
70-
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
70+
substrate-build-script-utils = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
7171

7272
[features]
7373
default = ["cli"]

‎cli/src/res/chainx_regenesis.json

+3
Large diffs are not rendered by default.

‎executor/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[package]
22
name = "chainx-executor"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

77
[dependencies]
8-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
9-
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
8+
frame-benchmarking = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
9+
sc-executor = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" }
1010

1111
# ChainX runtime
1212
chainx-runtime = { path = "../runtime/chainx" }

‎primitives/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "chainx-primitives"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

@@ -10,13 +10,13 @@ serde = { version = "1.0", features = ["derive"], optional = true }
1010
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
1111

1212
# Substrate primitives
13-
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
14-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
15-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
16-
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
13+
sp-application-crypto = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
14+
sp-core = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
15+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
16+
sp-std = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1717

1818
# Substrate pallets
19-
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
19+
frame-system = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
2020

2121
[features]
2222
default = ["std"]

‎primitives/assets-registrar/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xp-assets-registrar"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

@@ -11,8 +11,8 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive"
1111
impl-trait-for-tuples = "0.2.1"
1212

1313
# Substrate primitives
14-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
15-
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
14+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
15+
sp-std = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1616

1717
# ChainX primitives
1818
chainx-primitives = { path = "../../primitives", default-features = false }

‎primitives/gateway/bitcoin/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xp-gateway-bitcoin"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

@@ -11,10 +11,10 @@ serde = { version = "1.0", features = ["derive"], optional = true }
1111
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
1212

1313
# Substrate primitives
14-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
15-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
16-
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
17-
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
14+
sp-core = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
15+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
16+
sp-std = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
17+
frame-support = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1818

1919
# ChainX primitives
2020
chainx-primitives = { path = "../../../primitives", default-features = false }

‎primitives/gateway/common/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xp-gateway-common"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

@@ -11,8 +11,8 @@ hex = { version = "0.4", default-features = false }
1111
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
1212

1313
# Substrate primitives
14-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
15-
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
14+
sp-core = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
15+
frame-support = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1616

1717
# ChainX primitives
1818
xp-io = { path = "../../io", default-features = false, optional = true }

‎primitives/genesis-builder/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xp-genesis-builder"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

‎primitives/io/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[package]
22
name = "xp-io"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

77
[dependencies]
88
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
99

1010
# Substrate primitives
11-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
12-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
13-
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
11+
sp-core = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
12+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
13+
sp-runtime-interface = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1414

1515
[dev-dependencies]
1616
hex = "0.4"

‎primitives/mining/common/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
22
name = "xp-mining-common"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

77
[dependencies]
88
# Substrate primitives
9-
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
10-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
9+
sp-arithmetic = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
10+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1111

1212
# ChainX primitives
1313
chainx-primitives = { path = "../../../primitives", default-features = false }

‎primitives/mining/staking/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
22
name = "xp-mining-staking"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

77
[dependencies]
88
# Substrate primitives
9-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
10-
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
9+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
10+
sp-std = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1111

1212
# ChainX primitives
1313
chainx-primitives = { path = "../../../primitives", default-features = false }

‎primitives/protocol/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xp-protocol"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

@@ -10,7 +10,7 @@ serde = { version = "1.0", features = ["derive"], optional = true }
1010
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
1111

1212
# Substrate primitives
13-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
13+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1414

1515
# ChainX primitives
1616
chainx-primitives = { path = "..", default-features = false }

‎primitives/rpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xp-rpc"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

‎primitives/runtime/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xp-runtime"
3-
version = "5.1.1"
3+
version = "5.2.0"
44
authors = ["The ChainX Authors"]
55
edition = "2021"
66

@@ -10,9 +10,9 @@ serde = { version = "1.0", optional = true, features = ["derive"] }
1010
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
1111

1212
# Substrate primitives
13-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
14-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
15-
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
13+
sp-core = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
14+
sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
15+
sp-std = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false }
1616

1717
# EVM
1818
fp-rpc = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc", default-features = false }

0 commit comments

Comments
 (0)