Skip to content

Commit 5ce1a20

Browse files
jshiohahajshiohaha
committed
update ts-sdk/client
1 parent d10622b commit 5ce1a20

File tree

117 files changed

+8900
-4705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+8900
-4705
lines changed

‎.changeset/long-spoons-smile.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@orca-so/whirlpools-client": major
3+
---
4+
5+
Update dependencies to support contract upgrade to Anchor 0.29->0.31.1 and Solana Program 1.17->2.1

‎ts-sdk/client/codama.js‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,7 @@ import { rootNodeFromAnchor } from "@codama/nodes-from-anchor";
44
import { readFileSync } from "fs";
55

66
const idl = JSON.parse(readFileSync("../../target/idl/whirlpool.json", "utf8"));
7-
// IDL generated with anchor 0.29 does not have the metadata field so we have to add it manually
8-
const node = rootNodeFromAnchor({
9-
...idl,
10-
metadata: {
11-
address: "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc",
12-
origin: "anchor",
13-
},
14-
});
7+
const node = rootNodeFromAnchor(idl);
158
const visitor = renderVisitor("./src/generated");
169
const codama = createFromRoot(node);
1710
codama.update(

‎ts-sdk/client/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
"@solana/kit": "^2.1.0"
3434
},
3535
"devDependencies": {
36-
"@codama/nodes-from-anchor": "^1.1.11",
37-
"@codama/renderers-js": "^1.2.10",
36+
"@codama/nodes-from-anchor": "^1.2.9",
37+
"@codama/renderers-js": "^1.4.2",
3838
"@orca-so/whirlpools-program": "*",
39-
"@solana/kit": "^2.1.0",
40-
"codama": "^1.2.11",
39+
"@solana/kit": "^2.3.0",
40+
"codama": "^1.3.7",
4141
"typescript": "^5.8.2"
4242
},
4343
"repository": {

‎ts-sdk/client/src/generated/accounts/adaptiveFeeTier.ts‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* This code was AUTOGENERATED using the codama library.
2+
* This code was AUTOGENERATED using the Codama library.
33
* Please DO NOT EDIT THIS FILE, instead use visitors
4-
* to add features, then rerun codama to update it.
4+
* to add features, then rerun Codama to update it.
55
*
66
* @see https://github.com/codama-idl/codama
77
*/
@@ -28,24 +28,24 @@ import {
2828
transformEncoder,
2929
type Account,
3030
type Address,
31-
type Codec,
32-
type Decoder,
3331
type EncodedAccount,
34-
type Encoder,
3532
type FetchAccountConfig,
3633
type FetchAccountsConfig,
34+
type FixedSizeCodec,
35+
type FixedSizeDecoder,
36+
type FixedSizeEncoder,
3737
type MaybeAccount,
3838
type MaybeEncodedAccount,
3939
type ReadonlyUint8Array,
40-
} from "@solana/kit";
40+
} from '@solana/kit';
4141

4242
export const ADAPTIVE_FEE_TIER_DISCRIMINATOR = new Uint8Array([
4343
147, 16, 144, 116, 47, 146, 149, 46,
4444
]);
4545

4646
export function getAdaptiveFeeTierDiscriminatorBytes() {
4747
return fixEncoderSize(getBytesEncoder(), 8).encode(
48-
ADAPTIVE_FEE_TIER_DISCRIMINATOR,
48+
ADAPTIVE_FEE_TIER_DISCRIMINATOR
4949
);
5050
}
5151

@@ -82,75 +82,75 @@ export type AdaptiveFeeTierArgs = {
8282
majorSwapThresholdTicks: number;
8383
};
8484

