Rebenchmark pallet-mantapay

.github/workflows/check_tests.yml

@@ -38,7 +38,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin
@@ -131,7 +131,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin
@@ -159,7 +159,13 @@ jobs:
             sccache-
       - name: start sccache server
         run: sccache --start-server
-      - name: init
+      - name: build benchmarking binary
+        env:
+          RUST_BACKTRACE: full
+          RUSTC_WRAPPER: sccache
+          SCCACHE_CACHE_SIZE: 120G
+          SCCACHE_DIR: /home/runner/.cache/sccache
+          CARGO_TERM_COLOR: always
         run: |
           sudo apt update
           sudo apt install -y pkg-config libssl-dev protobuf-compiler
@@ -169,17 +175,39 @@ jobs:
           rustup toolchain install nightly-2023-03-03
           rustup default nightly-2023-03-03
           rustup target add wasm32-unknown-unknown
+          df -h
+          sudo apt remove -y '^dotnet-.*'
+          sudo apt remove -y '^mongodb-.*'
+          sudo apt remove -y '^mysql-.*'
+          sudo apt remove -y '^postgresql-*'
+          sudo apt remove -y google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
+          sudo apt autoremove -y
+          sudo apt clean
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /usr/share/dotnet
+          df -h
+      - name: create-chainspec
+        run: |
+          RUSTC_BOOTSTRAP=1 cargo build --release --features runtime-benchmarks
+          ${{ github.workspace }}/target/release/manta build-spec --chain calamari-dev --disable-default-bootnode --raw > ${{ github.workspace }}/tests/data/fork.json
+      - name: append manta-pay storage
+        run: |
+          wget -P ${{ github.workspace }}/tests/data https://manta-ops.s3.amazonaws.com/integration-tests-data/storage.json
+          cd ${{ github.workspace }}/tests
+          yarn install
+          yarn
+          node append_storage.js
       - name: Run live benchmarks test
         env:
           RUST_BACKTRACE: full
           RUSTC_WRAPPER: sccache
           SCCACHE_CACHE_SIZE: 120G
           SCCACHE_DIR: /home/runner/.cache/sccache
         run: |
-          RUSTC_BOOTSTRAP=1 cargo run --release --features runtime-benchmarks,try-runtime \
+          ${{ github.workspace }}/target/release/manta \
           benchmark \
             pallet \
-            --chain=calamari-dev \
+            --chain=${{ github.workspace }}/tests/data/fork.json \
             --pallet=* \
             --extrinsic=* \
             --repeat=1 \
@@ -227,7 +255,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin
@@ -266,15 +294,26 @@ jobs:
           rustup toolchain install nightly-2023-03-03
           rustup default nightly-2023-03-03
           rustup target add wasm32-unknown-unknown
+          df -h
+          sudo apt remove -y '^dotnet-.*'
+          sudo apt remove -y '^mongodb-.*'
+          sudo apt remove -y '^mysql-.*'
+          sudo apt remove -y '^postgresql-*'
+          sudo apt remove -y google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
+          sudo apt autoremove -y
+          sudo apt clean
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /usr/share/dotnet
+          df -h
       - name: Run Unit Tests
         env:
           RUST_BACKTRACE: full
           RUSTC_WRAPPER: sccache
-          SCCACHE_CACHE_SIZE: 120G
+          SCCACHE_CACHE_SIZE: 240
           SCCACHE_DIR: /home/runner/.cache/sccache
         run: |
           source ${HOME}/.cargo/env
-          RUSTC_BOOTSTRAP=1 cargo test --release --features=runtime-benchmarks,try-runtime --workspace --exclude integration-tests
+          RUSTC_BOOTSTRAP=1 cargo test --release --features=runtime-benchmarks,try-runtime --workspace --exclude integration-tests pallet-manta-pay
       - name: stop sccache server
         run: sccache --stop-server || true
   stop-unit-test-checks:

.github/workflows/integration_test_calamari.yml

@@ -46,7 +46,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin

.github/workflows/integration_test_manta.yml

@@ -46,7 +46,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin

.github/workflows/metadata_diff.yml

@@ -42,7 +42,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin

.github/workflows/publish_draft_releases.yml

@@ -90,7 +90,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin

.github/workflows/run_all_benchmarks.yml

