@chainflip/sdk 1.5.1 → 1.6.0-alpha.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.
@@ -1,5 +1,5 @@
1
- import { z, assetAndChain, numericString, hexString, btcAddress, ccmParamsSchema, affiliateBroker, fillOrKillParams, dotAddress, ethereumAddress } from './chunk-HWJAHLL7.mjs';
2
- import { __name, Chains } from './chunk-3V7QJANN.mjs';
1
+ import { z, assetAndChain, numericString, hexString, btcAddress, solanaAddress, ccmParamsSchema, affiliateBroker, fillOrKillParams, dcaParams, dotAddress, ethereumAddress } from './chunk-NKAH7KWJ.mjs';
2
+ import { __name, Chains } from './chunk-EBZERIHA.mjs';
3
3
  import { HttpClient } from '@chainflip/rpc';
4
4
  import * as ss58 from '@chainflip/utils/ss58';
5
5
 
@@ -15,18 +15,14 @@ var validateRequest = /* @__PURE__ */ __name((network, params) => z.tuple([
15
15
  z.union([
16
16
  numericString,
17
17
  hexString,
18
- btcAddress(network)
18
+ btcAddress(network),
19
+ solanaAddress
19
20
  ]),
20
21
  z.number(),
21
- ccmParamsSchema.merge(z.object({
22
- cfParameters: z.union([
23
- hexString,
24
- z.string()
25
- ]).optional()
26
- })).transform(({ message, ...rest }) => ({
22
+ ccmParamsSchema.transform(({ message, ...rest }) => ({
27
23
  message,
28
24
  cf_parameters: rest.cfParameters,
29
- gas_budget: `0x${BigInt(rest.gasBudget).toString(16)}`
25
+ gas_budget: rest.gasBudget
30
26
  })).optional(),
31
27
  z.number().optional(),
32
28
  z.array(affiliateBroker).optional(),
@@ -34,13 +30,18 @@ var validateRequest = /* @__PURE__ */ __name((network, params) => z.tuple([
34
30
  retry_duration: retryDurationBlocks,
35
31
  refund_address: refundAddress,
36
32
  min_price: `0x${BigInt(minPriceX128).toString(16)}`
33
+ })).optional(),
34
+ dcaParams.transform(({ numberOfChunks, chunkInterval }) => ({
35
+ number_of_chunks: numberOfChunks,
36
+ chunk_interval: chunkInterval
37
37
  })).optional()
38
38
  ]).parse(params), "validateRequest");
39
39
  var validateResponse = /* @__PURE__ */ __name((network, response) => z.object({
40
40
  address: z.union([
41
41
  dotAddress,
42
42
  ethereumAddress,
43
- btcAddress(network)
43
+ btcAddress(network),
44
+ solanaAddress
44
45
  ]),
45
46
  issued_block: z.number(),
46
47
  channel_id: z.number(),
@@ -54,7 +55,7 @@ var validateResponse = /* @__PURE__ */ __name((network, response) => z.object({
54
55
  channelOpeningFee: channel_opening_fee
55
56
  })).parse(response), "validateResponse");
56
57
  async function requestSwapDepositAddress(swapRequest, opts, chainflipNetwork) {
57
- const { srcAsset, srcChain, destAsset, destChain, destAddress, maxBoostFeeBps } = swapRequest;
58
+ const { srcAsset, srcChain, destAsset, destChain, destAddress } = swapRequest;
58
59
  const client = new HttpClient(opts.url);
59
60
  const params = validateRequest(chainflipNetwork, [
60
61
  {
@@ -67,15 +68,15 @@ async function requestSwapDepositAddress(swapRequest, opts, chainflipNetwork) {
67
68
  },
68
69
  submitAddress(destChain, destAddress),
69
70
  swapRequest.commissionBps ?? 0,
70
- swapRequest.ccmParams && {
71
- ...swapRequest.ccmParams,
72
- cfParameters: void 0
73
- },
74
- maxBoostFeeBps,
71
+ swapRequest.ccmParams,
72
+ swapRequest.maxBoostFeeBps,
75
73
  swapRequest.affiliates,
76
74
  swapRequest.fillOrKillParams && {
77
75
  ...swapRequest.fillOrKillParams,
78
76
  refundAddress: submitAddress(srcChain, swapRequest.fillOrKillParams.refundAddress)
77
+ },
78
+ swapRequest.dcaParams && {
79
+ ...swapRequest.dcaParams
79
80
  }
80
81
  ]);
81
82
  const response = await client.sendRequest("broker_requestSwapDepositAddress", ...params);
@@ -1,4 +1,4 @@
1
- import { getInternalAsset, __name, __publicField, ChainflipNetworks, Chains, InternalAssets } from './chunk-3V7QJANN.mjs';
1
+ import { getInternalAsset, __name, __publicField, ChainflipNetworks, Chains, InternalAssets } from './chunk-EBZERIHA.mjs';
2
2
  import { constants, HttpClient } from '@chainflip/rpc';
3
3
  import { Interface, Contract } from 'ethers';
4
4
 
@@ -2049,7 +2049,9 @@ var ADDRESSES = {
2049
2049
  ARBUSDC_CONTRACT_ADDRESS: "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
2050
2050
  VAULT_CONTRACT_ADDRESS: "0xB7A5bd0345EF1Cc5E66bf61BdeC17D2461fBd968",
2051
2051
  STATE_CHAIN_GATEWAY_ADDRESS: "0xeEBe00Ac0756308ac4AaBfD76c05c4F3088B8883",
2052
- ARB_VAULT_CONTRACT_ADDRESS: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
2052
+ ARB_VAULT_CONTRACT_ADDRESS: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
2053
+ // TODO(solana)
2054
+ SOLUSDC_CONTRACT_ADDRESS: ""
2053
2055
  },
2054
2056
  [ChainflipNetworks.sisyphos]: {
2055
2057
  FLIP_CONTRACT_ADDRESS: "0xcD079EAB6B5443b545788Fd210C8800FEADd87fa",
@@ -2058,7 +2060,8 @@ var ADDRESSES = {
2058
2060
  ARBUSDC_CONTRACT_ADDRESS: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
2059
2061
  VAULT_CONTRACT_ADDRESS: "0xa94d6b1853F3cb611Ed3cCb701b4fdA5a9DACe85",
2060
2062
  STATE_CHAIN_GATEWAY_ADDRESS: "0x1F7fE41C798cc7b1D34BdC8de2dDDA4a4bE744D9",
2061
- ARB_VAULT_CONTRACT_ADDRESS: "0x8155BdD48CD011e1118b51A1C82be020A3E5c2f2"
2063
+ ARB_VAULT_CONTRACT_ADDRESS: "0x8155BdD48CD011e1118b51A1C82be020A3E5c2f2",
2064
+ SOLUSDC_CONTRACT_ADDRESS: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
2062
2065
  },
2063
2066
  [ChainflipNetworks.perseverance]: {
2064
2067
  FLIP_CONTRACT_ADDRESS: "0xdC27c60956cB065D19F08bb69a707E37b36d8086",
@@ -2067,7 +2070,8 @@ var ADDRESSES = {
2067
2070
  ARBUSDC_CONTRACT_ADDRESS: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
2068
2071
  VAULT_CONTRACT_ADDRESS: "0x36eaD71325604DC15d35FAE584D7b50646D81753",
2069
2072
  STATE_CHAIN_GATEWAY_ADDRESS: "0xA34a967197Ee90BB7fb28e928388a573c5CFd099",
2070
- ARB_VAULT_CONTRACT_ADDRESS: "0x2bb150e6d4366A1BDBC4275D1F35892CD63F27e3"
2073
+ ARB_VAULT_CONTRACT_ADDRESS: "0x2bb150e6d4366A1BDBC4275D1F35892CD63F27e3",
2074
+ SOLUSDC_CONTRACT_ADDRESS: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
2071
2075
  },
2072
2076
  [ChainflipNetworks.mainnet]: {
2073
2077
  FLIP_CONTRACT_ADDRESS: "0x826180541412D574cf1336d22c0C0a287822678A",
@@ -2076,7 +2080,8 @@ var ADDRESSES = {
2076
2080
  ARBUSDC_CONTRACT_ADDRESS: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
2077
2081
  VAULT_CONTRACT_ADDRESS: "0xF5e10380213880111522dd0efD3dbb45b9f62Bcc",
2078
2082
  STATE_CHAIN_GATEWAY_ADDRESS: "0x6995Ab7c4D7F4B03f467Cf4c8E920427d9621DBd",
2079
- ARB_VAULT_CONTRACT_ADDRESS: "0x79001a5e762f3bEFC8e5871b42F6734e00498920"
2083
+ ARB_VAULT_CONTRACT_ADDRESS: "0x79001a5e762f3bEFC8e5871b42F6734e00498920",
2084
+ SOLUSDC_CONTRACT_ADDRESS: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
2080
2085
  }
2081
2086
  };
2082
2087
 
@@ -2090,6 +2095,7 @@ function getTokenContractAddress(asset, network) {
2090
2095
  if (asset === InternalAssets.Usdc) return ADDRESSES[network].USDC_CONTRACT_ADDRESS;
2091
2096
  if (asset === InternalAssets.Usdt) return ADDRESSES[network].USDT_CONTRACT_ADDRESS;
2092
2097
  if (asset === InternalAssets.ArbUsdc) return ADDRESSES[network].ARBUSDC_CONTRACT_ADDRESS;
2098
+ if (asset === InternalAssets.SolUsdc) return ADDRESSES[network].SOLUSDC_CONTRACT_ADDRESS;
2093
2099
  throw new Error(`No contract address for ${asset} on ${network}`);
2094
2100
  }
2095
2101
  __name(getTokenContractAddress, "getTokenContractAddress");
@@ -16,13 +16,16 @@ var InternalAssets = arrayToMap([
16
16
  "Btc",
17
17
  "Usdt",
18
18
  "ArbUsdc",
19
- "ArbEth"
19
+ "ArbEth",
20
+ "Sol",
21
+ "SolUsdc"
20
22
  ]);
21
23
  var Chains = arrayToMap([
22
24
  "Bitcoin",
23
25
  "Ethereum",
24
26
  "Polkadot",
25
- "Arbitrum"
27
+ "Arbitrum",
28
+ "Solana"
26
29
  ]);
27
30
  var Assets = arrayToMap([
28
31
  "FLIP",
@@ -30,7 +33,8 @@ var Assets = arrayToMap([
30
33
  "DOT",
31
34
  "ETH",
32
35
  "BTC",
33
- "USDT"
36
+ "USDT",
37
+ "SOL"
34
38
  ]);
35
39
  var ChainflipNetworks = arrayToMap([
36
40
  "backspin",
@@ -95,6 +99,20 @@ var assetConstants = {
95
99
  name: "Arbitrum USDC",
96
100
  decimals: 6,
97
101
  contractId: 7
102
+ },
103
+ [InternalAssets.Sol]: {
104
+ chain: Chains.Solana,
105
+ asset: Assets.SOL,
106
+ name: "Solana",
107
+ decimals: 9,
108
+ contractId: 9
109
+ },
110
+ [InternalAssets.SolUsdc]: {
111
+ chain: Chains.Solana,
112
+ asset: Assets.USDC,
113
+ name: "Solana USDC",
114
+ decimals: 6,
115
+ contractId: 10
98
116
  }
99
117
  };
100
118
  var chainConstants = {
@@ -133,6 +151,15 @@ var chainConstants = {
133
151
  gasAsset: Assets.ETH,
134
152
  contractId: 4,
135
153
  blockTimeSeconds: 0.26
154
+ },
155
+ [Chains.Solana]: {
156
+ assets: [
157
+ Assets.SOL,
158
+ Assets.USDC
159
+ ],
160
+ gasAsset: Assets.SOL,
161
+ contractId: 5,
162
+ blockTimeSeconds: (400 + 800) / 2 / 1e3
136
163
  }
137
164
  };
138
165
  function isValidAssetAndChain(assetAndChain) {
@@ -170,6 +197,10 @@ function getInternalAsset(asset, assert2 = true) {
170
197
  [Chains.Arbitrum]: {
171
198
  [Assets.USDC]: InternalAssets.ArbUsdc,
172
199
  [Assets.ETH]: InternalAssets.ArbEth
200
+ },
201
+ [Chains.Solana]: {
202
+ [Assets.SOL]: InternalAssets.Sol,
203
+ [Assets.USDC]: InternalAssets.SolUsdc
173
204
  }
174
205
  };
175
206
  const chain = map[asset.chain];
@@ -1,7 +1,10 @@
1
- import { __name, isString, InternalAssets, Chains, Assets, ChainflipNetworks, isValidAssetAndChain, getInternalAssets, assert } from './chunk-3V7QJANN.mjs';
1
+ import { __name, isString, InternalAssets, Chains, Assets, ChainflipNetworks, isValidAssetAndChain, getInternalAssets, assert } from './chunk-EBZERIHA.mjs';
2
+ import * as base58 from '@chainflip/utils/base58';
3
+ import { hexToBytes } from '@chainflip/utils/bytes';
2
4
  import * as ss582 from '@chainflip/utils/ss58';
3
5
  import '@chainflip/utils/string';
4
6
  import * as ethers from 'ethers';
7
+ import { hexEncodeNumber } from '@chainflip/utils/number';
5
8
 
6
9
  // ../../node_modules/.pnpm/zod@3.23.8/node_modules/zod/lib/index.mjs
7
10
  var util;
@@ -4223,6 +4226,14 @@ var networkToBitcoinNetwork = /* @__PURE__ */ __name((network) => {
4223
4226
  }
4224
4227
  }, "networkToBitcoinNetwork");
4225
4228
  var isValidAddressForNetwork2 = /* @__PURE__ */ __name((address, network) => Bitcoin.isValidAddressForNetwork(address, networkToBitcoinNetwork(network)), "isValidAddressForNetwork2");
4229
+ var isValidSolanaAddress = /* @__PURE__ */ __name((address) => {
4230
+ try {
4231
+ const bytes = base58.decode(address);
4232
+ return bytes.length === 32;
4233
+ } catch (e) {
4234
+ return false;
4235
+ }
4236
+ }, "isValidSolanaAddress");
4226
4237
  var validatePolkadotAddress = /* @__PURE__ */ __name((address) => {
4227
4238
  try {
4228
4239
  ss582.decode(address);
@@ -4235,36 +4246,42 @@ var validateEvmAddress = /* @__PURE__ */ __name((address) => ethers.isAddress(ad
4235
4246
  var validateBitcoinMainnetAddress = /* @__PURE__ */ __name((address) => isValidAddressForNetwork2(address, "mainnet"), "validateBitcoinMainnetAddress");
4236
4247
  var validateBitcoinTestnetAddress = /* @__PURE__ */ __name((address) => isValidAddressForNetwork2(address, "testnet"), "validateBitcoinTestnetAddress");
4237
4248
  var validateBitcoinRegtestAddress = /* @__PURE__ */ __name((address) => isValidAddressForNetwork2(address, "regtest"), "validateBitcoinRegtestAddress");
4249
+ var validateSolanaAddress = isValidSolanaAddress;
4238
4250
  var validators = {
4239
4251
  mainnet: {
4240
4252
  Bitcoin: validateBitcoinMainnetAddress,
4241
4253
  Ethereum: validateEvmAddress,
4242
4254
  Polkadot: validatePolkadotAddress,
4243
- Arbitrum: validateEvmAddress
4255
+ Arbitrum: validateEvmAddress,
4256
+ Solana: validateSolanaAddress
4244
4257
  },
4245
4258
  perseverance: {
4246
4259
  Bitcoin: validateBitcoinTestnetAddress,
4247
4260
  Ethereum: validateEvmAddress,
4248
4261
  Polkadot: validatePolkadotAddress,
4249
- Arbitrum: validateEvmAddress
4262
+ Arbitrum: validateEvmAddress,
4263
+ Solana: validateSolanaAddress
4250
4264
  },
4251
4265
  sisyphos: {
4252
4266
  Bitcoin: validateBitcoinTestnetAddress,
4253
4267
  Ethereum: validateEvmAddress,
4254
4268
  Polkadot: validatePolkadotAddress,
4255
- Arbitrum: validateEvmAddress
4269
+ Arbitrum: validateEvmAddress,
4270
+ Solana: validateSolanaAddress
4256
4271
  },
4257
4272
  backspin: {
4258
4273
  Bitcoin: validateBitcoinRegtestAddress,
4259
4274
  Ethereum: validateEvmAddress,
4260
4275
  Polkadot: validatePolkadotAddress,
4261
- Arbitrum: validateEvmAddress
4276
+ Arbitrum: validateEvmAddress,
4277
+ Solana: validateSolanaAddress
4262
4278
  },
4263
4279
  localnet: {
4264
4280
  Bitcoin: validateBitcoinRegtestAddress,
4265
4281
  Ethereum: validateEvmAddress,
4266
4282
  Polkadot: validatePolkadotAddress,
4267
- Arbitrum: validateEvmAddress
4283
+ Arbitrum: validateEvmAddress,
4284
+ Solana: validateSolanaAddress
4268
4285
  }
4269
4286
  };
4270
4287
  var assertValidAddress = /* @__PURE__ */ __name((chain2, address, network) => assert(validators[network][chain2](address), `Address "${address}" is not a valid "${chain2}" address for "${network}"`), "assertValidAddress");
@@ -4325,10 +4342,13 @@ var dotAddress = z.union([
4325
4342
  message: `address is not a valid polkadot address`
4326
4343
  });
4327
4344
  var ethereumAddress = hexString.refine((address) => ethers.isAddress(address), (address) => ({
4328
- message: `${address} is not a valid ethereum address`
4345
+ message: `${address} is not a valid Ethereum address`
4329
4346
  }));
4330
4347
  var chainflipAddress = string.refine((address) => address.startsWith("cF") && ss582.decode(address), (address) => ({
4331
- message: `${address} is not a valid chainflip address`
4348
+ message: `${address} is not a valid Chainflip address`
4349
+ }));
4350
+ var solanaAddress = string.refine(isValidSolanaAddress, (address) => ({
4351
+ message: `${address} is not a valid Solana address`
4332
4352
  }));
4333
4353
  numericString.transform((arg) => BigInt(arg));
4334
4354
  var u128 = z.union([
@@ -4404,8 +4424,7 @@ z.union([
4404
4424
  prewitnessedDepositId: u128
4405
4425
  })
4406
4426
  ]);
4407
-
4408
- // ../shared/src/schemas.ts
4427
+ hexString.transform((value) => base58.encode(hexToBytes(value)));
4409
4428
  z.object({
4410
4429
  srcChain: chain,
4411
4430
  srcAsset: asset,
@@ -4443,8 +4462,13 @@ z.object({
4443
4462
  };
4444
4463
  });
4445
4464
  var ccmParamsSchema = z.object({
4446
- gasBudget: numericString,
4447
- message: hexStringWithMaxByteSize(1024 * 10)
4465
+ gasBudget: z.union([
4466
+ numericString,
4467
+ hexString
4468
+ ]).transform((n) => hexEncodeNumber(BigInt(n))),
4469
+ message: hexStringWithMaxByteSize(1024 * 10),
4470
+ // TODO(solana): update max size when it is known
4471
+ cfParameters: hexStringWithMaxByteSize(1024 * 10).optional()
4448
4472
  });
4449
4473
  var affiliateBroker = z.object({
4450
4474
  account: chainflipAddress,
@@ -4453,6 +4477,10 @@ var affiliateBroker = z.object({
4453
4477
  account,
4454
4478
  bps
4455
4479
  }));
4480
+ var dcaParams = z.object({
4481
+ numberOfChunks: number,
4482
+ chunkInterval: number
4483
+ });
4456
4484
  var fillOrKillParams = z.object({
4457
4485
  retryDurationBlocks: number,
4458
4486
  refundAddress: z.string(),
@@ -4469,10 +4497,14 @@ z.object({
4469
4497
  ccmParams: ccmParamsSchema.optional(),
4470
4498
  maxBoostFeeBps: z.number().optional(),
4471
4499
  srcAddress: z.string().optional(),
4472
- fillOrKillParams: fillOrKillParams.optional()
4500
+ fillOrKillParams: fillOrKillParams.optional(),
4501
+ dcaParams: z.object({
4502
+ numberOfChunks: z.number(),
4503
+ chunkInterval: z.number()
4504
+ }).optional()
4473
4505
  }).transform(({ amount, ...rest }) => ({
4474
4506
  ...rest,
4475
4507
  expectedDepositAmount: amount
4476
4508
  }));
4477
4509
 
4478
- export { affiliateBroker, assertValidAddress, assetAndChain, btcAddress, ccmParamsSchema, dotAddress, ethereumAddress, fillOrKillParams, hexString, numericString, z };
4510
+ export { affiliateBroker, assertValidAddress, assetAndChain, btcAddress, ccmParamsSchema, dcaParams, dotAddress, ethereumAddress, fillOrKillParams, hexString, numericString, solanaAddress, z };
@@ -1,11 +1,11 @@
1
1
  type ArrayToMap<T extends readonly string[]> = {
2
2
  [K in T[number]]: K;
3
3
  };
4
- declare const InternalAssets: ArrayToMap<readonly ["Flip", "Usdc", "Dot", "Eth", "Btc", "Usdt", "ArbUsdc", "ArbEth"]>;
4
+ declare const InternalAssets: ArrayToMap<readonly ["Flip", "Usdc", "Dot", "Eth", "Btc", "Usdt", "ArbUsdc", "ArbEth", "Sol", "SolUsdc"]>;
5
5
  type InternalAsset = (typeof InternalAssets)[keyof typeof InternalAssets];
6
- declare const Chains: ArrayToMap<readonly ["Bitcoin", "Ethereum", "Polkadot", "Arbitrum"]>;
6
+ declare const Chains: ArrayToMap<readonly ["Bitcoin", "Ethereum", "Polkadot", "Arbitrum", "Solana"]>;
7
7
  type Chain = (typeof Chains)[keyof typeof Chains];
8
- declare const Assets: ArrayToMap<readonly ["FLIP", "USDC", "DOT", "ETH", "BTC", "USDT"]>;
8
+ declare const Assets: ArrayToMap<readonly ["FLIP", "USDC", "DOT", "ETH", "BTC", "USDT", "SOL"]>;
9
9
  type Asset = (typeof Assets)[keyof typeof Assets];
10
10
  declare const ChainflipNetworks: ArrayToMap<readonly ["backspin", "sisyphos", "perseverance", "mainnet"]>;
11
11
  type ChainflipNetwork = (typeof ChainflipNetworks)[keyof typeof ChainflipNetworks];
@@ -34,6 +34,12 @@ declare const chainConstants: {
34
34
  readonly contractId: 4;
35
35
  readonly blockTimeSeconds: 0.26;
36
36
  };
37
+ readonly Solana: {
38
+ readonly assets: ["SOL", "USDC"];
39
+ readonly gasAsset: "SOL";
40
+ readonly contractId: 5;
41
+ readonly blockTimeSeconds: number;
42
+ };
37
43
  };
38
44
  type AssetOfChain<C extends Chain> = (typeof chainConstants)[C]['assets'][number];
39
45
  type UncheckedAssetAndChain = {
@@ -1,11 +1,11 @@
1
1
  type ArrayToMap<T extends readonly string[]> = {
2
2
  [K in T[number]]: K;
3
3
  };
4
- declare const InternalAssets: ArrayToMap<readonly ["Flip", "Usdc", "Dot", "Eth", "Btc", "Usdt", "ArbUsdc", "ArbEth"]>;
4
+ declare const InternalAssets: ArrayToMap<readonly ["Flip", "Usdc", "Dot", "Eth", "Btc", "Usdt", "ArbUsdc", "ArbEth", "Sol", "SolUsdc"]>;
5
5
  type InternalAsset = (typeof InternalAssets)[keyof typeof InternalAssets];
6
- declare const Chains: ArrayToMap<readonly ["Bitcoin", "Ethereum", "Polkadot", "Arbitrum"]>;
6
+ declare const Chains: ArrayToMap<readonly ["Bitcoin", "Ethereum", "Polkadot", "Arbitrum", "Solana"]>;
7
7
  type Chain = (typeof Chains)[keyof typeof Chains];
8
- declare const Assets: ArrayToMap<readonly ["FLIP", "USDC", "DOT", "ETH", "BTC", "USDT"]>;
8
+ declare const Assets: ArrayToMap<readonly ["FLIP", "USDC", "DOT", "ETH", "BTC", "USDT", "SOL"]>;
9
9
  type Asset = (typeof Assets)[keyof typeof Assets];
10
10
  declare const ChainflipNetworks: ArrayToMap<readonly ["backspin", "sisyphos", "perseverance", "mainnet"]>;
11
11
  type ChainflipNetwork = (typeof ChainflipNetworks)[keyof typeof ChainflipNetworks];
@@ -34,6 +34,12 @@ declare const chainConstants: {
34
34
  readonly contractId: 4;
35
35
  readonly blockTimeSeconds: 0.26;
36
36
  };
37
+ readonly Solana: {
38
+ readonly assets: ["SOL", "USDC"];
39
+ readonly gasAsset: "SOL";
40
+ readonly contractId: 5;
41
+ readonly blockTimeSeconds: number;
42
+ };
37
43
  };
38
44
  type AssetOfChain<C extends Chain> = (typeof chainConstants)[C]['assets'][number];
39
45
  type UncheckedAssetAndChain = {
@@ -1,5 +1,5 @@
1
1
  import { Signer } from 'ethers';
2
- import { c as ChainflipNetwork, T as TransactionOptions } from './contracts-Cb-5VdIi.mjs';
2
+ import { c as ChainflipNetwork, T as TransactionOptions } from './contracts-DmShvHR7.mjs';
3
3
 
4
4
  type PendingRedemption = {
5
5
  amount: bigint;
package/dist/funding.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Signer } from 'ethers';
2
- import { c as ChainflipNetwork, T as TransactionOptions } from './contracts-Cb-5VdIi.js';
2
+ import { c as ChainflipNetwork, T as TransactionOptions } from './contracts-DmShvHR7.js';
3
3
 
4
4
  type PendingRedemption = {
5
5
  amount: bigint;
package/dist/funding.js CHANGED
@@ -772,13 +772,16 @@ var InternalAssets = arrayToMap([
772
772
  "Btc",
773
773
  "Usdt",
774
774
  "ArbUsdc",
775
- "ArbEth"
775
+ "ArbEth",
776
+ "Sol",
777
+ "SolUsdc"
776
778
  ]);
777
779
  var Chains = arrayToMap([
778
780
  "Bitcoin",
779
781
  "Ethereum",
780
782
  "Polkadot",
781
- "Arbitrum"
783
+ "Arbitrum",
784
+ "Solana"
782
785
  ]);
783
786
  var Assets = arrayToMap([
784
787
  "FLIP",
@@ -786,7 +789,8 @@ var Assets = arrayToMap([
786
789
  "DOT",
787
790
  "ETH",
788
791
  "BTC",
789
- "USDT"
792
+ "USDT",
793
+ "SOL"
790
794
  ]);
791
795
  var ChainflipNetworks = arrayToMap([
792
796
  "backspin",
@@ -850,6 +854,20 @@ var ChainflipNetworks = arrayToMap([
850
854
  name: "Arbitrum USDC",
851
855
  decimals: 6,
852
856
  contractId: 7
857
+ },
858
+ [InternalAssets.Sol]: {
859
+ chain: Chains.Solana,
860
+ asset: Assets.SOL,
861
+ name: "Solana",
862
+ decimals: 9,
863
+ contractId: 9
864
+ },
865
+ [InternalAssets.SolUsdc]: {
866
+ chain: Chains.Solana,
867
+ asset: Assets.USDC,
868
+ name: "Solana USDC",
869
+ decimals: 6,
870
+ contractId: 10
853
871
  }
854
872
  });
855
873
  var chainConstants = {
@@ -888,6 +906,15 @@ var chainConstants = {
888
906
  gasAsset: Assets.ETH,
889
907
  contractId: 4,
890
908
  blockTimeSeconds: 0.26
909
+ },
910
+ [Chains.Solana]: {
911
+ assets: [
912
+ Assets.SOL,
913
+ Assets.USDC
914
+ ],
915
+ gasAsset: Assets.SOL,
916
+ contractId: 5,
917
+ blockTimeSeconds: (400 + 800) / 2 / 1e3
891
918
  }
892
919
  };
893
920
  function isValidAssetAndChain(assetAndChain) {
@@ -920,6 +947,10 @@ function getInternalAsset(asset, assert2 = true) {
920
947
  [Chains.Arbitrum]: {
921
948
  [Assets.USDC]: InternalAssets.ArbUsdc,
922
949
  [Assets.ETH]: InternalAssets.ArbEth
950
+ },
951
+ [Chains.Solana]: {
952
+ [Assets.SOL]: InternalAssets.Sol,
953
+ [Assets.USDC]: InternalAssets.SolUsdc
923
954
  }
924
955
  };
925
956
  const chain = map[asset.chain];
@@ -956,7 +987,9 @@ var ADDRESSES = {
956
987
  ARBUSDC_CONTRACT_ADDRESS: "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
957
988
  VAULT_CONTRACT_ADDRESS: "0xB7A5bd0345EF1Cc5E66bf61BdeC17D2461fBd968",
958
989
  STATE_CHAIN_GATEWAY_ADDRESS: "0xeEBe00Ac0756308ac4AaBfD76c05c4F3088B8883",
959
- ARB_VAULT_CONTRACT_ADDRESS: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
990
+ ARB_VAULT_CONTRACT_ADDRESS: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
991
+ // TODO(solana)
992
+ SOLUSDC_CONTRACT_ADDRESS: ""
960
993
  },
961
994
  [ChainflipNetworks.sisyphos]: {
962
995
  FLIP_CONTRACT_ADDRESS: "0xcD079EAB6B5443b545788Fd210C8800FEADd87fa",
@@ -965,7 +998,8 @@ var ADDRESSES = {
965
998
  ARBUSDC_CONTRACT_ADDRESS: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
966
999
  VAULT_CONTRACT_ADDRESS: "0xa94d6b1853F3cb611Ed3cCb701b4fdA5a9DACe85",
967
1000
  STATE_CHAIN_GATEWAY_ADDRESS: "0x1F7fE41C798cc7b1D34BdC8de2dDDA4a4bE744D9",
968
- ARB_VAULT_CONTRACT_ADDRESS: "0x8155BdD48CD011e1118b51A1C82be020A3E5c2f2"
1001
+ ARB_VAULT_CONTRACT_ADDRESS: "0x8155BdD48CD011e1118b51A1C82be020A3E5c2f2",
1002
+ SOLUSDC_CONTRACT_ADDRESS: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
969
1003
  },
970
1004
  [ChainflipNetworks.perseverance]: {
971
1005
  FLIP_CONTRACT_ADDRESS: "0xdC27c60956cB065D19F08bb69a707E37b36d8086",
@@ -974,7 +1008,8 @@ var ADDRESSES = {
974
1008
  ARBUSDC_CONTRACT_ADDRESS: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
975
1009
  VAULT_CONTRACT_ADDRESS: "0x36eaD71325604DC15d35FAE584D7b50646D81753",
976
1010
  STATE_CHAIN_GATEWAY_ADDRESS: "0xA34a967197Ee90BB7fb28e928388a573c5CFd099",
977
- ARB_VAULT_CONTRACT_ADDRESS: "0x2bb150e6d4366A1BDBC4275D1F35892CD63F27e3"
1011
+ ARB_VAULT_CONTRACT_ADDRESS: "0x2bb150e6d4366A1BDBC4275D1F35892CD63F27e3",
1012
+ SOLUSDC_CONTRACT_ADDRESS: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
978
1013
  },
979
1014
  [ChainflipNetworks.mainnet]: {
980
1015
  FLIP_CONTRACT_ADDRESS: "0x826180541412D574cf1336d22c0C0a287822678A",
@@ -983,7 +1018,8 @@ var ADDRESSES = {
983
1018
  ARBUSDC_CONTRACT_ADDRESS: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
984
1019
  VAULT_CONTRACT_ADDRESS: "0xF5e10380213880111522dd0efD3dbb45b9f62Bcc",
985
1020
  STATE_CHAIN_GATEWAY_ADDRESS: "0x6995Ab7c4D7F4B03f467Cf4c8E920427d9621DBd",
986
- ARB_VAULT_CONTRACT_ADDRESS: "0x79001a5e762f3bEFC8e5871b42F6734e00498920"
1021
+ ARB_VAULT_CONTRACT_ADDRESS: "0x79001a5e762f3bEFC8e5871b42F6734e00498920",
1022
+ SOLUSDC_CONTRACT_ADDRESS: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
987
1023
  }
988
1024
  };
989
1025
 
@@ -997,6 +1033,7 @@ function getTokenContractAddress(asset, network) {
997
1033
  if (asset === InternalAssets.Usdc) return ADDRESSES[network].USDC_CONTRACT_ADDRESS;
998
1034
  if (asset === InternalAssets.Usdt) return ADDRESSES[network].USDT_CONTRACT_ADDRESS;
999
1035
  if (asset === InternalAssets.ArbUsdc) return ADDRESSES[network].ARBUSDC_CONTRACT_ADDRESS;
1036
+ if (asset === InternalAssets.SolUsdc) return ADDRESSES[network].SOLUSDC_CONTRACT_ADDRESS;
1000
1037
  throw new Error(`No contract address for ${asset} on ${network}`);
1001
1038
  }
1002
1039
  __name(getTokenContractAddress, "getTokenContractAddress");
package/dist/funding.mjs CHANGED
@@ -1,5 +1,5 @@
1
- import { getFlipBalance, getFundingEnvironment, getStateChainGatewayContractAddress, approve, getTokenContractAddress, checkAllowance, extractOverrides, StateChainGateway__factory } from './chunk-M32JHS3U.mjs';
2
- import { __name, __publicField, ChainflipNetworks, InternalAssets, assert } from './chunk-3V7QJANN.mjs';
1
+ import { getFlipBalance, getFundingEnvironment, getStateChainGatewayContractAddress, approve, getTokenContractAddress, checkAllowance, extractOverrides, StateChainGateway__factory } from './chunk-AXKJJ3VI.mjs';
2
+ import { __name, __publicField, ChainflipNetworks, InternalAssets, assert } from './chunk-EBZERIHA.mjs';
3
3
 
4
4
  // ../shared/src/stateChainGateway/utils.ts
5
5
  var getStateChainGateway = /* @__PURE__ */ __name((networkOpts) => {
package/dist/swap.d.mts CHANGED
@@ -1,19 +1,22 @@
1
1
  import { Signer } from 'ethers';
2
- import { A as AssetAndChain, C as Chain, a as Asset, I as InternalAsset, b as AssetOfChain, c as ChainflipNetwork, T as TransactionOptions, d as ChainAssetMap, e as ChainMap } from './contracts-Cb-5VdIi.mjs';
3
- export { g as Assets, h as ChainflipIds, i as ChainflipNetworks, f as Chains, U as UncheckedAssetAndChain, j as getChainflipId } from './contracts-Cb-5VdIi.mjs';
2
+ import { A as AssetAndChain, C as Chain, a as Asset, I as InternalAsset, b as AssetOfChain, c as ChainflipNetwork, T as TransactionOptions, d as ChainAssetMap, e as ChainMap } from './contracts-DmShvHR7.mjs';
3
+ export { g as Assets, h as ChainflipIds, i as ChainflipNetworks, f as Chains, U as UncheckedAssetAndChain, j as getChainflipId } from './contracts-DmShvHR7.mjs';
4
4
  import { z } from 'zod';
5
5
 
6
6
  declare const ccmParamsSchema: z.ZodObject<{
7
- gasBudget: z.ZodString;
7
+ gasBudget: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `0x${string}`, string>;
8
8
  message: z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>;
9
+ cfParameters: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>>;
9
10
  }, "strip", z.ZodTypeAny, {
10
11
  message: `0x${string}`;
11
- gasBudget: string;
12
+ gasBudget: `0x${string}`;
13
+ cfParameters?: `0x${string}` | undefined;
12
14
  }, {
13
15
  message: string;
14
16
  gasBudget: string;
17
+ cfParameters?: string | undefined;
15
18
  }>;
16
- type CcmParams = z.infer<typeof ccmParamsSchema>;
19
+ type CcmParams = z.input<typeof ccmParamsSchema>;
17
20
  declare const affiliateBroker: z.ZodEffects<z.ZodObject<{
18
21
  account: z.ZodEffects<z.ZodString, string, string>;
19
22
  commissionBps: z.ZodNumber;
@@ -48,6 +51,10 @@ type FillOrKillParamsX128 = z.input<typeof fillOrKillParams>;
48
51
  type FillOrKillParams = Omit<FillOrKillParamsX128, 'minPriceX128'> & {
49
52
  minPrice: string;
50
53
  };
54
+ type DcaParams = {
55
+ numberOfChunks: number;
56
+ chunkInterval: number;
57
+ };
51
58
  type Fee<T> = {
52
59
  type: T;
53
60
  chain: Chain;
@@ -131,6 +138,7 @@ interface DepositAddressRequest extends QuoteRequest {
131
138
  maxBoostFeeBps?: number;
132
139
  srcAddress?: string;
133
140
  fillOrKillParams?: FillOrKillParams;
141
+ dcaParams?: DcaParams;
134
142
  ccmMetadata?: CcmParams;
135
143
  }
136
144
  interface DepositAddressResponse extends DepositAddressRequest {
package/dist/swap.d.ts CHANGED
@@ -1,19 +1,22 @@
1
1
  import { Signer } from 'ethers';
2
- import { A as AssetAndChain, C as Chain, a as Asset, I as InternalAsset, b as AssetOfChain, c as ChainflipNetwork, T as TransactionOptions, d as ChainAssetMap, e as ChainMap } from './contracts-Cb-5VdIi.js';
3
- export { g as Assets, h as ChainflipIds, i as ChainflipNetworks, f as Chains, U as UncheckedAssetAndChain, j as getChainflipId } from './contracts-Cb-5VdIi.js';
2
+ import { A as AssetAndChain, C as Chain, a as Asset, I as InternalAsset, b as AssetOfChain, c as ChainflipNetwork, T as TransactionOptions, d as ChainAssetMap, e as ChainMap } from './contracts-DmShvHR7.js';
3
+ export { g as Assets, h as ChainflipIds, i as ChainflipNetworks, f as Chains, U as UncheckedAssetAndChain, j as getChainflipId } from './contracts-DmShvHR7.js';
4
4
  import { z } from 'zod';
5
5
 
6
6
  declare const ccmParamsSchema: z.ZodObject<{
7
- gasBudget: z.ZodString;
7
+ gasBudget: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `0x${string}`, string>;
8
8
  message: z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>;
9
+ cfParameters: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>>;
9
10
  }, "strip", z.ZodTypeAny, {
10
11
  message: `0x${string}`;
11
- gasBudget: string;
12
+ gasBudget: `0x${string}`;
13
+ cfParameters?: `0x${string}` | undefined;
12
14
  }, {
13
15
  message: string;
14
16
  gasBudget: string;
17
+ cfParameters?: string | undefined;
15
18
  }>;
16
- type CcmParams = z.infer<typeof ccmParamsSchema>;
19
+ type CcmParams = z.input<typeof ccmParamsSchema>;
17
20
  declare const affiliateBroker: z.ZodEffects<z.ZodObject<{
18
21
  account: z.ZodEffects<z.ZodString, string, string>;
19
22
  commissionBps: z.ZodNumber;
@@ -48,6 +51,10 @@ type FillOrKillParamsX128 = z.input<typeof fillOrKillParams>;
48
51
  type FillOrKillParams = Omit<FillOrKillParamsX128, 'minPriceX128'> & {
49
52
  minPrice: string;
50
53
  };
54
+ type DcaParams = {
55
+ numberOfChunks: number;
56
+ chunkInterval: number;
57
+ };
51
58
  type Fee<T> = {
52
59
  type: T;
53
60
  chain: Chain;
@@ -131,6 +138,7 @@ interface DepositAddressRequest extends QuoteRequest {
131
138
  maxBoostFeeBps?: number;
132
139
  srcAddress?: string;
133
140
  fillOrKillParams?: FillOrKillParams;
141
+ dcaParams?: DcaParams;
134
142
  ccmMetadata?: CcmParams;
135
143
  }
136
144
  interface DepositAddressResponse extends DepositAddressRequest {
package/dist/swap.js CHANGED
@@ -1,10 +1,12 @@
1
1
  'use strict';
2
2
 
3
+ var base58 = require('@chainflip/utils/base58');
3
4
  var ss582 = require('@chainflip/utils/ss58');
4
5
  var ethers = require('ethers');
5
- require('@chainflip/utils/string');
6
- var rpc = require('@chainflip/rpc');
7
6
  var bytes = require('@chainflip/utils/bytes');
7
+ var string$1 = require('@chainflip/utils/string');
8
+ var number$1 = require('@chainflip/utils/number');
9
+ var rpc = require('@chainflip/rpc');
8
10
  var axios = require('axios');
9
11
 
10
12
  function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -27,6 +29,7 @@ function _interopNamespace(e) {
27
29
  return Object.freeze(n);
28
30
  }
29
31
 
32
+ var base58__namespace = /*#__PURE__*/_interopNamespace(base58);
30
33
  var ss582__namespace = /*#__PURE__*/_interopNamespace(ss582);
31
34
  var ethers__namespace = /*#__PURE__*/_interopNamespace(ethers);
32
35
  var axios__default = /*#__PURE__*/_interopDefault(axios);
@@ -74,6 +77,10 @@ function getInternalAsset(asset2, assert2 = true) {
74
77
  [exports.Chains.Arbitrum]: {
75
78
  [exports.Assets.USDC]: exports.ChainflipIds.ArbUsdc,
76
79
  [exports.Assets.ETH]: exports.ChainflipIds.ArbEth
80
+ },
81
+ [exports.Chains.Solana]: {
82
+ [exports.Assets.SOL]: exports.ChainflipIds.Sol,
83
+ [exports.Assets.USDC]: exports.ChainflipIds.SolUsdc
77
84
  }
78
85
  };
79
86
  const chain2 = map[asset2.chain];
@@ -119,13 +126,16 @@ var init_enums = __esm({
119
126
  "Btc",
120
127
  "Usdt",
121
128
  "ArbUsdc",
122
- "ArbEth"
129
+ "ArbEth",
130
+ "Sol",
131
+ "SolUsdc"
123
132
  ]);
124
133
  exports.Chains = arrayToMap([
125
134
  "Bitcoin",
126
135
  "Ethereum",
127
136
  "Polkadot",
128
- "Arbitrum"
137
+ "Arbitrum",
138
+ "Solana"
129
139
  ]);
130
140
  exports.Assets = arrayToMap([
131
141
  "FLIP",
@@ -133,7 +143,8 @@ var init_enums = __esm({
133
143
  "DOT",
134
144
  "ETH",
135
145
  "BTC",
136
- "USDT"
146
+ "USDT",
147
+ "SOL"
137
148
  ]);
138
149
  exports.ChainflipNetworks = arrayToMap([
139
150
  "backspin",
@@ -198,6 +209,20 @@ var init_enums = __esm({
198
209
  name: "Arbitrum USDC",
199
210
  decimals: 6,
200
211
  contractId: 7
212
+ },
213
+ [exports.ChainflipIds.Sol]: {
214
+ chain: exports.Chains.Solana,
215
+ asset: exports.Assets.SOL,
216
+ name: "Solana",
217
+ decimals: 9,
218
+ contractId: 9
219
+ },
220
+ [exports.ChainflipIds.SolUsdc]: {
221
+ chain: exports.Chains.Solana,
222
+ asset: exports.Assets.USDC,
223
+ name: "Solana USDC",
224
+ decimals: 6,
225
+ contractId: 10
201
226
  }
202
227
  };
203
228
  chainConstants = {
@@ -236,6 +261,15 @@ var init_enums = __esm({
236
261
  gasAsset: exports.Assets.ETH,
237
262
  contractId: 4,
238
263
  blockTimeSeconds: 0.26
264
+ },
265
+ [exports.Chains.Solana]: {
266
+ assets: [
267
+ exports.Assets.SOL,
268
+ exports.Assets.USDC
269
+ ],
270
+ gasAsset: exports.Assets.SOL,
271
+ contractId: 5,
272
+ blockTimeSeconds: (400 + 800) / 2 / 1e3
239
273
  }
240
274
  };
241
275
  __name(isValidAssetAndChain, "isValidAssetAndChain");
@@ -477,6 +511,26 @@ var init_dist = __esm({
477
511
  isValidAddressForNetwork2 = /* @__PURE__ */ __name((address, network) => Bitcoin.isValidAddressForNetwork(address, networkToBitcoinNetwork(network)), "isValidAddressForNetwork2");
478
512
  }
479
513
  });
514
+ var isValidSolanaAddress;
515
+ var init_address = __esm({
516
+ "../../node_modules/.pnpm/@chainflip+solana@1.0.2/node_modules/@chainflip/solana/dist/address.mjs"() {
517
+ isValidSolanaAddress = /* @__PURE__ */ __name((address) => {
518
+ try {
519
+ const bytes = base58__namespace.decode(address);
520
+ return bytes.length === 32;
521
+ } catch (e) {
522
+ return false;
523
+ }
524
+ }, "isValidSolanaAddress");
525
+ }
526
+ });
527
+
528
+ // ../../node_modules/.pnpm/@chainflip+solana@1.0.2/node_modules/@chainflip/solana/dist/index.mjs
529
+ var init_dist2 = __esm({
530
+ "../../node_modules/.pnpm/@chainflip+solana@1.0.2/node_modules/@chainflip/solana/dist/index.mjs"() {
531
+ init_address();
532
+ }
533
+ });
480
534
 
481
535
  // ../../node_modules/.pnpm/zod@3.23.8/node_modules/zod/lib/index.mjs
482
536
  function setErrorMap(map) {
@@ -4491,10 +4545,11 @@ var init_lib = __esm({
4491
4545
  });
4492
4546
  }
4493
4547
  });
4494
- var validatePolkadotAddress, validateEvmAddress, validateBitcoinMainnetAddress, validateBitcoinTestnetAddress, validateBitcoinRegtestAddress, validators, assertValidAddress;
4548
+ var validatePolkadotAddress, validateEvmAddress, validateBitcoinMainnetAddress, validateBitcoinTestnetAddress, validateBitcoinRegtestAddress, validateSolanaAddress, validators, assertValidAddress;
4495
4549
  var init_addressValidation = __esm({
4496
4550
  "../shared/src/validation/addressValidation.ts"() {
4497
4551
  init_dist();
4552
+ init_address();
4498
4553
  init_guards();
4499
4554
  validatePolkadotAddress = /* @__PURE__ */ __name((address) => {
4500
4555
  try {
@@ -4508,45 +4563,52 @@ var init_addressValidation = __esm({
4508
4563
  validateBitcoinMainnetAddress = /* @__PURE__ */ __name((address) => isValidAddressForNetwork2(address, "mainnet"), "validateBitcoinMainnetAddress");
4509
4564
  validateBitcoinTestnetAddress = /* @__PURE__ */ __name((address) => isValidAddressForNetwork2(address, "testnet"), "validateBitcoinTestnetAddress");
4510
4565
  validateBitcoinRegtestAddress = /* @__PURE__ */ __name((address) => isValidAddressForNetwork2(address, "regtest"), "validateBitcoinRegtestAddress");
4566
+ validateSolanaAddress = isValidSolanaAddress;
4511
4567
  validators = {
4512
4568
  mainnet: {
4513
4569
  Bitcoin: validateBitcoinMainnetAddress,
4514
4570
  Ethereum: validateEvmAddress,
4515
4571
  Polkadot: validatePolkadotAddress,
4516
- Arbitrum: validateEvmAddress
4572
+ Arbitrum: validateEvmAddress,
4573
+ Solana: validateSolanaAddress
4517
4574
  },
4518
4575
  perseverance: {
4519
4576
  Bitcoin: validateBitcoinTestnetAddress,
4520
4577
  Ethereum: validateEvmAddress,
4521
4578
  Polkadot: validatePolkadotAddress,
4522
- Arbitrum: validateEvmAddress
4579
+ Arbitrum: validateEvmAddress,
4580
+ Solana: validateSolanaAddress
4523
4581
  },
4524
4582
  sisyphos: {
4525
4583
  Bitcoin: validateBitcoinTestnetAddress,
4526
4584
  Ethereum: validateEvmAddress,
4527
4585
  Polkadot: validatePolkadotAddress,
4528
- Arbitrum: validateEvmAddress
4586
+ Arbitrum: validateEvmAddress,
4587
+ Solana: validateSolanaAddress
4529
4588
  },
4530
4589
  backspin: {
4531
4590
  Bitcoin: validateBitcoinRegtestAddress,
4532
4591
  Ethereum: validateEvmAddress,
4533
4592
  Polkadot: validatePolkadotAddress,
4534
- Arbitrum: validateEvmAddress
4593
+ Arbitrum: validateEvmAddress,
4594
+ Solana: validateSolanaAddress
4535
4595
  },
4536
4596
  localnet: {
4537
4597
  Bitcoin: validateBitcoinRegtestAddress,
4538
4598
  Ethereum: validateEvmAddress,
4539
4599
  Polkadot: validatePolkadotAddress,
4540
- Arbitrum: validateEvmAddress
4600
+ Arbitrum: validateEvmAddress,
4601
+ Solana: validateSolanaAddress
4541
4602
  }
4542
4603
  };
4543
4604
  assertValidAddress = /* @__PURE__ */ __name((chain2, address, network) => assert(validators[network][chain2](address), `Address "${address}" is not a valid "${chain2}" address for "${network}"`), "assertValidAddress");
4544
4605
  }
4545
4606
  });
4546
- var enumValues, safeStringify, errorMap2, string, number, numericString, numericOrEmptyString, hexString, hexStringWithMaxByteSize, btcAddress, DOT_PREFIX, dotAddress, ethereumAddress, chainflipAddress, u128, unsignedInteger, rustEnum, chain, asset, uncheckedAssetAndChain, assetAndChain, chainflipSS58Prefix;
4607
+ var enumValues, safeStringify, errorMap2, string, number, numericString, numericOrEmptyString, hexString, hexStringWithMaxByteSize, btcAddress, DOT_PREFIX, dotAddress, ethereumAddress, chainflipAddress, solanaAddress, u128, unsignedInteger, rustEnum, chain, asset, uncheckedAssetAndChain, assetAndChain, chainflipSS58Prefix;
4547
4608
  var init_parsers = __esm({
4548
4609
  "../shared/src/parsers.ts"() {
4549
4610
  init_dist();
4611
+ init_dist2();
4550
4612
  init_lib();
4551
4613
  init_enums();
4552
4614
  init_guards();
@@ -4606,10 +4668,13 @@ var init_parsers = __esm({
4606
4668
  message: `address is not a valid polkadot address`
4607
4669
  });
4608
4670
  ethereumAddress = hexString.refine((address) => ethers__namespace.isAddress(address), (address) => ({
4609
- message: `${address} is not a valid ethereum address`
4671
+ message: `${address} is not a valid Ethereum address`
4610
4672
  }));
4611
4673
  chainflipAddress = string.refine((address) => address.startsWith("cF") && ss582__namespace.decode(address), (address) => ({
4612
- message: `${address} is not a valid chainflip address`
4674
+ message: `${address} is not a valid Chainflip address`
4675
+ }));
4676
+ solanaAddress = string.refine(isValidSolanaAddress, (address) => ({
4677
+ message: `${address} is not a valid Solana address`
4613
4678
  }));
4614
4679
  numericString.transform((arg) => BigInt(arg));
4615
4680
  u128 = z.union([
@@ -4685,11 +4750,10 @@ var init_parsers = __esm({
4685
4750
  prewitnessedDepositId: u128
4686
4751
  })
4687
4752
  ]);
4753
+ hexString.transform((value) => base58__namespace.encode(bytes.hexToBytes(value)));
4688
4754
  }
4689
4755
  });
4690
-
4691
- // ../shared/src/schemas.ts
4692
- var ccmParamsSchema, affiliateBroker, fillOrKillParams;
4756
+ var ccmParamsSchema, affiliateBroker, dcaParams, fillOrKillParams;
4693
4757
  var init_schemas = __esm({
4694
4758
  "../shared/src/schemas.ts"() {
4695
4759
  init_lib();
@@ -4732,8 +4796,13 @@ var init_schemas = __esm({
4732
4796
  };
4733
4797
  });
4734
4798
  ccmParamsSchema = z.object({
4735
- gasBudget: numericString,
4736
- message: hexStringWithMaxByteSize(1024 * 10)
4799
+ gasBudget: z.union([
4800
+ numericString,
4801
+ hexString
4802
+ ]).transform((n) => number$1.hexEncodeNumber(BigInt(n))),
4803
+ message: hexStringWithMaxByteSize(1024 * 10),
4804
+ // TODO(solana): update max size when it is known
4805
+ cfParameters: hexStringWithMaxByteSize(1024 * 10).optional()
4737
4806
  });
4738
4807
  affiliateBroker = z.object({
4739
4808
  account: chainflipAddress,
@@ -4742,6 +4811,10 @@ var init_schemas = __esm({
4742
4811
  account,
4743
4812
  bps
4744
4813
  }));
4814
+ dcaParams = z.object({
4815
+ numberOfChunks: number,
4816
+ chunkInterval: number
4817
+ });
4745
4818
  fillOrKillParams = z.object({
4746
4819
  retryDurationBlocks: number,
4747
4820
  refundAddress: z.string(),
@@ -4758,7 +4831,11 @@ var init_schemas = __esm({
4758
4831
  ccmParams: ccmParamsSchema.optional(),
4759
4832
  maxBoostFeeBps: z.number().optional(),
4760
4833
  srcAddress: z.string().optional(),
4761
- fillOrKillParams: fillOrKillParams.optional()
4834
+ fillOrKillParams: fillOrKillParams.optional(),
4835
+ dcaParams: z.object({
4836
+ numberOfChunks: z.number(),
4837
+ chunkInterval: z.number()
4838
+ }).optional()
4762
4839
  }).transform(({ amount, ...rest }) => ({
4763
4840
  ...rest,
4764
4841
  expectedDepositAmount: amount
@@ -4772,7 +4849,7 @@ __export(broker_exports, {
4772
4849
  requestSwapDepositAddress: () => requestSwapDepositAddress
4773
4850
  });
4774
4851
  async function requestSwapDepositAddress(swapRequest, opts, chainflipNetwork2) {
4775
- const { srcAsset, srcChain, destAsset, destChain, destAddress, maxBoostFeeBps } = swapRequest;
4852
+ const { srcAsset, srcChain, destAsset, destChain, destAddress } = swapRequest;
4776
4853
  const client = new rpc.HttpClient(opts.url);
4777
4854
  const params = validateRequest(chainflipNetwork2, [
4778
4855
  {
@@ -4785,15 +4862,15 @@ async function requestSwapDepositAddress(swapRequest, opts, chainflipNetwork2) {
4785
4862
  },
4786
4863
  submitAddress(destChain, destAddress),
4787
4864
  swapRequest.commissionBps ?? 0,
4788
- swapRequest.ccmParams && {
4789
- ...swapRequest.ccmParams,
4790
- cfParameters: void 0
4791
- },
4792
- maxBoostFeeBps,
4865
+ swapRequest.ccmParams,
4866
+ swapRequest.maxBoostFeeBps,
4793
4867
  swapRequest.affiliates,
4794
4868
  swapRequest.fillOrKillParams && {
4795
4869
  ...swapRequest.fillOrKillParams,
4796
4870
  refundAddress: submitAddress(srcChain, swapRequest.fillOrKillParams.refundAddress)
4871
+ },
4872
+ swapRequest.dcaParams && {
4873
+ ...swapRequest.dcaParams
4797
4874
  }
4798
4875
  ]);
4799
4876
  const response = await client.sendRequest("broker_requestSwapDepositAddress", ...params);
@@ -4818,18 +4895,14 @@ var init_broker = __esm({
4818
4895
  z.union([
4819
4896
  numericString,
4820
4897
  hexString,
4821
- btcAddress(network)
4898
+ btcAddress(network),
4899
+ solanaAddress
4822
4900
  ]),
4823
4901
  z.number(),
4824
- ccmParamsSchema.merge(z.object({
4825
- cfParameters: z.union([
4826
- hexString,
4827
- z.string()
4828
- ]).optional()
4829
- })).transform(({ message, ...rest }) => ({
4902
+ ccmParamsSchema.transform(({ message, ...rest }) => ({
4830
4903
  message,
4831
4904
  cf_parameters: rest.cfParameters,
4832
- gas_budget: `0x${BigInt(rest.gasBudget).toString(16)}`
4905
+ gas_budget: rest.gasBudget
4833
4906
  })).optional(),
4834
4907
  z.number().optional(),
4835
4908
  z.array(affiliateBroker).optional(),
@@ -4837,13 +4910,18 @@ var init_broker = __esm({
4837
4910
  retry_duration: retryDurationBlocks,
4838
4911
  refund_address: refundAddress,
4839
4912
  min_price: `0x${BigInt(minPriceX128).toString(16)}`
4913
+ })).optional(),
4914
+ dcaParams.transform(({ numberOfChunks, chunkInterval }) => ({
4915
+ number_of_chunks: numberOfChunks,
4916
+ chunk_interval: chunkInterval
4840
4917
  })).optional()
4841
4918
  ]).parse(params), "validateRequest");
4842
4919
  validateResponse = /* @__PURE__ */ __name((network, response) => z.object({
4843
4920
  address: z.union([
4844
4921
  dotAddress,
4845
4922
  ethereumAddress,
4846
- btcAddress(network)
4923
+ btcAddress(network),
4924
+ solanaAddress
4847
4925
  ]),
4848
4926
  issued_block: z.number(),
4849
4927
  channel_id: z.number(),
@@ -9802,7 +9880,9 @@ var ADDRESSES = {
9802
9880
  ARBUSDC_CONTRACT_ADDRESS: "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
9803
9881
  VAULT_CONTRACT_ADDRESS: "0xB7A5bd0345EF1Cc5E66bf61BdeC17D2461fBd968",
9804
9882
  STATE_CHAIN_GATEWAY_ADDRESS: "0xeEBe00Ac0756308ac4AaBfD76c05c4F3088B8883",
9805
- ARB_VAULT_CONTRACT_ADDRESS: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
9883
+ ARB_VAULT_CONTRACT_ADDRESS: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
9884
+ // TODO(solana)
9885
+ SOLUSDC_CONTRACT_ADDRESS: ""
9806
9886
  },
9807
9887
  [exports.ChainflipNetworks.sisyphos]: {
9808
9888
  FLIP_CONTRACT_ADDRESS: "0xcD079EAB6B5443b545788Fd210C8800FEADd87fa",
@@ -9811,7 +9891,8 @@ var ADDRESSES = {
9811
9891
  ARBUSDC_CONTRACT_ADDRESS: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
9812
9892
  VAULT_CONTRACT_ADDRESS: "0xa94d6b1853F3cb611Ed3cCb701b4fdA5a9DACe85",
9813
9893
  STATE_CHAIN_GATEWAY_ADDRESS: "0x1F7fE41C798cc7b1D34BdC8de2dDDA4a4bE744D9",
9814
- ARB_VAULT_CONTRACT_ADDRESS: "0x8155BdD48CD011e1118b51A1C82be020A3E5c2f2"
9894
+ ARB_VAULT_CONTRACT_ADDRESS: "0x8155BdD48CD011e1118b51A1C82be020A3E5c2f2",
9895
+ SOLUSDC_CONTRACT_ADDRESS: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
9815
9896
  },
9816
9897
  [exports.ChainflipNetworks.perseverance]: {
9817
9898
  FLIP_CONTRACT_ADDRESS: "0xdC27c60956cB065D19F08bb69a707E37b36d8086",
@@ -9820,7 +9901,8 @@ var ADDRESSES = {
9820
9901
  ARBUSDC_CONTRACT_ADDRESS: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
9821
9902
  VAULT_CONTRACT_ADDRESS: "0x36eaD71325604DC15d35FAE584D7b50646D81753",
9822
9903
  STATE_CHAIN_GATEWAY_ADDRESS: "0xA34a967197Ee90BB7fb28e928388a573c5CFd099",
9823
- ARB_VAULT_CONTRACT_ADDRESS: "0x2bb150e6d4366A1BDBC4275D1F35892CD63F27e3"
9904
+ ARB_VAULT_CONTRACT_ADDRESS: "0x2bb150e6d4366A1BDBC4275D1F35892CD63F27e3",
9905
+ SOLUSDC_CONTRACT_ADDRESS: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
9824
9906
  },
9825
9907
  [exports.ChainflipNetworks.mainnet]: {
9826
9908
  FLIP_CONTRACT_ADDRESS: "0x826180541412D574cf1336d22c0C0a287822678A",
@@ -9829,7 +9911,8 @@ var ADDRESSES = {
9829
9911
  ARBUSDC_CONTRACT_ADDRESS: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
9830
9912
  VAULT_CONTRACT_ADDRESS: "0xF5e10380213880111522dd0efD3dbb45b9f62Bcc",
9831
9913
  STATE_CHAIN_GATEWAY_ADDRESS: "0x6995Ab7c4D7F4B03f467Cf4c8E920427d9621DBd",
9832
- ARB_VAULT_CONTRACT_ADDRESS: "0x79001a5e762f3bEFC8e5871b42F6734e00498920"
9914
+ ARB_VAULT_CONTRACT_ADDRESS: "0x79001a5e762f3bEFC8e5871b42F6734e00498920",
9915
+ SOLUSDC_CONTRACT_ADDRESS: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
9833
9916
  }
9834
9917
  };
9835
9918
 
@@ -9844,6 +9927,7 @@ function getTokenContractAddress(asset2, network) {
9844
9927
  if (asset2 === exports.ChainflipIds.Usdc) return ADDRESSES[network].USDC_CONTRACT_ADDRESS;
9845
9928
  if (asset2 === exports.ChainflipIds.Usdt) return ADDRESSES[network].USDT_CONTRACT_ADDRESS;
9846
9929
  if (asset2 === exports.ChainflipIds.ArbUsdc) return ADDRESSES[network].ARBUSDC_CONTRACT_ADDRESS;
9930
+ if (asset2 === exports.ChainflipIds.SolUsdc) return ADDRESSES[network].SOLUSDC_CONTRACT_ADDRESS;
9847
9931
  throw new Error(`No contract address for ${asset2} on ${network}`);
9848
9932
  }
9849
9933
  __name(getTokenContractAddress, "getTokenContractAddress");
@@ -9879,6 +9963,10 @@ var assertIsEvmChain = /* @__PURE__ */ __name((chain2) => {
9879
9963
  const evmChainId = getEvmChainId(chain2, exports.ChainflipNetworks.backspin);
9880
9964
  assert(evmChainId, `Chain ${chain2} is not an evm chain`);
9881
9965
  }, "assertIsEvmChain");
9966
+ var assertIsCCMDestination = /* @__PURE__ */ __name((chain2) => {
9967
+ if (chain2 === "Solana") return;
9968
+ assertIsEvmChain(chain2);
9969
+ }, "assertIsCCMDestination");
9882
9970
  var assertSignerIsConnectedToChain = /* @__PURE__ */ __name(async (opts, chain2) => {
9883
9971
  if (opts.network === "localnet") return;
9884
9972
  assert(opts.signer.provider, "Signer has no provider");
@@ -9897,6 +9985,10 @@ var encodeAddress = /* @__PURE__ */ __name((chain2, address) => {
9897
9985
  if (chain2 === exports.Chains.Polkadot) return bytes.bytesToHex(ss582__namespace.decode(dotAddress.parse(address)).data);
9898
9986
  if (chain2 === exports.Chains.Bitcoin) return `0x${Buffer.from(address).toString("hex")}`;
9899
9987
  if (chain2 === exports.Chains.Ethereum || chain2 === exports.Chains.Arbitrum) return address;
9988
+ if (chain2 === exports.Chains.Solana) {
9989
+ if (string$1.isHex(address)) return address;
9990
+ return bytes.bytesToHex(base58__namespace.decode(address));
9991
+ }
9900
9992
  throw new Error(`cannot encode address for chain ${chain2}`);
9901
9993
  }, "encodeAddress");
9902
9994
  var assertIsValidSwap = /* @__PURE__ */ __name((params) => {
@@ -9921,7 +10013,7 @@ var swapNative = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
9921
10013
  asset: params.destAsset
9922
10014
  });
9923
10015
  const { vaultContract: vault } = getVaultContract(params.srcChain, networkOpts);
9924
- const transaction = await vault.xSwapNative(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, "0x", {
10016
+ const transaction = await vault.xSwapNative(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams?.cfParameters ?? "0x", {
9925
10017
  value: params.amount,
9926
10018
  ...extractOverrides(txOpts)
9927
10019
  });
@@ -9934,7 +10026,7 @@ var swapToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
9934
10026
  const erc20Address = getErc20Address(srcAsset, networkOpts);
9935
10027
  const { hasSufficientAllowance } = await checkAllowance(BigInt(params.amount), vaultAddress, erc20Address, networkOpts.signer);
9936
10028
  assert(hasSufficientAllowance, "Swap amount exceeds allowance");
9937
- const transaction = await vault.xSwapToken(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, erc20Address, params.amount, "0x", extractOverrides(txOpts));
10029
+ const transaction = await vault.xSwapToken(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, erc20Address, params.amount, params.ccmParams?.cfParameters ?? "0x", extractOverrides(txOpts));
9938
10030
  await transaction.wait(txOpts.wait);
9939
10031
  return transaction;
9940
10032
  }, "swapToken");
@@ -9944,7 +10036,7 @@ var callNative = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
9944
10036
  asset: params.destAsset
9945
10037
  });
9946
10038
  const { vaultContract: vault } = getVaultContract(params.srcChain, networkOpts);
9947
- const transaction = await vault.xCallNative(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams.message, params.ccmParams.gasBudget, "0x", {
10039
+ const transaction = await vault.xCallNative(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams.message, params.ccmParams.gasBudget, params.ccmParams?.cfParameters ?? "0x", {
9948
10040
  value: params.amount,
9949
10041
  ...extractOverrides(txOpts)
9950
10042
  });
@@ -9957,7 +10049,7 @@ var callToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
9957
10049
  const erc20Address = getErc20Address(srcAsset, networkOpts);
9958
10050
  const { hasSufficientAllowance } = await checkAllowance(BigInt(params.amount), vaultAddress, erc20Address, networkOpts.signer);
9959
10051
  assert(hasSufficientAllowance, "Swap amount exceeds allowance");
9960
- const transaction = await vault.xCallToken(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams.message, params.ccmParams.gasBudget, erc20Address, params.amount, "0x", extractOverrides(txOpts));
10052
+ const transaction = await vault.xCallToken(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams.message, params.ccmParams.gasBudget, erc20Address, params.amount, params.ccmMetadata?.cfParameters ?? "0x", extractOverrides(txOpts));
9961
10053
  await transaction.wait(txOpts.wait);
9962
10054
  return transaction;
9963
10055
  }, "callToken");
@@ -9967,7 +10059,7 @@ var executeSwap = /* @__PURE__ */ __name(async ({ ccmParams: unvalidatedCcmParam
9967
10059
  assertValidAddress(params.destChain, params.destAddress, networkOpts.network);
9968
10060
  await assertSignerIsConnectedToChain(networkOpts, params.srcChain);
9969
10061
  if (unvalidatedCcmParams) {
9970
- assertIsEvmChain(params.destChain);
10062
+ assertIsCCMDestination(params.destChain);
9971
10063
  const ccmParams = ccmParamsSchema.parse(unvalidatedCcmParams);
9972
10064
  return params.srcAsset === chainConstants[params.srcChain].gasAsset ? callNative({
9973
10065
  ...params,
@@ -10040,7 +10132,7 @@ var getChainData = /* @__PURE__ */ __name((chain2, network, env) => ({
10040
10132
  init_enums();
10041
10133
 
10042
10134
  // package.json
10043
- var version = "1.5.1";
10135
+ var version = "1.6.0-alpha.1";
10044
10136
 
10045
10137
  // src/swap/consts.ts
10046
10138
  var CF_SDK_VERSION_HEADERS = {
package/dist/swap.mjs CHANGED
@@ -1,9 +1,11 @@
1
- import { getEnvironment, getSupportedAssets, getAllBoostPoolsDepth, getVaultContractAddress, approve, getTokenContractAddress, getEvmChainId, checkAllowance, extractOverrides, Vault__factory } from './chunk-M32JHS3U.mjs';
2
- import { assertValidAddress, ccmParamsSchema, dotAddress } from './chunk-HWJAHLL7.mjs';
3
- import { __name, ChainflipNetworks, __publicField, Chains, assetConstants, getInternalAsset, isNotNullish, assert, getAssetAndChain, readChainAssetValue, isTestnet, chainConstants, getInternalAssets } from './chunk-3V7QJANN.mjs';
4
- export { Assets, InternalAssets as ChainflipIds, ChainflipNetworks, Chains, getInternalAsset as getChainflipId } from './chunk-3V7QJANN.mjs';
1
+ import { getEnvironment, getSupportedAssets, getAllBoostPoolsDepth, getVaultContractAddress, approve, getTokenContractAddress, getEvmChainId, checkAllowance, extractOverrides, Vault__factory } from './chunk-AXKJJ3VI.mjs';
2
+ import { assertValidAddress, ccmParamsSchema, dotAddress } from './chunk-NKAH7KWJ.mjs';
3
+ import { __name, ChainflipNetworks, __publicField, Chains, assetConstants, getInternalAsset, isNotNullish, assert, getAssetAndChain, readChainAssetValue, isTestnet, chainConstants, getInternalAssets } from './chunk-EBZERIHA.mjs';
4
+ export { Assets, InternalAssets as ChainflipIds, ChainflipNetworks, Chains, getInternalAsset as getChainflipId } from './chunk-EBZERIHA.mjs';
5
+ import * as base58 from '@chainflip/utils/base58';
5
6
  import { bytesToHex } from '@chainflip/utils/bytes';
6
7
  import * as ss58 from '@chainflip/utils/ss58';
8
+ import { isHex } from '@chainflip/utils/string';
7
9
  import axios from 'axios';
8
10
 
9
11
  // ../../node_modules/.pnpm/@trpc+server@10.45.2/node_modules/@trpc/server/dist/observable-ade1bad8.mjs
@@ -3564,6 +3566,10 @@ var assertIsEvmChain = /* @__PURE__ */ __name((chain) => {
3564
3566
  const evmChainId = getEvmChainId(chain, ChainflipNetworks.backspin);
3565
3567
  assert(evmChainId, `Chain ${chain} is not an evm chain`);
3566
3568
  }, "assertIsEvmChain");
3569
+ var assertIsCCMDestination = /* @__PURE__ */ __name((chain) => {
3570
+ if (chain === "Solana") return;
3571
+ assertIsEvmChain(chain);
3572
+ }, "assertIsCCMDestination");
3567
3573
  var assertSignerIsConnectedToChain = /* @__PURE__ */ __name(async (opts, chain) => {
3568
3574
  if (opts.network === "localnet") return;
3569
3575
  assert(opts.signer.provider, "Signer has no provider");
@@ -3578,6 +3584,10 @@ var encodeAddress = /* @__PURE__ */ __name((chain, address) => {
3578
3584
  if (chain === Chains.Polkadot) return bytesToHex(ss58.decode(dotAddress.parse(address)).data);
3579
3585
  if (chain === Chains.Bitcoin) return `0x${Buffer.from(address).toString("hex")}`;
3580
3586
  if (chain === Chains.Ethereum || chain === Chains.Arbitrum) return address;
3587
+ if (chain === Chains.Solana) {
3588
+ if (isHex(address)) return address;
3589
+ return bytesToHex(base58.decode(address));
3590
+ }
3581
3591
  throw new Error(`cannot encode address for chain ${chain}`);
3582
3592
  }, "encodeAddress");
3583
3593
  var assertIsValidSwap = /* @__PURE__ */ __name((params) => {
@@ -3602,7 +3612,7 @@ var swapNative = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
3602
3612
  asset: params.destAsset
3603
3613
  });
3604
3614
  const { vaultContract: vault } = getVaultContract(params.srcChain, networkOpts);
3605
- const transaction = await vault.xSwapNative(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, "0x", {
3615
+ const transaction = await vault.xSwapNative(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams?.cfParameters ?? "0x", {
3606
3616
  value: params.amount,
3607
3617
  ...extractOverrides(txOpts)
3608
3618
  });
@@ -3615,7 +3625,7 @@ var swapToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
3615
3625
  const erc20Address = getErc20Address(srcAsset, networkOpts);
3616
3626
  const { hasSufficientAllowance } = await checkAllowance(BigInt(params.amount), vaultAddress, erc20Address, networkOpts.signer);
3617
3627
  assert(hasSufficientAllowance, "Swap amount exceeds allowance");
3618
- const transaction = await vault.xSwapToken(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, erc20Address, params.amount, "0x", extractOverrides(txOpts));
3628
+ const transaction = await vault.xSwapToken(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, erc20Address, params.amount, params.ccmParams?.cfParameters ?? "0x", extractOverrides(txOpts));
3619
3629
  await transaction.wait(txOpts.wait);
3620
3630
  return transaction;
3621
3631
  }, "swapToken");
@@ -3625,7 +3635,7 @@ var callNative = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
3625
3635
  asset: params.destAsset
3626
3636
  });
3627
3637
  const { vaultContract: vault } = getVaultContract(params.srcChain, networkOpts);
3628
- const transaction = await vault.xCallNative(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams.message, params.ccmParams.gasBudget, "0x", {
3638
+ const transaction = await vault.xCallNative(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams.message, params.ccmParams.gasBudget, params.ccmParams?.cfParameters ?? "0x", {
3629
3639
  value: params.amount,
3630
3640
  ...extractOverrides(txOpts)
3631
3641
  });
@@ -3638,7 +3648,7 @@ var callToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
3638
3648
  const erc20Address = getErc20Address(srcAsset, networkOpts);
3639
3649
  const { hasSufficientAllowance } = await checkAllowance(BigInt(params.amount), vaultAddress, erc20Address, networkOpts.signer);
3640
3650
  assert(hasSufficientAllowance, "Swap amount exceeds allowance");
3641
- const transaction = await vault.xCallToken(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams.message, params.ccmParams.gasBudget, erc20Address, params.amount, "0x", extractOverrides(txOpts));
3651
+ const transaction = await vault.xCallToken(chainConstants[params.destChain].contractId, encodeAddress(params.destChain, params.destAddress), assetConstants[destAsset].contractId, params.ccmParams.message, params.ccmParams.gasBudget, erc20Address, params.amount, params.ccmMetadata?.cfParameters ?? "0x", extractOverrides(txOpts));
3642
3652
  await transaction.wait(txOpts.wait);
3643
3653
  return transaction;
3644
3654
  }, "callToken");
@@ -3648,7 +3658,7 @@ var executeSwap = /* @__PURE__ */ __name(async ({ ccmParams: unvalidatedCcmParam
3648
3658
  assertValidAddress(params.destChain, params.destAddress, networkOpts.network);
3649
3659
  await assertSignerIsConnectedToChain(networkOpts, params.srcChain);
3650
3660
  if (unvalidatedCcmParams) {
3651
- assertIsEvmChain(params.destChain);
3661
+ assertIsCCMDestination(params.destChain);
3652
3662
  const ccmParams = ccmParamsSchema.parse(unvalidatedCcmParams);
3653
3663
  return params.srcAsset === chainConstants[params.srcChain].gasAsset ? callNative({
3654
3664
  ...params,
@@ -3713,7 +3723,7 @@ var getChainData = /* @__PURE__ */ __name((chain, network, env) => ({
3713
3723
  }), "getChainData");
3714
3724
 
3715
3725
  // package.json
3716
- var version = "1.5.1";
3726
+ var version = "1.6.0-alpha.1";
3717
3727
 
3718
3728
  // src/swap/consts.ts
3719
3729
  var CF_SDK_VERSION_HEADERS = {
@@ -3844,7 +3854,7 @@ var _SwapSDK = class _SwapSDK {
3844
3854
  depositAddressRequest.ccmParams ?? (depositAddressRequest.ccmParams = depositAddressRequest.ccmMetadata);
3845
3855
  let response;
3846
3856
  if (this.options.broker !== void 0) {
3847
- const { requestSwapDepositAddress } = await import('./broker-4D7ISFUZ.mjs');
3857
+ const { requestSwapDepositAddress } = await import('./broker-KNYBSXFY.mjs');
3848
3858
  const result = await requestSwapDepositAddress({
3849
3859
  ...depositAddressRequest,
3850
3860
  commissionBps: brokerCommissionBps ?? this.options.broker.commissionBps,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@chainflip/sdk",
3
- "version": "1.5.1",
3
+ "version": "1.6.0-alpha.1",
4
4
  "description": "",
5
5
  "exports": {
6
6
  "./swap": {
@@ -41,7 +41,7 @@
41
41
  "access": "public"
42
42
  },
43
43
  "dependencies": {
44
- "@chainflip/rpc": "^1.5.6",
44
+ "@chainflip/rpc": "^1.6.3",
45
45
  "@chainflip/utils": "^0.4.0",
46
46
  "axios": "^1.6.8",
47
47
  "ethers": "^6.13.2"