Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/anchor-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ on:
- develop
- production
pull_request:
workflow_dispatch:

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
- uses: actions/checkout@v4

- uses: metadaoproject/anchor-test@v2.2
with:
anchor-version: '0.29.0'
solana-cli-version: '1.17.16'
anchor-version: '0.29.0'
solana-cli-version: '1.17.16'
8 changes: 4 additions & 4 deletions .github/workflows/deploy-buffer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ 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: actions/checkout@v4
- uses: metadaoproject/setup-anchor@v3.2
with:
solana-cli-version: '1.18.18'
solana-cli-version: '1.17.16'
anchor-version: '0.29.0'
- run: echo "$DEPLOYER_KEYPAIR" > deployer-keypair.json && chmod 600 deployer-keypair.json
shell: bash
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/generate-verifiable-builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
with:
program: autocrat
anchor-version: '0.29.0'
Expand All @@ -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.3
with:
program: conditional_vault
anchor-version: '0.29.0'
Expand All @@ -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.3
with:
program: amm
anchor-version: '0.29.0'
Expand All @@ -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.3
with:
program: launchpad
anchor-version: '0.29.0'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/verify-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ 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: actions/checkout@v4
- uses: metadaoproject/setup-anchor@v3.2
with:
anchor-version: ${{ inputs.anchor-version }}
solana-cli-version: ${{ inputs.solana-cli-version }}
- name: Cache Cargo registry + index
uses: actions/cache@v2
uses: actions/cache@v4
id: cache-cargo-registry
with:
path: |
Expand All @@ -39,7 +39,7 @@ jobs:
~/.cargo/git/db/
key: cargo-${{ runner.os }}-v0001-${{ hashFiles('**/Cargo.lock') }}
- name: Cache Solana Verify
uses: actions/cache@v2
uses: actions/cache@v4
id: cache-solana-verify
with:
path: |
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sdk/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions sdk/src/v0.4/ConditionalVaultClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -259,7 +259,7 @@ export class ConditionalVaultClient {

const preInstructions = conditionalTokenMintAddrs.map((mint) =>
createAssociatedTokenAccountIdempotentInstruction(
payer ?? user,
payer,
getAssociatedTokenAddressSync(mint, user, true),
user,
mint
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading