@chainflip/sdk 2.3.3 → 2.3.4-dev.1

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.js CHANGED
@@ -1,6 +1,6 @@
1
- import { getEnvironment, getEvmChainId, getAllSupplyPoolsDepth, getAllBoostPoolsDepth, SUPPLY_POOL_BOOST_FEE_BPS, assert, isNotNullish, ADDRESSES } from './chunk-6KPGKVRC.js';
1
+ import { getEnvironment, getEvmChainId, getAllSupplyPoolsDepth, getAllBoostPoolsDepth, assert, SUPPLY_POOL_BOOST_FEE_BPS, isNotNullish, ADDRESSES } from './chunk-6KPGKVRC.js';
2
2
  import { unreachable } from '@chainflip/utils/assertion';
3
- import { chainflipChains, assetSymbols, isValidAssetAndChain, getInternalAssets, assetConstants, isChainflipAsset, internalAssetToRpcAsset, getInternalAsset, chainflipNetworks, chainflipAssets, readAssetValue, anyAssetConstants } from '@chainflip/utils/chainflip';
3
+ import { chainflipChains, assetSymbols, isValidAssetAndChain, getInternalAssets, assetConstants, isChainflipAsset, internalAssetToRpcAsset, getInternalAsset, chainflipNetworks, chainflipAssets, readAssetValue, anyChainConstants, anyAssetConstants } from '@chainflip/utils/chainflip';
4
4
  export { getInternalAsset as getChainflipId } from '@chainflip/utils/chainflip';
5
5
  import { calculateTotalEffectiveBorrowableAmount, ppmToBps } from '@chainflip/utils/lending';
6
6
  import { HttpClient } from '@chainflip/rpc';
@@ -12,30 +12,12 @@ import BigNumber2 from 'bignumber.js';
12
12
  import { z } from 'zod';
13
13
  import { isValidSolanaAddress } from '@chainflip/solana';
14
14
  import { isValidTronAddress } from '@chainflip/utils/tron';
15
- import { hexEncodeNumber } from '@chainflip/utils/number';
16
15
  import * as bitcoin from '@chainflip/bitcoin';
17
16
  import * as ethers from 'ethers';
17
+ import { hexEncodeNumber } from '@chainflip/utils/number';
18
18
  import { CHAINFLIP_BLOCK_TIME_SECONDS } from '@chainflip/utils/consts';
19
19
  import axios from 'axios';
20
20
 
21
- // ../shared/src/strings.ts
22
- var toCamelCase = (str) => str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
23
-
24
- // ../shared/src/objects.ts
25
- var transformKeysToCamelCase = (obj) => {
26
- if (Array.isArray(obj)) {
27
- return obj.map(transformKeysToCamelCase);
28
- }
29
- if (obj !== null && typeof obj === "object") {
30
- return Object.fromEntries(
31
- Object.entries(obj).map(([key, value]) => [
32
- toCamelCase(key),
33
- transformKeysToCamelCase(value)
34
- ])
35
- );
36
- }
37
- return obj;
38
- };
39
21
  var booleanString = z.string().regex(/^(true|false)$/i).transform((v) => v.toLowerCase() === "true");
40
22
  var numericString = z.string().regex(/^[0-9]+$/);
41
23
  var numericOrEmptyString = z.string().regex(/^[0-9]*$/);
