diff --git a/.github/workflows/check_tests.yml b/.github/workflows/check_tests.yml
index 3b6c65744..874232f54 100644
--- a/.github/workflows/check_tests.yml
+++ b/.github/workflows/check_tests.yml
@@ -98,7 +98,7 @@ jobs:
           SCCACHE_DIR: /home/runner/.cache/sccache
         run: |
           source ${HOME}/.cargo/env
-          cargo test --features=runtime-benchmarks,try-runtime
+          cargo test --release --features=runtime-benchmarks,try-runtime -- --test-threads=2
       -
         name: stop sccache server
         run: sccache --stop-server || true
diff --git a/.github/workflows/generate_dolphin_weights_files.yml b/.github/workflows/generate_dolphin_weights_files.yml
index 03d527eca..ff7952880 100644
--- a/.github/workflows/generate_dolphin_weights_files.yml
+++ b/.github/workflows/generate_dolphin_weights_files.yml
@@ -224,6 +224,14 @@ jobs:
               id: pallet_asset_manager
               name: pallet_asset_manager
             iterations: 20
+          -
+            extrinsic:
+              id: '*'
+              name: pallet_manta_pay
+            pallet:
+              id: pallet_manta_pay
+              name: pallet_manta_pay
+            iterations: 20
     steps:
       -
         uses: actions/download-artifact@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff54c80d3..e6844500a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Breaking changes
 
 ### Features