85-
export function getAdaptiveFeeTierEncoder(): Encoder<AdaptiveFeeTierArgs> {
85+
export function getAdaptiveFeeTierEncoder(): FixedSizeEncoder<AdaptiveFeeTierArgs> {
8686
return transformEncoder(
8787
getStructEncoder([
88-
["discriminator", fixEncoderSize(getBytesEncoder(), 8)],
89-
["whirlpoolsConfig", getAddressEncoder()],
90-
["feeTierIndex", getU16Encoder()],
91-
["tickSpacing", getU16Encoder()],
92-
["initializePoolAuthority", getAddressEncoder()],
93-
["delegatedFeeAuthority", getAddressEncoder()],
94-
["defaultBaseFeeRate", getU16Encoder()],
95-
["filterPeriod", getU16Encoder()],
96-
["decayPeriod", getU16Encoder()],
97-
["reductionFactor", getU16Encoder()],
98-
["adaptiveFeeControlFactor", getU32Encoder()],
99-
["maxVolatilityAccumulator", getU32Encoder()],
100-
["tickGroupSize", getU16Encoder()],
101-
["majorSwapThresholdTicks", getU16Encoder()],
88+
['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
89+
['whirlpoolsConfig', getAddressEncoder()],
90+
['feeTierIndex', getU16Encoder()],
91+
['tickSpacing', getU16Encoder()],
92+
['initializePoolAuthority', getAddressEncoder()],
93+
['delegatedFeeAuthority', getAddressEncoder()],
94+
['defaultBaseFeeRate', getU16Encoder()],
95+
['filterPeriod', getU16Encoder()],
96+
['decayPeriod', getU16Encoder()],
97+
['reductionFactor', getU16Encoder()],
98+
['adaptiveFeeControlFactor', getU32Encoder()],
99+
['maxVolatilityAccumulator', getU32Encoder()],
100+
['tickGroupSize', getU16Encoder()],
101+
['majorSwapThresholdTicks', getU16Encoder()],
102102
]),
103-
(value) => ({ ...value, discriminator: ADAPTIVE_FEE_TIER_DISCRIMINATOR }),
103+
(value) => ({ ...value, discriminator: ADAPTIVE_FEE_TIER_DISCRIMINATOR })
104104
);
105105
}
106106

107-
export function getAdaptiveFeeTierDecoder(): Decoder<AdaptiveFeeTier> {
107+
export function getAdaptiveFeeTierDecoder(): FixedSizeDecoder<AdaptiveFeeTier> {
108108
return getStructDecoder([
109-
["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
110-
["whirlpoolsConfig", getAddressDecoder()],
111-
["feeTierIndex", getU16Decoder()],
112-
["tickSpacing", getU16Decoder()],
113-
["initializePoolAuthority", getAddressDecoder()],
114-
["delegatedFeeAuthority", getAddressDecoder()],
115-
["defaultBaseFeeRate", getU16Decoder()],
116-
["filterPeriod", getU16Decoder()],
117-
["decayPeriod", getU16Decoder()],
118-
["reductionFactor", getU16Decoder()],
119-
["adaptiveFeeControlFactor", getU32Decoder()],
120-
["maxVolatilityAccumulator", getU32Decoder()],
121-
["tickGroupSize", getU16Decoder()],
122-
["majorSwapThresholdTicks", getU16Decoder()],
109+
['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
110+
['whirlpoolsConfig', getAddressDecoder()],
111+
['feeTierIndex', getU16Decoder()],
112+
['tickSpacing', getU16Decoder()],
113+
['initializePoolAuthority', getAddressDecoder()],
114+
['delegatedFeeAuthority', getAddressDecoder()],
115+
['defaultBaseFeeRate', getU16Decoder()],
116+
['filterPeriod', getU16Decoder()],
117+
['decayPeriod', getU16Decoder()],
118+
['reductionFactor', getU16Decoder()],
119+
['adaptiveFeeControlFactor', getU32Decoder()],
120+
['maxVolatilityAccumulator', getU32Decoder()],
121+
['tickGroupSize', getU16Decoder()],
122+
['majorSwapThresholdTicks', getU16Decoder()],
123123
]);
124124
}
125125

126-
export function getAdaptiveFeeTierCodec(): Codec<
126+
export function getAdaptiveFeeTierCodec(): FixedSizeCodec<
127127
AdaptiveFeeTierArgs,
128128
AdaptiveFeeTier
129129
> {
130130
return combineCodec(getAdaptiveFeeTierEncoder(), getAdaptiveFeeTierDecoder());
131131
}
132132

133133
export function decodeAdaptiveFeeTier<TAddress extends string = string>(
134-
encodedAccount: EncodedAccount<TAddress>,
134+
encodedAccount: EncodedAccount<TAddress>
135135
): Account<AdaptiveFeeTier, TAddress>;
136136
export function decodeAdaptiveFeeTier<TAddress extends string = string>(
137-
encodedAccount: MaybeEncodedAccount<TAddress>,
137+
encodedAccount: MaybeEncodedAccount<TAddress>
138138
): MaybeAccount<AdaptiveFeeTier, TAddress>;
139139
export function decodeAdaptiveFeeTier<TAddress extends string = string>(
140-
encodedAccount: EncodedAccount<TAddress> | MaybeEncodedAccount<TAddress>,
140+
encodedAccount: EncodedAccount<TAddress> | MaybeEncodedAccount<TAddress>
141141
):
142142
| Account<AdaptiveFeeTier, TAddress>
143143
| MaybeAccount<AdaptiveFeeTier, TAddress> {
144144
return decodeAccount(
145145
encodedAccount as MaybeEncodedAccount<TAddress>,
146-
getAdaptiveFeeTierDecoder(),
146+
getAdaptiveFeeTierDecoder()
147147
);
148148
}
149149

150150
export async function fetchAdaptiveFeeTier<TAddress extends string = string>(
151151
rpc: Parameters<typeof fetchEncodedAccount>[0],
152152
address: Address<TAddress>,
153-
config?: FetchAccountConfig,
153+
config?: FetchAccountConfig
154154
): Promise<Account<AdaptiveFeeTier, TAddress>> {
155155
const maybeAccount = await fetchMaybeAdaptiveFeeTier(rpc, address, config);
156156
assertAccountExists(maybeAccount);
@@ -162,7 +162,7 @@ export async function fetchMaybeAdaptiveFeeTier<
162162
>(
163163
rpc: Parameters<typeof fetchEncodedAccount>[0],
164164
address: Address<TAddress>,
165-
config?: FetchAccountConfig,
165+
config?: FetchAccountConfig
166166
): Promise<MaybeAccount<AdaptiveFeeTier, TAddress>> {
167167
const maybeAccount = await fetchEncodedAccount(rpc, address, config);
168168
return decodeAdaptiveFeeTier(maybeAccount);
@@ -171,12 +171,12 @@ export async function fetchMaybeAdaptiveFeeTier<
171171
export async function fetchAllAdaptiveFeeTier(
172172
rpc: Parameters<typeof fetchEncodedAccounts>[0],
173173
addresses: Array<Address>,
174-
config?: FetchAccountsConfig,
174+
config?: FetchAccountsConfig
175175
): Promise<Account<AdaptiveFeeTier>[]> {
176176
const maybeAccounts = await fetchAllMaybeAdaptiveFeeTier(
177177
rpc,
178178
addresses,
179-
config,
179+
config
180180
);
181181
assertAccountsExist(maybeAccounts);
182182
return maybeAccounts;
@@ -185,11 +185,11 @@ export async function fetchAllAdaptiveFeeTier(
185185
export async function fetchAllMaybeAdaptiveFeeTier(
186186
rpc: Parameters<typeof fetchEncodedAccounts>[0],
187187
addresses: Array<Address>,
188-
config?: FetchAccountsConfig,
188+
config?: FetchAccountsConfig
189189
): Promise<MaybeAccount<AdaptiveFeeTier>[]> {
190190
const maybeAccounts = await fetchEncodedAccounts(rpc, addresses, config);
191191
return maybeAccounts.map((maybeAccount) =>
192-
decodeAdaptiveFeeTier(maybeAccount),
192+
decodeAdaptiveFeeTier(maybeAccount)
193193
);
194194
}
195195

‎ts-sdk/client/src/generated/accounts/dynamicTickArray.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* This code was AUTOGENERATED using the codama library.
2+
* This code was AUTOGENERATED using the Codama library.
33
* Please DO NOT EDIT THIS FILE, instead use visitors
4-
* to add features, then rerun codama to update it.
4+
* to add features, then rerun Codama to update it.
55
*
66
* @see https://github.com/codama-idl/codama
77
*/
@@ -39,21 +39,21 @@ import {
3939
type MaybeAccount,
4040
type MaybeEncodedAccount,
4141
type ReadonlyUint8Array,
42-
} from "@solana/kit";
42+
} from '@solana/kit';
4343
import {
4444
getDynamicTickDecoder,
4545
getDynamicTickEncoder,
4646
type DynamicTick,
4747
type DynamicTickArgs,
48-
} from "../types";
48+
} from '../types';
4949

5050
export const DYNAMIC_TICK_ARRAY_DISCRIMINATOR = new Uint8Array([
5151
17, 216, 246, 142, 225, 199, 218, 56,
5252
]);
5353

5454
export function getDynamicTickArrayDiscriminatorBytes() {
5555
return fixEncoderSize(getBytesEncoder(), 8).encode(
56-
DYNAMIC_TICK_ARRAY_DISCRIMINATOR,
56+
DYNAMIC_TICK_ARRAY_DISCRIMINATOR
5757
);
5858
}
5959

@@ -75,23 +75,23 @@ export type DynamicTickArrayArgs = {
7575
export function getDynamicTickArrayEncoder(): Encoder<DynamicTickArrayArgs> {
7676
return transformEncoder(
7777
getStructEncoder([
78-
["discriminator", fixEncoderSize(getBytesEncoder(), 8)],
79-
["startTickIndex", getI32Encoder()],
80-
["whirlpool", getAddressEncoder()],
81-
["tickBitmap", getU128Encoder()],
82-
["ticks", getArrayEncoder(getDynamicTickEncoder(), { size: 88 })],
78+
['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
79+
['startTickIndex', getI32Encoder()],
80+
['whirlpool', getAddressEncoder()],
81+
['tickBitmap', getU128Encoder()],
82+
['ticks', getArrayEncoder(getDynamicTickEncoder(), { size: 88 })],
8383
]),
84-
(value) => ({ ...value, discriminator: DYNAMIC_TICK_ARRAY_DISCRIMINATOR }),
84+
(value) => ({ ...value, discriminator: DYNAMIC_TICK_ARRAY_DISCRIMINATOR })
8585
);
8686
}
8787

8888
export function getDynamicTickArrayDecoder(): Decoder<DynamicTickArray> {
8989
return getStructDecoder([
90-
["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
91-
["startTickIndex", getI32Decoder()],
92-
["whirlpool", getAddressDecoder()],
93-
["tickBitmap", getU128Decoder()],
94-
["ticks", getArrayDecoder(getDynamicTickDecoder(), { size: 88 })],
90+
['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
91+
['startTickIndex', getI32Decoder()],
92+
['whirlpool', getAddressDecoder()],
93+
['tickBitmap', getU128Decoder()],
94+
['ticks', getArrayDecoder(getDynamicTickDecoder(), { size: 88 })],
9595
]);
9696
}
9797

@@ -101,31 +101,31 @@ export function getDynamicTickArrayCodec(): Codec<
101101
> {
102102
return combineCodec(
103103
getDynamicTickArrayEncoder(),
104-
getDynamicTickArrayDecoder(),
104+
getDynamicTickArrayDecoder()
105105
);
106106
}
107107

108108
export function decodeDynamicTickArray<TAddress extends string = string>(
109-
encodedAccount: EncodedAccount<TAddress>,
109+
encodedAccount: EncodedAccount<TAddress>
110110
): Account<DynamicTickArray, TAddress>;
111111
export function decodeDynamicTickArray<TAddress extends string = string>(
112-
encodedAccount: MaybeEncodedAccount<TAddress>,
112+
encodedAccount: MaybeEncodedAccount<TAddress>
113113
): MaybeAccount<DynamicTickArray, TAddress>;
114114
export function decodeDynamicTickArray<TAddress extends string = string>(
115-
encodedAccount: EncodedAccount<TAddress> | MaybeEncodedAccount<TAddress>,
115+
encodedAccount: EncodedAccount<TAddress> | MaybeEncodedAccount<TAddress>
116116
):
117117
| Account<DynamicTickArray, TAddress>
118118
| MaybeAccount<DynamicTickArray, TAddress> {
119119
return decodeAccount(
120120
encodedAccount as MaybeEncodedAccount<TAddress>,
121-
getDynamicTickArrayDecoder(),
121+
getDynamicTickArrayDecoder()
122122
);
123123
}
124124

125125
export async function fetchDynamicTickArray<TAddress extends string = string>(
126126
rpc: Parameters<typeof fetchEncodedAccount>[0],
127127
address: Address<TAddress>,
128-
config?: FetchAccountConfig,
128+
config?: FetchAccountConfig
129129
): Promise<Account<DynamicTickArray, TAddress>> {
130130
const maybeAccount = await fetchMaybeDynamicTickArray(rpc, address, config);
131131
assertAccountExists(maybeAccount);
@@ -137,7 +137,7 @@ export async function fetchMaybeDynamicTickArray<
137137
>(
138138
rpc: Parameters<typeof fetchEncodedAccount>[0],
139139
address: Address<TAddress>,
140-
config?: FetchAccountConfig,
140+
config?: FetchAccountConfig
141141
): Promise<MaybeAccount<DynamicTickArray, TAddress>> {
142142
const maybeAccount = await fetchEncodedAccount(rpc, address, config);
143143
return decodeDynamicTickArray(maybeAccount);
@@ -146,12 +146,12 @@ export async function fetchMaybeDynamicTickArray<
146146
export async function fetchAllDynamicTickArray(
147147
rpc: Parameters<typeof fetchEncodedAccounts>[0],
148148
addresses: Array<Address>,
149-
config?: FetchAccountsConfig,
149+
config?: FetchAccountsConfig
150150
): Promise<Account<DynamicTickArray>[]> {
151151
const maybeAccounts = await fetchAllMaybeDynamicTickArray(
152152
rpc,
153153
addresses,
154-
config,
154+
config
155155
);
156156
assertAccountsExist(maybeAccounts);
157157
return maybeAccounts;
@@ -160,10 +160,10 @@ export async function fetchAllDynamicTickArray(
160160
export async function fetchAllMaybeDynamicTickArray(
161161
rpc: Parameters<typeof fetchEncodedAccounts>[0],
162162
addresses: Array<Address>,
163-
config?: FetchAccountsConfig,
163+
config?: FetchAccountsConfig
164164
): Promise<MaybeAccount<DynamicTickArray>[]> {
165165
const maybeAccounts = await fetchEncodedAccounts(rpc, addresses, config);
166166
return maybeAccounts.map((maybeAccount) =>
167-
decodeDynamicTickArray(maybeAccount),
167+
decodeDynamicTickArray(maybeAccount)
168168
);
169169
}

0 commit comments

Comments
 (0)