diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08e07bd..e06a139 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,7 +39,7 @@ commands:
 jobs:
   lint:
     docker:
-      - image: polymeshassociation/rust:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust:debian-nightly-2024-11-14
     resource_class: small
     environment:
       VERBOSE: "1"
@@ -53,7 +53,7 @@ jobs:
           command: ./scripts/check_spec_and_cargo_version.sh
   check-storage-version:
     docker:
-      - image: polymeshassociation/rust:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust:debian-nightly-2024-11-14
     resource_class: small
     environment:
       VERBOSE: "1"
@@ -64,7 +64,7 @@ jobs:
           command: ./scripts/check_storage_versions.sh
   build:
     docker:
-      - image: polymeshassociation/rust:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust:debian-nightly-2024-11-14
     resource_class: xlarge
     environment:
       VERBOSE: "1"
@@ -106,7 +106,7 @@ jobs:
       - save-sccache-cache
   build-arm64:
     docker:
-      - image: polymeshassociation/rust-arm64:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust-arm64:debian-nightly-2024-11-14
     resource_class: arm.xlarge
     environment:
       VERBOSE: "1"
@@ -133,7 +133,7 @@ jobs:
       - save-sccache-cache
   benchmark-build:
     docker:
-      - image: polymeshassociation/rust:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust:debian-nightly-2024-11-14
     resource_class: xlarge
     environment:
       VERBOSE: "1"
@@ -170,7 +170,7 @@ jobs:
           no_output_timeout: 30m
   test:
     docker:
-      - image: polymeshassociation/rust:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust:debian-nightly-2024-11-14
     resource_class: large
     environment:
       VERBOSE: "1"
@@ -191,7 +191,7 @@ jobs:
       - save-sccache-cache
   coverage:
     docker:
-      - image: polymeshassociation/rust:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust:debian-nightly-2024-11-14
     resource_class: xlarge
     environment:
       VERBOSE: "1"
@@ -206,7 +206,7 @@ jobs:
       - save-sccache-cache
   rust-integration-test:
     docker:
-      - image: polymeshassociation/rust:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust:debian-nightly-2024-11-14
     resource_class: medium+
     environment:
       - VERBOSE: "1"
@@ -237,7 +237,7 @@ jobs:
           no_output_timeout: 30m
   clippy:
     docker:
-      - image: polymeshassociation/rust:debian-nightly-2023-12-11
+      - image: polymeshassociation/rust:debian-nightly-2024-11-14
     resource_class: xlarge
     environment:
       VERBOSE: "1"
diff --git a/Cargo.lock b/Cargo.lock
index a8dfe08..550bcf1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom 0.2.12",
  "once_cell",
@@ -160,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom 0.2.12",
@@ -622,7 +622,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding 0.2.1",
  "generic-array 0.14.7",
 ]
 
