@instadapp/interop-x 0.0.0-dev.f9253db → 0.0.0-dev.fabee70
Sign up to get free protection for your applications and to get access to all the features.
- package/bin/interop-x +1 -1
- package/dist/package.json +73 -0
- package/dist/{abi → src/abi}/erc20.json +0 -0
- package/dist/{abi → src/abi}/gnosisSafe.json +0 -0
- package/dist/{abi → src/abi}/index.js +0 -0
- package/dist/{abi → src/abi}/interopBridgeToken.json +0 -0
- package/dist/{abi → src/abi}/interopXGateway.json +0 -0
- package/dist/src/api/index.js +33 -0
- package/dist/{config → src/config}/index.js +1 -0
- package/dist/{constants → src/constants}/addresses.js +0 -8
- package/dist/{constants → src/constants}/index.js +1 -0
- package/dist/src/constants/itokens.js +13 -0
- package/dist/{constants → src/constants}/tokens.js +0 -0
- package/dist/{db → src/db}/index.js +0 -0
- package/dist/{db → src/db}/models/index.js +0 -0
- package/dist/{db → src/db}/models/transaction.js +3 -1
- package/dist/{db → src/db}/sequelize.js +0 -0
- package/dist/src/index.js +107 -0
- package/dist/{logger → src/logger}/index.js +0 -0
- package/dist/{net → src/net}/index.js +0 -0
- package/dist/{net → src/net}/peer/index.js +8 -3
- package/dist/{net → src/net}/pool/index.js +32 -9
- package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +0 -0
- package/dist/src/net/protocol/dial/SignatureDialProtocol.1.js +28 -0
- package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +22 -12
- package/dist/{net → src/net}/protocol/index.js +41 -1
- package/dist/src/tasks/AutoUpdateTask.js +57 -0
- package/dist/{tasks → src/tasks}/BaseTask.js +8 -4
- package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +146 -0
- package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +69 -0
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +149 -0
- package/dist/{tasks → src/tasks}/InteropXGateway/SyncDepositEvents.js +16 -21
- package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +53 -0
- package/dist/src/tasks/index.js +44 -0
- package/dist/{typechain → src/typechain}/Erc20.js +0 -0
- package/dist/{typechain → src/typechain}/GnosisSafe.js +0 -0
- package/dist/{typechain → src/typechain}/InteropBridgeToken.js +0 -0
- package/dist/{typechain → src/typechain}/InteropXGateway.js +0 -0
- package/dist/{typechain → src/typechain}/common.js +0 -0
- package/dist/{typechain → src/typechain}/factories/Erc20__factory.js +0 -0
- package/dist/{typechain → src/typechain}/factories/GnosisSafe__factory.js +0 -0
- package/dist/{typechain → src/typechain}/factories/InteropBridgeToken__factory.js +0 -0
- package/dist/{typechain → src/typechain}/factories/InteropXGateway__factory.js +0 -0
- package/dist/{typechain → src/typechain}/factories/index.js +0 -0
- package/dist/{typechain → src/typechain}/index.js +0 -0
- package/dist/{types.js → src/types.js} +0 -0
- package/dist/src/utils/index.js +238 -0
- package/package.json +9 -3
- package/patches/@ethersproject+properties+5.6.0.patch +13 -0
- package/src/api/index.ts +33 -0
- package/src/config/index.ts +2 -0
- package/src/constants/addresses.ts +0 -8
- package/src/constants/index.ts +1 -0
- package/src/constants/itokens.ts +10 -0
- package/src/db/models/transaction.ts +8 -4
- package/src/index.ts +62 -6
- package/src/net/peer/index.ts +9 -7
- package/src/net/pool/index.ts +41 -11
- package/src/net/protocol/dial/SignatureDialProtocol.1.ts +31 -0
- package/src/net/protocol/dial/SignatureDialProtocol.ts +25 -13
- package/src/net/protocol/index.ts +57 -1
- package/src/tasks/AutoUpdateTask.ts +73 -0
- package/src/tasks/BaseTask.ts +9 -4
- package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +231 -0
- package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +119 -0
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +243 -0
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +23 -13
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +65 -0
- package/src/tasks/index.ts +24 -2
- package/src/utils/index.ts +197 -7
- package/dist/index.js +0 -63
- package/dist/tasks/index.js +0 -27
- package/dist/utils/index.js +0 -101
@@ -0,0 +1,243 @@
|
|
1
|
+
import { BaseTask } from "../BaseTask";
|
2
|
+
import Logger from '@/logger';
|
3
|
+
import { BigNumber, ethers } from "ethers";
|
4
|
+
import abi from "@/abi";
|
5
|
+
import { Transaction } from "@/db";
|
6
|
+
import { buildDataForTransaction, buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
|
7
|
+
import { addresses } from "@/constants";
|
8
|
+
import { ChainId } from "@/types";
|
9
|
+
import config from "@/config";
|
10
|
+
import { GnosisSafe, InteropXGateway } from "@/typechain";
|
11
|
+
import { Op } from "sequelize";
|
12
|
+
import wait from "waait";
|
13
|
+
import { peerPool, protocol } from "@/net";
|
14
|
+
import { LogDescription } from "ethers/lib/utils";
|
15
|
+
|
16
|
+
const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
|
17
|
+
console.log(transactionData);
|
18
|
+
|
19
|
+
let isExecuted = await safeContract.dataHashes(
|
20
|
+
await safeContract.getTransactionHash(
|
21
|
+
transactionData.to,
|
22
|
+
transactionData.value,
|
23
|
+
transactionData.data,
|
24
|
+
transactionData.operation,
|
25
|
+
transactionData.safeTxGas,
|
26
|
+
transactionData.baseGas,
|
27
|
+
transactionData.gasPrice,
|
28
|
+
transactionData.gasToken,
|
29
|
+
transactionData.refundReceiver,
|
30
|
+
transactionData.nonce
|
31
|
+
)
|
32
|
+
)
|
33
|
+
|
34
|
+
while (isExecuted == 1) {
|
35
|
+
transactionData.safeTxGas = BigNumber.from(String(transactionData.safeTxGas)).add(1).toString()
|
36
|
+
|
37
|
+
isExecuted = await safeContract.dataHashes(
|
38
|
+
await safeContract.getTransactionHash(
|
39
|
+
transactionData.to,
|
40
|
+
transactionData.value,
|
41
|
+
transactionData.data,
|
42
|
+
transactionData.operation,
|
43
|
+
transactionData.safeTxGas,
|
44
|
+
transactionData.baseGas,
|
45
|
+
transactionData.gasPrice,
|
46
|
+
transactionData.gasToken,
|
47
|
+
transactionData.refundReceiver,
|
48
|
+
transactionData.nonce
|
49
|
+
)
|
50
|
+
)
|
51
|
+
}
|
52
|
+
|
53
|
+
return transactionData
|
54
|
+
}
|
55
|
+
|
56
|
+
class ProcessDepositEvents extends BaseTask {
|
57
|
+
contractAddress: string;
|
58
|
+
provider: ethers.providers.JsonRpcProvider;
|
59
|
+
contract: InteropXGateway;
|
60
|
+
chainId: ChainId;
|
61
|
+
leadNodeOnly = true
|
62
|
+
|
63
|
+
constructor({ chainId }: { chainId: ChainId }) {
|
64
|
+
super({
|
65
|
+
logger: new Logger("InteropXGateway::ProcessDepositEvents"),
|
66
|
+
})
|
67
|
+
this.chainId = chainId;
|
68
|
+
}
|
69
|
+
|
70
|
+
async pollHandler() {
|
71
|
+
const blockNumber = await this.provider.getBlockNumber()
|
72
|
+
|
73
|
+
const transaction = await Transaction.findOne({
|
74
|
+
where: {
|
75
|
+
status: 'pending',
|
76
|
+
sourceStatus: 'success',
|
77
|
+
targetStatus: 'uninitialised',
|
78
|
+
action: 'deposit',
|
79
|
+
sourceCreatedAt: {
|
80
|
+
[Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
|
81
|
+
},
|
82
|
+
targetDelayUntil: {
|
83
|
+
[Op.or]: {
|
84
|
+
[Op.is]: null,
|
85
|
+
[Op.lt]: new Date(),
|
86
|
+
}
|
87
|
+
},
|
88
|
+
sourceBlockNumber: {
|
89
|
+
[Op.lt]: blockNumber - 12,
|
90
|
+
},
|
91
|
+
sourceChainId: this.chainId,
|
92
|
+
}
|
93
|
+
})
|
94
|
+
|
95
|
+
if (!transaction) {
|
96
|
+
return;
|
97
|
+
}
|
98
|
+
|
99
|
+
console.log(`Processing transaction ${transaction.transactionHash}`);
|
100
|
+
|
101
|
+
transaction.targetStatus = 'pending';
|
102
|
+
await transaction.save();
|
103
|
+
|
104
|
+
// refresh event data?
|
105
|
+
|
106
|
+
const targetChainProvider = new ethers.providers.JsonRpcProvider(
|
107
|
+
getRpcProviderUrl(transaction.targetChainId as ChainId)
|
108
|
+
);
|
109
|
+
|
110
|
+
const targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
|
111
|
+
|
112
|
+
const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
|
113
|
+
|
114
|
+
|
115
|
+
const safeContract = getContract<GnosisSafe>(
|
116
|
+
safeAddress,
|
117
|
+
abi.gnosisSafe,
|
118
|
+
targetWallet
|
119
|
+
)
|
120
|
+
|
121
|
+
const ownersThreshold = await safeContract.getThreshold();
|
122
|
+
await wait(10000);
|
123
|
+
|
124
|
+
let gnosisTx = await generateGnosisTransaction({
|
125
|
+
baseGas: "0",
|
126
|
+
data: await buildDataForTransaction(transaction),
|
127
|
+
gasPrice: "0",
|
128
|
+
gasToken: "0x0000000000000000000000000000000000000000",
|
129
|
+
nonce: '0',
|
130
|
+
operation: "1",
|
131
|
+
refundReceiver: "0x0000000000000000000000000000000000000000",
|
132
|
+
safeAddress: safeAddress,
|
133
|
+
safeTxGas: "79668",
|
134
|
+
to: addresses[transaction.targetChainId].multisend,
|
135
|
+
value: "0",
|
136
|
+
}, safeContract);
|
137
|
+
|
138
|
+
const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
|
139
|
+
|
140
|
+
const ownerPeerIds = peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id)
|
141
|
+
|
142
|
+
console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
|
143
|
+
|
144
|
+
console.log(ownerPeerIds);
|
145
|
+
|
146
|
+
const signatures = await protocol.requestSignatures({
|
147
|
+
type: 'source',
|
148
|
+
transactionHash: transaction.transactionHash,
|
149
|
+
safeTxGas: gnosisTx.safeTxGas,
|
150
|
+
safeNonce: gnosisTx.nonce
|
151
|
+
}, ownerPeerIds)
|
152
|
+
|
153
|
+
|
154
|
+
const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x') as Signature[];
|
155
|
+
|
156
|
+
console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
|
157
|
+
|
158
|
+
if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
|
159
|
+
await transaction.save();
|
160
|
+
transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
|
161
|
+
transaction.targetStatus = 'uninitialised'
|
162
|
+
|
163
|
+
await transaction.save();
|
164
|
+
const errorMessage = signatures.find(s => !!s.error)?.error;
|
165
|
+
throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
|
166
|
+
}
|
167
|
+
|
168
|
+
|
169
|
+
console.log(`Executing transaction for execution ${transaction.transactionHash}`)
|
170
|
+
|
171
|
+
const { data: txData } = await safeContract.populateTransaction.execTransaction(
|
172
|
+
gnosisTx.to,
|
173
|
+
gnosisTx.value,
|
174
|
+
gnosisTx.data,
|
175
|
+
gnosisTx.operation,
|
176
|
+
gnosisTx.safeTxGas,
|
177
|
+
gnosisTx.baseGas,
|
178
|
+
gnosisTx.gasPrice,
|
179
|
+
gnosisTx.gasToken,
|
180
|
+
gnosisTx.refundReceiver,
|
181
|
+
buildSignatureBytes(validSignatures)
|
182
|
+
);
|
183
|
+
|
184
|
+
console.log({
|
185
|
+
from: targetWallet.address,
|
186
|
+
gasPrice: BigNumber.from(120 * 10 ** 9).toString(),
|
187
|
+
to: safeAddress,
|
188
|
+
data: txData,
|
189
|
+
})
|
190
|
+
|
191
|
+
|
192
|
+
const txSent = await targetWallet.sendTransaction({
|
193
|
+
from: targetWallet.address,
|
194
|
+
gasPrice: BigNumber.from(120 * 10 ** 9),
|
195
|
+
to: safeAddress,
|
196
|
+
data: txData,
|
197
|
+
})
|
198
|
+
|
199
|
+
const receipt = await txSent.wait();
|
200
|
+
|
201
|
+
const parsedLogs: LogDescription[] = [];
|
202
|
+
|
203
|
+
receipt.logs.forEach((log) => {
|
204
|
+
try {
|
205
|
+
parsedLogs.push(safeContract.interface.parseLog(log));
|
206
|
+
} catch (e) { }
|
207
|
+
});
|
208
|
+
|
209
|
+
if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
|
210
|
+
console.log('ExecutionSuccess')
|
211
|
+
transaction.targetStatus = 'success'
|
212
|
+
transaction.targetTransactionHash = txSent.hash
|
213
|
+
transaction.status = 'success'
|
214
|
+
await transaction.save();
|
215
|
+
} else {
|
216
|
+
console.log('ExecutionFailure')
|
217
|
+
transaction.targetStatus = 'failed'
|
218
|
+
transaction.targetTransactionHash = txSent.hash
|
219
|
+
transaction.status = 'failed'
|
220
|
+
await transaction.save();
|
221
|
+
}
|
222
|
+
|
223
|
+
protocol.sendTransaction(transaction)
|
224
|
+
}
|
225
|
+
|
226
|
+
async start(): Promise<void> {
|
227
|
+
this.contractAddress = addresses[this.chainId].interopXGateway;
|
228
|
+
|
229
|
+
this.provider = new ethers.providers.JsonRpcProvider(
|
230
|
+
getRpcProviderUrl(this.chainId)
|
231
|
+
);
|
232
|
+
|
233
|
+
this.contract = getContract<InteropXGateway>(
|
234
|
+
this.contractAddress,
|
235
|
+
abi.interopXGateway,
|
236
|
+
new ethers.Wallet(config.privateKey!, this.provider)
|
237
|
+
);
|
238
|
+
|
239
|
+
await super.start()
|
240
|
+
}
|
241
|
+
}
|
242
|
+
|
243
|
+
export default ProcessDepositEvents;
|
@@ -3,7 +3,7 @@ import Logger from '@/logger';
|
|
3
3
|
import { ethers } from "ethers";
|
4
4
|
import abi from "@/abi";
|
5
5
|
import { Transaction } from "@/db";
|
6
|
-
import { generateInteropTransactionHash, getRpcProviderUrl } from "@/utils";
|
6
|
+
import { generateInteropTransactionHash, getContract, getRpcProviderUrl } from "@/utils";
|
7
7
|
import { addresses } from "@/constants";
|
8
8
|
import { ChainId } from "@/types";
|
9
9
|
import config from "@/config";
|
@@ -43,8 +43,8 @@ class SyncDepositEvents extends BaseTask {
|
|
43
43
|
const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
|
44
44
|
|
45
45
|
const uniqueIdentifier = {
|
46
|
-
|
47
|
-
|
46
|
+
action: 'deposit',
|
47
|
+
submitTransactionHash: event.transactionHash,
|
48
48
|
sourceChainId: sourceChainId.toNumber(),
|
49
49
|
targetChainId: targetChainId.toNumber(),
|
50
50
|
}
|
@@ -56,17 +56,20 @@ class SyncDepositEvents extends BaseTask {
|
|
56
56
|
const tx = await event.getTransaction()
|
57
57
|
|
58
58
|
await Transaction.create({
|
59
|
+
...uniqueIdentifier,
|
59
60
|
transactionHash: generateInteropTransactionHash(uniqueIdentifier),
|
60
|
-
type: 'deposit',
|
61
61
|
from: tx.from,
|
62
62
|
to: user,
|
63
63
|
|
64
|
-
|
64
|
+
|
65
|
+
submitTransactionHash: event.transactionHash,
|
66
|
+
submitBlockNumber: event.blockNumber,
|
67
|
+
|
68
|
+
// submit & source are the same
|
65
69
|
sourceTransactionHash: event.transactionHash,
|
66
70
|
sourceBlockNumber: event.blockNumber,
|
67
|
-
sourceStatus: "
|
71
|
+
sourceStatus: "success",
|
68
72
|
|
69
|
-
targetChainId: targetChainId.toNumber(),
|
70
73
|
targetStatus: "uninitialised",
|
71
74
|
|
72
75
|
submitEvent: {
|
@@ -74,14 +77,23 @@ class SyncDepositEvents extends BaseTask {
|
|
74
77
|
sourceChainId: sourceChainId.toString(),
|
75
78
|
targetChainId: targetChainId.toString(),
|
76
79
|
token: token,
|
77
|
-
|
80
|
+
amount: amount.toString(),
|
81
|
+
vnonce: vnonce.toString(),
|
82
|
+
},
|
83
|
+
|
84
|
+
sourceEvent: {
|
85
|
+
user,
|
86
|
+
sourceChainId: sourceChainId.toString(),
|
87
|
+
targetChainId: targetChainId.toString(),
|
88
|
+
token: token,
|
89
|
+
amount: amount.toString(),
|
78
90
|
vnonce: vnonce.toString(),
|
79
91
|
},
|
80
92
|
status: "pending",
|
81
93
|
})
|
82
94
|
|
83
95
|
this.logger.info(
|
84
|
-
`
|
96
|
+
`Deposit queued: ${event.transactionHash} ${event.blockNumber}`
|
85
97
|
);
|
86
98
|
} catch (error) {
|
87
99
|
this.logger.error(error);
|
@@ -93,19 +105,17 @@ class SyncDepositEvents extends BaseTask {
|
|
93
105
|
}
|
94
106
|
|
95
107
|
async start(): Promise<void> {
|
96
|
-
this.logger.info(`Starting execution watcher on interop chain`);
|
97
|
-
|
98
108
|
this.contractAddress = addresses[this.chainId].interopXGateway;
|
99
109
|
|
100
110
|
this.provider = new ethers.providers.JsonRpcProvider(
|
101
111
|
getRpcProviderUrl(this.chainId)
|
102
112
|
);
|
103
113
|
|
104
|
-
this.contract =
|
114
|
+
this.contract = getContract<InteropXGateway>(
|
105
115
|
this.contractAddress,
|
106
116
|
abi.interopXGateway,
|
107
117
|
new ethers.Wallet(config.privateKey!, this.provider)
|
108
|
-
)
|
118
|
+
);
|
109
119
|
|
110
120
|
await super.start()
|
111
121
|
}
|
@@ -0,0 +1,65 @@
|
|
1
|
+
import { BaseTask } from "../BaseTask";
|
2
|
+
import Logger from '@/logger';
|
3
|
+
import config from "@/config";
|
4
|
+
import { peerPool, protocol } from "@/net";
|
5
|
+
import { Transaction } from "@/db";
|
6
|
+
import { Op } from "sequelize";
|
7
|
+
|
8
|
+
class SyncTransactionStatusTask extends BaseTask {
|
9
|
+
pollIntervalMs: number = 60 * 1000
|
10
|
+
exceptLeadNode: boolean = true;
|
11
|
+
|
12
|
+
constructor() {
|
13
|
+
super({
|
14
|
+
logger: new Logger("SyncTransactionStatusTask"),
|
15
|
+
})
|
16
|
+
}
|
17
|
+
|
18
|
+
async pollHandler() {
|
19
|
+
// if transaction is pending for more than 1 hour, check lead node for status
|
20
|
+
const leadNode = peerPool.getLeadPeer();
|
21
|
+
|
22
|
+
if (!leadNode) {
|
23
|
+
return;
|
24
|
+
}
|
25
|
+
|
26
|
+
const transaction = await Transaction.findOne({
|
27
|
+
where: {
|
28
|
+
status: 'pending',
|
29
|
+
sourceCreatedAt: {
|
30
|
+
[Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
|
31
|
+
},
|
32
|
+
}
|
33
|
+
})
|
34
|
+
|
35
|
+
if (!transaction) {
|
36
|
+
return;
|
37
|
+
}
|
38
|
+
|
39
|
+
this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`)
|
40
|
+
|
41
|
+
const transactionStatus = await protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
|
42
|
+
|
43
|
+
if (!transactionStatus) {
|
44
|
+
return;
|
45
|
+
}
|
46
|
+
|
47
|
+
this.logger.info(`Received transaction status for ${transaction.transactionHash}`)
|
48
|
+
|
49
|
+
transaction.sourceStatus = transactionStatus.sourceStatus
|
50
|
+
transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash
|
51
|
+
transaction.sourceErrors = transactionStatus.sourceErrors
|
52
|
+
|
53
|
+
transaction.targetStatus = transactionStatus.targetStatus
|
54
|
+
transaction.targetTransactionHash = transactionStatus.targetTransactionHash
|
55
|
+
transaction.targetErrors = transactionStatus.targetErrors
|
56
|
+
|
57
|
+
transaction.status = transactionStatus.status
|
58
|
+
|
59
|
+
await transaction.save()
|
60
|
+
|
61
|
+
this.logger.info(`Updated transaction status for ${transaction.transactionHash}`)
|
62
|
+
}
|
63
|
+
}
|
64
|
+
|
65
|
+
export default SyncTransactionStatusTask;
|
package/src/tasks/index.ts
CHANGED
@@ -1,11 +1,33 @@
|
|
1
1
|
import { BaseTask } from "./BaseTask";
|
2
|
-
import
|
2
|
+
import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
|
3
|
+
import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
|
4
|
+
|
5
|
+
import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
|
6
|
+
import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
|
7
|
+
import AutoUpdateTask from "./AutoUpdateTask";
|
8
|
+
import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
|
3
9
|
|
4
10
|
export class Tasks {
|
5
11
|
|
6
12
|
tasks: BaseTask[] = [
|
7
|
-
new
|
13
|
+
new SyncTransactionStatusTask(),
|
14
|
+
new AutoUpdateTask(),
|
15
|
+
|
16
|
+
new InteropXGatewaySyncDepositEvents({
|
17
|
+
chainId: 43114
|
18
|
+
}),
|
19
|
+
|
20
|
+
new InteropXGatewayProcessDepositEvents({
|
8
21
|
chainId: 43114
|
22
|
+
}),
|
23
|
+
|
24
|
+
new InteropBridgeSyncWithdrawEvents({
|
25
|
+
chainId: 137,
|
26
|
+
itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
|
27
|
+
}),
|
28
|
+
|
29
|
+
new InteropBridgeProcessWithdrawEvents({
|
30
|
+
chainId: 137,
|
9
31
|
})
|
10
32
|
];
|
11
33
|
|
package/src/utils/index.ts
CHANGED
@@ -3,15 +3,32 @@
|
|
3
3
|
*/
|
4
4
|
import axios from 'axios'
|
5
5
|
import axiosRetry from "axios-retry";
|
6
|
-
import { addresses } from '@/constants';
|
6
|
+
import { addresses, itokens, tokens } from '@/constants';
|
7
7
|
import { ChainId } from '@/types'
|
8
8
|
import { ethers } from 'ethers';
|
9
|
+
import { encodeMulti, MetaTransaction, OperationType } from 'ethers-multisend';
|
10
|
+
import { Transaction } from '@/db';
|
11
|
+
import config from '@/config';
|
12
|
+
import abi from '@/abi';
|
13
|
+
import { InteropBridgeToken, InteropXGateway } from '@/typechain';
|
9
14
|
|
10
15
|
export const http = axios.create();
|
11
16
|
|
12
17
|
axiosRetry(http, { retries: 3, retryDelay: axiosRetry.exponentialDelay });
|
13
18
|
|
14
19
|
|
20
|
+
export function shortenHash(hash: string, length: number = 4) {
|
21
|
+
if (!hash) return;
|
22
|
+
|
23
|
+
if (hash.length < 12) return hash;
|
24
|
+
|
25
|
+
const beginningChars = hash.startsWith("0x") ? length + 2 : length;
|
26
|
+
|
27
|
+
const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
|
28
|
+
|
29
|
+
return shortened;
|
30
|
+
}
|
31
|
+
|
15
32
|
export function short(buffer: Buffer): string {
|
16
33
|
return buffer.toString('hex').slice(0, 8) + '...'
|
17
34
|
}
|
@@ -71,11 +88,11 @@ export const signGnosisSafeTx = async ({
|
|
71
88
|
export const getRpcProviderUrl = (chainId: ChainId) => {
|
72
89
|
switch (chainId) {
|
73
90
|
case 1:
|
74
|
-
return 'https://rpc.
|
91
|
+
return 'https://rpc.ankr.com/eth';
|
75
92
|
case 137:
|
76
|
-
return 'https://rpc.
|
93
|
+
return 'https://rpc.ankr.com/polygon';
|
77
94
|
case 43114:
|
78
|
-
return 'https://rpc.
|
95
|
+
return 'https://rpc.ankr.com/avalanche';
|
79
96
|
default:
|
80
97
|
throw new Error(`Unknown chainId: ${chainId}`);
|
81
98
|
}
|
@@ -119,11 +136,184 @@ export const asyncCallWithTimeout = async <T>(asyncPromise: Promise<T>, timeout:
|
|
119
136
|
}
|
120
137
|
|
121
138
|
|
122
|
-
export const generateInteropTransactionHash = (data: {
|
139
|
+
export const generateInteropTransactionHash = (data: { action: string, submitTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
|
123
140
|
return ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
|
124
|
-
String(data.
|
125
|
-
String(data.
|
141
|
+
String(data.action),
|
142
|
+
String(data.submitTransactionHash),
|
126
143
|
String(data.sourceChainId),
|
127
144
|
String(data.targetChainId),
|
128
145
|
]);
|
146
|
+
}
|
147
|
+
|
148
|
+
export const buildDataForTransaction = async (transaction: Transaction, type?: 'source' | 'target') => {
|
149
|
+
type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
|
150
|
+
|
151
|
+
switch (transaction.action) {
|
152
|
+
case "deposit":
|
153
|
+
return await buildDepositDataForTransaction(transaction, type);
|
154
|
+
case "withdraw":
|
155
|
+
return await buildWithdrawDataForTransaction(transaction, type);
|
156
|
+
default:
|
157
|
+
throw new Error(`Unknown action: ${transaction.action}`);
|
158
|
+
}
|
159
|
+
}
|
160
|
+
|
161
|
+
export const buildDepositDataForTransaction = async (transaction: Transaction, type: 'source' | 'target') => {
|
162
|
+
const transactions: MetaTransaction[] = [];
|
163
|
+
|
164
|
+
if (transaction.action !== 'deposit') {
|
165
|
+
throw new Error(`Invalid action: ${transaction.action}`)
|
166
|
+
}
|
167
|
+
|
168
|
+
if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
|
169
|
+
throw Error('Cannot build data for pending deposit transaction');
|
170
|
+
}
|
171
|
+
|
172
|
+
if (!transaction.submitEvent) {
|
173
|
+
throw Error('Cannot build data for transaction without submitEvent');
|
174
|
+
}
|
175
|
+
|
176
|
+
|
177
|
+
const token = tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
|
178
|
+
|
179
|
+
if (!token) {
|
180
|
+
throw Error('Cannot build data for transaction without token');
|
181
|
+
}
|
182
|
+
|
183
|
+
const itoken = itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
|
184
|
+
|
185
|
+
if (!itoken) {
|
186
|
+
throw Error('Cannot build data for transaction without itoken');
|
187
|
+
}
|
188
|
+
|
189
|
+
const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
|
190
|
+
const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
|
191
|
+
const interopBridgeContract = getContract<InteropBridgeToken>(itoken.address, abi.interopBridgeToken, targetWallet);
|
192
|
+
|
193
|
+
const { data } = await interopBridgeContract.populateTransaction.mint(
|
194
|
+
transaction.submitEvent.user,
|
195
|
+
ethers.BigNumber.from(transaction.submitEvent.amount.toString()),
|
196
|
+
ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()),
|
197
|
+
transaction.submitTransactionHash,
|
198
|
+
);
|
199
|
+
|
200
|
+
transactions.push({
|
201
|
+
to: itoken.address,
|
202
|
+
data: data!,
|
203
|
+
value: '0',
|
204
|
+
operation: OperationType.Call,
|
205
|
+
});
|
206
|
+
|
207
|
+
return encodeMulti(transactions).data
|
208
|
+
}
|
209
|
+
|
210
|
+
export const buildWithdrawDataForTransaction = async (transaction: Transaction, type: 'source' | 'target') => {
|
211
|
+
const transactions: MetaTransaction[] = [];
|
212
|
+
|
213
|
+
if (transaction.action !== 'withdraw') {
|
214
|
+
throw new Error(`Invalid action: ${transaction.action}`)
|
215
|
+
}
|
216
|
+
|
217
|
+
if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
|
218
|
+
throw Error('Cannot build data for pending withdraw transaction');
|
219
|
+
}
|
220
|
+
|
221
|
+
if (!transaction.submitEvent) {
|
222
|
+
throw Error('Cannot build data for transaction without submitEvent');
|
223
|
+
}
|
224
|
+
|
225
|
+
const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
|
226
|
+
|
227
|
+
const itoken = itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
|
228
|
+
|
229
|
+
if (!itoken) {
|
230
|
+
throw Error('Cannot build data for transaction without itoken');
|
231
|
+
}
|
232
|
+
|
233
|
+
const token = tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
|
234
|
+
|
235
|
+
if (!token) {
|
236
|
+
throw Error('Cannot build data for transaction without token');
|
237
|
+
}
|
238
|
+
|
239
|
+
const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
|
240
|
+
const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
|
241
|
+
const gatewayAddress = addresses[chainId].interopXGateway;
|
242
|
+
const interopBridgeContract = getContract<InteropXGateway>(gatewayAddress, abi.interopXGateway, targetWallet);
|
243
|
+
|
244
|
+
const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(
|
245
|
+
ethers.BigNumber.from(amount.toString()),
|
246
|
+
to,
|
247
|
+
token.address,
|
248
|
+
ethers.BigNumber.from(transaction.sourceChainId.toString()),
|
249
|
+
transaction.submitTransactionHash,
|
250
|
+
);
|
251
|
+
|
252
|
+
transactions.push({
|
253
|
+
to: gatewayAddress,
|
254
|
+
data: data!,
|
255
|
+
value: '0',
|
256
|
+
operation: OperationType.Call,
|
257
|
+
});
|
258
|
+
|
259
|
+
return encodeMulti(transactions).data
|
260
|
+
}
|
261
|
+
|
262
|
+
|
263
|
+
export function getContract<TContract extends ethers.Contract>(address: string, contractInterface: ethers.ContractInterface | any, signerOrProvider?: ethers.Signer | ethers.providers.Provider) {
|
264
|
+
if (!ethers.utils.getAddress(address) || address === ethers.constants.AddressZero) {
|
265
|
+
throw Error(`Invalid 'address' parameter '${address}'.`)
|
266
|
+
}
|
267
|
+
|
268
|
+
const contract = new ethers.Contract(
|
269
|
+
address,
|
270
|
+
contractInterface,
|
271
|
+
signerOrProvider
|
272
|
+
) as TContract
|
273
|
+
|
274
|
+
// Make sure the contract properties is writable
|
275
|
+
const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
|
276
|
+
|
277
|
+
if (!desc || desc.writable !== true) {
|
278
|
+
return contract
|
279
|
+
}
|
280
|
+
|
281
|
+
return new Proxy(contract, {
|
282
|
+
get(target, prop, receiver) {
|
283
|
+
const value = Reflect.get(target, prop, receiver);
|
284
|
+
|
285
|
+
if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
|
286
|
+
return async (...args: any[]) => {
|
287
|
+
try {
|
288
|
+
return await value.bind(contract)(...args);
|
289
|
+
} catch (error) {
|
290
|
+
throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`)
|
291
|
+
}
|
292
|
+
}
|
293
|
+
}
|
294
|
+
|
295
|
+
|
296
|
+
if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
|
297
|
+
const parentProp = String(prop);
|
298
|
+
|
299
|
+
return new Proxy(value, {
|
300
|
+
get(target, prop, receiver) {
|
301
|
+
const value = Reflect.get(target, prop, receiver);
|
302
|
+
|
303
|
+
if (typeof value === 'function') {
|
304
|
+
return async (...args: any[]) => {
|
305
|
+
try {
|
306
|
+
return await value.bind(contract)(...args);
|
307
|
+
} catch (error) {
|
308
|
+
throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`)
|
309
|
+
}
|
310
|
+
}
|
311
|
+
}
|
312
|
+
}
|
313
|
+
})
|
314
|
+
}
|
315
|
+
|
316
|
+
return value;
|
317
|
+
},
|
318
|
+
});
|
129
319
|
}
|