diff --git a/.github/workflows/anchor-test.yaml b/.github/workflows/anchor-test.yaml index 66fb3c197..db53b5a73 100644 --- a/.github/workflows/anchor-test.yaml +++ b/.github/workflows/anchor-test.yaml @@ -8,10 +8,15 @@ on: jobs: run-anchor-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 + + env: + RUSTUP_TOOLCHAIN: '1.86.0' + steps: - - uses: actions/checkout@v3 - - uses: metadaoproject/anchor-test@v2.1 + - uses: actions/checkout@v4 + + - uses: metadaoproject/anchor-test@v2.5 with: - anchor-version: '0.29.0' - solana-cli-version: '1.17.16' + anchor-version: '0.29.0' + solana-cli-version: '1.17.16' \ No newline at end of file diff --git a/.github/workflows/deploy-buffer.yaml b/.github/workflows/deploy-buffer.yaml index 3695f1534..ae97390ad 100644 --- a/.github/workflows/deploy-buffer.yaml +++ b/.github/workflows/deploy-buffer.yaml @@ -19,10 +19,10 @@ on: jobs: deploy-buffer: - runs-on: ubuntu-20.04 + 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.18' anchor-version: '0.29.0' diff --git a/.github/workflows/generate-verifiable-builds.yaml b/.github/workflows/generate-verifiable-builds.yaml index e3dcc6670..182cab561 100644 --- a/.github/workflows/generate-verifiable-builds.yaml +++ b/.github/workflows/generate-verifiable-builds.yaml @@ -8,10 +8,10 @@ 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 + - uses: actions/checkout@v4 + - uses: metadaoproject/anchor-verifiable-build@v0.4 with: program: autocrat anchor-version: '0.29.0' @@ -24,10 +24,10 @@ 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 + - uses: actions/checkout@v4 + - uses: metadaoproject/anchor-verifiable-build@v0.4 with: program: conditional_vault anchor-version: '0.29.0' @@ -41,10 +41,10 @@ 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 + - uses: actions/checkout@v4 + - uses: metadaoproject/anchor-verifiable-build@v0.4 with: program: amm anchor-version: '0.29.0' @@ -57,10 +57,10 @@ 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 + - uses: actions/checkout@v4 + - uses: metadaoproject/anchor-verifiable-build@v0.4 with: program: launchpad anchor-version: '0.29.0' diff --git a/.github/workflows/verify-build.yaml b/.github/workflows/verify-build.yaml index bc8499d87..b8f1a186b 100644 --- a/.github/workflows/verify-build.yaml +++ b/.github/workflows/verify-build.yaml @@ -22,10 +22,10 @@ on: jobs: verify-build: - runs-on: ubuntu-20.04 + 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 }} 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"