@@ -699,19 +698,21 @@ dependencies = [
 
 [[package]]
 name = "bulletproofs"
-version = "4.0.0"
-source = "git+https://github.com/PolymeshAssociation/bulletproofs?branch=polymesh#b8670ba8905d4e5d5c204677c4b391eea5d4b158"
+version = "5.0.0"
+source = "git+https://github.com/PolymeshAssociation/bulletproofs?branch=v5.0.0#119cc876cdba056cdb71890fbf073f1b296c9edd"
 dependencies = [
  "byteorder",
- "curve25519-dalek-ng",
- "digest 0.9.0",
+ "clear_on_drop",
+ "curve25519-dalek 4.1.3",
+ "digest 0.10.7",
+ "group 0.13.0",
  "merlin 3.0.0",
  "rand 0.8.5",
  "rand_core 0.6.4",
  "serde",
  "serde_derive",
- "sha3 0.9.1",
- "subtle-ng",
+ "sha3",
+ "subtle",
  "thiserror",
 ]
 
@@ -974,6 +975,15 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
+[[package]]
+name = "clear_on_drop"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38508a63f4979f0048febc9966fadbd48e5dab31fd0ec6a3f151bbf4a74f7423"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -1012,12 +1022,12 @@ dependencies = [
 
 [[package]]
 name = "confidential_assets"
-version = "1.0.0"
-source = "git+https://github.com/PolymeshAssociation/confidential_assets?branch=main#09f12ded3a06e971dffb76dc5bb366a17164e737"
+version = "1.1.0"
+source = "git+https://github.com/PolymeshAssociation/confidential_assets?branch=main#a5b0414235be6ed965d9e356022aa2ee00852c03"
 dependencies = [
  "bulletproofs",
  "byteorder",
- "curve25519-dalek-ng",
+ "curve25519-dalek 4.1.3",
  "log",
  "merlin 3.0.0",
  "parity-scale-codec",
@@ -1359,17 +1369,19 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "platforms 3.3.0",
+ "group 0.13.0",
+ "rand_core 0.6.4",
  "rustc_version 0.4.0",
+ "serde",
  "subtle",
  "zeroize",
 ]
@@ -1385,20 +1397,6 @@ dependencies = [
  "syn 2.0.48",
 ]
 
-[[package]]
-name = "curve25519-dalek-ng"
-version = "4.1.1"
-source = "git+https://github.com/atouchet/curve25519-dalek-ng.git?branch=simd#24e1004b5b54517ce361f06a190fefd3ca432cdb"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "packed_simd",
- "rand_core 0.6.4",
- "serde",
- "subtle-ng",
- "zeroize",
-]
-
 [[package]]
 name = "cxx"
 version = "1.0.115"
@@ -1798,7 +1796,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.3",
  "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
@@ -1837,9 +1835,9 @@ dependencies = [
  "crypto-bigint",
  "der 0.6.1",
  "digest 0.10.7",
- "ff",
+ "ff 0.12.1",
  "generic-array 0.14.7",
- "group",
+ "group 0.12.1",
  "hkdf",
  "pem-rfc7468",
  "pkcs8 0.9.0",
@@ -1963,6 +1961,16 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "fiat-crypto"
 version = "0.2.5"
@@ -2519,6 +2527,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom_or_panic"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9"
+dependencies = [
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "ghash"
 version = "0.4.4"
@@ -2581,7 +2599,18 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
- "ff",
+ "ff 0.12.1",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
  "rand_core 0.6.4",
  "subtle",
 ]
@@ -2640,7 +2669,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.7",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -2649,7 +2678,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
 ]
 
 [[package]]
@@ -2842,7 +2871,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite 0.2.13",
- "socket2 0.4.10",
+ "socket2 0.5.5",
  "tokio",
  "tower-service",
  "tracing",
@@ -4173,7 +4202,7 @@ dependencies = [
  "digest 0.10.7",
  "multihash-derive",
  "sha2 0.10.8",
- "sha3 0.10.8",
+ "sha3",
  "unsigned-varint",
 ]
 
