Merge branch 'development' into gov-incentives

Arena-DAO · May 7, 2024 · a86f0dc · a86f0dc
2 parents 2816beb + 3ab7017
commit a86f0dc
Show file tree

Hide file tree

Showing 83 changed files with 2,012 additions and 846 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -25,6 +25,9 @@ jobs:
           target: wasm32-unknown-unknown
           override: true
 
+      - name: Install just
+        uses: extractions/setup-just@v1
+
       - name: Rust Dependencies Cache
         uses: actions/cache@v3
         with:
@@ -36,18 +39,6 @@ jobs:
             artifacts/
           key: ${{ runner.os }}-cargo-with-artifacts-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Set latest just version
-        run: echo "JUST_VERSION=$(cargo search just -q | sed -n -e '/^just[[:space:]]/p' | cut -d '"' -f 2)" >> $GITHUB_ENV
-
-      - name: Get cached just
-        uses: actions/cache@v3
-        with:
-          path: ~/.cargo/bin/just
-          key: ${{ runner.os }}-just-${{ env.JUST_VERSION }}
-
-      - name: Install just
-        run: cargo install just || true
-
       - name: Get mainnet GAS_LIMIT
         run: echo "MAINNET_GAS_LIMIT=$(curl -s https://juno-rpc.polkachu.com/consensus_params | jq -r '.result.consensus_params.block.max_gas')" >> $GITHUB_ENV
 

diff --git a/.github/workflows/test_tube.yml b/.github/workflows/test_tube.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2023-02-02
+          toolchain: nightly-2024-01-08
           target: wasm32-unknown-unknown
           override: true
 
@@ -33,7 +33,7 @@ jobs:
         with:
           repository: CosmWasm/wasmvm
           path: ./wasmvm
-          ref: v1.4.1
+          ref: v1.5.2
 
       - name: Install libwasmv
         run: cd ./wasmvm && make build-rust && cd ../
@@ -49,17 +49,8 @@ jobs:
             artifacts/
           key: ${{ runner.os }}-cargo-with-artifacts-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Set latest just version
-        run: echo "JUST_VERSION=$(cargo search just -q | sed -n -e '/^just[[:space:]]/p' | cut -d '"' -f 2)" >> $GITHUB_ENV
-
-      - name: Get cached just
-        uses: actions/cache@v3
-        with:
-          path: ~/.cargo/bin/just
-          key: ${{ runner.os }}-just-${{ env.JUST_VERSION }}
-
       - name: Install just
-        run: cargo install just || true
+        uses: extractions/setup-just@v1
 
       - name: Run download deps
         run: just download-deps