@@ -80,6 +62,119 @@ var uncheckedAssetAndChain = z.object({
80
62
  var assetAndChain = uncheckedAssetAndChain.refine(
81
63
  (value) => chain.safeParse(value.chain).success && asset.safeParse(value.asset).success && isValidAssetAndChain(value)
82
64
  );
65
+ var validatePolkadotAddress = (address) => {
66
+ if (isHex(address)) return address.length === 66;
67
+ try {
68
+ ss58.decode(address);
69
+ return true;
70
+ } catch {
71
+ return false;
72
+ }
73
+ };
74
+ var validateEvmAddress = (address) => ethers.isAddress(address);
75
+ var validateBitcoinMainnetAddress = (address) => bitcoin.isValidAddressForNetwork(address, "mainnet");
76
+ var validateBitcoinTestnetAddress = (address) => bitcoin.isValidAddressForNetwork(address, "testnet");
77
+ var validateBitcoinRegtestAddress = (address) => bitcoin.isValidAddressForNetwork(address, "regtest");
78
+ var validateSolanaAddress = isValidSolanaAddress;
79
+ var validateTronAddress = isValidTronAddress;
80
+ var validators = {
81
+ mainnet: {
82
+ Bitcoin: validateBitcoinMainnetAddress,
83
+ Ethereum: validateEvmAddress,
84
+ Arbitrum: validateEvmAddress,
85
+ Solana: validateSolanaAddress,
86
+ Assethub: validatePolkadotAddress,
87
+ Tron: validateTronAddress,
88
+ Bsc: validateEvmAddress
89
+ },
90
+ perseverance: {
91
+ Bitcoin: validateBitcoinTestnetAddress,
92
+ Ethereum: validateEvmAddress,
93
+ Arbitrum: validateEvmAddress,
94
+ Solana: validateSolanaAddress,
95
+ Assethub: validatePolkadotAddress,
96
+ Tron: validateTronAddress,
97
+ Bsc: validateEvmAddress
98
+ },
99
+ sisyphos: {
100
+ Bitcoin: validateBitcoinTestnetAddress,
101
+ Ethereum: validateEvmAddress,
102
+ Arbitrum: validateEvmAddress,
103
+ Solana: validateSolanaAddress,
104
+ Assethub: validatePolkadotAddress,
105
+ Tron: validateTronAddress,
106
+ Bsc: validateEvmAddress
107
+ },
108
+ backspin: {
109
+ Bitcoin: validateBitcoinRegtestAddress,
110
+ Ethereum: validateEvmAddress,
111
+ Arbitrum: validateEvmAddress,
112
+ Solana: validateSolanaAddress,
113
+ Assethub: validatePolkadotAddress,
114
+ Tron: validateTronAddress,
115
+ Bsc: validateEvmAddress
116
+ },
117
+ localnet: {
118
+ Bitcoin: validateBitcoinRegtestAddress,
119
+ Ethereum: validateEvmAddress,
120
+ Arbitrum: validateEvmAddress,
121
+ Solana: validateSolanaAddress,
122
+ Assethub: validatePolkadotAddress,
123
+ Tron: validateTronAddress,
124
+ Bsc: validateEvmAddress
125
+ }
126
+ };
127
+ var validateAddress = (chain2, address, network) => Object.hasOwn(validators, network) && Object.hasOwn(validators[network], chain2) && validators[network][chain2](address);
128
+
129
+ // ../shared/src/api/openAccountCreationDepositChannel.ts
130
+ var getAccountCreationDepositChannelSchema = (network) => z.object({
131
+ signatureData: z.object({
132
+ Ethereum: z.object({
133
+ signature: hexString,
134
+ signer: hexString,
135
+ sigType: z.literal("Eip712")
136
+ }).transform(({ sigType, ...rest }) => ({
137
+ sig_type: sigType,
138
+ ...rest
139
+ }))
140
+ }),
141
+ transactionMetadata: z.object({
142
+ nonce: u32,
143
+ expiryBlock: u32.positive()
144
+ }).transform(({ nonce, expiryBlock }) => ({
145
+ nonce,
146
+ expiry_block: expiryBlock
147
+ })),
148
+ asset: assetAndChain,
149
+ refundAddress: z.string(),
150
+ boostFeeBps: u16.optional().default(0)
151
+ }).superRefine(({ asset: asset2, refundAddress }, ctx) => {
152
+ if (!validateAddress(asset2.chain, refundAddress, network)) {
153
+ ctx.addIssue({
154
+ message: `Address "${refundAddress}" is not a valid "${asset2.chain}" address for "${network}"`,
155
+ code: z.ZodIssueCode.custom
156
+ });
157
+ }
158
+ });
159
+
160
+ // ../shared/src/strings.ts
161
+ var toCamelCase = (str) => str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
162
+
163
+ // ../shared/src/objects.ts
164
+ var transformKeysToCamelCase = (obj) => {
165
+ if (Array.isArray(obj)) {
166
+ return obj.map(transformKeysToCamelCase);
167
+ }
168
+ if (obj !== null && typeof obj === "object") {
169
+ return Object.fromEntries(
170
+ Object.entries(obj).map(([key, value]) => [
171
+ toCamelCase(key),
172
+ transformKeysToCamelCase(value)
173
+ ])
174
+ );
175
+ }
176
+ return obj;
177
+ };
83
178
  z.object({
84
179
  srcChain: chain,
85
180
  srcAsset: asset,
@@ -196,69 +291,6 @@ z.object({
196
291
  maxOraclePriceSlippage: basisPoints.nullish().transform((v) => v ?? null),
197
292
  refundCcmMetadata: ccmParamsSchema.nullish().optional().default(null)
198
293
  });
199
- var validatePolkadotAddress = (address) => {
200
- if (isHex(address)) return address.length === 66;
201
- try {
202
- ss58.decode(address);
203
- return true;
204
- } catch {
205
- return false;
206
- }
207
- };
208
- var validateEvmAddress = (address) => ethers.isAddress(address);
209
- var validateBitcoinMainnetAddress = (address) => bitcoin.isValidAddressForNetwork(address, "mainnet");
210
- var validateBitcoinTestnetAddress = (address) => bitcoin.isValidAddressForNetwork(address, "testnet");
211
- var validateBitcoinRegtestAddress = (address) => bitcoin.isValidAddressForNetwork(address, "regtest");
212
- var validateSolanaAddress = isValidSolanaAddress;
213
- var validateTronAddress = isValidTronAddress;
214
- var validators = {
215
- mainnet: {
216
- Bitcoin: validateBitcoinMainnetAddress,
217
- Ethereum: validateEvmAddress,
218
- Arbitrum: validateEvmAddress,
219
- Solana: validateSolanaAddress,
220
- Assethub: validatePolkadotAddress,
221
- Tron: validateTronAddress,
222
- Bsc: validateEvmAddress
223
- },
224
- perseverance: {
225
- Bitcoin: validateBitcoinTestnetAddress,
226
- Ethereum: validateEvmAddress,
227
- Arbitrum: validateEvmAddress,
228
- Solana: validateSolanaAddress,
229
- Assethub: validatePolkadotAddress,
230
- Tron: validateTronAddress,
231
- Bsc: validateEvmAddress
232
- },
233
- sisyphos: {
234
- Bitcoin: validateBitcoinTestnetAddress,
235
- Ethereum: validateEvmAddress,
236
- Arbitrum: validateEvmAddress,
237
- Solana: validateSolanaAddress,
238
- Assethub: validatePolkadotAddress,
239
- Tron: validateTronAddress,
240
- Bsc: validateEvmAddress
241
- },
242
- backspin: {
243
- Bitcoin: validateBitcoinRegtestAddress,
244
- Ethereum: validateEvmAddress,
245
- Arbitrum: validateEvmAddress,
246
- Solana: validateSolanaAddress,
247
- Assethub: validatePolkadotAddress,
248
- Tron: validateTronAddress,
249
- Bsc: validateEvmAddress
250
- },
251
- localnet: {
252
- Bitcoin: validateBitcoinRegtestAddress,
253
- Ethereum: validateEvmAddress,
254
- Arbitrum: validateEvmAddress,
255
- Solana: validateSolanaAddress,
256
- Assethub: validatePolkadotAddress,
257
- Tron: validateTronAddress,
258
- Bsc: validateEvmAddress
259
- }
260
- };
261
- var validateAddress = (chain2, address, network) => Object.hasOwn(validators, network) && Object.hasOwn(validators[network], chain2) && validators[network][chain2](address);
262
294
 
263
295
  // ../shared/src/broker.ts
264
296
  var transformedDcaParamsSchema = dcaParams.transform(
@@ -332,6 +364,7 @@ var getVaultSwapParameterEncodingRequestSchema = (network) => z.object({
332
364
  fillOrKillParams: transformedFokSchema,
333
365
  dcaParams: transformedDcaParamsSchema.optional(),
334
366
  extraParams: z.object({ seed: hexString.optional() }).optional(),
367
+ // TODO: remove after brokerAccount is deprecated
335
368
  brokerAccount: chainflipAddress.optional()
336
369
  }).superRefine((val, ctx) => {
337
370
  if (val.srcAddress && !validateAddress(val.srcAsset.chain, val.srcAddress, network)) {
@@ -457,6 +490,7 @@ var getParameterEncodingRequestSchema = (network) => z.object({
457
490
  affiliates: z.array(affiliateBroker).optional(),
458
491
  fillOrKillParams: transformedFokSchema,
459
492
  dcaParams: transformedDcaParamsSchema.optional(),
493
+ // TODO: remove after brokerAccount is deprecated
460
494
  brokerAccount: chainflipAddress.optional()
461
495
  }).superRefine(({ ...val }, ctx) => {
462
496
  if (val.srcAddress && !validateAddress(val.srcAsset.chain, val.srcAddress, network)) {
@@ -495,6 +529,22 @@ async function requestCfParametersEncoding(request, opts, network) {
495
529
  );
496
530
  return response;
497
531
  }
532
+ async function requestAccountCreationDepositAddress(request, opts, network) {
533
+ const client = new HttpClient(opts.url);
534
+ const params = getAccountCreationDepositChannelSchema(network).parse(request);
535
+ const response = await client.sendRequest(
536
+ "broker_request_account_creation_deposit_address",
537
+ params.signatureData,
538
+ params.transactionMetadata,
539
+ params.asset,
540
+ params.boostFeeBps,
541
+ params.refundAddress
542
+ );
543
+ return {
544
+ ...transformKeysToCamelCase(response),
545
+ address: formatBrokerDepositAddress(params.asset.chain, response.address)
546
+ };
547
+ }
498
548
  var MultiCache = class {
499
549
  constructor(fetchers) {
500
550
  this.fetchers = fetchers;
@@ -569,6 +619,17 @@ function parseFoKParams(params, quote) {
569
619
  return "refundAddress" in params ? { ...parsed, refundAddress: params.refundAddress } : parsed;
570
620
  }
571
621
  var isTestnet = (network) => network !== "mainnet";
622
+ function calculateExpiryTime(args) {
623
+ const { chainInfo, expiryBlock } = args;
624
+ if (chainInfo == null || expiryBlock == null) {
625
+ return null;
626
+ }
627
+ const remainingBlocks = Number(BigInt(expiryBlock) - BigInt(chainInfo.height));
628
+ const { blockTimeSeconds } = anyChainConstants[chainInfo.chain];
629
+ return new Date(
630
+ new Date(chainInfo.blockTrackedAt).getTime() + remainingBlocks * blockTimeSeconds * 1e3
631
+ );
632
+ }
572
633
  var MAX_SWAP_AMOUNT = 2n ** 128n - 1n;
573
634
  var validateSwapAmount = (env, asset2, amount) => {
574
635
  const minimumAmount = readAssetValue(env.ingressEgress.minimumDepositAmounts, asset2);
@@ -654,7 +715,7 @@ var getChainData = (chain2, network, env) => ({
654
715
 
655
716
  // package.json
656
717
  var package_default = {
657
- version: "2.3.3"};
718
+ version: "2.3.4-dev.1"};
658
719
 
659
720
  // src/swap/consts.ts
660
721
  var CF_SDK_VERSION_HEADERS = { "X-Chainflip-Sdk-Version": package_default.version };
@@ -724,6 +785,11 @@ var backendRequest = async (baseUrl, method, path, body) => {
724
785
  }
725
786
  return { status: res.status, body: await res.blob(), headers: res.headers };
726
787
  };
788
+ var apiError = (action, res) => {
789
+ const { body } = res;
790
+ const message = body && typeof body === "object" && "message" in body && typeof body.message === "string" ? `: ${body.message}` : "";
791
+ return new Error(`Failed to ${action} (${res.status})${message}`, { cause: res });
792
+ };
727
793
  var getNetworkInfo = async (baseUrl) => {
728
794
  const res = await backendRequest(baseUrl, "GET", "/api/networkInfo");
729
795
  assert(res.status === 200, "Failed to fetch network info");
@@ -731,32 +797,30 @@ var getNetworkInfo = async (baseUrl) => {
731
797
  };
732
798
  var openSwapDepositChannel = async (baseUrl, body) => {
733
799
  const res = await backendRequest(baseUrl, "POST", "/api/openSwapDepositChannel", body);
734
- assert(res.status === 201, "Failed to open swap deposit channel");
800
+ if (res.status !== 201) throw apiError("open swap deposit channel", res);
735
801
  return res.body;
736
802
  };
737
803
  var encodeVaultSwapData = async (baseUrl, body) => {
738
804
  const res = await backendRequest(baseUrl, "POST", "/api/encodeVaultSwapData", body);
739
- if (res.status !== 200) {
740
- throw new Error("Failed to encode vault swap data", { cause: res });
741
- }
805
+ if (res.status !== 200) throw apiError("encode vault swap data", res);
742
806
  return res.body;
743
807
  };
744
808
  var encodeCfParameters = async (baseUrl, body) => {
745
809
  const res = await backendRequest(baseUrl, "POST", "/api/encodeCfParameters", body);
746
- if (res.status !== 200) {
747
- throw new Error("Failed to encode cf parameters", { cause: res });
748
- }
810
+ if (res.status !== 200) throw apiError("encode cf parameters", res);
749
811
  return res.body;
750
812
  };
751
813
  var openAccountCreationDepositChannel = async (baseUrl, body) => {
752
814
  const res = await backendRequest(baseUrl, "POST", "/api/openAccountCreationDepositChannel", body);
753
- if (res.status !== 201) {
754
- throw new Error("Failed to request account creation deposit channel", { cause: res });
755
- }
815
+ if (res.status !== 201) throw apiError("open account creation deposit channel", res);
756
816
  return res.body;
757
817
  };
758
818
 
759
819
  // src/swap/sdk.ts
820
+ var BrokerName = {
821
+ ChainflipSwap: "swap.chainflip.io"
822
+ };
823
+ var brokerNames = Object.values(BrokerName);
760
824
  var assertQuoteValid = (quote) => {
761
825
  switch (quote.type) {
762
826
  case "REGULAR":
@@ -841,20 +905,60 @@ var SwapSDK = class {
841
905
  ]);
842
906
  return supportedAssets.map((asset2) => getAssetData(asset2, this.options.network, env)).filter((asset2) => !chain2 || asset2.chain === chain2);
843
907
  }
844
- // eslint-disable-next-line class-methods-use-this
845
- shouldTakeCommission() {
846
- return false;
908
+ resolveBroker(fees = {}) {
909
+ const { broker } = this.options;
910
+ assert(
911
+ !(broker && "name" in broker && "url" in broker),
912
+ "A broker can be set by url or name, not both"
913
+ );
914
+ if (broker && "name" in broker) {
915
+ assert(brokerNames.includes(broker.name), `Broker name "${broker.name}" is not supported`);
916
+ assert(
917
+ fees.brokerCommissionBps === void 0 && !fees.affiliates?.length,
918
+ `Broker commission and affiliates are not supported with the ${broker.name} broker`
919
+ );
920
+ }
921
+ return broker;
922
+ }
923
+ requireBroker(fees = {}) {
924
+ const broker = this.resolveBroker(fees);
925
+ assert(broker, "A broker url or name is required to open channels or encode swaps");
926
+ return broker;
927
+ }
928
+ // TODO: remove after brokerAccount is deprecated
929
+ resolveEncodingBroker(brokerAccount, fees) {
930
+ if (!brokerAccount) return this.requireBroker(fees);
931
+ assert(
932
+ !this.options.broker,
933
+ "Setting brokerAccount is not supported when the SDK is initialized with a broker"
934
+ );
935
+ return void 0;
936
+ }
937
+ async estimateExpiryTime(chain2, expiryBlock) {
938
+ try {
939
+ const { chainTracking } = await this.cache.read("networkInfo");
940
+ const chainInfo = chainTracking?.find((info) => info.chain === chain2);
941
+ return calculateExpiryTime({ chainInfo, expiryBlock })?.getTime();
942
+ } catch {
943
+ return void 0;
944
+ }
847
945
  }
848
- async getCommissionBps(brokerCommissionBps) {
849
- if (this.shouldTakeCommission()) {
850
- return (await this.cache.read("networkInfo")).cfBrokerCommissionBps;
946
+ async getCommissionBps({
947
+ brokerCommissionBps,
948
+ affiliateBrokers,
949
+ isOnChain
950
+ }) {
951
+ const broker = this.resolveBroker({ brokerCommissionBps, affiliates: affiliateBrokers });
952
+ if (!isOnChain && broker && "name" in broker && broker.name === BrokerName.ChainflipSwap) {
953
+ return this.getQuotedBrokerCommissionBps();
851
954
  }
852
955
  return brokerCommissionBps ?? 0;
853
956
  }
957
+ async getQuotedBrokerCommissionBps() {
958
+ return (await this.cache.read("networkInfo")).cfBrokerCommissionBps;
959
+ }
854
960
  async getQuoteV2(quoteRequest, options = {}) {
855
- const submitterBrokerCommissionBps = await this.getCommissionBps(
856
- quoteRequest.brokerCommissionBps
857
- );
961
+ const submitterBrokerCommissionBps = await this.getCommissionBps(quoteRequest);
858
962
  return getQuoteV2(
859
963
  this.options.backendUrl,
860
964
  {
@@ -941,8 +1045,9 @@ var SwapSDK = class {
941
1045
  fillOrKillParams: inputFoKParams,
942
1046
  affiliateBrokers: affiliates,
943
1047
  ccmParams,
944
- brokerCommissionBps: brokerCommissionBpsParam
1048
+ brokerCommissionBps
945
1049
  }) {
1050
+ const broker = this.requireBroker({ brokerCommissionBps, affiliates });
946
1051
  await this.validateSwapAmount(quote.srcAsset, BigInt(quote.depositAmount));
947
1052
  assertQuoteValid(quote);
948
1053
  assert(!quote.isVaultSwap, "Cannot open a deposit channel for a vault swap quote");
@@ -952,7 +1057,6 @@ var SwapSDK = class {
952
1057
  } else {
953
1058
  assert(!quote.ccmParams, "Cannot open regular channel for quote with CCM params");
954
1059
  }
955
- const brokerCommissionBps = await this.getCommissionBps(brokerCommissionBpsParam);
956
1060
  const depositAddressRequest = {
957
1061
  srcAsset: quote.srcAsset,
958
1062
  destAsset: quote.destAsset,
@@ -964,38 +1068,29 @@ var SwapSDK = class {
964
1068
  ccmParams,
965
1069
  amount: quote.depositAmount
966
1070
  };
967
- let response;
968
- if (this.options.broker) {
1071
+ let channel;
1072
+ if ("url" in broker) {
969
1073
  const result = await requestSwapDepositAddress(
970
- {
971
- ...depositAddressRequest,
972
- commissionBps: brokerCommissionBps,
973
- affiliates
974
- },
975
- { url: this.options.broker.url },
1074
+ { ...depositAddressRequest, commissionBps: brokerCommissionBps ?? 0, affiliates },
1075
+ broker,
976
1076
  this.options.network
977
1077
  );
978
- response = {
1078
+ channel = {
979
1079
  id: `${result.issuedBlock}-${quote.srcAsset.chain}-${result.channelId}`,
980
1080
  depositAddress: result.address,
981
- brokerCommissionBps,
1081
+ brokerCommissionBps: brokerCommissionBps ?? 0,
1082
+ maxBoostFeeBps: Number(depositAddressRequest.maxBoostFeeBps) || 0,
982
1083
  srcChainExpiryBlock: result.sourceChainExpiryBlock,
983
- maxBoostFeeBps: depositAddressRequest.maxBoostFeeBps,
1084
+ estimatedExpiryTime: await this.estimateExpiryTime(
1085
+ quote.srcAsset.chain,
1086
+ result.sourceChainExpiryBlock
1087
+ ),
984
1088
  channelOpeningFee: result.channelOpeningFee
985
1089
  };
986
1090
  } else {
987
- assert(
988
- !brokerCommissionBps || this.shouldTakeCommission(),
989
- "Broker commission is supported only when initializing the SDK with a brokerUrl"
990
- );
991
- assert(
992
- !affiliates?.length,
993
- "Affiliate brokers are supported only when initializing the SDK with a brokerUrl"
994
- );
995
- response = await openSwapDepositChannel(this.options.backendUrl, {
1091
+ channel = await openSwapDepositChannel(this.options.backendUrl, {
996
1092
  ...depositAddressRequest,
997
- quote,
998
- takeCommission: this.shouldTakeCommission()
1093
+ quote
999
1094
  });
1000
1095
  }
1001
1096
  return {
@@ -1004,14 +1099,14 @@ var SwapSDK = class {
1004
1099
  destAsset: quote.destAsset.asset,
1005
1100
  srcChain: quote.srcAsset.chain,
1006
1101
  destChain: quote.destAsset.chain,
1007
- depositChannelId: response.id,
1008
- depositAddress: response.depositAddress,
1009
- brokerCommissionBps: response.brokerCommissionBps,
1102
+ depositChannelId: channel.id,
1103
+ depositAddress: channel.depositAddress,
1104
+ brokerCommissionBps: channel.brokerCommissionBps,
1010
1105
  affiliateBrokers: affiliates ?? [],
1011
- maxBoostFeeBps: Number(response.maxBoostFeeBps) || 0,
1012
- depositChannelExpiryBlock: BigInt(response.srcChainExpiryBlock),
1013
- estimatedDepositChannelExpiryTime: response.estimatedExpiryTime,
1014
- channelOpeningFee: BigInt(response.channelOpeningFee),
1106
+ maxBoostFeeBps: channel.maxBoostFeeBps,
1107
+ depositChannelExpiryBlock: BigInt(channel.srcChainExpiryBlock),
1108
+ estimatedDepositChannelExpiryTime: channel.estimatedExpiryTime,
1109
+ channelOpeningFee: BigInt(channel.channelOpeningFee),
1015
1110
  fillOrKillParams: inputFoKParams
1016
1111
  };
1017
1112
  }
@@ -1023,9 +1118,10 @@ var SwapSDK = class {
1023
1118
  affiliateBrokers: affiliates,
1024
1119
  ccmParams,
1025
1120
  brokerAccount,
1026
- brokerCommissionBps: brokerCommissionBpsParam,
1121
+ brokerCommissionBps,
1027
1122
  extraParams
1028
1123
  }) {
1124
+ const broker = this.resolveEncodingBroker(brokerAccount, { brokerCommissionBps, affiliates });
1029
1125
  await this.validateSwapAmount(quote.srcAsset, BigInt(quote.depositAmount));
1030
1126
  assertQuoteValid(quote);
1031
1127
  assert(quote.isVaultSwap, "Cannot encode vault swap data for non-vault swap quotes");
@@ -1034,7 +1130,6 @@ var SwapSDK = class {
1034
1130
  } else {
1035
1131
  assert(!quote.ccmParams, "Cannot encode regular swap for quote with CCM params");
1036
1132
  }
1037
- const brokerCommissionBps = await this.getCommissionBps(brokerCommissionBpsParam);
1038
1133
  const vaultSwapRequest = {
1039
1134
  srcAsset: quote.srcAsset,
1040
1135
  destAsset: quote.destAsset,
@@ -1046,30 +1141,16 @@ var SwapSDK = class {
1046
1141
  fillOrKillParams: parseFoKParams(inputFoKParams, quote),
1047
1142
  dcaParams: quote.type === "DCA" ? quote.dcaParams : void 0,
1048
1143
  extraParams,
1049
- brokerAccount,
1050
1144
  commissionBps: brokerCommissionBps,
1051
1145
  affiliates
1052
1146
  };
1053
- if (this.options.broker) {
1054
- assert(
1055
- !vaultSwapRequest.brokerAccount,
1056
- "Cannot overwrite broker account when initializing the SDK with a brokerUrl"
1057
- );
1058
- return requestSwapParameterEncoding(
1059
- vaultSwapRequest,
1060
- { url: this.options.broker.url },
1061
- this.options.network
1062
- );
1147
+ if (broker && "url" in broker) {
1148
+ return requestSwapParameterEncoding(vaultSwapRequest, broker, this.options.network);
1063
1149
  }
1064
- assert(
1065
- !vaultSwapRequest.commissionBps || vaultSwapRequest.brokerAccount || this.shouldTakeCommission(),
1066
- "Broker commission is supported only when setting a broker account"
1067
- );
1068
- assert(
1069
- !vaultSwapRequest.affiliates?.length || vaultSwapRequest.brokerAccount,
1070
- "Affiliate brokers are supported only when setting a broker account"
1150
+ const body = await encodeVaultSwapData(
1151
+ this.options.backendUrl,
1152
+ brokerAccount ? { ...vaultSwapRequest, brokerAccount, commissionBps: brokerCommissionBps ?? 0 } : { ...vaultSwapRequest, commissionBps: await this.getQuotedBrokerCommissionBps() }
1071
1153
  );
1072
- const body = await encodeVaultSwapData(this.options.backendUrl, vaultSwapRequest);
1073
1154
  switch (body.chain) {
1074
1155
  case "Arbitrum":
1075
1156
  case "Ethereum":
@@ -1090,6 +1171,7 @@ var SwapSDK = class {
1090
1171
  brokerAccount,
1091
1172
  brokerCommissionBps
1092
1173
  }) {
1174
+ const broker = this.resolveEncodingBroker(brokerAccount, { brokerCommissionBps, affiliates });
1093
1175
  await this.validateSwapAmount(quote.srcAsset, BigInt(quote.depositAmount));
1094
1176
  assertQuoteValid(quote);
1095
1177
  if (ccmParams) {
@@ -1107,45 +1189,52 @@ var SwapSDK = class {
1107
1189
  maxBoostFeeBps: "maxBoostFeeBps" in quote ? quote.maxBoostFeeBps : void 0,
1108
1190
  fillOrKillParams: parseFoKParams(fillOrKillParams2, quote),
1109
1191
  dcaParams: quote.type === "DCA" ? quote.dcaParams : void 0,
1110
- commissionBps: await this.getCommissionBps(brokerCommissionBps),
1192
+ commissionBps: brokerCommissionBps,
1111
1193
  affiliates
1112
1194
  };
1113
- if (this.options.broker) {
1114
- assert(
1115
- !brokerAccount,
1116
- "Cannot overwrite broker account when initializing the SDK with a brokerUrl"
1117
- );
1118
- return requestCfParametersEncoding(
1119
- requestParams,
1120
- { url: this.options.broker.url },
1121
- this.options.network
1122
- );
1195
+ if (broker && "url" in broker) {
1196
+ return requestCfParametersEncoding(requestParams, broker, this.options.network);
1123
1197
  }
1124
- assert(
1125
- !requestParams.commissionBps || brokerAccount || this.shouldTakeCommission(),
1126
- "Broker commission is supported only when setting a broker account"
1127
- );
1128
- assert(
1129
- !requestParams.affiliates?.length || brokerAccount,
1130
- "Affiliate brokers are supported only when setting a broker account"
1198
+ return encodeCfParameters(
1199
+ this.options.backendUrl,
1200
+ brokerAccount ? { ...requestParams, brokerAccount, commissionBps: brokerCommissionBps ?? 0 } : { ...requestParams, commissionBps: await this.getQuotedBrokerCommissionBps() }
1131
1201
  );
1132
- return encodeCfParameters(this.options.backendUrl, {
1133
- ...requestParams,
1134
- brokerAccount
1135
- });
1136
1202
  }
1137
1203
  async checkBoostEnabled() {
1138
1204
  const { assets } = await this.cache.read("networkInfo");
1139
1205
  return assets.find((a) => a.asset === "Btc")?.boostDepositsEnabled ?? true;
1140
1206
  }
1141
1207
  async requestAccountCreationDepositAddress(asset2, refundAddress, signatureData, transactionMetadata, boostFeeBps = 0) {
1142
- return openAccountCreationDepositChannel(this.options.backendUrl, {
1143
- asset: internalAssetToRpcAsset[asset2],
1208
+ const broker = this.requireBroker();
1209
+ const rpcAsset = internalAssetToRpcAsset[asset2];
1210
+ const request = {
1211
+ asset: rpcAsset,
1144
1212
  refundAddress,
1145
1213
  signatureData,
1146
1214
  transactionMetadata,
1147
1215
  boostFeeBps
1148
- });
1216
+ };
1217
+ if ("url" in broker) {
1218
+ const result = await requestAccountCreationDepositAddress(
1219
+ request,
1220
+ broker,
1221
+ this.options.network
1222
+ );
1223
+ return {
1224
+ id: `${result.issuedBlock}-${rpcAsset.chain}-${result.channelId}`,
1225
+ depositAddress: result.address,
1226
+ brokerCommissionBps: 0,
1227
+ maxBoostFeeBps: boostFeeBps,
1228
+ issuedBlock: result.issuedBlock,
1229
+ srcChainExpiryBlock: result.depositChainExpiryBlock.toString(),
1230
+ estimatedExpiryTime: await this.estimateExpiryTime(
1231
+ rpcAsset.chain,
1232
+ result.depositChainExpiryBlock
1233
+ ),
1234
+ channelOpeningFee: result.channelOpeningFee.toString()
1235
+ };
1236
+ }
1237
+ return openAccountCreationDepositChannel(this.options.backendUrl, request);
1149
1238
  }
1150
1239
  };
1151
1240
  var arrayToMap = (array) => Object.fromEntries(array.map((item) => [item, item]));
@@ -1154,4 +1243,4 @@ var InternalAssets = arrayToMap(chainflipAssets);
1154
1243
  var Chains = arrayToMap(chainflipChains);
1155
1244
  var Assets = arrayToMap(assetSymbols);
1156
1245
 
1157
- export { Assets, InternalAssets as ChainflipIds, ChainflipNetworks, Chains, SwapSDK };
1246
+ export { Assets, BrokerName, InternalAssets as ChainflipIds, ChainflipNetworks, Chains, SwapSDK };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@chainflip/sdk",
3
- "version": "2.3.3",
3
+ "version": "2.3.4-dev.1",
4
4
  "description": "",
5
5
  "exports": {
6
6
  "./swap": {