Merge remote-tracking branch 'origin/main' into nicolas/abs-589-oracl…

…e-adapter-implementation
AbstractSDK · Jan 8, 2025 · e4c132c · e4c132c
2 parents 7ab80c9 + d403ed0
commit e4c132c
Show file tree

Hide file tree

Showing 240 changed files with 30,725 additions and 1,988 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -124,7 +124,7 @@ jobs:
 
   build-framework:
     docker:
-      - image: cimg/rust:1.80.0
+      - image: cimg/rust:1.83.0
     resource_class: xlarge
     steps:
       - setup_remote_docker
@@ -157,7 +157,7 @@ jobs:
             git checkout "$CIRCLE_BRANCH-build"
       - restore_cache:
           keys:
-            - cargocache-v2-build-rust:1.80.0-{{ checksum "framework/Cargo.lock" }}
+            - cargocache-v2-build-rust:1.83.0-{{ checksum "framework/Cargo.lock" }}
       - run:
           name: Build framework WASM artifacts
           command: |
@@ -170,7 +170,7 @@ jobs:
             - framework/target/debug/.fingerprint
             - framework/target/debug/build
             - framework/target/debug/deps
-          key: cargocache-v2-build-rust:1.80.0-{{ checksum "framework/Cargo.lock" }}
+          key: cargocache-v2-build-rust:1.83.0-{{ checksum "framework/Cargo.lock" }}
       - run:
           name: Import GPG Key
           command: |
@@ -203,7 +203,7 @@ jobs:
 
   build-modules:
     docker:
-      - image: cimg/rust:1.80.0
+      - image: cimg/rust:1.83.0
     resource_class: xlarge
     steps:
       - setup_remote_docker
@@ -271,7 +271,7 @@ jobs:
 
   build-schemas:
     docker:
-      - image: cimg/rust:1.80.0
+      - image: cimg/rust:1.83.0
     resource_class: xlarge
     steps:
       - setup_remote_docker
@@ -297,7 +297,7 @@ jobs:
             git checkout "$CIRCLE_BRANCH-build"
       - restore_cache:
           keys:
-            - cargocache-v2-build-rust:1.80.0-{{ checksum "framework/Cargo.lock" }}
+            - cargocache-v2-build-rust:1.83.0-{{ checksum "framework/Cargo.lock" }}
       - run:
           name: Generate schemas
           command: |
@@ -370,7 +370,7 @@ jobs:
 
   tests:
     docker:
-      - image: cimg/rust:1.80.0
+      - image: cimg/rust:1.83.0
     resource_class: xlarge
     steps:
       - checkout
@@ -381,7 +381,7 @@ jobs:
             cargo generate-lockfile
       - restore_cache:
           keys:
-            - cargocache-v2-tests-rust:1.80.0-{{ checksum "modules/Cargo.lock" }}
+            - cargocache-v2-tests-rust:1.83.0-{{ checksum "modules/Cargo.lock" }}
       - run:
           name: Modules tests
           command: |
@@ -392,11 +392,11 @@ jobs:
             - modules/target/debug/.fingerprint
             - modules/target/debug/build
             - modules/target/debug/deps
-          key: cargocache-v2-tests-rust:1.80.0-{{ checksum "modules/Cargo.lock" }}
+          key: cargocache-v2-tests-rust:1.83.0-{{ checksum "modules/Cargo.lock" }}
 
   deploy:
     docker:
-      - image: cimg/rust:1.80.0
+      - image: cimg/rust:1.83.0
     resource_class: large
     steps:
       - checkout
@@ -409,7 +409,7 @@ jobs:
             fi
       - restore_cache:
           keys:
-            - cargocache-v2-deploy-rust:1.80.0-{{ checksum "framework/Cargo.lock" }}
+            - cargocache-v2-deploy-rust:1.83.0-{{ checksum "framework/Cargo.lock" }}
       - run:
           name: Decode and Deploy
           command: |
@@ -450,11 +450,11 @@ jobs:
             - framework/target/debug/.fingerprint
             - framework/target/debug/build
             - framework/target/debug/deps
-          key: cargocache-v2-deploy-rust:1.80.0-{{ checksum "framework/Cargo.lock" }}
+          key: cargocache-v2-deploy-rust:1.83.0-{{ checksum "framework/Cargo.lock" }}
 
   modules-coverage:
     docker:
-      - image: cimg/rust:1.80.0
+      - image: cimg/rust:1.83.0
     resource_class: xlarge
     steps:
       - setup_remote_docker
@@ -468,7 +468,7 @@ jobs:
             fi
       - restore_cache:
           keys:
-            - cargocache-v2-coverage-rust:1.80.0-{{ checksum "modules/Cargo.lock" }}
+            - cargocache-v2-coverage-rust:1.83.0-{{ checksum "modules/Cargo.lock" }}
       - run:
           name: Run tests with coverage for modules
           command: |
@@ -481,11 +481,11 @@ jobs:
             - modules/target/debug/.fingerprint
             - modules/target/debug/build
             - modules/target/debug/deps
-          key: cargocache-v2-deploy-rust:1.80.0-{{ checksum "modules/Cargo.lock" }}
+          key: cargocache-v2-deploy-rust:1.83.0-{{ checksum "modules/Cargo.lock" }}
 
   framework-coverage:
     docker:
-      - image: cimg/rust:1.80.0
+      - image: cimg/rust:1.83.0
     resource_class: xlarge
     steps:
       - rust_install_nightly
@@ -500,7 +500,7 @@ jobs:
             fi
       - restore_cache:
           keys:
