From 97a65f1616168896335386e742b9c81a42485036 Mon Sep 17 00:00:00 2001 From: Kollan House Date: Wed, 7 May 2025 11:32:47 -0700 Subject: [PATCH 01/17] chore: update to working ubuntu version --- .github/workflows/anchor-test.yaml | 2 +- .github/workflows/deploy-buffer.yaml | 2 +- .github/workflows/generate-verifiable-builds.yaml | 8 ++++---- .github/workflows/verify-build.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 66fb3c197..0c7ec4451 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -8,7 +8,7 @@ on: jobs: run-anchor-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/anchor-test@v2.1 diff --git a/.github/workflows/deploy-buffer.yaml b/.github/workflows/deploy-buffer.yaml index 3695f1534..959a26772 100644 --- a/.github/workflows/deploy-buffer.yaml +++ b/.github/workflows/deploy-buffer.yaml @@ -19,7 +19,7 @@ on: jobs: deploy-buffer: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/setup-anchor@v3 diff --git a/.github/workflows/generate-verifiable-builds.yaml b/.github/workflows/generate-verifiable-builds.yaml index e3dcc6670..56330d1a9 100644 --- a/.github/workflows/generate-verifiable-builds.yaml +++ b/.github/workflows/generate-verifiable-builds.yaml @@ -8,7 +8,7 @@ on: jobs: generate-verifiable-autocrat: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/anchor-verifiable-build@v0.2 @@ -24,7 +24,7 @@ jobs: default_author: github_actions message: 'Update autocrat verifiable build' generate-verifiable-vault: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/anchor-verifiable-build@v0.2 @@ -41,7 +41,7 @@ jobs: default_author: github_actions message: 'Update conditional_vault verifiable build' generate-verifiable-amm: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/anchor-verifiable-build@v0.2 @@ -57,7 +57,7 @@ jobs: default_author: github_actions message: 'Update amm verifiable build' generate-verifiable-launchpad: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/anchor-verifiable-build@v0.2 diff --git a/.github/workflows/verify-build.yaml b/.github/workflows/verify-build.yaml index bc8499d87..8dba80a52 100644 --- a/.github/workflows/verify-build.yaml +++ b/.github/workflows/verify-build.yaml @@ -22,7 +22,7 @@ on: jobs: verify-build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/setup-anchor@v2 From 3a848ac0ffb5fbb27a53b34ae0cb17076359343a Mon Sep 17 00:00:00 2001 From: Kollan House Date: Wed, 7 May 2025 11:42:35 -0700 Subject: [PATCH 02/17] chore: update solana release pre agave --- .github/workflows/anchor-test.yaml | 2 +- .github/workflows/deploy-buffer.yaml | 2 +- .github/workflows/generate-verifiable-builds.yaml | 8 ++++---- .github/workflows/verify-build.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 0c7ec4451..316e41c2a 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -14,4 +14,4 @@ jobs: - uses: metadaoproject/anchor-test@v2.1 with: anchor-version: '0.29.0' - solana-cli-version: '1.17.16' + solana-cli-version: '1.18.26' diff --git a/.github/workflows/deploy-buffer.yaml b/.github/workflows/deploy-buffer.yaml index 959a26772..90c449af5 100644 --- a/.github/workflows/deploy-buffer.yaml +++ b/.github/workflows/deploy-buffer.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: metadaoproject/setup-anchor@v3 with: - solana-cli-version: '1.18.18' + solana-cli-version: '1.18.26' anchor-version: '0.29.0' - run: echo "$DEPLOYER_KEYPAIR" > deployer-keypair.json && chmod 600 deployer-keypair.json shell: bash diff --git a/.github/workflows/generate-verifiable-builds.yaml b/.github/workflows/generate-verifiable-builds.yaml index 56330d1a9..4b724becb 100644 --- a/.github/workflows/generate-verifiable-builds.yaml +++ b/.github/workflows/generate-verifiable-builds.yaml @@ -15,7 +15,7 @@ jobs: with: program: autocrat anchor-version: '0.29.0' - solana-cli-version: '1.17.16' + solana-cli-version: '1.18.26' - run: 'git pull --rebase' - run: cp target/deploy/autocrat.so ./verifiable-builds - name: Commit verifiable build back to mainline @@ -31,7 +31,7 @@ jobs: with: program: conditional_vault anchor-version: '0.29.0' - solana-cli-version: '1.17.16' + solana-cli-version: '1.18.26' features: 'production' - run: 'git pull --rebase' - run: cp target/deploy/conditional_vault.so ./verifiable-builds @@ -48,7 +48,7 @@ jobs: with: program: amm anchor-version: '0.29.0' - solana-cli-version: '1.17.16' + solana-cli-version: '1.18.26' - run: 'git pull --rebase' - run: cp target/deploy/amm.so ./verifiable-builds - name: Commit verifiable build back to mainline @@ -64,7 +64,7 @@ jobs: with: program: launchpad anchor-version: '0.29.0' - solana-cli-version: '1.17.16' + solana-cli-version: '1.18.26' features: 'production' - run: 'git pull --rebase' - run: cp target/deploy/launchpad.so ./verifiable-builds diff --git a/.github/workflows/verify-build.yaml b/.github/workflows/verify-build.yaml index 8dba80a52..0a27b3757 100644 --- a/.github/workflows/verify-build.yaml +++ b/.github/workflows/verify-build.yaml @@ -18,7 +18,7 @@ on: solana-cli-version: description: 'Solana CLI version' required: true - default: '1.17.16' + default: '1.18.26' jobs: verify-build: From f7da8911ef9e1a3c1df74e6bc0473389440e8a6c Mon Sep 17 00:00:00 2001 From: Kollan House Date: Wed, 7 May 2025 12:10:22 -0700 Subject: [PATCH 03/17] chore: update all versions of our build pipeline --- .github/workflows/anchor-test.yaml | 4 ++-- .github/workflows/deploy-buffer.yaml | 4 ++-- .../workflows/generate-verifiable-builds.yaml | 16 ++++++++-------- .github/workflows/verify-build.yaml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 316e41c2a..2924055ae 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-test@v2.1 + - uses: metadaoproject/anchor-test@v2.2 with: anchor-version: '0.29.0' - solana-cli-version: '1.18.26' + solana-cli-version: '1.18.16' diff --git a/.github/workflows/deploy-buffer.yaml b/.github/workflows/deploy-buffer.yaml index 90c449af5..ae97390ad 100644 --- a/.github/workflows/deploy-buffer.yaml +++ b/.github/workflows/deploy-buffer.yaml @@ -22,9 +22,9 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: metadaoproject/setup-anchor@v3 + - uses: metadaoproject/setup-anchor@v3.2 with: - solana-cli-version: '1.18.26' + solana-cli-version: '1.18.18' anchor-version: '0.29.0' - run: echo "$DEPLOYER_KEYPAIR" > deployer-keypair.json && chmod 600 deployer-keypair.json shell: bash diff --git a/.github/workflows/generate-verifiable-builds.yaml b/.github/workflows/generate-verifiable-builds.yaml index 4b724becb..52507b0a9 100644 --- a/.github/workflows/generate-verifiable-builds.yaml +++ b/.github/workflows/generate-verifiable-builds.yaml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-verifiable-build@v0.2 + - uses: metadaoproject/anchor-verifiable-build@v0.3 with: program: autocrat anchor-version: '0.29.0' - solana-cli-version: '1.18.26' + solana-cli-version: '1.17.16' - run: 'git pull --rebase' - run: cp target/deploy/autocrat.so ./verifiable-builds - name: Commit verifiable build back to mainline @@ -27,11 +27,11 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-verifiable-build@v0.2 + - uses: metadaoproject/anchor-verifiable-build@v0.3 with: program: conditional_vault anchor-version: '0.29.0' - solana-cli-version: '1.18.26' + solana-cli-version: '1.17.16' features: 'production' - run: 'git pull --rebase' - run: cp target/deploy/conditional_vault.so ./verifiable-builds @@ -44,11 +44,11 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-verifiable-build@v0.2 + - uses: metadaoproject/anchor-verifiable-build@v0.3 with: program: amm anchor-version: '0.29.0' - solana-cli-version: '1.18.26' + solana-cli-version: '1.17.16' - run: 'git pull --rebase' - run: cp target/deploy/amm.so ./verifiable-builds - name: Commit verifiable build back to mainline @@ -60,11 +60,11 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-verifiable-build@v0.2 + - uses: metadaoproject/anchor-verifiable-build@v0.3 with: program: launchpad anchor-version: '0.29.0' - solana-cli-version: '1.18.26' + solana-cli-version: '1.17.16' features: 'production' - run: 'git pull --rebase' - run: cp target/deploy/launchpad.so ./verifiable-builds diff --git a/.github/workflows/verify-build.yaml b/.github/workflows/verify-build.yaml index 0a27b3757..b8f1a186b 100644 --- a/.github/workflows/verify-build.yaml +++ b/.github/workflows/verify-build.yaml @@ -18,14 +18,14 @@ on: solana-cli-version: description: 'Solana CLI version' required: true - default: '1.18.26' + default: '1.17.16' jobs: verify-build: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: metadaoproject/setup-anchor@v2 + - uses: metadaoproject/setup-anchor@v3.2 with: anchor-version: ${{ inputs.anchor-version }} solana-cli-version: ${{ inputs.solana-cli-version }} From 3e9f15a8dd1b9f9cd8d3c0217da2206d45a0a35b Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 13:37:27 -0600 Subject: [PATCH 04/17] fix: updated anchor-test to 2.3 to test solana-labs install of solana 17.1 with ubuntu 22.04 --- .github/workflows/anchor-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 2924055ae..142556a2e 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-test@v2.2 + - uses: metadaoproject/anchor-test@v2.3 with: anchor-version: '0.29.0' - solana-cli-version: '1.18.16' + solana-cli-version: '1.17.16' From 77c3edfd1d0717b98b3511a443b308eb813afcde Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 13:53:48 -0600 Subject: [PATCH 05/17] fix: trigger to run anchor-test --- .github/workflows/anchor-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 142556a2e..16dea4e17 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -15,3 +15,4 @@ jobs: with: anchor-version: '0.29.0' solana-cli-version: '1.17.16' + From 4f59ac4e51f5dc2acbcae0dcd82b176263e9e48a Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 14:43:27 -0600 Subject: [PATCH 06/17] fix: pinning rust version to 1.86.0 --- .github/workflows/anchor-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 16dea4e17..c41827fd8 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -15,4 +15,4 @@ jobs: with: anchor-version: '0.29.0' solana-cli-version: '1.17.16' - + \ No newline at end of file From e8e22827c61b93e2c2c0eb078bb691e8feb7e5e0 Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 15:15:09 -0600 Subject: [PATCH 07/17] fix: changed solana-cli to 1.17.34 --- .github/workflows/anchor-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index c41827fd8..3cb4a0fd5 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -14,5 +14,5 @@ jobs: - uses: metadaoproject/anchor-test@v2.3 with: anchor-version: '0.29.0' - solana-cli-version: '1.17.16' + solana-cli-version: '1.17.34' \ No newline at end of file From 251724063e65ee908446966d87ad4888a4bde875 Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 15:27:22 -0600 Subject: [PATCH 08/17] fix: attempting to use an ubuntu 20.04 image --- .github/workflows/anchor-test.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 3cb4a0fd5..ebc621eec 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -9,10 +9,11 @@ on: jobs: run-anchor-test: runs-on: ubuntu-22.04 + container: + image: ubuntu:20.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/anchor-test@v2.3 with: anchor-version: '0.29.0' - solana-cli-version: '1.17.34' - \ No newline at end of file + solana-cli-version: '1.17.34' \ No newline at end of file From e4a8630d83e3df0cbaf1813dc1d22e720b611447 Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 15:39:26 -0600 Subject: [PATCH 09/17] fix: changed solana-cli to 1.17.14 --- .github/workflows/anchor-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index ebc621eec..1c83cfe7f 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -16,4 +16,4 @@ jobs: - uses: metadaoproject/anchor-test@v2.3 with: anchor-version: '0.29.0' - solana-cli-version: '1.17.34' \ No newline at end of file + solana-cli-version: '1.17.14' \ No newline at end of file From 2211bbf6d6dee0b05d3f6bbd8ed05be9c7f7228e Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 15:40:44 -0600 Subject: [PATCH 10/17] fix: changed solana-cli to 1.17.14 --- .github/workflows/anchor-test.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 1c83cfe7f..1afbdccb7 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -9,11 +9,10 @@ on: jobs: run-anchor-test: runs-on: ubuntu-22.04 - container: - image: ubuntu:20.04 steps: - uses: actions/checkout@v3 - uses: metadaoproject/anchor-test@v2.3 with: anchor-version: '0.29.0' - solana-cli-version: '1.17.14' \ No newline at end of file + solana-cli-version: '1.17.14' + \ No newline at end of file From 2276239df6fc2cb6e5f405fb687b250a5d4f39ca Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 16:05:21 -0600 Subject: [PATCH 11/17] fix: updated checkout from v3 to v4 --- .github/workflows/anchor-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 1afbdccb7..fb2ed6538 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -10,7 +10,7 @@ jobs: run-anchor-test: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: metadaoproject/anchor-test@v2.3 with: anchor-version: '0.29.0' From 3c3f85b4a4d6f90315c8babfae07b7f40dfb9f76 Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 16:39:17 -0600 Subject: [PATCH 12/17] fix: reverted solana-cli back to 1.17.16 --- .github/workflows/anchor-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index fb2ed6538..faea79a8a 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -14,5 +14,5 @@ jobs: - uses: metadaoproject/anchor-test@v2.3 with: anchor-version: '0.29.0' - solana-cli-version: '1.17.14' + solana-cli-version: '1.17.16' \ No newline at end of file From 310f79d2bb1602d30e27173b657a653d5c96ce11 Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 17:03:49 -0600 Subject: [PATCH 13/17] fix: pinned rustc to 1.86 --- .github/workflows/anchor-test.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index faea79a8a..b75de0bae 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -8,11 +8,17 @@ on: jobs: run-anchor-test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest + steps: - uses: actions/checkout@v4 + + - name: Set toolchain + run: | + rustup toolchain install 1.86.0 --profile minimal + rustup override set 1.86.0 + - uses: metadaoproject/anchor-test@v2.3 with: - anchor-version: '0.29.0' - solana-cli-version: '1.17.16' - \ No newline at end of file + anchor-version: '0.29.0' + solana-cli-version: '1.17.16' \ No newline at end of file From 1ff7fda0972a5a621ca8e1e09b09d0b615079fce Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 17:22:20 -0600 Subject: [PATCH 14/17] fix: further pinning of rustc to 1.86 --- .github/workflows/anchor-test.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index b75de0bae..3c7fc769f 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -10,14 +10,12 @@ jobs: run-anchor-test: runs-on: ubuntu-latest + env: + RUSTUP_TOOLCHAIN: '1.86.0' + steps: - uses: actions/checkout@v4 - - name: Set toolchain - run: | - rustup toolchain install 1.86.0 --profile minimal - rustup override set 1.86.0 - - uses: metadaoproject/anchor-test@v2.3 with: anchor-version: '0.29.0' From 8694c0ff38a260d0a270d13118c63439520b0015 Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Wed, 28 May 2025 17:40:37 -0600 Subject: [PATCH 15/17] fix: changed versioning of anchor-test --- .github/workflows/anchor-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 3c7fc769f..d98a9b70d 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -8,7 +8,7 @@ on: jobs: run-anchor-test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: RUSTUP_TOOLCHAIN: '1.86.0' @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: metadaoproject/anchor-test@v2.3 + - uses: metadaoproject/anchor-test@v2.4 with: anchor-version: '0.29.0' solana-cli-version: '1.17.16' \ No newline at end of file From 172ab5d5595e382823f316f8dc6457575c373267 Mon Sep 17 00:00:00 2001 From: Kollan House Date: Wed, 28 May 2025 18:27:29 -0700 Subject: [PATCH 16/17] fix: conditional check on payer --- package.json | 2 +- sdk/package.json | 2 +- sdk/src/v0.4/ConditionalVaultClient.ts | 4 ++-- yarn.lock | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 019e3ca3d..2b2475d69 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dependencies": { "@coral-xyz/anchor": "0.29.0", "@inquirer/prompts": "^7.3.3", - "@metadaoproject/futarchy": "0.4.0-alpha.67", + "@metadaoproject/futarchy": "0.4.0-alpha.69", "@metaplex-foundation/mpl-token-metadata": "^3.2.0", "@metaplex-foundation/umi": "^0.9.1", "@metaplex-foundation/umi-bundle-defaults": "^0.9.1", diff --git a/sdk/package.json b/sdk/package.json index de01b3c84..e78fdefef 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@metadaoproject/futarchy", - "version": "0.4.0-alpha.67", + "version": "0.4.0-alpha.69", "type": "module", "main": "dist/index.js", "module": "dist/index.js", diff --git a/sdk/src/v0.4/ConditionalVaultClient.ts b/sdk/src/v0.4/ConditionalVaultClient.ts index 4a951f045..37153a555 100644 --- a/sdk/src/v0.4/ConditionalVaultClient.ts +++ b/sdk/src/v0.4/ConditionalVaultClient.ts @@ -247,7 +247,7 @@ export class ConditionalVaultClient { vault: PublicKey, numOutcomes: number, user: PublicKey, - payer?: PublicKey + payer: PublicKey = this.provider.publicKey ) { const conditionalTokenMintAddrs = this.getConditionalTokenMints( vault, @@ -259,7 +259,7 @@ export class ConditionalVaultClient { const preInstructions = conditionalTokenMintAddrs.map((mint) => createAssociatedTokenAccountIdempotentInstruction( - payer ?? user, + payer, getAssociatedTokenAddressSync(mint, user, true), user, mint diff --git a/yarn.lock b/yarn.lock index 361b0259c..ef12a1334 100644 --- a/yarn.lock +++ b/yarn.lock @@ -786,10 +786,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@metadaoproject/futarchy@0.4.0-alpha.63": - version "0.4.0-alpha.62" - resolved "https://registry.yarnpkg.com/@metadaoproject/futarchy/-/futarchy-0.4.0-alpha.62.tgz#399ecb2be2422b5be3614ce1ed412db4ccdd5999" - integrity sha512-qp2bjBabIelxGPw0FaLnd/F+EoCBwm4MefmyT6syR4YBXbe2IGEgu+XjUmBYMmjlR8BzEJ65s8XS4ZIJaIRUsA== +"@metadaoproject/futarchy@0.4.0-alpha.69": + version "0.4.0-alpha.69" + resolved "https://registry.yarnpkg.com/@metadaoproject/futarchy/-/futarchy-0.4.0-alpha.69.tgz#92099d4a766552376d4820677050788ebc41fc28" + integrity sha512-WkdR1goHVd4OR+oQiCU2Yb93I03B0w+OhzfMqOUIVvt3DbEg4/F1xqjBQLtvRPFdSMNZ80v4dS7SgPsXEj0j+A== dependencies: "@coral-xyz/anchor" "^0.29.0" "@metaplex-foundation/umi" "^0.9.2" From 5255aaad513e5498b4fb342e9c5dcfe3129de3fd Mon Sep 17 00:00:00 2001 From: brooksjeremy7 <92278656+brooksjeremy7@users.noreply.github.com> Date: Thu, 29 May 2025 10:11:49 -0600 Subject: [PATCH 17/17] fix: updated verifiable build and anchor-test --- .github/workflows/anchor-test.yaml | 2 +- .../workflows/generate-verifiable-builds.yaml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index d98a9b70d..db53b5a73 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: metadaoproject/anchor-test@v2.4 + - uses: metadaoproject/anchor-test@v2.5 with: anchor-version: '0.29.0' solana-cli-version: '1.17.16' \ No newline at end of file diff --git a/.github/workflows/generate-verifiable-builds.yaml b/.github/workflows/generate-verifiable-builds.yaml index 52507b0a9..182cab561 100644 --- a/.github/workflows/generate-verifiable-builds.yaml +++ b/.github/workflows/generate-verifiable-builds.yaml @@ -10,8 +10,8 @@ jobs: generate-verifiable-autocrat: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-verifiable-build@v0.3 + - uses: actions/checkout@v4 + - uses: metadaoproject/anchor-verifiable-build@v0.4 with: program: autocrat anchor-version: '0.29.0' @@ -26,8 +26,8 @@ jobs: generate-verifiable-vault: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-verifiable-build@v0.3 + - uses: actions/checkout@v4 + - uses: metadaoproject/anchor-verifiable-build@v0.4 with: program: conditional_vault anchor-version: '0.29.0' @@ -43,8 +43,8 @@ jobs: generate-verifiable-amm: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-verifiable-build@v0.3 + - uses: actions/checkout@v4 + - uses: metadaoproject/anchor-verifiable-build@v0.4 with: program: amm anchor-version: '0.29.0' @@ -59,8 +59,8 @@ jobs: generate-verifiable-launchpad: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-verifiable-build@v0.3 + - uses: actions/checkout@v4 + - uses: metadaoproject/anchor-verifiable-build@v0.4 with: program: launchpad anchor-version: '0.29.0'