@@ -4339,7 +4368,7 @@ dependencies = [
 [[package]]
 name = "node-rpc"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4365,7 +4394,7 @@ dependencies = [
 [[package]]
 name = "node-rpc-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4464,7 +4493,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
- "libm",
 ]
 
 [[package]]
@@ -4562,20 +4590,10 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
-[[package]]
-name = "packed_simd"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d"
-dependencies = [
- "cfg-if",
- "num-traits",
-]
-
 [[package]]
 name = "pallet-asset"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "arrayvec 0.7.4",
  "frame-benchmarking",
@@ -4595,7 +4613,7 @@ dependencies = [
  "polymesh-common-utilities",
  "polymesh-primitives",
  "polymesh-primitives-derive",
- "polymesh-runtime-common 1.0.0 (git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0)",
+ "polymesh-runtime-common 1.0.0 (git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop)",
  "rustc-hex",
  "scale-info",
  "serde",
@@ -4667,7 +4685,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4707,7 +4725,7 @@ dependencies = [
 [[package]]
 name = "pallet-base"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4727,7 +4745,7 @@ dependencies = [
 [[package]]
 name = "pallet-committee"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4752,7 +4770,7 @@ dependencies = [
 [[package]]
 name = "pallet-compliance-manager"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "either",
  "frame-benchmarking",
@@ -4862,7 +4880,7 @@ dependencies = [
 [[package]]
 name = "pallet-corporate-actions"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4931,7 +4949,7 @@ dependencies = [
 [[package]]
 name = "pallet-external-agents"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4977,7 +4995,7 @@ dependencies = [
 [[package]]
 name = "pallet-group"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5001,7 +5019,7 @@ dependencies = [
 [[package]]
 name = "pallet-group-rpc"
 version = "2.0.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5022,7 +5040,7 @@ dependencies = [
 [[package]]
 name = "pallet-group-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "parity-scale-codec",
  "polymesh-common-utilities",
@@ -5035,7 +5053,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "either",
  "frame-benchmarking",
@@ -5052,7 +5070,7 @@ dependencies = [
  "polymesh-common-utilities",
  "polymesh-primitives",
  "scale-info",
- "schnorrkel 0.10.2",
+ "schnorrkel 0.11.4",
  "serde",
  "serde_derive",
  "sp-api",
@@ -5117,7 +5135,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5140,7 +5158,7 @@ dependencies = [
 [[package]]
 name = "pallet-nft"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5179,7 +5197,7 @@ dependencies = [
 [[package]]
 name = "pallet-permissions"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5196,7 +5214,7 @@ dependencies = [
 [[package]]
 name = "pallet-pips"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5214,7 +5232,7 @@ dependencies = [
  "polymesh-common-utilities",
  "polymesh-primitives",
  "polymesh-primitives-derive",
- "polymesh-runtime-common 1.0.0 (git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0)",
+ "polymesh-runtime-common 1.0.0 (git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop)",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "scale-info",
@@ -5231,7 +5249,7 @@ dependencies = [
 [[package]]
 name = "pallet-portfolio"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5271,7 +5289,7 @@ dependencies = [
 [[package]]
 name = "pallet-protocol-fee"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5291,7 +5309,7 @@ dependencies = [
 [[package]]
 name = "pallet-protocol-fee-rpc"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5312,7 +5330,7 @@ dependencies = [
 [[package]]
 name = "pallet-protocol-fee-rpc-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "parity-scale-codec",
  "polymesh-common-utilities",
@@ -5324,7 +5342,7 @@ dependencies = [
 [[package]]
 name = "pallet-relayer"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5379,7 +5397,7 @@ dependencies = [
 [[package]]
 name = "pallet-settlement"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5415,7 +5433,7 @@ dependencies = [
 [[package]]
 name = "pallet-statistics"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5441,7 +5459,7 @@ dependencies = [
 [[package]]
 name = "pallet-sto"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5475,7 +5493,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5490,7 +5508,7 @@ dependencies = [
 [[package]]
 name = "pallet-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5527,7 +5545,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5546,7 +5564,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5571,7 +5589,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5882,12 +5900,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
 
-[[package]]
-name = "platforms"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
-
 [[package]]
 name = "polling"
 version = "3.3.1"
@@ -5916,7 +5928,7 @@ dependencies = [
 [[package]]
 name = "polymesh-build-tool"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "substrate-wasm-builder",
 ]
@@ -5924,7 +5936,7 @@ dependencies = [
 [[package]]
 name = "polymesh-common-utilities"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5934,7 +5946,7 @@ dependencies = [
  "polymesh-primitives",
  "polymesh-primitives-derive",
  "scale-info",
- "schnorrkel 0.10.2",
+ "schnorrkel 0.11.4",
  "serde",
  "serde_derive",
  "sp-api",
@@ -5948,7 +5960,7 @@ dependencies = [
 [[package]]
 name = "polymesh-contracts"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5974,7 +5986,7 @@ dependencies = [
 [[package]]
 name = "polymesh-extensions"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6009,7 +6021,7 @@ dependencies = [
 [[package]]
 name = "polymesh-primitives"
 version = "5.0.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "chrono",
  "either",
@@ -6022,7 +6034,7 @@ dependencies = [
  "rand_core 0.6.4",
  "rustc-hex",
  "scale-info",
- "schnorrkel 0.10.2",
+ "schnorrkel 0.11.4",
  "serde",
  "serde_bytes",
  "sp-application-crypto",
@@ -6038,7 +6050,7 @@ dependencies = [
 [[package]]
 name = "polymesh-primitives-derive"
 version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6050,7 +6062,6 @@ name = "polymesh-private"
 version = "2.0.0"
 dependencies = [
  "clap",
- "curve25519-dalek-ng",
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "frame-support",
@@ -6422,7 +6433,7 @@ dependencies = [
 [[package]]
 name = "polymesh-runtime-common"
 version = "1.0.0"
-source = "git+https://github.com/PolymeshAssociation/Polymesh.git?tag=v7.0.0#048d4dc5026af014d709090bce833ed6c68b68a9"
+source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -7644,7 +7655,7 @@ name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
 source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "array-bytes",
  "async-trait",
  "dyn-clone",
@@ -7913,7 +7924,7 @@ name = "sc-network-gossip"
 version = "0.10.0-dev"
 source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "futures",
  "futures-timer",
  "libp2p",
@@ -8428,7 +8439,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "cfg-if",
  "hashbrown 0.13.2",
 ]
@@ -8453,18 +8464,20 @@ dependencies = [
 
 [[package]]
 name = "schnorrkel"
-version = "0.10.2"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d"
+checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
 dependencies = [
+ "aead 0.5.2",
  "arrayref",
  "arrayvec 0.7.4",
- "curve25519-dalek-ng",
+ "curve25519-dalek 4.1.3",
+ "getrandom_or_panic",
  "merlin 3.0.0",
  "rand_core 0.6.4",
  "serde_bytes",
- "sha2 0.9.9",
- "subtle-ng",
+ "sha2 0.10.8",
+ "subtle",
  "zeroize",
 ]
 
@@ -8709,18 +8722,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "sha3"
 version = "0.10.8"
@@ -8829,7 +8830,7 @@ dependencies = [
  "aes-gcm 0.10.3",
  "blake2",
  "chacha20poly1305",
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.3",
  "rand_core 0.6.4",
  "ring 0.17.7",
  "rustc_version 0.4.0",
@@ -9110,7 +9111,7 @@ dependencies = [
  "byteorder",
  "digest 0.10.7",
  "sha2 0.10.8",
- "sha3 0.10.8",
+ "sha3",
  "sp-std",
  "twox-hash",
 ]
@@ -9450,7 +9451,7 @@ name = "sp-trie"
 version = "7.0.0"
 source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.11",
  "hash-db",
  "hashbrown 0.12.3",
  "lazy_static",
@@ -9677,7 +9678,7 @@ name = "substrate-build-script-utils"
 version = "3.0.0"
 source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
 dependencies = [
- "platforms 2.0.0",
+ "platforms",
 ]
 
 [[package]]
@@ -9781,12 +9782,6 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
-[[package]]
-name = "subtle-ng"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -11518,7 +11513,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.3",
  "rand_core 0.6.4",
  "serde",
  "zeroize",
diff --git a/Cargo.toml b/Cargo.toml
index b209d67..2015077 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,10 +99,10 @@ substrate-prometheus-endpoint = { git = "https://github.com/PolymeshAssociation/
 substrate-build-script-utils = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
 substrate-wasm-builder = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
 
-bulletproofs = { version = "4.0.0", git = "https://github.com/PolymeshAssociation/bulletproofs", branch = "polymesh" }
+bulletproofs = { version = "5.0.0", git = "https://github.com/PolymeshAssociation/bulletproofs", branch = "v5.0.0" }
+#bulletproofs = { path = "../bulletproofs/" }
 confidential_assets = { git = "https://github.com/PolymeshAssociation/confidential_assets", branch = "main" }
 #confidential_assets = { path = "../confidential_assets" }
-curve25519-dalek-ng = { git = "https://github.com/atouchet/curve25519-dalek-ng.git", branch = "simd" }
 
 substrate-validator-set = { git = "https://github.com/PolymeshAssociation/substrate-validator-set", branch = "polymesh-v6-monthly-2023-03" }
 
@@ -122,51 +122,51 @@ exclude = [
 ## Keep common dependencies here.
 [workspace.dependencies]
 # Our pallets
-pallet-asset = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-balances = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-base = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-committee = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-compliance-manager = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
+pallet-asset = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-balances = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-base = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-committee = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-compliance-manager = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
 pallet-confidential-asset = { path = "pallets/confidential-asset/", default-features = false }
 polymesh-host-functions = { path = "host-functions/", default-features = false }
-pallet-corporate-actions = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-external-agents = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-group = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-identity = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-multisig = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-nft = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-permissions = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-pips = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-portfolio = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-protocol-fee = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-relayer = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-sto = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-settlement = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-statistics = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-test-utils = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-treasury = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-utility = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-sudo = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-polymesh-contracts = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
+pallet-corporate-actions = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-external-agents = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-group = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-identity = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-multisig = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-nft = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-permissions = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-pips = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-portfolio = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-protocol-fee = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-relayer = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-sto = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-settlement = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-statistics = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-test-utils = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-treasury = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-utility = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-sudo = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+polymesh-contracts = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
 
 # Common
-polymesh-common-utilities = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
+polymesh-common-utilities = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
 polymesh-runtime-common = { path = "runtime/common/", default-features = false }
-polymesh-primitives = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
+polymesh-primitives = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
 polymesh-weights = { path = "pallets/weights/", default-features = false }
-polymesh-extensions = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
+polymesh-extensions = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
 
 # RPC
-node-rpc = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-node-rpc-runtime-api = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-group-rpc = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-group-rpc-runtime-api = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-protocol-fee-rpc = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
-pallet-protocol-fee-rpc-runtime-api = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
+node-rpc = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+node-rpc-runtime-api = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-group-rpc = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-group-rpc-runtime-api = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-protocol-fee-rpc = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
+pallet-protocol-fee-rpc-runtime-api = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
 
 # Build tool
-polymesh-build-tool = { git = "https://github.com/PolymeshAssociation/Polymesh.git", tag = "v7.0.0", default-features = false }
+polymesh-build-tool = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false }
 
 # Substrate
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
@@ -310,7 +310,7 @@ substrate-frame-rpc-system = { version = "4.0.0-dev" }
 substrate-state-trie-migration-rpc = { version = "4.0.0-dev" }
 
 # Substrate
-codec = { workspace = true, package = "parity-scale-codec" }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
@@ -341,30 +341,11 @@ sp-transaction-pool = { workspace = true }
 frame-benchmarking = "4.0.0-dev"
 frame-benchmarking-cli = "4.0.0-dev"
 
-curve25519-dalek = { package = "curve25519-dalek-ng", version = "4", default-features = false, features = ["alloc"] }
-
 [build-dependencies]
 substrate-build-script-utils = { version = "3.0.0" }
 
 [features]
-default = ["std", "simd_backend"]
-
-# Backends
-u64_backend = [
-	"polymesh-host-functions/u64_backend",
-	"polymesh-private-runtime-develop/u64_backend",
-	"polymesh-private-runtime-production/u64_backend",
-]
-simd_backend = [
-	"polymesh-host-functions/simd_backend",
-	"polymesh-private-runtime-develop/simd_backend",
-	"polymesh-private-runtime-production/simd_backend",
-]
-avx2_backend = [
-	"polymesh-host-functions/avx2_backend",
-	"polymesh-private-runtime-develop/avx2_backend",
-	"polymesh-private-runtime-production/avx2_backend",
-]
+default = ["std"]
 
 running-ci = [ "polymesh-private-runtime-develop/running-ci" ]
 default_identity = [ "polymesh-common-utilities/default_identity" ]
diff --git a/host-functions/Cargo.toml b/host-functions/Cargo.toml
index ad4e9ce..85d4c28 100644
--- a/host-functions/Cargo.toml
+++ b/host-functions/Cargo.toml
@@ -20,20 +20,15 @@ log = "0.4"
 
 # Substrate
 scale-info = { workspace = true, default-features = false, features = ["derive"] }
-codec = { workspace = true, package = "parity-scale-codec", default-features = false, features = ["derive"] }
+codec = { workspace = true, default-features = false, features = ["derive"] }
 sp-std = { workspace = true, default-features = false }
 sp-core = { workspace = true, default-features = false }
 sp-runtime-interface = { workspace = true, default-features = false }
 
 [features]
-default = ["std", "u64_backend"]
+default = ["std"]
 
-# Backends
-u64_backend = ["confidential_assets/u64_backend"]
-simd_backend = ["confidential_assets/simd_backend"]
-avx2_backend = ["confidential_assets/avx2_backend"]
-
-no_std = ["confidential_assets/no_std", "u64_backend"]
+no_std = ["confidential_assets/no_std"]
 std = [
     "rand_core/std",
     "rand_chacha/std",
diff --git a/host-functions/src/batch.rs b/host-functions/src/batch.rs
index c2d8ad3..687d260 100644
--- a/host-functions/src/batch.rs
+++ b/host-functions/src/batch.rs
@@ -21,6 +21,7 @@ lazy_static::lazy_static! {
     };
 }
 
+#[cfg(feature = "runtime-benchmarks")]
 pub type Hash = [u8; 8];
 
 #[derive(Debug)]
@@ -82,7 +83,9 @@ impl InnerBatchVerifiers {
                 let _ = tx.send(BatchResult {
                     id: req_id,
                     result,
+                    #[cfg(feature = "runtime-benchmarks")]
                     proof: Err(Error::VerifyFailed),
+                    #[cfg(feature = "runtime-benchmarks")]
                     key: None,
                 });
             });
@@ -200,7 +203,9 @@ impl BatchVerifiers {
 pub struct BatchResult {
     pub id: BatchReqId,
     pub result: Result<(), Error>,
+    #[cfg(feature = "runtime-benchmarks")]
     pub proof: Result<GenerateProofResponse, Error>,
+    #[cfg(feature = "runtime-benchmarks")]
     pub key: Option<Hash>,
 }
 
diff --git a/pallets/confidential-asset/Cargo.toml b/pallets/confidential-asset/Cargo.toml
index 21d0d10..66e95f0 100644
--- a/pallets/confidential-asset/Cargo.toml
+++ b/pallets/confidential-asset/Cargo.toml
@@ -25,7 +25,7 @@ confidential_assets = { workspace = true, default-features = false }
 polymesh-host-functions = { workspace = true, default-features = false }
 
 # Substrate
-codec = { workspace = true, package = "parity-scale-codec", default-features = false, features = ["derive"] }
+codec = { workspace = true, default-features = false, features = ["derive"] }
 scale-info = { workspace = true, default-features = false, features = ["derive"] }
 frame-system = { workspace = true, default-features = false }
 frame-support = { workspace = true, default-features = false }
@@ -38,27 +38,13 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional
 
 [features]
 equalize = []
-default = ["std", "equalize", "u64_backend"]
+default = ["std", "equalize"]
 
 testing = [
   "polymesh-host-functions/runtime-benchmarks",
 ]
 
-# Backends
-u64_backend = [
-  "confidential_assets/u64_backend",
-  "polymesh-host-functions/u64_backend",
-]
-simd_backend = [
-  "confidential_assets/simd_backend",
-  "polymesh-host-functions/simd_backend",
-]
-avx2_backend = [
-  "confidential_assets/avx2_backend",
-  "polymesh-host-functions/avx2_backend",
-]
-
-no_std = ["confidential_assets/no_std", "polymesh-host-functions/no_std", "u64_backend"]
+no_std = ["confidential_assets/no_std", "polymesh-host-functions/no_std"]
 std = [
     "rand_core/std",
     "rand_chacha/std",
@@ -89,3 +75,4 @@ runtime-benchmarks = [
     "polymesh-host-functions/runtime-benchmarks",
     "sp-runtime/runtime-benchmarks",
 ]
+try-runtime = []
diff --git a/pallets/confidential-asset/src/lib.rs b/pallets/confidential-asset/src/lib.rs
index fcf7ba2..b868fe8 100644
--- a/pallets/confidential-asset/src/lib.rs
+++ b/pallets/confidential-asset/src/lib.rs
@@ -478,7 +478,6 @@ pub mod pallet {
     use frame_system::pallet_prelude::*;
 
     #[pallet::pallet]
-    #[pallet::generate_store(pub(super) trait Store)]
     #[pallet::without_storage_info]
     pub struct Pallet<T>(_);
 
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index e8ddac1..dc3fb02 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -22,7 +22,7 @@ pallet-group-rpc-runtime-api = { workspace = true, default-features = false}
 smallvec = "1.4.0"
 
 # Substrate
-codec = { workspace = true, package = "parity-scale-codec", default-features = false, features = ["derive"] }
+codec = { workspace = true, default-features = false, features = ["derive"] }
 scale-info = { workspace = true, default-features = false, features = ["derive"] }
 sp-std = { workspace = true, default-features = false }
 sp-runtime = { workspace = true, default-features = false }
diff --git a/runtime/develop/Cargo.toml b/runtime/develop/Cargo.toml
index be58b7a..8f5c534 100644
--- a/runtime/develop/Cargo.toml
+++ b/runtime/develop/Cargo.toml
@@ -45,7 +45,7 @@ polymesh-contracts = { workspace = true, default-features = false }
 log = "0.4.8"
 
 # Substrate
-codec = { workspace = true, package = "parity-scale-codec", default-features = false, features = ["derive"] }
+codec = { workspace = true, default-features = false, features = ["derive"] }
 scale-info = { workspace = true, default-features = false, features = ["derive"] }
 sp-core = { workspace = true, default-features = false }
 sp-std = { workspace = true, default-features = false }
@@ -103,28 +103,13 @@ getrandom = { version = "0.2.6", default-features = false, optional = true }
 polymesh-build-tool = { workspace = true, default-features = false }
 
 [features]
-default = ["std", "equalize", "u64_backend"]
+default = ["std", "equalize"]
 equalize = []
 
 ci-runtime = []
 
-# Backends
-u64_backend = [
-	"polymesh-primitives/u64_backend",
-	"pallet-confidential-asset/u64_backend",
-]
-simd_backend = [
-	#"polymesh-primitives/simd_backend",
-	"pallet-confidential-asset/simd_backend",
-]
-avx2_backend = [
-	#"polymesh-primitives/avx2_backend",
-	"pallet-confidential-asset/avx2_backend",
-]
-
 no_std = [
     "polymesh-primitives/no_std",
-    "u64_backend"
 ]
 
 std = [
diff --git a/runtime/develop/src/runtime.rs b/runtime/develop/src/runtime.rs
index a8130ad..a99b440 100644
--- a/runtime/develop/src/runtime.rs
+++ b/runtime/develop/src/runtime.rs
@@ -478,6 +478,7 @@ construct_runtime!(
 polymesh_runtime_common::runtime_apis! {
     #[cfg(feature = "runtime-benchmarks")]
     impl frame_benchmarking::Benchmark<Block> for Runtime {
+        #[allow(non_local_definitions)]
         fn dispatch_benchmark(
             config: frame_benchmarking::BenchmarkConfig
         ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
diff --git a/runtime/production/Cargo.toml b/runtime/production/Cargo.toml
index 33a6b10..3ef689d 100644
--- a/runtime/production/Cargo.toml
+++ b/runtime/production/Cargo.toml
@@ -49,7 +49,7 @@ pallet-protocol-fee-rpc-runtime-api = { workspace = true, default-features = fal
 log = "0.4"
 
 # Substrate
-codec = { workspace = true, package = "parity-scale-codec", default-features = false, features = ["derive"] }
+codec = { workspace = true, default-features = false, features = ["derive"] }
 frame-support = { workspace = true, default-features = false }
 frame-system = { workspace = true, default-features = false }
 frame-system-rpc-runtime-api = { workspace = true, default-features = false }
@@ -58,7 +58,7 @@ pallet-authorship = { workspace = true, default-features = false }
 pallet-babe = { workspace = true, default-features = false }
 pallet-contracts = { workspace = true, default-features = false }
 pallet-contracts-primitives = { workspace = true, default-features = false}
-pallet-executive = { package = "frame-executive", workspace = true, default-features = false }
+pallet-executive = { workspace = true, default-features = false }
 pallet-grandpa = { workspace = true, default-features = false }
 pallet-im-online = { workspace = true, default-features = false }
 pallet-indices = { workspace = true, default-features = false }
@@ -92,27 +92,12 @@ validator-set = { workspace = true, default-features = false }
 polymesh-build-tool = { workspace = true, default-features = false }
 
 [features]
-default = ["std", "equalize", "u64_backend"]
+default = ["std", "equalize"]
 equalize = []
 
-# Backends
-u64_backend = [
-	"polymesh-primitives/u64_backend",
-	"pallet-confidential-asset/u64_backend",
-]
-simd_backend = [
-	#"polymesh-primitives/simd_backend",
-	"pallet-confidential-asset/simd_backend",
-]
-avx2_backend = [
-	#"polymesh-primitives/avx2_backend",
-	"pallet-confidential-asset/avx2_backend",
-]
-
 migration-dry-run = []
 no_std = [
     "polymesh-primitives/no_std",
-    "u64_backend"
 ]
 std = [
 		"polymesh-build-tool/std",
diff --git a/runtime/production/src/runtime.rs b/runtime/production/src/runtime.rs
index cbae670..6de2c5d 100644
--- a/runtime/production/src/runtime.rs
+++ b/runtime/production/src/runtime.rs
@@ -159,14 +159,7 @@ type ConfidentialAssetMaxAssetAuditors = ConstSize<4>;
 type ConfidentialAssetMaxAssetMediators = ConstSize<4>;
 type ConfidentialAssetMaxAssetDataLength = ConstSize<8192>;
 
-#[cfg(feature = "runtime-benchmarks")]
-type ConfidentialAssetMaxAssetsPerMoveFunds = ConstSize<2000>;
-#[cfg(feature = "runtime-benchmarks")]
-type ConfidentialAssetMaxMoveFunds = ConstSize<2000>;
-
-#[cfg(not(feature = "runtime-benchmarks"))]
 type ConfidentialAssetMaxAssetsPerMoveFunds = ConstSize<100>;
-#[cfg(not(feature = "runtime-benchmarks"))]
 type ConfidentialAssetMaxMoveFunds = ConstSize<2000>;
 
 type ConfidentialAssetBatchHostThreads = ConstSize<8>;
diff --git a/runtime/tests/Cargo.toml b/runtime/tests/Cargo.toml
index 6357d72..89a6ee6 100644
--- a/runtime/tests/Cargo.toml
+++ b/runtime/tests/Cargo.toml
@@ -45,7 +45,7 @@ log = "0.4.8"
 smallvec = "1.4.0"
 
 # Substrate
-codec = { workspace = true, package = "parity-scale-codec", default-features = false, features = ["derive"] }
+codec = { workspace = true, default-features = false, features = ["derive"] }
 scale-info = { workspace = true, default-features = false, features = ["derive"] }
 sp-core = { workspace = true, default-features = false }
 sp-std = { workspace = true, default-features = false }
@@ -101,6 +101,8 @@ confidential_assets = { workspace = true, default-features = false }
 [features]
 default = ["std", "testing"]
 
+ci-runtime = []
+
 std = [
   "codec/std",
   "frame-support/std",
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 254a7c2..712eb00 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,5 @@
 [toolchain]
-channel = "nightly-2023-12-11"
+channel = "nightly-2024-11-14"
 targets = [ "wasm32-unknown-unknown" ]
+components = [ "rustfmt" ]
 profile = "minimal"
diff --git a/src/service.rs b/src/service.rs
index 9d1d493..6b9ff95 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -322,6 +322,7 @@ where
     })
 }
 
+#[allow(dead_code)]
 pub struct NewFullBase<R, D>
 where
     R: ConstructRuntimeApi<Block, FullClient<R, D>> + Send + Sync + 'static,
@@ -385,15 +386,6 @@ where
         Vec::default(),
     ));
 
-    #[cfg(feature = "cli")]
-    config.network.request_response_protocols.push(
-        sc_consensus_grandpa_warp_sync::request_response_config_for_chain(
-            &config,
-            task_manager.spawn_handle(),
-            backend.clone(),
-        ),
-    );
-
     let (network, system_rpc_tx, tx_handler_controller, network_starter) =
         sc_service::build_network(sc_service::BuildNetworkParams {
             config: &config,