Merge remote-tracking branch 'origin/master' into pxrl/depositAndBurn

Author: pxrl

.github/workflows/pr.yml

@@ -16,23 +16,23 @@ jobs:
         with:
           node-version: "${{ matrix.node }}"
           cache: yarn
-      - name: Setup Anchor & Build
-        uses: metadaoproject/setup-anchor@v2
+      - name: Extract Solana versions
+        uses: solana-developers/github-actions/[email protected]
+        id: versions
+      - name: Setup Anchor & Solana
+        uses: solana-developers/github-actions/[email protected]
         with:
-          anchor-version: 0.30.1
-          solana-cli-version: 1.18.21
-          node-version: 20
-      - name: Create keypair
-        run: solana-keygen new --no-bip39-passphrase
-        shell: bash
+          anchor_version: ${{ steps.versions.outputs.anchor_version }}
+          solana_version: ${{ steps.versions.outputs.solana_version }}
+          node_version: 20
       - name: Install Cargo toolchain
         uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
           profile: minimal
-          components: rustc
+          components: rustc, rustfmt
       - name: Install packages
-        run: yarn install --frozen-lockfile && rustup component add --toolchain nightly-x86_64-unknown-linux-gnu rustfmt
+        run: yarn install --frozen-lockfile
       - name: Lint js
         shell: bash
         run: yarn lint-js
@@ -57,15 +57,15 @@ jobs:
         with:
           node-version: "${{ matrix.node }}"
           cache: yarn
-      - name: Setup Anchor & Build
-        uses: metadaoproject/setup-anchor@v2
+      - name: Extract Solana versions
+        uses: solana-developers/github-actions/[email protected]
+        id: versions
+      - name: Setup Anchor & Solana
+        uses: solana-developers/github-actions/[email protected]
         with:
-          anchor-version: 0.30.1
-          solana-cli-version: 1.18.21
-          node-version: 20
-      - name: Create keypair
-        run: solana-keygen new --no-bip39-passphrase
-        shell: bash
+          anchor_version: ${{ steps.versions.outputs.anchor_version }}
+          solana_version: ${{ steps.versions.outputs.solana_version }}
+          node_version: 20
       - name: Install Cargo toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -99,12 +99,15 @@ jobs:
         with:
           node-version: "${{ matrix.node }}"
           cache: yarn
-      - name: Setup Anchor & Build
-        uses: metadaoproject/setup-anchor@v2
+      - name: Extract Solana versions
+        uses: solana-developers/github-actions/[email protected]
+        id: versions
+      - name: Setup Anchor & Solana
+        uses: solana-developers/github-actions/[email protected]
         with:
-          anchor-version: 0.30.1
-          solana-cli-version: 1.18.21
-          node-version: 20
+          anchor_version: ${{ steps.versions.outputs.anchor_version }}
+          solana_version: ${{ steps.versions.outputs.solana_version }}
+          node_version: 20
       - name: Install packages
         run: yarn install --frozen-lockfile
       - name: Install Foundry

.github/workflows/publish.yml

@@ -23,12 +23,15 @@ jobs:
         id: release
         uses: manovotny/[email protected]
       # Setup Anchor to enable compilation and export of Solana programs
-      - name: Setup Anchor & Build
-        uses: metadaoproject/setup-anchor@v2
+      - name: Extract Solana versions
+        uses: solana-developers/github-actions/[email protected]
+        id: versions
+      - name: Setup Anchor & Solana
+        uses: solana-developers/github-actions/[email protected]
         with:
-          anchor-version: "0.30.1"
-          solana-cli-version: "1.18.21"
-          node-version: "20.17.0"
+          anchor_version: ${{ steps.versions.outputs.anchor_version }}
+          solana_version: ${{ steps.versions.outputs.solana_version }}
+          node_version: 20
       # - run: anchor build
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v3