Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .github/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CARGO_TERM_COLOR=always
NODE_VERSION=20.x
PROGRAMS=["program", "adversarial_program/margin_withdraw_cpi"]
RUST_VERSION=1.78.0
RUST_VERSION=1.76.0
SOLANA_VERSION=1.17.34
8 changes: 5 additions & 3 deletions .github/workflows/build-programs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
type: string
solana:
description: Solana version
default: 1.17.34
default: 1.17.23
required: true
type: string
node:
Expand All @@ -43,7 +43,9 @@ jobs:
- name: Setup SSH agent
uses: tensor-foundation/actions/ssh-agent@v1
with:
key: ${{ secrets.TOOLBOX_KEY }}
key: |
${{ secrets.TOOLBOX_KEY }}
${{ secrets.ESCROW_KEY }}

- name: Load environment variables
run: cat .github/.env >> $GITHUB_ENV
Expand All @@ -54,7 +56,7 @@ jobs:
toolchain: ${{ inputs.rust || env.RUST_VERSION }}

- name: Install Solana
uses: tensor-foundation/actions/install-solana@v2.1
uses: tensor-foundation/actions/install-solana@v2
with:
version: ${{ inputs.solana || env.SOLANA_VERSION }}
cache: ${{ env.CACHE }}
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/build-rust-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
type: string
solana:
description: Solana version
default: 1.17.22
default: 1.17.23
required: true
type: string

Expand All @@ -35,7 +35,9 @@ jobs:
- name: Setup SSH agent
uses: tensor-foundation/actions/ssh-agent@v1
with:
key: ${{ secrets.TOOLBOX_KEY }}
key: |
${{ secrets.TOOLBOX_KEY }}
${{ secrets.ESCROW_KEY }}

- name: Load environment variables
run: cat .github/.env >> $GITHUB_ENV
Expand All @@ -46,7 +48,7 @@ jobs:
toolchain: ${{ inputs.rust || env.RUST_VERSION }}

- name: Install Solana
uses: tensor-foundation/actions/install-solana@v2.1
uses: tensor-foundation/actions/install-solana@v2
with:
version: ${{ inputs.solana || env.SOLANA_VERSION }}
cache: ${{ env.CACHE }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ jobs:
- name: Setup SSH agent
uses: tensor-foundation/actions/ssh-agent@v1
with:
key: ${{ secrets.TOOLBOX_KEY }}
key: |
${{ secrets.TOOLBOX_KEY }}
${{ secrets.ESCROW_KEY }}

- name: Load environment variables
run: cat .github/.env >> $GITHUB_ENV
Expand Down Expand Up @@ -179,7 +181,7 @@ jobs:
toolchain: ${{ env.RUST_VERSION }}

- name: Install Solana
uses: tensor-foundation/actions/install-solana@v2.1
uses: tensor-foundation/actions/install-solana@v2
with:
version: ${{ env.SOLANA_VERSION }}
cache: ${{ env.CACHE }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-programs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ jobs:
- name: Setup SSH agent
uses: tensor-foundation/actions/ssh-agent@v1
with:
key: ${{ secrets.TOOLBOX_KEY }}
key: |
${{ secrets.TOOLBOX_KEY }}
${{ secrets.ESCROW_KEY }}

- name: Load environment variables
run: cat .github/.env >> $GITHUB_ENV
Expand All @@ -36,7 +38,7 @@ jobs:
toolchain: ${{ env.RUST_VERSION }}

- name: Install Solana
uses: tensor-foundation/actions/install-solana@v2.1
uses: tensor-foundation/actions/install-solana@v2
with:
version: ${{ env.SOLANA_VERSION }}
cache: ${{ env.CACHE }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-rust-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ jobs:
- name: Setup SSH agent
uses: tensor-foundation/actions/ssh-agent@v1
with:
key: ${{ secrets.TOOLBOX_KEY }}
key: |
${{ secrets.TOOLBOX_KEY }}
${{ secrets.ESCROW_KEY }}

- name: Load environment variables
run: cat .github/.env >> $GITHUB_ENV
Expand All @@ -28,7 +30,7 @@ jobs:
toolchain: ${{ env.RUST_VERSION }}

- name: Install Solana
uses: tensor-foundation/actions/install-solana@v2.1
uses: tensor-foundation/actions/install-solana@v2
with:
version: ${{ env.SOLANA_VERSION }}
cache: ${{ env.CACHE }}
Expand Down
44 changes: 38 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions clients/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"scripts": {
"build": "rimraf dist && tsup && tsc -p ./tsconfig.declarations.json",
"build:docs": "typedoc",
"clean": "rm -rf node_modules && rm -rf dist",
"test": "ava",
"lint": "eslint --ext js,ts,tsx src",
"lint:fix": "eslint --fix --ext js,ts,tsx src",
Expand All @@ -43,14 +44,14 @@
"@ava/typescript": "^4.1.0",
"@solana/eslint-config-solana": "^3.0.0",
"@tensor-foundation/test-helpers": "1.0.0-beta.1",
"@tensor-foundation/amm": "0.9.0",
"@tensor-foundation/marketplace": "0.5.0",
"@tensor-foundation/whitelist": "0.3.0",
"@tensor-foundation/amm": "1.0.1",
"@tensor-foundation/marketplace": "1.0.0-beta.3",
"@tensor-foundation/whitelist": "1.0.0-beta.1",
"@tensor-foundation/mpl-token-metadata": "1.0.0-beta.1",
"@tensor-foundation/mpl-bubblegum": "1.0.0-beta.1",
"@tensor-foundation/mpl-core": "1.0.0-beta.1",
"@solana/webcrypto-ed25519-polyfill": "^2.0.0",
"@solana-program/system": "0.6.1",
"@solana-program/system": "0.6.2",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@types/node": "^22.0.0",
Expand Down
Loading
Loading