rebase

gear-tech · Dec 17, 2024 · c6c6354 · c6c6354
2 parents d30c16d + 0fed2b6
commit c6c6354
Show file tree

Hide file tree

Showing 118 changed files with 4,101 additions and 2,540 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -45,7 +45,7 @@ jobs:
         run: |
           npm cache clean --force
           # version from ethexe/contracts/lib/openzeppelin-foundry-upgrades/src/internal/Versions.sol
-          npx @openzeppelin/upgrades-core@^1.32.3
+          npx @openzeppelin/upgrades-core@^1.37.0
 
           cd ethexe/contracts
           forge fmt --check
@@ -105,6 +105,7 @@ jobs:
     runs-on: [kuberunner, github-runner-01]
     env:
       RUSTUP_HOME: /tmp/rustup_home
+      RUSTFLAGS: "--cfg fuzz"
     steps:
       - name: Cancel Previous Runs
         if: ${{ github.event_name == 'pull_request' }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,7 +62,8 @@ jobs:
 
       - name: "Environment: Export versions"
         run: |
-          echo "VARA_SPEC=$(cat runtime/vara/src/lib.rs | grep "spec_version: " | awk -F " " '{print substr($2, 1, length($2)-1)}')" >> $GITHUB_ENV
+          echo "VARA_PROD_SPEC=$(cat runtime/vara/src/lib.rs | grep "spec_version: " | head -n 1 | awk -F " " '{print substr($2, 1, length($2)-1)}')" >> $GITHUB_ENV
+          echo "VARA_DEV_SPEC=$(cat runtime/vara/src/lib.rs | grep "spec_version: " | tail -n 1 | awk -F " " '{print substr($2, 1, length($2)-1)}')" >> $GITHUB_ENV
 
       - name: "Environment: Make `artifact` directory"
         run: mkdir -p artifact
@@ -80,31 +81,31 @@ jobs:
 
       - name: "Artifact: Production `vara-runtime` metadata"
         run: |
-          RUNTIME_WASM=target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm PRINT_SCALE=1 cargo run -p gsdk-api-gen --release > "artifact/production_vara_runtime_v${VARA_SPEC}_metadata.scale"
+          RUNTIME_WASM=target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm PRINT_SCALE=1 cargo run -p gsdk-api-gen --release > "artifact/production_vara_runtime_v${VARA_PROD_SPEC}_metadata.scale"
 
       - name: "Artifact: Production `vara-runtime`"
-        run: cp target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm "artifact/production_vara_runtime_v$VARA_SPEC.wasm"
+        run: cp target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm "artifact/production_vara_runtime_v${VARA_PROD_SPEC}.wasm"
 
       - name: "Build: Production node client and development `vara-runtime`"
-        run: cargo build -p gear-cli --profile production
+        run: cargo build -p gear-cli --profile production --features metadata-hash
 
       - name: "Test: Development `vara-runtime`"
         run: ./wasm-proc --check-runtime-imports --check-runtime-is-dev true target/production/wbuild/vara-runtime/vara_runtime.compact.wasm
 
       - name: "Artifact: Development `vara-runtime` metadata"
         run: |
-          RUNTIME_WASM=target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm PRINT_SCALE=1 cargo run -p gsdk-api-gen --release > "artifact/testnet_vara_runtime_v${VARA_SPEC}_metadata.scale"
+          RUNTIME_WASM=target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm PRINT_SCALE=1 cargo run -p gsdk-api-gen --release > "artifact/testnet_vara_runtime_v${VARA_DEV_SPEC}_metadata.scale"
 
       - name: "Artifact: Production node client and development `vara-runtime`"
         run: |
-          cp target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm "artifact/testnet_vara_runtime_v$VARA_SPEC.wasm"
+          cp target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm "artifact/testnet_vara_runtime_v${VARA_DEV_SPEC}.wasm"
           cp target/production/gear artifact/gear
           strip artifact/gear || true
 
       - name: Check SHA256 checksums
         run: |
-          sha256sum artifact/production_vara_runtime_v$VARA_SPEC.wasm
-          sha256sum artifact/testnet_vara_runtime_v$VARA_SPEC.wasm
+          sha256sum artifact/production_vara_runtime_v${VARA_PROD_SPEC}.wasm
+          sha256sum artifact/testnet_vara_runtime_v${VARA_DEV_SPEC}.wasm
 
       - name: Publish
         uses: softprops/action-gh-release@v2

diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,19 @@
 [submodule "ethexe/contracts/lib/forge-std"]
 	path = ethexe/contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+	branch = "v1"
 [submodule "ethexe/contracts/lib/openzeppelin-contracts"]
 	path = ethexe/contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = "release-v5.1"
 [submodule "ethexe/contracts/lib/openzeppelin-foundry-upgrades"]
 	path = ethexe/contracts/lib/openzeppelin-foundry-upgrades
 	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
+	branch = "main"
 [submodule "ethexe/contracts/lib/openzeppelin-contracts-upgradeable"]
 	path = ethexe/contracts/lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+	branch = "release-v5.1"
 [submodule "ethexe/contracts/lib/symbiotic-core"]
 	path = ethexe/contracts/lib/symbiotic-core
 	url = https://github.com/grishasobol/symbiotic-core