Merge branch 'main' into develop

Author: ChewingGlass

.github/actions/setup-solana/action.yaml

@@ -11,7 +11,7 @@ runs:
             ~/.cache/solana/
             ~/.local/share/solana/
           key: solana-${{ runner.os }}-v0000-${{ env.SOLANA_CLI_VERSION }}
-      - run: sh -c "$(curl -sSfL https://release.solana.com/v${{ env.SOLANA_CLI_VERSION }}/install)"
+      - run: sh -c "$(curl -sSfL https://release.anza.xyz/v${{ env.SOLANA_CLI_VERSION }}/install)"
         shell: bash
         if: steps.cache-solana.outputs.cache-hit != 'true'
       - run: echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH

.github/actions/setup/action.yaml

@@ -7,7 +7,7 @@ runs:
         shell: bash
       - run: sudo apt-get install -y pkg-config build-essential libudev-dev
         shell: bash
-      - run: echo "ANCHOR_VERSION=0" >> $GITHUB_ENV
+      - run: echo "ANCHOR_VERSION=0.31.0" >> $GITHUB_ENV
         shell: bash
       - run: echo "ANCHOR_SHA=98396c0aeffb4745ab08fb9f45e0d31ad0bd1402" >> $GITHUB_ENV
         shell: bash

.github/workflows/develop-release-program.yaml

@@ -1,7 +1,7 @@
 name: Deploy Programs to devnet
 
 env:
-  SOLANA_CLI_VERSION: 1.18.15
+  SOLANA_CLI_VERSION: 2.1.6
   NODE_VERSION: 18.12.1
 
 on:

.github/workflows/docker-push.yaml

@@ -1,7 +1,7 @@
 name: Deploy to ECR
 
 env:
-  SOLANA_CLI_VERSION: 1.18.15
+  SOLANA_CLI_VERSION: 2.1.6
   NODE_VERSION: 18.12.1
 
 on:

.github/workflows/npm-canary-release.yaml

@@ -4,7 +4,7 @@ on:
     types: [ created ]
 
 env:
-  SOLANA_CLI_VERSION: 1.18.15
+  SOLANA_CLI_VERSION: 2.1.6
   NODE_VERSION: 18.12.1    
 
 permissions:

.github/workflows/npm-publish.yaml

@@ -1,7 +1,7 @@
 name: NPM Publish
 
 env:
-  SOLANA_CLI_VERSION: 1.18.15
+  SOLANA_CLI_VERSION: 2.1.6
   NODE_VERSION: 18.12.1
 
 on:

.github/workflows/release-program.yaml

@@ -1,7 +1,7 @@
 name: Release Program to Mainnet
 
 env:
-  SOLANA_CLI_VERSION: 1.18.15
+  SOLANA_CLI_VERSION: 2.1.6
   NODE_VERSION: 18.12.1
 
 on:

.github/workflows/solana-programs.yaml

@@ -11,7 +11,7 @@ on:
     paths: ['solana-programs/**', '.github/workflows/solana-programs.yml']
 
 env:
-  SOLANA_CLI_VERSION: 1.18.15
+  SOLANA_CLI_VERSION: 2.1.6
   NODE_VERSION: 18.12.1
 
 jobs: