From fa02c50af61ebead272c993cd7034a86d847df52 Mon Sep 17 00:00:00 2001 From: Erwan Renaut <73958772+renauter@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:43:28 -0300 Subject: [PATCH 1/7] Use transferKeepAlive in balance.js --- clients/tfchain-client-js/lib/balance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/tfchain-client-js/lib/balance.js b/clients/tfchain-client-js/lib/balance.js index 66e08e41a..ad4946002 100644 --- a/clients/tfchain-client-js/lib/balance.js +++ b/clients/tfchain-client-js/lib/balance.js @@ -13,7 +13,7 @@ async function transfer (self, address, amount, callback) { throw Error('You must pass a valid numeric amount') } - const transfer = self.api.tx.balances.transfer(address, amount) + const transfer = self.api.tx.balances.transferKeepAlive(address, amount) const nonce = await self.api.rpc.system.accountNextIndex(self.address) return transfer.signAndSend(self.key, { nonce }, callback) From 3ceb72d306a95f8ff844b57af7b05fa6a762975b Mon Sep 17 00:00:00 2001 From: renauter Date: Tue, 3 Sep 2024 10:23:24 -0300 Subject: [PATCH 2/7] use transferAllowDeath instead of transferKeepAlive --- clients/tfchain-client-go/transfer.go | 2 +- clients/tfchain-client-js/lib/balance.js | 2 +- .../pallets/pallet-smart-contract/src/service_contract.rs | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/clients/tfchain-client-go/transfer.go b/clients/tfchain-client-go/transfer.go index ec50f1a9b..d991b52ce 100644 --- a/clients/tfchain-client-go/transfer.go +++ b/clients/tfchain-client-go/transfer.go @@ -19,7 +19,7 @@ func (s *Substrate) Transfer(identity Identity, amount uint64, destination Accou } bal := big.NewInt(int64(amount)) - c, err := types.NewCall(meta, "Balances.transfer_keep_alive", dest, types.NewUCompact(bal)) + c, err := types.NewCall(meta, "Balances.transfer_allow_death", dest, types.NewUCompact(bal)) if err != nil { panic(err) } diff --git a/clients/tfchain-client-js/lib/balance.js b/clients/tfchain-client-js/lib/balance.js index ad4946002..9f2924d45 100644 --- a/clients/tfchain-client-js/lib/balance.js +++ b/clients/tfchain-client-js/lib/balance.js @@ -13,7 +13,7 @@ async function transfer (self, address, amount, callback) { throw Error('You must pass a valid numeric amount') } - const transfer = self.api.tx.balances.transferKeepAlive(address, amount) + const transfer = self.api.tx.balances.transferAllowDeath(address, amount) const nonce = await self.api.rpc.system.accountNextIndex(self.address) return transfer.signAndSend(self.key, { nonce }, callback) diff --git a/substrate-node/pallets/pallet-smart-contract/src/service_contract.rs b/substrate-node/pallets/pallet-smart-contract/src/service_contract.rs index 18d98f91f..5637c36e5 100644 --- a/substrate-node/pallets/pallet-smart-contract/src/service_contract.rs +++ b/substrate-node/pallets/pallet-smart-contract/src/service_contract.rs @@ -376,11 +376,10 @@ impl Pallet { } // Transfer amount due from consumer account to service account - ::Currency::transfer( + ::Currency::transfer_allow_death( &consumer_twin.account_id, &service_twin.account_id, amount, - ExistenceRequirement::KeepAlive, )?; log::debug!( From b818a514c2f662ecb885d12a980d449dffb5a793 Mon Sep 17 00:00:00 2001 From: renauter Date: Tue, 3 Sep 2024 11:17:28 -0300 Subject: [PATCH 3/7] go back to service contract transfer --- .../pallets/pallet-smart-contract/src/service_contract.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/substrate-node/pallets/pallet-smart-contract/src/service_contract.rs b/substrate-node/pallets/pallet-smart-contract/src/service_contract.rs index 5637c36e5..df7f16d6a 100644 --- a/substrate-node/pallets/pallet-smart-contract/src/service_contract.rs +++ b/substrate-node/pallets/pallet-smart-contract/src/service_contract.rs @@ -376,10 +376,11 @@ impl Pallet { } // Transfer amount due from consumer account to service account - ::Currency::transfer_allow_death( + ::Currency::transfer( &consumer_twin.account_id, &service_twin.account_id, amount, + ExistenceRequirement::AllowDeath, )?; log::debug!( From 984627a4340a9989456ae1a8b81d89b03346ec84 Mon Sep 17 00:00:00 2001 From: renauter Date: Tue, 3 Sep 2024 11:26:11 -0300 Subject: [PATCH 4/7] skip check-benchmark-weights From 85a8974bd0629e97dea4e88c7d295c401d4f4294 Mon Sep 17 00:00:00 2001 From: Erwan Renaut <73958772+renauter@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:59:22 -0300 Subject: [PATCH 5/7] chore(polkadot): upgrade to v1.2.0 (#905) --- substrate-node/Cargo.lock | 298 +++++++++--------- substrate-node/Cargo.toml | 144 ++++----- substrate-node/node/src/command.rs | 1 - substrate-node/node/src/service.rs | 1 + .../pallets/pallet-smart-contract/src/mock.rs | 4 +- .../pallet-smart-contract/src/tests.rs | 86 +++-- .../pallet-tft-bridge/src/migrations/v2.rs | 11 +- substrate-node/runtime/Cargo.toml | 4 +- substrate-node/runtime/src/lib.rs | 11 + 9 files changed, 296 insertions(+), 264 deletions(-) diff --git a/substrate-node/Cargo.lock b/substrate-node/Cargo.lock index a284cc150..68a68d8c6 100644 --- a/substrate-node/Cargo.lock +++ b/substrate-node/Cargo.lock @@ -315,24 +315,10 @@ dependencies = [ "parity-scale-codec 3.6.9", ] -[[package]] -name = "ark-scale" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-serialize", - "ark-std", - "parity-scale-codec 3.6.9", - "scale-info", -] - [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" dependencies = [ "ark-ec", "ark-ff", @@ -380,7 +366,7 @@ dependencies = [ [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" dependencies = [ "ark-ff", "ark-serialize", @@ -573,13 +559,12 @@ dependencies = [ [[package]] name = "bandersnatch_vrfs" version = "0.0.1" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" dependencies = [ "ark-bls12-381", "ark-ec", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", - "ark-scale 0.0.12", "ark-serialize", "ark-std", "dleq_vrf", @@ -1076,7 +1061,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895" dependencies = [ "ark-ec", "ark-ff", @@ -1085,6 +1070,7 @@ dependencies = [ "ark-std", "fflonk", "merlin 3.0.0", + "rand_chacha 0.3.1", ] [[package]] @@ -1608,9 +1594,9 @@ dependencies = [ [[package]] name = "directories" -version = "4.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] @@ -1627,13 +1613,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1661,11 +1648,11 @@ dependencies = [ [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" dependencies = [ "ark-ec", "ark-ff", - "ark-scale 0.0.10", + "ark-scale", "ark-secret-scalar", "ark-serialize", "ark-std", @@ -2062,7 +2049,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", ] @@ -2085,7 +2072,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-support", "frame-support-procedural", @@ -2110,7 +2097,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "Inflector", "array-bytes", @@ -2158,7 +2145,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -2169,7 +2156,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2186,7 +2173,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-support", "frame-system", @@ -2216,7 +2203,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-recursion", "futures", @@ -2238,7 +2225,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "aquamarine", "bitflags 1.3.2", @@ -2278,7 +2265,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "Inflector", "cfg-expr", @@ -2296,7 +2283,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -2308,7 +2295,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "proc-macro2", "quote", @@ -2318,7 +2305,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "cfg-if", "frame-support", @@ -2337,7 +2324,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-benchmarking", "frame-support", @@ -2352,7 +2339,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "sp-api", @@ -2361,7 +2348,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-support", "parity-scale-codec 3.6.9", @@ -4542,10 +4529,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-support", "frame-system", @@ -4562,7 +4555,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-support", "frame-system", @@ -4576,7 +4569,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-benchmarking", "frame-support", @@ -4609,7 +4602,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-benchmarking", "frame-support", @@ -4649,7 +4642,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-benchmarking", "frame-support", @@ -4688,7 +4681,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-benchmarking", "frame-support", @@ -4717,7 +4710,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "docify", "frame-benchmarking", @@ -4735,7 +4728,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-support", "frame-system", @@ -4757,7 +4750,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-benchmarking", "frame-support", @@ -4805,7 +4798,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4901,8 +4894,9 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -4920,7 +4914,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-support", "frame-system", @@ -4936,7 +4930,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -4952,7 +4946,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "pallet-transaction-payment", "parity-scale-codec 3.6.9", @@ -4964,7 +4958,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-benchmarking", "frame-support", @@ -5925,13 +5919,14 @@ dependencies = [ [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895" dependencies = [ "ark-ec", "ark-ff", "ark-poly", "ark-serialize", "ark-std", + "blake2", "common", "fflonk", "merlin 3.0.0", @@ -6174,7 +6169,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "log", "sp-core", @@ -6185,7 +6180,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "futures", "futures-timer", @@ -6208,7 +6203,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "sc-client-api", @@ -6223,7 +6218,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -6242,7 +6237,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -6253,7 +6248,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", "chrono", @@ -6292,7 +6287,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "fnv", "futures", @@ -6312,13 +6307,14 @@ dependencies = [ "sp-state-machine", "sp-statement-store", "sp-storage", + "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "hash-db", "kvdb", @@ -6344,7 +6340,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "futures", @@ -6369,7 +6365,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "futures", @@ -6398,7 +6394,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "ahash 0.8.7", "array-bytes", @@ -6439,7 +6435,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "futures", @@ -6462,7 +6458,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "parking_lot 0.12.1", @@ -6484,7 +6480,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -6496,7 +6492,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "anyhow", "cfg-if", @@ -6513,7 +6509,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "ansi_term", "futures", @@ -6529,7 +6525,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", "parking_lot 0.12.1", @@ -6543,7 +6539,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", "async-channel", @@ -6584,7 +6580,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-channel", "cid", @@ -6604,7 +6600,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -6621,7 +6617,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "ahash 0.8.7", "futures", @@ -6639,7 +6635,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", "async-channel", @@ -6660,7 +6656,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", "async-channel", @@ -6694,7 +6690,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", "futures", @@ -6712,7 +6708,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", "bytes", @@ -6746,7 +6742,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6755,7 +6751,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "futures", "jsonrpsee", @@ -6786,7 +6782,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "jsonrpsee", "parity-scale-codec 3.6.9", @@ -6805,7 +6801,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "http", "jsonrpsee", @@ -6820,7 +6816,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", "futures", @@ -6848,7 +6844,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "directories", @@ -6912,7 +6908,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "log", "parity-scale-codec 3.6.9", @@ -6923,7 +6919,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "futures", "libc", @@ -6942,7 +6938,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "chrono", "futures", @@ -6961,7 +6957,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "ansi_term", "atty", @@ -6990,7 +6986,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -7001,7 +6997,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "futures", @@ -7027,7 +7023,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "futures", @@ -7043,7 +7039,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-channel", "futures", @@ -7474,7 +7470,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "hash-db", "log", @@ -7495,7 +7491,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "Inflector", "blake2", @@ -7509,7 +7505,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "scale-info", @@ -7522,7 +7518,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "integer-sqrt", "num-traits", @@ -7536,7 +7532,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "sp-api", "sp-inherents", @@ -7547,7 +7543,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "futures", "log", @@ -7565,7 +7561,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "futures", @@ -7580,7 +7576,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "parity-scale-codec 3.6.9", @@ -7597,7 +7593,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "parity-scale-codec 3.6.9", @@ -7616,7 +7612,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "finality-grandpa", "log", @@ -7634,7 +7630,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "scale-info", @@ -7646,10 +7642,9 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "array-bytes", - "arrayvec 0.7.4", "bandersnatch_vrfs", "bitflags 1.3.2", "blake2", @@ -7693,7 +7688,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "blake2b_simd", "byteorder", @@ -7706,7 +7701,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "quote", "sp-core-hashing", @@ -7716,7 +7711,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -7725,7 +7720,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "proc-macro2", "quote", @@ -7735,7 +7730,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "environmental", "parity-scale-codec 3.6.9", @@ -7746,7 +7741,7 @@ dependencies = [ [[package]] name = "sp-genesis-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "serde_json", "sp-api", @@ -7757,7 +7752,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -7771,7 +7766,7 @@ dependencies = [ [[package]] name = "sp-io" version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "bytes", "ed25519-dalek", @@ -7795,7 +7790,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "lazy_static", "sp-core", @@ -7806,7 +7801,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.27.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "parking_lot 0.12.1", @@ -7818,7 +7813,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "thiserror", "zstd 0.12.4", @@ -7827,7 +7822,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-metadata", "parity-scale-codec 3.6.9", @@ -7838,7 +7833,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "scale-info", @@ -7852,7 +7847,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "sp-api", "sp-core", @@ -7862,7 +7857,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "backtrace", "lazy_static", @@ -7872,7 +7867,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "rustc-hash", "serde", @@ -7882,7 +7877,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "either", "hash256-std-hasher", @@ -7904,7 +7899,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -7922,7 +7917,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -7934,7 +7929,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "scale-info", @@ -7949,7 +7944,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec 3.6.9", @@ -7963,7 +7958,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.28.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "hash-db", "log", @@ -7984,7 +7979,7 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "aes-gcm", "curve25519-dalek 4.1.1", @@ -8013,12 +8008,12 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#6f [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "impl-serde", "parity-scale-codec 3.6.9", @@ -8031,7 +8026,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "parity-scale-codec 3.6.9", @@ -8044,7 +8039,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "sp-std 8.0.0", @@ -8056,7 +8051,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "sp-api", "sp-runtime", @@ -8065,7 +8060,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "parity-scale-codec 3.6.9", @@ -8080,7 +8075,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "22.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "ahash 0.8.7", "hash-db", @@ -8103,7 +8098,7 @@ dependencies = [ [[package]] name = "sp-version" version = "22.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "impl-serde", "parity-scale-codec 3.6.9", @@ -8120,7 +8115,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "proc-macro2", @@ -8131,7 +8126,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -8144,7 +8139,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "parity-scale-codec 3.6.9", "scale-info", @@ -8307,7 +8302,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" [[package]] name = "substrate-fixed" @@ -8321,7 +8316,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -8340,7 +8335,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "hyper", "log", @@ -8352,7 +8347,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "jsonrpsee", @@ -8400,7 +8395,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "ansi_term", "build-helper", @@ -8604,6 +8599,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -9032,9 +9028,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" +checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" dependencies = [ "hash-db", "hashbrown 0.13.2", @@ -9107,7 +9103,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.1.0#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19" dependencies = [ "async-trait", "clap", diff --git a/substrate-node/Cargo.toml b/substrate-node/Cargo.toml index fe6414578..40fbd27b4 100644 --- a/substrate-node/Cargo.toml +++ b/substrate-node/Cargo.toml @@ -23,7 +23,7 @@ resolver = "2" # External (without extra features and with default disabled if necessary) base58 = {version = "0.2.0", default-features = false} bitflags = {version = "1.3.2", default-features = false} -clap = "4.0.9" +clap = { version = "4.4.4", features = ["derive"] } parity-scale-codec = { version = "3.6.1", default-features = false } env_logger = "0.10.0" futures = {version = "0.3.21", default-features = false} @@ -34,12 +34,13 @@ libsecp256k1 = {version = "0.7", default-features = false} log = "0.4.17" scale-info = {version = "2.5.0", default-features = false} serde = { version = "1.0.144", default-features = false, features = ["derive"] } -serde_json = { version = "1.0", default-features = false, features = ["alloc"] } +serde_json = { version = "1.0.108", default-features = false, features = ["alloc"] } sha3 = {version = "0.10.0", default-features = false} smallvec = "1.8.0" valip = "0.4.0" lite-json = { version = "0.1", default-features = false } parking_lot = '0.11' +libp2p-identity = "0.1.3" # Internal pallets pallet-burning = { path = "pallets/pallet-burning", default-features = false } @@ -60,79 +61,80 @@ tfchain-support = { path = "support", default-features = false } tfchain-runtime = { path = "runtime", default-features = false } # Benchmarking (with default disabled) -frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } +frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } # Substrate (with default disabled) -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-version = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } -sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.1.0" } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } +sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-v1.2.0" } # Client-only (with default enabled) -polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-network = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-service = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } [profile.production] inherits = "release" diff --git a/substrate-node/node/src/command.rs b/substrate-node/node/src/command.rs index 02407f412..46fd3bca7 100644 --- a/substrate-node/node/src/command.rs +++ b/substrate-node/node/src/command.rs @@ -194,7 +194,6 @@ pub fn run() -> sc_cli::Result<()> { } #[cfg(feature = "try-runtime")] Some(Subcommand::TryRuntime) => Err(try_runtime_cli::DEPRECATION_NOTICE.into()), - #[cfg(not(feature = "try-runtime"))] Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \ You can enable it with `--features try-runtime`." diff --git a/substrate-node/node/src/service.rs b/substrate-node/node/src/service.rs index 4f824f347..b6476461b 100644 --- a/substrate-node/node/src/service.rs +++ b/substrate-node/node/src/service.rs @@ -205,6 +205,7 @@ pub fn new_full(config: Configuration) -> Result { import_queue, block_announce_validator_builder: None, warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), + block_relay: None, })?; if config.offchain_worker.enabled { diff --git a/substrate-node/pallets/pallet-smart-contract/src/mock.rs b/substrate-node/pallets/pallet-smart-contract/src/mock.rs index e19775bb9..2a4f00357 100644 --- a/substrate-node/pallets/pallet-smart-contract/src/mock.rs +++ b/substrate-node/pallets/pallet-smart-contract/src/mock.rs @@ -150,7 +150,7 @@ pub const EXISTENTIAL_DEPOSIT: u64 = 500; parameter_types! { pub const MaxLocks: u32 = 50; pub const MaxReserves: u32 = 50; - pub const ExistentialDepositBalance: u64 = EXISTENTIAL_DEPOSIT; + pub const ExistentialDeposit: u64 = EXISTENTIAL_DEPOSIT; } impl pallet_balances::Config for TestRuntime { @@ -162,7 +162,7 @@ impl pallet_balances::Config for TestRuntime { /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; type DustRemoval = (); - type ExistentialDeposit = ExistentialDepositBalance; + type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = pallet_balances::weights::SubstrateWeight; type FreezeIdentifier = (); diff --git a/substrate-node/pallets/pallet-smart-contract/src/tests.rs b/substrate-node/pallets/pallet-smart-contract/src/tests.rs index 8fe7572e9..94c41b6fa 100644 --- a/substrate-node/pallets/pallet-smart-contract/src/tests.rs +++ b/substrate-node/pallets/pallet-smart-contract/src/tests.rs @@ -981,7 +981,8 @@ fn test_node_contract_billing_details() { TFTPriceModule::set_prices(RuntimeOrigin::signed(alice()), 50, 101).unwrap(); - let twin = TfgridModule::twins(2).unwrap(); + let twin_id = 2; + let twin = TfgridModule::twins(twin_id).unwrap(); let initial_twin_balance = Balances::total_balance(&twin.account_id); assert_ok!(SmartContractModule::create_node_contract( @@ -1040,7 +1041,8 @@ fn test_node_contract_billing_works_for_non_existing_accounts() { TFTPriceModule::set_prices(RuntimeOrigin::signed(alice()), 50, 101).unwrap(); - let twin = TfgridModule::twins(2).unwrap(); + let twin_id = 2; + let twin = TfgridModule::twins(twin_id).unwrap(); let initial_twin_balance = Balances::total_balance(&twin.account_id); assert_ok!(SmartContractModule::create_node_contract( @@ -1124,7 +1126,8 @@ fn test_billing_node_contract_in_graceperiod_should_reset_unbilled_network_consu assert_eq!(c1.state, types::ContractState::GracePeriod(11)); // contract payment should be overdrawn - let contract_payment_state = SmartContractModule::contract_payment_state(contract_id).unwrap(); + let contract_payment_state = + SmartContractModule::contract_payment_state(contract_id).unwrap(); assert_ne!(contract_payment_state.get_overdraft(), 0); // amount unbilled should have been reset after adding the amount to the contract overdraft @@ -1148,7 +1151,8 @@ fn test_node_contract_billing_details_with_solution_provider() { TFTPriceModule::set_prices(RuntimeOrigin::signed(alice()), 50, 101).unwrap(); - let twin = TfgridModule::twins(2).unwrap(); + let twin_id = 2; + let twin = TfgridModule::twins(twin_id).unwrap(); let initial_twin_balance = Balances::free_balance(&twin.account_id); let initial_farmer_balance = Balances::free_balance(alice()); @@ -1623,7 +1627,8 @@ fn test_node_contract_billing_cycles_cancel_contract_during_cycle_without_balanc TFTPriceModule::set_prices(RuntimeOrigin::signed(alice()), 50, 101).unwrap(); - let twin = TfgridModule::twins(2).unwrap(); + let twin_id = 2; + let twin = TfgridModule::twins(twin_id).unwrap(); let initial_twin_balance = Balances::free_balance(&twin.account_id); info!("initial twin balance: {:?}", initial_twin_balance); let initial_farmer_balance = Balances::free_balance(alice()); @@ -1637,7 +1642,6 @@ fn test_node_contract_billing_cycles_cancel_contract_during_cycle_without_balanc None )); let contract_id = 1; - let twin_id = 2; push_contract_resources_used(contract_id); let (amount_due_1, discount_received) = calculate_tft_cost(contract_id, twin_id, 10); @@ -1663,7 +1667,7 @@ fn test_node_contract_billing_cycles_cancel_contract_during_cycle_without_balanc info!("total amount billed: {:?}", total_amount_billed); let leave = 1000; - Balances::transfer( + Balances::transfer_allow_death( RuntimeOrigin::signed(bob()), charlie(), initial_twin_balance - total_amount_billed - leave, @@ -1816,7 +1820,7 @@ fn test_restore_node_contract_in_grace_works() { run_to_block(31, Some(&mut pool_state)); run_to_block(41, Some(&mut pool_state)); // Transfer some balance to the owner of the contract to trigger the grace period to stop - Balances::transfer(RuntimeOrigin::signed(bob()), charlie(), 100000000).unwrap(); + Balances::transfer_allow_death(RuntimeOrigin::signed(bob()), charlie(), 100000000).unwrap(); run_to_block(52, Some(&mut pool_state)); run_to_block(62, Some(&mut pool_state)); @@ -2009,6 +2013,7 @@ fn test_rent_contract_billing() { node_id, None )); + let twin_id = 2; let contract_id = 1; let contract = SmartContractModule::contracts(contract_id).unwrap(); @@ -2038,7 +2043,7 @@ fn test_rent_contract_billing() { run_to_block(21, Some(&mut pool_state)); // should bill partial cycle 2 [15-21], 6 blocks - let (amount_due_as_u128, discount_received) = calculate_tft_cost(contract_id, 2, 6); + let (amount_due_as_u128, discount_received) = calculate_tft_cost(contract_id, twin_id, 6); assert_ne!(amount_due_as_u128, 0); check_report_cost(contract_id, amount_due_as_u128, 21, discount_received); @@ -2075,7 +2080,7 @@ fn test_rent_contract_billing() { run_to_block(51, Some(&mut pool_state)); // should bill partial cycle 5 [45-51], 6 blocks - let (amount_due_as_u128, discount_received) = calculate_tft_cost(contract_id, 2, 6); + let (amount_due_as_u128, discount_received) = calculate_tft_cost(contract_id, twin_id, 6); assert_ne!(amount_due_as_u128, 0); check_report_cost(contract_id, amount_due_as_u128, 51, discount_received); }); @@ -2159,6 +2164,7 @@ fn test_rent_contract_billing_cancel_should_bill_reserved_balance() { node_id, None )); + let twin_id = 2; let contract_id = 1; let contract = SmartContractModule::contracts(contract_id).unwrap(); @@ -2173,7 +2179,8 @@ fn test_rent_contract_billing_cancel_should_bill_reserved_balance() { .should_call_bill_contract(contract_id, Ok(Pays::Yes.into()), 11); run_to_block(11, Some(&mut pool_state)); - let (amount_due_1_as_u128, discount_received) = calculate_tft_cost(contract_id, 2, 10); + let (amount_due_1_as_u128, discount_received) = + calculate_tft_cost(contract_id, twin_id, 10); assert_ne!(amount_due_1_as_u128, 0); check_report_cost( contract_id, @@ -2182,7 +2189,7 @@ fn test_rent_contract_billing_cancel_should_bill_reserved_balance() { discount_received.clone(), ); - let twin = TfgridModule::twins(2).unwrap(); + let twin = TfgridModule::twins(twin_id).unwrap(); let total_balance = Balances::total_balance(&twin.account_id); let free_balance = Balances::free_balance(&twin.account_id); assert_ne!(total_balance, free_balance); @@ -2191,16 +2198,16 @@ fn test_rent_contract_billing_cancel_should_bill_reserved_balance() { // cancel contract // it will bill before removing the contract and it should bill all // reserved balance - let (amount_due_2_as_u128, discount_received) = calculate_tft_cost(contract_id, 2, 2); + let (amount_due_2_as_u128, discount_received) = calculate_tft_cost(contract_id, twin_id, 2); assert_ok!(SmartContractModule::cancel_contract( RuntimeOrigin::signed(bob()), contract_id )); - let twin = TfgridModule::twins(2).unwrap(); let usable_balance = Balances::usable_balance(&twin.account_id); assert_ne!(usable_balance, 0); - Balances::transfer(RuntimeOrigin::signed(bob()), alice(), usable_balance).unwrap(); + Balances::transfer_allow_death(RuntimeOrigin::signed(bob()), alice(), usable_balance) + .unwrap(); // Last amount due is not the same as the first one assert_ne!(amount_due_1_as_u128, amount_due_2_as_u128); @@ -2229,9 +2236,10 @@ fn test_rent_contract_overdrawn_and_partial_bill() { node_id, None )); + let twin_id = 3; let contract_id = 1; - let twin = TfgridModule::twins(3).unwrap(); + let twin = TfgridModule::twins(twin_id).unwrap(); let initial_reservable_balance = Balances::usable_balance(&twin.account_id) - EXISTENTIAL_DEPOSIT; @@ -2247,7 +2255,7 @@ fn test_rent_contract_overdrawn_and_partial_bill() { .should_call_bill_contract(contract_id, Ok(Pays::Yes.into()), 11); run_to_block(11, Some(&mut pool_state)); - let (amount_due_per_cycle, _) = calculate_tft_cost(contract_id, 2, 10); + let (amount_due_per_cycle, _) = calculate_tft_cost(contract_id, twin_id, 10); assert_ne!(amount_due_per_cycle, 0); // expect contractPaymentOverdarwn event with partially billed amount @@ -2264,7 +2272,8 @@ fn test_rent_contract_overdrawn_and_partial_bill() { true ); - let contract_payment_state = SmartContractModule::contract_payment_state(contract_id).unwrap(); + let contract_payment_state = + SmartContractModule::contract_payment_state(contract_id).unwrap(); assert_eq!( contract_payment_state.get_reserve(), initial_reservable_balance @@ -2295,7 +2304,8 @@ fn test_rent_contract_overdrawn_and_partial_bill() { ))), true ); - let contract_payment_state = SmartContractModule::contract_payment_state(contract_id).unwrap(); + let contract_payment_state = + SmartContractModule::contract_payment_state(contract_id).unwrap(); assert_eq!( contract_payment_state.get_reserve(), initial_reservable_balance @@ -2307,7 +2317,7 @@ fn test_rent_contract_overdrawn_and_partial_bill() { let should_have_next_cycle = amount_due_per_cycle * 3 - initial_reservable_balance; // transfer some balance to the owner of the contract to trigger the grace period to stop - Balances::transfer( + Balances::transfer_allow_death( RuntimeOrigin::signed(bob()), charlie(), should_have_next_cycle, @@ -2319,7 +2329,8 @@ fn test_rent_contract_overdrawn_and_partial_bill() { .should_call_bill_contract(contract_id, Ok(Pays::Yes.into()), 31); run_to_block(31, Some(&mut pool_state)); - let contract_payment_state = SmartContractModule::contract_payment_state(contract_id).unwrap(); + let contract_payment_state = + SmartContractModule::contract_payment_state(contract_id).unwrap(); assert_eq!( contract_payment_state.get_reserve(), amount_due_per_cycle * 3 @@ -2349,6 +2360,7 @@ fn test_rent_contract_canceled_mid_cycle_should_bill_for_remainder() { node_id, None )); + let twin_id = 2; let contract_id = 1; let contract = SmartContractModule::contracts(contract_id).unwrap(); @@ -2358,14 +2370,14 @@ fn test_rent_contract_canceled_mid_cycle_should_bill_for_remainder() { types::ContractData::RentContract(rent_contract) ); - let twin = TfgridModule::twins(2).unwrap(); + let twin = TfgridModule::twins(twin_id).unwrap(); let reserved_balance = Balances::reserved_balance(&twin.account_id); info!("reserved balance: {:?}", reserved_balance); run_to_block(8, Some(&mut pool_state)); // Calculate the cost for 7 blocks of runtime (created a block 1, canceled at block 8) - let (amount_due_as_u128, discount_received) = calculate_tft_cost(contract_id, 2, 7); + let (amount_due_as_u128, discount_received) = calculate_tft_cost(contract_id, twin_id, 7); // cancel rent contract at block 8 assert_ok!(SmartContractModule::cancel_contract( RuntimeOrigin::signed(bob()), @@ -2380,7 +2392,7 @@ fn test_rent_contract_canceled_mid_cycle_should_bill_for_remainder() { ); // Twin should have no more reserved balance - let twin = TfgridModule::twins(2).unwrap(); + let twin = TfgridModule::twins(twin_id).unwrap(); let reserved_balance = Balances::reserved_balance(&twin.account_id); assert_eq!(reserved_balance, 0); }); @@ -2413,6 +2425,7 @@ fn test_create_rent_contract_and_node_contract_excludes_node_contract_from_billi 0, None )); + let twin_id = 2; let node_contract_id = 2; push_contract_resources_used(node_contract_id); @@ -2425,7 +2438,8 @@ fn test_create_rent_contract_and_node_contract_excludes_node_contract_from_billi .should_call_bill_contract(node_contract_id, Ok(Pays::Yes.into()), 12); run_to_block(12, Some(&mut pool_state)); - let (amount_due_as_u128, discount_received) = calculate_tft_cost(rent_contract_id, 2, 10); + let (amount_due_as_u128, discount_received) = + calculate_tft_cost(rent_contract_id, twin_id, 10); assert_ne!(amount_due_as_u128, 0); check_report_cost(rent_contract_id, amount_due_as_u128, 11, discount_received); @@ -2567,6 +2581,7 @@ fn test_create_rent_contract_and_node_contract_with_ip_billing_works() { node_id, None )); + let twin_id = 2; let rent_contract_id = 1; run_to_block(2, Some(&mut pool_state)); @@ -2588,7 +2603,8 @@ fn test_create_rent_contract_and_node_contract_with_ip_billing_works() { run_to_block(11, Some(&mut pool_state)); // check contract 1 costs (Rent Contract) - let (amount_due_as_u128, discount_received) = calculate_tft_cost(rent_contract_id, 2, 10); + let (amount_due_as_u128, discount_received) = + calculate_tft_cost(rent_contract_id, twin_id, 10); assert_ne!(amount_due_as_u128, 0); check_report_cost(rent_contract_id, amount_due_as_u128, 11, discount_received); @@ -2598,7 +2614,8 @@ fn test_create_rent_contract_and_node_contract_with_ip_billing_works() { run_to_block(12, Some(&mut pool_state)); // check contract 2 costs (Node Contract) - let (amount_due_as_u128, discount_received) = calculate_tft_cost(node_contract_id, 2, 10); + let (amount_due_as_u128, discount_received) = + calculate_tft_cost(node_contract_id, twin_id, 10); assert_ne!(amount_due_as_u128, 0); check_report_cost(node_contract_id, amount_due_as_u128, 12, discount_received); @@ -2700,7 +2717,7 @@ fn test_restore_rent_contract_in_grace_works() { run_to_block(31, Some(&mut pool_state)); // Transfer some balance to the owner of the contract to trigger the grace period to stop - Balances::transfer(RuntimeOrigin::signed(bob()), charlie(), 100000000).unwrap(); + Balances::transfer_allow_death(RuntimeOrigin::signed(bob()), charlie(), 100000000).unwrap(); pool_state .write() @@ -2805,7 +2822,7 @@ fn test_restore_rent_contract_and_node_contracts_in_grace_works() { run_to_block(32, Some(&mut pool_state)); // Transfer some balance to the owner of the contract to trigger the grace period to stop - Balances::transfer(RuntimeOrigin::signed(bob()), charlie(), 100000000).unwrap(); + Balances::transfer_allow_death(RuntimeOrigin::signed(bob()), charlie(), 100000000).unwrap(); pool_state .write() @@ -3576,7 +3593,8 @@ fn test_service_contract_bill_works() { get_timestamp_in_seconds_for_block(1) ); - let consumer_twin = TfgridModule::twins(2).unwrap(); + let consumer_twin_id = 2; + let consumer_twin = TfgridModule::twins(consumer_twin_id).unwrap(); let consumer_balance = Balances::free_balance(&consumer_twin.account_id); assert_eq!(consumer_balance, 2500000000); @@ -3584,7 +3602,7 @@ fn test_service_contract_bill_works() { run_to_block(201, Some(&mut pool_state)); assert_ok!(SmartContractModule::service_contract_bill( RuntimeOrigin::signed(alice()), - 1, + service_contract_id, VARIABLE_AMOUNT, b"bill_metadata_1".to_vec(), )); @@ -3766,9 +3784,11 @@ fn test_service_contract_bill_out_of_funds_fails() { approve_service_consumer_contract(service_contract_id); // Drain consumer account - let consumer_twin = TfgridModule::twins(2).unwrap(); + let twin_id = 2; + let consumer_twin = TfgridModule::twins(twin_id).unwrap(); let consumer_balance = Balances::free_balance(&consumer_twin.account_id); - Balances::transfer(RuntimeOrigin::signed(bob()), alice(), consumer_balance).unwrap(); + Balances::transfer_allow_death(RuntimeOrigin::signed(bob()), alice(), consumer_balance) + .unwrap(); let consumer_balance = Balances::free_balance(&consumer_twin.account_id); assert_eq!(consumer_balance, 0); diff --git a/substrate-node/pallets/pallet-tft-bridge/src/migrations/v2.rs b/substrate-node/pallets/pallet-tft-bridge/src/migrations/v2.rs index 831c6e4cd..abb85715a 100644 --- a/substrate-node/pallets/pallet-tft-bridge/src/migrations/v2.rs +++ b/substrate-node/pallets/pallet-tft-bridge/src/migrations/v2.rs @@ -17,9 +17,10 @@ impl OnRuntimeUpgrade for MigrateBurnTransactionsV2 { #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result, sp_runtime::TryRuntimeError> { info!("current pallet version: {:?}", PalletVersion::::get()); - if PalletVersion::::get() != types::StorageVersion::V1 { - return Ok(Vec::::new()); - } + ensure!( + PalletVersion::::get() >= types::StorageVersion::V1, + DispatchError::Other("Unexpected pallet version") + ); let burn_transactions_count: u64 = migrations::types::v1::BurnTransactions::::iter().count() as u64; @@ -35,7 +36,7 @@ impl OnRuntimeUpgrade for MigrateBurnTransactionsV2 { executed_burn_transactions_count ); - info!("👥 TFT-BRIDGE pallet to V1 passes PRE migrate checks ✅",); + info!("👥 TFT-BRIDGE pallet to V2 passes PRE migrate checks ✅",); Ok(Vec::::new()) } @@ -54,7 +55,7 @@ impl OnRuntimeUpgrade for MigrateBurnTransactionsV2 { ) -> Result<(), sp_runtime::TryRuntimeError> { info!("current pallet version: {:?}", PalletVersion::::get()); ensure!( - PalletVersion::::get() == types::StorageVersion::V2, + PalletVersion::::get() >= types::StorageVersion::V2, DispatchError::Other("Unexpected pallet version") ); diff --git a/substrate-node/runtime/Cargo.toml b/substrate-node/runtime/Cargo.toml index b98009d25..c496d2877 100644 --- a/substrate-node/runtime/Cargo.toml +++ b/substrate-node/runtime/Cargo.toml @@ -14,7 +14,7 @@ version.workspace = true targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.2.0" } [dependencies] smallvec.workspace = true @@ -59,6 +59,7 @@ sp-api.workspace = true sp-block-builder.workspace = true sp-consensus-aura.workspace = true sp-core.workspace = true +sp-genesis-builder.workspace = true sp-inherents.workspace = true sp-offchain.workspace = true sp-runtime.workspace = true @@ -99,6 +100,7 @@ std = [ "sp-block-builder/std", "sp-consensus-aura/std", "sp-core/std", + "sp-genesis-builder/std", "sp-inherents/std", "sp-offchain/std", "sp-runtime/std", diff --git a/substrate-node/runtime/src/lib.rs b/substrate-node/runtime/src/lib.rs index 40d0d261d..f61b74ab6 100644 --- a/substrate-node/runtime/src/lib.rs +++ b/substrate-node/runtime/src/lib.rs @@ -35,6 +35,7 @@ use tfchain_support::{ types::PublicIP, }; +use frame_support::genesis_builder_helper::{build_config, create_default_config}; // A few exports that help ease life for downstream crates. pub use frame_support::{ construct_runtime, parameter_types, @@ -1054,4 +1055,14 @@ impl_runtime_apis! { Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap() } } + + impl sp_genesis_builder::GenesisBuilder for Runtime { + fn create_default_config() -> Vec { + create_default_config::() + } + + fn build_config(config: Vec) -> sp_genesis_builder::Result { + build_config::(config) + } + } } From 20f5ccc7f5249f5c41e434de746e87b2aac7635d Mon Sep 17 00:00:00 2001 From: renauter Date: Wed, 4 Sep 2024 08:32:05 -0300 Subject: [PATCH 6/7] skip check-benchmark-weights From b3fcccff5f408af67ebef54d41bfb4f3563939af Mon Sep 17 00:00:00 2001 From: renauter Date: Mon, 7 Oct 2024 19:53:15 -0300 Subject: [PATCH 7/7] skip check-benchmark-weights