@instadapp/interop-x 0.0.0-dev.a9cd1d2 → 0.0.0-dev.acc4865
Sign up to get free protection for your applications and to get access to all the features.
- package/.github/workflows/ci.yml +19 -0
- package/dist/package.json +3 -2
- package/dist/src/abi/connectors/index.js +36 -0
- package/dist/src/abi/connectors/v1/aave.js +148 -0
- package/dist/src/abi/connectors/v1/aave_claim.js +4 -0
- package/dist/src/abi/connectors/v1/aave_migrate.js +109 -0
- package/dist/src/abi/connectors/v1/aave_polygon_migrate.js +110 -0
- package/dist/src/abi/connectors/v1/aave_stake.js +4 -0
- package/dist/src/abi/connectors/v1/aave_v1_import.js +54 -0
- package/dist/src/abi/connectors/v1/aave_v2.js +230 -0
- package/dist/src/abi/connectors/v1/aave_v2_import.js +59 -0
- package/dist/src/abi/connectors/v1/authority.js +100 -0
- package/dist/src/abi/connectors/v1/basic.js +136 -0
- package/dist/src/abi/connectors/v1/chi.js +36 -0
- package/dist/src/abi/connectors/v1/comp.js +4 -0
- package/dist/src/abi/connectors/v1/compound.js +4 -0
- package/dist/src/abi/connectors/v1/compoundImport.js +69 -0
- package/dist/src/abi/connectors/v1/compoundImport_v2.js +4 -0
- package/dist/src/abi/connectors/v1/compound_old.js +448 -0
- package/dist/src/abi/connectors/v1/curve.js +140 -0
- package/dist/src/abi/connectors/v1/curve_claim.js +63 -0
- package/dist/src/abi/connectors/v1/curve_gauge.js +158 -0
- package/dist/src/abi/connectors/v1/curve_sbtc.js +140 -0
- package/dist/src/abi/connectors/v1/curve_susd.js +140 -0
- package/dist/src/abi/connectors/v1/curve_three.js +79 -0
- package/dist/src/abi/connectors/v1/curve_y.js +140 -0
- package/dist/src/abi/connectors/v1/dsa_migrate_v1_to_v2.js +4 -0
- package/dist/src/abi/connectors/v1/dydx.js +148 -0
- package/dist/src/abi/connectors/v1/dydx_flash.js +52 -0
- package/dist/src/abi/connectors/v1/fee.js +50 -0
- package/dist/src/abi/connectors/v1/gelato.js +1138 -0
- package/dist/src/abi/connectors/v1/index.js +58 -0
- package/dist/src/abi/connectors/v1/instapool.js +439 -0
- package/dist/src/abi/connectors/v1/instapool_v2.js +126 -0
- package/dist/src/abi/connectors/v1/kyber.js +117 -0
- package/dist/src/abi/connectors/v1/maker.js +480 -0
- package/dist/src/abi/connectors/v1/maker_old.js +300 -0
- package/dist/src/abi/connectors/v1/math.js +43 -0
- package/dist/src/abi/connectors/v1/migrate.js +46 -0
- package/dist/src/abi/connectors/v1/oasis.js +198 -0
- package/dist/src/abi/connectors/v1/oneInch.js +160 -0
- package/dist/src/abi/connectors/v1/polygon_bridge.js +4 -0
- package/dist/src/abi/connectors/v1/refinance.js +4 -0
- package/dist/src/abi/connectors/v1/staking.js +220 -0
- package/dist/src/abi/connectors/v1/swerve.js +179 -0
- package/dist/src/abi/connectors/v1/uniswap.js +297 -0
- package/dist/src/abi/connectors/v2/1INCH-A.js +4 -0
- package/dist/src/abi/connectors/v2/1INCH-B.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-CLAIM-A.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-CLAIM-B.js +166 -0
- package/dist/src/abi/connectors/v2/AAVE-STAKE-A.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-V1-A.js +130 -0
- package/dist/src/abi/connectors/v2/AAVE-V1-IMPORT-A.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-V2-A.js +230 -0
- package/dist/src/abi/connectors/v2/AAVE-V2-IMPORT-A.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-V2-IMPORT-B.js +225 -0
- package/dist/src/abi/connectors/v2/AUTHORITY-A.js +100 -0
- package/dist/src/abi/connectors/v2/B-COMPOUND-A.js +4 -0
- package/dist/src/abi/connectors/v2/B-LIQUITY-A.js +4 -0
- package/dist/src/abi/connectors/v2/B-MAKERDAO-A.js +4 -0
- package/dist/src/abi/connectors/v2/BASIC-A.js +136 -0
- package/dist/src/abi/connectors/v2/BASIC-B.js +4 -0
- package/dist/src/abi/connectors/v2/BASIC-C.js +4 -0
- package/dist/src/abi/connectors/v2/COMP-A.js +4 -0
- package/dist/src/abi/connectors/v2/COMPOUND-A.js +4 -0
- package/dist/src/abi/connectors/v2/COMPOUND-IMPORT-A.js +4 -0
- package/dist/src/abi/connectors/v2/COMPOUND-IMPORT-B.js +195 -0
- package/dist/src/abi/connectors/v2/G-UNISWAP-A.js +4 -0
- package/dist/src/abi/connectors/v2/GELATO-AAVE-A.js +4 -0
- package/dist/src/abi/connectors/v2/INST-A.js +4 -0
- package/dist/src/abi/connectors/v2/INST-LM-A.js +4 -0
- package/dist/src/abi/connectors/v2/INST-STAKING-A.js +4 -0
- package/dist/src/abi/connectors/v2/INST-STAKING-B.js +4 -0
- package/dist/src/abi/connectors/v2/INSTAPOOL-A.js +4 -0
- package/dist/src/abi/connectors/v2/LIQUITY-A.js +4 -0
- package/dist/src/abi/connectors/v2/MAKERDAO-A.js +4 -0
- package/dist/src/abi/connectors/v2/MAKERDAO-CLAIM-A.js +136 -0
- package/dist/src/abi/connectors/v2/PARASWAP-A.js +4 -0
- package/dist/src/abi/connectors/v2/POLYGON-BRIDGE-A.js +4 -0
- package/dist/src/abi/connectors/v2/REFINANCE-A.js +4 -0
- package/dist/src/abi/connectors/v2/REFLEXER-A.js +4 -0
- package/dist/src/abi/connectors/v2/STAKE-ERC20-A.js +4 -0
- package/dist/src/abi/connectors/v2/UNISWAP-A.js +297 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V2-A.js +4 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V3-A.js +4 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V3-STAKE-A.js +4 -0
- package/dist/src/abi/connectors/v2/WETH-A.js +4 -0
- package/dist/src/abi/connectors/v2/YEARN-VAULT-A.js +4 -0
- package/dist/src/abi/connectors/v2/index.js +89 -0
- package/dist/src/abi/index.js +2 -0
- package/dist/src/constants/addresses.js +2 -0
- package/dist/src/constants/blockConfirmations.js +8 -0
- package/dist/src/constants/index.js +1 -0
- package/dist/src/db/models/transaction.js +2 -2
- package/dist/src/gnosis/actions/aaveV2/index.js +11 -0
- package/dist/src/gnosis/actions/aaveV2/source.js +62 -0
- package/dist/src/gnosis/actions/aaveV2/target.js +8 -0
- package/dist/src/gnosis/actions/index.js +2 -2
- package/dist/src/index.js +1 -1
- package/dist/src/net/protocol/dial/SignatureDialProtocol.js +2 -2
- package/dist/src/tasks/InteropX/ProcessSubmitSubmitEvents.js +168 -0
- package/dist/src/tasks/InteropX/SyncLogSubmitEvents.js +5 -3
- package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +4 -3
- package/dist/src/tasks/index.js +5 -0
- package/dist/src/utils/index.js +57 -30
- package/package.json +3 -2
- package/src/abi/connectors/index.ts +14 -0
- package/src/abi/connectors/v1/aave.ts +147 -0
- package/src/abi/connectors/v1/aave_claim.ts +3 -0
- package/src/abi/connectors/v1/aave_migrate.ts +108 -0
- package/src/abi/connectors/v1/aave_polygon_migrate.ts +109 -0
- package/src/abi/connectors/v1/aave_stake.ts +3 -0
- package/src/abi/connectors/v1/aave_v1_import.ts +53 -0
- package/src/abi/connectors/v1/aave_v2.ts +229 -0
- package/src/abi/connectors/v1/aave_v2_import.ts +58 -0
- package/src/abi/connectors/v1/authority.ts +99 -0
- package/src/abi/connectors/v1/basic.ts +135 -0
- package/src/abi/connectors/v1/chi.ts +35 -0
- package/src/abi/connectors/v1/comp.ts +3 -0
- package/src/abi/connectors/v1/compound.ts +3 -0
- package/src/abi/connectors/v1/compoundImport.ts +68 -0
- package/src/abi/connectors/v1/compoundImport_v2.ts +3 -0
- package/src/abi/connectors/v1/compound_old.ts +447 -0
- package/src/abi/connectors/v1/curve.ts +139 -0
- package/src/abi/connectors/v1/curve_claim.ts +62 -0
- package/src/abi/connectors/v1/curve_gauge.ts +157 -0
- package/src/abi/connectors/v1/curve_sbtc.ts +139 -0
- package/src/abi/connectors/v1/curve_susd.ts +139 -0
- package/src/abi/connectors/v1/curve_three.ts +78 -0
- package/src/abi/connectors/v1/curve_y.ts +139 -0
- package/src/abi/connectors/v1/dsa_migrate_v1_to_v2.ts +3 -0
- package/src/abi/connectors/v1/dydx.ts +147 -0
- package/src/abi/connectors/v1/dydx_flash.ts +51 -0
- package/src/abi/connectors/v1/fee.ts +49 -0
- package/src/abi/connectors/v1/gelato.ts +1137 -0
- package/src/abi/connectors/v1/index.ts +42 -0
- package/src/abi/connectors/v1/instapool.ts +438 -0
- package/src/abi/connectors/v1/instapool_v2.ts +125 -0
- package/src/abi/connectors/v1/kyber.ts +116 -0
- package/src/abi/connectors/v1/maker.ts +479 -0
- package/src/abi/connectors/v1/maker_old.ts +299 -0
- package/src/abi/connectors/v1/math.ts +42 -0
- package/src/abi/connectors/v1/migrate.ts +45 -0
- package/src/abi/connectors/v1/oasis.ts +197 -0
- package/src/abi/connectors/v1/oneInch.ts +159 -0
- package/src/abi/connectors/v1/polygon_bridge.ts +3 -0
- package/src/abi/connectors/v1/refinance.ts +3 -0
- package/src/abi/connectors/v1/staking.ts +219 -0
- package/src/abi/connectors/v1/swerve.ts +178 -0
- package/src/abi/connectors/v1/uniswap.ts +297 -0
- package/src/abi/connectors/v2/1INCH-A.ts +3 -0
- package/src/abi/connectors/v2/1INCH-B.ts +3 -0
- package/src/abi/connectors/v2/AAVE-CLAIM-A.ts +3 -0
- package/src/abi/connectors/v2/AAVE-CLAIM-B.ts +165 -0
- package/src/abi/connectors/v2/AAVE-STAKE-A.ts +3 -0
- package/src/abi/connectors/v2/AAVE-V1-A.ts +130 -0
- package/src/abi/connectors/v2/AAVE-V1-IMPORT-A.ts +3 -0
- package/src/abi/connectors/v2/AAVE-V2-A.ts +229 -0
- package/src/abi/connectors/v2/AAVE-V2-IMPORT-A.ts +3 -0
- package/src/abi/connectors/v2/AAVE-V2-IMPORT-B.ts +224 -0
- package/src/abi/connectors/v2/AUTHORITY-A.ts +99 -0
- package/src/abi/connectors/v2/B-COMPOUND-A.ts +3 -0
- package/src/abi/connectors/v2/B-LIQUITY-A.ts +3 -0
- package/src/abi/connectors/v2/B-MAKERDAO-A.ts +3 -0
- package/src/abi/connectors/v2/BASIC-A.ts +135 -0
- package/src/abi/connectors/v2/BASIC-B.ts +3 -0
- package/src/abi/connectors/v2/BASIC-C.ts +3 -0
- package/src/abi/connectors/v2/COMP-A.ts +3 -0
- package/src/abi/connectors/v2/COMPOUND-A.ts +3 -0
- package/src/abi/connectors/v2/COMPOUND-IMPORT-A.ts +3 -0
- package/src/abi/connectors/v2/COMPOUND-IMPORT-B.ts +194 -0
- package/src/abi/connectors/v2/G-UNISWAP-A.ts +3 -0
- package/src/abi/connectors/v2/GELATO-AAVE-A.ts +3 -0
- package/src/abi/connectors/v2/INST-A.ts +3 -0
- package/src/abi/connectors/v2/INST-LM-A.ts +3 -0
- package/src/abi/connectors/v2/INST-STAKING-A.ts +3 -0
- package/src/abi/connectors/v2/INST-STAKING-B.ts +3 -0
- package/src/abi/connectors/v2/INSTAPOOL-A.ts +3 -0
- package/src/abi/connectors/v2/LIQUITY-A.ts +3 -0
- package/src/abi/connectors/v2/MAKERDAO-A.ts +3 -0
- package/src/abi/connectors/v2/MAKERDAO-CLAIM-A.ts +135 -0
- package/src/abi/connectors/v2/PARASWAP-A.ts +3 -0
- package/src/abi/connectors/v2/POLYGON-BRIDGE-A.ts +3 -0
- package/src/abi/connectors/v2/REFINANCE-A.ts +3 -0
- package/src/abi/connectors/v2/REFLEXER-A.ts +3 -0
- package/src/abi/connectors/v2/STAKE-ERC20-A.ts +3 -0
- package/src/abi/connectors/v2/UNISWAP-A.ts +297 -0
- package/src/abi/connectors/v2/UNISWAP-V2-A.ts +3 -0
- package/src/abi/connectors/v2/UNISWAP-V3-A.ts +3 -0
- package/src/abi/connectors/v2/UNISWAP-V3-STAKE-A.ts +3 -0
- package/src/abi/connectors/v2/WETH-A.ts +3 -0
- package/src/abi/connectors/v2/YEARN-VAULT-A.ts +3 -0
- package/src/abi/connectors/v2/index.ts +87 -0
- package/src/abi/index.ts +6 -4
- package/src/constants/addresses.ts +3 -1
- package/src/constants/blockConfirmations.ts +5 -0
- package/src/constants/index.ts +1 -0
- package/src/db/models/transaction.ts +2 -2
- package/src/gnosis/actions/aaveV2/index.ts +9 -0
- package/src/gnosis/actions/aaveV2/source.ts +104 -0
- package/src/gnosis/actions/aaveV2/target.ts +13 -0
- package/src/gnosis/actions/index.ts +2 -2
- package/src/net/protocol/dial/SignatureDialProtocol.ts +3 -2
- package/src/tasks/InteropX/ProcessSubmitSubmitEvents.ts +252 -0
- package/src/tasks/InteropX/SyncLogSubmitEvents.ts +118 -116
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +4 -3
- package/src/tasks/index.ts +6 -1
- package/src/utils/index.ts +169 -93
- package/dist/src/gnosis/actions/withdraw/index.js +0 -114
- package/src/gnosis/actions/withdraw/index.ts +0 -155
package/dist/src/utils/index.js
CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.LiquidityError = exports.generateGnosisTransaction = exports.getContract = exports.ContractError = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
|
6
|
+
exports.encodeConnectorMethod = exports.LiquidityError = exports.generateGnosisTransaction = exports.getContract = exports.ContractError = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
|
7
7
|
/**
|
8
8
|
* @module util
|
9
9
|
*/
|
@@ -12,6 +12,7 @@ const axios_retry_1 = __importDefault(require("axios-retry"));
|
|
12
12
|
const constants_1 = require("@/constants");
|
13
13
|
const ethers_1 = require("ethers");
|
14
14
|
const async_retry_1 = __importDefault(require("async-retry"));
|
15
|
+
const connectors_1 = require("@/abi/connectors");
|
15
16
|
exports.http = axios_1.default.create();
|
16
17
|
(0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
|
17
18
|
function shortenHash(hash, length = 4) {
|
@@ -25,10 +26,10 @@ function shortenHash(hash, length = 4) {
|
|
25
26
|
}
|
26
27
|
exports.shortenHash = shortenHash;
|
27
28
|
function short(buffer) {
|
28
|
-
return buffer.toString(
|
29
|
+
return buffer.toString("hex").slice(0, 8) + "...";
|
29
30
|
}
|
30
31
|
exports.short = short;
|
31
|
-
const signGnosisSafeTx = async ({ to, data = null, value =
|
32
|
+
const signGnosisSafeTx = async ({ to, data = null, value = "0", operation = "1", baseGas = "0", gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }, { signer }) => {
|
32
33
|
const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
|
33
34
|
const domain = {
|
34
35
|
verifyingContract: gnosisSafe,
|
@@ -36,16 +37,16 @@ const signGnosisSafeTx = async ({ to, data = null, value = '0', operation = '1',
|
|
36
37
|
};
|
37
38
|
const types = {
|
38
39
|
SafeTx: [
|
39
|
-
{ type:
|
40
|
-
{ type:
|
41
|
-
{ type:
|
42
|
-
{ type:
|
43
|
-
{ type:
|
44
|
-
{ type:
|
45
|
-
{ type:
|
46
|
-
{ type:
|
47
|
-
{ type:
|
48
|
-
{ type:
|
40
|
+
{ type: "address", name: "to" },
|
41
|
+
{ type: "uint256", name: "value" },
|
42
|
+
{ type: "bytes", name: "data" },
|
43
|
+
{ type: "uint8", name: "operation" },
|
44
|
+
{ type: "uint256", name: "safeTxGas" },
|
45
|
+
{ type: "uint256", name: "baseGas" },
|
46
|
+
{ type: "uint256", name: "gasPrice" },
|
47
|
+
{ type: "address", name: "gasToken" },
|
48
|
+
{ type: "address", name: "refundReceiver" },
|
49
|
+
{ type: "uint256", name: "nonce" },
|
49
50
|
],
|
50
51
|
};
|
51
52
|
const message = {
|
@@ -67,11 +68,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
|
|
67
68
|
const getRpcProviderUrl = (chainId) => {
|
68
69
|
switch (chainId) {
|
69
70
|
case 1:
|
70
|
-
return
|
71
|
+
return "https://rpc.ankr.com/eth";
|
71
72
|
case 137:
|
72
|
-
return
|
73
|
+
return "https://rpc.ankr.com/polygon";
|
73
74
|
case 43114:
|
74
|
-
return
|
75
|
+
return "https://rpc.ankr.com/avalanche";
|
75
76
|
default:
|
76
77
|
throw new Error(`Unknown chainId: ${chainId}`);
|
77
78
|
}
|
@@ -93,16 +94,16 @@ exports.buildSignatureBytes = buildSignatureBytes;
|
|
93
94
|
const asyncCallWithTimeout = async (asyncPromise, timeout) => {
|
94
95
|
let timeoutHandle;
|
95
96
|
const timeoutPromise = new Promise((_resolve, reject) => {
|
96
|
-
timeoutHandle = setTimeout(() => reject(new Error(
|
97
|
+
timeoutHandle = setTimeout(() => reject(new Error("Async call timeout limit reached")), timeout);
|
97
98
|
});
|
98
|
-
return Promise.race([asyncPromise, timeoutPromise]).then(result => {
|
99
|
+
return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
|
99
100
|
clearTimeout(timeoutHandle);
|
100
101
|
return result;
|
101
102
|
});
|
102
103
|
};
|
103
104
|
exports.asyncCallWithTimeout = asyncCallWithTimeout;
|
104
105
|
const generateInteropTransactionHash = (data) => {
|
105
|
-
return ethers_1.ethers.utils.solidityKeccak256(Array.from(
|
106
|
+
return ethers_1.ethers.utils.solidityKeccak256(Array.from({ length: 7 }, () => "string"), [
|
106
107
|
String(data.actionId),
|
107
108
|
String(data.vnonce),
|
108
109
|
String(data.sourceSender),
|
@@ -117,25 +118,27 @@ class ContractError extends Error {
|
|
117
118
|
}
|
118
119
|
exports.ContractError = ContractError;
|
119
120
|
function getContract(address, contractInterface, signerOrProvider) {
|
120
|
-
if (!ethers_1.ethers.utils.getAddress(address) ||
|
121
|
+
if (!ethers_1.ethers.utils.getAddress(address) ||
|
122
|
+
address === ethers_1.ethers.constants.AddressZero) {
|
121
123
|
throw Error(`Invalid 'address' parameter '${address}'.`);
|
122
124
|
}
|
123
125
|
const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
|
124
126
|
// Make sure the contract properties is writable
|
125
|
-
const desc = Object.getOwnPropertyDescriptor(contract,
|
127
|
+
const desc = Object.getOwnPropertyDescriptor(contract, "functions");
|
126
128
|
if (!desc || desc.writable !== true) {
|
127
129
|
return contract;
|
128
130
|
}
|
129
131
|
return new Proxy(contract, {
|
130
132
|
get(target, prop, receiver) {
|
131
133
|
const value = Reflect.get(target, prop, receiver);
|
132
|
-
if (typeof value ===
|
134
|
+
if (typeof value === "function" &&
|
135
|
+
(contract.functions.hasOwnProperty(prop) ||
|
136
|
+
["queryFilter"].includes(String(prop)))) {
|
133
137
|
let isConstant = false;
|
134
138
|
try {
|
135
139
|
isConstant = contract.interface.getFunction(String(prop)).constant;
|
136
140
|
}
|
137
|
-
catch (error) {
|
138
|
-
}
|
141
|
+
catch (error) { }
|
139
142
|
return async (...args) => {
|
140
143
|
try {
|
141
144
|
return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: isConstant ? 1 : 3 });
|
@@ -149,15 +152,21 @@ function getContract(address, contractInterface, signerOrProvider) {
|
|
149
152
|
}
|
150
153
|
};
|
151
154
|
}
|
152
|
-
if (typeof value ===
|
155
|
+
if (typeof value === "object" &&
|
156
|
+
[
|
157
|
+
"populateTransaction",
|
158
|
+
"estimateGas",
|
159
|
+
"functions",
|
160
|
+
"callStatic",
|
161
|
+
].includes(String(prop))) {
|
153
162
|
const parentProp = String(prop);
|
154
163
|
return new Proxy(value, {
|
155
164
|
get(target, prop, receiver) {
|
156
165
|
const value = Reflect.get(target, prop, receiver);
|
157
|
-
if (typeof value ===
|
166
|
+
if (typeof value === "function") {
|
158
167
|
return async (...args) => {
|
159
168
|
try {
|
160
|
-
return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: parentProp ===
|
169
|
+
return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: parentProp === "callStatic" ? 3 : 1 });
|
161
170
|
}
|
162
171
|
catch (error) {
|
163
172
|
const err = new ContractError(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
|
@@ -168,7 +177,7 @@ function getContract(address, contractInterface, signerOrProvider) {
|
|
168
177
|
}
|
169
178
|
};
|
170
179
|
}
|
171
|
-
}
|
180
|
+
},
|
172
181
|
});
|
173
182
|
}
|
174
183
|
return value;
|
@@ -180,7 +189,9 @@ const generateGnosisTransaction = async (transactionData, safeContract) => {
|
|
180
189
|
console.log(transactionData);
|
181
190
|
let isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
|
182
191
|
while (isExecuted == 1) {
|
183
|
-
transactionData.safeTxGas = ethers_1.ethers.BigNumber.from(String(transactionData.safeTxGas))
|
192
|
+
transactionData.safeTxGas = ethers_1.ethers.BigNumber.from(String(transactionData.safeTxGas))
|
193
|
+
.add(1)
|
194
|
+
.toString();
|
184
195
|
isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
|
185
196
|
}
|
186
197
|
return transactionData;
|
@@ -188,8 +199,24 @@ const generateGnosisTransaction = async (transactionData, safeContract) => {
|
|
188
199
|
exports.generateGnosisTransaction = generateGnosisTransaction;
|
189
200
|
class LiquidityError extends Error {
|
190
201
|
constructor(message) {
|
191
|
-
super(message ||
|
202
|
+
super(message || "Not enough liquidity");
|
192
203
|
Object.setPrototypeOf(this, new.target.prototype);
|
193
204
|
}
|
194
205
|
}
|
195
206
|
exports.LiquidityError = LiquidityError;
|
207
|
+
const encodeConnectorMethod = (params) => {
|
208
|
+
const connectorInterface = getInterface(connectors_1.connectors.versions[2][params.connector], params.method);
|
209
|
+
if (!connectorInterface)
|
210
|
+
throw new Error(`ConnectorInterface '${params.method}' not found`);
|
211
|
+
const iface = new ethers_1.ethers.utils.Interface(connectorInterface);
|
212
|
+
return iface.encodeFunctionData(params.method, params.args);
|
213
|
+
};
|
214
|
+
exports.encodeConnectorMethod = encodeConnectorMethod;
|
215
|
+
const getInterface = (abiItems, method) => {
|
216
|
+
const abiItem = abiItems.find((abiItem) => abiItem.name === method);
|
217
|
+
if (!abiItem) {
|
218
|
+
console.error(`${method} is an invalid method.`);
|
219
|
+
return;
|
220
|
+
}
|
221
|
+
return abiItem;
|
222
|
+
};
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@instadapp/interop-x",
|
3
|
-
"version": "0.0.0-dev.
|
3
|
+
"version": "0.0.0-dev.acc4865",
|
4
4
|
"license": "MIT",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"engines": {
|
@@ -52,7 +52,8 @@
|
|
52
52
|
"postinstall-postinstall": "^2.1.0",
|
53
53
|
"sequelize": "6.18.0",
|
54
54
|
"sqlite3": "^5.0.8",
|
55
|
-
"waait": "^1.0.5"
|
55
|
+
"waait": "^1.0.5",
|
56
|
+
"web3-utils": "^1.7.3"
|
56
57
|
},
|
57
58
|
"bin": {
|
58
59
|
"interop-x": "bin/interop-x",
|
@@ -0,0 +1,14 @@
|
|
1
|
+
export * as connectorsV1 from './v1'
|
2
|
+
export * as connectorsV2_M1 from './v2'
|
3
|
+
|
4
|
+
import * as connectorsV1 from './v1'
|
5
|
+
import { connectorsV2_M1 } from './v2'
|
6
|
+
|
7
|
+
export type Connector = keyof typeof connectorsV1 | keyof typeof connectorsV2_M1
|
8
|
+
|
9
|
+
export const connectors = {
|
10
|
+
versions: {
|
11
|
+
1: connectorsV1,
|
12
|
+
2: connectorsV2_M1
|
13
|
+
}
|
14
|
+
}
|
@@ -0,0 +1,147 @@
|
|
1
|
+
import { AbiItem } from 'web3-utils'
|
2
|
+
|
3
|
+
export const aave: AbiItem[] = [
|
4
|
+
{
|
5
|
+
inputs: [
|
6
|
+
{
|
7
|
+
internalType: 'address',
|
8
|
+
name: 'token',
|
9
|
+
type: 'address',
|
10
|
+
},
|
11
|
+
{
|
12
|
+
internalType: 'uint256',
|
13
|
+
name: 'amt',
|
14
|
+
type: 'uint256',
|
15
|
+
},
|
16
|
+
{
|
17
|
+
internalType: 'uint256',
|
18
|
+
name: 'getId',
|
19
|
+
type: 'uint256',
|
20
|
+
},
|
21
|
+
{
|
22
|
+
internalType: 'uint256',
|
23
|
+
name: 'setId',
|
24
|
+
type: 'uint256',
|
25
|
+
},
|
26
|
+
],
|
27
|
+
name: 'borrow',
|
28
|
+
outputs: [],
|
29
|
+
stateMutability: 'payable',
|
30
|
+
type: 'function',
|
31
|
+
},
|
32
|
+
{
|
33
|
+
inputs: [],
|
34
|
+
name: 'connectorID',
|
35
|
+
outputs: [
|
36
|
+
{
|
37
|
+
internalType: 'uint256',
|
38
|
+
name: 'model',
|
39
|
+
type: 'uint256',
|
40
|
+
},
|
41
|
+
{
|
42
|
+
internalType: 'uint256',
|
43
|
+
name: 'id',
|
44
|
+
type: 'uint256',
|
45
|
+
},
|
46
|
+
],
|
47
|
+
stateMutability: 'pure',
|
48
|
+
type: 'function',
|
49
|
+
},
|
50
|
+
{
|
51
|
+
inputs: [
|
52
|
+
{
|
53
|
+
internalType: 'address',
|
54
|
+
name: 'token',
|
55
|
+
type: 'address',
|
56
|
+
},
|
57
|
+
{
|
58
|
+
internalType: 'uint256',
|
59
|
+
name: 'amt',
|
60
|
+
type: 'uint256',
|
61
|
+
},
|
62
|
+
{
|
63
|
+
internalType: 'uint256',
|
64
|
+
name: 'getId',
|
65
|
+
type: 'uint256',
|
66
|
+
},
|
67
|
+
{
|
68
|
+
internalType: 'uint256',
|
69
|
+
name: 'setId',
|
70
|
+
type: 'uint256',
|
71
|
+
},
|
72
|
+
],
|
73
|
+
name: 'deposit',
|
74
|
+
outputs: [],
|
75
|
+
stateMutability: 'payable',
|
76
|
+
type: 'function',
|
77
|
+
},
|
78
|
+
{
|
79
|
+
inputs: [],
|
80
|
+
name: 'name',
|
81
|
+
outputs: [
|
82
|
+
{
|
83
|
+
internalType: 'string',
|
84
|
+
name: '',
|
85
|
+
type: 'string',
|
86
|
+
},
|
87
|
+
],
|
88
|
+
stateMutability: 'view',
|
89
|
+
type: 'function',
|
90
|
+
},
|
91
|
+
{
|
92
|
+
inputs: [
|
93
|
+
{
|
94
|
+
internalType: 'address',
|
95
|
+
name: 'token',
|
96
|
+
type: 'address',
|
97
|
+
},
|
98
|
+
{
|
99
|
+
internalType: 'uint256',
|
100
|
+
name: 'amt',
|
101
|
+
type: 'uint256',
|
102
|
+
},
|
103
|
+
{
|
104
|
+
internalType: 'uint256',
|
105
|
+
name: 'getId',
|
106
|
+
type: 'uint256',
|
107
|
+
},
|
108
|
+
{
|
109
|
+
internalType: 'uint256',
|
110
|
+
name: 'setId',
|
111
|
+
type: 'uint256',
|
112
|
+
},
|
113
|
+
],
|
114
|
+
name: 'payback',
|
115
|
+
outputs: [],
|
116
|
+
stateMutability: 'payable',
|
117
|
+
type: 'function',
|
118
|
+
},
|
119
|
+
{
|
120
|
+
inputs: [
|
121
|
+
{
|
122
|
+
internalType: 'address',
|
123
|
+
name: 'token',
|
124
|
+
type: 'address',
|
125
|
+
},
|
126
|
+
{
|
127
|
+
internalType: 'uint256',
|
128
|
+
name: 'amt',
|
129
|
+
type: 'uint256',
|
130
|
+
},
|
131
|
+
{
|
132
|
+
internalType: 'uint256',
|
133
|
+
name: 'getId',
|
134
|
+
type: 'uint256',
|
135
|
+
},
|
136
|
+
{
|
137
|
+
internalType: 'uint256',
|
138
|
+
name: 'setId',
|
139
|
+
type: 'uint256',
|
140
|
+
},
|
141
|
+
],
|
142
|
+
name: 'withdraw',
|
143
|
+
outputs: [],
|
144
|
+
stateMutability: 'payable',
|
145
|
+
type: 'function',
|
146
|
+
},
|
147
|
+
]
|
@@ -0,0 +1,3 @@
|
|
1
|
+
import { AbiItem } from 'web3-utils';
|
2
|
+
|
3
|
+
export const aave_claim: AbiItem[] = [{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address[]","name":"assets","type":"address[]"},{"indexed":false,"internalType":"uint256","name":"amt","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"getId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"setId","type":"uint256"}],"name":"LogClaimed","type":"event"},{"inputs":[{"internalType":"address[]","name":"assets","type":"address[]"},{"internalType":"uint256","name":"amt","type":"uint256"},{"internalType":"uint256","name":"getId","type":"uint256"},{"internalType":"uint256","name":"setId","type":"uint256"}],"name":"claim","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"connectorID","outputs":[{"internalType":"uint256","name":"_type","type":"uint256"},{"internalType":"uint256","name":"_id","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"}]
|
@@ -0,0 +1,108 @@
|
|
1
|
+
import { AbiItem } from 'web3-utils';
|
2
|
+
|
3
|
+
export const aave_migrate: AbiItem[] = [
|
4
|
+
{
|
5
|
+
anonymous: false,
|
6
|
+
inputs: [
|
7
|
+
{
|
8
|
+
indexed: false,
|
9
|
+
internalType: 'address[]',
|
10
|
+
name: 'aTokens',
|
11
|
+
type: 'address[]',
|
12
|
+
},
|
13
|
+
{
|
14
|
+
indexed: false,
|
15
|
+
internalType: 'uint256[]',
|
16
|
+
name: 'aTknBals',
|
17
|
+
type: 'uint256[]',
|
18
|
+
},
|
19
|
+
{
|
20
|
+
indexed: false,
|
21
|
+
internalType: 'uint256[]',
|
22
|
+
name: 'borrowBals',
|
23
|
+
type: 'uint256[]',
|
24
|
+
},
|
25
|
+
{
|
26
|
+
indexed: false,
|
27
|
+
internalType: 'uint256[]',
|
28
|
+
name: 'borrowBalsFee',
|
29
|
+
type: 'uint256[]',
|
30
|
+
},
|
31
|
+
],
|
32
|
+
name: 'LogMigrate',
|
33
|
+
type: 'event',
|
34
|
+
},
|
35
|
+
{
|
36
|
+
anonymous: false,
|
37
|
+
inputs: [
|
38
|
+
{
|
39
|
+
indexed: false,
|
40
|
+
internalType: 'address',
|
41
|
+
name: 'user',
|
42
|
+
type: 'address',
|
43
|
+
},
|
44
|
+
{
|
45
|
+
indexed: false,
|
46
|
+
internalType: 'address[]',
|
47
|
+
name: 'aTokens',
|
48
|
+
type: 'address[]',
|
49
|
+
},
|
50
|
+
{
|
51
|
+
indexed: false,
|
52
|
+
internalType: 'uint256[]',
|
53
|
+
name: 'aTknBals',
|
54
|
+
type: 'uint256[]',
|
55
|
+
},
|
56
|
+
{
|
57
|
+
indexed: false,
|
58
|
+
internalType: 'uint256[]',
|
59
|
+
name: 'borrowBals',
|
60
|
+
type: 'uint256[]',
|
61
|
+
},
|
62
|
+
{
|
63
|
+
indexed: false,
|
64
|
+
internalType: 'uint256[]',
|
65
|
+
name: 'borrowBalsFee',
|
66
|
+
type: 'uint256[]',
|
67
|
+
},
|
68
|
+
],
|
69
|
+
name: 'LogMigrateUser',
|
70
|
+
type: 'event',
|
71
|
+
},
|
72
|
+
{
|
73
|
+
inputs: [],
|
74
|
+
name: 'connectorID',
|
75
|
+
outputs: [
|
76
|
+
{ internalType: 'uint256', name: 'model', type: 'uint256' },
|
77
|
+
{ internalType: 'uint256', name: 'id', type: 'uint256' },
|
78
|
+
],
|
79
|
+
stateMutability: 'pure',
|
80
|
+
type: 'function',
|
81
|
+
},
|
82
|
+
{
|
83
|
+
inputs: [
|
84
|
+
{ internalType: 'address[]', name: 'tokens', type: 'address[]' },
|
85
|
+
],
|
86
|
+
name: 'migrate',
|
87
|
+
outputs: [],
|
88
|
+
stateMutability: 'payable',
|
89
|
+
type: 'function',
|
90
|
+
},
|
91
|
+
{
|
92
|
+
inputs: [
|
93
|
+
{ internalType: 'address', name: 'userAccount', type: 'address' },
|
94
|
+
{ internalType: 'address[]', name: 'tokens', type: 'address[]' },
|
95
|
+
],
|
96
|
+
name: 'migrateUser',
|
97
|
+
outputs: [],
|
98
|
+
stateMutability: 'payable',
|
99
|
+
type: 'function',
|
100
|
+
},
|
101
|
+
{
|
102
|
+
inputs: [],
|
103
|
+
name: 'name',
|
104
|
+
outputs: [{ internalType: 'string', name: '', type: 'string' }],
|
105
|
+
stateMutability: 'view',
|
106
|
+
type: 'function',
|
107
|
+
},
|
108
|
+
];
|
@@ -0,0 +1,109 @@
|
|
1
|
+
import { AbiItem } from 'web3-utils';
|
2
|
+
|
3
|
+
export const aave_polygon_migrate: AbiItem[] = [
|
4
|
+
{
|
5
|
+
anonymous: false,
|
6
|
+
inputs: [
|
7
|
+
{
|
8
|
+
indexed: true,
|
9
|
+
internalType: "address",
|
10
|
+
name: "user",
|
11
|
+
type: "address"
|
12
|
+
},
|
13
|
+
{
|
14
|
+
indexed: true,
|
15
|
+
internalType: "address",
|
16
|
+
name: "targetDsa",
|
17
|
+
type: "address"
|
18
|
+
},
|
19
|
+
{
|
20
|
+
indexed: false,
|
21
|
+
internalType: "address[]",
|
22
|
+
name: "supplyTokens",
|
23
|
+
type: "address[]"
|
24
|
+
},
|
25
|
+
{
|
26
|
+
indexed: false,
|
27
|
+
internalType: "address[]",
|
28
|
+
name: "borrowTokens",
|
29
|
+
type: "address[]"
|
30
|
+
}
|
31
|
+
],
|
32
|
+
name: "LogAaveV2Migrate",
|
33
|
+
type: "event"
|
34
|
+
},
|
35
|
+
{
|
36
|
+
inputs: [ ],
|
37
|
+
name: "connectorID",
|
38
|
+
outputs: [
|
39
|
+
{
|
40
|
+
internalType: "uint256",
|
41
|
+
name: "_type",
|
42
|
+
type: "uint256"
|
43
|
+
},
|
44
|
+
{
|
45
|
+
internalType: "uint256",
|
46
|
+
name: "_id",
|
47
|
+
type: "uint256"
|
48
|
+
}
|
49
|
+
],
|
50
|
+
stateMutability: "pure",
|
51
|
+
type: "function"
|
52
|
+
},
|
53
|
+
{
|
54
|
+
inputs: [
|
55
|
+
{
|
56
|
+
internalType: "address",
|
57
|
+
name: "targetDsa",
|
58
|
+
type: "address"
|
59
|
+
},
|
60
|
+
{
|
61
|
+
internalType: "address[]",
|
62
|
+
name: "supplyTokens",
|
63
|
+
type: "address[]"
|
64
|
+
},
|
65
|
+
{
|
66
|
+
internalType: "address[]",
|
67
|
+
name: "borrowTokens",
|
68
|
+
type: "address[]"
|
69
|
+
},
|
70
|
+
{
|
71
|
+
internalType: "uint256[]",
|
72
|
+
name: "variableBorrowAmts",
|
73
|
+
type: "uint256[]"
|
74
|
+
},
|
75
|
+
{
|
76
|
+
internalType: "uint256[]",
|
77
|
+
name: "stableBorrowAmts",
|
78
|
+
type: "uint256[]"
|
79
|
+
},
|
80
|
+
{
|
81
|
+
internalType: "uint256[]",
|
82
|
+
name: "supplyAmts",
|
83
|
+
type: "uint256[]"
|
84
|
+
},
|
85
|
+
{
|
86
|
+
internalType: "uint256",
|
87
|
+
name: "ethAmt",
|
88
|
+
type: "uint256"
|
89
|
+
}
|
90
|
+
],
|
91
|
+
name: "migrate",
|
92
|
+
outputs: [ ],
|
93
|
+
stateMutability: "payable",
|
94
|
+
type: "function"
|
95
|
+
},
|
96
|
+
{
|
97
|
+
inputs: [ ],
|
98
|
+
name: "name",
|
99
|
+
outputs: [
|
100
|
+
{
|
101
|
+
internalType: "string",
|
102
|
+
name: "",
|
103
|
+
type: "string"
|
104
|
+
}
|
105
|
+
],
|
106
|
+
stateMutability: "view",
|
107
|
+
type: "function"
|
108
|
+
}
|
109
|
+
]
|
@@ -0,0 +1,3 @@
|
|
1
|
+
import { AbiItem } from 'web3-utils';
|
2
|
+
|
3
|
+
export const aave_stake: AbiItem[] =[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amt","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"getId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"setId","type":"uint256"}],"name":"LogClaim","type":"event"},{"anonymous":false,"inputs":[],"name":"LogCooldown","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"delegatee","type":"address"},{"indexed":false,"internalType":"bool","name":"delegateAave","type":"bool"},{"indexed":false,"internalType":"bool","name":"delegateStkAave","type":"bool"},{"indexed":false,"internalType":"uint8","name":"aaveDelegationType","type":"uint8"},{"indexed":false,"internalType":"uint8","name":"stkAaveDelegationType","type":"uint8"}],"name":"LogDelegate","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amt","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"getId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"setId","type":"uint256"}],"name":"LogRedeem","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amt","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"getId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"setId","type":"uint256"}],"name":"LogStake","type":"event"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"getId","type":"uint256"},{"internalType":"uint256","name":"setId","type":"uint256"}],"name":"claim","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"connectorID","outputs":[{"internalType":"uint256","name":"_type","type":"uint256"},{"internalType":"uint256","name":"_id","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"cooldown","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"delegatee","type":"address"},{"internalType":"bool","name":"delegateAave","type":"bool"},{"internalType":"bool","name":"delegateStkAave","type":"bool"},{"internalType":"uint8","name":"aaveDelegationType","type":"uint8"},{"internalType":"uint8","name":"stkAaveDelegationType","type":"uint8"}],"name":"delegate","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"getId","type":"uint256"},{"internalType":"uint256","name":"setId","type":"uint256"}],"name":"redeem","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"getId","type":"uint256"},{"internalType":"uint256","name":"setId","type":"uint256"}],"name":"stake","outputs":[],"stateMutability":"payable","type":"function"}]
|
@@ -0,0 +1,53 @@
|
|
1
|
+
import { AbiItem } from 'web3-utils';
|
2
|
+
|
3
|
+
export const aave_v1_import: AbiItem[] = [
|
4
|
+
{
|
5
|
+
inputs: [],
|
6
|
+
name: 'connectorID',
|
7
|
+
outputs: [
|
8
|
+
{
|
9
|
+
internalType: 'uint256',
|
10
|
+
name: 'model',
|
11
|
+
type: 'uint256',
|
12
|
+
},
|
13
|
+
{
|
14
|
+
internalType: 'uint256',
|
15
|
+
name: 'id',
|
16
|
+
type: 'uint256',
|
17
|
+
},
|
18
|
+
],
|
19
|
+
stateMutability: 'pure',
|
20
|
+
type: 'function',
|
21
|
+
},
|
22
|
+
{
|
23
|
+
inputs: [
|
24
|
+
{
|
25
|
+
internalType: 'address',
|
26
|
+
name: 'userAccount',
|
27
|
+
type: 'address',
|
28
|
+
},
|
29
|
+
{
|
30
|
+
internalType: 'address[]',
|
31
|
+
name: 'tokens',
|
32
|
+
type: 'address[]',
|
33
|
+
},
|
34
|
+
],
|
35
|
+
name: 'importAave',
|
36
|
+
outputs: [],
|
37
|
+
stateMutability: 'payable',
|
38
|
+
type: 'function',
|
39
|
+
},
|
40
|
+
{
|
41
|
+
inputs: [],
|
42
|
+
name: 'name',
|
43
|
+
outputs: [
|
44
|
+
{
|
45
|
+
internalType: 'string',
|
46
|
+
name: '',
|
47
|
+
type: 'string',
|
48
|
+
},
|
49
|
+
],
|
50
|
+
stateMutability: 'view',
|
51
|
+
type: 'function',
|
52
|
+
},
|
53
|
+
];
|