@@ -29,7 +29,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin
@@ -67,6 +67,13 @@ jobs:
           rustup toolchain install nightly-2023-03-03
           rustup default nightly-2023-03-03
           rustup target add wasm32-unknown-unknown
+      - name: init nodejs && yarn
+        run: |
+          curl -s https://deb.nodesource.com/setup_16.x | sudo bash
+          sudo apt install nodejs -y
+          node -v
+          sudo npm install --global yarn
+          yarn -v
       - name: build benchmarking binary
         env:
           RUST_BACKTRACE: full
@@ -77,19 +84,31 @@ jobs:
         run: |
           source ${HOME}/.cargo/env
           RUSTC_BOOTSTRAP=1 cargo build --profile production --features runtime-benchmarks --verbose
+      - name: create-chainspec
+        run: |
+          ${{ github.workspace }}/target/production/manta build-spec --chain $CHAIN_SPEC --disable-default-bootnode --raw > ${{ github.workspace }}/tests/data/fork.json
+      - name: append manta-pay storage
+        run: |
+          wget -P ${{ github.workspace }}/tests/data https://manta-ops.s3.amazonaws.com/integration-tests-data/storage.json
+          cd ${{ github.workspace }}/tests
+          yarn install
+          yarn
+          node append_storage.js
+          CHAIN_SPEC=${{ github.workspace }}/tests/data/fork.json
+          echo $CHAIN_SPEC
       - name: stop sccache server
         run: sccache --stop-server || true
       - if: ${{ env.SNAPSHOT_URL == '' }}
         name: run all benchmarks script without storage benchmark
         run: |
-          ./scripts/benchmarking/run_all_benchmarks.sh -b -c $CHAIN_SPEC
+          ./scripts/benchmarking/run_all_benchmarks.sh -b -c ${{ github.workspace }}/tests/data/fork.json
       - if: ${{ env.SNAPSHOT_URL != '' }}
         name: run all benchmarks script with storage benchmark
         run: |
           mkdir $FULL_DB_FOLDER
           wget -q $SNAPSHOT_URL
           tar -xf calamari.tar.gz --directory ./$FULL_DB_FOLDER
-          ./scripts/benchmarking/run_all_benchmarks.sh -b -c $CHAIN_SPEC -s ./$FULL_DB_FOLDER
+          ./scripts/benchmarking/run_all_benchmarks.sh -b -c ${{ github.workspace }}/tests/data/fork.json -s ./$FULL_DB_FOLDER
       - if: always()
         name: upload benchmarking binary
         uses: actions/upload-artifact@v2

.github/workflows/run_linters.yml

@@ -40,7 +40,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin

.github/workflows/try-runtime-mainnet.yml

@@ -48,7 +48,7 @@ jobs:
       - name: install sccache
         env:
           SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: v0.2.15
+          SCCACHE_VERSION: v0.5.3
         run: |
           SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
           mkdir -p $HOME/.local/bin

pallets/asset-manager/src/benchmarking.rs

@@ -18,7 +18,6 @@
 
 use crate::{Call, Config, Pallet};
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
-use frame_support::traits::Get;
 use frame_system::{EventRecord, RawOrigin};
 use manta_primitives::assets::{AssetConfig, TestingDefault, UnitsPerSecond};
 use xcm::latest::prelude::*;
@@ -38,7 +37,7 @@ benchmarks! {
         let metadata = <T::AssetConfig as AssetConfig<T>>::AssetRegistryMetadata::testing_default();
     }: _(RawOrigin::Root, location.clone(), metadata)
     verify {
-        assert_eq!(Pallet::<T>::asset_id_location(<T::AssetConfig as AssetConfig<T>>::StartNonNativeAssetId::get()), Some(location));
+        assert_eq!(Pallet::<T>::asset_id_location(crate::NextAssetId::<T>::get() - 1.into()), Some(location));
     }
 
     set_units_per_second {
@@ -154,6 +153,7 @@ benchmarks! {
     }
 
     register_lp_asset {
+        let current_asset_id = crate::NextAssetId::<T>::get();
         let assets_count = 10;
         for i in 8..assets_count {
             let location: MultiLocation = MultiLocation::new(0, X1(Parachain(i)));
@@ -162,10 +162,10 @@ benchmarks! {
             Pallet::<T>::register_asset(RawOrigin::Root.into(), location.clone(), metadata.clone())?;
         }
         let lp_metadata = <T::AssetConfig as AssetConfig<T>>::AssetRegistryMetadata::testing_default();
-    }: _(RawOrigin::Root, <T as Config>::AssetId::from(8), <T as Config>::AssetId::from(9), lp_metadata)
+    }: _(RawOrigin::Root, current_asset_id, current_asset_id + 1.into(), lp_metadata)
     verify {
-        assert_eq!(Pallet::<T>::asset_id_pair_to_lp((<T as Config>::AssetId::from(8), <T as Config>::AssetId::from(9))), Some(<T as Config>::AssetId::from(10)));
-        assert_eq!(Pallet::<T>::lp_to_asset_id_pair(<T as Config>::AssetId::from(10)), Some((<T as Config>::AssetId::from(8), <T as Config>::AssetId::from(9))));
+        assert_eq!(Pallet::<T>::asset_id_pair_to_lp((current_asset_id, current_asset_id + 1.into())), Some(current_asset_id + 2.into()));
+        assert_eq!(Pallet::<T>::lp_to_asset_id_pair(current_asset_id + 2.into()), Some((current_asset_id, current_asset_id + 1.into())));
     }
 }
 

pallets/manta-pay/Cargo.toml

@@ -124,7 +124,7 @@ lazy_static = "1.4.0"
 manta-crypto = { git = "https://github.com/manta-network/manta-rs.git", tag = "v0.5.15", features = ["getrandom"] }
 manta-pay = { git = "https://github.com/manta-network/manta-rs.git", tag = "v0.5.15", features = ["groth16", "parameters", "scale", "download", "test"] }
 pallet-asset-manager = { path = "../asset-manager" }
-pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.37" }
+pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.37", features = ["runtime-benchmarks"] }
 pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.37" }
 pallet-tx-pause = { path = '../tx-pause' }
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" }

pallets/manta-pay/src/benchmark/mod.rs

@@ -14,12 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Manta.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{
-    benchmark::precomputed_coins::{
-        PRIVATE_TRANSFER, PRIVATE_TRANSFER_INPUT, TO_PRIVATE, TO_PUBLIC, TO_PUBLIC_INPUT,
-    },
-    Call, Config, Event, Pallet, StandardAssetId, TransferPost,
-};
+use crate::{Call, Config, Event, Pallet, StandardAssetId, TransferPost};
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_support::traits::Get;
 use frame_system::RawOrigin;
@@ -28,16 +23,26 @@ use manta_support::manta_pay::{
 };
 
 use manta_primitives::{
-    assets::{AssetConfig, AssetRegistry, FungibleLedger, TestingDefault},
+    assets::{AssetConfig, FungibleLedger},
     constants::TEST_DEFAULT_ASSET_ED,
     types::Balance,
 };
 use scale_codec::Decode;
 
-mod precomputed_coins;
-
 pub const INITIAL_VALUE: u128 = 1_000_000_000_000_000_000_000u128;
 
+const MINTS_OFFSET: usize = 2;
+const MINT_SIZE: usize = 553;
+
+const TRANSFERS_OFFSET: usize = 4;
+const TRANSFER_SIZE: usize = 1291;
+
+const RECLAIMS_OFFSET: usize = 4;
+const RECLAIM_SIZE: usize = 1001;
+
+// 14000 iterations of mint, mint, mint, transfer, mint, mint, reclaim
+const TOTAL_ITERATIONS: usize = 14000;
+
 /// Asserts that the last event that has occurred is the same as `event`.
 #[inline]
 pub fn assert_last_event<T, E>(event: E)
