Register Operations logic

.github/workflows/actions.yml

@@ -2,20 +2,27 @@ name: CI
 
 on:
   push:
-    branches:
-      - main
+    branches: [ main, feat/* ]
   pull_request:
+    branches: [ main, feat/* ]
+  workflow_dispatch:
 
 permissions:
+  actions: write
   checks: write
+  contents: write
+  id-token: write
+  issues: write
+  discussions: write
   pull-requests: write
+  statuses: write
 
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/[email protected].1
+    uses: multiversx/mx-sc-actions/.github/workflows/[email protected].5
     with:
-      rust-toolchain: nightly-2023-05-26
-      vmtools-version: v1.4.60
+      rust-toolchain: nightly-2023-12-11
+      vmtools-version: v1.5.24
     secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
+      token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/on_pull_request_build_contracts.yml

@@ -0,0 +1,14 @@
+name: On pull request, build contracts
+
+on:
+  pull_request:
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    uses: multiversx/mx-sc-actions/.github/workflows/[email protected]
+    with:
+      image_tag: v5.4.1
+      package_whole_project_src: true

.github/workflows/release.yml

@@ -1,79 +1,15 @@
-name: Create release
+name: On release build and attach artifacts
 
 on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        required: true
-        description: Release tag
-      title:
-        required: true
-        description: Release title
-      image_tag:
-        type: choice
-        required: true
-        description: Image multiversx/sdk-rust-contract-builder
-        options:
-        - v3.1.0
-        - v4.0.2
-        - v4.0.3
+  release:
+    types: [published]
 
 permissions:
   contents: write
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.GITHUB_REF_NAME }}
-          fetch-depth: 0
-          repository: ${{ env.GITHUB_REPOSITORY }}
-
-      - name: Download build script
-        run: |
-          wget https://raw.githubusercontent.com/multiversx/mx-sdk-rust-contract-builder/${{ github.event.inputs.image_tag }}/build_with_docker.py
-      - name: Build contract
-        run: |
-          python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ github.event.inputs.image_tag }} --project=. --output=/home/runner/work/output-from-docker
-      - name: Save artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: built-contracts
-          path: |
-            /home/runner/work/output-from-docker/**/*.wasm
-            /home/runner/work/output-from-docker/**/*.abi.json
-          if-no-files-found: error
-
-  release:
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: "0"
-
-      - name: Download all workflow artifacts
-        uses: actions/download-artifact@v2
-        with:
-          path: assets
-
-      - name: Create release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          echo "Built using Docker image: **multiversx/sdk-rust-contract-builder:${{ github.event.inputs.image_tag }}**." >> notes.txt
-          echo "" >> notes.txt
-          echo "## Codehash (blake2b):" >> notes.txt
-          echo "" >> notes.txt
-          for i in $(find ./assets -type f -name *.wasm); do
-            filename=$(basename ${i})
-            checksum=($(b2sum -l 256 ${i}))
-            echo " - **${filename}**: \`${checksum}\`" >> notes.txt
-          done
-          gh release create ${{ github.event.inputs.tag }} --target=$GITHUB_SHA --prerelease --title="${{ github.event.inputs.title }}" --generate-notes --notes-file=notes.txt
-          sleep 10
-          gh release upload ${{ github.event.inputs.tag }} $(find ./assets -type f)
+    uses: multiversx/mx-sc-actions/.github/workflows/[email protected]
+    with:
+      image_tag: v6.0.0
+      attach_to_existing_release: true

common/token-whitelist/src/lib.rs

@@ -22,7 +22,7 @@ pub trait TokenWhitelistModule:
             return;
         }
 
-        let token_list = self.verfiy_items_signature(opt_signature, tokens);
+        let token_list = self.verify_items_signature(opt_signature, tokens);
         self.token_whitelist().extend(&token_list);
     }
 
@@ -39,7 +39,7 @@ pub trait TokenWhitelistModule:
             return;
         }
 
-        let token_list = self.verfiy_items_signature(opt_signature, tokens);
+        let token_list = self.verify_items_signature(opt_signature, tokens);
         self.remove_items(&mut self.token_whitelist(), &token_list);
     }
 
@@ -64,7 +64,7 @@ pub trait TokenWhitelistModule:
             return;
         }
 