+- [\#484](https://github.com/Manta-Network/Manta/pull/484) Update to [latest MantaPay circuits](https://github.com/Manta-Network/manta-rs/pull/50)
 - [\#430](https://github.com/Manta-Network/Manta/pull/419) Add private payment to dolphin runtime.
 - [\#419](https://github.com/Manta-Network/Manta/pull/419) Add asset manager and XCM support.
 - [\#358](https://github.com/Manta-Network/Manta/pull/358) Underperforming collators are automatically removed from the collator set after each session
diff --git a/Cargo.lock b/Cargo.lock
index 41e90c43a..c0906b03b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -381,9 +381,9 @@ dependencies = [
 
 [[package]]
 name = "async-global-executor"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c026b7e44f1316b567ee750fea85103f87fcb80792b860e979f221259796ca0a"
+checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -592,7 +592,7 @@ dependencies = [
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.4.4",
  "object",
  "rustc-demangle",
 ]
@@ -2486,9 +2486,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.30"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -2694,15 +2694,15 @@ checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
 
 [[package]]
 name = "flate2"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
+checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
 dependencies = [
  "cfg-if 1.0.0",
  "crc32fast",
  "libc",
  "libz-sys",
- "miniz_oxide",
+ "miniz_oxide 0.5.1",
 ]
 
 [[package]]
@@ -3212,9 +3212,9 @@ dependencies = [
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e"
+checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3224,9 +3224,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b"
+checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
@@ -3237,7 +3237,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.1",
  "tracing",
 ]
 
@@ -3402,9 +3402,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
+checksum = "6330e8a36bd8c859f3fa6d9382911fbb7147ec39807f63b923933a247240b9ba"
 
 [[package]]
 name = "httpdate"
@@ -3687,9 +3687,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.56"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
+checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3807,7 +3807,7 @@ dependencies = [
  "log",
  "tokio",
  "tokio-stream",
- "tokio-util",
+ "tokio-util 0.6.9",
  "unicase",
 ]
 
@@ -3902,7 +3902,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-rustls",
- "tokio-util",
+ "tokio-util 0.6.9",
 ]
 
 [[package]]
@@ -4083,9 +4083,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.121"
+version = "0.2.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"
+checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd"
 
 [[package]]
 name = "libloading"
@@ -4479,7 +4479,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "lru 0.7.3",
+ "lru 0.7.5",
  "rand 0.7.3",
  "smallvec",
  "unsigned-varint 0.7.1",
@@ -4728,9 +4728,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb"
+checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889"
 dependencies = [
  "hashbrown 0.11.2",
 ]
@@ -4846,10 +4846,11 @@ dependencies = [
 [[package]]
 name = "manta-accounting"
 version = "0.4.0"
-source = "git+https://github.com/manta-network/manta-rs.git#a91d908da79e7fee0a3215945a73c7bb28f94641"
+source = "git+https://github.com/manta-network/manta-rs.git#0795efe8b779dab5e0e681c30a42a81545e3b509"
 dependencies = [
  "derivative",
  "derive_more",
+ "futures 0.3.21",
  "indexmap",
  "manta-crypto",
  "manta-util",
@@ -4888,7 +4889,7 @@ dependencies = [
 [[package]]
 name = "manta-crypto"
 version = "0.4.0"
-source = "git+https://github.com/manta-network/manta-rs.git#a91d908da79e7fee0a3215945a73c7bb28f94641"
+source = "git+https://github.com/manta-network/manta-rs.git#0795efe8b779dab5e0e681c30a42a81545e3b509"
 dependencies = [
  "derivative",
  "manta-util",
@@ -4898,7 +4899,7 @@ dependencies = [
 [[package]]
 name = "manta-pay"
 version = "0.4.0"
-source = "git+https://github.com/manta-network/manta-rs.git#16e142f7917cc61e6066d6896f1a75aa45a0569d"
+source = "git+https://github.com/manta-network/manta-rs.git#0795efe8b779dab5e0e681c30a42a81545e3b509"
 dependencies = [
  "aes-gcm",
  "ark-bls12-381",
@@ -5008,8 +5009,8 @@ dependencies = [
 
 [[package]]
 name = "manta-sdk"
-version = "0.4.0"
-source = "git+https://github.com/manta-network/sdk.git#d86146a03a5b9184fcdb0ec5d7c99f31ce2e92bf"
+version = "0.5.0"
+source = "git+https://github.com/manta-network/sdk.git#fef5dc1868f6dea4911c8bb03cb6b29399810063"
 dependencies = [
  "anyhow",
  "attohttpc",
@@ -5021,7 +5022,7 @@ dependencies = [
 [[package]]
 name = "manta-util"
 version = "0.4.0"
-source = "git+https://github.com/manta-network/manta-rs.git#a91d908da79e7fee0a3215945a73c7bb28f94641"
+source = "git+https://github.com/manta-network/manta-rs.git#0795efe8b779dab5e0e681c30a42a81545e3b509"
 
 [[package]]
 name = "maplit"
@@ -5175,6 +5176,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "mio"
 version = "0.6.23"
@@ -6686,9 +6696,9 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d121a9af17a43efd0a38c6afa508b927ba07785bd4709efb2ac03bf77efef8d"
+checksum = "b3e7f385d61562f5834282b90aa50b41f38a35cf64d5209b8b05487b50553dbe"
 dependencies = [
  "blake2-rfc",
  "crc32fast",
@@ -7044,9 +7054,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "platforms"
@@ -7116,7 +7126,7 @@ source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.16#
 dependencies = [
  "derive_more",
  "futures 0.3.21",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -7137,7 +7147,7 @@ version = "0.9.16"
 source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
 dependencies = [
  "futures 0.3.21",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -7245,7 +7255,7 @@ source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.16#
 dependencies = [
  "derive_more",
  "futures 0.3.21",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -7341,7 +7351,7 @@ dependencies = [
  "futures 0.3.21",
  "futures-timer",
  "kvdb",
- "lru 0.7.3",
+ "lru 0.7.5",
  "merlin",
  "parity-scale-codec",
  "polkadot-node-jaeger",
@@ -7469,7 +7479,7 @@ source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.16#
 dependencies = [
  "futures 0.3.21",
  "kvdb",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -7693,7 +7703,7 @@ dependencies = [
  "derive_more",
  "futures 0.3.21",
  "itertools",
- "lru 0.7.3",
+ "lru 0.7.5",
  "metered-channel",
  "parity-scale-codec",
  "pin-project 1.0.10",
@@ -7719,7 +7729,7 @@ source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.16#
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-util-mem",
  "parking_lot 0.11.2",
  "polkadot-node-metrics",
@@ -8064,7 +8074,7 @@ dependencies = [
  "kusama-runtime",
  "kvdb",
  "kvdb-rocksdb",
- "lru 0.7.3",
+ "lru 0.7.5",
  "pallet-babe",
  "pallet-im-online",
  "pallet-mmr-primitives",
@@ -8282,9 +8292,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
 dependencies = [
  "unicode-xid",
 ]
@@ -8358,9 +8368,9 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eca0fa5dd7c4c96e184cec588f0b1db1ee3165e678db21c09793105acb17e6f"
+checksum = "871372391786ccec00d3c5d3d6608905b3d4db263639cfe075d3b60a736d115a"
 dependencies = [
  "cc",
 ]
@@ -8390,9 +8400,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
  "proc-macro2",
 ]
@@ -9521,7 +9531,7 @@ dependencies = [
  "linked-hash-map",
  "linked_hash_set",
  "log",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "parking_lot 0.11.2",
  "pin-project 1.0.10",
@@ -9558,7 +9568,7 @@ dependencies = [
  "futures-timer",
  "libp2p",
  "log",
- "lru 0.7.3",
+ "lru 0.7.5",
  "sc-network",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -10231,9 +10241,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
+checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
 
 [[package]]
 name = "slot-range-helper"
@@ -10424,7 +10434,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.1
 dependencies = [
  "futures 0.3.21",
  "log",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "parking_lot 0.11.2",
  "sp-api",
@@ -11241,9 +11251,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.90"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f"
+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11498,6 +11508,20 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+dependencies = [
+ "bytes 1.1.0",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite 0.2.8",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.8"
@@ -11515,9 +11539,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
+checksum = "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3"
 dependencies = [
  "cfg-if 1.0.0",
  "pin-project-lite 0.2.8",
@@ -11538,9 +11562,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.23"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c"
+checksum = "6dfce9f3241b150f36e8e54bb561a742d5daa1a47b5dd9a5ce369fd4a4db2210"
 dependencies = [
  "lazy_static",
  "valuable",
@@ -11941,9 +11965,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
+checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -11951,9 +11975,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
+checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -11966,9 +11990,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.29"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
+checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -11978,9 +12002,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
+checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -11988,9 +12012,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
+checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12001,9 +12025,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
+checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
 
 [[package]]
 name = "wasm-gc-api"
@@ -12225,9 +12249,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.56"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
+checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/pallets/manta-pay/src/benchmark/precomputed_coins.rs b/pallets/manta-pay/src/benchmark/precomputed_coins.rs
index d01b0ecdc..a8c63cd16 100644
--- a/pallets/manta-pay/src/benchmark/precomputed_coins.rs
+++ b/pallets/manta-pay/src/benchmark/precomputed_coins.rs
@@ -19,151 +19,165 @@
 //! THIS FILE IS AUTOMATICALLY GENERATED by `src/bin/precompute_coins.rs`. DO NOT EDIT.
 
 pub(crate) const MINT: &[u8] = &[
-	1, 8, 0, 0, 0, 4, 160, 134, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 74, 107, 21, 231,
-	190, 12, 35, 250, 44, 22, 179, 148, 164, 173, 15, 184, 117, 43, 59, 123, 232, 187, 80, 154, 54,
-	248, 51, 84, 47, 247, 55, 41, 3, 193, 58, 135, 164, 161, 62, 217, 142, 241, 215, 18, 146, 251,
-	200, 181, 7, 245, 119, 159, 236, 255, 101, 121, 150, 76, 122, 152, 247, 116, 38, 118, 143, 112,
-	57, 95, 248, 80, 254, 5, 93, 159, 18, 200, 152, 7, 18, 10, 222, 23, 110, 73, 17, 183, 19, 205,
-	203, 228, 53, 227, 167, 148, 11, 88, 217, 25, 187, 26, 0, 213, 254, 139, 66, 154, 240, 164,
-	198, 205, 28, 14, 79, 218, 181, 112, 24, 3, 19, 60, 37, 216, 205, 15, 200, 47, 169, 161, 72,
-	135, 229, 45, 198, 44, 190, 111, 139, 95, 228, 21, 10, 90, 20, 17, 45, 57, 194, 45, 151, 208,
-	47, 48, 111, 46, 134, 216, 91, 10, 204, 114, 177, 239, 37, 246, 233, 114, 179, 73, 101, 252,
-	148, 241, 189, 217, 10, 161, 100, 209, 141, 221, 5, 207, 199, 160, 76, 168, 170, 190, 213, 73,
-	18, 207, 132, 101, 184, 128, 23, 246, 250, 86, 26, 95, 38, 186, 225, 162, 37, 239, 31, 206,
-	196, 4, 46, 208, 83, 42, 212, 210, 109, 162, 124, 107, 8, 254, 137, 92, 162, 72, 84, 201, 125,
-	196, 28, 83, 131, 253, 112, 8, 122, 250, 153, 155, 200, 131, 24, 198, 71, 64, 29, 231, 19, 200,
-	2, 65, 230, 185, 20, 15, 50, 176, 210, 217, 196, 89, 174, 162, 171, 22, 253, 120, 229, 22, 3,
-	24, 56, 88, 247, 20, 26, 104, 246, 79, 216, 75, 137, 126, 93, 5, 115, 255, 173, 207, 137,
+	1, 8, 0, 0, 0, 4, 160, 134, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 185, 130, 170, 226,
+	74, 3, 155, 160, 10, 150, 100, 122, 158, 234, 185, 254, 254, 22, 148, 171, 108, 233, 38, 4,
+	117, 199, 26, 13, 29, 95, 16, 115, 99, 137, 11, 192, 60, 50, 107, 90, 4, 216, 26, 108, 148, 78,
+	74, 119, 51, 235, 0, 121, 30, 226, 237, 150, 188, 28, 40, 241, 6, 138, 206, 0, 168, 178, 43,
+	249, 209, 80, 199, 27, 16, 48, 93, 211, 121, 143, 211, 130, 134, 243, 241, 35, 93, 244, 129,
+	203, 47, 239, 17, 167, 25, 126, 228, 39, 150, 132, 241, 224, 120, 149, 172, 211, 104, 132, 134,
+	161, 105, 203, 47, 104, 166, 114, 145, 113, 154, 45, 189, 49, 244, 177, 157, 58, 14, 227, 8,
+	158, 75, 151, 10, 162, 0, 78, 14, 164, 138, 22, 55, 47, 29, 164, 51, 66, 235, 0, 104, 1, 129,
+	5, 166, 140, 253, 76, 210, 102, 48, 148, 250, 150, 187, 210, 19, 63, 211, 24, 209, 35, 84, 96,
+	222, 85, 21, 11, 211, 87, 118, 215, 226, 65, 17, 241, 237, 15, 255, 229, 67, 89, 247, 186, 219,
+	96, 65, 180, 192, 239, 239, 189, 128, 51, 12, 53, 67, 55, 53, 114, 145, 13, 92, 105, 240, 111,
+	48, 97, 7, 141, 216, 12, 107, 176, 119, 139, 158, 132, 240, 200, 100, 166, 8, 111, 37, 5, 237,
+	114, 142, 220, 136, 156, 16, 62, 89, 146, 225, 28, 187, 82, 209, 155, 123, 250, 216, 97, 226,
+	15, 252, 197, 166, 94, 178, 119, 210, 233, 102, 149, 59, 189, 96, 116, 64, 55, 163, 126, 230,
+	172, 115, 180, 145, 70, 66, 161, 177, 75, 224, 135, 8, 63, 192, 121, 117, 47, 123, 90, 38, 34,
+	141, 118, 204, 232, 174, 6, 76, 245, 246, 111, 190, 186, 134, 167, 143, 13, 23, 86, 119, 224,
+	82, 74, 107, 83, 45, 141, 232, 32, 248, 44, 22,
 ];
 
 pub(crate) const PRIVATE_TRANSFER_INPUT: &[&[u8]] = &[
 	&[
-		1, 8, 0, 0, 0, 4, 16, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20, 6, 81, 61,
-		120, 248, 96, 193, 17, 117, 21, 250, 202, 11, 128, 41, 122, 110, 5, 241, 210, 244, 159,
-		226, 22, 7, 34, 125, 75, 192, 241, 72, 220, 204, 4, 119, 85, 71, 131, 84, 114, 58, 216, 18,
-		168, 163, 168, 176, 21, 69, 105, 255, 69, 137, 65, 219, 168, 101, 123, 173, 51, 212, 199,
-		255, 41, 243, 245, 7, 126, 172, 252, 189, 59, 186, 64, 237, 152, 58, 219, 85, 69, 95, 214,
-		111, 61, 137, 179, 130, 50, 108, 209, 234, 114, 167, 70, 94, 194, 113, 44, 74, 0, 180, 22,
-		136, 92, 72, 234, 221, 135, 163, 97, 229, 112, 105, 116, 44, 84, 130, 245, 67, 222, 65,
-		177, 181, 43, 124, 228, 221, 93, 144, 157, 55, 151, 96, 18, 92, 70, 171, 142, 54, 100, 152,
-		6, 136, 93, 162, 130, 31, 152, 78, 165, 88, 31, 129, 150, 203, 161, 11, 125, 22, 31, 23,
-		80, 177, 4, 185, 136, 101, 190, 112, 20, 22, 196, 23, 201, 175, 0, 175, 251, 173, 209, 7,
-		48, 5, 147, 18, 103, 84, 92, 130, 7, 169, 220, 243, 90, 170, 15, 194, 59, 104, 47, 66, 172,
-		219, 17, 75, 19, 77, 64, 59, 3, 26, 44, 98, 44, 143, 85, 248, 137, 231, 61, 148, 180, 243,
-		12, 115, 219, 254, 52, 97, 102, 12, 24, 128, 230, 99, 167, 129, 136, 222, 61, 43, 253, 219,
-		14, 139, 128, 172, 80, 211, 173, 197, 11, 9, 237, 4, 73, 47, 59, 227, 109, 217, 84, 143,
-		164, 118, 180, 91, 227, 69, 45, 99, 232, 227, 118, 24, 34, 109, 172, 154, 28, 204, 215, 38,
-		183, 167, 98, 174, 74, 91, 254, 112, 152,
+		1, 8, 0, 0, 0, 4, 16, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 159, 183, 12, 98,
+		199, 240, 56, 6, 200, 34, 41, 208, 78, 149, 130, 227, 140, 123, 124, 122, 188, 250, 81, 65,
+		224, 129, 130, 168, 181, 177, 136, 109, 158, 177, 96, 191, 29, 242, 152, 67, 3, 223, 72,
+		144, 7, 164, 232, 217, 215, 221, 139, 19, 96, 181, 123, 76, 186, 51, 78, 160, 42, 15, 21,
+		136, 169, 76, 221, 100, 252, 37, 252, 227, 88, 193, 172, 43, 43, 178, 40, 215, 127, 224,
+		57, 131, 191, 215, 85, 128, 186, 225, 32, 48, 60, 68, 66, 8, 92, 224, 228, 39, 149, 70,
+		179, 100, 41, 142, 25, 69, 84, 239, 130, 248, 189, 146, 55, 193, 171, 243, 199, 90, 155,
+		245, 79, 252, 178, 55, 98, 141, 33, 96, 102, 124, 0, 246, 238, 181, 127, 117, 231, 138, 69,
+		72, 145, 216, 121, 112, 195, 34, 110, 162, 49, 175, 149, 161, 138, 117, 23, 44, 17, 149,
+		48, 236, 31, 74, 100, 24, 57, 66, 142, 174, 19, 227, 107, 115, 160, 205, 252, 188, 117,
+		176, 4, 187, 184, 55, 235, 204, 214, 161, 147, 178, 217, 127, 147, 160, 161, 199, 32, 49,
+		84, 164, 204, 23, 46, 15, 51, 107, 12, 142, 47, 85, 231, 61, 164, 171, 229, 8, 48, 52, 65,
+		82, 129, 55, 102, 159, 23, 112, 193, 197, 24, 137, 8, 21, 56, 157, 151, 145, 240, 159, 62,
+		179, 177, 160, 204, 245, 239, 13, 217, 249, 44, 20, 236, 85, 225, 122, 159, 177, 140, 84,
+		14, 85, 176, 76, 144, 114, 211, 7, 96, 243, 146, 19, 102, 85, 22, 0, 22, 104, 9, 190, 60,
+		210, 155, 247, 14, 6, 183, 61, 106, 59, 241, 33, 136, 232, 253, 135, 116, 246, 210, 171,
+		25, 89, 165, 252, 192, 24, 133, 133, 166, 22, 216, 44, 149, 170, 8, 152, 112, 194, 119,
+		197, 215, 168, 0, 214, 186, 195, 149,
 	],
 	&[
-		1, 8, 0, 0, 0, 4, 32, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 33, 196, 16, 32,
-		203, 198, 154, 168, 148, 43, 11, 41, 189, 68, 164, 61, 49, 213, 60, 167, 61, 238, 196, 54,
-		193, 215, 218, 178, 99, 97, 161, 21, 122, 122, 134, 60, 205, 171, 19, 126, 23, 224, 119,
-		97, 80, 122, 186, 157, 200, 54, 3, 173, 210, 233, 125, 80, 126, 215, 204, 225, 240, 201,
-		73, 247, 67, 5, 210, 39, 47, 133, 44, 60, 77, 245, 141, 72, 211, 198, 191, 237, 5, 67, 75,
-		135, 137, 113, 212, 46, 107, 228, 212, 63, 82, 189, 205, 54, 131, 249, 204, 156, 0, 21,
-		130, 162, 20, 206, 65, 141, 176, 219, 126, 244, 150, 117, 108, 173, 89, 100, 190, 243, 40,
-		145, 77, 16, 214, 159, 91, 235, 39, 47, 249, 56, 118, 42, 176, 100, 167, 221, 174, 34, 233,
-		177, 113, 251, 120, 178, 186, 190, 21, 180, 242, 227, 221, 181, 209, 207, 132, 175, 66, 95,
-		245, 118, 180, 254, 71, 7, 62, 161, 220, 249, 178, 202, 94, 235, 195, 4, 136, 124, 81, 143,
-		149, 110, 61, 243, 1, 92, 181, 103, 132, 100, 236, 95, 118, 84, 95, 42, 6, 46, 206, 163,
-		182, 99, 179, 234, 144, 111, 85, 133, 103, 49, 43, 137, 85, 33, 73, 97, 110, 61, 90, 93,
-		164, 85, 7, 239, 83, 210, 155, 39, 93, 202, 145, 39, 16, 210, 201, 24, 115, 37, 241, 187,
-		111, 25, 19, 40, 146, 92, 32, 76, 197, 173, 227, 31, 53, 130, 14, 204, 186, 50, 64, 0, 110,
-		147, 234, 19, 96, 243, 180, 145, 148, 62, 127, 126, 13, 177, 8, 113, 189, 202, 125, 99,
-		121, 94, 26, 135, 212, 221, 165, 180, 244, 115, 44, 147, 150,
+		1, 8, 0, 0, 0, 4, 32, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 228, 93, 36, 120,
+		190, 129, 158, 45, 131, 179, 188, 51, 129, 45, 172, 168, 73, 134, 167, 213, 65, 251, 45,
+		114, 107, 197, 210, 72, 184, 86, 8, 7, 155, 124, 155, 44, 6, 238, 213, 99, 70, 42, 72, 11,
+		244, 59, 220, 192, 125, 5, 73, 186, 69, 68, 103, 89, 81, 20, 116, 214, 212, 205, 173, 141,
+		202, 9, 125, 131, 47, 222, 172, 218, 56, 165, 226, 29, 233, 79, 222, 253, 243, 125, 162,
+		192, 27, 214, 9, 202, 164, 251, 223, 16, 57, 175, 180, 15, 11, 157, 66, 130, 186, 132, 142,
+		111, 149, 40, 82, 10, 19, 41, 247, 105, 4, 224, 85, 89, 175, 235, 13, 187, 62, 74, 245,
+		239, 136, 100, 132, 73, 224, 131, 93, 159, 0, 241, 22, 119, 69, 39, 101, 223, 1, 180, 214,
+		134, 3, 125, 82, 221, 14, 94, 86, 227, 145, 152, 253, 195, 89, 60, 30, 107, 156, 176, 201,
+		50, 136, 152, 84, 156, 188, 159, 233, 152, 95, 168, 7, 138, 46, 24, 229, 239, 140, 70, 92,
+		179, 0, 227, 41, 114, 42, 209, 176, 238, 30, 206, 214, 172, 30, 99, 65, 98, 170, 34, 168,
+		119, 204, 194, 127, 198, 133, 190, 237, 18, 124, 231, 172, 70, 63, 167, 189, 231, 90, 166,
+		228, 61, 160, 222, 160, 111, 8, 168, 237, 209, 230, 199, 216, 82, 21, 235, 205, 109, 29, 9,
+		45, 209, 158, 62, 208, 30, 46, 242, 151, 22, 155, 230, 18, 139, 145, 210, 41, 46, 209, 37,
+		0, 159, 77, 147, 4, 76, 58, 31, 74, 39, 175, 64, 140, 51, 140, 90, 97, 247, 67, 32, 115,
+		135, 5, 209, 33, 175, 207, 81, 25, 86, 133, 6, 125, 118, 206, 129, 244, 196, 244, 155, 38,
+		138, 222, 16, 201, 229, 120, 134, 66, 18, 104, 230, 21, 188, 144, 205, 140, 30, 127, 14,
+		202, 61, 3,
 	],
 ];
 
 pub(crate) const PRIVATE_TRANSFER: &[u8] = &[
-	0, 0, 8, 13, 139, 46, 132, 205, 5, 70, 42, 29, 3, 4, 40, 86, 85, 136, 208, 53, 154, 150, 99,
-	139, 174, 97, 124, 23, 210, 255, 202, 78, 186, 181, 53, 188, 85, 21, 31, 88, 42, 231, 54, 212,
-	147, 124, 158, 241, 176, 100, 230, 151, 51, 69, 65, 74, 211, 221, 61, 224, 24, 81, 88, 245,
-	106, 95, 69, 52, 172, 66, 52, 211, 169, 72, 135, 188, 5, 245, 81, 217, 166, 108, 14, 113, 230,
-	68, 108, 236, 240, 204, 149, 61, 63, 44, 104, 181, 219, 79, 78, 94, 87, 222, 82, 238, 169, 78,
-	169, 205, 123, 157, 66, 120, 136, 116, 223, 35, 103, 68, 146, 115, 109, 61, 192, 84, 151, 253,
-	31, 91, 6, 212, 33, 8, 130, 26, 248, 67, 242, 80, 16, 194, 74, 16, 17, 233, 52, 193, 83, 111,
-	166, 19, 188, 105, 78, 243, 155, 63, 239, 154, 71, 214, 29, 68, 110, 94, 197, 36, 5, 4, 124,
-	138, 123, 201, 55, 170, 25, 247, 139, 211, 254, 54, 145, 63, 249, 43, 221, 51, 59, 119, 48,
-	219, 172, 136, 89, 43, 129, 243, 203, 98, 53, 23, 101, 110, 168, 100, 180, 121, 216, 33, 85,
-	156, 34, 20, 183, 96, 87, 182, 219, 142, 213, 16, 35, 222, 153, 30, 193, 74, 84, 241, 195, 49,
-	213, 154, 233, 173, 54, 203, 145, 47, 95, 132, 143, 18, 227, 54, 218, 63, 76, 140, 91, 49, 185,
-	161, 12, 120, 117, 124, 84, 191, 101, 165, 127, 19, 114, 53, 20, 239, 201, 32, 25, 186, 60, 16,
-	19, 25, 235, 165, 132, 242, 243, 208, 124, 23, 99, 219, 118, 87, 23, 122, 229, 66, 232, 99,
-	140, 63, 186, 114, 179, 120, 38, 77, 167, 113, 52, 83, 137, 226, 189, 253, 254, 119, 140, 197,
-	215, 145, 99, 110, 154, 146, 193, 130, 62, 41, 14, 32, 47, 232, 234, 98, 94, 79, 184, 140, 0,
-	174, 10, 25, 193, 170, 177, 167, 124, 192, 227, 18, 207, 20, 129, 252, 89, 163, 114, 161, 172,
-	49, 134, 255, 174, 186, 38, 76, 165, 134, 17, 4, 132, 205, 165, 228, 62, 43, 18, 49, 15, 5, 84,
-	217, 196, 197, 157, 61, 135, 77, 40, 101, 116, 13, 20, 38, 233, 137, 114, 132, 156, 176, 72,
-	76, 208, 122, 72, 67, 108, 16, 188, 45, 238, 28, 184, 131, 63, 97, 93, 243, 239, 195, 196, 20,
-	169, 51, 210, 127, 227, 196, 202, 103, 84, 182, 62, 18, 17, 27, 135, 231, 172, 38, 6, 97, 20,
-	191, 89, 15, 26, 202, 19, 88, 141, 140, 89, 144, 167, 255, 108, 45, 109, 52, 28, 255, 46, 84,
-	40, 42, 182, 182, 23, 125, 244, 211, 143, 69, 204, 182, 179, 133, 179, 40, 228, 70, 137, 211,
-	183, 46, 213, 22, 186, 70, 150, 92, 21, 126, 20, 50, 30, 3, 245, 5, 167, 117, 146, 51, 187,
-	124, 193, 185, 203, 104, 255, 109, 129, 59, 140, 83, 11, 157, 238, 39, 10, 143, 207, 238, 146,
-	239, 156, 57, 215, 98, 7,
+	0, 0, 8, 149, 141, 24, 70, 56, 223, 63, 113, 225, 101, 247, 12, 53, 81, 2, 70, 98, 80, 224,
+	108, 149, 149, 192, 180, 26, 52, 0, 10, 55, 12, 1, 36, 94, 47, 214, 59, 108, 233, 220, 81, 254,
+	195, 216, 28, 72, 243, 66, 14, 140, 195, 139, 107, 119, 249, 218, 203, 158, 91, 2, 96, 92, 193,
+	195, 72, 9, 127, 98, 5, 100, 128, 65, 63, 29, 54, 2, 32, 102, 47, 67, 168, 14, 130, 164, 77,
+	36, 8, 119, 47, 224, 151, 89, 114, 19, 99, 90, 2, 225, 5, 75, 74, 168, 89, 181, 108, 217, 220,
+	97, 98, 241, 221, 57, 51, 101, 94, 137, 141, 106, 255, 224, 191, 63, 189, 144, 21, 55, 105, 79,
+	111, 8, 136, 46, 143, 144, 67, 219, 201, 243, 48, 94, 10, 180, 33, 50, 215, 146, 189, 68, 7,
+	211, 147, 22, 89, 22, 61, 45, 77, 188, 71, 127, 7, 2, 181, 243, 203, 34, 220, 73, 195, 125,
+	164, 123, 216, 200, 132, 74, 158, 47, 218, 127, 224, 255, 224, 170, 86, 2, 243, 138, 211, 23,
+	88, 236, 24, 8, 240, 193, 214, 10, 138, 88, 57, 21, 228, 25, 123, 169, 233, 4, 141, 161, 169,
+	47, 129, 136, 181, 67, 198, 246, 75, 232, 97, 14, 241, 109, 42, 166, 199, 188, 68, 86, 77, 30,
+	190, 150, 255, 191, 222, 231, 11, 227, 155, 125, 152, 50, 31, 189, 185, 161, 109, 190, 202,
+	157, 108, 173, 158, 13, 172, 234, 151, 208, 175, 28, 204, 188, 48, 62, 89, 191, 118, 60, 98,
+	55, 189, 111, 157, 229, 205, 107, 233, 158, 17, 135, 65, 250, 153, 85, 22, 163, 69, 115, 244,
+	213, 242, 77, 138, 19, 12, 150, 131, 252, 33, 116, 63, 178, 184, 34, 167, 189, 132, 24, 172,
+	67, 227, 185, 103, 136, 253, 234, 194, 48, 24, 126, 34, 14, 175, 177, 248, 245, 120, 245, 224,
+	233, 72, 36, 172, 106, 172, 53, 212, 224, 189, 172, 211, 14, 53, 251, 46, 186, 156, 246, 77,
+	131, 251, 107, 225, 133, 12, 195, 135, 82, 218, 84, 145, 44, 254, 77, 105, 52, 18, 147, 2, 194,
+	183, 74, 230, 225, 51, 159, 107, 218, 151, 118, 120, 128, 64, 234, 104, 238, 90, 201, 233, 247,
+	102, 72, 0, 140, 231, 52, 121, 137, 246, 181, 102, 228, 64, 132, 5, 238, 193, 152, 191, 37, 0,
+	25, 123, 138, 168, 74, 179, 110, 17, 241, 200, 143, 232, 187, 216, 176, 56, 11, 90, 113, 43,
+	231, 244, 97, 120, 32, 252, 26, 88, 35, 3, 108, 46, 3, 43, 96, 183, 50, 196, 134, 107, 152, 11,
+	103, 78, 217, 84, 236, 97, 144, 78, 91, 16, 54, 29, 136, 0, 120, 130, 45, 248, 169, 242, 32, 7,
+	230, 95, 179, 208, 176, 251, 190, 85, 206, 102, 107, 39, 239, 19, 170, 75, 169, 228, 93, 96,
+	203, 177, 72, 58, 82, 64, 14, 139, 197, 26, 186, 105, 239, 25, 214, 209, 28, 2, 61, 88, 184,
+	33, 34, 119, 100, 89, 164, 186, 105, 35, 24, 186, 184, 2, 182, 137, 13, 67, 59, 43, 43, 12,
+	244, 117, 205, 202, 180, 108, 162, 35, 111, 133, 138, 17, 106, 65, 105, 237, 167, 142, 79, 240,
+	137, 65, 210, 214, 12, 30, 30, 62, 255, 101, 189, 56, 147, 236, 21, 104, 123, 157, 27, 142, 40,
+	23, 35, 190, 27, 82, 196, 6,
 ];
 
 pub(crate) const RECLAIM_INPUT: &[&[u8]] = &[
 	&[
-		1, 8, 0, 0, 0, 4, 16, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 233, 109, 90,
-		102, 96, 156, 86, 27, 202, 210, 35, 113, 133, 183, 210, 195, 252, 117, 173, 255, 17, 85,
-		87, 204, 135, 100, 97, 160, 222, 114, 217, 2, 186, 76, 204, 110, 220, 153, 176, 134, 97,
-		195, 114, 80, 111, 112, 94, 142, 119, 64, 201, 231, 199, 9, 147, 228, 206, 177, 157, 142,
-		161, 224, 244, 13, 71, 134, 253, 50, 46, 7, 131, 231, 236, 106, 199, 102, 4, 253, 66, 70,
-		37, 14, 232, 225, 4, 64, 180, 88, 132, 179, 177, 196, 218, 11, 42, 129, 60, 9, 248, 39, 0,
-		193, 209, 7, 217, 164, 162, 171, 192, 76, 168, 88, 213, 31, 246, 223, 118, 177, 44, 139,
-		64, 64, 109, 83, 204, 124, 99, 134, 59, 142, 115, 146, 200, 137, 179, 0, 124, 144, 198,
-		206, 66, 243, 109, 145, 169, 91, 196, 50, 134, 82, 231, 159, 204, 14, 176, 190, 119, 29,
-		235, 33, 204, 222, 87, 110, 34, 58, 222, 218, 156, 195, 226, 225, 223, 26, 123, 253, 201,
-		92, 55, 131, 36, 215, 212, 132, 128, 4, 93, 161, 38, 5, 243, 236, 92, 113, 88, 9, 8, 72,
-		193, 194, 244, 217, 47, 83, 180, 128, 58, 226, 244, 43, 142, 211, 162, 28, 194, 143, 23,
-		113, 162, 44, 168, 221, 110, 45, 247, 166, 159, 243, 253, 67, 225, 100, 216, 240, 219, 133,
-		120, 192, 41, 103, 228, 0, 117, 49, 19, 180, 20, 123, 42, 240, 35, 78, 91, 112, 95, 151,
-		162, 108, 207, 59, 55, 173, 70, 126, 13, 43, 173, 20, 14, 98, 42, 106, 138, 9, 123, 164,
-		29, 49, 161, 190, 24, 80, 64, 49, 9, 64, 170, 162, 113, 251, 17, 185, 128,
+		1, 8, 0, 0, 0, 4, 16, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 128, 176, 193,
+		38, 145, 229, 208, 226, 218, 128, 10, 50, 99, 41, 109, 253, 125, 116, 100, 244, 82, 95,
+		242, 87, 165, 210, 5, 65, 24, 184, 221, 112, 135, 41, 233, 98, 174, 50, 66, 158, 142, 182,
+		55, 179, 215, 39, 252, 65, 239, 247, 32, 118, 211, 65, 158, 172, 197, 230, 87, 105, 247,
+		147, 197, 72, 56, 101, 214, 52, 24, 91, 2, 181, 64, 207, 148, 68, 11, 83, 209, 195, 134,
+		120, 73, 97, 212, 78, 253, 131, 179, 11, 100, 34, 20, 139, 147, 118, 47, 141, 17, 253, 70,
+		161, 164, 175, 248, 223, 190, 227, 188, 54, 146, 38, 137, 252, 205, 236, 67, 179, 216, 117,
+		160, 74, 236, 110, 66, 181, 241, 34, 134, 31, 163, 235, 0, 199, 64, 216, 208, 244, 48, 143,
+		31, 215, 130, 218, 240, 219, 125, 114, 77, 110, 121, 206, 69, 185, 195, 133, 7, 25, 84,
+		231, 66, 128, 11, 96, 254, 159, 79, 13, 11, 96, 210, 147, 111, 221, 249, 127, 90, 176, 153,
+		19, 16, 178, 21, 54, 202, 69, 213, 243, 206, 123, 116, 43, 84, 253, 152, 100, 57, 43, 3,
+		161, 178, 151, 144, 164, 221, 119, 161, 193, 26, 21, 113, 145, 241, 159, 57, 23, 224, 190,
+		186, 192, 31, 60, 170, 11, 248, 79, 211, 24, 21, 236, 196, 99, 183, 179, 121, 140, 14, 76,
+		74, 3, 126, 189, 116, 19, 51, 255, 53, 99, 184, 140, 229, 160, 58, 108, 12, 182, 118, 63,
+		236, 182, 107, 204, 143, 160, 153, 198, 26, 240, 158, 137, 150, 243, 153, 222, 148, 104,
+		150, 136, 207, 155, 47, 66, 141, 195, 229, 239, 174, 79, 93, 88, 181, 19, 167, 97, 169, 39,
+		255, 29, 34, 98, 204, 52, 38, 77, 162, 130, 34, 74, 138, 80, 161, 8, 245, 74, 13, 193, 70,
+		121, 82, 132, 117, 227, 49, 87, 5,
 	],
 	&[
-		1, 8, 0, 0, 0, 4, 32, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 47, 78, 188, 215,
-		159, 112, 40, 219, 240, 133, 16, 121, 255, 188, 224, 172, 69, 38, 149, 161, 161, 5, 198,
-		33, 64, 255, 0, 28, 182, 46, 120, 96, 20, 207, 115, 38, 45, 24, 97, 120, 88, 95, 117, 89,
-		49, 139, 230, 254, 54, 71, 230, 134, 23, 179, 138, 176, 143, 231, 58, 151, 8, 55, 204, 62,
-		23, 39, 245, 105, 108, 177, 172, 121, 232, 134, 9, 17, 247, 46, 22, 206, 154, 107, 194, 47,
-		177, 68, 142, 219, 73, 239, 74, 145, 104, 210, 15, 16, 157, 94, 128, 132, 0, 26, 6, 41,
-		168, 216, 128, 35, 102, 87, 77, 178, 180, 236, 167, 182, 254, 236, 96, 162, 12, 152, 70, 0,
-		60, 122, 44, 201, 13, 70, 60, 185, 245, 123, 29, 62, 54, 190, 96, 4, 152, 71, 212, 86, 21,
-		147, 182, 231, 6, 220, 97, 139, 248, 36, 128, 205, 77, 218, 48, 92, 75, 121, 91, 38, 213,
-		250, 210, 55, 155, 89, 85, 51, 112, 243, 254, 18, 38, 202, 10, 81, 87, 42, 205, 164, 52,
-		25, 16, 78, 125, 142, 179, 42, 229, 198, 55, 139, 19, 6, 171, 243, 220, 153, 231, 50, 133,
-		46, 0, 16, 192, 74, 19, 53, 84, 79, 22, 170, 203, 251, 163, 32, 244, 244, 230, 54, 10, 239,
-		181, 81, 221, 181, 191, 51, 36, 4, 215, 109, 192, 62, 148, 40, 199, 147, 14, 32, 10, 26,
-		48, 139, 26, 7, 243, 86, 55, 116, 84, 42, 20, 46, 53, 156, 98, 202, 56, 207, 157, 245, 236,
-		43, 83, 227, 232, 152, 219, 214, 38, 26, 129, 181, 42, 61, 128, 127, 153, 227, 33, 166, 9,
-		64, 243, 71, 22, 49, 147,
+		1, 8, 0, 0, 0, 4, 32, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 228, 210, 85, 0,
+		68, 231, 28, 46, 214, 210, 81, 196, 230, 180, 70, 194, 45, 3, 133, 200, 141, 201, 198, 111,
+		89, 130, 144, 15, 103, 70, 115, 115, 191, 136, 103, 200, 240, 183, 116, 232, 156, 243, 148,
+		228, 93, 70, 253, 65, 131, 0, 189, 103, 198, 45, 218, 238, 247, 59, 170, 60, 146, 159, 199,
+		181, 3, 47, 178, 191, 251, 70, 141, 115, 235, 63, 121, 41, 28, 219, 154, 92, 242, 72, 27,
+		88, 15, 46, 244, 121, 90, 25, 96, 8, 243, 164, 125, 93, 165, 176, 83, 112, 149, 98, 27,
+		251, 58, 212, 98, 137, 69, 236, 177, 91, 223, 117, 57, 242, 205, 36, 36, 200, 146, 180, 34,
+		208, 123, 178, 17, 254, 188, 185, 237, 161, 0, 160, 10, 124, 37, 73, 65, 167, 250, 162, 69,
+		144, 116, 250, 190, 144, 9, 175, 235, 202, 31, 8, 209, 71, 245, 221, 84, 26, 78, 115, 187,
+		163, 246, 149, 86, 203, 133, 188, 220, 31, 177, 174, 162, 11, 177, 159, 186, 165, 151, 28,
+		22, 185, 14, 246, 198, 128, 226, 46, 97, 229, 117, 89, 122, 69, 111, 117, 121, 150, 144,
+		151, 190, 38, 182, 106, 252, 183, 10, 154, 158, 246, 17, 234, 73, 168, 10, 123, 87, 139,
+		152, 177, 161, 51, 68, 141, 218, 150, 21, 94, 247, 99, 173, 233, 95, 76, 15, 74, 46, 23,
+		23, 4, 228, 97, 213, 232, 79, 102, 9, 233, 4, 43, 113, 44, 197, 129, 139, 59, 169, 35, 93,
+		240, 93, 132, 225, 189, 5, 187, 144, 167, 54, 56, 7, 213, 7, 32, 12, 65, 10, 100, 12, 212,
+		174, 15, 144, 183, 77, 20, 182, 52, 138, 68, 6, 225, 37, 208, 109, 58, 137, 171, 137, 147,
+		44, 45, 92, 163, 41, 88, 40, 50, 228, 37, 176, 74, 161, 91, 88, 115, 198, 51, 188, 20, 83,
+		155, 148,
 	],
 ];
 
 pub(crate) const RECLAIM: &[u8] = &[
-	1, 8, 0, 0, 0, 0, 8, 26, 231, 209, 123, 75, 35, 238, 255, 11, 131, 161, 227, 162, 232, 15, 108,
-	141, 174, 251, 128, 219, 142, 210, 113, 148, 219, 123, 216, 105, 115, 60, 43, 204, 145, 255,
-	139, 215, 216, 235, 189, 154, 124, 81, 172, 165, 126, 3, 100, 54, 43, 73, 94, 180, 160, 229,
-	239, 91, 75, 151, 172, 167, 34, 167, 28, 117, 91, 204, 239, 94, 215, 143, 213, 121, 14, 88,
-	120, 250, 143, 106, 100, 29, 207, 93, 233, 6, 25, 163, 44, 33, 0, 216, 12, 134, 116, 172, 62,
-	124, 228, 122, 161, 33, 62, 163, 88, 166, 210, 70, 38, 233, 173, 118, 93, 127, 38, 112, 225,
-	105, 245, 238, 62, 52, 31, 53, 98, 63, 176, 184, 83, 4, 7, 31, 44, 255, 214, 63, 123, 181, 58,
-	195, 185, 140, 21, 221, 55, 84, 23, 128, 226, 109, 12, 207, 141, 71, 216, 23, 241, 94, 112,
-	168, 120, 39, 110, 251, 136, 201, 60, 192, 3, 104, 216, 61, 29, 52, 54, 84, 35, 184, 16, 191,
-	248, 83, 8, 243, 230, 31, 219, 45, 76, 108, 186, 173, 245, 234, 134, 35, 233, 42, 193, 123,
-	135, 35, 247, 212, 40, 25, 71, 237, 211, 109, 127, 43, 67, 90, 135, 10, 120, 232, 155, 74, 28,
-	104, 133, 181, 127, 94, 7, 191, 22, 26, 4, 16, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	106, 215, 19, 93, 200, 168, 244, 203, 23, 109, 135, 210, 244, 82, 227, 217, 212, 146, 105, 199,
-	119, 194, 190, 152, 110, 82, 211, 214, 103, 152, 141, 120, 209, 32, 215, 87, 69, 177, 245, 66,
-	226, 20, 224, 219, 110, 114, 90, 130, 221, 84, 49, 27, 240, 92, 198, 80, 165, 69, 174, 232, 72,
-	90, 121, 198, 92, 240, 166, 90, 48, 214, 199, 20, 89, 235, 123, 239, 80, 172, 141, 91, 69, 219,
-	178, 150, 250, 47, 17, 193, 196, 217, 142, 144, 125, 150, 204, 5, 221, 22, 26, 95, 107, 225,
-	145, 233, 59, 9, 93, 104, 155, 18, 136, 6, 199, 113, 111, 110, 14, 213, 216, 243, 54, 66, 113,
-	230, 26, 39, 150, 144, 247, 144, 101, 170, 64, 244, 101, 230, 94, 166, 160, 94, 218, 198, 38,
-	140, 144, 20, 39, 184, 58, 9, 253, 3, 103, 9, 125, 205, 123, 4, 105, 15, 157, 190, 126, 160,
-	67, 178, 55, 9, 81, 136, 170, 36, 162, 104, 28, 149, 243, 194, 152, 184, 101, 191, 48, 22, 225,
-	108, 136, 241, 231, 107, 137, 5,
+	1, 8, 0, 0, 0, 0, 8, 181, 218, 94, 91, 229, 12, 93, 102, 103, 83, 128, 233, 35, 47, 43, 157,
+	125, 73, 218, 195, 135, 59, 41, 236, 140, 102, 173, 161, 125, 251, 14, 2, 65, 169, 122, 135,
+	41, 122, 69, 34, 114, 174, 83, 250, 231, 40, 132, 115, 136, 70, 202, 131, 95, 118, 10, 116, 82,
+	46, 5, 203, 39, 9, 200, 98, 243, 129, 186, 1, 55, 53, 4, 200, 146, 79, 133, 119, 144, 50, 173,
+	247, 74, 154, 80, 177, 159, 19, 166, 132, 205, 153, 205, 237, 110, 117, 254, 54, 176, 50, 183,
+	217, 132, 167, 234, 73, 198, 87, 167, 131, 52, 49, 113, 84, 94, 207, 55, 136, 193, 5, 203, 139,
+	211, 84, 9, 111, 25, 49, 151, 24, 4, 21, 106, 71, 113, 109, 83, 114, 123, 250, 211, 76, 64, 10,
+	217, 184, 133, 24, 92, 47, 31, 239, 179, 71, 45, 138, 192, 134, 148, 230, 63, 74, 11, 53, 182,
+	73, 110, 35, 147, 150, 235, 178, 207, 149, 85, 111, 169, 67, 12, 65, 186, 104, 142, 197, 123,
+	147, 205, 234, 64, 137, 195, 147, 171, 49, 204, 30, 111, 40, 182, 151, 215, 220, 6, 200, 199,
+	253, 245, 158, 221, 77, 194, 164, 165, 215, 204, 179, 218, 24, 116, 197, 134, 57, 254, 174,
+	197, 81, 81, 180, 21, 11, 177, 199, 148, 221, 245, 169, 115, 98, 165, 11, 31, 157, 88, 59, 26,
+	252, 235, 45, 184, 124, 252, 240, 128, 198, 10, 228, 238, 131, 113, 150, 95, 246, 180, 4, 16,
+	39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 219, 183, 141, 210, 65, 237, 205, 219, 148, 194,
+	99, 219, 92, 13, 143, 190, 214, 137, 94, 119, 131, 77, 187, 255, 106, 239, 240, 156, 182, 215,
+	89, 159, 91, 170, 24, 106, 103, 44, 194, 155, 81, 232, 143, 7, 111, 38, 243, 25, 215, 83, 45,
+	88, 170, 161, 136, 54, 184, 214, 74, 150, 44, 249, 16, 80, 21, 182, 12, 68, 20, 39, 85, 25, 59,
+	108, 17, 133, 84, 68, 245, 41, 244, 228, 98, 203, 39, 1, 161, 97, 127, 175, 16, 160, 98, 187,
+	191, 15, 126, 19, 69, 0, 201, 2, 88, 203, 193, 200, 146, 15, 95, 248, 177, 104, 252, 141, 59,
+	213, 61, 190, 112, 97, 186, 146, 162, 239, 199, 14, 0, 51, 46, 47, 0, 221, 168, 189, 254, 171,
+	19, 95, 124, 201, 201, 228, 63, 17, 162, 55, 101, 251, 71, 65, 119, 162, 61, 68, 240, 205, 41,
+	128, 117, 216, 117, 187, 6, 134, 78, 102, 58, 69, 175, 79, 222, 189, 1, 254, 63, 174, 89, 76,
+	159, 135, 123, 78, 48, 4, 219, 127, 62, 176, 102, 15, 167, 4,
 ];
diff --git a/pallets/manta-pay/src/bin/precompute_coins.rs b/pallets/manta-pay/src/bin/precompute_coins.rs
index 05e40325b..548fcebcf 100644
--- a/pallets/manta-pay/src/bin/precompute_coins.rs
+++ b/pallets/manta-pay/src/bin/precompute_coins.rs
@@ -29,9 +29,10 @@ use manta_crypto::{
 	rand::{CryptoRng, Rand, RngCore, Sample},
 };
 use manta_pay::config::{
-	self, FullParameters, KeyAgreementScheme, MerkleTreeConfiguration, Mint, MultiProvingContext,
-	MultiVerifyingContext, Parameters, PrivateTransfer, ProofSystem, ProvingContext, Reclaim,
-	UtxoAccumulatorModel, UtxoCommitmentScheme, VerifyingContext, VoidNumberHashFunction,
+	self, FullParameters, MerkleTreeConfiguration, Mint, MultiProvingContext,
+	MultiVerifyingContext, NoteEncryptionScheme, Parameters, PrivateTransfer, ProofSystem,
+	ProvingContext, Reclaim, UtxoAccumulatorModel, UtxoCommitmentScheme, VerifyingContext,
+	VoidNumberCommitmentScheme,
 };
 use manta_util::codec::{Decode, IoReader};
 use pallet_manta_pay::types::TransferPost;
@@ -88,21 +89,21 @@ fn load_parameters(
 		.expect("Unable to decode RECLAIM verifying context."),
 	};
 	let parameters = Parameters {
-		key_agreement: KeyAgreementScheme::decode(
-			manta_sdk::pay::testnet::parameters::KeyAgreement::get()
+		note_encryption_scheme: NoteEncryptionScheme::decode(
+			manta_sdk::pay::testnet::parameters::NoteEncryptionScheme::get()
 				.expect("Checksum did not match."),
 		)
-		.expect("Unable to decode KEY_AGREEMENT parameters."),
+		.expect("Unable to decode NOTE_ENCRYPTION_SCHEME parameters."),
 		utxo_commitment: UtxoCommitmentScheme::decode(
 			manta_sdk::pay::testnet::parameters::UtxoCommitmentScheme::get()
 				.expect("Checksum did not match."),
 		)
 		.expect("Unable to decode UTXO_COMMITMENT_SCHEME parameters."),
-		void_number_hash: VoidNumberHashFunction::decode(
-			manta_sdk::pay::testnet::parameters::VoidNumberHashFunction::get()
+		void_number_commitment: VoidNumberCommitmentScheme::decode(
+			manta_sdk::pay::testnet::parameters::VoidNumberCommitmentScheme::get()
 				.expect("Checksum did not match."),
 		)
-		.expect("Unable to decode VOID_NUMBER_HASH_FUNCTION parameters."),
+		.expect("Unable to decode VOID_NUMBER_COMMITMENT_SCHEME parameters."),
 	};
 	Ok((
 		proving_context,
diff --git a/pallets/manta-pay/src/test/payment.rs b/pallets/manta-pay/src/test/payment.rs
index 9950f1f54..da60dc3dc 100644
--- a/pallets/manta-pay/src/test/payment.rs
+++ b/pallets/manta-pay/src/test/payment.rs
@@ -29,9 +29,9 @@ use manta_crypto::{
 	rand::{CryptoRng, Rand, RngCore, Sample},
 };
 use manta_pay::config::{
-	FullParameters, KeyAgreementScheme, MerkleTreeConfiguration, Mint, MultiProvingContext,
+	FullParameters, MerkleTreeConfiguration, Mint, MultiProvingContext, NoteEncryptionScheme,
 	Parameters, PrivateTransfer, ProvingContext, Reclaim, TransferPost, UtxoAccumulatorModel,
-	UtxoCommitmentScheme, VoidNumberHashFunction,
+	UtxoCommitmentScheme, VoidNumberCommitmentScheme,
 };
 use manta_primitives::{
 	assets::{AssetConfig, AssetRegistrar, AssetRegistrarMetadata, FungibleLedger},
@@ -90,21 +90,21 @@ fn load_proving_context() -> MultiProvingContext {
 #[inline]
 fn load_parameters() -> Parameters {
 	Parameters {
-		key_agreement: KeyAgreementScheme::decode(
-			manta_sdk::pay::testnet::parameters::KeyAgreement::get()
+		note_encryption_scheme: NoteEncryptionScheme::decode(
+			manta_sdk::pay::testnet::parameters::NoteEncryptionScheme::get()
 				.expect("Checksum did not match."),
 		)
-		.expect("Unable to decode KEY_AGREEMENT parameters."),
+		.expect("Unable to decode NOTE_ENCRYPTION_SCHEME parameters."),
 		utxo_commitment: UtxoCommitmentScheme::decode(
 			manta_sdk::pay::testnet::parameters::UtxoCommitmentScheme::get()
 				.expect("Checksum did not match."),
 		)
 		.expect("Unable to decode UTXO_COMMITMENT_SCHEME parameters."),
-		void_number_hash: VoidNumberHashFunction::decode(
-			manta_sdk::pay::testnet::parameters::VoidNumberHashFunction::get()
+		void_number_commitment: VoidNumberCommitmentScheme::decode(
+			manta_sdk::pay::testnet::parameters::VoidNumberCommitmentScheme::get()
 				.expect("Checksum did not match."),
 		)
-		.expect("Unable to decode VOID_NUMBER_HASH_FUNCTION parameters."),
+		.expect("Unable to decode VOID_NUMBER_COMMITMENT_SCHEME parameters."),
 	}
 }
 
diff --git a/pallets/manta-pay/src/types.rs b/pallets/manta-pay/src/types.rs
index 8ea379ae9..4f9976c97 100644
--- a/pallets/manta-pay/src/types.rs
+++ b/pallets/manta-pay/src/types.rs
@@ -73,29 +73,29 @@ impl Asset {
 /// Encrypted Note
 #[derive(Clone, Debug, Decode, Encode, Eq, Hash, MaxEncodedLen, PartialEq, TypeInfo)]
 pub struct EncryptedNote {
-	/// Ciphertext
-	pub ciphertext: [u8; 36],
-
 	/// Ephemeral Public Key
 	pub ephemeral_public_key: [u8; 32],
+
+	/// Ciphertext
+	pub ciphertext: [u8; 68],
 }
 
 impl Default for EncryptedNote {
 	#[inline]
 	fn default() -> Self {
 		Self {
-			ciphertext: [0; 36],
 			ephemeral_public_key: [0; 32],
+			ciphertext: [0; 68],
 		}
 	}
 }
 
 impl From<config::EncryptedNote> for EncryptedNote {
 	#[inline]
-	fn from(note: config::EncryptedNote) -> Self {
+	fn from(encrypted_note: config::EncryptedNote) -> Self {
 		Self {
-			ciphertext: note.ciphertext.into(),
-			ephemeral_public_key: encode(note.ephemeral_public_key),
+			ephemeral_public_key: encode(encrypted_note.ephemeral_public_key),
+			ciphertext: encrypted_note.ciphertext.into(),
 		}
 	}
 }
@@ -104,10 +104,10 @@ impl TryFrom<EncryptedNote> for config::EncryptedNote {
 	type Error = ();
 
 	#[inline]
-	fn try_from(note: EncryptedNote) -> Result<Self, Self::Error> {
+	fn try_from(encrypted_note: EncryptedNote) -> Result<Self, Self::Error> {
 		Ok(Self {
-			ciphertext: note.ciphertext.into(),
-			ephemeral_public_key: decode(note.ephemeral_public_key)?,
+			ephemeral_public_key: decode(encrypted_note.ephemeral_public_key)?,
+			ciphertext: encrypted_note.ciphertext.into(),
 		})
 	}
 }
@@ -151,7 +151,7 @@ pub struct ReceiverPost {
 	pub utxo: [u8; 32],
 
 	/// Encrypted Note
-	pub note: EncryptedNote,
+	pub encrypted_note: EncryptedNote,
 }
 
 impl From<config::ReceiverPost> for ReceiverPost {
@@ -159,7 +159,7 @@ impl From<config::ReceiverPost> for ReceiverPost {
 	fn from(post: config::ReceiverPost) -> Self {
 		Self {
 			utxo: encode(post.utxo),
-			note: post.note.into(),
+			encrypted_note: post.encrypted_note.into(),
 		}
 	}
 }
@@ -171,7 +171,7 @@ impl TryFrom<ReceiverPost> for config::ReceiverPost {
 	fn try_from(post: ReceiverPost) -> Result<Self, Self::Error> {
 		Ok(Self {
 			utxo: decode(post.utxo)?,
-			note: post.note.try_into()?,
+			encrypted_note: post.encrypted_note.try_into()?,
 		})
 	}
 }
diff --git a/primitives/src/assets.rs b/primitives/src/assets.rs
index 7512882fa..cf3d5ed88 100644
--- a/primitives/src/assets.rs
+++ b/primitives/src/assets.rs
@@ -448,10 +448,10 @@ where
 		Self::is_valid(asset_id)?;
 		Self::can_deposit(asset_id, beneficiary, amount)?;
 		if asset_id == A::NativeAssetId::get() {
-			let _ = <Native as Currency<C::AccountId>>::deposit_creating(&beneficiary, amount);
+			let _ = <Native as Currency<C::AccountId>>::deposit_creating(beneficiary, amount);
 			Ok(())
 		} else {
-			<NonNative as Mutate<C::AccountId>>::mint_into(asset_id, &beneficiary, amount)
+			<NonNative as Mutate<C::AccountId>>::mint_into(asset_id, beneficiary, amount)
 				.map(|_| ())
 				.map_err(|_| FungibleLedgerConsequence::InternalError)
 		}
diff --git a/runtime/dolphin/src/weights/pallet_manta_pay.rs b/runtime/dolphin/src/weights/pallet_manta_pay.rs
index 0b86750fb..d873a2364 100644
--- a/runtime/dolphin/src/weights/pallet_manta_pay.rs
+++ b/runtime/dolphin/src/weights/pallet_manta_pay.rs
@@ -1,81 +1,134 @@
-// Copyright 2019-2022 Manta Network.
-// This file is part of pallet-manta-pay.
-//
-// pallet-manta-pay is free software: you can redistribute it and/or modify
+// Copyright 2020-2022 Manta Network.
+// This file is part of Manta.
+
+// Manta is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-//
-// pallet-manta-pay is distributed in the hope that it will be useful,
+
+// Manta is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-//
+
 // You should have received a copy of the GNU General Public License
-// along with pallet-manta-pay.  If not, see <http://www.gnu.org/licenses/>.
+// along with Manta.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Autogenerated weights
+//! Autogenerated weights for pallet_manta_pay
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-10-15, STEPS: `1`, REPEAT: 10, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128
+//! DATE: 2022-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dolphin-dev"), DB CACHE: 1024
 
+// Executed Command:
+// manta
+// benchmark
+// --chain=dolphin-dev
+// --pallet=pallet_manta_pay
+// --extrinsic=*
+// --execution=Wasm
+// --wasm-execution=Compiled
+// --heap-pages=4096
+// --repeat=20
+// --steps=50
+// --template=.github/resources/frame-weight-template.hbs
+// --output=pallet_manta_pay.rs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
 
-use core::marker::PhantomData;
-use frame_support::{
-	traits::Get,
-	weights::{constants::RocksDbWeight, Weight},
-};
-use frame_system::Config;
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
 
-/// Concrete Weight Functions
-pub struct SubstrateWeight<T>(PhantomData<T>);
+/// Weight functions needed for pallet_manta_pay.
+pub trait WeightInfo {
+	fn to_private() -> Weight;
+	fn private_transfer() -> Weight;
+	fn to_public() -> Weight;
+}
 
+/// Weights for pallet_manta_pay using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_manta_pay::WeightInfo for SubstrateWeight<T> {
-	/// ```text
-	/// Storage: MantaPay Balances (r:1 w:1)
-	/// Storage: MantaPay UtxoSet (r:1 w:1)
-	/// Storage: MantaPay ShardTrees (r:1 w:1)
-	/// Storage: MantaPay UtxoSetOutputs (r:0 w:1)
-	/// Storage: MantaPay Shards (r:0 w:1)
-	/// ```
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: MantaPay UtxoSet (r:1 w:1)
+	// Storage: MantaPay VoidNumberSetSize (r:1 w:0)
+	// Storage: MantaPay ShardTrees (r:1 w:1)
+	// Storage: MantaPay UtxoAccumulatorOutputs (r:0 w:1)
+	// Storage: MantaPay Shards (r:0 w:1)
 	fn to_private() -> Weight {
-		(36_400_000_000 as Weight)
+		(83_558_310_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 	}
-
-	/// ```text
-	/// Storage: MantaPay UtxoSetOutputs (r:2 w:2)
-	/// Storage: MantaPay VoidNumberSet (r:2 w:2)
-	/// Storage: MantaPay UtxoSet (r:2 w:2)
-	/// Storage: MantaPay VoidNumberSetSize (r:1 w:1)
-	/// Storage: MantaPay ShardTrees (r:2 w:2)
-	/// Storage: MantaPay VoidNumberSetInsertionOrder (r:0 w:2)
-	/// Storage: MantaPay Shards (r:0 w:2)
-	/// ```
+	// Storage: MantaPay UtxoAccumulatorOutputs (r:2 w:2)
+	// Storage: MantaPay VoidNumberSet (r:2 w:2)
+	// Storage: MantaPay UtxoSet (r:2 w:2)
+	// Storage: MantaPay VoidNumberSetSize (r:1 w:1)
+	// Storage: MantaPay ShardTrees (r:2 w:2)
+	// Storage: MantaPay VoidNumberSetInsertionOrder (r:0 w:2)
+	// Storage: MantaPay Shards (r:0 w:2)
 	fn private_transfer() -> Weight {
-		(51_500_000_000 as Weight)
+		(112_161_756_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(9 as Weight))
 			.saturating_add(T::DbWeight::get().writes(13 as Weight))
 	}
-
-	/// ```text
-	/// Storage: MantaPay UtxoSetOutputs (r:2 w:1)
-	/// Storage: MantaPay VoidNumberSet (r:2 w:2)
-	/// Storage: MantaPay UtxoSet (r:1 w:1)
-	/// Storage: MantaPay VoidNumberSetSize (r:1 w:1)
-	/// Storage: MantaPay ShardTrees (r:1 w:1)
-	/// Storage: MantaPay Balances (r:1 w:1)
-	/// Storage: MantaPay VoidNumberSetInsertionOrder (r:0 w:2)
-	/// Storage: MantaPay Shards (r:0 w:1)
-	/// ```
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: MantaPay UtxoAccumulatorOutputs (r:2 w:1)
+	// Storage: MantaPay VoidNumberSet (r:2 w:2)
+	// Storage: MantaPay UtxoSet (r:1 w:1)
+	// Storage: MantaPay VoidNumberSetSize (r:1 w:1)
+	// Storage: MantaPay ShardTrees (r:1 w:1)
+	// Storage: MantaPay VoidNumberSetInsertionOrder (r:0 w:2)
+	// Storage: MantaPay Shards (r:0 w:1)
 	fn to_public() -> Weight {
-		(44_100_000_000 as Weight)
+		(103_005_197_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(12 as Weight))
 	}
 }
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: MantaPay UtxoSet (r:1 w:1)
+	// Storage: MantaPay VoidNumberSetSize (r:1 w:0)
+	// Storage: MantaPay ShardTrees (r:1 w:1)
+	// Storage: MantaPay UtxoAccumulatorOutputs (r:0 w:1)
+	// Storage: MantaPay Shards (r:0 w:1)
+	fn to_private() -> Weight {
+		(83_558_310_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
+	}
+	// Storage: MantaPay UtxoAccumulatorOutputs (r:2 w:2)
+	// Storage: MantaPay VoidNumberSet (r:2 w:2)
+	// Storage: MantaPay UtxoSet (r:2 w:2)
+	// Storage: MantaPay VoidNumberSetSize (r:1 w:1)
+	// Storage: MantaPay ShardTrees (r:2 w:2)
+	// Storage: MantaPay VoidNumberSetInsertionOrder (r:0 w:2)
+	// Storage: MantaPay Shards (r:0 w:2)
+	fn private_transfer() -> Weight {
+		(112_161_756_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(9 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(13 as Weight))
+	}
+	// Storage: Assets Asset (r:1 w:1)
+	// Storage: Assets Account (r:2 w:2)
+	// Storage: MantaPay UtxoAccumulatorOutputs (r:2 w:1)
+	// Storage: MantaPay VoidNumberSet (r:2 w:2)
+	// Storage: MantaPay UtxoSet (r:1 w:1)
+	// Storage: MantaPay VoidNumberSetSize (r:1 w:1)
+	// Storage: MantaPay ShardTrees (r:1 w:1)
+	// Storage: MantaPay VoidNumberSetInsertionOrder (r:0 w:2)
+	// Storage: MantaPay Shards (r:0 w:1)
+	fn to_public() -> Weight {
+		(103_005_197_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(12 as Weight))
+	}
+}