@@ -56,15 +61,6 @@ where
     T: Config,
     T::AccountId: From<AccountId> + Into<AccountId>,
 {
-    let metadata = <T::AssetConfig as AssetConfig<T>>::AssetRegistryMetadata::testing_default();
-    let storage_metadata: <T::AssetConfig as AssetConfig<T>>::StorageMetadata = metadata.into();
-    <T::AssetConfig as AssetConfig<T>>::AssetRegistry::create_asset(
-        id,
-        storage_metadata,
-        TEST_DEFAULT_ASSET_ED,
-        true,
-    )
-    .expect("Unable to create asset.");
     let pallet_account: T::AccountId = Pallet::<T>::account_id();
     <T::AssetConfig as AssetConfig<T>>::FungibleLedger::deposit_minting(
         id,
@@ -85,7 +81,10 @@ benchmarks! {
     to_private {
         let caller: T::AccountId = whitelisted_caller();
         let origin = T::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
-        let mint_post = TransferPost::decode(&mut &*TO_PRIVATE).unwrap();
+        let mint_coins = core::include_bytes!("../../../../tests/data/precomputed_mints");
+        let mints_start = MINTS_OFFSET + TOTAL_ITERATIONS * MINT_SIZE;
+        let to_private_coin = &mint_coins[mints_start..mints_start + MINT_SIZE];
+        let mint_post = TransferPost::decode(&mut &*to_private_coin).unwrap();
         let asset = mint_post.source(0).unwrap();
         init_asset::<T>(&caller, id_from_field(asset.id).unwrap(), asset_value_decode(asset.value));
     }: to_private (
@@ -100,13 +99,25 @@ benchmarks! {
         let caller: T::AccountId = whitelisted_caller();
         let origin = T::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
         init_asset::<T>(&caller, <T::AssetConfig as AssetConfig<T>>::StartNonNativeAssetId::get(), INITIAL_VALUE);
-        for coin in TO_PUBLIC_INPUT {
+        let reclaim_coins = core::include_bytes!("../../../../tests/data/precomputed_reclaims");
+
+        let reclaim_start = RECLAIMS_OFFSET + TOTAL_ITERATIONS * (2 * MINT_SIZE + RECLAIM_SIZE);
+        let to_public_input = {
+            let mint_post1 = &reclaim_coins[reclaim_start..reclaim_start + MINT_SIZE];
+            let mint_post2 = &reclaim_coins[reclaim_start + MINT_SIZE..reclaim_start + 2 * MINT_SIZE];
+
+            [mint_post1, mint_post2]
+        };
+
+        for coin in to_public_input {
             Pallet::<T>::to_private(
                 origin.clone(),
-                TransferPost::decode(&mut &**coin).unwrap()
+                TransferPost::decode(&mut &*coin).unwrap()
             ).unwrap();
         }
-        let reclaim_post = TransferPost::decode(&mut &*TO_PUBLIC).unwrap();
+
+        let to_public_post = &reclaim_coins[reclaim_start + 2 * MINT_SIZE..reclaim_start + 2 * MINT_SIZE + RECLAIM_SIZE];
+        let reclaim_post = TransferPost::decode(&mut &*to_public_post).unwrap();
         let asset = reclaim_post.sink(0).unwrap();
     }: to_public (
         RawOrigin::Signed(caller.clone()),
@@ -120,13 +131,23 @@ benchmarks! {
         let caller: T::AccountId = whitelisted_caller();
         let origin = T::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
         init_asset::<T>(&caller, <T::AssetConfig as AssetConfig<T>>::StartNonNativeAssetId::get(), INITIAL_VALUE);
-        for coin in PRIVATE_TRANSFER_INPUT {
+        let private_transfer_coins = core::include_bytes!("../../../../tests/data/precomputed_transfers");
+        let transfer_start = TRANSFERS_OFFSET + TOTAL_ITERATIONS * (2 * MINT_SIZE + TRANSFER_SIZE);
+        let private_transfer_input = {
+            let mint_post1 = &private_transfer_coins[transfer_start..transfer_start + MINT_SIZE];
+            let mint_post2 = &private_transfer_coins[transfer_start + MINT_SIZE..transfer_start + 2 * MINT_SIZE];
+
+            [mint_post1, mint_post2]
+        };
+
+        for coin in private_transfer_input {
             Pallet::<T>::to_private(
                 origin.clone(),
-                TransferPost::decode(&mut &**coin).unwrap(),
+                TransferPost::decode(&mut &*coin).unwrap(),
             ).unwrap();
         }
-        let private_transfer_post = TransferPost::decode(&mut &*PRIVATE_TRANSFER).unwrap();
+        let private_transfer_post = &private_transfer_coins[transfer_start + 2 * MINT_SIZE..transfer_start + 2 * MINT_SIZE + TRANSFER_SIZE];
+        let private_transfer_post = TransferPost::decode(&mut &*private_transfer_post).unwrap();
     }: private_transfer (
         RawOrigin::Signed(caller.clone()),
         private_transfer_post