-        let token_list = self.verfiy_items_signature(opt_signature, tokens);
+        let token_list = self.verify_items_signature(opt_signature, tokens);
         self.token_blacklist().extend(&token_list);
     }
 
@@ -81,7 +81,7 @@ pub trait TokenWhitelistModule:
             return;
         }
 
-        let token_list = self.verfiy_items_signature(opt_signature, tokens);
+        let token_list = self.verify_items_signature(opt_signature, tokens);
         self.remove_items(&mut self.token_blacklist(), &token_list);
     }
 

common/utils/src/lib.rs

@@ -47,7 +47,7 @@ pub trait UtilsModule: bls_signature::BlsSignatureModule {
         first_payment
     }
 
-    fn verfiy_items_signature<T: TopDecode + NestedEncode + ManagedVecItem>(
+    fn verify_items_signature<T: TopDecode + NestedEncode + ManagedVecItem>(
         &self,
         opt_signature: Option<BlsSignature<Self::Api>>,
         items: MultiValueEncoded<T>,

esdt-safe/src/to_sovereign/create_tx.rs

@@ -57,7 +57,7 @@ pub trait CreateTxModule:
             return;
         }
 
-        let all_tokens = self.verfiy_items_signature(opt_signature, tokens);
+        let all_tokens = self.verify_items_signature(opt_signature, tokens);
         self.burn_tokens().extend(&all_tokens);
     }
 
@@ -74,7 +74,7 @@ pub trait CreateTxModule:
             return;
         }
 
-        let all_tokens = self.verfiy_items_signature(opt_signature, tokens);
+        let all_tokens = self.verify_items_signature(opt_signature, tokens);
         self.remove_items(&mut self.burn_tokens(), &all_tokens);
     }
 
@@ -91,7 +91,7 @@ pub trait CreateTxModule:
             return;
         }
 
-        let all_names = self.verfiy_items_signature(opt_signature, names);
+        let all_names = self.verify_items_signature(opt_signature, names);
         self.banned_endpoint_names().extend(&all_names);
     }
 
@@ -108,7 +108,7 @@ pub trait CreateTxModule:
             return;
         }
 
-        let all_names = self.verfiy_items_signature(opt_signature, names);
+        let all_names = self.verify_items_signature(opt_signature, names);
         self.remove_items(&mut self.banned_endpoint_names(), &all_names);
     }
 
@@ -151,6 +151,7 @@ pub trait CreateTxModule:
         let own_sc_address = self.blockchain().get_sc_address();
         let mut all_token_data = ManagedVec::new();
         let mut total_tokens_for_fees = 0usize;
+        let mut event_payments = MultiValueEncoded::new();
         let burn_mapper = self.burn_tokens();
         for payment in &payments {
             self.require_below_max_amount(&payment.token_identifier, &payment.amount);
@@ -170,6 +171,14 @@ pub trait CreateTxModule:
             } else {
                 all_token_data.push(StolenFromFrameworkEsdtTokenData::default());
             }
+
+            event_payments.push(
+                MultiValue3 ((
+                    payment.token_identifier.clone(),
+                    payment.token_nonce,
+                    payment.amount.clone()    
+                ))
+            );
 
             if burn_mapper.contains(&payment.token_identifier) {
                 self.send().esdt_local_burn(
@@ -196,8 +205,7 @@ pub trait CreateTxModule:
 
         self.deposit_event(
             &to,
-            &final_payments.fee,
-            &payments,
+            &event_payments,
             DepositEvent::from(tx_nonce, &opt_transfer_data),
         );
 

esdt-safe/src/to_sovereign/events.rs

@@ -1,5 +1,5 @@
 use transaction::{
-    transaction_status::TransactionStatus, BatchId, GasLimit, PaymentsVec, TransferData, TxId,
+    transaction_status::TransactionStatus, BatchId, GasLimit, TransferData, TxId
 };
 
 multiversx_sc::imports!();
@@ -38,8 +38,7 @@ pub trait EventsModule {
     fn deposit_event(
         &self,
         #[indexed] dest_address: &ManagedAddress,
-        #[indexed] fee: &EsdtTokenPayment,
-        #[indexed] tokens: &PaymentsVec<Self::Api>,
+        #[indexed] tokens: &MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
         event_data: DepositEvent<Self::Api>,
     );