@chainflip/sdk 1.6.7-rc.0 → 1.6.7-rc.2

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.mts CHANGED
@@ -84,8 +84,8 @@ type BoostedQuoteDetails = {
84
84
  interface BaseQuoteDetails {
85
85
  srcAsset: AssetAndChain;
86
86
  destAsset: AssetAndChain;
87
- intermediateAmount?: string;
88
87
  depositAmount: string;
88
+ intermediateAmount?: string;
89
89
  egressAmount: string;
90
90
  includedFees: SwapFee[];
91
91
  poolInfo: PoolInfo[];
@@ -513,7 +513,7 @@ declare class SwapSDK {
513
513
  private readonly options;
514
514
  private readonly rpcConfig;
515
515
  private readonly trpc;
516
- private stateChainEnvironment?;
516
+ private stateChainEnvironmentCache;
517
517
  private supportedAssets?;
518
518
  private dcaEnabled;
519
519
  constructor(options?: SwapSDKOptions);
@@ -534,6 +534,12 @@ declare class SwapSDK {
534
534
  signer?: Signer;
535
535
  }): Promise<TransactionHash | null>;
536
536
  private validateSwapAmount;
537
+ approveAndExecuteSwap(params: ExecuteSwapParams, txOpts?: Omit<TransactionOptions, 'nonce'> & {
538
+ signer?: Signer;
539
+ }): Promise<{
540
+ approveTxRef: TransactionHash | null;
541
+ swapTxRef: TransactionHash | null;
542
+ }>;
537
543
  getSwapLimits(): Promise<{
538
544
  minimumSwapAmounts: ChainAssetMap<bigint>;
539
545
  maximumSwapAmounts: ChainAssetMap<bigint | null>;
package/dist/swap.d.ts CHANGED
@@ -84,8 +84,8 @@ type BoostedQuoteDetails = {
84
84
  interface BaseQuoteDetails {
85
85
  srcAsset: AssetAndChain;
86
86
  destAsset: AssetAndChain;
87
- intermediateAmount?: string;
88
87
  depositAmount: string;
88
+ intermediateAmount?: string;
89
89
  egressAmount: string;
90
90
  includedFees: SwapFee[];
91
91
  poolInfo: PoolInfo[];
@@ -513,7 +513,7 @@ declare class SwapSDK {
513
513
  private readonly options;
514
514
  private readonly rpcConfig;
515
515
  private readonly trpc;
516
- private stateChainEnvironment?;
516
+ private stateChainEnvironmentCache;
517
517
  private supportedAssets?;
518
518
  private dcaEnabled;
519
519
  constructor(options?: SwapSDKOptions);
@@ -534,6 +534,12 @@ declare class SwapSDK {
534
534
  signer?: Signer;
535
535
  }): Promise<TransactionHash | null>;
536
536
  private validateSwapAmount;
537
+ approveAndExecuteSwap(params: ExecuteSwapParams, txOpts?: Omit<TransactionOptions, 'nonce'> & {
538
+ signer?: Signer;
539
+ }): Promise<{
540
+ approveTxRef: TransactionHash | null;
541
+ swapTxRef: TransactionHash | null;
542
+ }>;
537
543
  getSwapLimits(): Promise<{
538
544
  minimumSwapAmounts: ChainAssetMap<bigint>;
539
545
  maximumSwapAmounts: ChainAssetMap<bigint | null>;
package/dist/swap.js CHANGED
@@ -1450,8 +1450,8 @@ function find(record, predicate) {
1450
1450
  }
1451
1451
  __name(find, "find");
1452
1452
  function forEach(record, run) {
1453
- Object.entries(record).forEach(function(_a3) {
1454
- var _b = __read(_a3, 2), key = _b[0], value2 = _b[1];
1453
+ Object.entries(record).forEach(function(_a4) {
1454
+ var _b = __read(_a4, 2), key = _b[0], value2 = _b[1];
1455
1455
  return run(value2, key);
1456
1456
  });
1457
1457
  }
@@ -2034,7 +2034,7 @@ function traverse(tree, walker2, origin) {
2034
2034
  });
2035
2035
  return;
2036
2036
  }
2037
- var _a3 = __read3(tree, 2), nodeValue = _a3[0], children = _a3[1];
2037
+ var _a4 = __read3(tree, 2), nodeValue = _a4[0], children = _a4[1];
2038
2038
  if (children) {
2039
2039
  forEach(children, function(child, key) {
2040
2040
  traverse(child, walker2, __spreadArray2(__spreadArray2([], __read3(origin)), __read3(parsePath(key))));
@@ -2063,7 +2063,7 @@ function applyReferentialEqualityAnnotations(plain, annotations) {
2063
2063
  }
2064
2064
  __name(apply, "apply");
2065
2065
  if (isArray(annotations)) {
2066
- var _a3 = __read3(annotations, 2), root = _a3[0], other = _a3[1];
2066
+ var _a4 = __read3(annotations, 2), root = _a4[0], other = _a4[1];
2067
2067
  root.forEach(function(identicalPath) {
2068
2068
  plain = setDeep(plain, parsePath(identicalPath), function() {
2069
2069
  return plain;
@@ -2106,7 +2106,7 @@ function generateReferentialEqualityAnnotations(identitites, dedupe) {
2106
2106
  return a.length - b.length;
2107
2107
  });
2108
2108
  }
2109
- var _a3 = __read3(paths), representativePath = _a3[0], identicalPaths = _a3.slice(1);
2109
+ var _a4 = __read3(paths), representativePath = _a4[0], identicalPaths = _a4.slice(1);
2110
2110
  if (representativePath.length === 0) {
2111
2111
  rootEqualityPaths = identicalPaths.map(stringifyPath);
2112
2112
  } else {
@@ -2130,7 +2130,7 @@ function generateReferentialEqualityAnnotations(identitites, dedupe) {
2130
2130
  }
2131
2131
  __name(generateReferentialEqualityAnnotations, "generateReferentialEqualityAnnotations");
2132
2132
  var walker = /* @__PURE__ */ __name(function(object2, identities, superJson, dedupe, path, objectsInThisPath, seenObjects) {
2133
- var _a3;
2133
+ var _a4;
2134
2134
  if (path === void 0) {
2135
2135
  path = [];
2136
2136
  }
@@ -2171,7 +2171,7 @@ var walker = /* @__PURE__ */ __name(function(object2, identities, superJson, ded
2171
2171
  };
2172
2172
  }
2173
2173
  var transformationResult = transformValue(object2, superJson);
2174
- var transformed = (_a3 = transformationResult === null || transformationResult === void 0 ? void 0 : transformationResult.value) !== null && _a3 !== void 0 ? _a3 : object2;
2174
+ var transformed = (_a4 = transformationResult === null || transformationResult === void 0 ? void 0 : transformationResult.value) !== null && _a4 !== void 0 ? _a4 : object2;
2175
2175
  var transformedValue = isArray(transformed) ? [] : {};
2176
2176
  var innerAnnotations = {};
2177
2177
  forEach(transformed, function(value2, index) {
@@ -2310,12 +2310,12 @@ var __spreadArray3 = function(to, from) {
2310
2310
  var SuperJSON = (
2311
2311
  /** @class */
2312
2312
  function() {
2313
- function SuperJSON2(_a3) {
2314
- var _b = _a3 === void 0 ? {} : _a3, _c = _b.dedupe, dedupe = _c === void 0 ? false : _c;
2313
+ function SuperJSON2(_a4) {
2314
+ var _b = _a4 === void 0 ? {} : _a4, _c = _b.dedupe, dedupe = _c === void 0 ? false : _c;
2315
2315
  this.classRegistry = new ClassRegistry();
2316
2316
  this.symbolRegistry = new Registry(function(s) {
2317
- var _a4;
2318
- return (_a4 = s.description) !== null && _a4 !== void 0 ? _a4 : "";
2317
+ var _a5;
2318
+ return (_a5 = s.description) !== null && _a5 !== void 0 ? _a5 : "";
2319
2319
  });
2320
2320
  this.customTransformerRegistry = new CustomTransformerRegistry();
2321
2321
  this.allowedErrorProps = [];
@@ -2370,12 +2370,12 @@ var SuperJSON = (
2370
2370
  }, transformer));
2371
2371
  };
2372
2372
  SuperJSON2.prototype.allowErrorProps = function() {
2373
- var _a3;
2373
+ var _a4;
2374
2374
  var props = [];
2375
2375
  for (var _i = 0; _i < arguments.length; _i++) {
2376
2376
  props[_i] = arguments[_i];
2377
2377
  }
2378
- (_a3 = this.allowedErrorProps).push.apply(_a3, __spreadArray3([], __read4(props)));
2378
+ (_a4 = this.allowedErrorProps).push.apply(_a4, __spreadArray3([], __read4(props)));
2379
2379
  };
2380
2380
  SuperJSON2.defaultInstance = new SuperJSON2();
2381
2381
  SuperJSON2.serialize = SuperJSON2.defaultInstance.serialize.bind(SuperJSON2.defaultInstance);
@@ -8112,13 +8112,13 @@ function processCreateParams(params) {
8112
8112
  if (errorMap3)
8113
8113
  return { errorMap: errorMap3, description };
8114
8114
  const customMap = /* @__PURE__ */ __name((iss, ctx) => {
8115
- var _a3, _b;
8115
+ var _a4, _b;
8116
8116
  const { message } = params;
8117
8117
  if (iss.code === "invalid_enum_value") {
8118
8118
  return { message: message !== null && message !== void 0 ? message : ctx.defaultError };
8119
8119
  }
8120
8120
  if (typeof ctx.data === "undefined") {
8121
- return { message: (_a3 = message !== null && message !== void 0 ? message : required_error) !== null && _a3 !== void 0 ? _a3 : ctx.defaultError };
8121
+ return { message: (_a4 = message !== null && message !== void 0 ? message : required_error) !== null && _a4 !== void 0 ? _a4 : ctx.defaultError };
8122
8122
  }
8123
8123
  if (iss.code !== "invalid_type")
8124
8124
  return { message: ctx.defaultError };
@@ -8203,11 +8203,11 @@ var _ZodType = class _ZodType {
8203
8203
  throw result.error;
8204
8204
  }
8205
8205
  safeParse(data, params) {
8206
- var _a3;
8206
+ var _a4;
8207
8207
  const ctx = {
8208
8208
  common: {
8209
8209
  issues: [],
8210
- async: (_a3 = params === null || params === void 0 ? void 0 : params.async) !== null && _a3 !== void 0 ? _a3 : false,
8210
+ async: (_a4 = params === null || params === void 0 ? void 0 : params.async) !== null && _a4 !== void 0 ? _a4 : false,
8211
8211
  contextualErrorMap: params === null || params === void 0 ? void 0 : params.errorMap
8212
8212
  },
8213
8213
  path: (params === null || params === void 0 ? void 0 : params.path) || [],
@@ -8566,7 +8566,7 @@ var _ZodString = class _ZodString extends ZodType {
8566
8566
  } else if (check15.kind === "url") {
8567
8567
  try {
8568
8568
  new URL(input.data);
8569
- } catch (_a3) {
8569
+ } catch (_a4) {
8570
8570
  ctx = this._getOrReturnCtx(input, ctx);
8571
8571
  addIssueToContext(ctx, {
8572
8572
  validation: "url",
@@ -8736,7 +8736,7 @@ var _ZodString = class _ZodString extends ZodType {
8736
8736
  return this._addCheck({ kind: "ip", ...errorUtil.errToObj(options) });
8737
8737
  }
8738
8738
  datetime(options) {
8739
- var _a3, _b;
8739
+ var _a4, _b;
8740
8740
  if (typeof options === "string") {
8741
8741
  return this._addCheck({
8742
8742
  kind: "datetime",
@@ -8749,7 +8749,7 @@ var _ZodString = class _ZodString extends ZodType {
8749
8749
  return this._addCheck({
8750
8750
  kind: "datetime",
8751
8751
  precision: typeof (options === null || options === void 0 ? void 0 : options.precision) === "undefined" ? null : options === null || options === void 0 ? void 0 : options.precision,
8752
- offset: (_a3 = options === null || options === void 0 ? void 0 : options.offset) !== null && _a3 !== void 0 ? _a3 : false,
8752
+ offset: (_a4 = options === null || options === void 0 ? void 0 : options.offset) !== null && _a4 !== void 0 ? _a4 : false,
8753
8753
  local: (_b = options === null || options === void 0 ? void 0 : options.local) !== null && _b !== void 0 ? _b : false,
8754
8754
  ...errorUtil.errToObj(options === null || options === void 0 ? void 0 : options.message)
8755
8755
  });
@@ -8915,11 +8915,11 @@ var _ZodString = class _ZodString extends ZodType {
8915
8915
  __name(_ZodString, "ZodString");
8916
8916
  var ZodString = _ZodString;
8917
8917
  ZodString.create = (params) => {
8918
- var _a3;
8918
+ var _a4;
8919
8919
  return new ZodString({
8920
8920
  checks: [],
8921
8921
  typeName: ZodFirstPartyTypeKind.ZodString,
8922
- coerce: (_a3 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a3 !== void 0 ? _a3 : false,
8922
+ coerce: (_a4 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a4 !== void 0 ? _a4 : false,
8923
8923
  ...processCreateParams(params)
8924
8924
  });
8925
8925
  };
@@ -9325,11 +9325,11 @@ var _ZodBigInt = class _ZodBigInt extends ZodType {
9325
9325
  __name(_ZodBigInt, "ZodBigInt");
9326
9326
  var ZodBigInt = _ZodBigInt;
9327
9327
  ZodBigInt.create = (params) => {
9328
- var _a3;
9328
+ var _a4;
9329
9329
  return new ZodBigInt({
9330
9330
  checks: [],
9331
9331
  typeName: ZodFirstPartyTypeKind.ZodBigInt,
9332
- coerce: (_a3 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a3 !== void 0 ? _a3 : false,
9332
+ coerce: (_a4 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a4 !== void 0 ? _a4 : false,
9333
9333
  ...processCreateParams(params)
9334
9334
  });
9335
9335
  };
@@ -9856,8 +9856,8 @@ var _ZodObject = class _ZodObject extends ZodType {
9856
9856
  unknownKeys: "strict",
9857
9857
  ...message !== void 0 ? {
9858
9858
  errorMap: /* @__PURE__ */ __name((issue, ctx) => {
9859
- var _a3, _b, _c, _d;
9860
- const defaultError = (_c = (_b = (_a3 = this._def).errorMap) === null || _b === void 0 ? void 0 : _b.call(_a3, issue, ctx).message) !== null && _c !== void 0 ? _c : ctx.defaultError;
9859
+ var _a4, _b, _c, _d;
9860
+ const defaultError = (_c = (_b = (_a4 = this._def).errorMap) === null || _b === void 0 ? void 0 : _b.call(_a4, issue, ctx).message) !== null && _c !== void 0 ? _c : ctx.defaultError;
9861
9861
  if (issue.code === "unrecognized_keys")
9862
9862
  return {
9863
9863
  message: (_d = errorUtil.errToObj(message).message) !== null && _d !== void 0 ? _d : defaultError
@@ -11370,10 +11370,10 @@ ZodReadonly.create = (type, params) => {
11370
11370
  function custom2(check15, params = {}, fatal) {
11371
11371
  if (check15)
11372
11372
  return ZodAny.create().superRefine((data, ctx) => {
11373
- var _a3, _b;
11373
+ var _a4, _b;
11374
11374
  if (!check15(data)) {
11375
11375
  const p = typeof params === "function" ? params(data) : typeof params === "string" ? { message: params } : params;
11376
- const _fatal = (_b = (_a3 = p.fatal) !== null && _a3 !== void 0 ? _a3 : fatal) !== null && _b !== void 0 ? _b : true;
11376
+ const _fatal = (_b = (_a4 = p.fatal) !== null && _a4 !== void 0 ? _a4 : fatal) !== null && _b !== void 0 ? _b : true;
11377
11377
  const p2 = typeof p === "string" ? { message: p } : p;
11378
11378
  ctx.addIssue({ code: "custom", ...p2, fatal: _fatal });
11379
11379
  }
@@ -12122,7 +12122,12 @@ z.object({
12122
12122
  maxBoostFeeBps: z.number().optional(),
12123
12123
  srcAddress: z.string().optional(),
12124
12124
  fillOrKillParams: fillOrKillParams.optional(),
12125
- dcaParams: dcaParams.optional()
12125
+ dcaParams: dcaParams.optional(),
12126
+ quote: z.object({
12127
+ intermediateAmount: z.string().optional(),
12128
+ egressAmount: z.string(),
12129
+ estimatedPrice: z.string()
12130
+ }).optional()
12126
12131
  }).superRefine(ensureDcaWithFok).transform(({ amount, ...rest }) => ({
12127
12132
  ...rest,
12128
12133
  expectedDepositAmount: amount
@@ -13934,6 +13939,82 @@ var approveVault = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) =>
13934
13939
  return approve(BigInt(params.amount), vaultContractAddress, erc20, allowance, txOpts);
13935
13940
  }, "approveVault");
13936
13941
 
13942
+ // ../swap/src/utils/dataStructures.ts
13943
+ var _a3;
13944
+ var Timer = (_a3 = class {
13945
+ constructor(value2, cb, ms) {
13946
+ __publicField(this, "value");
13947
+ __publicField(this, "cb");
13948
+ __publicField(this, "ms");
13949
+ __publicField(this, "timeout");
13950
+ this.value = value2;
13951
+ this.cb = cb;
13952
+ this.ms = ms;
13953
+ this.reset(true);
13954
+ }
13955
+ reset(resetExpiryOnLookup) {
13956
+ if (resetExpiryOnLookup) {
13957
+ this.clear();
13958
+ this.timeout = setTimeout(this.cb, this.ms);
13959
+ }
13960
+ return this;
13961
+ }
13962
+ getValue(resetExpiryOnLookup) {
13963
+ return this.reset(resetExpiryOnLookup).value;
13964
+ }
13965
+ clear() {
13966
+ if (this.timeout) clearTimeout(this.timeout);
13967
+ }
13968
+ }, __name(_a3, "Timer"), _a3);
13969
+ var _CacheMap = class _CacheMap {
13970
+ constructor(ttl, resetExpiryOnLookup = true) {
13971
+ __publicField(this, "ttl");
13972
+ __publicField(this, "resetExpiryOnLookup");
13973
+ __publicField(this, "store");
13974
+ this.ttl = ttl;
13975
+ this.resetExpiryOnLookup = resetExpiryOnLookup;
13976
+ this.store = /* @__PURE__ */ new Map();
13977
+ }
13978
+ set(key, value2) {
13979
+ this.delete(key);
13980
+ const timer = new Timer(value2, () => this.store.delete(key), this.ttl);
13981
+ this.store.set(key, timer);
13982
+ return this;
13983
+ }
13984
+ get(key) {
13985
+ return this.store.get(key)?.getValue(this.resetExpiryOnLookup);
13986
+ }
13987
+ delete(key) {
13988
+ this.store.get(key)?.clear();
13989
+ return this.store.delete(key);
13990
+ }
13991
+ };
13992
+ __name(_CacheMap, "CacheMap");
13993
+ var CacheMap = _CacheMap;
13994
+ var _AsyncCacheMap = class _AsyncCacheMap extends CacheMap {
13995
+ constructor({ fetch, ttl, resetExpiryOnLookup = true }) {
13996
+ super(ttl, resetExpiryOnLookup);
13997
+ __publicField(this, "fetch");
13998
+ this.fetch = fetch;
13999
+ }
14000
+ get(key) {
14001
+ let promise = super.get(key);
14002
+ if (!promise) {
14003
+ promise = this.fetch(key).catch((err) => {
14004
+ this.delete(key);
14005
+ throw err;
14006
+ });
14007
+ this.set(key, promise);
14008
+ }
14009
+ return promise;
14010
+ }
14011
+ load(key) {
14012
+ return this.get(key).then(() => true, () => false);
14013
+ }
14014
+ };
14015
+ __name(_AsyncCacheMap, "AsyncCacheMap");
14016
+ var AsyncCacheMap = _AsyncCacheMap;
14017
+
13937
14018
  // src/swap/assets.ts
13938
14019
  var isGasAsset = /* @__PURE__ */ __name((asset2) => {
13939
14020
  const { chain: chain2 } = assetConstants[asset2];
@@ -13967,7 +14048,7 @@ var getChainData = /* @__PURE__ */ __name((chain2, network, env) => ({
13967
14048
  }), "getChainData");
13968
14049
 
13969
14050
  // package.json
13970
- var version = "1.6.7-rc.0";
14051
+ var version = "1.6.7-rc.2";
13971
14052
 
13972
14053
  // src/swap/consts.ts
13973
14054
  var CF_SDK_VERSION_HEADERS = {
@@ -14061,7 +14142,7 @@ var _SwapSDK = class _SwapSDK {
14061
14142
  __publicField(this, "options");
14062
14143
  __publicField(this, "rpcConfig");
14063
14144
  __publicField(this, "trpc");
14064
- __publicField(this, "stateChainEnvironment");
14145
+ __publicField(this, "stateChainEnvironmentCache");
14065
14146
  __publicField(this, "supportedAssets");
14066
14147
  __publicField(this, "dcaEnabled", false);
14067
14148
  const network = options.network ?? ChainflipNetworks.perseverance;
@@ -14085,6 +14166,11 @@ var _SwapSDK = class _SwapSDK {
14085
14166
  ]
14086
14167
  });
14087
14168
  this.dcaEnabled = options.enabledFeatures?.dca ?? false;
14169
+ this.stateChainEnvironmentCache = new AsyncCacheMap({
14170
+ fetch: /* @__PURE__ */ __name((_key) => getEnvironment(this.rpcConfig), "fetch"),
14171
+ ttl: 6e4 * 10,
14172
+ resetExpiryOnLookup: false
14173
+ });
14088
14174
  }
14089
14175
  async getChains(sourceChain) {
14090
14176
  if (sourceChain && !(sourceChain in Chains)) throw new Error(`unsupported source chain "${sourceChain}"`);
@@ -14098,8 +14184,7 @@ var _SwapSDK = class _SwapSDK {
14098
14184
  return supportedChains.map((chain2) => getChainData(chain2, this.options.network, env)).filter((chain2) => chain2.chain !== sourceChain);
14099
14185
  }
14100
14186
  async getStateChainEnvironment() {
14101
- this.stateChainEnvironment ?? (this.stateChainEnvironment = await getEnvironment(this.rpcConfig));
14102
- return this.stateChainEnvironment;
14187
+ return this.stateChainEnvironmentCache.get("cf_environment");
14103
14188
  }
14104
14189
  async getSupportedAssets() {
14105
14190
  this.supportedAssets ?? (this.supportedAssets = (await getSupportedAssets(this.rpcConfig)).map((asset2) => getInternalAsset(asset2, false)).filter(isNotNullish));
@@ -14231,6 +14316,30 @@ var _SwapSDK = class _SwapSDK {
14231
14316
  const result = validateSwapAmount(stateChainEnv, internalAsset, amount);
14232
14317
  if (!result.success) throw new Error(result.reason);
14233
14318
  }
14319
+ async approveAndExecuteSwap(params, txOpts = {}) {
14320
+ const { srcChain, srcAsset } = params;
14321
+ const signer = txOpts.signer ?? this.options.signer;
14322
+ assert2(signer, "No signer provided");
14323
+ const internalAsset = getInternalAsset({
14324
+ chain: srcChain,
14325
+ asset: srcAsset
14326
+ });
14327
+ let approveTxRef = null;
14328
+ if (!isGasAsset(internalAsset)) {
14329
+ approveTxRef = await this.approveVault(params, {
14330
+ ...txOpts,
14331
+ nonce: void 0
14332
+ });
14333
+ }
14334
+ const swapTxRef = await this.executeSwap(params, {
14335
+ ...txOpts,
14336
+ nonce: void 0
14337
+ });
14338
+ return {
14339
+ approveTxRef,
14340
+ swapTxRef
14341
+ };
14342
+ }
14234
14343
  async getSwapLimits() {
14235
14344
  const { swapping: { maximumSwapAmounts }, ingressEgress: { minimumDepositAmounts } } = await this.getStateChainEnvironment();
14236
14345
  return {
@@ -14301,7 +14410,10 @@ var _SwapSDK = class _SwapSDK {
14301
14410
  channelOpeningFee: result.channelOpeningFee
14302
14411
  };
14303
14412
  } else {
14304
- response = await this.trpc.openSwapDepositChannel.mutate(depositAddressRequest);
14413
+ response = await this.trpc.openSwapDepositChannel.mutate({
14414
+ ...depositAddressRequest,
14415
+ quote
14416
+ });
14305
14417
  }
14306
14418
  return {
14307
14419
  ...depositAddressRequest,
package/dist/swap.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { __commonJS, __name, __export, __toESM, isString, InternalAssets, Chains, Assets, ChainflipNetworks, isValidAssetAndChain, getInternalAssets, __publicField, assert, assetConstants, getEnvironment, getSupportedAssets, getInternalAsset, isNotNullish, getAllBoostPoolsDepth, getAssetAndChain, readChainAssetValue, getVaultContractAddress, approve, getTokenContractAddress, isTestnet, getEvmChainId, chainConstants, checkAllowance, extractOverrides, Vault__factory } from './chunk-G76RI3QK.mjs';
1
+ import { __commonJS, __name, __export, __toESM, isString, InternalAssets, Chains, Assets, ChainflipNetworks, isValidAssetAndChain, getInternalAssets, __publicField, assert, getEnvironment, assetConstants, getSupportedAssets, getInternalAsset, isNotNullish, getAllBoostPoolsDepth, getAssetAndChain, readChainAssetValue, getVaultContractAddress, approve, chainConstants, getTokenContractAddress, isTestnet, getEvmChainId, checkAllowance, extractOverrides, Vault__factory } from './chunk-G76RI3QK.mjs';
2
2
  export { Assets, InternalAssets as ChainflipIds, ChainflipNetworks, Chains, getInternalAsset as getChainflipId } from './chunk-G76RI3QK.mjs';
3
3
  import { assert as assert$1 } from '@chainflip/utils/assertion';
4
4
  import { hexToBytes, bytesToHex } from '@chainflip/utils/bytes';
@@ -1391,8 +1391,8 @@ function find(record, predicate) {
1391
1391
  }
1392
1392
  __name(find, "find");
1393
1393
  function forEach(record, run) {
1394
- Object.entries(record).forEach(function(_a3) {
1395
- var _b = __read(_a3, 2), key = _b[0], value2 = _b[1];
1394
+ Object.entries(record).forEach(function(_a4) {
1395
+ var _b = __read(_a4, 2), key = _b[0], value2 = _b[1];
1396
1396
  return run(value2, key);
1397
1397
  });
1398
1398
  }
@@ -1975,7 +1975,7 @@ function traverse(tree, walker2, origin) {
1975
1975
  });
1976
1976
  return;
1977
1977
  }
1978
- var _a3 = __read3(tree, 2), nodeValue = _a3[0], children = _a3[1];
1978
+ var _a4 = __read3(tree, 2), nodeValue = _a4[0], children = _a4[1];
1979
1979
  if (children) {
1980
1980
  forEach(children, function(child, key) {
1981
1981
  traverse(child, walker2, __spreadArray2(__spreadArray2([], __read3(origin)), __read3(parsePath(key))));
@@ -2004,7 +2004,7 @@ function applyReferentialEqualityAnnotations(plain, annotations) {
2004
2004
  }
2005
2005
  __name(apply, "apply");
2006
2006
  if (isArray(annotations)) {
2007
- var _a3 = __read3(annotations, 2), root = _a3[0], other = _a3[1];
2007
+ var _a4 = __read3(annotations, 2), root = _a4[0], other = _a4[1];
2008
2008
  root.forEach(function(identicalPath) {
2009
2009
  plain = setDeep(plain, parsePath(identicalPath), function() {
2010
2010
  return plain;
@@ -2047,7 +2047,7 @@ function generateReferentialEqualityAnnotations(identitites, dedupe) {
2047
2047
  return a.length - b.length;
2048
2048
  });
2049
2049
  }
2050
- var _a3 = __read3(paths), representativePath = _a3[0], identicalPaths = _a3.slice(1);
2050
+ var _a4 = __read3(paths), representativePath = _a4[0], identicalPaths = _a4.slice(1);
2051
2051
  if (representativePath.length === 0) {
2052
2052
  rootEqualityPaths = identicalPaths.map(stringifyPath);
2053
2053
  } else {
@@ -2071,7 +2071,7 @@ function generateReferentialEqualityAnnotations(identitites, dedupe) {
2071
2071
  }
2072
2072
  __name(generateReferentialEqualityAnnotations, "generateReferentialEqualityAnnotations");
2073
2073
  var walker = /* @__PURE__ */ __name(function(object2, identities, superJson, dedupe, path, objectsInThisPath, seenObjects) {
2074
- var _a3;
2074
+ var _a4;
2075
2075
  if (path === void 0) {
2076
2076
  path = [];
2077
2077
  }
@@ -2112,7 +2112,7 @@ var walker = /* @__PURE__ */ __name(function(object2, identities, superJson, ded
2112
2112
  };
2113
2113
  }
2114
2114
  var transformationResult = transformValue(object2, superJson);
2115
- var transformed = (_a3 = transformationResult === null || transformationResult === void 0 ? void 0 : transformationResult.value) !== null && _a3 !== void 0 ? _a3 : object2;
2115
+ var transformed = (_a4 = transformationResult === null || transformationResult === void 0 ? void 0 : transformationResult.value) !== null && _a4 !== void 0 ? _a4 : object2;
2116
2116
  var transformedValue = isArray(transformed) ? [] : {};
2117
2117
  var innerAnnotations = {};
2118
2118
  forEach(transformed, function(value2, index) {
@@ -2251,12 +2251,12 @@ var __spreadArray3 = function(to, from) {
2251
2251
  var SuperJSON = (
2252
2252
  /** @class */
2253
2253
  function() {
2254
- function SuperJSON2(_a3) {
2255
- var _b = _a3 === void 0 ? {} : _a3, _c = _b.dedupe, dedupe = _c === void 0 ? false : _c;
2254
+ function SuperJSON2(_a4) {
2255
+ var _b = _a4 === void 0 ? {} : _a4, _c = _b.dedupe, dedupe = _c === void 0 ? false : _c;
2256
2256
  this.classRegistry = new ClassRegistry();
2257
2257
  this.symbolRegistry = new Registry(function(s) {
2258
- var _a4;
2259
- return (_a4 = s.description) !== null && _a4 !== void 0 ? _a4 : "";
2258
+ var _a5;
2259
+ return (_a5 = s.description) !== null && _a5 !== void 0 ? _a5 : "";
2260
2260
  });
2261
2261
  this.customTransformerRegistry = new CustomTransformerRegistry();
2262
2262
  this.allowedErrorProps = [];
@@ -2311,12 +2311,12 @@ var SuperJSON = (
2311
2311
  }, transformer));
2312
2312
  };
2313
2313
  SuperJSON2.prototype.allowErrorProps = function() {
2314
- var _a3;
2314
+ var _a4;
2315
2315
  var props = [];
2316
2316
  for (var _i = 0; _i < arguments.length; _i++) {
2317
2317
  props[_i] = arguments[_i];
2318
2318
  }
2319
- (_a3 = this.allowedErrorProps).push.apply(_a3, __spreadArray3([], __read4(props)));
2319
+ (_a4 = this.allowedErrorProps).push.apply(_a4, __spreadArray3([], __read4(props)));
2320
2320
  };
2321
2321
  SuperJSON2.defaultInstance = new SuperJSON2();
2322
2322
  SuperJSON2.serialize = SuperJSON2.defaultInstance.serialize.bind(SuperJSON2.defaultInstance);
@@ -8053,13 +8053,13 @@ function processCreateParams(params) {
8053
8053
  if (errorMap3)
8054
8054
  return { errorMap: errorMap3, description };
8055
8055
  const customMap = /* @__PURE__ */ __name((iss, ctx) => {
8056
- var _a3, _b;
8056
+ var _a4, _b;
8057
8057
  const { message } = params;
8058
8058
  if (iss.code === "invalid_enum_value") {
8059
8059
  return { message: message !== null && message !== void 0 ? message : ctx.defaultError };
8060
8060
  }
8061
8061
  if (typeof ctx.data === "undefined") {
8062
- return { message: (_a3 = message !== null && message !== void 0 ? message : required_error) !== null && _a3 !== void 0 ? _a3 : ctx.defaultError };
8062
+ return { message: (_a4 = message !== null && message !== void 0 ? message : required_error) !== null && _a4 !== void 0 ? _a4 : ctx.defaultError };
8063
8063
  }
8064
8064
  if (iss.code !== "invalid_type")
8065
8065
  return { message: ctx.defaultError };
@@ -8144,11 +8144,11 @@ var _ZodType = class _ZodType {
8144
8144
  throw result.error;
8145
8145
  }
8146
8146
  safeParse(data, params) {
8147
- var _a3;
8147
+ var _a4;
8148
8148
  const ctx = {
8149
8149
  common: {
8150
8150
  issues: [],
8151
- async: (_a3 = params === null || params === void 0 ? void 0 : params.async) !== null && _a3 !== void 0 ? _a3 : false,
8151
+ async: (_a4 = params === null || params === void 0 ? void 0 : params.async) !== null && _a4 !== void 0 ? _a4 : false,
8152
8152
  contextualErrorMap: params === null || params === void 0 ? void 0 : params.errorMap
8153
8153
  },
8154
8154
  path: (params === null || params === void 0 ? void 0 : params.path) || [],
@@ -8507,7 +8507,7 @@ var _ZodString = class _ZodString extends ZodType {
8507
8507
  } else if (check15.kind === "url") {
8508
8508
  try {
8509
8509
  new URL(input.data);
8510
- } catch (_a3) {
8510
+ } catch (_a4) {
8511
8511
  ctx = this._getOrReturnCtx(input, ctx);
8512
8512
  addIssueToContext(ctx, {
8513
8513
  validation: "url",
@@ -8677,7 +8677,7 @@ var _ZodString = class _ZodString extends ZodType {
8677
8677
  return this._addCheck({ kind: "ip", ...errorUtil.errToObj(options) });
8678
8678
  }
8679
8679
  datetime(options) {
8680
- var _a3, _b;
8680
+ var _a4, _b;
8681
8681
  if (typeof options === "string") {
8682
8682
  return this._addCheck({
8683
8683
  kind: "datetime",
@@ -8690,7 +8690,7 @@ var _ZodString = class _ZodString extends ZodType {
8690
8690
  return this._addCheck({
8691
8691
  kind: "datetime",
8692
8692
  precision: typeof (options === null || options === void 0 ? void 0 : options.precision) === "undefined" ? null : options === null || options === void 0 ? void 0 : options.precision,
8693
- offset: (_a3 = options === null || options === void 0 ? void 0 : options.offset) !== null && _a3 !== void 0 ? _a3 : false,
8693
+ offset: (_a4 = options === null || options === void 0 ? void 0 : options.offset) !== null && _a4 !== void 0 ? _a4 : false,
8694
8694
  local: (_b = options === null || options === void 0 ? void 0 : options.local) !== null && _b !== void 0 ? _b : false,
8695
8695
  ...errorUtil.errToObj(options === null || options === void 0 ? void 0 : options.message)
8696
8696
  });
@@ -8856,11 +8856,11 @@ var _ZodString = class _ZodString extends ZodType {
8856
8856
  __name(_ZodString, "ZodString");
8857
8857
  var ZodString = _ZodString;
8858
8858
  ZodString.create = (params) => {
8859
- var _a3;
8859
+ var _a4;
8860
8860
  return new ZodString({
8861
8861
  checks: [],
8862
8862
  typeName: ZodFirstPartyTypeKind.ZodString,
8863
- coerce: (_a3 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a3 !== void 0 ? _a3 : false,
8863
+ coerce: (_a4 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a4 !== void 0 ? _a4 : false,
8864
8864
  ...processCreateParams(params)
8865
8865
  });
8866
8866
  };
@@ -9266,11 +9266,11 @@ var _ZodBigInt = class _ZodBigInt extends ZodType {
9266
9266
  __name(_ZodBigInt, "ZodBigInt");
9267
9267
  var ZodBigInt = _ZodBigInt;
9268
9268
  ZodBigInt.create = (params) => {
9269
- var _a3;
9269
+ var _a4;
9270
9270
  return new ZodBigInt({
9271
9271
  checks: [],
9272
9272
  typeName: ZodFirstPartyTypeKind.ZodBigInt,
9273
- coerce: (_a3 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a3 !== void 0 ? _a3 : false,
9273
+ coerce: (_a4 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a4 !== void 0 ? _a4 : false,
9274
9274
  ...processCreateParams(params)
9275
9275
  });
9276
9276
  };
@@ -9797,8 +9797,8 @@ var _ZodObject = class _ZodObject extends ZodType {
9797
9797
  unknownKeys: "strict",
9798
9798
  ...message !== void 0 ? {
9799
9799
  errorMap: /* @__PURE__ */ __name((issue, ctx) => {
9800
- var _a3, _b, _c, _d;
9801
- const defaultError = (_c = (_b = (_a3 = this._def).errorMap) === null || _b === void 0 ? void 0 : _b.call(_a3, issue, ctx).message) !== null && _c !== void 0 ? _c : ctx.defaultError;
9800
+ var _a4, _b, _c, _d;
9801
+ const defaultError = (_c = (_b = (_a4 = this._def).errorMap) === null || _b === void 0 ? void 0 : _b.call(_a4, issue, ctx).message) !== null && _c !== void 0 ? _c : ctx.defaultError;
9802
9802
  if (issue.code === "unrecognized_keys")
9803
9803
  return {
9804
9804
  message: (_d = errorUtil.errToObj(message).message) !== null && _d !== void 0 ? _d : defaultError
@@ -11311,10 +11311,10 @@ ZodReadonly.create = (type, params) => {
11311
11311
  function custom2(check15, params = {}, fatal) {
11312
11312
  if (check15)
11313
11313
  return ZodAny.create().superRefine((data, ctx) => {
11314
- var _a3, _b;
11314
+ var _a4, _b;
11315
11315
  if (!check15(data)) {
11316
11316
  const p = typeof params === "function" ? params(data) : typeof params === "string" ? { message: params } : params;
11317
- const _fatal = (_b = (_a3 = p.fatal) !== null && _a3 !== void 0 ? _a3 : fatal) !== null && _b !== void 0 ? _b : true;
11317
+ const _fatal = (_b = (_a4 = p.fatal) !== null && _a4 !== void 0 ? _a4 : fatal) !== null && _b !== void 0 ? _b : true;
11318
11318
  const p2 = typeof p === "string" ? { message: p } : p;
11319
11319
  ctx.addIssue({ code: "custom", ...p2, fatal: _fatal });
11320
11320
  }
@@ -11818,7 +11818,12 @@ z.object({
11818
11818
  maxBoostFeeBps: z.number().optional(),
11819
11819
  srcAddress: z.string().optional(),
11820
11820
  fillOrKillParams: fillOrKillParams.optional(),
11821
- dcaParams: dcaParams.optional()
11821
+ dcaParams: dcaParams.optional(),
11822
+ quote: z.object({
11823
+ intermediateAmount: z.string().optional(),
11824
+ egressAmount: z.string(),
11825
+ estimatedPrice: z.string()
11826
+ }).optional()
11822
11827
  }).superRefine(ensureDcaWithFok).transform(({ amount, ...rest }) => ({
11823
11828
  ...rest,
11824
11829
  expectedDepositAmount: amount
@@ -12180,6 +12185,82 @@ var approveVault = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) =>
12180
12185
  return approve(BigInt(params.amount), vaultContractAddress, erc20, allowance, txOpts);
12181
12186
  }, "approveVault");
12182
12187
 
12188
+ // ../swap/src/utils/dataStructures.ts
12189
+ var _a3;
12190
+ var Timer = (_a3 = class {
12191
+ constructor(value2, cb, ms) {
12192
+ __publicField(this, "value");
12193
+ __publicField(this, "cb");
12194
+ __publicField(this, "ms");
12195
+ __publicField(this, "timeout");
12196
+ this.value = value2;
12197
+ this.cb = cb;
12198
+ this.ms = ms;
12199
+ this.reset(true);
12200
+ }
12201
+ reset(resetExpiryOnLookup) {
12202
+ if (resetExpiryOnLookup) {
12203
+ this.clear();
12204
+ this.timeout = setTimeout(this.cb, this.ms);
12205
+ }
12206
+ return this;
12207
+ }
12208
+ getValue(resetExpiryOnLookup) {
12209
+ return this.reset(resetExpiryOnLookup).value;
12210
+ }
12211
+ clear() {
12212
+ if (this.timeout) clearTimeout(this.timeout);
12213
+ }
12214
+ }, __name(_a3, "Timer"), _a3);
12215
+ var _CacheMap = class _CacheMap {
12216
+ constructor(ttl, resetExpiryOnLookup = true) {
12217
+ __publicField(this, "ttl");
12218
+ __publicField(this, "resetExpiryOnLookup");
12219
+ __publicField(this, "store");
12220
+ this.ttl = ttl;
12221
+ this.resetExpiryOnLookup = resetExpiryOnLookup;
12222
+ this.store = /* @__PURE__ */ new Map();
12223
+ }
12224
+ set(key, value2) {
12225
+ this.delete(key);
12226
+ const timer = new Timer(value2, () => this.store.delete(key), this.ttl);
12227
+ this.store.set(key, timer);
12228
+ return this;
12229
+ }
12230
+ get(key) {
12231
+ return this.store.get(key)?.getValue(this.resetExpiryOnLookup);
12232
+ }
12233
+ delete(key) {
12234
+ this.store.get(key)?.clear();
12235
+ return this.store.delete(key);
12236
+ }
12237
+ };
12238
+ __name(_CacheMap, "CacheMap");
12239
+ var CacheMap = _CacheMap;
12240
+ var _AsyncCacheMap = class _AsyncCacheMap extends CacheMap {
12241
+ constructor({ fetch, ttl, resetExpiryOnLookup = true }) {
12242
+ super(ttl, resetExpiryOnLookup);
12243
+ __publicField(this, "fetch");
12244
+ this.fetch = fetch;
12245
+ }
12246
+ get(key) {
12247
+ let promise = super.get(key);
12248
+ if (!promise) {
12249
+ promise = this.fetch(key).catch((err) => {
12250
+ this.delete(key);
12251
+ throw err;
12252
+ });
12253
+ this.set(key, promise);
12254
+ }
12255
+ return promise;
12256
+ }
12257
+ load(key) {
12258
+ return this.get(key).then(() => true, () => false);
12259
+ }
12260
+ };
12261
+ __name(_AsyncCacheMap, "AsyncCacheMap");
12262
+ var AsyncCacheMap = _AsyncCacheMap;
12263
+
12183
12264
  // src/swap/assets.ts
12184
12265
  var isGasAsset = /* @__PURE__ */ __name((asset2) => {
12185
12266
  const { chain: chain2 } = assetConstants[asset2];
@@ -12213,7 +12294,7 @@ var getChainData = /* @__PURE__ */ __name((chain2, network, env) => ({
12213
12294
  }), "getChainData");
12214
12295
 
12215
12296
  // package.json
12216
- var version = "1.6.7-rc.0";
12297
+ var version = "1.6.7-rc.2";
12217
12298
 
12218
12299
  // src/swap/consts.ts
12219
12300
  var CF_SDK_VERSION_HEADERS = {
@@ -12307,7 +12388,7 @@ var _SwapSDK = class _SwapSDK {
12307
12388
  __publicField(this, "options");
12308
12389
  __publicField(this, "rpcConfig");
12309
12390
  __publicField(this, "trpc");
12310
- __publicField(this, "stateChainEnvironment");
12391
+ __publicField(this, "stateChainEnvironmentCache");
12311
12392
  __publicField(this, "supportedAssets");
12312
12393
  __publicField(this, "dcaEnabled", false);
12313
12394
  const network = options.network ?? ChainflipNetworks.perseverance;
@@ -12331,6 +12412,11 @@ var _SwapSDK = class _SwapSDK {
12331
12412
  ]
12332
12413
  });
12333
12414
  this.dcaEnabled = options.enabledFeatures?.dca ?? false;
12415
+ this.stateChainEnvironmentCache = new AsyncCacheMap({
12416
+ fetch: /* @__PURE__ */ __name((_key) => getEnvironment(this.rpcConfig), "fetch"),
12417
+ ttl: 6e4 * 10,
12418
+ resetExpiryOnLookup: false
12419
+ });
12334
12420
  }
12335
12421
  async getChains(sourceChain) {
12336
12422
  if (sourceChain && !(sourceChain in Chains)) throw new Error(`unsupported source chain "${sourceChain}"`);
@@ -12344,8 +12430,7 @@ var _SwapSDK = class _SwapSDK {
12344
12430
  return supportedChains.map((chain2) => getChainData(chain2, this.options.network, env)).filter((chain2) => chain2.chain !== sourceChain);
12345
12431
  }
12346
12432
  async getStateChainEnvironment() {
12347
- this.stateChainEnvironment ?? (this.stateChainEnvironment = await getEnvironment(this.rpcConfig));
12348
- return this.stateChainEnvironment;
12433
+ return this.stateChainEnvironmentCache.get("cf_environment");
12349
12434
  }
12350
12435
  async getSupportedAssets() {
12351
12436
  this.supportedAssets ?? (this.supportedAssets = (await getSupportedAssets(this.rpcConfig)).map((asset2) => getInternalAsset(asset2, false)).filter(isNotNullish));
@@ -12477,6 +12562,30 @@ var _SwapSDK = class _SwapSDK {
12477
12562
  const result = validateSwapAmount(stateChainEnv, internalAsset, amount);
12478
12563
  if (!result.success) throw new Error(result.reason);
12479
12564
  }
12565
+ async approveAndExecuteSwap(params, txOpts = {}) {
12566
+ const { srcChain, srcAsset } = params;
12567
+ const signer = txOpts.signer ?? this.options.signer;
12568
+ assert(signer, "No signer provided");
12569
+ const internalAsset = getInternalAsset({
12570
+ chain: srcChain,
12571
+ asset: srcAsset
12572
+ });
12573
+ let approveTxRef = null;
12574
+ if (!isGasAsset(internalAsset)) {
12575
+ approveTxRef = await this.approveVault(params, {
12576
+ ...txOpts,
12577
+ nonce: void 0
12578
+ });
12579
+ }
12580
+ const swapTxRef = await this.executeSwap(params, {
12581
+ ...txOpts,
12582
+ nonce: void 0
12583
+ });
12584
+ return {
12585
+ approveTxRef,
12586
+ swapTxRef
12587
+ };
12588
+ }
12480
12589
  async getSwapLimits() {
12481
12590
  const { swapping: { maximumSwapAmounts }, ingressEgress: { minimumDepositAmounts } } = await this.getStateChainEnvironment();
12482
12591
  return {
@@ -12547,7 +12656,10 @@ var _SwapSDK = class _SwapSDK {
12547
12656
  channelOpeningFee: result.channelOpeningFee
12548
12657
  };
12549
12658
  } else {
12550
- response = await this.trpc.openSwapDepositChannel.mutate(depositAddressRequest);
12659
+ response = await this.trpc.openSwapDepositChannel.mutate({
12660
+ ...depositAddressRequest,
12661
+ quote
12662
+ });
12551
12663
  }
12552
12664
  return {
12553
12665
  ...depositAddressRequest,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@chainflip/sdk",
3
- "version": "1.6.7-rc.0",
3
+ "version": "1.6.7-rc.2",
4
4
  "description": "",
5
5
  "exports": {
6
6
  "./swap": {
@@ -42,14 +42,14 @@
42
42
  },
43
43
  "dependencies": {
44
44
  "@chainflip/extrinsics": "^1.6.1",
45
- "@chainflip/rpc": "^1.6.7",
45
+ "@chainflip/rpc": "^1.6.9",
46
46
  "@chainflip/utils": "^0.4.0",
47
47
  "axios": "^1.7.7",
48
48
  "bignumber.js": "^9.1.2",
49
49
  "ethers": "^6.13.3"
50
50
  },
51
51
  "devDependencies": {
52
- "tsup": "^8.2.4"
52
+ "tsup": "^8.3.0"
53
53
  },
54
54
  "scripts": {
55
55
  "test": "jest --forceExit",