feat: upgrade program to anchor 0.29.0 solana 1.18.0 (#181)

* feat: upgrade program to anchor 0.29.0 solana 1.18.0

* feat: update integration tests for anchor updated pacakge deps

* feat: use yarn 3.6.0

* ci: use test matrix

* test: remove orca sdk

* test: add debug dep for metaplex

Author: sol-mocha

.github/workflows/ci_cd.yml

@@ -1,6 +1,6 @@
 name: CI/CD
 env:
-  cli-id: anchor-v0.25.0.solana-1.10.32.v1
+  cli-id: anchor-v0.29.0.solana-1.18.0.v1
   SWAP_PROGRAM_OWNER_FEE_ADDRESS: HfoTxFR1Tm6kGmWgYWD6J7YHVy1UwqSULUGVLXkJqaKN
 on:
   push:
@@ -57,12 +57,12 @@ jobs:
       - name: Install Solana Tools
         id: install-solana-tools
         if: steps.cache-deps.outputs.cache-hit != 'true'
-        run: sh -c "$(curl -sSfL https://release.solana.com/v1.10.32/install)"
+        run: sh -c "$(curl -sSfL https://release.solana.com/v1.18.0/install)"
 
       - name: Install Anchor CLI
         id: install-anchor-cli
         if: steps.cache-deps.outputs.cache-hit != 'true'
-        run: cargo install --git https://github.com/project-serum/anchor --tag v0.25.0 anchor-cli --locked
+        run: cargo install --git https://github.com/project-serum/anchor --tag v0.29.0 anchor-cli --locked
 
       - name: Add Solana Tools to Path
         run: echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV
@@ -71,12 +71,11 @@ jobs:
         if: steps.cache-deps.outputs.cache-hit != 'true'
         run: |
           npm install -g typescript
-          npm install -g yarn
+          corepack enable
+          yarn set version 3.6.0
           npm install -g ts-mocha
-          npm install -g @project-serum/anchor
-          yarn
-
-      - run: npm list -g
+          npm install -g @coral-xyz/anchor
+          yarn install
 
       - name: Build Programs
         run: anchor build
@@ -86,7 +85,7 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [ build ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -104,13 +103,13 @@ jobs:
             /opt/hostedtoolcache/node
             target
             node_modules
-
+      - run: yarn install
       - run: cargo fmt -- --check
       - run: yarn run prettier --c ./
 
   test-unit:
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [ build ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -138,69 +137,26 @@ jobs:
       - name: unit test
         run: cargo test
 
-  test-integration-batch-1:
-    runs-on: ubuntu-latest
-    needs: [build, lint, test-unit]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: ⚡️ Cache
-        id: cache-deps
-        uses: actions/cache@v2
-        with:
-          key: $${{ env.cli-id }}
-          path: |
-            ~/.local/share/solana
-            ~/.cargo
-            ~/.rustup
-            /opt/hostedtoolcache/node
-            target
-            node_modules
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16.13.0'
-
-      - run: echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV
-      - name: Create Test Wallet
-        run: solana-keygen new --no-bip39-passphrase
-      - run: anchor test tests/integration-tests/batch1/*.ts
-
-  test-integration-batch-2:
+  program-integration-tests:
+    needs: [ build, lint, test-unit ]
     runs-on: ubuntu-latest
-    needs: [build, lint,  test-unit]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: ⚡️ Cache
-        id: cache-deps
-        uses: actions/cache@v2
-        with:
-          key: $${{ env.cli-id }}
-          path: |
-            ~/.local/share/solana
-            ~/.cargo
-            ~/.rustup
-            /opt/hostedtoolcache/node
-            target
-            node_modules
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16.13.0'
-
-      - run: echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV
-      - name: Create Test Wallet
-        run: solana-keygen new --no-bip39-passphrase
-      - run: anchor test tests/integration-tests/batch2/*.ts
-
-  test-integration-batch-3:
-    runs-on: ubuntu-latest
-    needs: [build, lint,  test-unit]
+    strategy:
+      matrix:
+        test:
+          [
+            {
+              scope: "tests/integration-tests/batch1/*.ts",
+            },
+            {
+              scope: "tests/integration-tests/batch2/*.ts",
+            },
+            {
+              scope: "tests/integration-tests/batch3/*.ts",
+            },
+            {
+              scope: "tests/integration-tests/batch4/*.ts",
+            },
+          ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -222,42 +178,20 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '16.13.0'
+          
+      - run: |
+          corepack enable
+          yarn set version 3.6.0
+          yarn install
 
       - run: echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV
+      
       - name: Create Test Wallet
         run: solana-keygen new --no-bip39-passphrase
-      - run: anchor test tests/integration-tests/batch3/*.ts
-
-  test-integration-batch-4:
-    runs-on: ubuntu-latest
-    needs: [build, lint,  test-unit]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: ⚡️ Cache
-        id: cache-deps
-        uses: actions/cache@v2
-        with:
-          key: $${{ env.cli-id }}
-          path: |
-            ~/.local/share/solana
-            ~/.cargo
-            ~/.rustup
-            /opt/hostedtoolcache/node
-            target
-            node_modules
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16.13.0'
+      
+      - name: Run Test 
+        run: anchor test ${{ matrix.test.scope }}
 
-      - run: echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV
-      - name: Create Test Wallet
-        run: solana-keygen new --no-bip39-passphrase
-      - run: anchor test tests/integration-tests/batch4/*.ts
-  
   # audit:
   #   runs-on: ubuntu-latest
   #   needs: [build]
@@ -288,44 +222,44 @@ jobs:
   #       continue-on-error: false          
   #       uses: silas-x/soteria-action@main
   #       with:                             
-  #         solana-version: "1.10.32"        
+  #         solana-version: "1.18.0"        
   #         run-mode: "-analyzeAll"         
   #         cargo-com: "."                  
   #         program-path: "programs/drip"
 
-  deploy:
-    if: github.ref == 'refs/heads/main'
-    needs: [test-integration-batch-1, test-integration-batch-2, test-integration-batch-3, test-integration-batch-4]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-          fetch-depth: 0
+  # deploy:
+  #   if: github.ref == 'refs/heads/main'
+  #   needs: [ test-integration-batch-1, test-integration-batch-2, test-integration-batch-3, test-integration-batch-4 ]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #         submodules: 'true'
+  #         fetch-depth: 0
 
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16.13.0'
+  #     - name: Setup Node
+  #       uses: actions/setup-node@v2
+  #       with:
+  #         node-version: '16.13.0'
 
-      - name: ⚡️ Cache
-        id: cache-deps
-        uses: actions/cache@v2
-        with:
-          key: $${{ env.cli-id }}
-          path: |
-            ~/.local/share/solana
-            ~/.cargo
-            ~/.rustup
-            /opt/hostedtoolcache/node
-            target
-            node_modules
-      
-      - name: Add Solana Tools to Path 
-        run: echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV
+  #     - name: ⚡️ Cache
+  #       id: cache-deps
+  #       uses: actions/cache@v2
+  #       with:
+  #         key: $${{ env.cli-id }}
+  #         path: |
+  #           ~/.local/share/solana
+  #           ~/.cargo
+  #           ~/.rustup
+  #           /opt/hostedtoolcache/node
+  #           target
+  #           node_modules
+
+  #     - name: Add Solana Tools to Path
+  #       run: echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV
 
-      - name: Deploy Devnet Staging Program
-        run: ./scripts/deploy-devnet-staging.sh
-        env:
-          UPGRADE_AUTHORITY: ${{ secrets.UPGRADE_AUTHORITY }}
-          DRIP_KEYPAIR: ${{ secrets.DRIP_KEYPAIR }}
+  #     - name: Deploy Devnet Staging Program
+  #       run: ./scripts/deploy-devnet-staging.sh
+  #       env:
+  #         UPGRADE_AUTHORITY: ${{ secrets.UPGRADE_AUTHORITY }}
+  #         DRIP_KEYPAIR: ${{ secrets.DRIP_KEYPAIR }}

.prettierignore

@@ -5,4 +5,8 @@ build
 .github
 .anchor
 *.rs
-deps/
+deps/
+**/idl/**/
+.yarn/
+*.cjs
+*.mjs