@chainflip/sdk 0.1.11 → 0.1.12

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/funding.js CHANGED
@@ -928,11 +928,9 @@ var fundStateChainAccount = /* @__PURE__ */ __name(async (accountId, amount, opt
928
928
  });
929
929
  return transaction.wait(1);
930
930
  }, "fundStateChainAccount");
931
- var executeRedemption = /* @__PURE__ */ __name(async (accountId, { nonce, ...options }) => {
931
+ var executeRedemption = /* @__PURE__ */ __name(async (accountId, options) => {
932
932
  const stateChainGateway = getStateChainGateway(options);
933
- const transaction = await stateChainGateway.executeRedemption(accountId, {
934
- nonce
935
- });
933
+ const transaction = await stateChainGateway.executeRedemption(accountId, options);
936
934
  return transaction.wait(1);
937
935
  }, "executeRedemption");
938
936
  var getMinimumFunding = /* @__PURE__ */ __name((options) => {
package/dist/funding.mjs CHANGED
@@ -32,11 +32,9 @@ var fundStateChainAccount = /* @__PURE__ */ __name(async (accountId, amount, opt
32
32
  });
33
33
  return transaction.wait(1);
34
34
  }, "fundStateChainAccount");
35
- var executeRedemption = /* @__PURE__ */ __name(async (accountId, { nonce, ...options }) => {
35
+ var executeRedemption = /* @__PURE__ */ __name(async (accountId, options) => {
36
36
  const stateChainGateway = getStateChainGateway(options);
37
- const transaction = await stateChainGateway.executeRedemption(accountId, {
38
- nonce
39
- });
37
+ const transaction = await stateChainGateway.executeRedemption(accountId, options);
40
38
  return transaction.wait(1);
41
39
  }, "executeRedemption");
42
40
  var getMinimumFunding = /* @__PURE__ */ __name((options) => {
package/dist/swap.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Signer } from 'ethers';
1
+ import ethers, { Signer } from 'ethers';
2
2
  import { C as Chain, c as chainAssets, A as Asset, a as ChainflipNetwork } from './enums-d5fa72fa.js';
3
3
  export { d as Assets, e as ChainflipNetworks, b as Chains, f as assetChains, h as assetContractIds, g as assetDecimals, i as chainContractIds } from './enums-d5fa72fa.js';
4
4
  import { z } from 'zod';
@@ -272,38 +272,26 @@ declare const executeCallParamsSchema: z.ZodUnion<[z.ZodObject<{
272
272
  destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
273
273
  srcAsset: z.ZodLiteral<"FLIP">;
274
274
  destAsset: z.ZodUnion<[z.ZodLiteral<"USDC">, z.ZodLiteral<"ETH">]>;
275
- ccmMetadata: z.ZodObject<{
276
- message: z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>;
277
- gasBudget: z.ZodString;
278
- }, "strip", z.ZodTypeAny, {
279
- message: `0x${string}`;
280
- gasBudget: string;
281
- }, {
282
- message: `0x${string}`;
283
- gasBudget: string;
284
- }>;
275
+ message: z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>;
276
+ gasBudget: z.ZodString;
285
277
  }, "strip", z.ZodTypeAny, {
286
278
  amount: string | bigint;
279
+ message: `0x${string}`;
287
280
  srcChain: "Ethereum";
288
281
  srcAsset: "FLIP";
289
282
  destChain: "Ethereum";
290
283
  destAddress: `0x${string}`;
291
284
  destAsset: "USDC" | "ETH";
292
- ccmMetadata: {
293
- message: `0x${string}`;
294
- gasBudget: string;
295
- };
285
+ gasBudget: string;
296
286
  }, {
297
287
  amount: string | bigint;
288
+ message: `0x${string}`;
298
289
  srcChain: "Ethereum";
299
290
  srcAsset: "FLIP";
300
291
  destChain: "Ethereum";
301
292
  destAddress: `0x${string}`;
302
293
  destAsset: "USDC" | "ETH";
303
- ccmMetadata: {
304
- message: `0x${string}`;
305
- gasBudget: string;
306
- };
294
+ gasBudget: string;
307
295
  }>, z.ZodObject<{
308
296
  amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
309
297
  srcChain: z.ZodLiteral<"Ethereum">;
@@ -311,40 +299,29 @@ declare const executeCallParamsSchema: z.ZodUnion<[z.ZodObject<{
311
299
  destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
312
300
  srcAsset: z.ZodLiteral<"USDC">;
313
301
  destAsset: z.ZodUnion<[z.ZodLiteral<"FLIP">, z.ZodLiteral<"ETH">]>;
314
- ccmMetadata: z.ZodObject<{
315
- message: z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>;
316
- gasBudget: z.ZodString;
317
- }, "strip", z.ZodTypeAny, {
318
- message: `0x${string}`;
319
- gasBudget: string;
320
- }, {
321
- message: `0x${string}`;
322
- gasBudget: string;
323
- }>;
302
+ message: z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>;
303
+ gasBudget: z.ZodString;
324
304
  }, "strip", z.ZodTypeAny, {
325
305
  amount: string | bigint;
306
+ message: `0x${string}`;
326
307
  srcChain: "Ethereum";
327
308
  srcAsset: "USDC";
328
309
  destChain: "Ethereum";
329
310
  destAddress: `0x${string}`;
330
311
  destAsset: "FLIP" | "ETH";
331
- ccmMetadata: {
332
- message: `0x${string}`;
333
- gasBudget: string;
334
- };
312
+ gasBudget: string;
335
313
  }, {
336
314
  amount: string | bigint;
315
+ message: `0x${string}`;
337
316
  srcChain: "Ethereum";
338
317
  srcAsset: "USDC";
339
318
  destChain: "Ethereum";
340
319
  destAddress: `0x${string}`;
341
320
  destAsset: "FLIP" | "ETH";
342
- ccmMetadata: {
343
- message: `0x${string}`;
344
- gasBudget: string;
345
- };
321
+ gasBudget: string;
346
322
  }>]>]>;
347
323
  type ExecuteCallParams = z.infer<typeof executeCallParamsSchema>;
324
+ type Overrides = Omit<ethers.providers.TransactionRequest, 'to' | 'data' | 'value' | 'from'>;
348
325
 
349
326
  declare const ccmMetadataSchema: z.ZodObject<{
350
327
  gasBudget: z.ZodUnion<[z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodNumber]>;
@@ -537,11 +514,9 @@ declare class SwapSDK {
537
514
  getQuote(quoteRequest: QuoteRequest, options?: RequestOptions): Promise<QuoteResponse>;
538
515
  requestDepositAddress(depositAddressRequest: DepositAddressRequest, options?: RequestOptions): Promise<DepositAddressResponse>;
539
516
  getStatus(swapStatusRequest: SwapStatusRequest, options?: RequestOptions): Promise<SwapStatusResponse>;
540
- executeSwap(params: ExecuteSwapParams): Promise<TransactionHash>;
541
- executeCall(params: ExecuteCallParams): Promise<TransactionHash>;
542
- approveVault(params: Pick<TokenSwapParams, 'srcAsset' | 'amount'>, options?: {
543
- nonce?: bigint | number | string;
544
- }): Promise<TransactionHash | null>;
517
+ executeSwap(params: ExecuteSwapParams, overrides?: Overrides): Promise<TransactionHash>;
518
+ executeCall(params: ExecuteCallParams, overrides?: Overrides): Promise<TransactionHash>;
519
+ approveVault(params: Pick<TokenSwapParams, 'srcAsset' | 'amount'>, overrides?: Overrides): Promise<TransactionHash | null>;
545
520
  }
546
521
 
547
522
  export { Asset, AssetData, Chain, ChainData, ChainflipNetwork, DepositAddressRequest, DepositAddressResponse, QuoteRequest, QuoteResponse, SDKOptions, SwapSDK, SwapStatusRequest, SwapStatusResponse, chainAssets };
package/dist/swap.js CHANGED
@@ -1863,10 +1863,6 @@ var nativeCallParamsSchema = ethereumBase.extend({
1863
1863
  message: zod.z.string(),
1864
1864
  gasBudget: numericString
1865
1865
  });
1866
- var ccmMetadataSchema = zod.z.object({
1867
- message: hexString,
1868
- gasBudget: numericString
1869
- });
1870
1866
  var tokenCallParamsSchema = zod.z.union([
1871
1867
  ethereumBase.extend({
1872
1868
  srcAsset: zod.z.literal(Assets.FLIP),
@@ -1874,7 +1870,8 @@ var tokenCallParamsSchema = zod.z.union([
1874
1870
  zod.z.literal(Assets.USDC),
1875
1871
  zod.z.literal(Assets.ETH)
1876
1872
  ]),
1877
- ccmMetadata: ccmMetadataSchema
1873
+ message: hexString,
1874
+ gasBudget: numericString
1878
1875
  }),
1879
1876
  ethereumBase.extend({
1880
1877
  srcAsset: zod.z.literal(Assets.USDC),
@@ -1882,7 +1879,8 @@ var tokenCallParamsSchema = zod.z.union([
1882
1879
  zod.z.literal(Assets.FLIP),
1883
1880
  zod.z.literal(Assets.ETH)
1884
1881
  ]),
1885
- ccmMetadata: ccmMetadataSchema
1882
+ message: hexString,
1883
+ gasBudget: numericString
1886
1884
  })
1887
1885
  ]);
1888
1886
  var executeCallParamsSchema = zod.z.union([
@@ -1890,43 +1888,36 @@ var executeCallParamsSchema = zod.z.union([
1890
1888
  tokenCallParamsSchema
1891
1889
  ]);
1892
1890
  var executeOptionsSchema = zod.z.intersection(zod.z.object({
1893
- signer: zod.z.instanceof(ethers.Signer),
1894
- nonce: zod.z.union([
1895
- zod.z.number(),
1896
- zod.z.bigint(),
1897
- zod.z.string()
1898
- ]).optional()
1899
- }), zod.z.union([
1891
+ signer: zod.z.instanceof(ethers.Signer)
1892
+ }).passthrough(), zod.z.union([
1900
1893
  zod.z.object({
1901
1894
  network: chainflipNetwork
1902
- }),
1895
+ }).passthrough(),
1903
1896
  zod.z.object({
1904
1897
  network: zod.z.literal("localnet"),
1905
1898
  vaultContractAddress: zod.z.string(),
1906
1899
  srcTokenContractAddress: zod.z.string().optional()
1907
- })
1900
+ }).passthrough()
1908
1901
  ]));
1909
1902
 
1910
1903
  // ../shared/src/vault/executeSwap.ts
1911
- var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, { nonce, ...opts }) => {
1912
- const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
1913
- const vault = Vault__factory.connect(vaultContractAddress, opts.signer);
1904
+ var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, { network, vaultContractAddress: address, signer, ...opts }) => {
1905
+ const vaultContractAddress = network === "localnet" ? address : getVaultManagerContractAddress(network);
1906
+ const vault = Vault__factory.connect(vaultContractAddress, signer);
1914
1907
  const transaction = await vault.xSwapNative(chainContractIds[destChain], destAddress, assetContractIds[destAsset], [], {
1915
1908
  value: amount,
1916
- nonce
1909
+ ...opts
1917
1910
  });
1918
1911
  return transaction.wait(1);
1919
1912
  }, "swapNative");
1920
- var swapToken = /* @__PURE__ */ __name(async (params, opts) => {
1921
- const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
1922
- const erc20Address = opts.network === "localnet" ? opts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, opts.network);
1913
+ var swapToken = /* @__PURE__ */ __name(async (params, { network, vaultContractAddress: vaultAddress, srcTokenContractAddress: tokenAddress, signer, ...opts }) => {
1914
+ const vaultContractAddress = network === "localnet" ? vaultAddress : getVaultManagerContractAddress(network);
1915
+ const erc20Address = network === "localnet" ? tokenAddress : getTokenContractAddress(params.srcAsset, network);
1923
1916
  assert(erc20Address !== void 0, "Missing ERC20 contract address");
1924
- const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, opts.signer);
1917
+ const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
1925
1918
  assert(isAllowable, "Swap amount exceeds allowance");
1926
- const vault = Vault__factory.connect(vaultContractAddress, opts.signer);
1927
- const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, [], {
1928
- nonce: opts.nonce
1929
- });
1919
+ const vault = Vault__factory.connect(vaultContractAddress, signer);
1920
+ const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, [], opts);
1930
1921
  return transaction.wait(1);
1931
1922
  }, "swapToken");
1932
1923
  var executeSwap = /* @__PURE__ */ __name(async (params, options) => {
@@ -1937,25 +1928,23 @@ var executeSwap = /* @__PURE__ */ __name(async (params, options) => {
1937
1928
  var executeSwap_default = executeSwap;
1938
1929
 
1939
1930
  // ../shared/src/vault/executeCall.ts
1940
- var callNative = /* @__PURE__ */ __name(async (params, { nonce, ...opts }) => {
1941
- const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
1942
- const vault = Vault__factory.connect(vaultContractAddress, opts.signer);
1931
+ var callNative = /* @__PURE__ */ __name(async (params, { network, vaultContractAddress: vaultAddress, signer, ...opts }) => {
1932
+ const vaultContractAddress = network === "localnet" ? vaultAddress : getVaultManagerContractAddress(network);
1933
+ const vault = Vault__factory.connect(vaultContractAddress, signer);
1943
1934
  const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.message, params.gasBudget, [], {
1944
1935
  value: params.amount,
1945
- nonce
1936
+ ...opts
1946
1937
  });
1947
1938
  return transaction.wait(1);
1948
1939
  }, "callNative");
1949
- var callToken = /* @__PURE__ */ __name(async (params, { signer, ...opts }) => {
1950
- const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
1951
- const erc20Address = opts.network === "localnet" ? opts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, opts.network);
1940
+ var callToken = /* @__PURE__ */ __name(async (params, { signer, network, vaultContractAddress: vaultAddress, srcTokenContractAddress: tokenAddress, ...opts }) => {
1941
+ const vaultContractAddress = network === "localnet" ? vaultAddress : getVaultManagerContractAddress(network);
1942
+ const erc20Address = network === "localnet" ? tokenAddress : getTokenContractAddress(params.srcAsset, network);
1952
1943
  assert(erc20Address !== void 0, "Missing ERC20 contract address");
1953
1944
  const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
1954
1945
  assert(isAllowable, "Swap amount exceeds allowance");
1955
1946
  const vault = Vault__factory.connect(vaultContractAddress, signer);
1956
- const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata?.gasBudget, params.ccmMetadata?.message, erc20Address, params.amount, [], {
1957
- nonce: opts.nonce
1958
- });
1947
+ const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.message, params.gasBudget, erc20Address, params.amount, [], opts);
1959
1948
  return transaction.wait(1);
1960
1949
  }, "callToken");
1961
1950
  var executeCall = /* @__PURE__ */ __name(async (params, options) => {
@@ -2170,30 +2159,32 @@ var SwapSDK = class {
2170
2159
  getStatus(swapStatusRequest, options = {}) {
2171
2160
  return ApiService_default.getStatus(this.baseUrl, swapStatusRequest, options);
2172
2161
  }
2173
- async executeSwap(params) {
2162
+ async executeSwap(params, overrides = {}) {
2174
2163
  assert(this.signer, "No signer provided");
2175
2164
  const receipt = await executeSwap_default(params, {
2165
+ ...overrides,
2176
2166
  network: this.network,
2177
2167
  signer: this.signer
2178
2168
  });
2179
2169
  return receipt.transactionHash;
2180
2170
  }
2181
- async executeCall(params) {
2171
+ async executeCall(params, overrides = {}) {
2182
2172
  assert(this.signer, "No signer provided");
2183
2173
  const receipt = await executeCall_default(params, {
2174
+ ...overrides,
2184
2175
  network: this.network,
2185
2176
  signer: this.signer
2186
2177
  });
2187
2178
  return receipt.transactionHash;
2188
2179
  }
2189
- async approveVault(params, options = {}) {
2180
+ async approveVault(params, overrides = {}) {
2190
2181
  if (!("srcAsset" in params))
2191
2182
  return null;
2192
2183
  assert(this.signer, "No signer provided");
2193
2184
  const receipt = await approveVault(params, {
2194
2185
  signer: this.signer,
2195
2186
  network: this.network,
2196
- ...options
2187
+ ...overrides
2197
2188
  });
2198
2189
  return receipt && receipt.transactionHash;
2199
2190
  }
package/dist/swap.mjs CHANGED
@@ -396,10 +396,6 @@ var nativeCallParamsSchema = ethereumBase.extend({
396
396
  message: z.string(),
397
397
  gasBudget: numericString
398
398
  });
399
- var ccmMetadataSchema = z.object({
400
- message: hexString,
401
- gasBudget: numericString
402
- });
403
399
  var tokenCallParamsSchema = z.union([
404
400
  ethereumBase.extend({
405
401
  srcAsset: z.literal(Assets.FLIP),
@@ -407,7 +403,8 @@ var tokenCallParamsSchema = z.union([
407
403
  z.literal(Assets.USDC),
408
404
  z.literal(Assets.ETH)
409
405
  ]),
410
- ccmMetadata: ccmMetadataSchema
406
+ message: hexString,
407
+ gasBudget: numericString
411
408
  }),
412
409
  ethereumBase.extend({
413
410
  srcAsset: z.literal(Assets.USDC),
@@ -415,7 +412,8 @@ var tokenCallParamsSchema = z.union([
415
412
  z.literal(Assets.FLIP),
416
413
  z.literal(Assets.ETH)
417
414
  ]),
418
- ccmMetadata: ccmMetadataSchema
415
+ message: hexString,
416
+ gasBudget: numericString
419
417
  })
420
418
  ]);
421
419
  var executeCallParamsSchema = z.union([
@@ -423,43 +421,36 @@ var executeCallParamsSchema = z.union([
423
421
  tokenCallParamsSchema
424
422
  ]);
425
423
  var executeOptionsSchema = z.intersection(z.object({
426
- signer: z.instanceof(Signer),
427
- nonce: z.union([
428
- z.number(),
429
- z.bigint(),
430
- z.string()
431
- ]).optional()
432
- }), z.union([
424
+ signer: z.instanceof(Signer)
425
+ }).passthrough(), z.union([
433
426
  z.object({
434
427
  network: chainflipNetwork
435
- }),
428
+ }).passthrough(),
436
429
  z.object({
437
430
  network: z.literal("localnet"),
438
431
  vaultContractAddress: z.string(),
439
432
  srcTokenContractAddress: z.string().optional()
440
- })
433
+ }).passthrough()
441
434
  ]));
442
435
 
443
436
  // ../shared/src/vault/executeSwap.ts
444
- var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, { nonce, ...opts }) => {
445
- const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
446
- const vault = Vault__factory.connect(vaultContractAddress, opts.signer);
437
+ var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, { network, vaultContractAddress: address, signer, ...opts }) => {
438
+ const vaultContractAddress = network === "localnet" ? address : getVaultManagerContractAddress(network);
439
+ const vault = Vault__factory.connect(vaultContractAddress, signer);
447
440
  const transaction = await vault.xSwapNative(chainContractIds[destChain], destAddress, assetContractIds[destAsset], [], {
448
441
  value: amount,
449
- nonce
442
+ ...opts
450
443
  });
451
444
  return transaction.wait(1);
452
445
  }, "swapNative");
453
- var swapToken = /* @__PURE__ */ __name(async (params, opts) => {
454
- const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
455
- const erc20Address = opts.network === "localnet" ? opts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, opts.network);
446
+ var swapToken = /* @__PURE__ */ __name(async (params, { network, vaultContractAddress: vaultAddress, srcTokenContractAddress: tokenAddress, signer, ...opts }) => {
447
+ const vaultContractAddress = network === "localnet" ? vaultAddress : getVaultManagerContractAddress(network);
448
+ const erc20Address = network === "localnet" ? tokenAddress : getTokenContractAddress(params.srcAsset, network);
456
449
  assert(erc20Address !== void 0, "Missing ERC20 contract address");
457
- const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, opts.signer);
450
+ const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
458
451
  assert(isAllowable, "Swap amount exceeds allowance");
459
- const vault = Vault__factory.connect(vaultContractAddress, opts.signer);
460
- const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, [], {
461
- nonce: opts.nonce
462
- });
452
+ const vault = Vault__factory.connect(vaultContractAddress, signer);
453
+ const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, [], opts);
463
454
  return transaction.wait(1);
464
455
  }, "swapToken");
465
456
  var executeSwap = /* @__PURE__ */ __name(async (params, options) => {
@@ -470,25 +461,23 @@ var executeSwap = /* @__PURE__ */ __name(async (params, options) => {
470
461
  var executeSwap_default = executeSwap;
471
462
 
472
463
  // ../shared/src/vault/executeCall.ts
473
- var callNative = /* @__PURE__ */ __name(async (params, { nonce, ...opts }) => {
474
- const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
475
- const vault = Vault__factory.connect(vaultContractAddress, opts.signer);
464
+ var callNative = /* @__PURE__ */ __name(async (params, { network, vaultContractAddress: vaultAddress, signer, ...opts }) => {
465
+ const vaultContractAddress = network === "localnet" ? vaultAddress : getVaultManagerContractAddress(network);
466
+ const vault = Vault__factory.connect(vaultContractAddress, signer);
476
467
  const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.message, params.gasBudget, [], {
477
468
  value: params.amount,
478
- nonce
469
+ ...opts
479
470
  });
480
471
  return transaction.wait(1);
481
472
  }, "callNative");
482
- var callToken = /* @__PURE__ */ __name(async (params, { signer, ...opts }) => {
483
- const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
484
- const erc20Address = opts.network === "localnet" ? opts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, opts.network);
473
+ var callToken = /* @__PURE__ */ __name(async (params, { signer, network, vaultContractAddress: vaultAddress, srcTokenContractAddress: tokenAddress, ...opts }) => {
474
+ const vaultContractAddress = network === "localnet" ? vaultAddress : getVaultManagerContractAddress(network);
475
+ const erc20Address = network === "localnet" ? tokenAddress : getTokenContractAddress(params.srcAsset, network);
485
476
  assert(erc20Address !== void 0, "Missing ERC20 contract address");
486
477
  const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
487
478
  assert(isAllowable, "Swap amount exceeds allowance");
488
479
  const vault = Vault__factory.connect(vaultContractAddress, signer);
489
- const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata?.gasBudget, params.ccmMetadata?.message, erc20Address, params.amount, [], {
490
- nonce: opts.nonce
491
- });
480
+ const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.message, params.gasBudget, erc20Address, params.amount, [], opts);
492
481
  return transaction.wait(1);
493
482
  }, "callToken");
494
483
  var executeCall = /* @__PURE__ */ __name(async (params, options) => {
@@ -703,30 +692,32 @@ var SwapSDK = class {
703
692
  getStatus(swapStatusRequest, options = {}) {
704
693
  return ApiService_default.getStatus(this.baseUrl, swapStatusRequest, options);
705
694
  }
706
- async executeSwap(params) {
695
+ async executeSwap(params, overrides = {}) {
707
696
  assert(this.signer, "No signer provided");
708
697
  const receipt = await executeSwap_default(params, {
698
+ ...overrides,
709
699
  network: this.network,
710
700
  signer: this.signer
711
701
  });
712
702
  return receipt.transactionHash;
713
703
  }
714
- async executeCall(params) {
704
+ async executeCall(params, overrides = {}) {
715
705
  assert(this.signer, "No signer provided");
716
706
  const receipt = await executeCall_default(params, {
707
+ ...overrides,
717
708
  network: this.network,
718
709
  signer: this.signer
719
710
  });
720
711
  return receipt.transactionHash;
721
712
  }
722
- async approveVault(params, options = {}) {
713
+ async approveVault(params, overrides = {}) {
723
714
  if (!("srcAsset" in params))
724
715
  return null;
725
716
  assert(this.signer, "No signer provided");
726
717
  const receipt = await approveVault(params, {
727
718
  signer: this.signer,
728
719
  network: this.network,
729
- ...options
720
+ ...overrides
730
721
  });
731
722
  return receipt && receipt.transactionHash;
732
723
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@chainflip/sdk",
3
- "version": "0.1.11",
3
+ "version": "0.1.12",
4
4
  "description": "",
5
5
  "exports": {
6
6
  "./swap": {