diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml
index 743fc79ec..49f03a9f4 100644
--- a/.github/workflows/reusable-e2e-tests.yml
+++ b/.github/workflows/reusable-e2e-tests.yml
@@ -96,48 +96,70 @@ jobs:
         include:
           - command: "yarn test-parallel --max-workers=10"
             fast: false
+            unlocked: true
           - command: "yarn test-sequential-no-bootstrap"
             fast: false
+            unlocked: true
           - command: "yarn test-seqgasless"
             fast: false
+            unlocked: true
           - command: "yarn test-maintenance"
             fast: true
+            unlocked: false
           - command: "yarn test-rollupUpdate"
             fast: true
+            unlocked: false
           - command: "yarn test-bootstrap"
             fast: false
+            unlocked: true
           - command: "yarn test-rewards-bootstrap"
             fast: false
+            unlocked: true
           - command: "yarn test-parallel-autocompound"
             fast: true
+            unlocked: false
           - command: "yarn test-sequential-autocompound"
             fast: true
+            unlocked: false
           - command: "yarn test-poolliquidity"
             fast: true
+            unlocked: false
           - command: "yarn test-governance"
             fast: true
+            unlocked: false
           - command: "yarn test-multiswap"
             fast: false
+            unlocked: true
           - command: "yarn test-experimentalStaking"
             fast: true
+            unlocked: false
           - command: "yarn test-crowdloan"
             fast: false
+            unlocked: true
           - command: "yarn test-sdk"
             fast: true
+            unlocked: false
           - command: "yarn test-parallel-3rdPartyRewards"
             fast: true
+            unlocked: false
           - command: "yarn test-sequencerStaking"
             fast: true
+            unlocked: false
           - command: "yarn test-sequencerCancellation"
             fast: true
+            unlocked: false
           - command: "yarn test-rolldown"
             fast: true
+            unlocked: false
           - command: "yarn test-rolldownWithdrawal"
             fast: true
+            unlocked: false
           - command: "yarn test-rolldownPreOperationWithdrawal"
             fast: true
+            unlocked: false
           - command: "yarn test-sequencerRewards"
             fast: true
+            unlocked: false
 
 
 
@@ -159,6 +181,9 @@ jobs:
       - name: Adapt if fast runtime
         if:  ${{  !contains(env.NODE_DOCKER_IMAGE, 'fast') && matrix.fast == true }}
         run: echo "NODE_DOCKER_IMAGE=${{ env.NODE_DOCKER_IMAGE }}-fast" >> $GITHUB_ENV
+      - name: Adapt if unlocked
+        if:  ${{  !contains(env.NODE_DOCKER_IMAGE, 'fast') && matrix.unlocked == true }}
+        run: echo "NODE_DOCKER_IMAGE=${{ env.NODE_DOCKER_IMAGE }}-unlocked" >> $GITHUB_ENV
 
 
       - name: Download node Docker image
diff --git a/Cargo.lock b/Cargo.lock
index d1a356916..29917a77a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,7 +306,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-std 0.4.0",
 ]
@@ -318,7 +318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55"
 dependencies = [
  "ark-bls12-377",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-models-ext",
  "ark-std 0.4.0",
 ]
