Skip to content

Commit b237b18

Browse files
heyAyushhheyAyushh
authoredJul 11, 2024··
chore: upgrade to 1.18.17 (#97)
* v1.18.17 works with anchor 0.30.1? * updated setup to cache based on nodejs version * test projects with 0.30.1 * added pnpm files, renamed yarn run ts-mocha to pnpm ts-mocha
1 parent 832d4f1 commit b237b18

File tree

33 files changed

+1883
-42
lines changed

33 files changed

+1883
-42
lines changed
 

Diff for: ‎.github/.ghaignore

+5
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,8 @@ compression/cutils/anchor
3333
compression/cnft-vault/anchor
3434
# builds but need to test on localhost
3535
compression/cnft-burn/anchor
36+
37+
# not building due to > spl 2.0 dependency issue
38+
tokens/token-2022/group/anchor
39+
tokens/token-2022/nft-meta-data-pointer/anchor-example/anchor
40+
tokens/escrow/anchor

Diff for: ‎.github/workflows/anchor.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
node-version: [20.x]
22-
solana-version: [1.18.8, stable]
22+
solana-version: [1.18.17, stable]
2323
anchor-version: [0.30.1]
2424
steps:
2525
- uses: actions/checkout@v4
@@ -35,8 +35,8 @@ jobs:
3535
- added|modified: '**/workflows/anchor.yml'
3636
3737
- name: Setup Anchor
38-
if: steps.changes.outputs.anchor == 'true' || steps.changes.outputs.anchor_action == 'true' || github.event_name == 'schedule'
39-
uses: heyAyushh/setup-anchor@v3.10
38+
if: steps.changes.outputs.anchor == 'true' || steps.changes.outputs.anchor_action == 'true' || github.event_name == 'schedule' || github.event_name == 'push'
39+
uses: heyAyushh/setup-anchor@v3.12
4040
with:
4141
anchor-version: ${{ matrix.anchor-version }}
4242
solana-cli-version: ${{ matrix.solana-version }}
@@ -96,7 +96,7 @@ jobs:
9696
shell: bash
9797
# Skip Building all Programs if it's a PR to main branch
9898
- name: Build All Anchor programs
99-
if: github.event_name == 'schedule' || steps.changes.outputs.anchor_action == 'true'
99+
if: github.event_name == 'schedule' || github.event_name == 'push' || steps.changes.outputs.anchor_action == 'true'
100100
run: |
101101
# Find all anchor projects and remove ignored projects
102102
declare -a ProjectDirs=($(find . -type d -name 'anchor' | sed 's|^\./||'| grep -v -f <(grep . .github/.ghaignore | grep -v '^$')))
@@ -137,8 +137,8 @@ jobs:
137137
strategy:
138138
matrix:
139139
node-version: [20.x]
140-
solana-version: [1.18.8, stable]
141-
anchor-version: [0.30.0]
140+
solana-version: [1.18.17, stable]
141+
anchor-version: [0.30.1]
142142
steps:
143143
- uses: actions/checkout@v4
144144
- uses: dorny/paths-filter@v3
@@ -153,8 +153,8 @@ jobs:
153153
- added|modified: '**/workflows/anchor.yml'
154154
# Skip Installing and Displaying versions if theres no change in anchor programs or anchor action workflow file or isn't a schedule event
155155
- name: Setup Anchor
156-
if: steps.changes.outputs.anchor == 'true' || steps.changes.outputs.anchor_action == 'true' || github.event_name == 'schedule'
157-
uses: heyAyushh/setup-anchor@v3.10
156+
if: steps.changes.outputs.anchor == 'true' || steps.changes.outputs.anchor_action == 'true' || github.event_name == 'schedule' || github.event_name == 'push'
157+
uses: heyAyushh/setup-anchor@v3.12
158158
with:
159159
anchor-version: ${{ matrix.anchor-version }}
160160
solana-cli-version: ${{ matrix.solana-version }}
@@ -180,8 +180,7 @@ jobs:
180180
Testing $projectDir
181181
********"
182182
cd $projectDir
183-
pnpm install --frozen-lockfile
184-
if anchor test; then
183+
if pnpm install --frozen-lockfile && anchor test; then
185184
echo "Tests succeeded for $projectDir."
186185
rm -rf target node_modules
187186
else

Diff for: ‎basics/counter/seahorse/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ cluster = "localnet"
1212
wallet = "~/.config/solana/id.json"
1313

1414
[scripts]
15-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
15+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎basics/favorites/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎basics/hello-solana/seahorse/hello_solana/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ cluster = "localnet"
1111
wallet = "/home/thefunnyintrovert/.config/solana/id.json"
1212

1313
[scripts]
14-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
14+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎basics/transfer-sol/seahorse/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ cluster = "Localnet"
1212
wallet = "/Users/devenv/.config/solana/id.json"
1313

1414
[scripts]
15-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
15+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎compression/cnft-burn/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Devnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/cnft-burn.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/cnft-burn.ts"

Diff for: ‎compression/cnft-vault/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ cluster = "Devnet"
1212
wallet = "~/.config/solana/id.json"
1313

1414
[scripts]
15-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
15+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎compression/cutils/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ cluster = "devnet"
1212
wallet = "~/.config/solana/test.json"
1313

1414
[scripts]
15-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
15+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎oracles/pyth/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cluster = "Localnet"
1212
wallet = "~/.config/solana/id.json"
1313

1414
[scripts]
15-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
15+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
1616

1717
[test.validator]
1818
url = "https://api.mainnet-beta.solana.com"

Diff for: ‎oracles/pyth/seahorse/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cluster = "Localnet"
1212
wallet = "~/.config/solana/id.json"
1313

1414
[scripts]
15-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
15+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
1616

1717
[test.validator]
1818
url = "https://api.mainnet-beta.solana.com"

Diff for: ‎tokens/escrow/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/nft-minter/native/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"scripts": {
3-
"test": "yarn run ts-mocha -p ./tsconfig.json -t 1000000 ./tests/test.ts"
3+
"test": "pnpm ts-mocha -p ./tsconfig.json -t 1000000 ./tests/test.ts"
44
},
55
"dependencies": {
66
"@metaplex-foundation/mpl-token-metadata": "^2.5.2",

Diff for: ‎tokens/nft-operations/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cluster = "localnet"
1818
wallet = "~/.config/solana/id.json"
1919

2020
[scripts]
21-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
21+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
2222

2323
[test.validator]
2424
url = "https://api.mainnet-beta.solana.com"

Diff for: ‎tokens/nft-operations/anchor/pnpm-lock.yaml

+1,838
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎tokens/spl-token-minter/native/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"scripts": {
3-
"test": "yarn run ts-mocha -p ./tsconfig.json -t 1000000 ./tests/test.ts"
3+
"test": "pnpm ts-mocha -p ./tsconfig.json -t 1000000 ./tests/test.ts"
44
},
55
"dependencies": {
66
"@metaplex-foundation/mpl-token-metadata": "^2.5.2",

Diff for: ‎tokens/token-2022/basics/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ cluster = "Localnet"
1212
wallet = "~/.config/solana/id.json"
1313

1414
[scripts]
15-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
15+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/cpi-guard/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/default-account-state/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/group/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/immutable-owner/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/interest-bearing/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/memo-transfer/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/metadata/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/mint-close-authority/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/non-transferable/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/permanent-delegate/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/transfer-fee/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/transfer-hook/counter/anchor/Anchor.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ cluster = "Localnet"
1010
wallet = "~/.config/solana/id.json"
1111

1212
[scripts]
13-
test = "yarn run ts-mocha -p ./tsconfig.json -t 100000 tests/**/*.ts"
14-
13+
test = "pnpm ts-mocha -p ./tsconfig.json -t 100000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/transfer-hook/transfer-cost/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/token-2022/transfer-hook/whitelist/anchor/Anchor.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ cluster = "Localnet"
1515
wallet = "~/.config/solana/id.json"
1616

1717
[scripts]
18-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
18+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
1919

2020
[test.validator]
2121
url = "https://api.devnet.solana.com"
2222

2323
[[test.validator.clone]]
24-
address = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s"
24+
address = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s"

Diff for: ‎tokens/token-fundraiser/anchor/Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ cluster = "Localnet"
1818
wallet = "~/.config/solana/id.json"
1919

2020
[scripts]
21-
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
21+
test = "pnpm ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Diff for: ‎tokens/transfer-tokens/native/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"scripts": {
3-
"test": "yarn run ts-mocha -p ./tsconfig.json -t 1000000 ./tests/test.ts"
3+
"test": "pnpm ts-mocha -p ./tsconfig.json -t 1000000 ./tests/test.ts"
44
},
55
"dependencies": {
66
"@metaplex-foundation/mpl-token-metadata": "^2.5.2",

0 commit comments

Comments
 (0)
Please sign in to comment.