Skip to content

Commit

Permalink
Fixed Multiple pending forced authority set changes are not allowed I… (
Browse files Browse the repository at this point in the history 
#393)

* Fixed Multiple pending forced authority set changes are not allowed Issue.

* Moved the change from marko/substrate to avail/substrate
  • Loading branch information
@markopoloparadox
markopoloparadox authored Jan 31, 2024
1 parent f9a6b6b commit b514ad4
Show file tree
Hide file tree
Showing 24 changed files with 460 additions and 460 deletions.
312 changes: 156 additions & 156 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ members = [
]


[patch."https://github.com/paritytech/substrate.git"]
[patch."https://github.com/availproject/substrate.git"]
frame-executive = { path = "pallets/executive" }
frame-system = { path = "pallets/system" }
frame-system-benchmarking = { path = "pallets/system/benchmarking" }
Expand Down
16 changes: 8 additions & 8 deletions avail-subxt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ curve25519-dalek = "2.1.3"
schnorrkel = "0.9.1"
serde = { version = "1", features = ["derive"] }
serde-hex = "0.1"
avail-core = { git = "https://github.com/availproject/avail-core", tag = "node-v1.9.0.0", features = ["serde"]}
avail-core = { git = "https://github.com/availproject/avail-core", tag = "core-goldberg-v1.10.0.0", features = ["serde"]}

# Substrate
subxt = { version = "0.29" }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-core = { git = "https://github.com/availproject/substrate.git", branch = "goldberg", default-features = false }
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = [
"derive",
"full",
Expand All @@ -56,16 +56,16 @@ serde_json = "1.0"
indicatif = "0.17"

# Substrate
sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-keyring = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }


# Dependency `subxt` uses it's own 'version' of sp-core so we need to patch it :)
[patch.crates-io]
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-core-hashing = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-core = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-io = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-runtime = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-std = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-core-hashing = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }


[features]
Expand Down
6 changes: 3 additions & 3 deletions base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ edition = "2021"

[dependencies]
# Our crates
avail-core = { git = "https://github.com/availproject/avail-core", tag = "node-v1.9.0.0", default-features = false, features = ["runtime"] }
kate = { git = "https://github.com/availproject/avail-core", tag = "node-v1.9.0.0", default-features = false }
avail-core = { git = "https://github.com/availproject/avail-core", tag = "core-goldberg-v1.10.0.0", default-features = false, features = ["runtime"] }
kate = { git = "https://github.com/availproject/avail-core", tag = "core-goldberg-v1.10.0.0", default-features = false }

# Substrate related
substrate-prometheus-endpoint = { version = "0.10.0-dev", optional = true }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-std = { git = "https://github.com/availproject/substrate.git", branch = "goldberg", default-features = false }

# 3rd-party
log = "0.4.17"
Expand Down
20 changes: 10 additions & 10 deletions e2e/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ edition = "2021"
[dependencies]
avail-subxt = { path = "../avail-subxt" }
async-std = { version = "1.12.0", features = ["attributes", "tokio1"] }
sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-keyring = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
subxt = "0.29"
anyhow = "1.0.66"
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full", "bit-vec"] }
kate-recovery = { git = "https://github.com/availproject/avail-core", tag = "node-v1.9.0.0" }
kate = { git = "https://github.com/availproject/avail-core", tag = "node-v1.9.0.0" }
avail-core = { git = "https://github.com/availproject/avail-core", tag = "node-v1.9.0.0" }
binary-merkle-tree = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
kate-recovery = { git = "https://github.com/availproject/avail-core", tag = "core-goldberg-v1.10.0.0" }
kate = { git = "https://github.com/availproject/avail-core", tag = "core-goldberg-v1.10.0.0" }
avail-core = { git = "https://github.com/availproject/avail-core", tag = "core-goldberg-v1.10.0.0" }
binary-merkle-tree = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"] }


# Dependency `subxt` uses it's own 'version' of sp-core so we need to patch it :)
[patch.crates-io]
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-core-hashing = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-core = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-io = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-runtime = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-std = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-core-hashing = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
122 changes: 61 additions & 61 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ name = "data-avail"
avail-base = { path = "../base" }

# Internals
avail-core = { git = "https://github.com/availproject/avail-core", tag = "node-v1.9.0.0", default-features = false, features = ["runtime"] }
kate = { git = "https://github.com/availproject/avail-core", tag = "node-v1.9.0.0", default-features = false }
avail-core = { git = "https://github.com/availproject/avail-core", tag = "core-goldberg-v1.10.0.0", default-features = false, features = ["runtime"] }
kate = { git = "https://github.com/availproject/avail-core", tag = "core-goldberg-v1.10.0.0", default-features = false }
da-runtime = { path = "../runtime" }
da-control = { path = "../pallets/dactr" }
kate-rpc = { path = "../rpc/kate-rpc" }
Expand All @@ -47,86 +47,86 @@ async-trait = "0.1.60"

# Substrate
## Primitives
sc-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-statement-store = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-executor = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-storage-monitor = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-telemetry = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-offchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-cli = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-io = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-statement-store = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-core = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-executor = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-service = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-storage-monitor = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-telemetry = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-keystore = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-keystore = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-keyring = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-transaction-pool = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-transaction-pool = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-inherents = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-transaction-pool-api = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-transaction-storage-proof = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-consensus-babe-rpc = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-consensus-babe = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-consensus = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-consensus = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-offchain = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
# Renamed: (https://github.com/paritytech/substrate/pull/13458)
sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-consensus-babe = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-consensus-slots = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-network = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-authority-discovery = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-authority-discovery = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-client-db = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-block-builder = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-sysinfo = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-network-common = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-network-sync = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-consensus-grandpa-rpc = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-consensus-grandpa = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-consensus-grandpa = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-client-api = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-runtime = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-timestamp = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-consensus-babe = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-consensus-slots = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-network = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-authority-discovery = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-authority-discovery = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-chain-spec = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-client-db = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-blockchain = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-block-builder = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-basic-authorship = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-sync-state-rpc = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-api = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-sysinfo = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-network-common = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-network-sync = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
primitive-types = "0.12.0"

# FRAME
pallet-im-online = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
pallet-im-online = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
frame-system = { path = "../pallets/system" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
mmr-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
pallet-transaction-payment = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
frame-support = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
mmr-rpc = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }

# These dependencies are used for the node template's RPCs
sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-rpc-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-rpc-spec-v2 = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sc-rpc = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sp-rpc = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-rpc-api = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
sc-rpc-spec-v2 = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
substrate-frame-rpc-system = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
pallet-transaction-payment-rpc = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
substrate-state-trie-migration-rpc = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
substrate-prometheus-endpoint = "0.10.0-dev"

# These dependencies are used for runtime benchmarking
frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
frame-benchmarking = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
frame-benchmarking-cli = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }

# Try-runtime
try-runtime-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", optional = true }
try-runtime-cli = { git = "https://github.com/availproject/substrate.git", branch = "goldberg", optional = true }

# Custom
frame-system-rpc-runtime-api = { path = "../pallets/system/rpc/runtime-api" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
substrate-build-script-utils = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
clap = { version = "4.0.9", optional = true }
clap_complete = { version = "4.0.2", optional = true }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", optional = true }
frame-benchmarking-cli = { git = "https://github.com/availproject/substrate.git", branch = "goldberg", optional = true }

[dev-dependencies]
sp-tracing = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-tracing = { git = "https://github.com/availproject/substrate.git", branch = "goldberg" }
tempfile = "3.1.0"

[features]
Expand Down
Loading

0 comments on commit b514ad4

Please sign in to comment.