@@ -329,7 +329,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
@@ -342,7 +342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c"
 dependencies = [
  "ark-bls12-381",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-models-ext",
  "ark-serialize 0.4.2",
@@ -356,7 +356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700"
 dependencies = [
  "ark-bls12-377",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-std 0.4.0",
 ]
@@ -368,7 +368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2"
 dependencies = [
  "ark-bw6-761",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-models-ext",
  "ark-std 0.4.0",
@@ -381,7 +381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
 dependencies = [
  "ark-ff 0.4.2",
- "ark-poly",
+ "ark-poly 0.4.2",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
  "derivative",
@@ -392,6 +392,27 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "ark-ec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
+dependencies = [
+ "ahash 0.8.11",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "educe",
+ "fnv",
+ "hashbrown 0.15.2",
+ "itertools 0.13.0",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "zeroize",
+]
+
 [[package]]
 name = "ark-ed-on-bls12-377"
 version = "0.4.0"
@@ -399,7 +420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6"
 dependencies = [
  "ark-bls12-377",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-std 0.4.0",
 ]
@@ -410,7 +431,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ed-on-bls12-377",
  "ark-ff 0.4.2",
  "ark-models-ext",
@@ -424,7 +445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c"
 dependencies = [
  "ark-bls12-381",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-std 0.4.0",
 ]
@@ -435,7 +456,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ed-on-bls12-381-bandersnatch",
  "ark-ff 0.4.2",
  "ark-models-ext",
@@ -480,6 +501,26 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "ark-ff"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70"
+dependencies = [
+ "ark-ff-asm 0.5.0",
+ "ark-ff-macros 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "arrayvec 0.7.6",
+ "digest 0.10.7",
+ "educe",
+ "itertools 0.13.0",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "zeroize",
+]
+
 [[package]]
 name = "ark-ff-asm"
 version = "0.3.0"
@@ -500,6 +541,16 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "ark-ff-asm"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
+dependencies = [
+ "quote",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "ark-ff-macros"
 version = "0.3.0"
@@ -525,13 +576,26 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "ark-ff-macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "ark-models-ext"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
@@ -551,13 +615,28 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
+[[package]]
+name = "ark-poly"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
+dependencies = [
+ "ahash 0.8.11",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "educe",
+ "fnv",
+ "hashbrown 0.15.2",
+]
+
 [[package]]
 name = "ark-scale"
 version = "0.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
@@ -570,11 +649,11 @@ name = "ark-secret-scalar"
 version = "0.0.2"
 source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
- "ark-transcript 0.0.2 (git+https://github.com/w3f/ring-vrf?rev=e9782f9)",
+ "ark-transcript 0.0.2",
  "digest 0.10.7",
  "getrandom_or_panic",
  "zeroize",
@@ -596,12 +675,25 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
 dependencies = [
- "ark-serialize-derive",
+ "ark-serialize-derive 0.4.2",
  "ark-std 0.4.0",
  "digest 0.10.7",
  "num-bigint",
 ]
 
+[[package]]
+name = "ark-serialize"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
+dependencies = [
+ "ark-serialize-derive 0.5.0",
+ "ark-std 0.5.0",
+ "arrayvec 0.7.6",
+ "digest 0.10.7",
+ "num-bigint",
+]
+
 [[package]]
 name = "ark-serialize-derive"
 version = "0.4.2"
@@ -613,6 +705,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "ark-serialize-derive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "ark-std"
 version = "0.3.0"
@@ -634,11 +737,20 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "ark-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
+dependencies = [
+ "num-traits",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "ark-transcript"
 version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "563084372d89271122bd743ef0a608179726f5fad0566008ba55bd0f756489b8"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
@@ -650,12 +762,12 @@ dependencies = [
 
 [[package]]
 name = "ark-transcript"
-version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
+version = "0.0.3"
+source = "git+https://github.com/w3f/ark-transcript#37a169f587f45d67e5afad143bc2a7c9c864884b"
 dependencies = [
- "ark-ff 0.4.2",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
  "digest 0.10.7",
  "rand_core 0.6.4",
  "sha3",
@@ -859,7 +971,7 @@ version = "0.0.4"
 source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-bls12-381",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ed-on-bls12-381-bandersnatch",
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
@@ -1472,13 +1584,13 @@ dependencies = [
 [[package]]
 name = "common"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof#652286c32f96beb9ce7f5793f5e2c2c923f63b73"
+source = "git+https://github.com/w3f/ring-proof#1eedf08d97effe1921f4aa2e926575088b068e2b"
 dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
  "fflonk",
  "getrandom_or_panic",
  "rand_core 0.6.4",
@@ -2118,13 +2230,13 @@ name = "dleq_vrf"
 version = "0.0.2"
 source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-scale",
  "ark-secret-scalar",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
- "ark-transcript 0.0.2 (git+https://github.com/w3f/ring-vrf?rev=e9782f9)",
+ "ark-transcript 0.0.2",
  "arrayvec 0.7.6",
  "zeroize",
 ]
@@ -2255,6 +2367,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "educe"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417"
+dependencies = [
+ "enum-ordinalize",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -2299,6 +2423,26 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "enum-ordinalize"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5"
+dependencies = [
+ "enum-ordinalize-derive",
+]
+
+[[package]]
+name = "enum-ordinalize-derive"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "enumflags2"
 version = "0.7.10"
@@ -2421,7 +2565,7 @@ dependencies = [
 [[package]]
 name = "extrinsic-shuffler"
 version = "4.0.0-dev"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "derive_more",
  "log",
@@ -2492,14 +2636,14 @@ dependencies = [
 
 [[package]]
 name = "fflonk"
-version = "0.1.0"
-source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35"
+version = "0.1.1"
+source = "git+https://github.com/w3f/fflonk#eda051ea3b80042e844a3ebd17c2f60536e6ee3f"
 dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
  "merlin 3.0.0",
 ]
 
@@ -2604,7 +2748,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "12.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2627,7 +2771,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2652,7 +2796,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "32.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "Inflector",
  "array-bytes 6.2.3",
@@ -2706,7 +2850,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "aquamarine 0.3.3",
  "extrinsic-shuffler",
@@ -2762,7 +2906,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "aquamarine 0.5.0",
  "array-bytes 6.2.3",
@@ -2804,7 +2948,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "23.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2823,7 +2967,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "10.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 3.2.0",
@@ -2835,7 +2979,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "11.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2845,7 +2989,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "cfg-if",
  "docify",
@@ -2867,7 +3011,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2882,7 +3026,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2891,7 +3035,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.34.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3313,6 +3457,15 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+]
+
 [[package]]
 name = "hashlink"
 version = "0.8.4"
@@ -3805,6 +3958,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -4775,7 +4937,7 @@ dependencies = [
 [[package]]
 name = "mangata-support"
 version = "0.1.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-support",
  "mangata-types",
@@ -4788,7 +4950,7 @@ dependencies = [
 [[package]]
 name = "mangata-types"
 version = "0.1.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -5490,7 +5652,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "27.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5507,7 +5669,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5522,7 +5684,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5546,7 +5708,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5594,7 +5756,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective-mangata"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5666,7 +5828,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5689,7 +5851,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5786,7 +5948,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5888,7 +6050,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5965,7 +6127,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6010,7 +6172,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo-mangata"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -6044,7 +6206,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "27.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -6064,7 +6226,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6080,7 +6242,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "30.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -6096,7 +6258,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6108,7 +6270,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "27.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -6127,7 +6289,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6143,7 +6305,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility-mangata"
 version = "4.0.0-dev"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6159,7 +6321,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting-mangata"
 version = "4.0.0-dev"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6247,8 +6409,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.7.3",
- "rand_core 0.5.1",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
  "serde",
  "unicode-normalization",
 ]
@@ -7379,15 +7541,14 @@ dependencies = [
 [[package]]
 name = "ring"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof#652286c32f96beb9ce7f5793f5e2c2c923f63b73"
-dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "ark-transcript 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "arrayvec 0.7.6",
+source = "git+https://github.com/w3f/ring-proof#1eedf08d97effe1921f4aa2e926575088b068e2b"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "ark-transcript 0.0.3",
  "blake2 0.10.6",
  "common",
  "fflonk",
@@ -7985,7 +8146,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "23.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "log",
  "sp-core",
@@ -7996,7 +8157,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship-ver"
 version = "0.10.0-dev"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "aquamarine 0.3.3",
  "futures",
@@ -8022,7 +8183,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8037,7 +8198,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder-ver"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "aquamarine 0.1.12",
  "extrinsic-shuffler",
@@ -8057,7 +8218,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "27.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "docify",
@@ -8083,7 +8244,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "11.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2",
@@ -8094,7 +8255,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.36.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "chrono",
@@ -8135,7 +8296,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "fnv",
  "futures",
@@ -8162,7 +8323,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.35.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -8188,7 +8349,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "futures",
@@ -8213,7 +8374,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.34.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "futures",
@@ -8242,7 +8403,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.19.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "ahash 0.8.11",
  "array-bytes 6.2.3",
@@ -8285,7 +8446,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "futures",
@@ -8310,7 +8471,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.32.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -8333,7 +8494,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.29.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "polkavm",
  "sc-allocator",
@@ -8346,7 +8507,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-polkavm"
 version = "0.29.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "log",
  "polkavm",
@@ -8357,7 +8518,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.29.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -8375,7 +8536,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "ansi_term",
  "futures",
@@ -8392,7 +8553,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "25.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "parking_lot 0.12.3",
@@ -8406,7 +8567,7 @@ dependencies = [
 [[package]]
 name = "sc-mixnet"
 version = "0.4.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 4.2.0",
  "arrayvec 0.7.6",
@@ -8435,7 +8596,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.34.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel",
@@ -8478,7 +8639,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-channel",
  "cid",
@@ -8498,7 +8659,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -8515,7 +8676,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.34.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "ahash 0.8.11",
  "futures",
@@ -8534,7 +8695,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel",
@@ -8555,7 +8716,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel",
@@ -8591,7 +8752,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "futures",
@@ -8610,7 +8771,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "29.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "bytes",
@@ -8644,7 +8805,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.17.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8653,7 +8814,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "29.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -8685,7 +8846,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.33.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -8705,7 +8866,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "11.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "futures",
  "governor",
@@ -8723,7 +8884,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.34.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "futures",
@@ -8754,7 +8915,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.35.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "directories",
@@ -8819,7 +8980,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.30.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8830,7 +8991,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "27.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "derive_more",
  "futures",
@@ -8851,7 +9012,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "15.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "chrono",
  "futures",
@@ -8870,7 +9031,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "ansi_term",
  "chrono",
@@ -8900,7 +9061,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2",
@@ -8911,7 +9072,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "futures",
@@ -8938,7 +9099,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "futures",
@@ -8954,7 +9115,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "14.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-channel",
  "futures",
@@ -9500,7 +9661,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "hash-db",
  "log",
@@ -9522,7 +9683,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "15.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
@@ -9536,7 +9697,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "30.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9549,7 +9710,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "23.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9581,7 +9742,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "sp-api",
  "sp-inherents",
@@ -9592,7 +9753,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "futures",
  "log",
@@ -9610,7 +9771,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.32.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "futures",
@@ -9625,7 +9786,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.32.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9642,7 +9803,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.32.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9661,7 +9822,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "13.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -9679,7 +9840,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.32.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9691,7 +9852,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "28.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "bandersnatch_vrfs",
@@ -9738,7 +9899,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.10.0"
-source = "git+https://github.com/gasp-xyz/polkadot-sdk?branch=eth-rollup-develop#46fdae444f71731021c0d8107dced84c4fc36278"
+source = "git+https://github.com/gasp-xyz/polkadot-sdk?branch=eth-rollup-develop#6b71a3c1276a1e0d8a75eaf5932d9afb82bb477a"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -9746,7 +9907,7 @@ dependencies = [
  "ark-bls12-381-ext",
  "ark-bw6-761",
  "ark-bw6-761-ext",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ed-on-bls12-377",
  "ark-ed-on-bls12-377-ext",
  "ark-ed-on-bls12-381-bandersnatch",
@@ -9759,7 +9920,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing"
 version = "0.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -9772,7 +9933,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
 version = "0.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "quote",
  "sp-crypto-hashing",
@@ -9782,7 +9943,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "10.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.3",
@@ -9791,7 +9952,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9801,7 +9962,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9812,7 +9973,7 @@ dependencies = [
 [[package]]
 name = "sp-genesis-builder"
 version = "0.7.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "serde_json",
  "sp-api",
@@ -9823,7 +9984,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -9837,7 +9998,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "30.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "bytes",
  "ed25519-dalek",
@@ -9863,7 +10024,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "31.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "sp-core",
  "sp-runtime",
@@ -9873,7 +10034,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.34.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -9884,7 +10045,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -9893,7 +10054,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.6.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -9904,7 +10065,7 @@ dependencies = [
 [[package]]
 name = "sp-mixnet"
 version = "0.4.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9916,7 +10077,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9926,7 +10087,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -9936,7 +10097,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -9946,7 +10107,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "31.0.1"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -9977,7 +10138,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -9996,7 +10157,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "Inflector",
  "expander",
@@ -10009,7 +10170,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "27.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10024,7 +10185,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10038,7 +10199,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.35.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "hash-db",
  "log",
@@ -10059,7 +10220,7 @@ dependencies = [
 [[package]]
 name = "sp-statement-store"
 version = "10.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek 4.1.1",
@@ -10084,12 +10245,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "impl-serde 0.4.0",
  "parity-scale-codec",
@@ -10102,7 +10263,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10115,7 +10276,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -10127,7 +10288,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10136,7 +10297,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "26.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10151,7 +10312,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "29.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "ahash 0.8.11",
  "hash-db",
@@ -10175,7 +10336,7 @@ dependencies = [
 [[package]]
 name = "sp-ver"
 version = "4.0.0-dev"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10192,7 +10353,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "29.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "impl-serde 0.4.0",
  "parity-scale-codec",
@@ -10209,7 +10370,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "13.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -10220,7 +10381,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -10233,7 +10394,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "27.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -10392,7 +10553,7 @@ dependencies = [
 [[package]]
 name = "substrate-bip39"
 version = "0.4.7"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
@@ -10404,12 +10565,12 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "11.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.17.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "hyper",
  "log",
@@ -10434,7 +10595,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "async-trait",
@@ -10461,7 +10622,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "array-bytes 6.2.3",
  "frame-executive",
@@ -10504,7 +10665,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "futures",
  "sc-block-builder",
@@ -10523,7 +10684,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "17.0.0"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "build-helper",
  "cargo_metadata",
@@ -11186,7 +11347,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
  "digest 0.10.7",
- "rand 0.7.3",
+ "rand 0.8.5",
  "static_assertions",
 ]
 
@@ -11325,7 +11486,7 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 [[package]]
 name = "ver-api"
 version = "4.0.0-dev"
-source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#8531208c02a02e9ee6ef9bc0ca37446b3b72ca26"
+source = "git+https://github.com//gasp-xyz/polkadot-sdk?branch=fix/rewards-market#7ddcc16002113bb3b7d2ff8d2a2086cc410d7f22"
 dependencies = [
  "derive_more",
  "frame-support",
@@ -11362,10 +11523,10 @@ checksum = "9c5da5fa2c6afa2c9158eaa7cd9aee249765eb32b5fb0c63ad8b9e79336a47ec"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-381",
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
- "ark-serialize-derive",
+ "ark-serialize-derive 0.4.2",
  "arrayref",
  "constcat",
  "digest 0.10.7",
diff --git a/Cargo.toml b/Cargo.toml
index 2025335e1..812ef338b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -327,3 +327,144 @@ sc-offchain = { git = "https://github.com//gasp-xyz/polkadot-sdk", branch = "fix
 sc-service = { git = "https://github.com//gasp-xyz/polkadot-sdk", branch = "fix/rewards-market" }
 sc-rpc = { git = "https://github.com//gasp-xyz/polkadot-sdk", branch = "fix/rewards-market" }
 sc-rpc-api = { git = "https://github.com//gasp-xyz/polkadot-sdk", branch = "fix/rewards-market" }
+
+# # patch generated by './scripts/dev_manifest.sh ../polkadot-sdk/'
+# [patch."https://github.com/gasp-xyz/polkadot-sdk"]
+# substrate-wasm-builder = { path = "../polkadot-sdk/substrate/utils/wasm-builder" }
+# frame-benchmarking-cli = { path = "../polkadot-sdk/substrate/utils/frame/benchmarking-cli" }
+# substrate-bip39 = { path = "../polkadot-sdk/substrate/utils/substrate-bip39" }
+# substrate-prometheus-endpoint = { path = "../polkadot-sdk/substrate/utils/prometheus" }
+# fork-tree = { path = "../polkadot-sdk/substrate/utils/fork-tree" }
+# substrate-build-script-utils = { path = "../polkadot-sdk/substrate/utils/build-script-utils" }
+# substrate-test-client = { path = "../polkadot-sdk/substrate/test-utils/client" }
+# substrate-test-runtime = { path = "../polkadot-sdk/substrate/test-utils/runtime" }
+# substrate-test-runtime-client = { path = "../polkadot-sdk/substrate/test-utils/runtime/client" }
+# frame-try-runtime = { path = "../polkadot-sdk/substrate/frame/try-runtime" }
+# pallet-timestamp = { path = "../polkadot-sdk/substrate/frame/timestamp" }
+# pallet-membership = { path = "../polkadot-sdk/substrate/frame/membership" }
+# pallet-sudo-mangata = { path = "../polkadot-sdk/substrate/frame/sudo-mangata" }
+# pallet-treasury = { path = "../polkadot-sdk/substrate/frame/treasury" }
+# pallet-collective-mangata = { path = "../polkadot-sdk/substrate/frame/collective-mangata" }
+# frame-system = { path = "../polkadot-sdk/substrate/frame/system" }
+# frame-system-benchmarking = { path = "../polkadot-sdk/substrate/frame/system/benchmarking" }
+# frame-system-rpc-runtime-api = { path = "../polkadot-sdk/substrate/frame/system/rpc/runtime-api" }
+# mangata-support = { path = "../polkadot-sdk/substrate/frame/mangata-support" }
+# pallet-balances = { path = "../polkadot-sdk/substrate/frame/balances" }
+# pallet-aura = { path = "../polkadot-sdk/substrate/frame/aura" }
+# pallet-vesting-mangata = { path = "../polkadot-sdk/substrate/frame/vesting-mangata" }
+# pallet-session = { path = "../polkadot-sdk/substrate/frame/session" }
+# pallet-utility-mangata = { path = "../polkadot-sdk/substrate/frame/utility-mangata" }
+# pallet-identity = { path = "../polkadot-sdk/substrate/frame/identity" }
+# pallet-utility = { path = "../polkadot-sdk/substrate/frame/utility" }
+# pallet-authorship = { path = "../polkadot-sdk/substrate/frame/authorship" }
+# frame-executive = { path = "../polkadot-sdk/substrate/frame/executive" }
+# pallet-babe = { path = "../polkadot-sdk/substrate/frame/babe" }
+# pallet-transaction-payment = { path = "../polkadot-sdk/substrate/frame/transaction-payment" }
+# pallet-transaction-payment-rpc = { path = "../polkadot-sdk/substrate/frame/transaction-payment/rpc" }
+# pallet-transaction-payment-rpc-runtime-api = { path = "../polkadot-sdk/substrate/frame/transaction-payment/rpc/runtime-api" }
+# pallet-proxy = { path = "../polkadot-sdk/substrate/frame/proxy" }
+# pallet-grandpa = { path = "../polkadot-sdk/substrate/frame/grandpa" }
+# frame-support = { path = "../polkadot-sdk/substrate/frame/support" }
+# frame-support-procedural = { path = "../polkadot-sdk/substrate/frame/support/procedural" }
+# frame-support-procedural-tools = { path = "../polkadot-sdk/substrate/frame/support/procedural/tools" }
+# frame-support-procedural-tools-derive = { path = "../polkadot-sdk/substrate/frame/support/procedural/tools/derive" }
+# frame-benchmarking = { path = "../polkadot-sdk/substrate/frame/benchmarking" }
+# sp-application-crypto = { path = "../polkadot-sdk/substrate/primitives/application-crypto" }
+# sp-timestamp = { path = "../polkadot-sdk/substrate/primitives/timestamp" }
+# sp-crypto-hashing = { path = "../polkadot-sdk/substrate/primitives/crypto/hashing" }
+# sp-crypto-hashing-proc-macro = { path = "../polkadot-sdk/substrate/primitives/crypto/hashing/proc-macro" }
+# sp-metadata-ir = { path = "../polkadot-sdk/substrate/primitives/metadata-ir" }
+# sp-state-machine = { path = "../polkadot-sdk/substrate/primitives/state-machine" }
+# sp-tracing = { path = "../polkadot-sdk/substrate/primitives/tracing" }
+# sp-mixnet = { path = "../polkadot-sdk/substrate/primitives/mixnet" }
+# sp-wasm-interface = { path = "../polkadot-sdk/substrate/primitives/wasm-interface" }
+# sp-ver = { path = "../polkadot-sdk/substrate/primitives/ver" }
+# sp-blockchain = { path = "../polkadot-sdk/substrate/primitives/blockchain" }
+# sp-block-builder = { path = "../polkadot-sdk/substrate/primitives/block-builder" }
+# sp-storage = { path = "../polkadot-sdk/substrate/primitives/storage" }
+# sp-session = { path = "../polkadot-sdk/substrate/primitives/session" }
+# sp-arithmetic = { path = "../polkadot-sdk/substrate/primitives/arithmetic" }
+# sp-consensus = { path = "../polkadot-sdk/substrate/primitives/consensus/common" }
+# sp-consensus-aura = { path = "../polkadot-sdk/substrate/primitives/consensus/aura" }
+# sp-consensus-babe = { path = "../polkadot-sdk/substrate/primitives/consensus/babe" }
+# sp-consensus-slots = { path = "../polkadot-sdk/substrate/primitives/consensus/slots" }
+# sp-consensus-grandpa = { path = "../polkadot-sdk/substrate/primitives/consensus/grandpa" }
+# sp-runtime-interface = { path = "../polkadot-sdk/substrate/primitives/runtime-interface" }
+# sp-runtime-interface-proc-macro = { path = "../polkadot-sdk/substrate/primitives/runtime-interface/proc-macro" }
+# ver-api = { path = "../polkadot-sdk/substrate/primitives/ver-api" }
+# sp-keystore = { path = "../polkadot-sdk/substrate/primitives/keystore" }
+# mangata-types = { path = "../polkadot-sdk/substrate/primitives/mangata-types" }
+# sp-trie = { path = "../polkadot-sdk/substrate/primitives/trie" }
+# sp-transaction-pool = { path = "../polkadot-sdk/substrate/primitives/transaction-pool" }
+# sp-api = { path = "../polkadot-sdk/substrate/primitives/api" }
+# sp-api-proc-macro = { path = "../polkadot-sdk/substrate/primitives/api/proc-macro" }
+# sp-std = { path = "../polkadot-sdk/substrate/primitives/std" }
+# sp-keyring = { path = "../polkadot-sdk/substrate/primitives/keyring" }
+# sp-version = { path = "../polkadot-sdk/substrate/primitives/version" }
+# sp-version-proc-macro = { path = "../polkadot-sdk/substrate/primitives/version/proc-macro" }
+# sp-weights = { path = "../polkadot-sdk/substrate/primitives/weights" }
+# sp-core = { path = "../polkadot-sdk/substrate/primitives/core" }
+# sp-maybe-compressed-blob = { path = "../polkadot-sdk/substrate/primitives/maybe-compressed-blob" }
+# extrinsic-shuffler = { path = "../polkadot-sdk/substrate/primitives/shuffler" }
+# sp-panic-handler = { path = "../polkadot-sdk/substrate/primitives/panic-handler" }
+# sp-inherents = { path = "../polkadot-sdk/substrate/primitives/inherents" }
+# sp-transaction-storage-proof = { path = "../polkadot-sdk/substrate/primitives/transaction-storage-proof" }
+# sp-runtime = { path = "../polkadot-sdk/substrate/primitives/runtime" }
+# sp-io = { path = "../polkadot-sdk/substrate/primitives/io" }
+# sp-database = { path = "../polkadot-sdk/substrate/primitives/database" }
+# sp-debug-derive = { path = "../polkadot-sdk/substrate/primitives/debug-derive" }
+# sp-staking = { path = "../polkadot-sdk/substrate/primitives/staking" }
+# sp-rpc = { path = "../polkadot-sdk/substrate/primitives/rpc" }
+# sp-offchain = { path = "../polkadot-sdk/substrate/primitives/offchain" }
+# sp-statement-store = { path = "../polkadot-sdk/substrate/primitives/statement-store" }
+# sp-externalities = { path = "../polkadot-sdk/substrate/primitives/externalities" }
+# sp-genesis-builder = { path = "../polkadot-sdk/substrate/primitives/genesis-builder" }
+# sc-allocator = { path = "../polkadot-sdk/substrate/client/allocator" }
+# sc-rpc-spec-v2 = { path = "../polkadot-sdk/substrate/client/rpc-spec-v2" }
+# sc-utils = { path = "../polkadot-sdk/substrate/client/utils" }
+# sc-informant = { path = "../polkadot-sdk/substrate/client/informant" }
+# sc-basic-authorship-ver = { path = "../polkadot-sdk/substrate/client/basic-authorship-ver" }
+# sc-tracing = { path = "../polkadot-sdk/substrate/client/tracing" }
+# sc-tracing-proc-macro = { path = "../polkadot-sdk/substrate/client/tracing/proc-macro" }
+# sc-mixnet = { path = "../polkadot-sdk/substrate/client/mixnet" }
+# sc-state-db = { path = "../polkadot-sdk/substrate/client/state-db" }
+# sc-executor = { path = "../polkadot-sdk/substrate/client/executor" }
+# sc-executor-polkavm = { path = "../polkadot-sdk/substrate/client/executor/polkavm" }
+# sc-executor-wasmtime = { path = "../polkadot-sdk/substrate/client/executor/wasmtime" }
+# sc-executor-common = { path = "../polkadot-sdk/substrate/client/executor/common" }
+# sc-block-builder = { path = "../polkadot-sdk/substrate/client/block-builder" }
+# sc-telemetry = { path = "../polkadot-sdk/substrate/client/telemetry" }
+# sc-consensus = { path = "../polkadot-sdk/substrate/client/consensus/common" }
+# sc-consensus-aura = { path = "../polkadot-sdk/substrate/client/consensus/aura" }
+# sc-consensus-slots = { path = "../polkadot-sdk/substrate/client/consensus/slots" }
+# sc-consensus-grandpa = { path = "../polkadot-sdk/substrate/client/consensus/grandpa" }
+# sc-keystore = { path = "../polkadot-sdk/substrate/client/keystore" }
+# sc-block-builder-ver = { path = "../polkadot-sdk/substrate/client/block-builder-ver" }
+# sc-proposer-metrics = { path = "../polkadot-sdk/substrate/client/proposer-metrics" }
+# sc-transaction-pool = { path = "../polkadot-sdk/substrate/client/transaction-pool" }
+# sc-transaction-pool-api = { path = "../polkadot-sdk/substrate/client/transaction-pool/api" }
+# sc-network = { path = "../polkadot-sdk/substrate/client/network" }
+# sc-network-common = { path = "../polkadot-sdk/substrate/client/network/common" }
+# sc-network-bitswap = { path = "../polkadot-sdk/substrate/client/network/bitswap" }
+# sc-network-sync = { path = "../polkadot-sdk/substrate/client/network/sync" }
+# sc-network-light = { path = "../polkadot-sdk/substrate/client/network/light" }
+# sc-network-transactions = { path = "../polkadot-sdk/substrate/client/network/transactions" }
+# sc-client-api = { path = "../polkadot-sdk/substrate/client/api" }
+# sc-network-gossip = { path = "../polkadot-sdk/substrate/client/network-gossip" }
+# sc-chain-spec = { path = "../polkadot-sdk/substrate/client/chain-spec" }
+# sc-chain-spec-derive = { path = "../polkadot-sdk/substrate/client/chain-spec/derive" }
+# sc-rpc-api = { path = "../polkadot-sdk/substrate/client/rpc-api" }
+# sc-cli = { path = "../polkadot-sdk/substrate/client/cli" }
+# sc-service = { path = "../polkadot-sdk/substrate/client/service" }
+# sc-rpc-server = { path = "../polkadot-sdk/substrate/client/rpc-servers" }
+# sc-sysinfo = { path = "../polkadot-sdk/substrate/client/sysinfo" }
+# sc-client-db = { path = "../polkadot-sdk/substrate/client/db" }
+# sc-rpc = { path = "../polkadot-sdk/substrate/client/rpc" }
+# sc-offchain = { path = "../polkadot-sdk/substrate/client/offchain" }
+
+# # patch generated by './scripts/dev_manifest.sh ../open-runtime-module-library/'
+# [patch."https://github.com/gasp-xyz/open-runtime-module-library"]
+# orml-tokens = { path = "../open-runtime-module-library/tokens" }
+# orml-asset-registry = { path = "../open-runtime-module-library/asset-registry" }
+# orml-traits = { path = "../open-runtime-module-library/traits" }
+# orml-utilities = { path = "../open-runtime-module-library/utilities" }
diff --git a/pallets/bootstrap/src/mock.rs b/pallets/bootstrap/src/mock.rs
index 54e6178c3..ebdd07859 100644
--- a/pallets/bootstrap/src/mock.rs
+++ b/pallets/bootstrap/src/mock.rs
@@ -177,6 +177,7 @@ impl pallet_proof_of_stake::Config for Test {
 	type Min3rdPartyRewardVolume = ConstU128<10>;
 	type ValuationApi = MockValuationApi;
 	type SchedulesPerBlock = ConstU32<5>;
+	type NontransferableTokens = Nothing;
 }
 
 impl BootstrapBenchmarkingConfig for Test {}
diff --git a/pallets/market/src/lib.rs b/pallets/market/src/lib.rs
index 70042ec78..e4de2789e 100644
--- a/pallets/market/src/lib.rs
+++ b/pallets/market/src/lib.rs
@@ -899,8 +899,9 @@ pub mod pallet {
 		) -> Option<T::Balance> {
 			let pool_info = Self::get_pool_info(pool_id).ok()?;
 			match pool_info.kind {
-				PoolKind::Xyk => T::Xyk::expected_amount_for_minting(pool_id, asset_id, amount),
-				PoolKind::StableSwap => Some(amount),
+				PoolKind::Xyk => T::Xyk::get_expected_amount_for_mint(pool_id, asset_id, amount),
+				PoolKind::StableSwap =>
+					T::StableSwap::get_expected_amount_for_mint(pool_id, asset_id, amount),
 			}
 		}
 
@@ -998,11 +999,25 @@ pub mod pallet {
 					(lp_amount, second_asset_withdrawn)
 				},
 				PoolKind::StableSwap => {
-					// use 1:1 rate for amounts
+					let expected = T::StableSwap::get_expected_amount_for_mint(
+						pool_info.pool_id,
+						asset_id,
+						amount,
+					)
+					.unwrap_or_default();
+
+					ensure!(expected <= max_amount, Error::<T>::ExcesiveInputAmount);
+
+					let amounts = if asset_id == pool_info.pool.0 {
+						(amount, expected)
+					} else {
+						(expected, amount)
+					};
+
 					let lp_amount = T::StableSwap::add_liquidity(
 						&sender,
 						pool_info.pool_id,
-						(amount, amount),
+						amounts,
 						Zero::zero(),
 					)?;
 					if activate && T::Rewards::native_rewards_enabled(pool_info.pool_id) {
@@ -1013,7 +1028,7 @@ pub mod pallet {
 							Some(ActivateKind::AvailableBalance),
 						)?;
 					}
-					(lp_amount, amount)
+					(lp_amount, expected)
 				},
 			};
 
diff --git a/pallets/multipurpose-liquidity/src/mock.rs b/pallets/multipurpose-liquidity/src/mock.rs
index b3e7d7f90..2cc0bda8a 100644
--- a/pallets/multipurpose-liquidity/src/mock.rs
+++ b/pallets/multipurpose-liquidity/src/mock.rs
@@ -229,10 +229,6 @@ impl<T: Config> XykFunctionsTrait<AccountId, Balance, TokenId> for MockXyk<T> {
 	) -> DispatchResult {
 		unimplemented!()
 	}
-
-	fn expected_amount_for_minting(_: u32, _: u32, _: u128) -> Option<u128> {
-		unimplemented!()
-	}
 }
 
 // This function basically just builds a genesis storage key/value store according to
diff --git a/pallets/proof-of-stake/src/lib.rs b/pallets/proof-of-stake/src/lib.rs
index 27e09d134..8e32aaa8f 100644
--- a/pallets/proof-of-stake/src/lib.rs
+++ b/pallets/proof-of-stake/src/lib.rs
@@ -171,7 +171,7 @@ use sp_runtime::traits::AccountIdConversion;
 
 use frame_support::{
 	pallet_prelude::*,
-	traits::{tokens::currency::MultiTokenCurrency, ExistenceRequirement, Get},
+	traits::{tokens::currency::MultiTokenCurrency, Contains, ExistenceRequirement, Get},
 	transactional,
 };
 
@@ -424,6 +424,9 @@ pub mod pallet {
 			Balance = BalanceOf<Self>,
 		>;
 
+		/// Tokens which cannot be transfered by extrinsics/user or use in pool, unless foundation override
+		type NontransferableTokens: Contains<CurrencyIdOf<Self>>;
+
 		#[cfg(feature = "runtime-benchmarks")]
 		type Xyk: XykFunctionsTrait<Self::AccountId, BalanceOf<Self>, CurrencyIdOf<Self>>;
 	}
@@ -463,6 +466,8 @@ pub mod pallet {
 		NoThirdPartyPartyRewardsToClaim,
 		// cannot promote solo token
 		SoloTokenPromotionForbiddenError,
+		/// Asset cannot be used for rewards
+		NontransferableToken,
 	}
 
 	#[pallet::event]
@@ -750,6 +755,12 @@ pub mod pallet {
 			schedule_end: SessionId,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
+
+			ensure!(
+				!T::NontransferableTokens::contains(&token_id),
+				Error::<T>::NontransferableToken
+			);
+
 			Self::reward_pool_impl(sender, pool_id, token_id, amount, schedule_end)
 		}
 
@@ -772,6 +783,11 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 
+			ensure!(
+				!T::NontransferableTokens::contains(&reward_token),
+				Error::<T>::NontransferableToken
+			);
+
 			Self::activate_liquidity_for_3rdparty_rewards_impl(
 				sender,
 				liquidity_token_id,
diff --git a/pallets/proof-of-stake/src/mock.rs b/pallets/proof-of-stake/src/mock.rs
index 8c5aff710..d5997c01e 100644
--- a/pallets/proof-of-stake/src/mock.rs
+++ b/pallets/proof-of-stake/src/mock.rs
@@ -298,6 +298,7 @@ impl pos::Config for Test {
 	type WeightInfo = ();
 	type ValuationApi = MockValuationApi;
 	type SchedulesPerBlock = ConstU32<5>;
+	type NontransferableTokens = Nothing;
 }
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -314,6 +315,7 @@ impl pos::Config for Test {
 	type WeightInfo = ();
 	type ValuationApi = MockValuationApi;
 	type SchedulesPerBlock = ConstU32<5>;
+	type NontransferableTokens = Nothing;
 	type Xyk = Xyk;
 }
 
diff --git a/pallets/rolldown/src/lib.rs b/pallets/rolldown/src/lib.rs
index 6c598a7e9..db7ff88cd 100644
--- a/pallets/rolldown/src/lib.rs
+++ b/pallets/rolldown/src/lib.rs
@@ -525,6 +525,8 @@ pub mod pallet {
 		UninitializedChainId,
 		// Asset can be withdrawn only to sender's address
 		NontransferableToken,
+		// the deposit was already ferried
+		AlreadyFerried,
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
@@ -1496,7 +1498,7 @@ impl<T: Config> Pallet<T> {
 			(update.pendingDeposits.len() as u128) +
 			(update.pendingCancelResolutions.len() as u128);
 
-		ensure!(last_id > LastProcessedRequestOnL2::<T>::get(l1), Error::<T>::WrongRequestId);
+		ensure!(last_id >= LastProcessedRequestOnL2::<T>::get(l1), Error::<T>::WrongRequestId);
 
 		let mut deposit_it = update.pendingDeposits.iter();
 		let mut cancel_it = update.pendingCancelResolutions.iter();
@@ -1521,8 +1523,8 @@ impl<T: Config> Pallet<T> {
 			update_hash: update.abi_encode_hash(),
 			update_size: update.pendingDeposits.len() as u128 +
 				update.pendingCancelResolutions.len() as u128,
-			max_id: lowest_id,
-			min_id: last_id,
+			min_id: lowest_id,
+			max_id: last_id,
 		})
 	}
 
@@ -1843,6 +1845,11 @@ impl<T: Config> Pallet<T> {
 			return Err(Error::<T>::AlreadyExecuted);
 		}
 
+		ensure!(
+			!FerriedDeposits::<T>::contains_key((chain, deposit_hash)),
+			Error::<T>::AlreadyFerried
+		);
+
 		let amount = deposit
 			.amount
 			.checked_sub(deposit.ferryTip)
diff --git a/pallets/rolldown/src/tests.rs b/pallets/rolldown/src/tests.rs
index be64780af..30d09331e 100644
--- a/pallets/rolldown/src/tests.rs
+++ b/pallets/rolldown/src/tests.rs
@@ -1028,7 +1028,10 @@ fn reject_update_with_invalid_too_high_request_id() {
 
 #[test]
 #[serial]
-fn reject_update_without_new_updates() {
+// changed to accept
+// seq gets the rights BEFORE LastProcessedRequestOnL2 is updated
+// a single request would be duplicated, extrinsic fail and break seq
+fn accept_update_without_new_updates() {
 	ExtBuilder::new().execute_with_default_mocks(|| {
 		forward_to_block::<Test>(10);
 
@@ -1044,10 +1047,10 @@ fn reject_update_without_new_updates() {
 		forward_to_block::<Test>(16);
 		assert_eq!(LastProcessedRequestOnL2::<Test>::get(consts::CHAIN), 1u128.into());
 
-		assert_err!(
-			Rolldown::update_l2_from_l1_unsafe(RuntimeOrigin::signed(ALICE), deposit_update),
-			Error::<Test>::WrongRequestId
-		);
+		assert_ok!(Rolldown::update_l2_from_l1_unsafe(
+			RuntimeOrigin::signed(ALICE),
+			deposit_update
+		));
 	});
 }
 
diff --git a/pallets/stable-swap/src/lib.rs b/pallets/stable-swap/src/lib.rs
index 2e906ecff..f8785837b 100644
--- a/pallets/stable-swap/src/lib.rs
+++ b/pallets/stable-swap/src/lib.rs
@@ -1785,6 +1785,32 @@ impl<T: Config> ComputeBalances for Pallet<T> {
 	) -> Option<Self::Balance> {
 		Self::calc_lp_token_amount(&pool_id, vec![amounts.0, amounts.1], true).ok()
 	}
+
+	fn get_expected_amount_for_mint(
+		pool_id: Self::CurrencyId,
+		asset_id: Self::CurrencyId,
+		amount: Self::Balance,
+	) -> Option<Self::Balance> {
+		let info = Pools::<T>::get(pool_id)?;
+		let asset1 = info.assets.get(0)?;
+		let asset2 = info.assets.get(1)?;
+		let exp1 = info.rate_multipliers.get(0)?;
+		let exp2 = info.rate_multipliers.get(1)?;
+
+		let (same, other) = if asset_id == *asset1 {
+			(exp1, exp2)
+		} else if asset_id == *asset2 {
+			(exp2, exp1)
+		} else {
+			return None;
+		};
+
+		T::HigherPrecisionBalance::from(amount)
+			.checked_mul(&T::HigherPrecisionBalance::from(*same))?
+			.checked_div(&T::HigherPrecisionBalance::from(*other))?
+			.try_into()
+			.ok()
+	}
 }
 
 impl<T: Config> Mutate<T::AccountId> for Pallet<T> {
diff --git a/pallets/xyk/src/lib.rs b/pallets/xyk/src/lib.rs
index 0fe7a7c39..c7711a6ec 100644
--- a/pallets/xyk/src/lib.rs
+++ b/pallets/xyk/src/lib.rs
@@ -3519,28 +3519,6 @@ impl<T: Config> XykFunctionsTrait<T::AccountId, BalanceOf<T>, CurrencyIdOf<T>> f
 	fn is_liquidity_token(liquidity_asset_id: CurrencyIdOf<T>) -> bool {
 		LiquidityPools::<T>::get(liquidity_asset_id).is_some()
 	}
-
-	// copypasta from mint_liquidity
-	fn expected_amount_for_minting(
-		liquidity_asset_id: CurrencyIdOf<T>,
-		asset_id: CurrencyIdOf<T>,
-		amount: BalanceOf<T>,
-	) -> Option<BalanceOf<T>> {
-		let (first_asset_id, second_asset_id) = LiquidityPools::<T>::get(liquidity_asset_id)?;
-		let (first_asset_reserve, second_asset_reserve) =
-			Pallet::<T>::get_reserves(first_asset_id, second_asset_id).ok()?;
-
-		let (b, c) = if asset_id == first_asset_id {
-			(second_asset_reserve, first_asset_reserve)
-		} else {
-			(first_asset_reserve, second_asset_reserve)
-		};
-
-		multiply_by_rational_with_rounding(amount.into(), b.into(), c.into(), Rounding::Down)?
-			.checked_add(1)?
-			.try_into()
-			.ok()
-	}
 }
 
 pub trait AssetMetadataMutationTrait<CurrencyId> {
@@ -3800,8 +3778,8 @@ impl<T: Config> ComputeBalances for Pallet<T> {
 		let reserves = Pools::<T>::get(pool);
 		let supply = <T as Config>::Currency::total_issuance(pool_id);
 
-		let exp_1 = Self::expected_amount_for_minting(pool_id, pool.0, amounts.0)?;
-		let exp_0 = Self::expected_amount_for_minting(pool_id, pool.1, amounts.1)?;
+		let exp_1 = Self::get_expected_amount_for_mint(pool_id, pool.0, amounts.0)?;
+		let exp_0 = Self::get_expected_amount_for_mint(pool_id, pool.1, amounts.1)?;
 
 		let (amount, reserve) = if exp_1 == amounts.1 {
 			(amounts.0, reserves.0)
@@ -3820,6 +3798,28 @@ impl<T: Config> ComputeBalances for Pallet<T> {
 		.try_into()
 		.ok()
 	}
+
+	// copypasta from mint_liquidity
+	fn get_expected_amount_for_mint(
+		pool_id: Self::CurrencyId,
+		asset_id: Self::CurrencyId,
+		amount: Self::Balance,
+	) -> Option<Self::Balance> {
+		let (first_asset_id, second_asset_id) = LiquidityPools::<T>::get(pool_id)?;
+		let (first_asset_reserve, second_asset_reserve) =
+			Pallet::<T>::get_reserves(first_asset_id, second_asset_id).ok()?;
+
+		let (b, c) = if asset_id == first_asset_id {
+			(second_asset_reserve, first_asset_reserve)
+		} else {
+			(first_asset_reserve, second_asset_reserve)
+		};
+
+		multiply_by_rational_with_rounding(amount.into(), b.into(), c.into(), Rounding::Down)?
+			.checked_add(1)?
+			.try_into()
+			.ok()
+	}
 }
 
 impl<T: Config> TreasuryBurn for Pallet<T> {
diff --git a/pallets/xyk/src/mock.rs b/pallets/xyk/src/mock.rs
index a4d119a59..9b4695673 100644
--- a/pallets/xyk/src/mock.rs
+++ b/pallets/xyk/src/mock.rs
@@ -335,6 +335,7 @@ impl pallet_proof_of_stake::Config for Test {
 	type Min3rdPartyRewardVolume = ConstU128<10>;
 	type ValuationApi = MockValuationApi;
 	type SchedulesPerBlock = ConstU32<5>;
+	type NontransferableTokens = Nothing;
 }
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -351,6 +352,7 @@ impl pallet_proof_of_stake::Config for Test {
 	type Min3rdPartyRewardVolume = ConstU128<10>;
 	type ValuationApi = MockValuationApi;
 	type SchedulesPerBlock = ConstU32<5>;
+	type NontransferableTokens = Nothing;
 }
 
 pub struct TokensActivationPassthrough<T: Config>(PhantomData<T>);
diff --git a/rollup/runtime/integration-test/src/market.rs b/rollup/runtime/integration-test/src/market.rs
index 3959591f6..062dc4dba 100644
--- a/rollup/runtime/integration-test/src/market.rs
+++ b/rollup/runtime/integration-test/src/market.rs
@@ -116,6 +116,7 @@ fn create_pool_works() {
 fn add_liquidity_works() {
 	test_env().execute_with(|| {
 		assert_ok!(create_pool_unb(PoolKind::Xyk, (ASSET_ID_2, ASSET_ID_1)));
+		// note that the created pool will be sorted as (ASSET_ID_1, ASSET_ID_2)
 		assert_ok!(create_pool_unb(PoolKind::StableSwap, (ASSET_ID_2, ASSET_ID_1)));
 
 		let expected =
@@ -135,7 +136,7 @@ fn add_liquidity_works() {
 		let expected =
 			Market::calculate_expected_amount_for_minting(POOL_ID_2, ASSET_ID_2, UNIT).unwrap();
 		let lp_expected =
-			Market::calculate_expected_lp_minted(POOL_ID_2, (UNIT, expected)).unwrap();
+			Market::calculate_expected_lp_minted(POOL_ID_2, (expected, UNIT)).unwrap();
 		assert_ok!(Market::mint_liquidity(origin(), POOL_ID_2, ASSET_ID_2, UNIT, 10 * UNIT));
 		System::assert_last_event(RuntimeEvent::Market(Event::LiquidityMinted {
 			who: AccountId::from(ALICE),
@@ -143,7 +144,7 @@ fn add_liquidity_works() {
 			amounts_provided: (1000000000000000000, expected),
 			lp_token: POOL_ID_2,
 			lp_token_minted: lp_expected,
-			total_supply: 114992390693470089383,
+			total_supply: 110000000000000000000,
 		}));
 	})
 }
diff --git a/rollup/runtime/src/lib.rs b/rollup/runtime/src/lib.rs
index 9cc51335b..1486193b8 100644
--- a/rollup/runtime/src/lib.rs
+++ b/rollup/runtime/src/lib.rs
@@ -366,6 +366,7 @@ impl pallet_proof_of_stake::Config for Runtime {
 	type Min3rdPartyRewardVolume = cfg::pallet_proof_of_stake::Min3rdPartyRewardVolume;
 	type SchedulesPerBlock = cfg::pallet_proof_of_stake::SchedulesPerBlock;
 	type ValuationApi = Market;
+	type NontransferableTokens = tokens::NontransferableTokens;
 	#[cfg(feature = "runtime-benchmarks")]
 	type Xyk = Xyk;
 }