@instadapp/interop-x 0.0.0-dev.8cb1c22 → 0.0.0-dev.909c44a
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/package.json +9 -2
- package/dist/src/abi/aaveV2Resolver.json +832 -0
- package/dist/src/abi/aaveV3Resolver.json +628 -0
- package/dist/src/abi/balanceResolver.json +211 -0
- package/dist/src/abi/connectors/index.js +2 -2
- package/dist/src/abi/connectors/v2/1INCH-A.js +39 -1
- package/dist/src/abi/connectors/v2/1INCH-V3-A.js +42 -0
- package/dist/src/abi/connectors/v2/1INCH-V4-A.js +42 -0
- package/dist/src/abi/connectors/v2/AAVE-IMPORT-V2-V3-A.js +57 -0
- package/dist/src/abi/connectors/v2/AAVE-V2-A.js +91 -133
- package/dist/src/abi/connectors/v2/AAVE-V2-IMPORT-C.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-V3-A.js +322 -0
- package/dist/src/abi/connectors/v2/AAVE-V3-CLAIM-A.js +58 -0
- package/dist/src/abi/connectors/v2/AAVE-V3-IMPORT-A.js +59 -0
- package/dist/src/abi/connectors/v2/AAVE-V3-IMPORT-PERMIT-A.js +81 -0
- package/dist/src/abi/connectors/v2/BASIC-A.js +44 -86
- package/dist/src/abi/connectors/v2/BENQI-A.js +901 -0
- package/dist/src/abi/connectors/v2/COMPOUND-IMPORT-C.js +4 -0
- package/dist/src/abi/connectors/v2/COMPOUND-IMPORT-D.js +27 -0
- package/dist/src/abi/connectors/v2/DSA-SPELL-A.js +60 -0
- package/dist/src/abi/connectors/v2/HOP-A.js +41 -0
- package/dist/src/abi/connectors/v2/HOP-MAINNET-A.js +38 -0
- package/dist/src/abi/connectors/v2/INSTA-DEX-SIMULATION-A.js +40 -0
- package/dist/src/abi/connectors/v2/INSTAPOOL-B.js +4 -0
- package/dist/src/abi/connectors/v2/INSTAPOOL-C.js +4 -0
- package/dist/src/abi/connectors/v2/INTEROP-A.js +4 -0
- package/dist/src/abi/connectors/v2/INTEROP-STAGING-A.js +4 -0
- package/dist/src/abi/connectors/v2/LIDO-STETH-A.js +36 -0
- package/dist/src/abi/connectors/v2/LITE-A.js +4 -0
- package/dist/src/abi/connectors/v2/MSTABLE-A.js +4 -0
- package/dist/src/abi/connectors/v2/NOTIONAL-V2-A.js +484 -0
- package/dist/src/abi/connectors/v2/PANGOLIN-A.js +136 -0
- package/dist/src/abi/connectors/v2/PANGOLIN-STAKE-A.js +227 -0
- package/dist/src/abi/connectors/v2/PARASWAP-A.js +26 -1
- package/dist/src/abi/connectors/v2/PARASWAP-V5-A.js +29 -0
- package/dist/src/abi/connectors/v2/POOLTOGETHER-A.js +4 -0
- package/dist/src/abi/connectors/v2/QI-A.js +4 -0
- package/dist/src/abi/connectors/v2/QUICKSWAP-A.js +136 -0
- package/dist/src/abi/connectors/v2/SUSHISWAP-A.js +136 -0
- package/dist/src/abi/connectors/v2/SWAP-AGGREGATOR-A.js +25 -0
- package/dist/src/abi/connectors/v2/UBIQUITY-A.js +73 -0
- package/dist/src/abi/connectors/v2/UNISWAP-SELL-BETA.js +4 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V3-A.js +1 -1
- package/dist/src/abi/connectors/v2/UNISWAP-V3-ROUTER-A.js +4 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V3-STAKER-B.js +193 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V3-SWAP-A.js +74 -0
- package/dist/src/abi/connectors/v2/UNIVERSE-A.js +4 -0
- package/dist/src/abi/connectors/v2/WAVAX-A.js +4 -0
- package/dist/src/abi/connectors/v2/WFTM-A.js +60 -0
- package/dist/src/abi/connectors/v2/WMATIC-A.js +4 -0
- package/dist/src/abi/connectors/v2/ZEROX-A.js +29 -0
- package/dist/src/abi/connectors/v2/ZEROX-V4-A.js +29 -0
- package/dist/src/abi/connectors/v2/index.js +128 -44
- package/dist/src/abi/index.js +8 -0
- package/dist/src/abi/instList.json +232 -0
- package/dist/src/api/index.js +7 -0
- package/dist/src/constants/addresses.js +9 -1
- package/dist/src/constants/capPerChain.js +8 -0
- package/dist/src/constants/index.js +2 -0
- package/dist/src/constants/tokens.js +44 -44
- package/dist/src/constants/wrappedNativeToken.js +8 -0
- package/dist/src/crons/index.js +3 -0
- package/dist/src/crons/prices.js +16 -0
- package/dist/src/db/models/transaction.js +5 -1
- package/dist/src/errors/index.js +30 -0
- package/dist/src/gnosis/actions/aaveV2/source.js +26 -1
- package/dist/src/gnosis/actions/aaveV2/target.js +20 -5
- package/dist/src/gnosis/actions/aaveV3/index.js +11 -0
- package/dist/src/gnosis/actions/aaveV3/source.js +74 -0
- package/dist/src/gnosis/actions/aaveV3/target.js +87 -0
- package/dist/src/gnosis/actions/index.js +2 -0
- package/dist/src/index.js +2 -1
- package/dist/src/providers/index.js +17 -0
- package/dist/src/providers/retry-provider.js +45 -0
- package/dist/src/services/Prices.js +74 -0
- package/dist/src/services/index.js +8 -0
- package/dist/src/tasks/InteropX/{ProcessSubmitSubmitEvents.js → ProcessSubmitEvents.js} +110 -16
- package/dist/src/tasks/InteropX/ProcessValidateEvents.js +30 -10
- package/dist/src/tasks/InteropX/SyncLogExecuteEvents.js +113 -0
- package/dist/src/tasks/InteropX/SyncLogSubmitEvents.js +3 -2
- package/dist/src/tasks/InteropX/SyncLogValidateEvents.js +6 -5
- package/dist/src/tasks/index.js +7 -5
- package/dist/src/typechain/AaveV2Resolver.js +2 -0
- package/dist/src/typechain/AaveV3Resolver.js +2 -0
- package/dist/src/typechain/BalanceResolver.js +2 -0
- package/dist/src/typechain/InstList.js +2 -0
- package/dist/src/typechain/factories/AaveV2Resolver__factory.js +1191 -0
- package/dist/src/typechain/factories/AaveV3Resolver__factory.js +887 -0
- package/dist/src/typechain/factories/BalanceResolver__factory.js +228 -0
- package/dist/src/typechain/factories/InstList__factory.js +249 -0
- package/dist/src/typechain/factories/index.js +9 -1
- package/dist/src/typechain/index.js +9 -1
- package/dist/src/utils/async.js +18 -0
- package/dist/src/utils/dsa.js +36 -0
- package/dist/src/utils/formatting.js +67 -0
- package/dist/src/utils/gnosis.js +87 -0
- package/dist/src/utils/http.js +10 -0
- package/dist/src/utils/index.js +22 -220
- package/dist/src/utils/interop.js +16 -0
- package/dist/src/utils/tokens.js +22 -0
- package/dist/src/utils/validate.js +111 -0
- package/dist/src/utils/web3.js +93 -0
- package/package.json +9 -2
- package/src/abi/aaveV2Resolver.json +832 -0
- package/src/abi/aaveV3Resolver.json +628 -0
- package/src/abi/balanceResolver.json +211 -0
- package/src/abi/connectors/index.ts +5 -5
- package/src/abi/connectors/v2/1INCH-A.ts +39 -1
- package/src/abi/connectors/v2/1INCH-V3-A.ts +41 -0
- package/src/abi/connectors/v2/1INCH-V4-A.ts +41 -0
- package/src/abi/connectors/v2/AAVE-IMPORT-V2-V3-A.ts +56 -0
- package/src/abi/connectors/v2/AAVE-V2-A.ts +93 -135
- package/src/abi/connectors/v2/AAVE-V2-IMPORT-C.ts +3 -0
- package/src/abi/connectors/v2/AAVE-V3-A.ts +321 -0
- package/src/abi/connectors/v2/AAVE-V3-CLAIM-A.ts +57 -0
- package/src/abi/connectors/v2/AAVE-V3-IMPORT-A.ts +58 -0
- package/src/abi/connectors/v2/AAVE-V3-IMPORT-PERMIT-A.ts +80 -0
- package/src/abi/connectors/v2/BASIC-A.ts +44 -86
- package/src/abi/connectors/v2/BENQI-A.ts +900 -0
- package/src/abi/connectors/v2/COMPOUND-IMPORT-C.ts +3 -0
- package/src/abi/connectors/v2/COMPOUND-IMPORT-D.ts +26 -0
- package/src/abi/connectors/v2/DSA-SPELL-A.ts +59 -0
- package/src/abi/connectors/v2/HOP-A.ts +40 -0
- package/src/abi/connectors/v2/HOP-MAINNET-A.ts +37 -0
- package/src/abi/connectors/v2/INSTA-DEX-SIMULATION-A.ts +39 -0
- package/src/abi/connectors/v2/INSTAPOOL-B.ts +3 -0
- package/src/abi/connectors/v2/INSTAPOOL-C.ts +3 -0
- package/src/abi/connectors/v2/INTEROP-A.ts +3 -0
- package/src/abi/connectors/v2/INTEROP-STAGING-A.ts +3 -0
- package/src/abi/connectors/v2/LIDO-STETH-A.ts +35 -0
- package/src/abi/connectors/v2/LITE-A.ts +3 -0
- package/src/abi/connectors/v2/MSTABLE-A.ts +3 -0
- package/src/abi/connectors/v2/NOTIONAL-V2-A.ts +483 -0
- package/src/abi/connectors/v2/PANGOLIN-A.ts +135 -0
- package/src/abi/connectors/v2/PANGOLIN-STAKE-A.ts +226 -0
- package/src/abi/connectors/v2/PARASWAP-A.ts +26 -1
- package/src/abi/connectors/v2/PARASWAP-V5-A.ts +28 -0
- package/src/abi/connectors/v2/POOLTOGETHER-A.ts +3 -0
- package/src/abi/connectors/v2/QI-A.ts +3 -0
- package/src/abi/connectors/v2/QUICKSWAP-A.ts +135 -0
- package/src/abi/connectors/v2/SUSHISWAP-A.ts +135 -0
- package/src/abi/connectors/v2/SWAP-AGGREGATOR-A.ts +24 -0
- package/src/abi/connectors/v2/UBIQUITY-A.ts +72 -0
- package/src/abi/connectors/v2/UNISWAP-SELL-BETA.ts +3 -0
- package/src/abi/connectors/v2/UNISWAP-V3-A.ts +1 -1
- package/src/abi/connectors/v2/UNISWAP-V3-ROUTER-A.ts +3 -0
- package/src/abi/connectors/v2/UNISWAP-V3-STAKER-B.ts +192 -0
- package/src/abi/connectors/v2/UNISWAP-V3-SWAP-A.ts +73 -0
- package/src/abi/connectors/v2/UNIVERSE-A.ts +3 -0
- package/src/abi/connectors/v2/WAVAX-A.ts +3 -0
- package/src/abi/connectors/v2/WFTM-A.ts +59 -0
- package/src/abi/connectors/v2/WMATIC-A.ts +3 -0
- package/src/abi/connectors/v2/ZEROX-A.ts +28 -0
- package/src/abi/connectors/v2/ZEROX-V4-A.ts +28 -0
- package/src/abi/connectors/v2/index.ts +171 -85
- package/src/abi/index.ts +8 -0
- package/src/abi/instList.json +232 -0
- package/src/api/index.ts +8 -0
- package/src/constants/addresses.ts +21 -2
- package/src/constants/capPerChain.ts +5 -0
- package/src/constants/index.ts +2 -0
- package/src/constants/tokens.ts +44 -44
- package/src/constants/wrappedNativeToken.ts +5 -0
- package/src/crons/index.ts +1 -0
- package/src/crons/prices.ts +12 -0
- package/src/db/models/transaction.ts +22 -1
- package/src/errors/index.ts +26 -0
- package/src/gnosis/actions/aaveV2/source.ts +56 -3
- package/src/gnosis/actions/aaveV2/target.ts +35 -7
- package/src/gnosis/actions/aaveV3/index.ts +9 -0
- package/src/gnosis/actions/aaveV3/source.ts +119 -0
- package/src/gnosis/actions/aaveV3/target.ts +142 -0
- package/src/gnosis/actions/index.ts +2 -0
- package/src/index.ts +1 -0
- package/src/providers/index.ts +1 -0
- package/src/providers/retry-provider.ts +51 -0
- package/src/services/Prices.ts +89 -0
- package/src/services/index.ts +1 -0
- package/src/tasks/InteropX/{ProcessSubmitSubmitEvents.ts → ProcessSubmitEvents.ts} +139 -22
- package/src/tasks/InteropX/ProcessValidateEvents.ts +42 -19
- package/src/tasks/InteropX/SyncLogExecuteEvents.ts +161 -0
- package/src/tasks/InteropX/SyncLogSubmitEvents.ts +6 -7
- package/src/tasks/InteropX/SyncLogValidateEvents.ts +9 -10
- package/src/tasks/index.ts +8 -5
- package/src/typechain/AaveV2Resolver.ts +1017 -0
- package/src/typechain/AaveV3Resolver.ts +935 -0
- package/src/typechain/BalanceResolver.ts +266 -0
- package/src/typechain/InstList.ts +402 -0
- package/src/typechain/factories/AaveV2Resolver__factory.ts +1198 -0
- package/src/typechain/factories/AaveV3Resolver__factory.ts +894 -0
- package/src/typechain/factories/BalanceResolver__factory.ts +235 -0
- package/src/typechain/factories/InstList__factory.ts +253 -0
- package/src/typechain/factories/index.ts +4 -0
- package/src/typechain/index.ts +8 -0
- package/src/utils/async.ts +22 -0
- package/src/utils/dsa.ts +56 -0
- package/src/utils/formatting.ts +68 -0
- package/src/utils/gnosis.ts +166 -0
- package/src/utils/http.ts +6 -0
- package/src/utils/index.ts +9 -365
- package/src/utils/interop.ts +28 -0
- package/src/utils/tokens.ts +21 -0
- package/src/utils/validate.ts +179 -0
- package/src/utils/web3.ts +132 -0
@@ -16,10 +16,14 @@ const sequelize_1 = require("sequelize");
|
|
16
16
|
const gnosis_1 = require("@/gnosis");
|
17
17
|
const net_1 = require("@/net");
|
18
18
|
const waait_1 = __importDefault(require("waait"));
|
19
|
-
|
19
|
+
const errors_1 = require("@/errors");
|
20
|
+
const bignumber_js_1 = require("bignumber.js");
|
21
|
+
const dedent_1 = __importDefault(require("dedent"));
|
22
|
+
const providers_1 = require("@/providers");
|
23
|
+
class ProcessSubmitEvents extends BaseTask_1.BaseTask {
|
20
24
|
constructor({ chainId }) {
|
21
25
|
super({
|
22
|
-
logger: new logger_1.default("InteropX::
|
26
|
+
logger: new logger_1.default("InteropX::ProcessSubmitEvents"),
|
23
27
|
});
|
24
28
|
this.leadNodeOnly = true;
|
25
29
|
this.blockConfirmationsCount = 12;
|
@@ -54,15 +58,51 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
|
|
54
58
|
this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
|
55
59
|
transaction.sourceStatus = "proccessing";
|
56
60
|
await transaction.save();
|
57
|
-
const
|
58
|
-
|
61
|
+
const { submitEvent: { position, sourceChainId, targetChainId, sourceDsaId } } = transaction;
|
62
|
+
try {
|
63
|
+
(0, utils_1.validateChains)({ sourceChainId, targetChainId });
|
64
|
+
}
|
65
|
+
catch (error) {
|
66
|
+
transaction.sourceErrors = [error.message];
|
67
|
+
transaction.sourceStatus = "failed";
|
68
|
+
transaction.targetStatus = "failed";
|
69
|
+
transaction.status = "failed";
|
70
|
+
await transaction.save();
|
71
|
+
return;
|
72
|
+
}
|
73
|
+
const walletBalance = (await this.sourceWallet.getBalance()).toString();
|
74
|
+
const currentGasPrice = (await this.sourceWallet.getGasPrice()).toString();
|
75
|
+
const minBalanceRequired = new bignumber_js_1.BigNumber(currentGasPrice)
|
76
|
+
.multipliedBy(4000000)
|
77
|
+
.multipliedBy(2); // 2x balance
|
78
|
+
if (new bignumber_js_1.BigNumber(walletBalance).isLessThan(minBalanceRequired)) {
|
79
|
+
console.log((0, dedent_1.default) `Not enough balance in wallet ${(0, utils_1.getExplorerUrl)(sourceChainId, '/address/' + this.sourceWallet.address)} on ${(0, utils_1.chainIdToName)(sourceChainId)}
|
80
|
+
Balance: ${ethers_1.ethers.utils.parseEther(walletBalance)} ${(0, utils_1.getChainIdNativeSymbol)(sourceChainId)}
|
81
|
+
Required Balance: ${ethers_1.ethers.utils.parseEther(minBalanceRequired.toString())}
|
82
|
+
Require more: ${ethers_1.ethers.utils.parseEther(minBalanceRequired.minus(walletBalance).toString())}`);
|
83
|
+
transaction.sourceDelayUntil = (0, moment_1.default)().add({ minutes: 5 }).toDate();
|
84
|
+
transaction.sourceStatus = "pending";
|
85
|
+
await transaction.save();
|
86
|
+
return;
|
87
|
+
}
|
88
|
+
try {
|
89
|
+
await (0, utils_1.validateLiquidityCap)(position, sourceChainId, targetChainId);
|
90
|
+
}
|
91
|
+
catch (error) {
|
92
|
+
transaction.sourceErrors = [error.message];
|
93
|
+
transaction.sourceStatus = "failed";
|
94
|
+
transaction.targetStatus = "failed";
|
95
|
+
transaction.status = "failed";
|
96
|
+
await transaction.save();
|
97
|
+
return;
|
98
|
+
}
|
59
99
|
this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
|
60
100
|
let data, logs = [];
|
61
101
|
try {
|
62
102
|
({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, "source"));
|
63
103
|
}
|
64
104
|
catch (error) {
|
65
|
-
if (error instanceof
|
105
|
+
if (error instanceof errors_1.LiquidityError) {
|
66
106
|
await transaction.save();
|
67
107
|
transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
|
68
108
|
transaction.sourceStatus = "pending";
|
@@ -78,6 +118,34 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
|
|
78
118
|
net_1.protocol.sendTransaction(transaction);
|
79
119
|
return;
|
80
120
|
}
|
121
|
+
try {
|
122
|
+
await (0, utils_1.validateSourceLiquidity)({
|
123
|
+
position,
|
124
|
+
sourceChainId,
|
125
|
+
sourceDsaId,
|
126
|
+
sourceProvider: this.sourceProvider,
|
127
|
+
});
|
128
|
+
}
|
129
|
+
catch (error) {
|
130
|
+
if (error instanceof errors_1.UnsupportedChaindIdError) {
|
131
|
+
console.log(`Dropping transaction ${transaction.transactionHash}`);
|
132
|
+
transaction.sourceErrors = [error.message];
|
133
|
+
transaction.sourceStatus = "failed";
|
134
|
+
transaction.targetStatus = "failed";
|
135
|
+
transaction.status = "failed";
|
136
|
+
await transaction.save();
|
137
|
+
}
|
138
|
+
else {
|
139
|
+
transaction.sourceStatus = "pending";
|
140
|
+
transaction.sourceErrors = [error.message];
|
141
|
+
transaction.sourceDelayUntil = (0, moment_1.default)().add({ minutes: 5 }).toDate();
|
142
|
+
await transaction.save();
|
143
|
+
console.log("[validateSourceLiquidity][Warning]", error.message);
|
144
|
+
return;
|
145
|
+
}
|
146
|
+
}
|
147
|
+
const ownersThreshold = await this.sourceGnosisContract.getThreshold();
|
148
|
+
await (0, waait_1.default)(10000);
|
81
149
|
this.logger.debug(`Generating gnosis tx for ${transaction.transactionHash}`);
|
82
150
|
let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
|
83
151
|
baseGas: "0",
|
@@ -92,14 +160,26 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
|
|
92
160
|
to: constants_1.addresses[transaction.sourceChainId].multisend,
|
93
161
|
value: "0",
|
94
162
|
}, this.sourceGnosisContract);
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
163
|
+
async function getGnosisOwnerPeerIds({ gnosisContract }) {
|
164
|
+
const owners = await gnosisContract
|
165
|
+
.getOwners()
|
166
|
+
.then((owners) => owners.map((owner) => owner.toLowerCase()));
|
167
|
+
return net_1.peerPool.activePeers
|
168
|
+
.filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
|
169
|
+
.map((peer) => peer.id);
|
170
|
+
}
|
171
|
+
const ownerPeerIds = await getGnosisOwnerPeerIds({
|
172
|
+
gnosisContract: this.sourceGnosisContract,
|
173
|
+
});
|
174
|
+
console.log(`Collecting signatures for execution ${transaction.transactionHash} `);
|
102
175
|
console.log(ownerPeerIds);
|
176
|
+
const message = (0, utils_1.generateGnosisSignatureMessage)({
|
177
|
+
to: constants_1.addresses[this.chainId].multisend,
|
178
|
+
data,
|
179
|
+
chainId: this.chainId,
|
180
|
+
safeTxGas: gnosisTx.safeTxGas,
|
181
|
+
nonce: gnosisTx.safeNonce,
|
182
|
+
});
|
103
183
|
const signatures = await net_1.protocol.requestSignatures({
|
104
184
|
type: "source",
|
105
185
|
transactionHash: transaction.transactionHash,
|
@@ -107,7 +187,21 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
|
|
107
187
|
safeNonce: gnosisTx.nonce,
|
108
188
|
chainId: this.chainId,
|
109
189
|
}, ownerPeerIds);
|
110
|
-
const validSignatures = signatures
|
190
|
+
const validSignatures = signatures
|
191
|
+
.filter((s) => !!s.data && s.data !== "0x")
|
192
|
+
.filter((s) => {
|
193
|
+
try {
|
194
|
+
const address = (0, utils_1.getGnosisSignatureAddress)({
|
195
|
+
message,
|
196
|
+
signature: s.data,
|
197
|
+
chainId: this.chainId,
|
198
|
+
});
|
199
|
+
return (address === null || address === void 0 ? void 0 : address.toLowerCase()) === s.signer.toLowerCase();
|
200
|
+
}
|
201
|
+
catch (error) {
|
202
|
+
return false;
|
203
|
+
}
|
204
|
+
});
|
111
205
|
console.log({
|
112
206
|
signatures,
|
113
207
|
validSignatures,
|
@@ -120,7 +214,7 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
|
|
120
214
|
transaction.sourceStatus = "pending";
|
121
215
|
await transaction.save();
|
122
216
|
const errorMessage = (_a = signatures.find((s) => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
|
123
|
-
throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ""));
|
217
|
+
throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage} ` : ""));
|
124
218
|
}
|
125
219
|
console.log(`Executing transaction for execution ${transaction.transactionHash}`);
|
126
220
|
const { data: txData } = await this.sourceGnosisContract.populateTransaction.execTransaction(gnosisTx.to, gnosisTx.value, gnosisTx.data, gnosisTx.operation, gnosisTx.safeTxGas, gnosisTx.baseGas, gnosisTx.gasPrice, gnosisTx.gasToken, gnosisTx.refundReceiver, (0, utils_1.buildSignatureBytes)(validSignatures));
|
@@ -170,10 +264,10 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
|
|
170
264
|
}
|
171
265
|
async start() {
|
172
266
|
this.blockConfirmationsCount = constants_1.blockConfirmations[this.chainId] + 1;
|
173
|
-
this.sourceProvider = new
|
267
|
+
this.sourceProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
174
268
|
this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.sourceProvider);
|
175
269
|
this.sourceGnosisContract = (0, utils_1.getContract)(constants_1.addresses[this.chainId].gnosisSafe, abi_1.default.gnosisSafe, this.sourceWallet);
|
176
270
|
await super.start();
|
177
271
|
}
|
178
272
|
}
|
179
|
-
exports.default =
|
273
|
+
exports.default = ProcessSubmitEvents;
|
@@ -16,6 +16,8 @@ const sequelize_1 = require("sequelize");
|
|
16
16
|
const gnosis_1 = require("@/gnosis");
|
17
17
|
const net_1 = require("@/net");
|
18
18
|
const waait_1 = __importDefault(require("waait"));
|
19
|
+
const errors_1 = require("@/errors");
|
20
|
+
const providers_1 = require("@/providers");
|
19
21
|
class ProcessValidateEvents extends BaseTask_1.BaseTask {
|
20
22
|
constructor({ chainId }) {
|
21
23
|
super({
|
@@ -57,7 +59,7 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
|
|
57
59
|
transaction.targetStatus = "proccessing";
|
58
60
|
await transaction.save();
|
59
61
|
const { sourceChainId, targetChainId } = transaction.validateEvent;
|
60
|
-
const targetProvider = new
|
62
|
+
const targetProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
|
61
63
|
const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetProvider);
|
62
64
|
const targetGnosisContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].gnosisSafe, abi_1.default.gnosisSafe, targetWallet);
|
63
65
|
const ownersThreshold = await targetGnosisContract.getThreshold();
|
@@ -68,7 +70,7 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
|
|
68
70
|
({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, "target"));
|
69
71
|
}
|
70
72
|
catch (error) {
|
71
|
-
if (error instanceof
|
73
|
+
if (error instanceof errors_1.LiquidityError) {
|
72
74
|
await transaction.save();
|
73
75
|
transaction.targetDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
|
74
76
|
transaction.targetStatus = "pending";
|
@@ -97,14 +99,18 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
|
|
97
99
|
to: constants_1.addresses[transaction.targetChainId].multisend,
|
98
100
|
value: "0",
|
99
101
|
}, targetGnosisContract);
|
100
|
-
const
|
101
|
-
|
102
|
-
|
103
|
-
const ownerPeerIds = net_1.peerPool.activePeers
|
104
|
-
.filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
|
105
|
-
.map((peer) => peer.id);
|
102
|
+
const ownerPeerIds = await (0, utils_1.getGnosisOwnerPeerIds)({
|
103
|
+
gnosisContract: targetGnosisContract,
|
104
|
+
});
|
106
105
|
console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
|
107
106
|
console.log(ownerPeerIds);
|
107
|
+
const message = (0, utils_1.generateGnosisSignatureMessage)({
|
108
|
+
to: constants_1.addresses[targetChainId].multisend,
|
109
|
+
data,
|
110
|
+
chainId: targetChainId,
|
111
|
+
safeTxGas: gnosisTx.safeTxGas,
|
112
|
+
nonce: gnosisTx.safeNonce,
|
113
|
+
});
|
108
114
|
const signatures = await net_1.protocol.requestSignatures({
|
109
115
|
type: "target",
|
110
116
|
transactionHash: transaction.transactionHash,
|
@@ -112,7 +118,21 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
|
|
112
118
|
safeNonce: gnosisTx.nonce,
|
113
119
|
chainId: targetChainId,
|
114
120
|
}, ownerPeerIds);
|
115
|
-
const validSignatures = signatures
|
121
|
+
const validSignatures = signatures
|
122
|
+
.filter((s) => !!s.data && s.data !== "0x")
|
123
|
+
.filter((s) => {
|
124
|
+
try {
|
125
|
+
const address = (0, utils_1.getGnosisSignatureAddress)({
|
126
|
+
message,
|
127
|
+
signature: s.data,
|
128
|
+
chainId: targetChainId,
|
129
|
+
});
|
130
|
+
return (address === null || address === void 0 ? void 0 : address.toLowerCase()) === s.signer.toLowerCase();
|
131
|
+
}
|
132
|
+
catch (error) {
|
133
|
+
return false;
|
134
|
+
}
|
135
|
+
});
|
116
136
|
console.log({
|
117
137
|
signatures,
|
118
138
|
validSignatures,
|
@@ -176,7 +196,7 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
|
|
176
196
|
}
|
177
197
|
async start() {
|
178
198
|
this.blockConfirmationsCount = constants_1.blockConfirmations[this.chainId] + 1;
|
179
|
-
this.sourceProvider = new
|
199
|
+
this.sourceProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
180
200
|
await super.start();
|
181
201
|
}
|
182
202
|
}
|
@@ -0,0 +1,113 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
const BaseTask_1 = require("../BaseTask");
|
7
|
+
const logger_1 = __importDefault(require("@/logger"));
|
8
|
+
const ethers_1 = require("ethers");
|
9
|
+
const abi_1 = __importDefault(require("@/abi"));
|
10
|
+
const db_1 = require("@/db");
|
11
|
+
const utils_1 = require("@/utils");
|
12
|
+
const constants_1 = require("@/constants");
|
13
|
+
const config_1 = __importDefault(require("@/config"));
|
14
|
+
const sequelize_1 = require("sequelize");
|
15
|
+
const providers_1 = require("@/providers");
|
16
|
+
class SyncLogExecuteEvents extends BaseTask_1.BaseTask {
|
17
|
+
constructor({ targetChainId }) {
|
18
|
+
super({
|
19
|
+
logger: new logger_1.default("InteropX::SyncLogExecuteEvents"),
|
20
|
+
});
|
21
|
+
this.targetChainId = targetChainId;
|
22
|
+
}
|
23
|
+
async pollHandler() {
|
24
|
+
const currentBlock = await this.provider.getBlockNumber();
|
25
|
+
const events = await this.contract.queryFilter(this.contract.filters.LogExecute(), currentBlock - 2000, currentBlock);
|
26
|
+
let processedEvents = 0;
|
27
|
+
for (const event of events) {
|
28
|
+
try {
|
29
|
+
if (!event.args) {
|
30
|
+
continue;
|
31
|
+
}
|
32
|
+
const { sourceSpells, targetSpells, position, actionId, actionIdHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = event.args;
|
33
|
+
const uniqueIdentifier = {
|
34
|
+
actionId,
|
35
|
+
vnonce: vnonce.toString(),
|
36
|
+
sourceSender: sourceSender.toString(),
|
37
|
+
sourceChainId: sourceChainId.toNumber(),
|
38
|
+
targetChainId: targetChainId.toNumber(),
|
39
|
+
sourceDsaId: sourceDsaId.toString(),
|
40
|
+
targetDsaId: targetDsaId.toString(),
|
41
|
+
};
|
42
|
+
let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
|
43
|
+
const transaction = await db_1.Transaction.findOne({
|
44
|
+
where: {
|
45
|
+
transactionHash,
|
46
|
+
executeEvent: { [sequelize_1.Op.eq]: null },
|
47
|
+
},
|
48
|
+
});
|
49
|
+
if (!transaction) {
|
50
|
+
continue;
|
51
|
+
}
|
52
|
+
if (transaction.targetStatus != "success") {
|
53
|
+
transaction.targetStatus = "success";
|
54
|
+
}
|
55
|
+
if (transaction.status != "success") {
|
56
|
+
transaction.status = "success";
|
57
|
+
}
|
58
|
+
if (!transaction.targetCreatedAt) {
|
59
|
+
transaction.targetCreatedAt = new Date();
|
60
|
+
}
|
61
|
+
transaction.targetTransactionHash = event.transactionHash;
|
62
|
+
transaction.targetBlockNumber = event.blockNumber;
|
63
|
+
transaction.targetLogs = [];
|
64
|
+
transaction.executeEvent = {
|
65
|
+
actionId,
|
66
|
+
actionIdHashHash: actionIdHash,
|
67
|
+
actionIdHash,
|
68
|
+
vnonce: vnonce.toString(),
|
69
|
+
sourceSpells: sourceSpells.map(({ connector, data }) => ({
|
70
|
+
connector,
|
71
|
+
data,
|
72
|
+
})),
|
73
|
+
targetSpells: targetSpells.map(({ connector, data }) => ({
|
74
|
+
connector,
|
75
|
+
data,
|
76
|
+
})),
|
77
|
+
position: {
|
78
|
+
withdraw: position.withdraw.map((v) => ({
|
79
|
+
sourceToken: v.sourceToken,
|
80
|
+
targetToken: v.targetToken,
|
81
|
+
amount: v.amount.toString(),
|
82
|
+
})),
|
83
|
+
supply: position.supply.map((v) => ({
|
84
|
+
sourceToken: v.sourceToken,
|
85
|
+
targetToken: v.targetToken,
|
86
|
+
amount: v.amount.toString(),
|
87
|
+
})),
|
88
|
+
},
|
89
|
+
sourceChainId: sourceChainId.toNumber(),
|
90
|
+
targetChainId: targetChainId.toNumber(),
|
91
|
+
sourceSender,
|
92
|
+
sourceDsaId: sourceDsaId.toString(),
|
93
|
+
targetDsaId: targetDsaId.toString(),
|
94
|
+
metadata,
|
95
|
+
};
|
96
|
+
await transaction.save();
|
97
|
+
this.logger.info(`New InteropX transaction: ${transactionHash} `);
|
98
|
+
}
|
99
|
+
catch (error) {
|
100
|
+
this.logger.error(error);
|
101
|
+
}
|
102
|
+
}
|
103
|
+
if (processedEvents > 0)
|
104
|
+
this.logger.info(`${processedEvents} events processed`);
|
105
|
+
}
|
106
|
+
async start() {
|
107
|
+
this.contractAddress = constants_1.addresses[this.targetChainId].interopX;
|
108
|
+
this.provider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(this.targetChainId));
|
109
|
+
this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopX, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
|
110
|
+
await super.start();
|
111
|
+
}
|
112
|
+
}
|
113
|
+
exports.default = SyncLogExecuteEvents;
|
@@ -11,6 +11,7 @@ const db_1 = require("@/db");
|
|
11
11
|
const utils_1 = require("@/utils");
|
12
12
|
const constants_1 = require("@/constants");
|
13
13
|
const config_1 = __importDefault(require("@/config"));
|
14
|
+
const providers_1 = require("@/providers");
|
14
15
|
class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
|
15
16
|
constructor({ chainId }) {
|
16
17
|
super({
|
@@ -68,7 +69,7 @@ class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
|
|
68
69
|
targetDsaId: targetDsaId.toString(),
|
69
70
|
metadata,
|
70
71
|
} }));
|
71
|
-
this.logger.info(`New InteropX
|
72
|
+
this.logger.info(`New InteropX transaction: ${transactionHash} `);
|
72
73
|
}
|
73
74
|
catch (error) {
|
74
75
|
this.logger.error(error);
|
@@ -79,7 +80,7 @@ class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
|
|
79
80
|
}
|
80
81
|
async start() {
|
81
82
|
this.contractAddress = constants_1.addresses[this.chainId].interopX;
|
82
|
-
this.provider = new
|
83
|
+
this.provider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
83
84
|
this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopX, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
|
84
85
|
await super.start();
|
85
86
|
}
|
@@ -12,6 +12,7 @@ const utils_1 = require("@/utils");
|
|
12
12
|
const constants_1 = require("@/constants");
|
13
13
|
const config_1 = __importDefault(require("@/config"));
|
14
14
|
const sequelize_1 = require("sequelize");
|
15
|
+
const providers_1 = require("@/providers");
|
15
16
|
class SyncLogValidateEvents extends BaseTask_1.BaseTask {
|
16
17
|
constructor({ chainId }) {
|
17
18
|
super({
|
@@ -57,7 +58,7 @@ class SyncLogValidateEvents extends BaseTask_1.BaseTask {
|
|
57
58
|
transaction.sourceTransactionHash = event.transactionHash;
|
58
59
|
transaction.sourceBlockNumber = event.blockNumber;
|
59
60
|
transaction.sourceLogs = [];
|
60
|
-
|
61
|
+
transaction.validateEvent = {
|
61
62
|
actionId,
|
62
63
|
actionIdHashHash: actionIdHash,
|
63
64
|
actionIdHash,
|
@@ -84,9 +85,9 @@ class SyncLogValidateEvents extends BaseTask_1.BaseTask {
|
|
84
85
|
sourceDsaId: sourceDsaId.toString(),
|
85
86
|
targetDsaId: targetDsaId.toString(),
|
86
87
|
metadata,
|
87
|
-
}
|
88
|
-
|
89
|
-
this.logger.info(`New InteropX
|
88
|
+
};
|
89
|
+
await transaction.save();
|
90
|
+
this.logger.info(`New InteropX transaction: ${transactionHash} `);
|
90
91
|
}
|
91
92
|
catch (error) {
|
92
93
|
this.logger.error(error);
|
@@ -97,7 +98,7 @@ class SyncLogValidateEvents extends BaseTask_1.BaseTask {
|
|
97
98
|
}
|
98
99
|
async start() {
|
99
100
|
this.contractAddress = constants_1.addresses[this.chainId].interopX;
|
100
|
-
this.provider = new
|
101
|
+
this.provider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
101
102
|
this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopX, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
|
102
103
|
await super.start();
|
103
104
|
}
|
package/dist/src/tasks/index.js
CHANGED
@@ -8,23 +8,25 @@ const waait_1 = __importDefault(require("waait"));
|
|
8
8
|
const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
|
9
9
|
const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
|
10
10
|
const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
|
11
|
-
const
|
11
|
+
const ProcessSubmitEvents_1 = __importDefault(require("./InteropX/ProcessSubmitEvents"));
|
12
12
|
const SyncLogValidateEvents_1 = __importDefault(require("./InteropX/SyncLogValidateEvents"));
|
13
13
|
const ProcessValidateEvents_1 = __importDefault(require("./InteropX/ProcessValidateEvents"));
|
14
|
+
const SyncLogExecuteEvents_1 = __importDefault(require("./InteropX/SyncLogExecuteEvents"));
|
14
15
|
class Tasks {
|
15
16
|
constructor() {
|
16
17
|
this.tasks = [
|
17
|
-
// new SyncTransactionStatusTask(),
|
18
18
|
new AutoUpdateTask_1.default(),
|
19
19
|
// InteropX
|
20
20
|
new SyncLogSubmitEvents_1.default({ chainId: 137 }),
|
21
21
|
new SyncLogSubmitEvents_1.default({ chainId: 43114 }),
|
22
|
-
new
|
23
|
-
new
|
22
|
+
new ProcessSubmitEvents_1.default({ chainId: 137 }),
|
23
|
+
new ProcessSubmitEvents_1.default({ chainId: 43114 }),
|
24
24
|
new SyncLogValidateEvents_1.default({ chainId: 137 }),
|
25
25
|
new SyncLogValidateEvents_1.default({ chainId: 43114 }),
|
26
26
|
new ProcessValidateEvents_1.default({ chainId: 137 }),
|
27
27
|
new ProcessValidateEvents_1.default({ chainId: 43114 }),
|
28
|
+
new SyncLogExecuteEvents_1.default({ targetChainId: 137 }),
|
29
|
+
new SyncLogExecuteEvents_1.default({ targetChainId: 43114 }),
|
28
30
|
new SyncTransactionStatusTask_1.default(),
|
29
31
|
];
|
30
32
|
}
|
@@ -32,7 +34,7 @@ class Tasks {
|
|
32
34
|
for (const task of this.tasks) {
|
33
35
|
try {
|
34
36
|
task.start();
|
35
|
-
await (0, waait_1.default)(
|
37
|
+
await (0, waait_1.default)(300);
|
36
38
|
}
|
37
39
|
catch (error) {
|
38
40
|
console.error(`Error starting task: ${task.constructor.name}`);
|