-            - cargocache-v2-coverage-rust:1.80.0-{{ checksum "framework/Cargo.lock" }}
+            - cargocache-v2-coverage-rust:1.83.0-{{ checksum "framework/Cargo.lock" }}
       - run:
           name: Run tests with coverage for framework
           command: |
@@ -513,7 +513,7 @@ jobs:
             - framework/target/debug/.fingerprint
             - framework/target/debug/build
             - framework/target/debug/deps
-          key: cargocache-v2-deploy-rust:1.80.0-{{ checksum "framework/Cargo.lock" }}
+          key: cargocache-v2-deploy-rust:1.83.0-{{ checksum "framework/Cargo.lock" }}
 
   pass:
     docker:

diff --git a/.github/workflows/framework-check.yml b/.github/workflows/framework-check.yml
@@ -7,10 +7,10 @@ on:
     paths:
       - "framework/**"
   pull_request:
-    paths: 
+    paths:
       - "framework/**"
 
-env: 
+env:
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
 
@@ -63,7 +63,7 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           components: clippy
       - uses: Swatinem/rust-cache@v2
-        with: 
+        with:
           workspaces: "framework -> target"
       - name: cargo clippy
         working-directory: ./framework
@@ -112,37 +112,30 @@ jobs:
       - name: cargo install cargo-hack
         uses: taiki-e/install-action@cargo-hack
       - uses: Swatinem/rust-cache@v2
-        with: 
-            workspaces: "framework -> target"
+        with:
+          workspaces: "framework -> target"
       - name: cargo hack
         working-directory: ./framework
         run: cargo hack --feature-powerset check --lib --tests
   # Find any unused dependencies
   unused-deps:
     runs-on: ubuntu-latest
-    name: nigtly / unused-deps
+    name: stable / unused-deps
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: webfactory/ssh-agent@v0.8.0
-        with:
-          ssh-private-key: |
-            ${{ secrets.SSH_PRIVATE_KEY_MULTI_TEST }}
-            ${{ secrets.SSH_PRIVATE_KEY_CW_ORCH_INTERCHAIN }}
       - name: Setup sccache
         uses: mozilla-actions/sccache-action@v0.0.5
         with:
           version: "v0.8.1"
-      - name: Install nightly
-        uses: dtolnay/rust-toolchain@nightly
-      - name: cargo install cargo-udeps
-        uses: taiki-e/install-action@cargo-udeps
-      - name: cargo install cargo-workspaces
-        run: cargo +stable install cargo-workspaces
-      - uses: Swatinem/rust-cache@v2
-        with: 
-            workspaces: "framework -> target"
-      - name: cargo udeps framework
+      - name: Install stable
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+      - name: Install cargo-machete
+        working-directory: ./framework
+        run: cargo install cargo-machete
+      - name: Install cargo-machete
         working-directory: ./framework
-        run: cargo workspaces exec cargo +nightly udeps --workspace --exclude "workspace-hack"
+        run: cargo machete ./contracts/* ./packages/*
diff --git a/.github/workflows/framework-test.yml b/.github/workflows/framework-test.yml
@@ -23,11 +23,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: webfactory/ssh-agent@v0.8.0
-        with:
-          ssh-private-key: |
-            ${{ secrets.SSH_PRIVATE_KEY_MULTI_TEST }}
-            ${{ secrets.SSH_PRIVATE_KEY_CW_ORCH_INTERCHAIN }}
       - name: Setup sccache
         uses: mozilla-actions/sccache-action@v0.0.5
         with:

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -1,4 +1,4 @@
-name: framwork-gh-pages-deploy
+name: framework-gh-pages-deploy
 
 on:
   push:
@@ -52,7 +52,7 @@ jobs:
 
       - name: Upload artifact
         if: ${{ github.event_name != 'pull_request' }}
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           # Upload book repository
           path: './framework/docs/book'

diff --git a/.github/workflows/modules-check.yml b/.github/workflows/modules-check.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        toolchain: [stable, beta]
+        toolchain: [stable]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -99,7 +99,7 @@ jobs:
           --mutually-exclusive-features \
           wynd,osmosis,astroport,bow,terraswap,astrovault,testing,osmosis-test,node-tests,interface,cw-orch,schema \
           --lib --tests
-          
+
   # Find any unused dependencies
   unused-deps:
     runs-on: ubuntu-latest
@@ -108,21 +108,17 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: webfactory/ssh-agent@v0.8.0
-        with:
-          ssh-private-key: |
-            ${{ secrets.SSH_PRIVATE_KEY_MULTI_TEST }}
-            ${{ secrets.SSH_PRIVATE_KEY_CW_ORCH_INTERCHAIN }}
       - name: Setup sccache
         uses: mozilla-actions/sccache-action@v0.0.5
         with:
           version: "v0.8.1"
-      - name: Install nightly
-        uses: dtolnay/rust-toolchain@nightly
-      - name: cargo install cargo-udeps
-        uses: taiki-e/install-action@cargo-udeps
-      - name: cargo install cargo-workspaces
-        run: cargo +stable install cargo-workspaces
-      - name: cargo udeps modules
+      - name: Install stable
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+      - name: Install cargo-machete
+        working-directory: ./modules
+        run: cargo install cargo-machete
+      - name: Install cargo-machete
         working-directory: ./modules
-        run: cargo workspaces exec cargo +nightly udeps
+        run: cargo machete
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 **/target
-**/Cargo.lock
 !framework/Cargo.lock
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries