@chainflip/sdk 0.1.13 → 0.1.14
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/{chunk-CMPMNSTZ.mjs → chunk-7N46BL6F.mjs} +3 -3
- package/dist/{enums-d5fa72fa.d.ts → enums-3131916c.d.ts} +1 -1
- package/dist/funding.d.ts +1 -1
- package/dist/funding.js +3 -2
- package/dist/funding.mjs +2 -1
- package/dist/swap.d.ts +7 -7
- package/dist/swap.js +74 -72
- package/dist/swap.mjs +69 -67
- package/package.json +1 -1
|
@@ -26,10 +26,10 @@ var Assets = arrayToMap([
|
|
|
26
26
|
"BTC"
|
|
27
27
|
]);
|
|
28
28
|
var ChainflipNetworks = arrayToMap([
|
|
29
|
+
"partnernet",
|
|
29
30
|
"sisyphos",
|
|
30
31
|
"perseverance",
|
|
31
|
-
"mainnet"
|
|
32
|
-
"partnernet"
|
|
32
|
+
"mainnet"
|
|
33
33
|
]);
|
|
34
34
|
var isTestnet = /* @__PURE__ */ __name((network) => network !== ChainflipNetworks.mainnet, "isTestnet");
|
|
35
35
|
var assetChains = {
|
|
@@ -2125,4 +2125,4 @@ var getFlipBalance = /* @__PURE__ */ __name(async (network, signer) => {
|
|
|
2125
2125
|
return balance.toBigInt();
|
|
2126
2126
|
}, "getFlipBalance");
|
|
2127
2127
|
|
|
2128
|
-
export { Assets, ChainflipNetworks, Chains, StateChainGateway__factory, Vault__factory, __name, approve, assert, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds, checkAllowance, getFlipBalance, getStateChainGatewayContractAddress, getTokenContractAddress, getVaultManagerContractAddress, isString, isTestnet, isTokenCall, isTokenSwap };
|
|
2128
|
+
export { Assets, ChainflipNetworks, Chains, StateChainGateway__factory, Vault__factory, __name, __publicField, approve, assert, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds, checkAllowance, getFlipBalance, getStateChainGatewayContractAddress, getTokenContractAddress, getVaultManagerContractAddress, isString, isTestnet, isTokenCall, isTokenSwap };
|
|
@@ -5,7 +5,7 @@ declare const Chains: ArrayToMap<readonly ["Bitcoin", "Ethereum", "Polkadot"]>;
|
|
|
5
5
|
type Chain = (typeof Chains)[keyof typeof Chains];
|
|
6
6
|
declare const Assets: ArrayToMap<readonly ["FLIP", "USDC", "DOT", "ETH", "BTC"]>;
|
|
7
7
|
type Asset = (typeof Assets)[keyof typeof Assets];
|
|
8
|
-
declare const ChainflipNetworks: ArrayToMap<readonly ["
|
|
8
|
+
declare const ChainflipNetworks: ArrayToMap<readonly ["partnernet", "sisyphos", "perseverance", "mainnet"]>;
|
|
9
9
|
type ChainflipNetwork = (typeof ChainflipNetworks)[keyof typeof ChainflipNetworks];
|
|
10
10
|
declare const assetChains: {
|
|
11
11
|
ETH: "Ethereum";
|
package/dist/funding.d.ts
CHANGED
package/dist/funding.js
CHANGED
|
@@ -777,10 +777,10 @@ var Assets = arrayToMap([
|
|
|
777
777
|
"BTC"
|
|
778
778
|
]);
|
|
779
779
|
var ChainflipNetworks = arrayToMap([
|
|
780
|
+
"partnernet",
|
|
780
781
|
"sisyphos",
|
|
781
782
|
"perseverance",
|
|
782
|
-
"mainnet"
|
|
783
|
-
"partnernet"
|
|
783
|
+
"mainnet"
|
|
784
784
|
]);
|
|
785
785
|
({
|
|
786
786
|
[Assets.ETH]: Chains.Ethereum,
|
|
@@ -945,6 +945,7 @@ var getRedemptionDelay = /* @__PURE__ */ __name((options) => {
|
|
|
945
945
|
// src/funding/index.ts
|
|
946
946
|
var FundingSDK = class {
|
|
947
947
|
constructor(options) {
|
|
948
|
+
__publicField(this, "options");
|
|
948
949
|
this.options = {
|
|
949
950
|
signer: options.signer,
|
|
950
951
|
network: options.network ?? ChainflipNetworks.perseverance
|
package/dist/funding.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { __name, ChainflipNetworks, getFlipBalance, getStateChainGatewayContractAddress, approve, getTokenContractAddress, Assets, checkAllowance, assert, StateChainGateway__factory } from './chunk-
|
|
1
|
+
import { __name, __publicField, ChainflipNetworks, getFlipBalance, getStateChainGatewayContractAddress, approve, getTokenContractAddress, Assets, checkAllowance, assert, StateChainGateway__factory } from './chunk-7N46BL6F.mjs';
|
|
2
2
|
|
|
3
3
|
// ../shared/src/stateChainGateway/utils.ts
|
|
4
4
|
var getStateChainGateway = /* @__PURE__ */ __name((options) => {
|
|
@@ -49,6 +49,7 @@ var getRedemptionDelay = /* @__PURE__ */ __name((options) => {
|
|
|
49
49
|
// src/funding/index.ts
|
|
50
50
|
var FundingSDK = class {
|
|
51
51
|
constructor(options) {
|
|
52
|
+
__publicField(this, "options");
|
|
52
53
|
this.options = {
|
|
53
54
|
signer: options.signer,
|
|
54
55
|
network: options.network ?? ChainflipNetworks.perseverance
|
package/dist/swap.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import ethers, { Signer } from 'ethers';
|
|
2
|
-
import { C as Chain, c as chainAssets, A as Asset, a as ChainflipNetwork } from './enums-
|
|
3
|
-
export { d as Assets, e as ChainflipNetworks, b as Chains, f as assetChains, h as assetContractIds, g as assetDecimals, i as chainContractIds } from './enums-
|
|
2
|
+
import { C as Chain, c as chainAssets, A as Asset, a as ChainflipNetwork } from './enums-3131916c.js';
|
|
3
|
+
export { d as Assets, e as ChainflipNetworks, b as Chains, f as assetChains, h as assetContractIds, g as assetDecimals, i as chainContractIds } from './enums-3131916c.js';
|
|
4
4
|
import { z } from 'zod';
|
|
5
5
|
|
|
6
6
|
declare const tokenSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
@@ -70,7 +70,7 @@ declare const tokenSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
|
70
70
|
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
71
71
|
srcChain: z.ZodLiteral<"Ethereum">;
|
|
72
72
|
destChain: z.ZodLiteral<"Bitcoin">;
|
|
73
|
-
destAddress: z.ZodEffects<z.
|
|
73
|
+
destAddress: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string> | z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodEffects<z.ZodString, string, string>]>, string, string>;
|
|
74
74
|
destAsset: z.ZodLiteral<"BTC">;
|
|
75
75
|
srcAsset: z.ZodUnion<[z.ZodLiteral<"FLIP">, z.ZodLiteral<"USDC">]>;
|
|
76
76
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -130,9 +130,9 @@ declare const executeSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
|
130
130
|
}>, z.ZodUnion<[z.ZodObject<{
|
|
131
131
|
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
132
132
|
srcChain: z.ZodLiteral<"Ethereum">;
|
|
133
|
+
srcAsset: z.ZodLiteral<"FLIP">;
|
|
133
134
|
destChain: z.ZodLiteral<"Ethereum">;
|
|
134
135
|
destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
|
|
135
|
-
srcAsset: z.ZodLiteral<"FLIP">;
|
|
136
136
|
destAsset: z.ZodUnion<[z.ZodLiteral<"USDC">, z.ZodLiteral<"ETH">]>;
|
|
137
137
|
ccmMetadata: z.ZodObject<{
|
|
138
138
|
message: z.ZodString;
|
|
@@ -169,9 +169,9 @@ declare const executeSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
|
169
169
|
}>, z.ZodObject<{
|
|
170
170
|
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
171
171
|
srcChain: z.ZodLiteral<"Ethereum">;
|
|
172
|
+
srcAsset: z.ZodLiteral<"USDC">;
|
|
172
173
|
destChain: z.ZodLiteral<"Ethereum">;
|
|
173
174
|
destAddress: z.ZodEffects<z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, `0x${string}`, `0x${string}`>;
|
|
174
|
-
srcAsset: z.ZodLiteral<"USDC">;
|
|
175
175
|
destAsset: z.ZodUnion<[z.ZodLiteral<"FLIP">, z.ZodLiteral<"ETH">]>;
|
|
176
176
|
ccmMetadata: z.ZodObject<{
|
|
177
177
|
message: z.ZodString;
|
|
@@ -252,7 +252,7 @@ declare const executeSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
|
252
252
|
srcChain: z.ZodLiteral<"Ethereum">;
|
|
253
253
|
srcAsset: z.ZodLiteral<"ETH">;
|
|
254
254
|
destChain: z.ZodLiteral<"Bitcoin">;
|
|
255
|
-
destAddress: z.ZodEffects<z.
|
|
255
|
+
destAddress: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string> | z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodEffects<z.ZodString, string, string>]>, string, string>;
|
|
256
256
|
destAsset: z.ZodLiteral<"BTC">;
|
|
257
257
|
}, "strip", z.ZodTypeAny, {
|
|
258
258
|
amount: string | bigint;
|
|
@@ -335,7 +335,7 @@ declare const executeSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
|
335
335
|
amount: z.ZodUnion<[z.ZodString, z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodBigInt]>;
|
|
336
336
|
srcChain: z.ZodLiteral<"Ethereum">;
|
|
337
337
|
destChain: z.ZodLiteral<"Bitcoin">;
|
|
338
|
-
destAddress: z.ZodEffects<z.
|
|
338
|
+
destAddress: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string> | z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodEffects<z.ZodString, string, string>]>, string, string>;
|
|
339
339
|
destAsset: z.ZodLiteral<"BTC">;
|
|
340
340
|
srcAsset: z.ZodUnion<[z.ZodLiteral<"FLIP">, z.ZodLiteral<"USDC">]>;
|
|
341
341
|
}, "strip", z.ZodTypeAny, {
|
package/dist/swap.js
CHANGED
|
@@ -55,10 +55,10 @@ var Assets = arrayToMap([
|
|
|
55
55
|
"BTC"
|
|
56
56
|
]);
|
|
57
57
|
var ChainflipNetworks = arrayToMap([
|
|
58
|
+
"partnernet",
|
|
58
59
|
"sisyphos",
|
|
59
60
|
"perseverance",
|
|
60
|
-
"mainnet"
|
|
61
|
-
"partnernet"
|
|
61
|
+
"mainnet"
|
|
62
62
|
]);
|
|
63
63
|
var isTestnet = /* @__PURE__ */ __name((network) => network !== ChainflipNetworks.mainnet, "isTestnet");
|
|
64
64
|
var assetChains = {
|
|
@@ -1449,22 +1449,22 @@ var getTokenContractAddress = /* @__PURE__ */ __name((asset, network) => {
|
|
|
1449
1449
|
return GOERLI_USDC_CONTRACT_ADDRESS;
|
|
1450
1450
|
}, "getTokenContractAddress");
|
|
1451
1451
|
var checkAllowance = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20Address, signer) => {
|
|
1452
|
-
const
|
|
1452
|
+
const erc20 = ERC20__factory.connect(erc20Address, signer);
|
|
1453
1453
|
const signerAddress = await signer.getAddress();
|
|
1454
|
-
const allowance = await
|
|
1454
|
+
const allowance = await erc20.allowance(signerAddress, spenderAddress);
|
|
1455
1455
|
return {
|
|
1456
1456
|
allowance,
|
|
1457
1457
|
isAllowable: allowance.gte(amount),
|
|
1458
|
-
erc20
|
|
1458
|
+
erc20
|
|
1459
1459
|
};
|
|
1460
1460
|
}, "checkAllowance");
|
|
1461
|
-
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress,
|
|
1461
|
+
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance, nonce) => {
|
|
1462
1462
|
const amountBigNumber = ethers.BigNumber.from(amount);
|
|
1463
1463
|
const allowanceBigNumber = ethers.BigNumber.from(allowance);
|
|
1464
1464
|
if (allowanceBigNumber.gte(amountBigNumber))
|
|
1465
1465
|
return null;
|
|
1466
1466
|
const requiredAmount = amountBigNumber.sub(allowanceBigNumber);
|
|
1467
|
-
const tx = await
|
|
1467
|
+
const tx = await erc20.approve(spenderAddress, requiredAmount, {
|
|
1468
1468
|
nonce
|
|
1469
1469
|
});
|
|
1470
1470
|
return tx.wait(1);
|
|
@@ -1712,7 +1712,7 @@ var validateBitcoinTestnetAddress = /* @__PURE__ */ __name((address) => validate
|
|
|
1712
1712
|
var validateBitcoinRegtestAddress = /* @__PURE__ */ __name((address) => validateBitcoinAddress(address, "regtest"), "validateBitcoinRegtestAddress");
|
|
1713
1713
|
|
|
1714
1714
|
// ../shared/src/parsers.ts
|
|
1715
|
-
var errorMap = /* @__PURE__ */ __name((
|
|
1715
|
+
var errorMap = /* @__PURE__ */ __name((_issue, context) => ({
|
|
1716
1716
|
message: `received: ${JSON.stringify(context.data)}`
|
|
1717
1717
|
}), "errorMap");
|
|
1718
1718
|
var string = zod.z.string({
|
|
@@ -1725,11 +1725,15 @@ var numericString = string.regex(/^[0-9]+$/);
|
|
|
1725
1725
|
var hexString = zod.z.custom((val) => typeof val === "string" && /^0x[0-9a-f]+$/i.test(val));
|
|
1726
1726
|
numericString.transform((arg) => ethers__namespace.BigNumber.from(arg).toHexString()).refine((arg) => arg.startsWith("0x"));
|
|
1727
1727
|
string.regex(/^[0-9a-f]+$/);
|
|
1728
|
-
var btcAddress =
|
|
1729
|
-
|
|
1730
|
-
|
|
1731
|
-
|
|
1732
|
-
|
|
1728
|
+
var btcAddress = /* @__PURE__ */ __name((env) => {
|
|
1729
|
+
const network = env ?? process.env.CHAINFLIP_NETWORK;
|
|
1730
|
+
if (network === "mainnet")
|
|
1731
|
+
return string.regex(/^(1|3|bc1)/).refine(validateBitcoinMainnetAddress);
|
|
1732
|
+
return zod.z.union([
|
|
1733
|
+
string.regex(/^(m|n|2|tb1)/).refine(validateBitcoinTestnetAddress),
|
|
1734
|
+
string.regex(/^bcrt1/).refine(validateBitcoinRegtestAddress)
|
|
1735
|
+
]);
|
|
1736
|
+
}, "btcAddress");
|
|
1733
1737
|
var dotAddress = zod.z.union([
|
|
1734
1738
|
string,
|
|
1735
1739
|
hexString
|
|
@@ -1793,7 +1797,7 @@ var bytesToHex = /* @__PURE__ */ __name((arr) => `0x${[
|
|
|
1793
1797
|
...arr
|
|
1794
1798
|
].map((v) => v.toString(16).padStart(2, "0")).join("")}`, "bytesToHex");
|
|
1795
1799
|
var utf8ToHex = /* @__PURE__ */ __name((str) => `0x${Buffer.from(str).toString("hex")}`, "utf8ToHex");
|
|
1796
|
-
var
|
|
1800
|
+
var eth = zod.z.object({
|
|
1797
1801
|
amount: zod.z.union([
|
|
1798
1802
|
numericString,
|
|
1799
1803
|
hexString,
|
|
@@ -1802,82 +1806,73 @@ var base = zod.z.object({
|
|
|
1802
1806
|
srcChain: zod.z.literal(Chains.Ethereum),
|
|
1803
1807
|
srcAsset: zod.z.literal(Assets.ETH)
|
|
1804
1808
|
});
|
|
1805
|
-
var
|
|
1809
|
+
var ethToEthereum = eth.extend({
|
|
1806
1810
|
destChain: zod.z.literal(Chains.Ethereum),
|
|
1807
1811
|
destAddress: ethereumAddress
|
|
1808
1812
|
});
|
|
1809
|
-
var
|
|
1813
|
+
var ethToDot = eth.extend({
|
|
1810
1814
|
destChain: zod.z.literal(Chains.Polkadot),
|
|
1811
|
-
destAddress: dotAddress.transform((addr) => bytesToHex(utilCrypto.decodeAddress(addr)))
|
|
1815
|
+
destAddress: dotAddress.transform((addr) => bytesToHex(utilCrypto.decodeAddress(addr))),
|
|
1816
|
+
destAsset: zod.z.literal(Assets.DOT)
|
|
1812
1817
|
});
|
|
1813
|
-
var
|
|
1818
|
+
var ethToBtc = eth.extend({
|
|
1814
1819
|
destChain: zod.z.literal(Chains.Bitcoin),
|
|
1815
|
-
destAddress: btcAddress.transform(utf8ToHex)
|
|
1820
|
+
destAddress: btcAddress().transform(utf8ToHex),
|
|
1821
|
+
destAsset: zod.z.literal(Assets.BTC)
|
|
1816
1822
|
});
|
|
1817
|
-
var
|
|
1823
|
+
var erc20Asset = zod.z.union([
|
|
1818
1824
|
zod.z.literal(Assets.FLIP),
|
|
1819
1825
|
zod.z.literal(Assets.USDC)
|
|
1820
1826
|
]);
|
|
1821
|
-
var
|
|
1822
|
-
destAsset:
|
|
1823
|
-
});
|
|
1824
|
-
var polkadotNative = polkadotBase.extend({
|
|
1825
|
-
destAsset: zod.z.literal(Assets.DOT)
|
|
1826
|
-
});
|
|
1827
|
-
var bitcoinNative = bitcoinBase.extend({
|
|
1828
|
-
destAsset: zod.z.literal(Assets.BTC)
|
|
1827
|
+
var ethToERC20 = ethToEthereum.extend({
|
|
1828
|
+
destAsset: erc20Asset
|
|
1829
1829
|
});
|
|
1830
1830
|
var nativeSwapParamsSchema = zod.z.union([
|
|
1831
|
-
|
|
1832
|
-
|
|
1833
|
-
|
|
1831
|
+
ethToERC20,
|
|
1832
|
+
ethToDot,
|
|
1833
|
+
ethToBtc
|
|
1834
1834
|
]);
|
|
1835
|
+
var flipToEthereumAsset = ethToEthereum.extend({
|
|
1836
|
+
srcAsset: zod.z.literal(Assets.FLIP),
|
|
1837
|
+
destAsset: zod.z.union([
|
|
1838
|
+
zod.z.literal(Assets.USDC),
|
|
1839
|
+
zod.z.literal(Assets.ETH)
|
|
1840
|
+
])
|
|
1841
|
+
});
|
|
1842
|
+
var usdcToEthereumAsset = ethToEthereum.extend({
|
|
1843
|
+
srcAsset: zod.z.literal(Assets.USDC),
|
|
1844
|
+
destAsset: zod.z.union([
|
|
1845
|
+
zod.z.literal(Assets.FLIP),
|
|
1846
|
+
zod.z.literal(Assets.ETH)
|
|
1847
|
+
])
|
|
1848
|
+
});
|
|
1849
|
+
var erc20ToDot = ethToDot.extend({
|
|
1850
|
+
srcAsset: erc20Asset
|
|
1851
|
+
});
|
|
1852
|
+
var erc20ToBtc = ethToBtc.extend({
|
|
1853
|
+
srcAsset: erc20Asset
|
|
1854
|
+
});
|
|
1835
1855
|
var tokenSwapParamsSchema = zod.z.union([
|
|
1836
|
-
|
|
1837
|
-
|
|
1838
|
-
|
|
1839
|
-
|
|
1840
|
-
zod.z.literal(Assets.ETH)
|
|
1841
|
-
])
|
|
1842
|
-
}),
|
|
1843
|
-
ethereumBase.extend({
|
|
1844
|
-
srcAsset: zod.z.literal(Assets.USDC),
|
|
1845
|
-
destAsset: zod.z.union([
|
|
1846
|
-
zod.z.literal(Assets.FLIP),
|
|
1847
|
-
zod.z.literal(Assets.ETH)
|
|
1848
|
-
])
|
|
1849
|
-
}),
|
|
1850
|
-
polkadotNative.extend({
|
|
1851
|
-
srcAsset: erc20
|
|
1852
|
-
}),
|
|
1853
|
-
bitcoinNative.extend({
|
|
1854
|
-
srcAsset: erc20
|
|
1855
|
-
})
|
|
1856
|
+
flipToEthereumAsset,
|
|
1857
|
+
usdcToEthereumAsset,
|
|
1858
|
+
erc20ToDot,
|
|
1859
|
+
erc20ToBtc
|
|
1856
1860
|
]);
|
|
1857
1861
|
var ccmMetadataSchema = zod.z.object({
|
|
1858
1862
|
message: zod.z.string(),
|
|
1859
1863
|
gasBudget: numericString
|
|
1860
1864
|
});
|
|
1865
|
+
var ccmFlipToEthereumAssset = flipToEthereumAsset.extend({
|
|
1866
|
+
ccmMetadata: ccmMetadataSchema
|
|
1867
|
+
});
|
|
1868
|
+
var ccmUsdcToEthereumAsset = usdcToEthereumAsset.extend({
|
|
1869
|
+
ccmMetadata: ccmMetadataSchema
|
|
1870
|
+
});
|
|
1861
1871
|
var tokenCallParamsSchema = zod.z.union([
|
|
1862
|
-
|
|
1863
|
-
|
|
1864
|
-
destAsset: zod.z.union([
|
|
1865
|
-
zod.z.literal(Assets.USDC),
|
|
1866
|
-
zod.z.literal(Assets.ETH)
|
|
1867
|
-
]),
|
|
1868
|
-
ccmMetadata: ccmMetadataSchema
|
|
1869
|
-
}),
|
|
1870
|
-
ethereumBase.extend({
|
|
1871
|
-
srcAsset: zod.z.literal(Assets.USDC),
|
|
1872
|
-
destAsset: zod.z.union([
|
|
1873
|
-
zod.z.literal(Assets.FLIP),
|
|
1874
|
-
zod.z.literal(Assets.ETH)
|
|
1875
|
-
]),
|
|
1876
|
-
ccmMetadata: ccmMetadataSchema
|
|
1877
|
-
})
|
|
1872
|
+
ccmFlipToEthereumAssset,
|
|
1873
|
+
ccmUsdcToEthereumAsset
|
|
1878
1874
|
]);
|
|
1879
|
-
var nativeCallParamsSchema =
|
|
1880
|
-
destAsset: erc20,
|
|
1875
|
+
var nativeCallParamsSchema = ethToERC20.extend({
|
|
1881
1876
|
ccmMetadata: ccmMetadataSchema
|
|
1882
1877
|
});
|
|
1883
1878
|
var executeSwapParamsSchema = zod.z.union([
|
|
@@ -1887,6 +1882,10 @@ var executeSwapParamsSchema = zod.z.union([
|
|
|
1887
1882
|
nativeSwapParamsSchema,
|
|
1888
1883
|
tokenSwapParamsSchema
|
|
1889
1884
|
]);
|
|
1885
|
+
var stripOverrides = /* @__PURE__ */ __name((obj) => {
|
|
1886
|
+
const { to, from, value, data, ...rest } = obj;
|
|
1887
|
+
return rest;
|
|
1888
|
+
}, "stripOverrides");
|
|
1890
1889
|
var executeOptionsSchema = zod.z.intersection(zod.z.object({
|
|
1891
1890
|
signer: zod.z.instanceof(ethers.Signer)
|
|
1892
1891
|
}).passthrough(), zod.z.union([
|
|
@@ -1898,7 +1897,7 @@ var executeOptionsSchema = zod.z.intersection(zod.z.object({
|
|
|
1898
1897
|
vaultContractAddress: zod.z.string(),
|
|
1899
1898
|
srcTokenContractAddress: zod.z.string().optional()
|
|
1900
1899
|
}).passthrough()
|
|
1901
|
-
]));
|
|
1900
|
+
])).transform(stripOverrides);
|
|
1902
1901
|
|
|
1903
1902
|
// ../shared/src/vault/executeSwap.ts
|
|
1904
1903
|
var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, { network, vaultContractAddress: address, signer, ...opts }) => {
|
|
@@ -1957,11 +1956,11 @@ var checkVaultAllowance = /* @__PURE__ */ __name((params, opts) => {
|
|
|
1957
1956
|
return checkAllowance(params.amount, vaultContractAddress, erc20Address, opts.signer);
|
|
1958
1957
|
}, "checkVaultAllowance");
|
|
1959
1958
|
var approveVault = /* @__PURE__ */ __name(async (params, opts) => {
|
|
1960
|
-
const { isAllowable, erc20
|
|
1959
|
+
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params, opts);
|
|
1961
1960
|
if (isAllowable)
|
|
1962
1961
|
return null;
|
|
1963
1962
|
const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
|
|
1964
|
-
return approve(params.amount, vaultContractAddress,
|
|
1963
|
+
return approve(params.amount, vaultContractAddress, erc20, allowance, opts.nonce);
|
|
1965
1964
|
}, "approveVault");
|
|
1966
1965
|
|
|
1967
1966
|
// src/swap/consts.ts
|
|
@@ -2132,6 +2131,9 @@ var ApiService_default = {
|
|
|
2132
2131
|
// src/swap/sdk.ts
|
|
2133
2132
|
var SwapSDK = class {
|
|
2134
2133
|
constructor(options = {}) {
|
|
2134
|
+
__publicField(this, "baseUrl");
|
|
2135
|
+
__publicField(this, "network");
|
|
2136
|
+
__publicField(this, "signer");
|
|
2135
2137
|
this.network = options.network ?? ChainflipNetworks.partnernet;
|
|
2136
2138
|
this.baseUrl = options.backendUrl ?? BACKEND_SERVICE_URLS[this.network];
|
|
2137
2139
|
this.signer = options.signer;
|
package/dist/swap.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { isString, Chains, Assets, ChainflipNetworks, __name, assert, getVaultManagerContractAddress, approve, isTokenCall, isTokenSwap, getTokenContractAddress, checkAllowance, Vault__factory, chainContractIds, assetContractIds, assetDecimals, isTestnet } from './chunk-
|
|
2
|
-
export { Assets, ChainflipNetworks, Chains, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds } from './chunk-
|
|
1
|
+
import { isString, Chains, Assets, ChainflipNetworks, __name, __publicField, assert, getVaultManagerContractAddress, approve, isTokenCall, isTokenSwap, getTokenContractAddress, checkAllowance, Vault__factory, chainContractIds, assetContractIds, assetDecimals, isTestnet } from './chunk-7N46BL6F.mjs';
|
|
2
|
+
export { Assets, ChainflipNetworks, Chains, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds } from './chunk-7N46BL6F.mjs';
|
|
3
3
|
import { encodeAddress, decodeAddress } from '@polkadot/util-crypto';
|
|
4
4
|
import * as ethers from 'ethers';
|
|
5
5
|
import { Signer } from 'ethers';
|
|
@@ -245,7 +245,7 @@ var validateBitcoinTestnetAddress = /* @__PURE__ */ __name((address) => validate
|
|
|
245
245
|
var validateBitcoinRegtestAddress = /* @__PURE__ */ __name((address) => validateBitcoinAddress(address, "regtest"), "validateBitcoinRegtestAddress");
|
|
246
246
|
|
|
247
247
|
// ../shared/src/parsers.ts
|
|
248
|
-
var errorMap = /* @__PURE__ */ __name((
|
|
248
|
+
var errorMap = /* @__PURE__ */ __name((_issue, context) => ({
|
|
249
249
|
message: `received: ${JSON.stringify(context.data)}`
|
|
250
250
|
}), "errorMap");
|
|
251
251
|
var string = z.string({
|
|
@@ -258,11 +258,15 @@ var numericString = string.regex(/^[0-9]+$/);
|
|
|
258
258
|
var hexString = z.custom((val) => typeof val === "string" && /^0x[0-9a-f]+$/i.test(val));
|
|
259
259
|
numericString.transform((arg) => ethers.BigNumber.from(arg).toHexString()).refine((arg) => arg.startsWith("0x"));
|
|
260
260
|
string.regex(/^[0-9a-f]+$/);
|
|
261
|
-
var btcAddress =
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
261
|
+
var btcAddress = /* @__PURE__ */ __name((env) => {
|
|
262
|
+
const network = env ?? process.env.CHAINFLIP_NETWORK;
|
|
263
|
+
if (network === "mainnet")
|
|
264
|
+
return string.regex(/^(1|3|bc1)/).refine(validateBitcoinMainnetAddress);
|
|
265
|
+
return z.union([
|
|
266
|
+
string.regex(/^(m|n|2|tb1)/).refine(validateBitcoinTestnetAddress),
|
|
267
|
+
string.regex(/^bcrt1/).refine(validateBitcoinRegtestAddress)
|
|
268
|
+
]);
|
|
269
|
+
}, "btcAddress");
|
|
266
270
|
var dotAddress = z.union([
|
|
267
271
|
string,
|
|
268
272
|
hexString
|
|
@@ -326,7 +330,7 @@ var bytesToHex = /* @__PURE__ */ __name((arr) => `0x${[
|
|
|
326
330
|
...arr
|
|
327
331
|
].map((v) => v.toString(16).padStart(2, "0")).join("")}`, "bytesToHex");
|
|
328
332
|
var utf8ToHex = /* @__PURE__ */ __name((str) => `0x${Buffer.from(str).toString("hex")}`, "utf8ToHex");
|
|
329
|
-
var
|
|
333
|
+
var eth = z.object({
|
|
330
334
|
amount: z.union([
|
|
331
335
|
numericString,
|
|
332
336
|
hexString,
|
|
@@ -335,82 +339,73 @@ var base = z.object({
|
|
|
335
339
|
srcChain: z.literal(Chains.Ethereum),
|
|
336
340
|
srcAsset: z.literal(Assets.ETH)
|
|
337
341
|
});
|
|
338
|
-
var
|
|
342
|
+
var ethToEthereum = eth.extend({
|
|
339
343
|
destChain: z.literal(Chains.Ethereum),
|
|
340
344
|
destAddress: ethereumAddress
|
|
341
345
|
});
|
|
342
|
-
var
|
|
346
|
+
var ethToDot = eth.extend({
|
|
343
347
|
destChain: z.literal(Chains.Polkadot),
|
|
344
|
-
destAddress: dotAddress.transform((addr) => bytesToHex(decodeAddress(addr)))
|
|
348
|
+
destAddress: dotAddress.transform((addr) => bytesToHex(decodeAddress(addr))),
|
|
349
|
+
destAsset: z.literal(Assets.DOT)
|
|
345
350
|
});
|
|
346
|
-
var
|
|
351
|
+
var ethToBtc = eth.extend({
|
|
347
352
|
destChain: z.literal(Chains.Bitcoin),
|
|
348
|
-
destAddress: btcAddress.transform(utf8ToHex)
|
|
353
|
+
destAddress: btcAddress().transform(utf8ToHex),
|
|
354
|
+
destAsset: z.literal(Assets.BTC)
|
|
349
355
|
});
|
|
350
|
-
var
|
|
356
|
+
var erc20Asset = z.union([
|
|
351
357
|
z.literal(Assets.FLIP),
|
|
352
358
|
z.literal(Assets.USDC)
|
|
353
359
|
]);
|
|
354
|
-
var
|
|
355
|
-
destAsset:
|
|
356
|
-
});
|
|
357
|
-
var polkadotNative = polkadotBase.extend({
|
|
358
|
-
destAsset: z.literal(Assets.DOT)
|
|
359
|
-
});
|
|
360
|
-
var bitcoinNative = bitcoinBase.extend({
|
|
361
|
-
destAsset: z.literal(Assets.BTC)
|
|
360
|
+
var ethToERC20 = ethToEthereum.extend({
|
|
361
|
+
destAsset: erc20Asset
|
|
362
362
|
});
|
|
363
363
|
var nativeSwapParamsSchema = z.union([
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
364
|
+
ethToERC20,
|
|
365
|
+
ethToDot,
|
|
366
|
+
ethToBtc
|
|
367
367
|
]);
|
|
368
|
+
var flipToEthereumAsset = ethToEthereum.extend({
|
|
369
|
+
srcAsset: z.literal(Assets.FLIP),
|
|
370
|
+
destAsset: z.union([
|
|
371
|
+
z.literal(Assets.USDC),
|
|
372
|
+
z.literal(Assets.ETH)
|
|
373
|
+
])
|
|
374
|
+
});
|
|
375
|
+
var usdcToEthereumAsset = ethToEthereum.extend({
|
|
376
|
+
srcAsset: z.literal(Assets.USDC),
|
|
377
|
+
destAsset: z.union([
|
|
378
|
+
z.literal(Assets.FLIP),
|
|
379
|
+
z.literal(Assets.ETH)
|
|
380
|
+
])
|
|
381
|
+
});
|
|
382
|
+
var erc20ToDot = ethToDot.extend({
|
|
383
|
+
srcAsset: erc20Asset
|
|
384
|
+
});
|
|
385
|
+
var erc20ToBtc = ethToBtc.extend({
|
|
386
|
+
srcAsset: erc20Asset
|
|
387
|
+
});
|
|
368
388
|
var tokenSwapParamsSchema = z.union([
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
z.literal(Assets.ETH)
|
|
374
|
-
])
|
|
375
|
-
}),
|
|
376
|
-
ethereumBase.extend({
|
|
377
|
-
srcAsset: z.literal(Assets.USDC),
|
|
378
|
-
destAsset: z.union([
|
|
379
|
-
z.literal(Assets.FLIP),
|
|
380
|
-
z.literal(Assets.ETH)
|
|
381
|
-
])
|
|
382
|
-
}),
|
|
383
|
-
polkadotNative.extend({
|
|
384
|
-
srcAsset: erc20
|
|
385
|
-
}),
|
|
386
|
-
bitcoinNative.extend({
|
|
387
|
-
srcAsset: erc20
|
|
388
|
-
})
|
|
389
|
+
flipToEthereumAsset,
|
|
390
|
+
usdcToEthereumAsset,
|
|
391
|
+
erc20ToDot,
|
|
392
|
+
erc20ToBtc
|
|
389
393
|
]);
|
|
390
394
|
var ccmMetadataSchema = z.object({
|
|
391
395
|
message: z.string(),
|
|
392
396
|
gasBudget: numericString
|
|
393
397
|
});
|
|
398
|
+
var ccmFlipToEthereumAssset = flipToEthereumAsset.extend({
|
|
399
|
+
ccmMetadata: ccmMetadataSchema
|
|
400
|
+
});
|
|
401
|
+
var ccmUsdcToEthereumAsset = usdcToEthereumAsset.extend({
|
|
402
|
+
ccmMetadata: ccmMetadataSchema
|
|
403
|
+
});
|
|
394
404
|
var tokenCallParamsSchema = z.union([
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
destAsset: z.union([
|
|
398
|
-
z.literal(Assets.USDC),
|
|
399
|
-
z.literal(Assets.ETH)
|
|
400
|
-
]),
|
|
401
|
-
ccmMetadata: ccmMetadataSchema
|
|
402
|
-
}),
|
|
403
|
-
ethereumBase.extend({
|
|
404
|
-
srcAsset: z.literal(Assets.USDC),
|
|
405
|
-
destAsset: z.union([
|
|
406
|
-
z.literal(Assets.FLIP),
|
|
407
|
-
z.literal(Assets.ETH)
|
|
408
|
-
]),
|
|
409
|
-
ccmMetadata: ccmMetadataSchema
|
|
410
|
-
})
|
|
405
|
+
ccmFlipToEthereumAssset,
|
|
406
|
+
ccmUsdcToEthereumAsset
|
|
411
407
|
]);
|
|
412
|
-
var nativeCallParamsSchema =
|
|
413
|
-
destAsset: erc20,
|
|
408
|
+
var nativeCallParamsSchema = ethToERC20.extend({
|
|
414
409
|
ccmMetadata: ccmMetadataSchema
|
|
415
410
|
});
|
|
416
411
|
var executeSwapParamsSchema = z.union([
|
|
@@ -420,6 +415,10 @@ var executeSwapParamsSchema = z.union([
|
|
|
420
415
|
nativeSwapParamsSchema,
|
|
421
416
|
tokenSwapParamsSchema
|
|
422
417
|
]);
|
|
418
|
+
var stripOverrides = /* @__PURE__ */ __name((obj) => {
|
|
419
|
+
const { to, from, value, data, ...rest } = obj;
|
|
420
|
+
return rest;
|
|
421
|
+
}, "stripOverrides");
|
|
423
422
|
var executeOptionsSchema = z.intersection(z.object({
|
|
424
423
|
signer: z.instanceof(Signer)
|
|
425
424
|
}).passthrough(), z.union([
|
|
@@ -431,7 +430,7 @@ var executeOptionsSchema = z.intersection(z.object({
|
|
|
431
430
|
vaultContractAddress: z.string(),
|
|
432
431
|
srcTokenContractAddress: z.string().optional()
|
|
433
432
|
}).passthrough()
|
|
434
|
-
]));
|
|
433
|
+
])).transform(stripOverrides);
|
|
435
434
|
|
|
436
435
|
// ../shared/src/vault/executeSwap.ts
|
|
437
436
|
var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, { network, vaultContractAddress: address, signer, ...opts }) => {
|
|
@@ -490,11 +489,11 @@ var checkVaultAllowance = /* @__PURE__ */ __name((params, opts) => {
|
|
|
490
489
|
return checkAllowance(params.amount, vaultContractAddress, erc20Address, opts.signer);
|
|
491
490
|
}, "checkVaultAllowance");
|
|
492
491
|
var approveVault = /* @__PURE__ */ __name(async (params, opts) => {
|
|
493
|
-
const { isAllowable, erc20
|
|
492
|
+
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params, opts);
|
|
494
493
|
if (isAllowable)
|
|
495
494
|
return null;
|
|
496
495
|
const vaultContractAddress = opts.network === "localnet" ? opts.vaultContractAddress : getVaultManagerContractAddress(opts.network);
|
|
497
|
-
return approve(params.amount, vaultContractAddress,
|
|
496
|
+
return approve(params.amount, vaultContractAddress, erc20, allowance, opts.nonce);
|
|
498
497
|
}, "approveVault");
|
|
499
498
|
|
|
500
499
|
// src/swap/consts.ts
|
|
@@ -665,6 +664,9 @@ var ApiService_default = {
|
|
|
665
664
|
// src/swap/sdk.ts
|
|
666
665
|
var SwapSDK = class {
|
|
667
666
|
constructor(options = {}) {
|
|
667
|
+
__publicField(this, "baseUrl");
|
|
668
|
+
__publicField(this, "network");
|
|
669
|
+
__publicField(this, "signer");
|
|
668
670
|
this.network = options.network ?? ChainflipNetworks.partnernet;
|
|
669
671
|
this.baseUrl = options.backendUrl ?? BACKEND_SERVICE_URLS[this.network];
|
|
670
672
|
this.signer = options.signer;
|