@chainflip/sdk 0.1.20 → 0.2.0
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-VOWQWFJD.mjs → chunk-UBMU3BTF.mjs} +21 -23
- package/dist/{enums-3131916c.d.ts → contracts-646d1727.d.ts} +10 -1
- package/dist/funding.d.mts +5 -5
- package/dist/funding.d.ts +5 -5
- package/dist/funding.js +51 -64
- package/dist/funding.mjs +36 -47
- package/dist/swap.d.mts +47 -48
- package/dist/swap.d.ts +47 -48
- package/dist/swap.js +66 -90
- package/dist/swap.mjs +54 -78
- package/package.json +2 -2
package/dist/swap.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var utilCrypto = require('@polkadot/util-crypto');
|
|
4
|
-
var ethers = require('ethers');
|
|
5
4
|
var zod = require('zod');
|
|
6
5
|
var util = require('@polkadot/util');
|
|
6
|
+
var ethers = require('ethers');
|
|
7
7
|
var axios = require('axios');
|
|
8
8
|
|
|
9
9
|
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
@@ -321,7 +321,7 @@ var assertArraylikeEqual = /* @__PURE__ */ __name((a, b) => {
|
|
|
321
321
|
}, "assertArraylikeEqual");
|
|
322
322
|
var validateP2PKHOrP2SHAddress = /* @__PURE__ */ __name((address, network) => {
|
|
323
323
|
try {
|
|
324
|
-
const decoded =
|
|
324
|
+
const decoded = utilCrypto.base58Decode(address);
|
|
325
325
|
assert(decoded.length === 25, "decoded address must be 25 bytes long");
|
|
326
326
|
if (network === "mainnet") {
|
|
327
327
|
assert(decoded[0] === 0 || decoded[0] === 5, "decoded address must start with 0x00 or 0x05");
|
|
@@ -329,7 +329,7 @@ var validateP2PKHOrP2SHAddress = /* @__PURE__ */ __name((address, network) => {
|
|
|
329
329
|
assert(decoded[0] === 111 || decoded[0] === 196, "decoded address must start with 0x6f or 0xc4");
|
|
330
330
|
}
|
|
331
331
|
const checksum = decoded.slice(-4);
|
|
332
|
-
const doubleHash = ethers__namespace.
|
|
332
|
+
const doubleHash = ethers__namespace.getBytes(ethers__namespace.sha256(ethers__namespace.sha256(decoded.slice(0, 21))));
|
|
333
333
|
assertArraylikeEqual(checksum, doubleHash.slice(0, 4));
|
|
334
334
|
return true;
|
|
335
335
|
} catch (error) {
|
|
@@ -367,7 +367,7 @@ zod.z.number({
|
|
|
367
367
|
});
|
|
368
368
|
var numericString = string.regex(/^[0-9]+$/);
|
|
369
369
|
var hexString = zod.z.custom((val) => typeof val === "string" && /^0x[0-9a-f]+$/i.test(val));
|
|
370
|
-
numericString.transform((arg) =>
|
|
370
|
+
numericString.transform((arg) => `0x${BigInt(arg).toString(16)}`);
|
|
371
371
|
string.regex(/^[0-9a-f]+$/);
|
|
372
372
|
var btcAddress = /* @__PURE__ */ __name((env) => {
|
|
373
373
|
const network = env ?? process.env.CHAINFLIP_NETWORK;
|
|
@@ -392,7 +392,7 @@ var dotAddress = zod.z.union([
|
|
|
392
392
|
return null;
|
|
393
393
|
}
|
|
394
394
|
}).refine(isString);
|
|
395
|
-
var ethereumAddress = hexString.refine((address) => ethers__namespace.
|
|
395
|
+
var ethereumAddress = hexString.refine((address) => ethers__namespace.isAddress(address));
|
|
396
396
|
numericString.transform((arg) => BigInt(arg));
|
|
397
397
|
var u128 = zod.z.union([
|
|
398
398
|
numericString,
|
|
@@ -413,7 +413,7 @@ zod.z.object({
|
|
|
413
413
|
}).transform(({ __kind }) => __kind.toUpperCase());
|
|
414
414
|
zod.z.nativeEnum(Chains);
|
|
415
415
|
zod.z.nativeEnum(Assets);
|
|
416
|
-
|
|
416
|
+
zod.z.nativeEnum(ChainflipNetworks);
|
|
417
417
|
zod.z.union([
|
|
418
418
|
zod.z.object({
|
|
419
419
|
__kind: zod.z.literal("CcmPrincipal"),
|
|
@@ -442,11 +442,7 @@ var bytesToHex = /* @__PURE__ */ __name((arr) => `0x${[
|
|
|
442
442
|
].map((v) => v.toString(16).padStart(2, "0")).join("")}`, "bytesToHex");
|
|
443
443
|
var utf8ToHex = /* @__PURE__ */ __name((str) => `0x${Buffer.from(str).toString("hex")}`, "utf8ToHex");
|
|
444
444
|
var eth = zod.z.object({
|
|
445
|
-
amount: zod.z.
|
|
446
|
-
numericString,
|
|
447
|
-
hexString,
|
|
448
|
-
zod.z.bigint()
|
|
449
|
-
]),
|
|
445
|
+
amount: zod.z.bigint(),
|
|
450
446
|
srcChain: zod.z.literal(Chains.Ethereum),
|
|
451
447
|
srcAsset: zod.z.literal(Assets.ETH)
|
|
452
448
|
});
|
|
@@ -526,22 +522,6 @@ var executeSwapParamsSchema = zod.z.union([
|
|
|
526
522
|
nativeSwapParamsSchema,
|
|
527
523
|
tokenSwapParamsSchema
|
|
528
524
|
]);
|
|
529
|
-
var stripOverrides = /* @__PURE__ */ __name((obj) => {
|
|
530
|
-
const { to, from, value, data, ...rest } = obj;
|
|
531
|
-
return rest;
|
|
532
|
-
}, "stripOverrides");
|
|
533
|
-
var executeOptionsSchema = zod.z.intersection(zod.z.object({
|
|
534
|
-
signer: zod.z.instanceof(ethers.Signer)
|
|
535
|
-
}).passthrough(), zod.z.union([
|
|
536
|
-
zod.z.object({
|
|
537
|
-
network: chainflipNetwork
|
|
538
|
-
}).passthrough(),
|
|
539
|
-
zod.z.object({
|
|
540
|
-
network: zod.z.literal("localnet"),
|
|
541
|
-
vaultContractAddress: zod.z.string(),
|
|
542
|
-
srcTokenContractAddress: zod.z.string().optional()
|
|
543
|
-
}).passthrough()
|
|
544
|
-
])).transform(stripOverrides);
|
|
545
525
|
var _abi = [
|
|
546
526
|
{
|
|
547
527
|
inputs: [
|
|
@@ -613,10 +593,10 @@ var _abi = [
|
|
|
613
593
|
];
|
|
614
594
|
var _ERC20__factory = class _ERC20__factory {
|
|
615
595
|
static createInterface() {
|
|
616
|
-
return new ethers.
|
|
596
|
+
return new ethers.Interface(_abi);
|
|
617
597
|
}
|
|
618
|
-
static connect(address,
|
|
619
|
-
return new ethers.Contract(address, _abi,
|
|
598
|
+
static connect(address, runner) {
|
|
599
|
+
return new ethers.Contract(address, _abi, runner);
|
|
620
600
|
}
|
|
621
601
|
};
|
|
622
602
|
__name(_ERC20__factory, "ERC20__factory");
|
|
@@ -1837,10 +1817,10 @@ var _abi2 = [
|
|
|
1837
1817
|
];
|
|
1838
1818
|
var _Vault__factory = class _Vault__factory {
|
|
1839
1819
|
static createInterface() {
|
|
1840
|
-
return new ethers.
|
|
1820
|
+
return new ethers.Interface(_abi2);
|
|
1841
1821
|
}
|
|
1842
|
-
static connect(address,
|
|
1843
|
-
return new ethers.Contract(address, _abi2,
|
|
1822
|
+
static connect(address, runner) {
|
|
1823
|
+
return new ethers.Contract(address, _abi2, runner);
|
|
1844
1824
|
}
|
|
1845
1825
|
};
|
|
1846
1826
|
__name(_Vault__factory, "Vault__factory");
|
|
@@ -1888,6 +1868,10 @@ var ADDRESSES = {
|
|
|
1888
1868
|
var GOERLI_USDC_CONTRACT_ADDRESS = "0x07865c6E87B9F70255377e024ace6630C1Eaa37F";
|
|
1889
1869
|
|
|
1890
1870
|
// ../shared/src/contracts.ts
|
|
1871
|
+
var extractOverrides = /* @__PURE__ */ __name((transactionOverrides) => {
|
|
1872
|
+
const { wait, ...ethersOverrides } = transactionOverrides;
|
|
1873
|
+
return ethersOverrides;
|
|
1874
|
+
}, "extractOverrides");
|
|
1891
1875
|
var getTokenContractAddress = /* @__PURE__ */ __name((asset, network) => {
|
|
1892
1876
|
assert(network !== ChainflipNetworks.mainnet, "Mainnet is not yet supported");
|
|
1893
1877
|
if (asset === Assets.FLIP)
|
|
@@ -1901,20 +1885,15 @@ var checkAllowance = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20
|
|
|
1901
1885
|
const allowance = await erc20.allowance(signerAddress, spenderAddress);
|
|
1902
1886
|
return {
|
|
1903
1887
|
allowance,
|
|
1904
|
-
isAllowable: allowance
|
|
1888
|
+
isAllowable: allowance >= amount,
|
|
1905
1889
|
erc20
|
|
1906
1890
|
};
|
|
1907
1891
|
}, "checkAllowance");
|
|
1908
|
-
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance,
|
|
1909
|
-
|
|
1910
|
-
const allowanceBigNumber = ethers.BigNumber.from(allowance);
|
|
1911
|
-
if (allowanceBigNumber.gte(amountBigNumber))
|
|
1892
|
+
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance, txOpts) => {
|
|
1893
|
+
if (allowance >= amount)
|
|
1912
1894
|
return null;
|
|
1913
|
-
const
|
|
1914
|
-
|
|
1915
|
-
nonce
|
|
1916
|
-
});
|
|
1917
|
-
return tx.wait(1);
|
|
1895
|
+
const transaction = await erc20.approve(spenderAddress, amount - allowance, extractOverrides(txOpts));
|
|
1896
|
+
return transaction.wait(txOpts.wait);
|
|
1918
1897
|
}, "approve");
|
|
1919
1898
|
var getVaultManagerContractAddress = /* @__PURE__ */ __name((network) => {
|
|
1920
1899
|
assert(network !== ChainflipNetworks.mainnet, "Mainnet is not yet supported");
|
|
@@ -1922,67 +1901,66 @@ var getVaultManagerContractAddress = /* @__PURE__ */ __name((network) => {
|
|
|
1922
1901
|
}, "getVaultManagerContractAddress");
|
|
1923
1902
|
|
|
1924
1903
|
// ../shared/src/vault/executeSwap.ts
|
|
1925
|
-
var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount },
|
|
1926
|
-
const vaultContractAddress = network === "localnet" ?
|
|
1927
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
1928
|
-
const transaction = await vault.xSwapNative(chainContractIds[destChain], destAddress, assetContractIds[destAsset],
|
|
1904
|
+
var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, networkOpts, txOpts) => {
|
|
1905
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1906
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
1907
|
+
const transaction = await vault.xSwapNative(chainContractIds[destChain], destAddress, assetContractIds[destAsset], "", {
|
|
1929
1908
|
value: amount,
|
|
1930
|
-
...
|
|
1909
|
+
...extractOverrides(txOpts)
|
|
1931
1910
|
});
|
|
1932
|
-
return transaction.wait(
|
|
1911
|
+
return transaction.wait(txOpts.wait);
|
|
1933
1912
|
}, "swapNative");
|
|
1934
|
-
var swapToken = /* @__PURE__ */ __name(async (params,
|
|
1935
|
-
const vaultContractAddress = network === "localnet" ?
|
|
1936
|
-
const erc20Address = network === "localnet" ?
|
|
1913
|
+
var swapToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1914
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1915
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
1937
1916
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
1938
|
-
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
1917
|
+
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
1939
1918
|
assert(isAllowable, "Swap amount exceeds allowance");
|
|
1940
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
1941
|
-
const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount,
|
|
1942
|
-
return transaction.wait(
|
|
1919
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
1920
|
+
const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, "", extractOverrides(txOpts));
|
|
1921
|
+
return transaction.wait(txOpts.wait);
|
|
1943
1922
|
}, "swapToken");
|
|
1944
|
-
var callNative = /* @__PURE__ */ __name(async (params,
|
|
1945
|
-
const vaultContractAddress = network === "localnet" ?
|
|
1946
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
1947
|
-
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget,
|
|
1923
|
+
var callNative = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1924
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1925
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
1926
|
+
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, "", {
|
|
1948
1927
|
value: params.amount,
|
|
1949
|
-
...
|
|
1928
|
+
...extractOverrides(txOpts)
|
|
1950
1929
|
});
|
|
1951
|
-
return transaction.wait(
|
|
1930
|
+
return transaction.wait(txOpts.wait);
|
|
1952
1931
|
}, "callNative");
|
|
1953
|
-
var callToken = /* @__PURE__ */ __name(async (params,
|
|
1954
|
-
const vaultContractAddress = network === "localnet" ?
|
|
1955
|
-
const erc20Address = network === "localnet" ?
|
|
1932
|
+
var callToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1933
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1934
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
1956
1935
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
1957
|
-
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
1936
|
+
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
1958
1937
|
assert(isAllowable, "Swap amount exceeds allowance");
|
|
1959
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
1960
|
-
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, erc20Address, params.amount,
|
|
1961
|
-
return transaction.wait(
|
|
1938
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
1939
|
+
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, erc20Address, params.amount, "", extractOverrides(txOpts));
|
|
1940
|
+
return transaction.wait(txOpts.wait);
|
|
1962
1941
|
}, "callToken");
|
|
1963
|
-
var executeSwap = /* @__PURE__ */ __name(async (params,
|
|
1942
|
+
var executeSwap = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1964
1943
|
const parsedParams = executeSwapParamsSchema.parse(params);
|
|
1965
|
-
const opts = executeOptionsSchema.parse(options);
|
|
1966
1944
|
if ("ccmMetadata" in parsedParams) {
|
|
1967
|
-
return isTokenCall(parsedParams) ? callToken(parsedParams,
|
|
1945
|
+
return isTokenCall(parsedParams) ? callToken(parsedParams, networkOpts, txOpts) : callNative(parsedParams, networkOpts, txOpts);
|
|
1968
1946
|
}
|
|
1969
|
-
return isTokenSwap(parsedParams) ? swapToken(parsedParams,
|
|
1947
|
+
return isTokenSwap(parsedParams) ? swapToken(parsedParams, networkOpts, txOpts) : swapNative(parsedParams, networkOpts, txOpts);
|
|
1970
1948
|
}, "executeSwap");
|
|
1971
1949
|
var executeSwap_default = executeSwap;
|
|
1972
1950
|
|
|
1973
1951
|
// ../shared/src/vault/approval.ts
|
|
1974
|
-
var checkVaultAllowance = /* @__PURE__ */ __name((params,
|
|
1975
|
-
const erc20Address =
|
|
1952
|
+
var checkVaultAllowance = /* @__PURE__ */ __name((params, networkOpts) => {
|
|
1953
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
1976
1954
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
1977
|
-
const vaultContractAddress =
|
|
1978
|
-
return checkAllowance(params.amount, vaultContractAddress, erc20Address,
|
|
1955
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1956
|
+
return checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
1979
1957
|
}, "checkVaultAllowance");
|
|
1980
|
-
var approveVault = /* @__PURE__ */ __name(async (params,
|
|
1981
|
-
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params,
|
|
1958
|
+
var approveVault = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1959
|
+
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params, networkOpts);
|
|
1982
1960
|
if (isAllowable)
|
|
1983
1961
|
return null;
|
|
1984
|
-
const vaultContractAddress =
|
|
1985
|
-
return approve(params.amount, vaultContractAddress, erc20, allowance,
|
|
1962
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1963
|
+
return approve(params.amount, vaultContractAddress, erc20, allowance, txOpts);
|
|
1986
1964
|
}, "approveVault");
|
|
1987
1965
|
|
|
1988
1966
|
// src/swap/consts.ts
|
|
@@ -2188,25 +2166,23 @@ var _SwapSDK = class _SwapSDK {
|
|
|
2188
2166
|
getStatus(swapStatusRequest, options = {}) {
|
|
2189
2167
|
return ApiService_default.getStatus(this.baseUrl, swapStatusRequest, options);
|
|
2190
2168
|
}
|
|
2191
|
-
async executeSwap(params,
|
|
2169
|
+
async executeSwap(params, txOpts = {}) {
|
|
2192
2170
|
assert(this.signer, "No signer provided");
|
|
2193
2171
|
const receipt = await executeSwap_default(params, {
|
|
2194
|
-
...overrides,
|
|
2195
2172
|
network: this.network,
|
|
2196
2173
|
signer: this.signer
|
|
2197
|
-
});
|
|
2198
|
-
return receipt.
|
|
2174
|
+
}, txOpts);
|
|
2175
|
+
return receipt.hash;
|
|
2199
2176
|
}
|
|
2200
|
-
async approveVault(params,
|
|
2177
|
+
async approveVault(params, txOpts = {}) {
|
|
2201
2178
|
if (!("srcAsset" in params))
|
|
2202
2179
|
return null;
|
|
2203
2180
|
assert(this.signer, "No signer provided");
|
|
2204
2181
|
const receipt = await approveVault(params, {
|
|
2205
2182
|
signer: this.signer,
|
|
2206
|
-
network: this.network
|
|
2207
|
-
|
|
2208
|
-
|
|
2209
|
-
return receipt && receipt.transactionHash;
|
|
2183
|
+
network: this.network
|
|
2184
|
+
}, txOpts);
|
|
2185
|
+
return receipt && receipt.hash;
|
|
2210
2186
|
}
|
|
2211
2187
|
};
|
|
2212
2188
|
__name(_SwapSDK, "SwapSDK");
|
package/dist/swap.mjs
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { isString, Chains, Assets, ChainflipNetworks, __name, __publicField, assert, getVaultManagerContractAddress, approve, isTokenCall, isTokenSwap, getTokenContractAddress, checkAllowance, Vault__factory, chainContractIds, assetContractIds, assetDecimals, isTestnet, getMinimumDepositAmount, getMinimumSwapAmount } from './chunk-
|
|
2
|
-
export { Assets, ChainflipNetworks, Chains, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds } from './chunk-
|
|
3
|
-
import { encodeAddress, decodeAddress } from '@polkadot/util-crypto';
|
|
4
|
-
import * as ethers from 'ethers';
|
|
5
|
-
import { Signer } from 'ethers';
|
|
1
|
+
import { isString, Chains, Assets, ChainflipNetworks, __name, __publicField, assert, getVaultManagerContractAddress, approve, isTokenCall, isTokenSwap, getTokenContractAddress, checkAllowance, Vault__factory, chainContractIds, assetContractIds, extractOverrides, assetDecimals, isTestnet, getMinimumDepositAmount, getMinimumSwapAmount } from './chunk-UBMU3BTF.mjs';
|
|
2
|
+
export { Assets, ChainflipNetworks, Chains, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds } from './chunk-UBMU3BTF.mjs';
|
|
3
|
+
import { encodeAddress, decodeAddress, base58Decode } from '@polkadot/util-crypto';
|
|
6
4
|
import { z } from 'zod';
|
|
7
5
|
import { hexToU8a } from '@polkadot/util';
|
|
6
|
+
import * as ethers from 'ethers';
|
|
8
7
|
import axios from 'axios';
|
|
9
8
|
|
|
10
9
|
// ../shared/src/validation/segwitAddr.ts
|
|
@@ -210,7 +209,7 @@ var assertArraylikeEqual = /* @__PURE__ */ __name((a, b) => {
|
|
|
210
209
|
}, "assertArraylikeEqual");
|
|
211
210
|
var validateP2PKHOrP2SHAddress = /* @__PURE__ */ __name((address, network) => {
|
|
212
211
|
try {
|
|
213
|
-
const decoded =
|
|
212
|
+
const decoded = base58Decode(address);
|
|
214
213
|
assert(decoded.length === 25, "decoded address must be 25 bytes long");
|
|
215
214
|
if (network === "mainnet") {
|
|
216
215
|
assert(decoded[0] === 0 || decoded[0] === 5, "decoded address must start with 0x00 or 0x05");
|
|
@@ -218,7 +217,7 @@ var validateP2PKHOrP2SHAddress = /* @__PURE__ */ __name((address, network) => {
|
|
|
218
217
|
assert(decoded[0] === 111 || decoded[0] === 196, "decoded address must start with 0x6f or 0xc4");
|
|
219
218
|
}
|
|
220
219
|
const checksum = decoded.slice(-4);
|
|
221
|
-
const doubleHash = ethers.
|
|
220
|
+
const doubleHash = ethers.getBytes(ethers.sha256(ethers.sha256(decoded.slice(0, 21))));
|
|
222
221
|
assertArraylikeEqual(checksum, doubleHash.slice(0, 4));
|
|
223
222
|
return true;
|
|
224
223
|
} catch (error) {
|
|
@@ -256,7 +255,7 @@ z.number({
|
|
|
256
255
|
});
|
|
257
256
|
var numericString = string.regex(/^[0-9]+$/);
|
|
258
257
|
var hexString = z.custom((val) => typeof val === "string" && /^0x[0-9a-f]+$/i.test(val));
|
|
259
|
-
numericString.transform((arg) =>
|
|
258
|
+
numericString.transform((arg) => `0x${BigInt(arg).toString(16)}`);
|
|
260
259
|
string.regex(/^[0-9a-f]+$/);
|
|
261
260
|
var btcAddress = /* @__PURE__ */ __name((env) => {
|
|
262
261
|
const network = env ?? process.env.CHAINFLIP_NETWORK;
|
|
@@ -281,7 +280,7 @@ var dotAddress = z.union([
|
|
|
281
280
|
return null;
|
|
282
281
|
}
|
|
283
282
|
}).refine(isString);
|
|
284
|
-
var ethereumAddress = hexString.refine((address) => ethers.
|
|
283
|
+
var ethereumAddress = hexString.refine((address) => ethers.isAddress(address));
|
|
285
284
|
numericString.transform((arg) => BigInt(arg));
|
|
286
285
|
var u128 = z.union([
|
|
287
286
|
numericString,
|
|
@@ -302,7 +301,7 @@ z.object({
|
|
|
302
301
|
}).transform(({ __kind }) => __kind.toUpperCase());
|
|
303
302
|
z.nativeEnum(Chains);
|
|
304
303
|
z.nativeEnum(Assets);
|
|
305
|
-
|
|
304
|
+
z.nativeEnum(ChainflipNetworks);
|
|
306
305
|
z.union([
|
|
307
306
|
z.object({
|
|
308
307
|
__kind: z.literal("CcmPrincipal"),
|
|
@@ -331,11 +330,7 @@ var bytesToHex = /* @__PURE__ */ __name((arr) => `0x${[
|
|
|
331
330
|
].map((v) => v.toString(16).padStart(2, "0")).join("")}`, "bytesToHex");
|
|
332
331
|
var utf8ToHex = /* @__PURE__ */ __name((str) => `0x${Buffer.from(str).toString("hex")}`, "utf8ToHex");
|
|
333
332
|
var eth = z.object({
|
|
334
|
-
amount: z.
|
|
335
|
-
numericString,
|
|
336
|
-
hexString,
|
|
337
|
-
z.bigint()
|
|
338
|
-
]),
|
|
333
|
+
amount: z.bigint(),
|
|
339
334
|
srcChain: z.literal(Chains.Ethereum),
|
|
340
335
|
srcAsset: z.literal(Assets.ETH)
|
|
341
336
|
});
|
|
@@ -415,85 +410,68 @@ var executeSwapParamsSchema = z.union([
|
|
|
415
410
|
nativeSwapParamsSchema,
|
|
416
411
|
tokenSwapParamsSchema
|
|
417
412
|
]);
|
|
418
|
-
var stripOverrides = /* @__PURE__ */ __name((obj) => {
|
|
419
|
-
const { to, from, value, data, ...rest } = obj;
|
|
420
|
-
return rest;
|
|
421
|
-
}, "stripOverrides");
|
|
422
|
-
var executeOptionsSchema = z.intersection(z.object({
|
|
423
|
-
signer: z.instanceof(Signer)
|
|
424
|
-
}).passthrough(), z.union([
|
|
425
|
-
z.object({
|
|
426
|
-
network: chainflipNetwork
|
|
427
|
-
}).passthrough(),
|
|
428
|
-
z.object({
|
|
429
|
-
network: z.literal("localnet"),
|
|
430
|
-
vaultContractAddress: z.string(),
|
|
431
|
-
srcTokenContractAddress: z.string().optional()
|
|
432
|
-
}).passthrough()
|
|
433
|
-
])).transform(stripOverrides);
|
|
434
413
|
|
|
435
414
|
// ../shared/src/vault/executeSwap.ts
|
|
436
|
-
var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount },
|
|
437
|
-
const vaultContractAddress = network === "localnet" ?
|
|
438
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
439
|
-
const transaction = await vault.xSwapNative(chainContractIds[destChain], destAddress, assetContractIds[destAsset],
|
|
415
|
+
var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, networkOpts, txOpts) => {
|
|
416
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
417
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
418
|
+
const transaction = await vault.xSwapNative(chainContractIds[destChain], destAddress, assetContractIds[destAsset], "", {
|
|
440
419
|
value: amount,
|
|
441
|
-
...
|
|
420
|
+
...extractOverrides(txOpts)
|
|
442
421
|
});
|
|
443
|
-
return transaction.wait(
|
|
422
|
+
return transaction.wait(txOpts.wait);
|
|
444
423
|
}, "swapNative");
|
|
445
|
-
var swapToken = /* @__PURE__ */ __name(async (params,
|
|
446
|
-
const vaultContractAddress = network === "localnet" ?
|
|
447
|
-
const erc20Address = network === "localnet" ?
|
|
424
|
+
var swapToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
425
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
426
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
448
427
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
449
|
-
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
428
|
+
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
450
429
|
assert(isAllowable, "Swap amount exceeds allowance");
|
|
451
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
452
|
-
const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount,
|
|
453
|
-
return transaction.wait(
|
|
430
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
431
|
+
const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, "", extractOverrides(txOpts));
|
|
432
|
+
return transaction.wait(txOpts.wait);
|
|
454
433
|
}, "swapToken");
|
|
455
|
-
var callNative = /* @__PURE__ */ __name(async (params,
|
|
456
|
-
const vaultContractAddress = network === "localnet" ?
|
|
457
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
458
|
-
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget,
|
|
434
|
+
var callNative = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
435
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
436
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
437
|
+
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, "", {
|
|
459
438
|
value: params.amount,
|
|
460
|
-
...
|
|
439
|
+
...extractOverrides(txOpts)
|
|
461
440
|
});
|
|
462
|
-
return transaction.wait(
|
|
441
|
+
return transaction.wait(txOpts.wait);
|
|
463
442
|
}, "callNative");
|
|
464
|
-
var callToken = /* @__PURE__ */ __name(async (params,
|
|
465
|
-
const vaultContractAddress = network === "localnet" ?
|
|
466
|
-
const erc20Address = network === "localnet" ?
|
|
443
|
+
var callToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
444
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
445
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
467
446
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
468
|
-
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
447
|
+
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
469
448
|
assert(isAllowable, "Swap amount exceeds allowance");
|
|
470
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
471
|
-
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, erc20Address, params.amount,
|
|
472
|
-
return transaction.wait(
|
|
449
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
450
|
+
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, erc20Address, params.amount, "", extractOverrides(txOpts));
|
|
451
|
+
return transaction.wait(txOpts.wait);
|
|
473
452
|
}, "callToken");
|
|
474
|
-
var executeSwap = /* @__PURE__ */ __name(async (params,
|
|
453
|
+
var executeSwap = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
475
454
|
const parsedParams = executeSwapParamsSchema.parse(params);
|
|
476
|
-
const opts = executeOptionsSchema.parse(options);
|
|
477
455
|
if ("ccmMetadata" in parsedParams) {
|
|
478
|
-
return isTokenCall(parsedParams) ? callToken(parsedParams,
|
|
456
|
+
return isTokenCall(parsedParams) ? callToken(parsedParams, networkOpts, txOpts) : callNative(parsedParams, networkOpts, txOpts);
|
|
479
457
|
}
|
|
480
|
-
return isTokenSwap(parsedParams) ? swapToken(parsedParams,
|
|
458
|
+
return isTokenSwap(parsedParams) ? swapToken(parsedParams, networkOpts, txOpts) : swapNative(parsedParams, networkOpts, txOpts);
|
|
481
459
|
}, "executeSwap");
|
|
482
460
|
var executeSwap_default = executeSwap;
|
|
483
461
|
|
|
484
462
|
// ../shared/src/vault/approval.ts
|
|
485
|
-
var checkVaultAllowance = /* @__PURE__ */ __name((params,
|
|
486
|
-
const erc20Address =
|
|
463
|
+
var checkVaultAllowance = /* @__PURE__ */ __name((params, networkOpts) => {
|
|
464
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
487
465
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
488
|
-
const vaultContractAddress =
|
|
489
|
-
return checkAllowance(params.amount, vaultContractAddress, erc20Address,
|
|
466
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
467
|
+
return checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
490
468
|
}, "checkVaultAllowance");
|
|
491
|
-
var approveVault = /* @__PURE__ */ __name(async (params,
|
|
492
|
-
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params,
|
|
469
|
+
var approveVault = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
470
|
+
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params, networkOpts);
|
|
493
471
|
if (isAllowable)
|
|
494
472
|
return null;
|
|
495
|
-
const vaultContractAddress =
|
|
496
|
-
return approve(params.amount, vaultContractAddress, erc20, allowance,
|
|
473
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
474
|
+
return approve(params.amount, vaultContractAddress, erc20, allowance, txOpts);
|
|
497
475
|
}, "approveVault");
|
|
498
476
|
|
|
499
477
|
// src/swap/consts.ts
|
|
@@ -699,25 +677,23 @@ var _SwapSDK = class _SwapSDK {
|
|
|
699
677
|
getStatus(swapStatusRequest, options = {}) {
|
|
700
678
|
return ApiService_default.getStatus(this.baseUrl, swapStatusRequest, options);
|
|
701
679
|
}
|
|
702
|
-
async executeSwap(params,
|
|
680
|
+
async executeSwap(params, txOpts = {}) {
|
|
703
681
|
assert(this.signer, "No signer provided");
|
|
704
682
|
const receipt = await executeSwap_default(params, {
|
|
705
|
-
...overrides,
|
|
706
683
|
network: this.network,
|
|
707
684
|
signer: this.signer
|
|
708
|
-
});
|
|
709
|
-
return receipt.
|
|
685
|
+
}, txOpts);
|
|
686
|
+
return receipt.hash;
|
|
710
687
|
}
|
|
711
|
-
async approveVault(params,
|
|
688
|
+
async approveVault(params, txOpts = {}) {
|
|
712
689
|
if (!("srcAsset" in params))
|
|
713
690
|
return null;
|
|
714
691
|
assert(this.signer, "No signer provided");
|
|
715
692
|
const receipt = await approveVault(params, {
|
|
716
693
|
signer: this.signer,
|
|
717
|
-
network: this.network
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
return receipt && receipt.transactionHash;
|
|
694
|
+
network: this.network
|
|
695
|
+
}, txOpts);
|
|
696
|
+
return receipt && receipt.hash;
|
|
721
697
|
}
|
|
722
698
|
};
|
|
723
699
|
__name(_SwapSDK, "SwapSDK");
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@chainflip/sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./swap": {
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@polkadot/util": "^12.4.2",
|
|
45
45
|
"@polkadot/util-crypto": "^12.4.2",
|
|
46
46
|
"axios": "^1.5.0",
|
|
47
|
-
"ethers": "
|
|
47
|
+
"ethers": "6.7.1",
|
|
48
48
|
"zod": "^3.22.2"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|