Skip to content

Commit d03874a

Browse files
committed
solana: bump version to 2.0.0
add script to sync/check crate versions
1 parent 9ecbd97 commit d03874a

32 files changed

+8463
-44
lines changed

.github/workflows/solana.yml

+8
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ jobs:
9797
cargo build-sbf --features "mainnet"
9898
cargo test-sbf --features "mainnet"
9999
cargo test
100+
check-version:
101+
name: Check version
102+
runs-on: ubuntu-latest
103+
steps:
104+
- uses: actions/checkout@v4
105+
- run: ./scripts/sync-versions --check
106+
shell: bash
107+
100108
anchor-test:
101109
name: Anchor Test
102110
runs-on: ubuntu-latest

sdk/solana/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"test:ci": "jest --config ./jest.config.ts",
4242
"copy:idl": "cp ../../solana/target/idl/*.json ./src/anchor-idl/$IDL_VERSION/",
4343
"copy:types": "cp ../../solana/target/types/*.ts ./src/anchor-idl/$IDL_VERSION/",
44-
"generate": "export IDL_VERSION=`tsx scripts/readVersion.ts` && mkdir -p ./src/anchor-idl/$IDL_VERSION && npm run copy:idl && npm run copy:types",
44+
"generate": "export IDL_VERSION=`../../solana/scripts/program-version | sed s/\\\\\\./_/g` && mkdir -p ./src/anchor-idl/$IDL_VERSION && npm run copy:idl && npm run copy:types",
4545
"build:contracts": "cd ../../solana && make build"
4646
},
4747
"devDependencies": {

sdk/solana/scripts/readVersion.ts

-16
This file was deleted.

sdk/solana/src/anchor-idl/2_0_0.ts

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import ntt from "./2_0_0/example_native_token_transfers.json";
2+
import quoter from "./2_0_0/ntt_quoter.json";
3+
import governance from "./2_0_0/wormhole_governance.json";
4+
5+
import type { ExampleNativeTokenTransfers } from "./2_0_0/example_native_token_transfers.js";
6+
import type { NttQuoter } from "./2_0_0/ntt_quoter.js";
7+
import type { WormholeGovernance } from "./2_0_0/wormhole_governance.js";
8+
9+
export namespace _2_0_0 {
10+
export const idl = { ntt, quoter, governance };
11+
12+
export type RawExampleNativeTokenTransfers = ExampleNativeTokenTransfers;
13+
export type RawNttQuoter = NttQuoter;
14+
export type RawWormholeGovernance = WormholeGovernance;
15+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
{
2+
"version": "2.0.0",
3+
"name": "dummy_transfer_hook",
4+
"instructions": [
5+
{
6+
"name": "initializeExtraAccountMetaList",
7+
"accounts": [
8+
{
9+
"name": "payer",
10+
"isMut": true,
11+
"isSigner": true
12+
},
13+
{
14+
"name": "extraAccountMetaList",
15+
"isMut": true,
16+
"isSigner": false
17+
},
18+
{
19+
"name": "mint",
20+
"isMut": false,
21+
"isSigner": false
22+
},
23+
{
24+
"name": "tokenProgram",
25+
"isMut": false,
26+
"isSigner": false
27+
},
28+
{
29+
"name": "associatedTokenProgram",
30+
"isMut": false,
31+
"isSigner": false
32+
},
33+
{
34+
"name": "counter",
35+
"isMut": true,
36+
"isSigner": false
37+
},
38+
{
39+
"name": "systemProgram",
40+
"isMut": false,
41+
"isSigner": false
42+
}
43+
],
44+
"args": []
45+
},
46+
{
47+
"name": "transferHook",
48+
"accounts": [
49+
{
50+
"name": "sourceToken",
51+
"isMut": false,
52+
"isSigner": false
53+
},
54+
{
55+
"name": "mint",
56+
"isMut": false,
57+
"isSigner": false
58+
},
59+
{
60+
"name": "destinationToken",
61+
"isMut": false,
62+
"isSigner": false
63+
},
64+
{
65+
"name": "authority",
66+
"isMut": false,
67+
"isSigner": false
68+
},
69+
{
70+
"name": "extraAccountMetaList",
71+
"isMut": false,
72+
"isSigner": false
73+
},
74+
{
75+
"name": "dummyAccount",
76+
"isMut": false,
77+
"isSigner": false,
78+
"docs": [
79+
"computes and the on-chain code correctly passes on the PDA."
80+
]
81+
},
82+
{
83+
"name": "counter",
84+
"isMut": true,
85+
"isSigner": false
86+
}
87+
],
88+
"args": [
89+
{
90+
"name": "amount",
91+
"type": "u64"
92+
}
93+
]
94+
}
95+
],
96+
"accounts": [
97+
{
98+
"name": "Counter",
99+
"type": {
100+
"kind": "struct",
101+
"fields": [
102+
{
103+
"name": "count",
104+
"type": "u64"
105+
}
106+
]
107+
}
108+
}
109+
]
110+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
export type DummyTransferHook = {
2+
"version": "2.0.0",
3+
"name": "dummy_transfer_hook",
4+
"instructions": [
5+
{
6+
"name": "initializeExtraAccountMetaList",
7+
"accounts": [
8+
{
9+
"name": "payer",
10+
"isMut": true,
11+
"isSigner": true
12+
},
13+
{
14+
"name": "extraAccountMetaList",
15+
"isMut": true,
16+
"isSigner": false
17+
},
18+
{
19+
"name": "mint",
20+
"isMut": false,
21+
"isSigner": false
22+
},
23+
{
24+
"name": "tokenProgram",
25+
"isMut": false,
26+
"isSigner": false
27+
},
28+
{
29+
"name": "associatedTokenProgram",
30+
"isMut": false,
31+
"isSigner": false
32+
},
33+
{
34+
"name": "counter",
35+
"isMut": true,
36+
"isSigner": false
37+
},
38+
{
39+
"name": "systemProgram",
40+
"isMut": false,
41+
"isSigner": false
42+
}
43+
],
44+
"args": []
45+
},
46+
{
47+
"name": "transferHook",
48+
"accounts": [
49+
{
50+
"name": "sourceToken",
51+
"isMut": false,
52+
"isSigner": false
53+
},
54+
{
55+
"name": "mint",
56+
"isMut": false,
57+
"isSigner": false
58+
},
59+
{
60+
"name": "destinationToken",
61+
"isMut": false,
62+
"isSigner": false
63+
},
64+
{
65+
"name": "authority",
66+
"isMut": false,
67+
"isSigner": false
68+
},
69+
{
70+
"name": "extraAccountMetaList",
71+
"isMut": false,
72+
"isSigner": false
73+
},
74+
{
75+
"name": "dummyAccount",
76+
"isMut": false,
77+
"isSigner": false,
78+
"docs": [
79+
"computes and the on-chain code correctly passes on the PDA."
80+
]
81+
},
82+
{
83+
"name": "counter",
84+
"isMut": true,
85+
"isSigner": false
86+
}
87+
],
88+
"args": [
89+
{
90+
"name": "amount",
91+
"type": "u64"
92+
}
93+
]
94+
}
95+
],
96+
"accounts": [
97+
{
98+
"name": "counter",
99+
"type": {
100+
"kind": "struct",
101+
"fields": [
102+
{
103+
"name": "count",
104+
"type": "u64"
105+
}
106+
]
107+
}
108+
}
109+
]
110+
};
111+
112+
export const IDL: DummyTransferHook = {
113+
"version": "2.0.0",
114+
"name": "dummy_transfer_hook",
115+
"instructions": [
116+
{
117+
"name": "initializeExtraAccountMetaList",
118+
"accounts": [
119+
{
120+
"name": "payer",
121+
"isMut": true,
122+
"isSigner": true
123+
},
124+
{
125+
"name": "extraAccountMetaList",
126+
"isMut": true,
127+
"isSigner": false
128+
},
129+
{
130+
"name": "mint",
131+
"isMut": false,
132+
"isSigner": false
133+
},
134+
{
135+
"name": "tokenProgram",
136+
"isMut": false,
137+
"isSigner": false
138+
},
139+
{
140+
"name": "associatedTokenProgram",
141+
"isMut": false,
142+
"isSigner": false
143+
},
144+
{
145+
"name": "counter",
146+
"isMut": true,
147+
"isSigner": false
148+
},
149+
{
150+
"name": "systemProgram",
151+
"isMut": false,
152+
"isSigner": false
153+
}
154+
],
155+
"args": []
156+
},
157+
{
158+
"name": "transferHook",
159+
"accounts": [
160+
{
161+
"name": "sourceToken",
162+
"isMut": false,
163+
"isSigner": false
164+
},
165+
{
166+
"name": "mint",
167+
"isMut": false,
168+
"isSigner": false
169+
},
170+
{
171+
"name": "destinationToken",
172+
"isMut": false,
173+
"isSigner": false
174+
},
175+
{
176+
"name": "authority",
177+
"isMut": false,
178+
"isSigner": false
179+
},
180+
{
181+
"name": "extraAccountMetaList",
182+
"isMut": false,
183+
"isSigner": false
184+
},
185+
{
186+
"name": "dummyAccount",
187+
"isMut": false,
188+
"isSigner": false,
189+
"docs": [
190+
"computes and the on-chain code correctly passes on the PDA."
191+
]
192+
},
193+
{
194+
"name": "counter",
195+
"isMut": true,
196+
"isSigner": false
197+
}
198+
],
199+
"args": [
200+
{
201+
"name": "amount",
202+
"type": "u64"
203+
}
204+
]
205+
}
206+
],
207+
"accounts": [
208+
{
209+
"name": "counter",
210+
"type": {
211+
"kind": "struct",
212+
"fields": [
213+
{
214+
"name": "count",
215+
"type": "u64"
216+
}
217+
]
218+
}
219+
}
220+
]
221+
};

0 commit comments

Comments
 (0)