Merge branch 'master' into human3

multiversx · Sep 5, 2024 · c5b2f23 · c5b2f23
2 parents b3c3bb2 + cafea24
commit c5b2f23
Show file tree

Hide file tree

Showing 2,312 changed files with 82,545 additions and 25,512 deletions.
diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  checks: write
+  pull-requests: write
+
+jobs:
+  contracts:
+    name: Contracts (nightly)
+    uses: multiversx/mx-sc-actions/.github/workflows/[email protected]
+    with:
+      rust-toolchain: nightly-2024-05-22
+      path-to-sc-meta: framework/meta
+      enable-contracts-size-report: false
+      mx-scenario-go-version: v2.1.0-alpha
+      coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 
 permissions:
   checks: write
@@ -13,10 +14,11 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.3
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.1.0
     with:
-      rust-toolchain: nightly-2023-05-26
-      vmtools-repository: "https://github.com/multiversx/mx-chain-vm-v1_4-go/archive/{TAG}.tar.gz"
-      vmtools-version: v1.4.89
+      rust-toolchain: stable
+      path-to-sc-meta: framework/meta
+      mx-scenario-go-version: v2.1.0-alpha
+      coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
     secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
+      token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lldb-formatter-tests.yml b/.github/workflows/lldb-formatter-tests.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 
 jobs:
   format_tests:
@@ -15,7 +16,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-05-26
+          toolchain: stable
 
       - name: Download vscode-lldb
         uses: robinraju/[email protected]

diff --git a/.github/workflows/plotter-test.yml b/.github/workflows/plotter-test.yml
@@ -0,0 +1,30 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  checks: write
+  pull-requests: write
+
+jobs:
+  template_test_current:
+    name: Plotter tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - name: Run plotter tests
+        run: |
+          cd tools/plotter
+          cargo test
diff --git a/.github/workflows/proxy-compare.yml b/.github/workflows/proxy-compare.yml
@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  proxy_compare:
+    name: Proxy compare - newly generated vs present in file tree
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          default: true
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - name: Install prerequisites
+        run: |
+          cargo install --path framework/meta
+
+      - name: Run proxy compare
+        run: |
+          cd contracts
+          sc-meta all proxy --compare
diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-05-26
+          toolchain: stable
           target: wasm32-unknown-unknown
 
       - name: Setup the PATH variable
@@ -43,12 +43,6 @@ jobs:
           which wasm2wat
           which run-scenarios
 
-      - name: Install libtinfo5
-        if: inputs.install-libtinfo5
-        run: |
-          sudo apt update
-          sudo apt install -y libtinfo5
-
       - name: Build project example outputs
         run: |
           ./zip-example-wasm.sh
@@ -60,4 +54,3 @@ jobs:
           file: ./examples-wasm.zip
           asset_name: examples-wasm.zip
           overwrite: true
-          body: "This is my release text"
diff --git a/.github/workflows/template-test-current.yml b/.github/workflows/template-test-current.yml
@@ -22,34 +22,18 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-05-26
+          toolchain: stable
           target: wasm32-unknown-unknown
 
-      - name: Setup the PATH variable
-        run: |
-          echo "PATH=$HOME/.local/bin:$HOME/multiversx-sdk/vmtools:$PATH" >> $GITHUB_ENV
-
       - name: Install prerequisites
         run: |
-          pip3 install multiversx-sdk-cli==v6.0.0
-          mkdir $HOME/multiversx-sdk
-          python3 -m multiversx_sdk_cli.cli deps install vmtools --tag v1.4.60
-          
-          wget -O binaryen.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_112/binaryen-version_112-x86_64-linux.tar.gz
-          tar -xf binaryen.tar.gz
-          cp binaryen-version_112/bin/wasm-opt $HOME/.local/bin
-
-          sudo apt install -y wabt=1.0.27-1
+          cargo install wasm-opt
+          cargo install --path framework/meta
+          sc-meta install mx-scenario-go --tag v2.0.0
 
           which wasm-opt
-          which wasm2wat
-          which run-scenarios
-
-      - name: Install libtinfo5
-        if: inputs.install-libtinfo5
-        run: |
-          sudo apt update
-          sudo apt install -y libtinfo5
+          which mx-scenario-go
+          mx-scenario-go --version
 
       - name: Run template tool test
         run: |

diff --git a/.github/workflows/template-test-released.yml b/.github/workflows/template-test-released.yml
@@ -22,34 +22,18 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           default: true
-          toolchain: nightly-2023-05-26
+          toolchain: stable
           target: wasm32-unknown-unknown
 
-      - name: Setup the PATH variable
-        run: |
-          echo "PATH=$HOME/.local/bin:$HOME/multiversx-sdk/vmtools:$PATH" >> $GITHUB_ENV
-
       - name: Install prerequisites
         run: |
-          pip3 install multiversx-sdk-cli==v6.0.0
-          mkdir $HOME/multiversx-sdk
-          python3 -m multiversx_sdk_cli.cli deps install vmtools --tag v1.4.60
-          
-          wget -O binaryen.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_112/binaryen-version_112-x86_64-linux.tar.gz
-          tar -xf binaryen.tar.gz
-          cp binaryen-version_112/bin/wasm-opt $HOME/.local/bin
-
-          sudo apt install -y wabt=1.0.27-1
+          cargo install wasm-opt
+          cargo install --path framework/meta
+          sc-meta install mx-scenario-go --tag v2.0.0
 
           which wasm-opt
-          which wasm2wat
-          which run-scenarios
-
-      - name: Install libtinfo5
-        if: inputs.install-libtinfo5
-        run: |
-          sudo apt update
-          sudo apt install -y libtinfo5
+          which mx-scenario-go
+          mx-scenario-go --version
 
       - name: Run template tool test
         run: |

diff --git a/.gitignore b/.gitignore
@@ -8,18 +8,26 @@
 # The root Cargo.lock is kept for dependabot.
 contracts/**/Cargo.lock
 !contracts/**/wasm*/Cargo.lock
+contracts/**/output*/
 data/**/Cargo.lock
 framework/**/Cargo.lock
 sdk/**/Cargo.lock
 tools/**/Cargo.lock
 vm/**/Cargo.lock
 
+# Coverage outputs
+*.profraw
+*.profdata
+*.coverage
+coverage.md
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-# VSCode config
+# Editors config
 .vscode
+.zed
+.idea
 
 # Others
 my-vm-tests.sh