@chainflip/sdk 0.1.20 → 0.1.21
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-TH2B6MNX.mjs} +8 -6
- package/dist/{enums-3131916c.d.ts → contracts-0eb81d54.d.ts} +10 -1
- package/dist/funding.d.mts +4 -4
- package/dist/funding.d.ts +4 -4
- package/dist/funding.js +38 -46
- package/dist/funding.mjs +32 -42
- package/dist/swap.d.mts +5 -6
- package/dist/swap.d.ts +5 -6
- package/dist/swap.js +49 -66
- package/dist/swap.mjs +44 -64
- package/package.json +1 -1
|
@@ -2105,6 +2105,10 @@ var isTokenSwap = /* @__PURE__ */ __name((params) => params.srcAsset !== Assets.
|
|
|
2105
2105
|
var isTokenCall = /* @__PURE__ */ __name((params) => params.srcAsset !== Assets.ETH, "isTokenCall");
|
|
2106
2106
|
|
|
2107
2107
|
// ../shared/src/contracts.ts
|
|
2108
|
+
var extractOverrides = /* @__PURE__ */ __name((transactionOverrides) => {
|
|
2109
|
+
const { wait, ...ethersOverrides } = transactionOverrides;
|
|
2110
|
+
return ethersOverrides;
|
|
2111
|
+
}, "extractOverrides");
|
|
2108
2112
|
var getTokenContractAddress = /* @__PURE__ */ __name((asset, network) => {
|
|
2109
2113
|
assert(network !== ChainflipNetworks.mainnet, "Mainnet is not yet supported");
|
|
2110
2114
|
if (asset === Assets.FLIP)
|
|
@@ -2126,16 +2130,14 @@ var checkAllowance = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20
|
|
|
2126
2130
|
erc20
|
|
2127
2131
|
};
|
|
2128
2132
|
}, "checkAllowance");
|
|
2129
|
-
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance,
|
|
2133
|
+
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance, txOpts) => {
|
|
2130
2134
|
const amountBigNumber = BigNumber.from(amount);
|
|
2131
2135
|
const allowanceBigNumber = BigNumber.from(allowance);
|
|
2132
2136
|
if (allowanceBigNumber.gte(amountBigNumber))
|
|
2133
2137
|
return null;
|
|
2134
2138
|
const requiredAmount = amountBigNumber.sub(allowanceBigNumber);
|
|
2135
|
-
const
|
|
2136
|
-
|
|
2137
|
-
});
|
|
2138
|
-
return tx.wait(1);
|
|
2139
|
+
const transaction = await erc20.approve(spenderAddress, requiredAmount, extractOverrides(txOpts));
|
|
2140
|
+
return transaction.wait(txOpts.wait);
|
|
2139
2141
|
}, "approve");
|
|
2140
2142
|
var getVaultManagerContractAddress = /* @__PURE__ */ __name((network) => {
|
|
2141
2143
|
assert(network !== ChainflipNetworks.mainnet, "Mainnet is not yet supported");
|
|
@@ -2148,4 +2150,4 @@ var getFlipBalance = /* @__PURE__ */ __name(async (network, signer) => {
|
|
|
2148
2150
|
return balance.toBigInt();
|
|
2149
2151
|
}, "getFlipBalance");
|
|
2150
2152
|
|
|
2151
|
-
export { Assets, ChainflipNetworks, Chains, StateChainGateway__factory, Vault__factory, __name, __publicField, approve, assert, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds, checkAllowance, getFlipBalance, getMinimumDepositAmount, getMinimumSwapAmount, getStateChainGatewayContractAddress, getTokenContractAddress, getVaultManagerContractAddress, isString, isTestnet, isTokenCall, isTokenSwap };
|
|
2153
|
+
export { Assets, ChainflipNetworks, Chains, StateChainGateway__factory, Vault__factory, __name, __publicField, approve, assert, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds, checkAllowance, extractOverrides, getFlipBalance, getMinimumDepositAmount, getMinimumSwapAmount, getStateChainGatewayContractAddress, getTokenContractAddress, getVaultManagerContractAddress, isString, isTestnet, isTokenCall, isTokenSwap };
|
|
@@ -29,4 +29,13 @@ declare const chainAssets: {
|
|
|
29
29
|
};
|
|
30
30
|
declare const chainContractIds: Record<Chain, number>;
|
|
31
31
|
|
|
32
|
-
|
|
32
|
+
type TransactionOptions = {
|
|
33
|
+
gasLimit?: bigint;
|
|
34
|
+
gasPrice?: bigint;
|
|
35
|
+
maxFeePerGas?: bigint;
|
|
36
|
+
maxPriorityFeePerGas?: bigint;
|
|
37
|
+
nonce?: bigint;
|
|
38
|
+
wait?: number;
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
export { Asset as A, Chain as C, TransactionOptions as T, ChainflipNetwork as a, Chains as b, chainAssets as c, Assets as d, ChainflipNetworks as e, assetChains as f, assetDecimals as g, assetContractIds as h, chainContractIds as i };
|
package/dist/funding.d.mts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Signer } from 'ethers';
|
|
2
|
-
import { a as ChainflipNetwork } from './
|
|
2
|
+
import { T as TransactionOptions, a as ChainflipNetwork } from './contracts-0eb81d54.js';
|
|
3
3
|
|
|
4
4
|
type SDKOptions = {
|
|
5
5
|
network?: Exclude<ChainflipNetwork, 'mainnet'>;
|
|
@@ -9,12 +9,12 @@ type TransactionHash = string;
|
|
|
9
9
|
declare class FundingSDK {
|
|
10
10
|
private readonly options;
|
|
11
11
|
constructor(options: SDKOptions);
|
|
12
|
-
fundStateChainAccount(accountId: `0x${string}`, amount: string): Promise<TransactionHash>;
|
|
13
|
-
executeRedemption(accountId: `0x${string}
|
|
12
|
+
fundStateChainAccount(accountId: `0x${string}`, amount: string, txOpts?: TransactionOptions): Promise<TransactionHash>;
|
|
13
|
+
executeRedemption(accountId: `0x${string}`, txOpts?: TransactionOptions): Promise<TransactionHash>;
|
|
14
14
|
getMinimumFunding(): Promise<bigint>;
|
|
15
15
|
getRedemptionDelay(): Promise<number>;
|
|
16
16
|
getFlipBalance(): Promise<bigint>;
|
|
17
|
-
approveStateChainGateway(amount: bigint | string | number,
|
|
17
|
+
approveStateChainGateway(amount: bigint | string | number, txOpts?: TransactionOptions): Promise<TransactionHash | null>;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
export { FundingSDK };
|
package/dist/funding.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Signer } from 'ethers';
|
|
2
|
-
import { a as ChainflipNetwork } from './
|
|
2
|
+
import { T as TransactionOptions, a as ChainflipNetwork } from './contracts-0eb81d54.js';
|
|
3
3
|
|
|
4
4
|
type SDKOptions = {
|
|
5
5
|
network?: Exclude<ChainflipNetwork, 'mainnet'>;
|
|
@@ -9,12 +9,12 @@ type TransactionHash = string;
|
|
|
9
9
|
declare class FundingSDK {
|
|
10
10
|
private readonly options;
|
|
11
11
|
constructor(options: SDKOptions);
|
|
12
|
-
fundStateChainAccount(accountId: `0x${string}`, amount: string): Promise<TransactionHash>;
|
|
13
|
-
executeRedemption(accountId: `0x${string}
|
|
12
|
+
fundStateChainAccount(accountId: `0x${string}`, amount: string, txOpts?: TransactionOptions): Promise<TransactionHash>;
|
|
13
|
+
executeRedemption(accountId: `0x${string}`, txOpts?: TransactionOptions): Promise<TransactionHash>;
|
|
14
14
|
getMinimumFunding(): Promise<bigint>;
|
|
15
15
|
getRedemptionDelay(): Promise<number>;
|
|
16
16
|
getFlipBalance(): Promise<bigint>;
|
|
17
|
-
approveStateChainGateway(amount: bigint | string | number,
|
|
17
|
+
approveStateChainGateway(amount: bigint | string | number, txOpts?: TransactionOptions): Promise<TransactionHash | null>;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
export { FundingSDK };
|
package/dist/funding.js
CHANGED
|
@@ -877,6 +877,10 @@ function assert(condition, message) {
|
|
|
877
877
|
__name(assert, "assert");
|
|
878
878
|
|
|
879
879
|
// ../shared/src/contracts.ts
|
|
880
|
+
var extractOverrides = /* @__PURE__ */ __name((transactionOverrides) => {
|
|
881
|
+
const { wait, ...ethersOverrides } = transactionOverrides;
|
|
882
|
+
return ethersOverrides;
|
|
883
|
+
}, "extractOverrides");
|
|
880
884
|
var getTokenContractAddress = /* @__PURE__ */ __name((asset, network) => {
|
|
881
885
|
assert(network !== ChainflipNetworks.mainnet, "Mainnet is not yet supported");
|
|
882
886
|
if (asset === Assets.FLIP)
|
|
@@ -898,16 +902,14 @@ var checkAllowance = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20
|
|
|
898
902
|
erc20
|
|
899
903
|
};
|
|
900
904
|
}, "checkAllowance");
|
|
901
|
-
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance,
|
|
905
|
+
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance, txOpts) => {
|
|
902
906
|
const amountBigNumber = ethers.BigNumber.from(amount);
|
|
903
907
|
const allowanceBigNumber = ethers.BigNumber.from(allowance);
|
|
904
908
|
if (allowanceBigNumber.gte(amountBigNumber))
|
|
905
909
|
return null;
|
|
906
910
|
const requiredAmount = amountBigNumber.sub(allowanceBigNumber);
|
|
907
|
-
const
|
|
908
|
-
|
|
909
|
-
});
|
|
910
|
-
return tx.wait(1);
|
|
911
|
+
const transaction = await erc20.approve(spenderAddress, requiredAmount, extractOverrides(txOpts));
|
|
912
|
+
return transaction.wait(txOpts.wait);
|
|
911
913
|
}, "approve");
|
|
912
914
|
var getFlipBalance = /* @__PURE__ */ __name(async (network, signer) => {
|
|
913
915
|
const flipAddress = getTokenContractAddress("FLIP", network);
|
|
@@ -917,48 +919,45 @@ var getFlipBalance = /* @__PURE__ */ __name(async (network, signer) => {
|
|
|
917
919
|
}, "getFlipBalance");
|
|
918
920
|
|
|
919
921
|
// ../shared/src/stateChainGateway/utils.ts
|
|
920
|
-
var getStateChainGateway = /* @__PURE__ */ __name((
|
|
921
|
-
const stateChainGatewayContractAddress =
|
|
922
|
-
return StateChainGateway__factory.connect(stateChainGatewayContractAddress,
|
|
922
|
+
var getStateChainGateway = /* @__PURE__ */ __name((networkOpts) => {
|
|
923
|
+
const stateChainGatewayContractAddress = networkOpts.network === "localnet" ? networkOpts.stateChainGatewayContractAddress : getStateChainGatewayContractAddress(networkOpts.network);
|
|
924
|
+
return StateChainGateway__factory.connect(stateChainGatewayContractAddress, networkOpts.signer);
|
|
923
925
|
}, "getStateChainGateway");
|
|
924
926
|
|
|
925
927
|
// ../shared/src/stateChainGateway/approval.ts
|
|
926
|
-
var checkStateChainGatewayAllowance = /* @__PURE__ */ __name(async (amount,
|
|
927
|
-
const flipContractAddress =
|
|
928
|
-
const stateChainGatewayContractAddress =
|
|
929
|
-
return checkAllowance(amount, stateChainGatewayContractAddress, flipContractAddress,
|
|
928
|
+
var checkStateChainGatewayAllowance = /* @__PURE__ */ __name(async (amount, networkOpts) => {
|
|
929
|
+
const flipContractAddress = networkOpts.network === "localnet" ? networkOpts.flipContractAddress : getTokenContractAddress(Assets.FLIP, networkOpts.network);
|
|
930
|
+
const stateChainGatewayContractAddress = networkOpts.network === "localnet" ? networkOpts.stateChainGatewayContractAddress : getStateChainGatewayContractAddress(networkOpts.network);
|
|
931
|
+
return checkAllowance(amount, stateChainGatewayContractAddress, flipContractAddress, networkOpts.signer);
|
|
930
932
|
}, "checkStateChainGatewayAllowance");
|
|
931
|
-
var approveStateChainGateway = /* @__PURE__ */ __name(async (amount,
|
|
932
|
-
const { allowance, erc20, isAllowable } = await checkStateChainGatewayAllowance(amount,
|
|
933
|
+
var approveStateChainGateway = /* @__PURE__ */ __name(async (amount, networkOpts, txOpts) => {
|
|
934
|
+
const { allowance, erc20, isAllowable } = await checkStateChainGatewayAllowance(amount, networkOpts);
|
|
933
935
|
if (isAllowable)
|
|
934
936
|
return null;
|
|
935
|
-
const stateChainGatewayContractAddress =
|
|
936
|
-
|
|
937
|
-
return receipt;
|
|
937
|
+
const stateChainGatewayContractAddress = networkOpts.network === "localnet" ? networkOpts.stateChainGatewayContractAddress : getStateChainGatewayContractAddress(networkOpts.network);
|
|
938
|
+
return approve(amount, stateChainGatewayContractAddress, erc20, allowance, txOpts);
|
|
938
939
|
}, "approveStateChainGateway");
|
|
939
940
|
|
|
940
941
|
// ../shared/src/stateChainGateway/index.ts
|
|
941
|
-
var fundStateChainAccount = /* @__PURE__ */ __name(async (accountId, amount,
|
|
942
|
-
const flipContractAddress =
|
|
943
|
-
const stateChainGateway = getStateChainGateway(
|
|
944
|
-
const { isAllowable } = await checkAllowance(amount, stateChainGateway.address, flipContractAddress,
|
|
942
|
+
var fundStateChainAccount = /* @__PURE__ */ __name(async (accountId, amount, networkOpts, txOpts) => {
|
|
943
|
+
const flipContractAddress = networkOpts.network === "localnet" ? networkOpts.flipContractAddress : getTokenContractAddress(Assets.FLIP, networkOpts.network);
|
|
944
|
+
const stateChainGateway = getStateChainGateway(networkOpts);
|
|
945
|
+
const { isAllowable } = await checkAllowance(amount, stateChainGateway.address, flipContractAddress, networkOpts.signer);
|
|
945
946
|
assert(isAllowable, "Insufficient allowance");
|
|
946
|
-
const transaction = await stateChainGateway.fundStateChainAccount(accountId, amount,
|
|
947
|
-
|
|
948
|
-
});
|
|
949
|
-
return transaction.wait(1);
|
|
947
|
+
const transaction = await stateChainGateway.fundStateChainAccount(accountId, amount, extractOverrides(txOpts));
|
|
948
|
+
return transaction.wait(txOpts.wait);
|
|
950
949
|
}, "fundStateChainAccount");
|
|
951
|
-
var executeRedemption = /* @__PURE__ */ __name(async (accountId,
|
|
952
|
-
const stateChainGateway = getStateChainGateway(
|
|
953
|
-
const transaction = await stateChainGateway.executeRedemption(accountId,
|
|
954
|
-
return transaction.wait(
|
|
950
|
+
var executeRedemption = /* @__PURE__ */ __name(async (accountId, networkOpts, txOpts) => {
|
|
951
|
+
const stateChainGateway = getStateChainGateway(networkOpts);
|
|
952
|
+
const transaction = await stateChainGateway.executeRedemption(accountId, extractOverrides(txOpts));
|
|
953
|
+
return transaction.wait(txOpts.wait);
|
|
955
954
|
}, "executeRedemption");
|
|
956
|
-
var getMinimumFunding = /* @__PURE__ */ __name((
|
|
957
|
-
const stateChainGateway = getStateChainGateway(
|
|
955
|
+
var getMinimumFunding = /* @__PURE__ */ __name((networkOpts) => {
|
|
956
|
+
const stateChainGateway = getStateChainGateway(networkOpts);
|
|
958
957
|
return stateChainGateway.getMinimumFunding();
|
|
959
958
|
}, "getMinimumFunding");
|
|
960
|
-
var getRedemptionDelay = /* @__PURE__ */ __name((
|
|
961
|
-
const stateChainGateway = getStateChainGateway(
|
|
959
|
+
var getRedemptionDelay = /* @__PURE__ */ __name((networkOpts) => {
|
|
960
|
+
const stateChainGateway = getStateChainGateway(networkOpts);
|
|
962
961
|
return stateChainGateway.REDEMPTION_DELAY();
|
|
963
962
|
}, "getRedemptionDelay");
|
|
964
963
|
|
|
@@ -974,20 +973,16 @@ var _FundingSDK = class _FundingSDK {
|
|
|
974
973
|
/**
|
|
975
974
|
* @param accountId the hex-encoded validator account id
|
|
976
975
|
* @param amount the amount to fund in base units of FLIP
|
|
977
|
-
* @param signer a signer to use for the transaction if different from the one
|
|
978
|
-
* provided in the constructor
|
|
979
976
|
*/
|
|
980
|
-
async fundStateChainAccount(accountId, amount) {
|
|
981
|
-
const tx = await fundStateChainAccount(accountId, amount, this.options);
|
|
977
|
+
async fundStateChainAccount(accountId, amount, txOpts = {}) {
|
|
978
|
+
const tx = await fundStateChainAccount(accountId, amount, this.options, txOpts);
|
|
982
979
|
return tx.transactionHash;
|
|
983
980
|
}
|
|
984
981
|
/**
|
|
985
982
|
* @param accountId the hex-encoded validator account id
|
|
986
|
-
* @param signer a signer to use for the transaction if different from the one
|
|
987
|
-
* provided in the constructor
|
|
988
983
|
*/
|
|
989
|
-
async executeRedemption(accountId) {
|
|
990
|
-
const tx = await executeRedemption(accountId, this.options);
|
|
984
|
+
async executeRedemption(accountId, txOpts = {}) {
|
|
985
|
+
const tx = await executeRedemption(accountId, this.options, txOpts);
|
|
991
986
|
return tx.transactionHash;
|
|
992
987
|
}
|
|
993
988
|
async getMinimumFunding() {
|
|
@@ -1004,11 +999,8 @@ var _FundingSDK = class _FundingSDK {
|
|
|
1004
999
|
* @param amount the amount of FLIP to request approval for
|
|
1005
1000
|
* @returns the transaction hash or null if no approval was required
|
|
1006
1001
|
*/
|
|
1007
|
-
async approveStateChainGateway(amount,
|
|
1008
|
-
const receipt = await approveStateChainGateway(amount,
|
|
1009
|
-
nonce,
|
|
1010
|
-
...this.options
|
|
1011
|
-
});
|
|
1002
|
+
async approveStateChainGateway(amount, txOpts = {}) {
|
|
1003
|
+
const receipt = await approveStateChainGateway(amount, this.options, txOpts);
|
|
1012
1004
|
return receipt && receipt.transactionHash;
|
|
1013
1005
|
}
|
|
1014
1006
|
};
|
package/dist/funding.mjs
CHANGED
|
@@ -1,48 +1,45 @@
|
|
|
1
|
-
import { __name, __publicField, ChainflipNetworks, getFlipBalance, getStateChainGatewayContractAddress, approve, getTokenContractAddress, Assets, checkAllowance, assert, StateChainGateway__factory } from './chunk-
|
|
1
|
+
import { __name, __publicField, ChainflipNetworks, getFlipBalance, getStateChainGatewayContractAddress, approve, getTokenContractAddress, Assets, checkAllowance, assert, extractOverrides, StateChainGateway__factory } from './chunk-TH2B6MNX.mjs';
|
|
2
2
|
|
|
3
3
|
// ../shared/src/stateChainGateway/utils.ts
|
|
4
|
-
var getStateChainGateway = /* @__PURE__ */ __name((
|
|
5
|
-
const stateChainGatewayContractAddress =
|
|
6
|
-
return StateChainGateway__factory.connect(stateChainGatewayContractAddress,
|
|
4
|
+
var getStateChainGateway = /* @__PURE__ */ __name((networkOpts) => {
|
|
5
|
+
const stateChainGatewayContractAddress = networkOpts.network === "localnet" ? networkOpts.stateChainGatewayContractAddress : getStateChainGatewayContractAddress(networkOpts.network);
|
|
6
|
+
return StateChainGateway__factory.connect(stateChainGatewayContractAddress, networkOpts.signer);
|
|
7
7
|
}, "getStateChainGateway");
|
|
8
8
|
|
|
9
9
|
// ../shared/src/stateChainGateway/approval.ts
|
|
10
|
-
var checkStateChainGatewayAllowance = /* @__PURE__ */ __name(async (amount,
|
|
11
|
-
const flipContractAddress =
|
|
12
|
-
const stateChainGatewayContractAddress =
|
|
13
|
-
return checkAllowance(amount, stateChainGatewayContractAddress, flipContractAddress,
|
|
10
|
+
var checkStateChainGatewayAllowance = /* @__PURE__ */ __name(async (amount, networkOpts) => {
|
|
11
|
+
const flipContractAddress = networkOpts.network === "localnet" ? networkOpts.flipContractAddress : getTokenContractAddress(Assets.FLIP, networkOpts.network);
|
|
12
|
+
const stateChainGatewayContractAddress = networkOpts.network === "localnet" ? networkOpts.stateChainGatewayContractAddress : getStateChainGatewayContractAddress(networkOpts.network);
|
|
13
|
+
return checkAllowance(amount, stateChainGatewayContractAddress, flipContractAddress, networkOpts.signer);
|
|
14
14
|
}, "checkStateChainGatewayAllowance");
|
|
15
|
-
var approveStateChainGateway = /* @__PURE__ */ __name(async (amount,
|
|
16
|
-
const { allowance, erc20, isAllowable } = await checkStateChainGatewayAllowance(amount,
|
|
15
|
+
var approveStateChainGateway = /* @__PURE__ */ __name(async (amount, networkOpts, txOpts) => {
|
|
16
|
+
const { allowance, erc20, isAllowable } = await checkStateChainGatewayAllowance(amount, networkOpts);
|
|
17
17
|
if (isAllowable)
|
|
18
18
|
return null;
|
|
19
|
-
const stateChainGatewayContractAddress =
|
|
20
|
-
|
|
21
|
-
return receipt;
|
|
19
|
+
const stateChainGatewayContractAddress = networkOpts.network === "localnet" ? networkOpts.stateChainGatewayContractAddress : getStateChainGatewayContractAddress(networkOpts.network);
|
|
20
|
+
return approve(amount, stateChainGatewayContractAddress, erc20, allowance, txOpts);
|
|
22
21
|
}, "approveStateChainGateway");
|
|
23
22
|
|
|
24
23
|
// ../shared/src/stateChainGateway/index.ts
|
|
25
|
-
var fundStateChainAccount = /* @__PURE__ */ __name(async (accountId, amount,
|
|
26
|
-
const flipContractAddress =
|
|
27
|
-
const stateChainGateway = getStateChainGateway(
|
|
28
|
-
const { isAllowable } = await checkAllowance(amount, stateChainGateway.address, flipContractAddress,
|
|
24
|
+
var fundStateChainAccount = /* @__PURE__ */ __name(async (accountId, amount, networkOpts, txOpts) => {
|
|
25
|
+
const flipContractAddress = networkOpts.network === "localnet" ? networkOpts.flipContractAddress : getTokenContractAddress(Assets.FLIP, networkOpts.network);
|
|
26
|
+
const stateChainGateway = getStateChainGateway(networkOpts);
|
|
27
|
+
const { isAllowable } = await checkAllowance(amount, stateChainGateway.address, flipContractAddress, networkOpts.signer);
|
|
29
28
|
assert(isAllowable, "Insufficient allowance");
|
|
30
|
-
const transaction = await stateChainGateway.fundStateChainAccount(accountId, amount,
|
|
31
|
-
|
|
32
|
-
});
|
|
33
|
-
return transaction.wait(1);
|
|
29
|
+
const transaction = await stateChainGateway.fundStateChainAccount(accountId, amount, extractOverrides(txOpts));
|
|
30
|
+
return transaction.wait(txOpts.wait);
|
|
34
31
|
}, "fundStateChainAccount");
|
|
35
|
-
var executeRedemption = /* @__PURE__ */ __name(async (accountId,
|
|
36
|
-
const stateChainGateway = getStateChainGateway(
|
|
37
|
-
const transaction = await stateChainGateway.executeRedemption(accountId,
|
|
38
|
-
return transaction.wait(
|
|
32
|
+
var executeRedemption = /* @__PURE__ */ __name(async (accountId, networkOpts, txOpts) => {
|
|
33
|
+
const stateChainGateway = getStateChainGateway(networkOpts);
|
|
34
|
+
const transaction = await stateChainGateway.executeRedemption(accountId, extractOverrides(txOpts));
|
|
35
|
+
return transaction.wait(txOpts.wait);
|
|
39
36
|
}, "executeRedemption");
|
|
40
|
-
var getMinimumFunding = /* @__PURE__ */ __name((
|
|
41
|
-
const stateChainGateway = getStateChainGateway(
|
|
37
|
+
var getMinimumFunding = /* @__PURE__ */ __name((networkOpts) => {
|
|
38
|
+
const stateChainGateway = getStateChainGateway(networkOpts);
|
|
42
39
|
return stateChainGateway.getMinimumFunding();
|
|
43
40
|
}, "getMinimumFunding");
|
|
44
|
-
var getRedemptionDelay = /* @__PURE__ */ __name((
|
|
45
|
-
const stateChainGateway = getStateChainGateway(
|
|
41
|
+
var getRedemptionDelay = /* @__PURE__ */ __name((networkOpts) => {
|
|
42
|
+
const stateChainGateway = getStateChainGateway(networkOpts);
|
|
46
43
|
return stateChainGateway.REDEMPTION_DELAY();
|
|
47
44
|
}, "getRedemptionDelay");
|
|
48
45
|
|
|
@@ -58,20 +55,16 @@ var _FundingSDK = class _FundingSDK {
|
|
|
58
55
|
/**
|
|
59
56
|
* @param accountId the hex-encoded validator account id
|
|
60
57
|
* @param amount the amount to fund in base units of FLIP
|
|
61
|
-
* @param signer a signer to use for the transaction if different from the one
|
|
62
|
-
* provided in the constructor
|
|
63
58
|
*/
|
|
64
|
-
async fundStateChainAccount(accountId, amount) {
|
|
65
|
-
const tx = await fundStateChainAccount(accountId, amount, this.options);
|
|
59
|
+
async fundStateChainAccount(accountId, amount, txOpts = {}) {
|
|
60
|
+
const tx = await fundStateChainAccount(accountId, amount, this.options, txOpts);
|
|
66
61
|
return tx.transactionHash;
|
|
67
62
|
}
|
|
68
63
|
/**
|
|
69
64
|
* @param accountId the hex-encoded validator account id
|
|
70
|
-
* @param signer a signer to use for the transaction if different from the one
|
|
71
|
-
* provided in the constructor
|
|
72
65
|
*/
|
|
73
|
-
async executeRedemption(accountId) {
|
|
74
|
-
const tx = await executeRedemption(accountId, this.options);
|
|
66
|
+
async executeRedemption(accountId, txOpts = {}) {
|
|
67
|
+
const tx = await executeRedemption(accountId, this.options, txOpts);
|
|
75
68
|
return tx.transactionHash;
|
|
76
69
|
}
|
|
77
70
|
async getMinimumFunding() {
|
|
@@ -88,11 +81,8 @@ var _FundingSDK = class _FundingSDK {
|
|
|
88
81
|
* @param amount the amount of FLIP to request approval for
|
|
89
82
|
* @returns the transaction hash or null if no approval was required
|
|
90
83
|
*/
|
|
91
|
-
async approveStateChainGateway(amount,
|
|
92
|
-
const receipt = await approveStateChainGateway(amount,
|
|
93
|
-
nonce,
|
|
94
|
-
...this.options
|
|
95
|
-
});
|
|
84
|
+
async approveStateChainGateway(amount, txOpts = {}) {
|
|
85
|
+
const receipt = await approveStateChainGateway(amount, this.options, txOpts);
|
|
96
86
|
return receipt && receipt.transactionHash;
|
|
97
87
|
}
|
|
98
88
|
};
|
package/dist/swap.d.mts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { C as Chain, c as chainAssets, A as Asset, a as ChainflipNetwork } from './
|
|
3
|
-
export { d as Assets, e as ChainflipNetworks, b as Chains, f as assetChains, h as assetContractIds, g as assetDecimals, i as chainContractIds } from './
|
|
1
|
+
import { Signer } from 'ethers';
|
|
2
|
+
import { C as Chain, c as chainAssets, A as Asset, a as ChainflipNetwork, T as TransactionOptions } from './contracts-0eb81d54.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 './contracts-0eb81d54.js';
|
|
4
4
|
import { z } from 'zod';
|
|
5
5
|
|
|
6
6
|
declare const tokenSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
@@ -355,7 +355,6 @@ declare const executeSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
|
355
355
|
}>]>]>;
|
|
356
356
|
type ExecuteSwapParams = z.infer<typeof executeSwapParamsSchema>;
|
|
357
357
|
type TokenSwapParams = z.infer<typeof tokenSwapParamsSchema>;
|
|
358
|
-
type Overrides = Omit<ethers.providers.TransactionRequest, 'to' | 'data' | 'value' | 'from'>;
|
|
359
358
|
|
|
360
359
|
declare const ccmMetadataSchema: z.ZodObject<{
|
|
361
360
|
gasBudget: z.ZodUnion<[z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodNumber]>;
|
|
@@ -553,8 +552,8 @@ declare class SwapSDK {
|
|
|
553
552
|
getQuote(quoteRequest: QuoteRequest, options?: RequestOptions): Promise<QuoteResponse>;
|
|
554
553
|
requestDepositAddress(depositAddressRequest: DepositAddressRequest, options?: RequestOptions): Promise<DepositAddressResponse>;
|
|
555
554
|
getStatus(swapStatusRequest: SwapStatusRequest, options?: RequestOptions): Promise<SwapStatusResponse>;
|
|
556
|
-
executeSwap(params: ExecuteSwapParams,
|
|
557
|
-
approveVault(params: Pick<TokenSwapParams, 'srcAsset' | 'amount'>,
|
|
555
|
+
executeSwap(params: ExecuteSwapParams, txOpts?: TransactionOptions): Promise<TransactionHash>;
|
|
556
|
+
approveVault(params: Pick<TokenSwapParams, 'srcAsset' | 'amount'>, txOpts?: TransactionOptions): Promise<TransactionHash | null>;
|
|
558
557
|
}
|
|
559
558
|
|
|
560
559
|
export { Asset, AssetData, Chain, ChainData, ChainflipNetwork, DepositAddressRequest, DepositAddressResponse, QuoteRequest, QuoteResponse, SDKOptions, SwapSDK, SwapStatusRequest, SwapStatusResponse, chainAssets };
|
package/dist/swap.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { C as Chain, c as chainAssets, A as Asset, a as ChainflipNetwork } from './
|
|
3
|
-
export { d as Assets, e as ChainflipNetworks, b as Chains, f as assetChains, h as assetContractIds, g as assetDecimals, i as chainContractIds } from './
|
|
1
|
+
import { Signer } from 'ethers';
|
|
2
|
+
import { C as Chain, c as chainAssets, A as Asset, a as ChainflipNetwork, T as TransactionOptions } from './contracts-0eb81d54.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 './contracts-0eb81d54.js';
|
|
4
4
|
import { z } from 'zod';
|
|
5
5
|
|
|
6
6
|
declare const tokenSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
@@ -355,7 +355,6 @@ declare const executeSwapParamsSchema: z.ZodUnion<[z.ZodObject<{
|
|
|
355
355
|
}>]>]>;
|
|
356
356
|
type ExecuteSwapParams = z.infer<typeof executeSwapParamsSchema>;
|
|
357
357
|
type TokenSwapParams = z.infer<typeof tokenSwapParamsSchema>;
|
|
358
|
-
type Overrides = Omit<ethers.providers.TransactionRequest, 'to' | 'data' | 'value' | 'from'>;
|
|
359
358
|
|
|
360
359
|
declare const ccmMetadataSchema: z.ZodObject<{
|
|
361
360
|
gasBudget: z.ZodUnion<[z.ZodType<`0x${string}`, z.ZodTypeDef, `0x${string}`>, z.ZodNumber]>;
|
|
@@ -553,8 +552,8 @@ declare class SwapSDK {
|
|
|
553
552
|
getQuote(quoteRequest: QuoteRequest, options?: RequestOptions): Promise<QuoteResponse>;
|
|
554
553
|
requestDepositAddress(depositAddressRequest: DepositAddressRequest, options?: RequestOptions): Promise<DepositAddressResponse>;
|
|
555
554
|
getStatus(swapStatusRequest: SwapStatusRequest, options?: RequestOptions): Promise<SwapStatusResponse>;
|
|
556
|
-
executeSwap(params: ExecuteSwapParams,
|
|
557
|
-
approveVault(params: Pick<TokenSwapParams, 'srcAsset' | 'amount'>,
|
|
555
|
+
executeSwap(params: ExecuteSwapParams, txOpts?: TransactionOptions): Promise<TransactionHash>;
|
|
556
|
+
approveVault(params: Pick<TokenSwapParams, 'srcAsset' | 'amount'>, txOpts?: TransactionOptions): Promise<TransactionHash | null>;
|
|
558
557
|
}
|
|
559
558
|
|
|
560
559
|
export { Asset, AssetData, Chain, ChainData, ChainflipNetwork, DepositAddressRequest, DepositAddressResponse, QuoteRequest, QuoteResponse, SDKOptions, SwapSDK, SwapStatusRequest, SwapStatusResponse, chainAssets };
|
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 }; }
|
|
@@ -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"),
|
|
@@ -526,22 +526,6 @@ var executeSwapParamsSchema = zod.z.union([
|
|
|
526
526
|
nativeSwapParamsSchema,
|
|
527
527
|
tokenSwapParamsSchema
|
|
528
528
|
]);
|
|
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
529
|
var _abi = [
|
|
546
530
|
{
|
|
547
531
|
inputs: [
|
|
@@ -1888,6 +1872,10 @@ var ADDRESSES = {
|
|
|
1888
1872
|
var GOERLI_USDC_CONTRACT_ADDRESS = "0x07865c6E87B9F70255377e024ace6630C1Eaa37F";
|
|
1889
1873
|
|
|
1890
1874
|
// ../shared/src/contracts.ts
|
|
1875
|
+
var extractOverrides = /* @__PURE__ */ __name((transactionOverrides) => {
|
|
1876
|
+
const { wait, ...ethersOverrides } = transactionOverrides;
|
|
1877
|
+
return ethersOverrides;
|
|
1878
|
+
}, "extractOverrides");
|
|
1891
1879
|
var getTokenContractAddress = /* @__PURE__ */ __name((asset, network) => {
|
|
1892
1880
|
assert(network !== ChainflipNetworks.mainnet, "Mainnet is not yet supported");
|
|
1893
1881
|
if (asset === Assets.FLIP)
|
|
@@ -1905,16 +1893,14 @@ var checkAllowance = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20
|
|
|
1905
1893
|
erc20
|
|
1906
1894
|
};
|
|
1907
1895
|
}, "checkAllowance");
|
|
1908
|
-
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance,
|
|
1896
|
+
var approve = /* @__PURE__ */ __name(async (amount, spenderAddress, erc20, allowance, txOpts) => {
|
|
1909
1897
|
const amountBigNumber = ethers.BigNumber.from(amount);
|
|
1910
1898
|
const allowanceBigNumber = ethers.BigNumber.from(allowance);
|
|
1911
1899
|
if (allowanceBigNumber.gte(amountBigNumber))
|
|
1912
1900
|
return null;
|
|
1913
1901
|
const requiredAmount = amountBigNumber.sub(allowanceBigNumber);
|
|
1914
|
-
const
|
|
1915
|
-
|
|
1916
|
-
});
|
|
1917
|
-
return tx.wait(1);
|
|
1902
|
+
const transaction = await erc20.approve(spenderAddress, requiredAmount, extractOverrides(txOpts));
|
|
1903
|
+
return transaction.wait(txOpts.wait);
|
|
1918
1904
|
}, "approve");
|
|
1919
1905
|
var getVaultManagerContractAddress = /* @__PURE__ */ __name((network) => {
|
|
1920
1906
|
assert(network !== ChainflipNetworks.mainnet, "Mainnet is not yet supported");
|
|
@@ -1922,67 +1908,66 @@ var getVaultManagerContractAddress = /* @__PURE__ */ __name((network) => {
|
|
|
1922
1908
|
}, "getVaultManagerContractAddress");
|
|
1923
1909
|
|
|
1924
1910
|
// ../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);
|
|
1911
|
+
var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, networkOpts, txOpts) => {
|
|
1912
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1913
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
1928
1914
|
const transaction = await vault.xSwapNative(chainContractIds[destChain], destAddress, assetContractIds[destAsset], [], {
|
|
1929
1915
|
value: amount,
|
|
1930
|
-
...
|
|
1916
|
+
...extractOverrides(txOpts)
|
|
1931
1917
|
});
|
|
1932
|
-
return transaction.wait(
|
|
1918
|
+
return transaction.wait(txOpts.wait);
|
|
1933
1919
|
}, "swapNative");
|
|
1934
|
-
var swapToken = /* @__PURE__ */ __name(async (params,
|
|
1935
|
-
const vaultContractAddress = network === "localnet" ?
|
|
1936
|
-
const erc20Address = network === "localnet" ?
|
|
1920
|
+
var swapToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1921
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1922
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
1937
1923
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
1938
|
-
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
1924
|
+
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
1939
1925
|
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(
|
|
1926
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
1927
|
+
const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, [], extractOverrides(txOpts));
|
|
1928
|
+
return transaction.wait(txOpts.wait);
|
|
1943
1929
|
}, "swapToken");
|
|
1944
|
-
var callNative = /* @__PURE__ */ __name(async (params,
|
|
1945
|
-
const vaultContractAddress = network === "localnet" ?
|
|
1946
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
1930
|
+
var callNative = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1931
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1932
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
1947
1933
|
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, [], {
|
|
1948
1934
|
value: params.amount,
|
|
1949
|
-
...
|
|
1935
|
+
...extractOverrides(txOpts)
|
|
1950
1936
|
});
|
|
1951
|
-
return transaction.wait(
|
|
1937
|
+
return transaction.wait(txOpts.wait);
|
|
1952
1938
|
}, "callNative");
|
|
1953
|
-
var callToken = /* @__PURE__ */ __name(async (params,
|
|
1954
|
-
const vaultContractAddress = network === "localnet" ?
|
|
1955
|
-
const erc20Address = network === "localnet" ?
|
|
1939
|
+
var callToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1940
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1941
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
1956
1942
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
1957
|
-
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
1943
|
+
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
1958
1944
|
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(
|
|
1945
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
1946
|
+
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, erc20Address, params.amount, [], extractOverrides(txOpts));
|
|
1947
|
+
return transaction.wait(txOpts.wait);
|
|
1962
1948
|
}, "callToken");
|
|
1963
|
-
var executeSwap = /* @__PURE__ */ __name(async (params,
|
|
1949
|
+
var executeSwap = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1964
1950
|
const parsedParams = executeSwapParamsSchema.parse(params);
|
|
1965
|
-
const opts = executeOptionsSchema.parse(options);
|
|
1966
1951
|
if ("ccmMetadata" in parsedParams) {
|
|
1967
|
-
return isTokenCall(parsedParams) ? callToken(parsedParams,
|
|
1952
|
+
return isTokenCall(parsedParams) ? callToken(parsedParams, networkOpts, txOpts) : callNative(parsedParams, networkOpts, txOpts);
|
|
1968
1953
|
}
|
|
1969
|
-
return isTokenSwap(parsedParams) ? swapToken(parsedParams,
|
|
1954
|
+
return isTokenSwap(parsedParams) ? swapToken(parsedParams, networkOpts, txOpts) : swapNative(parsedParams, networkOpts, txOpts);
|
|
1970
1955
|
}, "executeSwap");
|
|
1971
1956
|
var executeSwap_default = executeSwap;
|
|
1972
1957
|
|
|
1973
1958
|
// ../shared/src/vault/approval.ts
|
|
1974
|
-
var checkVaultAllowance = /* @__PURE__ */ __name((params,
|
|
1975
|
-
const erc20Address =
|
|
1959
|
+
var checkVaultAllowance = /* @__PURE__ */ __name((params, networkOpts) => {
|
|
1960
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
1976
1961
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
1977
|
-
const vaultContractAddress =
|
|
1978
|
-
return checkAllowance(params.amount, vaultContractAddress, erc20Address,
|
|
1962
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1963
|
+
return checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
1979
1964
|
}, "checkVaultAllowance");
|
|
1980
|
-
var approveVault = /* @__PURE__ */ __name(async (params,
|
|
1981
|
-
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params,
|
|
1965
|
+
var approveVault = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
1966
|
+
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params, networkOpts);
|
|
1982
1967
|
if (isAllowable)
|
|
1983
1968
|
return null;
|
|
1984
|
-
const vaultContractAddress =
|
|
1985
|
-
return approve(params.amount, vaultContractAddress, erc20, allowance,
|
|
1969
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
1970
|
+
return approve(params.amount, vaultContractAddress, erc20, allowance, txOpts);
|
|
1986
1971
|
}, "approveVault");
|
|
1987
1972
|
|
|
1988
1973
|
// src/swap/consts.ts
|
|
@@ -2188,24 +2173,22 @@ var _SwapSDK = class _SwapSDK {
|
|
|
2188
2173
|
getStatus(swapStatusRequest, options = {}) {
|
|
2189
2174
|
return ApiService_default.getStatus(this.baseUrl, swapStatusRequest, options);
|
|
2190
2175
|
}
|
|
2191
|
-
async executeSwap(params,
|
|
2176
|
+
async executeSwap(params, txOpts = {}) {
|
|
2192
2177
|
assert(this.signer, "No signer provided");
|
|
2193
2178
|
const receipt = await executeSwap_default(params, {
|
|
2194
|
-
...overrides,
|
|
2195
2179
|
network: this.network,
|
|
2196
2180
|
signer: this.signer
|
|
2197
|
-
});
|
|
2181
|
+
}, txOpts);
|
|
2198
2182
|
return receipt.transactionHash;
|
|
2199
2183
|
}
|
|
2200
|
-
async approveVault(params,
|
|
2184
|
+
async approveVault(params, txOpts = {}) {
|
|
2201
2185
|
if (!("srcAsset" in params))
|
|
2202
2186
|
return null;
|
|
2203
2187
|
assert(this.signer, "No signer provided");
|
|
2204
2188
|
const receipt = await approveVault(params, {
|
|
2205
2189
|
signer: this.signer,
|
|
2206
|
-
network: this.network
|
|
2207
|
-
|
|
2208
|
-
});
|
|
2190
|
+
network: this.network
|
|
2191
|
+
}, txOpts);
|
|
2209
2192
|
return receipt && receipt.transactionHash;
|
|
2210
2193
|
}
|
|
2211
2194
|
};
|
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-
|
|
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-TH2B6MNX.mjs';
|
|
2
|
+
export { Assets, ChainflipNetworks, Chains, assetChains, assetContractIds, assetDecimals, chainAssets, chainContractIds } from './chunk-TH2B6MNX.mjs';
|
|
3
3
|
import { encodeAddress, decodeAddress } from '@polkadot/util-crypto';
|
|
4
|
-
import * as ethers from 'ethers';
|
|
5
|
-
import { Signer } from 'ethers';
|
|
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
|
|
@@ -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"),
|
|
@@ -415,85 +414,68 @@ var executeSwapParamsSchema = z.union([
|
|
|
415
414
|
nativeSwapParamsSchema,
|
|
416
415
|
tokenSwapParamsSchema
|
|
417
416
|
]);
|
|
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
417
|
|
|
435
418
|
// ../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);
|
|
419
|
+
var swapNative = /* @__PURE__ */ __name(async ({ destChain, destAsset, destAddress, amount }, networkOpts, txOpts) => {
|
|
420
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
421
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
439
422
|
const transaction = await vault.xSwapNative(chainContractIds[destChain], destAddress, assetContractIds[destAsset], [], {
|
|
440
423
|
value: amount,
|
|
441
|
-
...
|
|
424
|
+
...extractOverrides(txOpts)
|
|
442
425
|
});
|
|
443
|
-
return transaction.wait(
|
|
426
|
+
return transaction.wait(txOpts.wait);
|
|
444
427
|
}, "swapNative");
|
|
445
|
-
var swapToken = /* @__PURE__ */ __name(async (params,
|
|
446
|
-
const vaultContractAddress = network === "localnet" ?
|
|
447
|
-
const erc20Address = network === "localnet" ?
|
|
428
|
+
var swapToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
429
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
430
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
448
431
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
449
|
-
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
432
|
+
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
450
433
|
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(
|
|
434
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
435
|
+
const transaction = await vault.xSwapToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], erc20Address, params.amount, [], extractOverrides(txOpts));
|
|
436
|
+
return transaction.wait(txOpts.wait);
|
|
454
437
|
}, "swapToken");
|
|
455
|
-
var callNative = /* @__PURE__ */ __name(async (params,
|
|
456
|
-
const vaultContractAddress = network === "localnet" ?
|
|
457
|
-
const vault = Vault__factory.connect(vaultContractAddress, signer);
|
|
438
|
+
var callNative = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
439
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
440
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
458
441
|
const transaction = await vault.xCallNative(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, [], {
|
|
459
442
|
value: params.amount,
|
|
460
|
-
...
|
|
443
|
+
...extractOverrides(txOpts)
|
|
461
444
|
});
|
|
462
|
-
return transaction.wait(
|
|
445
|
+
return transaction.wait(txOpts.wait);
|
|
463
446
|
}, "callNative");
|
|
464
|
-
var callToken = /* @__PURE__ */ __name(async (params,
|
|
465
|
-
const vaultContractAddress = network === "localnet" ?
|
|
466
|
-
const erc20Address = network === "localnet" ?
|
|
447
|
+
var callToken = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
448
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
449
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
467
450
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
468
|
-
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, signer);
|
|
451
|
+
const { isAllowable } = await checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
469
452
|
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(
|
|
453
|
+
const vault = Vault__factory.connect(vaultContractAddress, networkOpts.signer);
|
|
454
|
+
const transaction = await vault.xCallToken(chainContractIds[params.destChain], params.destAddress, assetContractIds[params.destAsset], params.ccmMetadata.message, params.ccmMetadata.gasBudget, erc20Address, params.amount, [], extractOverrides(txOpts));
|
|
455
|
+
return transaction.wait(txOpts.wait);
|
|
473
456
|
}, "callToken");
|
|
474
|
-
var executeSwap = /* @__PURE__ */ __name(async (params,
|
|
457
|
+
var executeSwap = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
475
458
|
const parsedParams = executeSwapParamsSchema.parse(params);
|
|
476
|
-
const opts = executeOptionsSchema.parse(options);
|
|
477
459
|
if ("ccmMetadata" in parsedParams) {
|
|
478
|
-
return isTokenCall(parsedParams) ? callToken(parsedParams,
|
|
460
|
+
return isTokenCall(parsedParams) ? callToken(parsedParams, networkOpts, txOpts) : callNative(parsedParams, networkOpts, txOpts);
|
|
479
461
|
}
|
|
480
|
-
return isTokenSwap(parsedParams) ? swapToken(parsedParams,
|
|
462
|
+
return isTokenSwap(parsedParams) ? swapToken(parsedParams, networkOpts, txOpts) : swapNative(parsedParams, networkOpts, txOpts);
|
|
481
463
|
}, "executeSwap");
|
|
482
464
|
var executeSwap_default = executeSwap;
|
|
483
465
|
|
|
484
466
|
// ../shared/src/vault/approval.ts
|
|
485
|
-
var checkVaultAllowance = /* @__PURE__ */ __name((params,
|
|
486
|
-
const erc20Address =
|
|
467
|
+
var checkVaultAllowance = /* @__PURE__ */ __name((params, networkOpts) => {
|
|
468
|
+
const erc20Address = networkOpts.network === "localnet" ? networkOpts.srcTokenContractAddress : getTokenContractAddress(params.srcAsset, networkOpts.network);
|
|
487
469
|
assert(erc20Address !== void 0, "Missing ERC20 contract address");
|
|
488
|
-
const vaultContractAddress =
|
|
489
|
-
return checkAllowance(params.amount, vaultContractAddress, erc20Address,
|
|
470
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
471
|
+
return checkAllowance(params.amount, vaultContractAddress, erc20Address, networkOpts.signer);
|
|
490
472
|
}, "checkVaultAllowance");
|
|
491
|
-
var approveVault = /* @__PURE__ */ __name(async (params,
|
|
492
|
-
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params,
|
|
473
|
+
var approveVault = /* @__PURE__ */ __name(async (params, networkOpts, txOpts) => {
|
|
474
|
+
const { isAllowable, erc20, allowance } = await checkVaultAllowance(params, networkOpts);
|
|
493
475
|
if (isAllowable)
|
|
494
476
|
return null;
|
|
495
|
-
const vaultContractAddress =
|
|
496
|
-
return approve(params.amount, vaultContractAddress, erc20, allowance,
|
|
477
|
+
const vaultContractAddress = networkOpts.network === "localnet" ? networkOpts.vaultContractAddress : getVaultManagerContractAddress(networkOpts.network);
|
|
478
|
+
return approve(params.amount, vaultContractAddress, erc20, allowance, txOpts);
|
|
497
479
|
}, "approveVault");
|
|
498
480
|
|
|
499
481
|
// src/swap/consts.ts
|
|
@@ -699,24 +681,22 @@ var _SwapSDK = class _SwapSDK {
|
|
|
699
681
|
getStatus(swapStatusRequest, options = {}) {
|
|
700
682
|
return ApiService_default.getStatus(this.baseUrl, swapStatusRequest, options);
|
|
701
683
|
}
|
|
702
|
-
async executeSwap(params,
|
|
684
|
+
async executeSwap(params, txOpts = {}) {
|
|
703
685
|
assert(this.signer, "No signer provided");
|
|
704
686
|
const receipt = await executeSwap_default(params, {
|
|
705
|
-
...overrides,
|
|
706
687
|
network: this.network,
|
|
707
688
|
signer: this.signer
|
|
708
|
-
});
|
|
689
|
+
}, txOpts);
|
|
709
690
|
return receipt.transactionHash;
|
|
710
691
|
}
|
|
711
|
-
async approveVault(params,
|
|
692
|
+
async approveVault(params, txOpts = {}) {
|
|
712
693
|
if (!("srcAsset" in params))
|
|
713
694
|
return null;
|
|
714
695
|
assert(this.signer, "No signer provided");
|
|
715
696
|
const receipt = await approveVault(params, {
|
|
716
697
|
signer: this.signer,
|
|
717
|
-
network: this.network
|
|
718
|
-
|
|
719
|
-
});
|
|
698
|
+
network: this.network
|
|
699
|
+
}, txOpts);
|
|
720
700
|
return receipt && receipt.transactionHash;
|
|
721
701
|
}
|
|
722
702
|
};
|