From 871d0d70e01d8a36e1b154155028db1b0457d9b1 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 26 Mar 2024 09:23:44 -0300 Subject: [PATCH 1/3] refresh sora2-common commit --- Cargo.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a2061fda20..c1c55522ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "bridge-common" version = "0.1.0" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "bitvec", "bridge-types", @@ -938,7 +938,7 @@ dependencies = [ [[package]] name = "bridge-data-signer" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "bridge-common", "bridge-types", @@ -957,7 +957,7 @@ dependencies = [ [[package]] name = "bridge-types" version = "0.1.0" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "derivative", "ethabi", @@ -2143,7 +2143,7 @@ dependencies = [ [[package]] name = "dispatch" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "bridge-types", "frame-benchmarking", @@ -4195,7 +4195,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "leaf-provider" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "bridge-types", "ethabi", @@ -4221,7 +4221,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "liberland-bridge-provider" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "bridge-types", "frame-benchmarking", @@ -5203,7 +5203,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multisig-verifier" version = "0.1.0" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "bridge-common", "bridge-types", @@ -10464,7 +10464,7 @@ dependencies = [ [[package]] name = "substrate-bridge-app" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "bridge-types", "ethabi", @@ -10486,7 +10486,7 @@ dependencies = [ [[package]] name = "substrate-bridge-channel" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#fa10f0511d9e35c576f38f552f4e060145124d62" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" dependencies = [ "bridge-types", "ethabi", From 9450cd8348d55203f81ad5b3384d4ef4aa3ffff6 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 15 Apr 2024 12:29:59 -0300 Subject: [PATCH 2/3] fix benchmarks build --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- substrate/bin/node/runtime/Cargo.toml | 4 ++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c1c55522ee..1552e5c036 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "bridge-common" version = "0.1.0" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "bitvec", "bridge-types", @@ -938,7 +938,7 @@ dependencies = [ [[package]] name = "bridge-data-signer" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "bridge-common", "bridge-types", @@ -957,7 +957,7 @@ dependencies = [ [[package]] name = "bridge-types" version = "0.1.0" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "derivative", "ethabi", @@ -2143,7 +2143,7 @@ dependencies = [ [[package]] name = "dispatch" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "bridge-types", "frame-benchmarking", @@ -4195,7 +4195,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "leaf-provider" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "bridge-types", "ethabi", @@ -4221,7 +4221,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "liberland-bridge-provider" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "bridge-types", "frame-benchmarking", @@ -5203,7 +5203,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multisig-verifier" version = "0.1.0" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "bridge-common", "bridge-types", @@ -10464,7 +10464,7 @@ dependencies = [ [[package]] name = "substrate-bridge-app" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "bridge-types", "ethabi", @@ -10486,7 +10486,7 @@ dependencies = [ [[package]] name = "substrate-bridge-channel" version = "0.1.1" -source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#697040640cdd4a6d9c29ada6c19db2560c4810af" +source = "git+https://github.com/sora-xor/sora2-common.git?branch=polkadotsdk-lib-1.1.0#ff2466e6ec78470c3260e1e83d2f34c33c68e62a" dependencies = [ "bridge-types", "ethabi", diff --git a/Cargo.toml b/Cargo.toml index 9af5c28fda..b39298600f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,4 +106,4 @@ pallet-democracy = { path = "substrate/frame/democracy" } pallet-identity = { path = "substrate/frame/identity" } pallet-elections-phragmen = { path = "substrate/frame/elections-phragmen" } pallet-staking = { path = "substrate/frame/staking" } -pallet-nfts = { path = "substrate/frame/nfts" } \ No newline at end of file +pallet-nfts = { path = "substrate/frame/nfts" } diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml index dcfa52c0a6..b00f50e9e7 100644 --- a/substrate/bin/node/runtime/Cargo.toml +++ b/substrate/bin/node/runtime/Cargo.toml @@ -277,6 +277,10 @@ runtime-benchmarks = [ "pallet-whitelist/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", + + # Sora Bridge + "dispatch/runtime-benchmarks", + "multisig-verifier/runtime-benchmarks", ] try-runtime = [ "frame-election-provider-support/try-runtime", From 2ae7b52114f8d9d046a4fb52eaad28b4835b7d4a Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 15 Apr 2024 12:31:56 -0300 Subject: [PATCH 3/3] refactor --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b39298600f..9af5c28fda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,4 +106,4 @@ pallet-democracy = { path = "substrate/frame/democracy" } pallet-identity = { path = "substrate/frame/identity" } pallet-elections-phragmen = { path = "substrate/frame/elections-phragmen" } pallet-staking = { path = "substrate/frame/staking" } -pallet-nfts = { path = "substrate/frame/nfts" } +pallet-nfts = { path = "substrate/frame/nfts" } \ No newline at end of file