From 7be75e8c098f4e309081bcd53a28692e40f3e6ef Mon Sep 17 00:00:00 2001 From: frank0528 <963688200@qq.com> Date: Wed, 19 Nov 2025 09:44:58 +0800 Subject: [PATCH 1/6] fix grandpa proof API --- runtime/src/lib.rs | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index a7fbd08d..926e4cc4 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -69,7 +69,7 @@ use pallet_evm::{ EnsureAddressRoot, EvmConfig, FeeCalculator, GasWeightMapping, HashedAddressMapping, OnChargeEVMTransaction as OnChargeEVMTransactionT, Runner, }; -use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId}; +use pallet_grandpa::{AuthorityId as GrandpaId}; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_nfts::PalletFeatures; use pallet_session::historical::{self as pallet_session_historical}; @@ -1909,23 +1909,27 @@ impl_runtime_apis! { } fn submit_report_equivocation_unsigned_extrinsic( - _equivocation_proof: sp_consensus_grandpa::EquivocationProof< + equivocation_proof: sp_consensus_grandpa::EquivocationProof< ::Hash, NumberFor, >, - _key_owner_proof: sp_consensus_grandpa::OpaqueKeyOwnershipProof, + key_owner_proof: sp_consensus_grandpa::OpaqueKeyOwnershipProof, ) -> Option<()> { - None + let key_owner_proof = key_owner_proof.decode()?; + + Grandpa::submit_unsigned_equivocation_report( + equivocation_proof, + key_owner_proof, + ) } fn generate_key_ownership_proof( _set_id: sp_consensus_grandpa::SetId, - _authority_id: GrandpaId, - ) -> Option { - // NOTE: this is the only implementation possible since we've - // defined our key owner proof type as a bottom type (i.e. a type - // with no values). - None + authority_id: GrandpaId, + ) -> Option { + Historical::prove((sp_consensus_grandpa::KEY_TYPE, authority_id)) + .map(|p| p.encode()) + .map(sp_consensus_grandpa::OpaqueKeyOwnershipProof::new) } } From 791e49d717b2e946a9c33af1e93a96307e394dd3 Mon Sep 17 00:00:00 2001 From: frank0528 <963688200@qq.com> Date: Wed, 19 Nov 2025 11:21:07 +0800 Subject: [PATCH 2/6] update bootnodes --- node/cli/res/dbc-spec-v4.json | 1 + 1 file changed, 1 insertion(+) diff --git a/node/cli/res/dbc-spec-v4.json b/node/cli/res/dbc-spec-v4.json index 3d6b9161..876140c7 100644 --- a/node/cli/res/dbc-spec-v4.json +++ b/node/cli/res/dbc-spec-v4.json @@ -5,6 +5,7 @@ "bootNodes": [ "/ip4/8.214.55.62/tcp/30333/p2p/12D3KooWNKYhbrZuhqxRN6Gb58GXgpVKbfj23wwCZYPBYGgX4XdG", "/ip4/8.214.76.106/tcp/30333/p2p/12D3KooWEqBoakhBZUTsFVL7yy6mUFjup2sVpFaDNiA9ieWcmqPf", + "/ip4/122.99.183.50/tcp/30333/p2p/12D3KooWCM4oi8kz9CbiDR2BV4RdYvFuvCmhdg3uw16uBeTTNgYq", "/ip4/149.7.4.15/tcp/30333/p2p/12D3KooWN9cAnx2UD9hwkYAqLr184S2ZD2EJR15diq4MgkMNzX4C" ], "telemetryEndpoints": [ From 0a5a006eb140c473e7b905acc972111052b3985c Mon Sep 17 00:00:00 2001 From: frank0528 <963688200@qq.com> Date: Wed, 19 Nov 2025 11:21:49 +0800 Subject: [PATCH 3/6] bump 4.0.1 --- Cargo.lock | 142 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61a30939..dabb78d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -980,7 +980,7 @@ dependencies = [ [[package]] name = "committee" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "frame-benchmarking", @@ -1000,7 +1000,7 @@ dependencies = [ [[package]] name = "committee-rpc" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "committee", "committee-runtime-api", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "committee-runtime-api" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "committee", "parity-scale-codec", @@ -1081,7 +1081,7 @@ dependencies = [ [[package]] name = "council-reward" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-price-ocw", "dbc-support", @@ -1471,7 +1471,7 @@ dependencies = [ [[package]] name = "dbc" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-cli", "sc-cli", @@ -1479,7 +1479,7 @@ dependencies = [ [[package]] name = "dbc-cli" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "array-bytes", "clap", @@ -1572,7 +1572,7 @@ dependencies = [ [[package]] name = "dbc-client-evm-tracing" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-primitives-rpc-debug", "dbc-primitives-rpc-evm-tracing-events", @@ -1586,7 +1586,7 @@ dependencies = [ [[package]] name = "dbc-client-rpc-core-debug" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-client-evm-tracing", "dbc-client-rpc-core-types", @@ -1600,7 +1600,7 @@ dependencies = [ [[package]] name = "dbc-client-rpc-core-trace" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-client-evm-tracing", "dbc-client-rpc-core-types", @@ -1613,7 +1613,7 @@ dependencies = [ [[package]] name = "dbc-client-rpc-core-txpool" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "ethereum", "ethereum-types", @@ -1625,7 +1625,7 @@ dependencies = [ [[package]] name = "dbc-client-rpc-core-types" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "ethereum-types", "serde", @@ -1634,7 +1634,7 @@ dependencies = [ [[package]] name = "dbc-client-rpc-debug" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-client-evm-tracing", "dbc-client-rpc-core-debug", @@ -1663,7 +1663,7 @@ dependencies = [ [[package]] name = "dbc-client-rpc-trace" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-client-evm-tracing", "dbc-client-rpc-core-trace", @@ -1698,7 +1698,7 @@ dependencies = [ [[package]] name = "dbc-client-rpc-txpool" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-client-rpc-core-txpool", "dbc-primitives-rpc-txpool", @@ -1720,7 +1720,7 @@ dependencies = [ [[package]] name = "dbc-evm-tracer" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-primitives-ext", "dbc-primitives-rpc-evm-tracing-events", @@ -1739,7 +1739,7 @@ dependencies = [ [[package]] name = "dbc-node-common" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "clap", "dbc-client-rpc-debug", @@ -1775,7 +1775,7 @@ dependencies = [ [[package]] name = "dbc-price-ocw" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "frame-support", @@ -1794,7 +1794,7 @@ dependencies = [ [[package]] name = "dbc-primitives" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "frame-system", "parity-scale-codec", @@ -1805,7 +1805,7 @@ dependencies = [ [[package]] name = "dbc-primitives-ext" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-primitives-rpc-evm-tracing-events", "ethereum-types", @@ -1817,7 +1817,7 @@ dependencies = [ [[package]] name = "dbc-primitives-rpc-debug" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "environmental", "ethereum", @@ -1834,7 +1834,7 @@ dependencies = [ [[package]] name = "dbc-primitives-rpc-evm-tracing-events" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "environmental", "ethereum", @@ -1848,7 +1848,7 @@ dependencies = [ [[package]] name = "dbc-primitives-rpc-txpool" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "ethereum", "parity-scale-codec", @@ -1861,7 +1861,7 @@ dependencies = [ [[package]] name = "dbc-runtime" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "array-bytes", "committee", @@ -1940,8 +1940,8 @@ dependencies = [ "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", - "pallet-staking 4.0.0-dev", - "pallet-staking-reward-curve 4.0.0-dev", + "pallet-staking 4.0.1-dev", + "pallet-staking-reward-curve 4.0.1-dev", "pallet-staking-runtime-api", "pallet-sudo", "pallet-timestamp", @@ -1979,7 +1979,7 @@ dependencies = [ [[package]] name = "dbc-support" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "bs58", "frame-support", @@ -2149,7 +2149,7 @@ dependencies = [ [[package]] name = "dlc-price-ocw" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "frame-support", @@ -2426,7 +2426,7 @@ dependencies = [ [[package]] name = "eth-precompile-whitelist" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "frame-support", "frame-system", @@ -2570,7 +2570,7 @@ dependencies = [ [[package]] name = "evm-macro" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "proc-macro2", "quote", @@ -3522,7 +3522,7 @@ dependencies = [ [[package]] name = "generic-func" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "frame-support", @@ -5092,7 +5092,7 @@ dependencies = [ [[package]] name = "maintain-committee" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "committee", "dbc-price-ocw", @@ -5713,7 +5713,7 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "online-committee" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "committee", "dbc-price-ocw", @@ -5741,7 +5741,7 @@ dependencies = [ [[package]] name = "online-committee-rpc" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "jsonrpsee", @@ -5755,7 +5755,7 @@ dependencies = [ [[package]] name = "online-committee-runtime-api" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "online-committee", @@ -5766,7 +5766,7 @@ dependencies = [ [[package]] name = "online-profile" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "frame-support", @@ -5783,7 +5783,7 @@ dependencies = [ [[package]] name = "online-profile-rpc" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "jsonrpsee", @@ -5797,7 +5797,7 @@ dependencies = [ [[package]] name = "online-profile-runtime-api" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "online-profile", @@ -5883,7 +5883,7 @@ dependencies = [ [[package]] name = "pallet-assets" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "frame-benchmarking", "frame-support", @@ -6349,7 +6349,7 @@ dependencies = [ [[package]] name = "pallet-nfts" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6393,7 +6393,7 @@ dependencies = [ "frame-system", "pallet-bags-list", "pallet-nomination-pools", - "pallet-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "pallet-staking 4.0.0-dev", "parity-scale-codec", "scale-info", "sp-runtime", @@ -6446,7 +6446,7 @@ dependencies = [ "pallet-im-online", "pallet-offences", "pallet-session", - "pallet-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "pallet-staking 4.0.0-dev", "parity-scale-codec", "scale-info", "sp-runtime", @@ -6548,7 +6548,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "pallet-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "pallet-staking 4.0.0-dev", "rand 0.8.5", "sp-runtime", "sp-session", @@ -6558,81 +6558,81 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" dependencies = [ - "dbc-support", "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", "pallet-authorship", - "pallet-bags-list", - "pallet-balances", "pallet-session", - "pallet-staking-reward-curve 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "pallet-timestamp", "parity-scale-codec", - "rand_chacha 0.3.1", + "rand_chacha 0.2.2", "scale-info", "serde", - "sp-core", + "sp-application-crypto", "sp-io", - "sp-npos-elections", "sp-runtime", "sp-staking", "sp-std", - "sp-tracing", - "substrate-test-utils", ] [[package]] name = "pallet-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "4.0.1-dev" dependencies = [ + "dbc-support", "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", "pallet-authorship", + "pallet-bags-list", + "pallet-balances", "pallet-session", + "pallet-staking-reward-curve 4.0.0-dev", + "pallet-timestamp", "parity-scale-codec", - "rand_chacha 0.2.2", + "rand_chacha 0.3.1", "scale-info", "serde", - "sp-application-crypto", + "sp-core", "sp-io", + "sp-npos-elections", "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", + "substrate-test-utils", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "sp-runtime", - "syn 1.0.109", + "syn 2.0.79", ] [[package]] name = "pallet-staking-reward-curve" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "4.0.1-dev" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.79", + "sp-runtime", + "syn 1.0.109", ] [[package]] name = "pallet-staking-runtime-api" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "parity-scale-codec", "sp-api", @@ -7685,7 +7685,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rent-machine" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "committee", "dbc-price-ocw", @@ -7713,7 +7713,7 @@ dependencies = [ [[package]] name = "rent-machine-rpc" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "jsonrpsee", @@ -7726,7 +7726,7 @@ dependencies = [ [[package]] name = "rent-machine-runtime-api" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "parity-scale-codec", @@ -9535,7 +9535,7 @@ dependencies = [ [[package]] name = "simple-rpc" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "frame-support", @@ -9550,7 +9550,7 @@ dependencies = [ [[package]] name = "simple-rpc-rpc" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "jsonrpsee", @@ -9564,7 +9564,7 @@ dependencies = [ [[package]] name = "simple-rpc-runtime-api" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "parity-scale-codec", "simple-rpc", @@ -10805,7 +10805,7 @@ dependencies = [ [[package]] name = "terminating-rental" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "committee", "dbc-price-ocw", @@ -10829,7 +10829,7 @@ dependencies = [ [[package]] name = "terminating-rental-rpc" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "jsonrpsee", @@ -10843,7 +10843,7 @@ dependencies = [ [[package]] name = "terminating-rental-runtime-api" -version = "4.0.0-dev" +version = "4.0.1-dev" dependencies = [ "dbc-support", "parity-scale-codec", diff --git a/Cargo.toml b/Cargo.toml index 8161df5d..99552cd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "4.0.0-dev" +version = "4.0.1-dev" authors = ["DeepBrainChain Developers"] repository = "https://github.com/DeepBrainChain/DeepBrainChain-MainChain" From 050175f857273200a06e2c6701103f5504295e92 Mon Sep 17 00:00:00 2001 From: frank0528 <963688200@qq.com> Date: Wed, 19 Nov 2025 11:28:47 +0800 Subject: [PATCH 4/6] fix --- runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 926e4cc4..734064f0 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -69,7 +69,7 @@ use pallet_evm::{ EnsureAddressRoot, EvmConfig, FeeCalculator, GasWeightMapping, HashedAddressMapping, OnChargeEVMTransaction as OnChargeEVMTransactionT, Runner, }; -use pallet_grandpa::{AuthorityId as GrandpaId}; +use pallet_grandpa::AuthorityId as GrandpaId; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_nfts::PalletFeatures; use pallet_session::historical::{self as pallet_session_historical}; From dad3c9cea85e450ee8a02bb2ff328414f0cd43db Mon Sep 17 00:00:00 2001 From: frank0528 <963688200@qq.com> Date: Wed, 19 Nov 2025 11:46:43 +0800 Subject: [PATCH 5/6] format --- node/cli/res/dbc-spec-v4.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/node/cli/res/dbc-spec-v4.json b/node/cli/res/dbc-spec-v4.json index 876140c7..5786cd7e 100644 --- a/node/cli/res/dbc-spec-v4.json +++ b/node/cli/res/dbc-spec-v4.json @@ -4,9 +4,9 @@ "chainType": "Live", "bootNodes": [ "/ip4/8.214.55.62/tcp/30333/p2p/12D3KooWNKYhbrZuhqxRN6Gb58GXgpVKbfj23wwCZYPBYGgX4XdG", - "/ip4/8.214.76.106/tcp/30333/p2p/12D3KooWEqBoakhBZUTsFVL7yy6mUFjup2sVpFaDNiA9ieWcmqPf", - "/ip4/122.99.183.50/tcp/30333/p2p/12D3KooWCM4oi8kz9CbiDR2BV4RdYvFuvCmhdg3uw16uBeTTNgYq", - "/ip4/149.7.4.15/tcp/30333/p2p/12D3KooWN9cAnx2UD9hwkYAqLr184S2ZD2EJR15diq4MgkMNzX4C" + "/ip4/8.214.76.106/tcp/30333/p2p/12D3KooWEqBoakhBZUTsFVL7yy6mUFjup2sVpFaDNiA9ieWcmqPf", + "/ip4/122.99.183.50/tcp/30333/p2p/12D3KooWCM4oi8kz9CbiDR2BV4RdYvFuvCmhdg3uw16uBeTTNgYq", + "/ip4/149.7.4.15/tcp/30333/p2p/12D3KooWN9cAnx2UD9hwkYAqLr184S2ZD2EJR15diq4MgkMNzX4C" ], "telemetryEndpoints": [ [ From e7e4e946d81438dafd9fe28c590cdfba47192f01 Mon Sep 17 00:00:00 2001 From: frank0528 <963688200@qq.com> Date: Wed, 19 Nov 2025 11:50:22 +0800 Subject: [PATCH 6/6] bump 407 runtime --- runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 734064f0..1315b8c8 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -155,7 +155,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // and set impl_version to 0. If only runtime // implementation changes and behavior does not, then leave spec_version as // is and increment impl_version. - spec_version: 406, + spec_version: 407, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1,