@chainflip/sdk 0.1.12 → 0.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/swap.d.ts +119 -86
- package/dist/swap.js +22 -36
- package/dist/swap.mjs +23 -37
- package/package.json +1 -1
package/dist/swap.d.ts
CHANGED
|
@@ -88,8 +88,124 @@ declare const tokenSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
|
88
88
|
destAddress: string;
|
|
89
89
|
destAsset: "BTC";
|
|
90
90
|
}>]>;
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
declare const executeSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
92
|
+
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
93
|
+
srcChain: z.ZodLiteral<"Ethereum">;
|
|
94
|
+
srcAsset: z.ZodLiteral<"ETH">;
|
|
95
|
+
destChain: z.ZodLiteral<"Ethereum">;
|
|
96
|
+
destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
|
|
97
|
+
destAsset: z.ZodUnion<[z.ZodLiteral<"FLIP">, z.ZodLiteral<"USDC">]>;
|
|
98
|
+
ccmMetadata: z.ZodObject<{
|
|
99
|
+
message: z.ZodString;
|
|
100
|
+
gasBudget: z.ZodString;
|
|
101
|
+
}, "strip", z.ZodTypeAny, {
|
|
102
|
+
message: string;
|
|
103
|
+
gasBudget: string;
|
|
104
|
+
}, {
|
|
105
|
+
message: string;
|
|
106
|
+
gasBudget: string;
|
|
107
|
+
}>;
|
|
108
|
+
}, "strip", z.ZodTypeAny, {
|
|
109
|
+
amount: string | bigint;
|
|
110
|
+
srcChain: "Ethereum";
|
|
111
|
+
srcAsset: "ETH";
|
|
112
|
+
destChain: "Ethereum";
|
|
113
|
+
destAddress: `0x${string}`;
|
|
114
|
+
destAsset: "FLIP" | "USDC";
|
|
115
|
+
ccmMetadata: {
|
|
116
|
+
message: string;
|
|
117
|
+
gasBudget: string;
|
|
118
|
+
};
|
|
119
|
+
}, {
|
|
120
|
+
amount: string | bigint;
|
|
121
|
+
srcChain: "Ethereum";
|
|
122
|
+
srcAsset: "ETH";
|
|
123
|
+
destChain: "Ethereum";
|
|
124
|
+
destAddress: `0x${string}`;
|
|
125
|
+
destAsset: "FLIP" | "USDC";
|
|
126
|
+
ccmMetadata: {
|
|
127
|
+
message: string;
|
|
128
|
+
gasBudget: string;
|
|
129
|
+
};
|
|
130
|
+
}>, z.ZodUnion<[z.ZodObject<{
|
|
131
|
+
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
132
|
+
srcChain: z.ZodLiteral<"Ethereum">;
|
|
133
|
+
destChain: z.ZodLiteral<"Ethereum">;
|
|
134
|
+
destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
|
|
135
|
+
srcAsset: z.ZodLiteral<"FLIP">;
|
|
136
|
+
destAsset: z.ZodUnion<[z.ZodLiteral<"USDC">, z.ZodLiteral<"ETH">]>;
|
|
137
|
+
ccmMetadata: z.ZodObject<{
|
|
138
|
+
message: z.ZodString;
|
|
139
|
+
gasBudget: z.ZodString;
|
|
140
|
+
}, "strip", z.ZodTypeAny, {
|
|
141
|
+
message: string;
|
|
142
|
+
gasBudget: string;
|
|
143
|
+
}, {
|
|
144
|
+
message: string;
|
|
145
|
+
gasBudget: string;
|
|
146
|
+
}>;
|
|
147
|
+
}, "strip", z.ZodTypeAny, {
|
|
148
|
+
amount: string | bigint;
|
|
149
|
+
srcChain: "Ethereum";
|
|
150
|
+
srcAsset: "FLIP";
|
|
151
|
+
destChain: "Ethereum";
|
|
152
|
+
destAddress: `0x${string}`;
|
|
153
|
+
destAsset: "USDC" | "ETH";
|
|
154
|
+
ccmMetadata: {
|
|
155
|
+
message: string;
|
|
156
|
+
gasBudget: string;
|
|
157
|
+
};
|
|
158
|
+
}, {
|
|
159
|
+
amount: string | bigint;
|
|
160
|
+
srcChain: "Ethereum";
|
|
161
|
+
srcAsset: "FLIP";
|
|
162
|
+
destChain: "Ethereum";
|
|
163
|
+
destAddress: `0x${string}`;
|
|
164
|
+
destAsset: "USDC" | "ETH";
|
|
165
|
+
ccmMetadata: {
|
|
166
|
+
message: string;
|
|
167
|
+
gasBudget: string;
|
|
168
|
+
};
|
|
169
|
+
}>, z.ZodObject<{
|
|
170
|
+
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
171
|
+
srcChain: z.ZodLiteral<"Ethereum">;
|
|
172
|
+
destChain: z.ZodLiteral<"Ethereum">;
|
|
173
|
+
destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
|
|
174
|
+
srcAsset: z.ZodLiteral<"USDC">;
|
|
175
|
+
destAsset: z.ZodUnion<[z.ZodLiteral<"FLIP">, z.ZodLiteral<"ETH">]>;
|
|
176
|
+
ccmMetadata: z.ZodObject<{
|
|
177
|
+
message: z.ZodString;
|
|
178
|
+
gasBudget: z.ZodString;
|
|
179
|
+
}, "strip", z.ZodTypeAny, {
|
|
180
|
+
message: string;
|
|
181
|
+
gasBudget: string;
|
|
182
|
+
}, {
|
|
183
|
+
message: string;
|
|
184
|
+
gasBudget: string;
|
|
185
|
+
}>;
|
|
186
|
+
}, "strip", z.ZodTypeAny, {
|
|
187
|
+
amount: string | bigint;
|
|
188
|
+
srcChain: "Ethereum";
|
|
189
|
+
srcAsset: "USDC";
|
|
190
|
+
destChain: "Ethereum";
|
|
191
|
+
destAddress: `0x${string}`;
|
|
192
|
+
destAsset: "FLIP" | "ETH";
|
|
193
|
+
ccmMetadata: {
|
|
194
|
+
message: string;
|
|
195
|
+
gasBudget: string;
|
|
196
|
+
};
|
|
197
|
+
}, {
|
|
198
|
+
amount: string | bigint;
|
|
199
|
+
srcChain: "Ethereum";
|
|
200
|
+
srcAsset: "USDC";
|
|
201
|
+
destChain: "Ethereum";
|
|
202
|
+
destAddress: `0x${string}`;
|
|
203
|
+
destAsset: "FLIP" | "ETH";
|
|
204
|
+
ccmMetadata: {
|
|
205
|
+
message: string;
|
|
206
|
+
gasBudget: string;
|
|
207
|
+
};
|
|
208
|
+
}>]>, z.ZodUnion<[z.ZodObject<{
|
|
93
209
|
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
94
210
|
srcChain: z.ZodLiteral<"Ethereum">;
|
|
95
211
|
srcAsset: z.ZodLiteral<"ETH">;
|
|
@@ -238,89 +354,7 @@ declare const executeSwapParamsSchema: z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
|
|
|
238
354
|
destAsset: "BTC";
|
|
239
355
|
}>]>]>;
|
|
240
356
|
type ExecuteSwapParams = z.infer<typeof executeSwapParamsSchema>;
|
|
241
|
-
|
|
242
|
-
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
243
|
-
srcChain: z.ZodLiteral<"Ethereum">;
|
|
244
|
-
srcAsset: z.ZodLiteral<"ETH">;
|
|
245
|
-
destChain: z.ZodLiteral<"Ethereum">;
|
|
246
|
-
destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
|
|
247
|
-
destAsset: z.ZodUnion<[z.ZodLiteral<"FLIP">, z.ZodLiteral<"USDC">]>;
|
|
248
|
-
message: z.ZodString;
|
|
249
|
-
gasBudget: z.ZodString;
|
|
250
|
-
}, "strip", z.ZodTypeAny, {
|
|
251
|
-
amount: string | bigint;
|
|
252
|
-
message: string;
|
|
253
|
-
srcChain: "Ethereum";
|
|
254
|
-
srcAsset: "ETH";
|
|
255
|
-
destChain: "Ethereum";
|
|
256
|
-
destAddress: `0x${string}`;
|
|
257
|
-
destAsset: "FLIP" | "USDC";
|
|
258
|
-
gasBudget: string;
|
|
259
|
-
}, {
|
|
260
|
-
amount: string | bigint;
|
|
261
|
-
message: string;
|
|
262
|
-
srcChain: "Ethereum";
|
|
263
|
-
srcAsset: "ETH";
|
|
264
|
-
destChain: "Ethereum";
|
|
265
|
-
destAddress: `0x${string}`;
|
|
266
|
-
destAsset: "FLIP" | "USDC";
|
|
267
|
-
gasBudget: string;
|
|
268
|
-
}>, z.ZodUnion<[z.ZodObject<{
|
|
269
|
-
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
270
|
-
srcChain: z.ZodLiteral<"Ethereum">;
|
|
271
|
-
destChain: z.ZodLiteral<"Ethereum">;
|
|
272
|
-
destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
|
|
273
|
-
srcAsset: z.ZodLiteral<"FLIP">;
|
|
274
|
-
destAsset: z.ZodUnion<[z.ZodLiteral<"USDC">, z.ZodLiteral<"ETH">]>;
|
|
275
|
-
message: z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>;
|
|
276
|
-
gasBudget: z.ZodString;
|
|
277
|
-
}, "strip", z.ZodTypeAny, {
|
|
278
|
-
amount: string | bigint;
|
|
279
|
-
message: `0x${string}`;
|
|
280
|
-
srcChain: "Ethereum";
|
|
281
|
-
srcAsset: "FLIP";
|
|
282
|
-
destChain: "Ethereum";
|
|
283
|
-
destAddress: `0x${string}`;
|
|
284
|
-
destAsset: "USDC" | "ETH";
|
|
285
|
-
gasBudget: string;
|
|
286
|
-
}, {
|
|
287
|
-
amount: string | bigint;
|
|
288
|
-
message: `0x${string}`;
|
|
289
|
-
srcChain: "Ethereum";
|
|
290
|
-
srcAsset: "FLIP";
|
|
291
|
-
destChain: "Ethereum";
|
|
292
|
-
destAddress: `0x${string}`;
|
|
293
|
-
destAsset: "USDC" | "ETH";
|
|
294
|
-
gasBudget: string;
|
|
295
|
-
}>, z.ZodObject<{
|
|
296
|
-
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
297
|
-
srcChain: z.ZodLiteral<"Ethereum">;
|
|
298
|
-
destChain: z.ZodLiteral<"Ethereum">;
|
|
299
|
-
destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
|
|
300
|
-
srcAsset: z.ZodLiteral<"USDC">;
|
|
301
|
-
destAsset: z.ZodUnion<[z.ZodLiteral<"FLIP">, z.ZodLiteral<"ETH">]>;
|
|
302
|
-
message: z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>;
|
|
303
|
-
gasBudget: z.ZodString;
|
|
304
|
-
}, "strip", z.ZodTypeAny, {
|
|
305
|
-
amount: string | bigint;
|
|
306
|
-
message: `0x${string}`;
|
|
307
|
-
srcChain: "Ethereum";
|
|
308
|
-
srcAsset: "USDC";
|
|
309
|
-
destChain: "Ethereum";
|
|
310
|
-
destAddress: `0x${string}`;
|
|
311
|
-
destAsset: "FLIP" | "ETH";
|
|
312
|
-
gasBudget: string;
|
|
313
|
-
}, {
|
|
314
|
-
amount: string | bigint;
|
|
315
|
-
message: `0x${string}`;
|
|
316
|
-
srcChain: "Ethereum";
|
|
317
|
-
srcAsset: "USDC";
|
|
318
|
-
destChain: "Ethereum";
|
|
319
|
-
destAddress: `0x${string}`;
|
|
320
|
-
destAsset: "FLIP" | "ETH";
|
|
321
|
-
gasBudget: string;
|
|
322
|
-
}>]>]>;
|
|
323
|
-
type ExecuteCallParams = z.infer<typeof executeCallParamsSchema>;
|
|
357
|
+
type TokenSwapParams = z.infer<typeof tokenSwapParamsSchema>;
|
|
324
358
|
type Overrides = Omit<ethers.providers.TransactionRequest, 'to' | 'data' | 'value' | 'from'>;
|
|
325
359
|
|
|
326
360
|
declare const ccmMetadataSchema: z.ZodObject<{
|
|
@@ -515,7 +549,6 @@ declare class SwapSDK {
|
|
|
515
549
|
requestDepositAddress(depositAddressRequest: DepositAddressRequest, options?: RequestOptions): Promise<DepositAddressResponse>;
|
|
516
550
|
getStatus(swapStatusRequest: SwapStatusRequest, options?: RequestOptions): Promise<SwapStatusResponse>;
|
|
517
551
|
executeSwap(params: ExecuteSwapParams, overrides?: Overrides): Promise<TransactionHash>;
|
|
518
|
-
executeCall(params: ExecuteCallParams, overrides?: Overrides): Promise<TransactionHash>;
|
|
519
552
|
approveVault(params: Pick<TokenSwapParams, 'srcAsset' | 'amount'>, overrides?: Overrides): Promise<TransactionHash | null>;
|
|
520
553
|
}
|
|
521
554
|
|
package/dist/swap.js
CHANGED
|
@@ -1854,12 +1854,7 @@ var tokenSwapParamsSchema = zod.z.union([
|
|
|
1854
1854
|
srcAsset: erc20
|
|
1855
1855
|
})
|
|
1856
1856
|
]);
|
|
1857
|
-
var
|
|
1858
|
-
nativeSwapParamsSchema,
|
|
1859
|
-
tokenSwapParamsSchema
|
|
1860
|
-
]);
|
|
1861
|
-
var nativeCallParamsSchema = ethereumBase.extend({
|
|
1862
|
-
destAsset: erc20,
|
|
1857
|
+
var ccmMetadataSchema = zod.z.object({
|
|
1863
1858
|
message: zod.z.string(),
|
|
1864
1859
|
gasBudget: numericString
|
|
1865
1860
|
});
|
|
@@ -1870,8 +1865,7 @@ var tokenCallParamsSchema = zod.z.union([
|
|
|
1870
1865
|
zod.z.literal(Assets.USDC),
|
|
1871
1866
|
zod.z.literal(Assets.ETH)
|
|
1872
1867
|
]),
|
|
1873
|
-
|
|
1874
|
-
gasBudget: numericString
|
|
1868
|
+
ccmMetadata: ccmMetadataSchema
|
|
1875
1869
|
}),
|
|
1876
1870
|
ethereumBase.extend({
|
|
1877
1871
|
srcAsset: zod.z.literal(Assets.USDC),
|
|
@@ -1879,13 +1873,19 @@ var tokenCallParamsSchema = zod.z.union([
|
|
|
1879
1873
|
zod.z.literal(Assets.FLIP),
|
|
1880
1874
|
zod.z.literal(Assets.ETH)
|
|
1881
1875
|
]),
|
|
1882
|
-
|
|
1883
|
-
gasBudget: numericString
|
|
1876
|
+
ccmMetadata: ccmMetadataSchema
|
|
1884
1877
|
})
|
|
1885
1878
|
]);
|
|
1886
|
-
var
|
|
1879
|
+
var nativeCallParamsSchema = ethereumBase.extend({
|
|
1880
|
+
destAsset: erc20,
|
|
1881
|
+
ccmMetadata: ccmMetadataSchema
|
|
1882
|
+
});
|
|
1883
|
+
var executeSwapParamsSchema = zod.z.union([
|
|
1884
|
+
// call schemas needs to precede swap schemas
|
|
1887
1885
|
nativeCallParamsSchema,
|
|
1888
|
-
tokenCallParamsSchema
|
|
1886
|
+
tokenCallParamsSchema,
|
|
1887
|
+
nativeSwapParamsSchema,
|
|
1888
|
+
tokenSwapParamsSchema
|
|
1889
1889
|
]);
|
|
1890
1890
|
var executeOptionsSchema = zod.z.intersection(zod.z.object({
|
|
1891
1891
|
signer: zod.z.instanceof(ethers.Signer)
|
|
@@ -1920,18 +1920,10 @@ var swapToken = /* @__PURE__ */ __name(async (params, { network, vaultContractAd
|
|
|
1920
1920
|
const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, [], opts);
|
|
1921
1921
|
return transaction.wait(1);
|
|
1922
1922
|
}, "swapToken");
|
|
1923
|
-
var executeSwap = /* @__PURE__ */ __name(async (params, options) => {
|
|
1924
|
-
const parsedParams = executeSwapParamsSchema.parse(params);
|
|
1925
|
-
const opts = executeOptionsSchema.parse(options);
|
|
1926
|
-
return isTokenSwap(parsedParams) ? swapToken(parsedParams, opts) : swapNative(parsedParams, opts);
|
|
1927
|
-
}, "executeSwap");
|
|
1928
|
-
var executeSwap_default = executeSwap;
|
|
1929
|
-
|
|
1930
|
-
// ../shared/src/vault/executeCall.ts
|
|
1931
1923
|
var callNative = /* @__PURE__ */ __name(async (params, { network, vaultContractAddress: vaultAddress, signer, ...opts }) => {
|
|
1932
1924
|
const vaultContractAddress = network === "localnet" ? vaultAddress : getVaultManagerContractAddress(network);
|
|
1933
1925
|
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
1934
|
-
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.message, params.gasBudget, [], {
|
|
1926
|
+
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, [], {
|
|
1935
1927
|
value: params.amount,
|
|
1936
1928
|
...opts
|
|
1937
1929
|
});
|
|
@@ -1944,15 +1936,18 @@ var callToken = /* @__PURE__ */ __name(async (params, { signer, network, vaultCo
|
|
|
1944
1936
|
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
1945
1937
|
assert(isAllowable, "Swap amount exceeds allowance");
|
|
1946
1938
|
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
1947
|
-
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.message, params.gasBudget, erc20Address, params.amount, [], opts);
|
|
1939
|
+
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, erc20Address, params.amount, [], opts);
|
|
1948
1940
|
return transaction.wait(1);
|
|
1949
1941
|
}, "callToken");
|
|
1950
|
-
var
|
|
1951
|
-
const parsedParams =
|
|
1942
|
+
var executeSwap = /* @__PURE__ */ __name(async (params, options) => {
|
|
1943
|
+
const parsedParams = executeSwapParamsSchema.parse(params);
|
|
1952
1944
|
const opts = executeOptionsSchema.parse(options);
|
|
1953
|
-
|
|
1954
|
-
|
|
1955
|
-
|
|
1945
|
+
if ("ccmMetadata" in parsedParams) {
|
|
1946
|
+
return isTokenCall(parsedParams) ? callToken(parsedParams, opts) : callNative(parsedParams, opts);
|
|
1947
|
+
}
|
|
1948
|
+
return isTokenSwap(parsedParams) ? swapToken(parsedParams, opts) : swapNative(parsedParams, opts);
|
|
1949
|
+
}, "executeSwap");
|
|
1950
|
+
var executeSwap_default = executeSwap;
|
|
1956
1951
|
|
|
1957
1952
|
// ../shared/src/vault/approval.ts
|
|
1958
1953
|
var checkVaultAllowance = /* @__PURE__ */ __name((params, opts) => {
|
|
@@ -2168,15 +2163,6 @@ var SwapSDK = class {
|
|
|
2168
2163
|
});
|
|
2169
2164
|
return receipt.transactionHash;
|
|
2170
2165
|
}
|
|
2171
|
-
async executeCall(params, overrides = {}) {
|
|
2172
|
-
assert(this.signer, "No signer provided");
|
|
2173
|
-
const receipt = await executeCall_default(params, {
|
|
2174
|
-
...overrides,
|
|
2175
|
-
network: this.network,
|
|
2176
|
-
signer: this.signer
|
|
2177
|
-
});
|
|
2178
|
-
return receipt.transactionHash;
|
|
2179
|
-
}
|
|
2180
2166
|
async approveVault(params, overrides = {}) {
|
|
2181
2167
|
if (!("srcAsset" in params))
|
|
2182
2168
|
return null;
|
package/dist/swap.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isString, Chains, Assets, ChainflipNetworks, __name, assert, getVaultManagerContractAddress, approve,
|
|
1
|
+
import { isString, Chains, Assets, ChainflipNetworks, __name, assert, getVaultManagerContractAddress, approve, isTokenCall, isTokenSwap, getTokenContractAddress, checkAllowance, Vault__factory, chainContractIds, assetContractIds, assetDecimals, isTestnet } from './chunk-CMPMNSTZ.mjs';
|
|
2
2
|
export { Assets, ChainflipNetworks, Chains, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds } from './chunk-CMPMNSTZ.mjs';
|
|
3
3
|
import { encodeAddress, decodeAddress } from '@polkadot/util-crypto';
|
|
4
4
|
import * as ethers from 'ethers';
|
|
@@ -387,12 +387,7 @@ var tokenSwapParamsSchema = z.union([
|
|
|
387
387
|
srcAsset: erc20
|
|
388
388
|
})
|
|
389
389
|
]);
|
|
390
|
-
var
|
|
391
|
-
nativeSwapParamsSchema,
|
|
392
|
-
tokenSwapParamsSchema
|
|
393
|
-
]);
|
|
394
|
-
var nativeCallParamsSchema = ethereumBase.extend({
|
|
395
|
-
destAsset: erc20,
|
|
390
|
+
var ccmMetadataSchema = z.object({
|
|
396
391
|
message: z.string(),
|
|
397
392
|
gasBudget: numericString
|
|
398
393
|
});
|
|
@@ -403,8 +398,7 @@ var tokenCallParamsSchema = z.union([
|
|
|
403
398
|
z.literal(Assets.USDC),
|
|
404
399
|
z.literal(Assets.ETH)
|
|
405
400
|
]),
|
|
406
|
-
|
|
407
|
-
gasBudget: numericString
|
|
401
|
+
ccmMetadata: ccmMetadataSchema
|
|
408
402
|
}),
|
|
409
403
|
ethereumBase.extend({
|
|
410
404
|
srcAsset: z.literal(Assets.USDC),
|
|
@@ -412,13 +406,19 @@ var tokenCallParamsSchema = z.union([
|
|
|
412
406
|
z.literal(Assets.FLIP),
|
|
413
407
|
z.literal(Assets.ETH)
|
|
414
408
|
]),
|
|
415
|
-
|
|
416
|
-
gasBudget: numericString
|
|
409
|
+
ccmMetadata: ccmMetadataSchema
|
|
417
410
|
})
|
|
418
411
|
]);
|
|
419
|
-
var
|
|
412
|
+
var nativeCallParamsSchema = ethereumBase.extend({
|
|
413
|
+
destAsset: erc20,
|
|
414
|
+
ccmMetadata: ccmMetadataSchema
|
|
415
|
+
});
|
|
416
|
+
var executeSwapParamsSchema = z.union([
|
|
417
|
+
// call schemas needs to precede swap schemas
|
|
420
418
|
nativeCallParamsSchema,
|
|
421
|
-
tokenCallParamsSchema
|
|
419
|
+
tokenCallParamsSchema,
|
|
420
|
+
nativeSwapParamsSchema,
|
|
421
|
+
tokenSwapParamsSchema
|
|
422
422
|
]);
|
|
423
423
|
var executeOptionsSchema = z.intersection(z.object({
|
|
424
424
|
signer: z.instanceof(Signer)
|
|
@@ -453,18 +453,10 @@ var swapToken = /* @__PURE__ */ __name(async (params, { network, vaultContractAd
|
|
|
453
453
|
const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, [], opts);
|
|
454
454
|
return transaction.wait(1);
|
|
455
455
|
}, "swapToken");
|
|
456
|
-
var executeSwap = /* @__PURE__ */ __name(async (params, options) => {
|
|
457
|
-
const parsedParams = executeSwapParamsSchema.parse(params);
|
|
458
|
-
const opts = executeOptionsSchema.parse(options);
|
|
459
|
-
return isTokenSwap(parsedParams) ? swapToken(parsedParams, opts) : swapNative(parsedParams, opts);
|
|
460
|
-
}, "executeSwap");
|
|
461
|
-
var executeSwap_default = executeSwap;
|
|
462
|
-
|
|
463
|
-
// ../shared/src/vault/executeCall.ts
|
|
464
456
|
var callNative = /* @__PURE__ */ __name(async (params, { network, vaultContractAddress: vaultAddress, signer, ...opts }) => {
|
|
465
457
|
const vaultContractAddress = network === "localnet" ? vaultAddress : getVaultManagerContractAddress(network);
|
|
466
458
|
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
467
|
-
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.message, params.gasBudget, [], {
|
|
459
|
+
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, [], {
|
|
468
460
|
value: params.amount,
|
|
469
461
|
...opts
|
|
470
462
|
});
|
|
@@ -477,15 +469,18 @@ var callToken = /* @__PURE__ */ __name(async (params, { signer, network, vaultCo
|
|
|
477
469
|
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
478
470
|
assert(isAllowable, "Swap amount exceeds allowance");
|
|
479
471
|
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
480
|
-
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.message, params.gasBudget, erc20Address, params.amount, [], opts);
|
|
472
|
+
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, erc20Address, params.amount, [], opts);
|
|
481
473
|
return transaction.wait(1);
|
|
482
474
|
}, "callToken");
|
|
483
|
-
var
|
|
484
|
-
const parsedParams =
|
|
475
|
+
var executeSwap = /* @__PURE__ */ __name(async (params, options) => {
|
|
476
|
+
const parsedParams = executeSwapParamsSchema.parse(params);
|
|
485
477
|
const opts = executeOptionsSchema.parse(options);
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
478
|
+
if ("ccmMetadata" in parsedParams) {
|
|
479
|
+
return isTokenCall(parsedParams) ? callToken(parsedParams, opts) : callNative(parsedParams, opts);
|
|
480
|
+
}
|
|
481
|
+
return isTokenSwap(parsedParams) ? swapToken(parsedParams, opts) : swapNative(parsedParams, opts);
|
|
482
|
+
}, "executeSwap");
|
|
483
|
+
var executeSwap_default = executeSwap;
|
|
489
484
|
|
|
490
485
|
// ../shared/src/vault/approval.ts
|
|
491
486
|
var checkVaultAllowance = /* @__PURE__ */ __name((params, opts) => {
|
|
@@ -701,15 +696,6 @@ var SwapSDK = class {
|
|
|
701
696
|
});
|
|
702
697
|
return receipt.transactionHash;
|
|
703
698
|
}
|
|
704
|
-
async executeCall(params, overrides = {}) {
|
|
705
|
-
assert(this.signer, "No signer provided");
|
|
706
|
-
const receipt = await executeCall_default(params, {
|
|
707
|
-
...overrides,
|
|
708
|
-
network: this.network,
|
|
709
|
-
signer: this.signer
|
|
710
|
-
});
|
|
711
|
-
return receipt.transactionHash;
|
|
712
|
-
}
|
|
713
699
|
async approveVault(params, overrides = {}) {
|
|
714
700
|
if (!("srcAsset" in params))
|
|
715
701
|
return null;
|