@instadapp/interop-x 0.0.0-dev.9b1fcb8 → 0.0.0-dev.9e91661
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 +6 -5
- package/dist/src/abi/interopBridgeToken.json +21 -9
- package/dist/src/abi/interopXGateway.json +11 -11
- package/dist/src/api/index.js +6 -3
- package/dist/src/config/index.js +11 -1
- package/dist/src/constants/addresses.js +1 -1
- package/dist/src/constants/itokens.js +1 -1
- package/dist/src/gnosis/actions/deposit.js +40 -0
- package/dist/src/gnosis/actions/index.js +11 -0
- package/dist/src/gnosis/actions/withdraw.js +45 -0
- package/dist/src/gnosis/index.js +16 -0
- package/dist/src/index.js +69 -7
- package/dist/src/net/peer/index.js +2 -1
- package/dist/src/net/pool/index.js +18 -2
- package/dist/src/net/protocol/dial/SignatureDialProtocol.js +2 -8
- package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +28 -0
- package/dist/src/net/protocol/index.js +41 -1
- package/dist/src/tasks/AutoUpdateTask.js +70 -0
- package/dist/src/tasks/BaseTask.js +11 -3
- package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +147 -0
- package/dist/src/tasks/InteropBridge/{SyncWithdrawEvents.js → SyncBurnEvents.js} +12 -9
- package/dist/src/tasks/InteropBridge/SyncMintEvents.js +67 -0
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +18 -2
- package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +2 -3
- package/dist/src/tasks/InteropXGateway/SyncWithdrawtEvents.js +72 -0
- package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +53 -0
- package/dist/src/tasks/index.js +22 -3
- package/dist/src/typechain/factories/InteropBridgeToken__factory.js +23 -11
- package/dist/src/typechain/factories/InteropXGateway__factory.js +14 -14
- package/dist/src/utils/index.js +19 -40
- package/package.json +6 -5
- package/src/abi/interopBridgeToken.json +21 -9
- package/src/abi/interopXGateway.json +11 -11
- package/src/api/index.ts +5 -2
- package/src/config/index.ts +11 -1
- package/src/constants/addresses.ts +1 -1
- package/src/constants/itokens.ts +1 -1
- package/src/gnosis/actions/deposit.ts +54 -0
- package/src/gnosis/actions/index.ts +7 -0
- package/src/gnosis/actions/withdraw.ts +61 -0
- package/src/gnosis/index.ts +13 -0
- package/src/index.ts +90 -9
- package/src/net/peer/index.ts +2 -1
- package/src/net/pool/index.ts +25 -5
- package/src/net/protocol/dial/SignatureDialProtocol.ts +3 -10
- package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +31 -0
- package/src/net/protocol/index.ts +57 -1
- package/src/tasks/AutoUpdateTask.ts +82 -0
- package/src/tasks/BaseTask.ts +13 -3
- package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +232 -0
- package/src/tasks/InteropBridge/{SyncWithdrawEvents.ts → SyncBurnEvents.ts} +13 -11
- package/src/tasks/InteropBridge/SyncMintEvents.ts +99 -0
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +24 -7
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +2 -4
- package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts +105 -0
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +65 -0
- package/src/tasks/index.ts +33 -3
- package/src/typechain/InteropBridgeToken.ts +23 -17
- package/src/typechain/InteropXGateway.ts +13 -13
- package/src/typechain/factories/InteropBridgeToken__factory.ts +23 -11
- package/src/typechain/factories/InteropXGateway__factory.ts +14 -14
- package/src/utils/index.ts +22 -62
@@ -10,13 +10,14 @@ const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
|
|
10
10
|
const __1 = require("..");
|
11
11
|
const config_1 = __importDefault(require("@/config"));
|
12
12
|
const types_1 = require("@/types");
|
13
|
+
const TransactionStatusDialProtocol_1 = require("./dial/TransactionStatusDialProtocol");
|
13
14
|
class Protocol extends stream_1.EventEmitter {
|
14
15
|
constructor() {
|
15
16
|
super(...arguments);
|
16
17
|
this.protocolMessages = [
|
17
18
|
{
|
18
19
|
name: 'PeerInfo',
|
19
|
-
code:
|
20
|
+
code: 0x01,
|
20
21
|
encode: (info) => [
|
21
22
|
Buffer.from(info.publicAddress),
|
22
23
|
],
|
@@ -24,6 +25,30 @@ class Protocol extends stream_1.EventEmitter {
|
|
24
25
|
publicAddress: publicAddress.toString(),
|
25
26
|
}),
|
26
27
|
},
|
28
|
+
{
|
29
|
+
name: 'TransactionStatus',
|
30
|
+
code: 0x02,
|
31
|
+
encode: (transaction) => [
|
32
|
+
Buffer.from(transaction.transactionHash),
|
33
|
+
Buffer.from(transaction.sourceStatus),
|
34
|
+
Buffer.from(transaction.sourceTransactionHash || ''),
|
35
|
+
transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
|
36
|
+
Buffer.from(transaction.targetStatus),
|
37
|
+
Buffer.from(transaction.targetTransactionHash || ''),
|
38
|
+
transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
|
39
|
+
Buffer.from(transaction.status),
|
40
|
+
],
|
41
|
+
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
|
42
|
+
transactionHash: transactionHash.toString(),
|
43
|
+
sourceStatus: sourceStatus.toString(),
|
44
|
+
sourceTransactionHash: sourceTransactionHash.toString() || null,
|
45
|
+
sourceErrors: sourceErrors.map((e) => e.toString()),
|
46
|
+
targetStatus: targetStatus.toString(),
|
47
|
+
targetTransactionHash: targetTransactionHash.toString() || null,
|
48
|
+
targetErrors: targetErrors.map((e) => e.toString()),
|
49
|
+
status: status.toString(),
|
50
|
+
}),
|
51
|
+
},
|
27
52
|
];
|
28
53
|
}
|
29
54
|
start({ libp2p, topic = null, }) {
|
@@ -40,6 +65,7 @@ class Protocol extends stream_1.EventEmitter {
|
|
40
65
|
});
|
41
66
|
});
|
42
67
|
this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
|
68
|
+
this.transactionStatus = new TransactionStatusDialProtocol_1.TransactionStatusDialProtocol(this.libp2p);
|
43
69
|
}
|
44
70
|
init() {
|
45
71
|
this.libp2p.pubsub.subscribe(this.topic);
|
@@ -75,6 +101,11 @@ class Protocol extends stream_1.EventEmitter {
|
|
75
101
|
const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(data)]);
|
76
102
|
this.libp2p.pubsub.publish(this.topic, encoded);
|
77
103
|
}
|
104
|
+
sendTransaction(transaction) {
|
105
|
+
const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus');
|
106
|
+
const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(transaction)]);
|
107
|
+
this.libp2p.pubsub.publish(this.topic, encoded);
|
108
|
+
}
|
78
109
|
async requestSignatures(data, peerIds) {
|
79
110
|
try {
|
80
111
|
peerIds = peerIds || __1.peerPool.activePeerIds;
|
@@ -88,5 +119,14 @@ class Protocol extends stream_1.EventEmitter {
|
|
88
119
|
return [];
|
89
120
|
}
|
90
121
|
}
|
122
|
+
async requestTransactionStatus(transactionHash, peerId) {
|
123
|
+
try {
|
124
|
+
return await this.transactionStatus.send(transactionHash, peerId);
|
125
|
+
}
|
126
|
+
catch (error) {
|
127
|
+
console.log(error);
|
128
|
+
return null;
|
129
|
+
}
|
130
|
+
}
|
91
131
|
}
|
92
132
|
exports.protocol = new Protocol();
|
@@ -0,0 +1,70 @@
|
|
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 await_spawn_1 = __importDefault(require("await-spawn"));
|
9
|
+
const child_process_1 = require("child_process");
|
10
|
+
const config_1 = __importDefault(require("@/config"));
|
11
|
+
const waait_1 = __importDefault(require("waait"));
|
12
|
+
const package_json_1 = __importDefault(require("../../package.json"));
|
13
|
+
const currentVersion = package_json_1.default.version;
|
14
|
+
const tag = config_1.default.staging ? 'dev' : 'latest';
|
15
|
+
class AutoUpdateTask extends BaseTask_1.BaseTask {
|
16
|
+
constructor() {
|
17
|
+
super({
|
18
|
+
logger: new logger_1.default("AutoUpdateTask"),
|
19
|
+
});
|
20
|
+
this.pollIntervalMs = 60 * 10 * 1000;
|
21
|
+
}
|
22
|
+
prePollHandler() {
|
23
|
+
return config_1.default.autoUpdate && !config_1.default.isLeadNode();
|
24
|
+
}
|
25
|
+
async getInstalledVersion() {
|
26
|
+
try {
|
27
|
+
const stdout = await (0, await_spawn_1.default)('npm', ['-g', 'ls', '--depth=0', '--json']);
|
28
|
+
return JSON.parse(stdout.toString()).dependencies[package_json_1.default.name].version;
|
29
|
+
}
|
30
|
+
catch (error) {
|
31
|
+
this.logger.error(error);
|
32
|
+
return currentVersion;
|
33
|
+
}
|
34
|
+
}
|
35
|
+
async getLatestVersion() {
|
36
|
+
try {
|
37
|
+
const stdout = await (0, await_spawn_1.default)('npm', ['view', `${package_json_1.default.name}@${tag}`, 'version']);
|
38
|
+
return stdout.toString().trim();
|
39
|
+
}
|
40
|
+
catch (error) {
|
41
|
+
this.logger.error(error);
|
42
|
+
return currentVersion;
|
43
|
+
}
|
44
|
+
}
|
45
|
+
async pollHandler() {
|
46
|
+
const version = await this.getLatestVersion();
|
47
|
+
if (version === currentVersion) {
|
48
|
+
return;
|
49
|
+
}
|
50
|
+
this.logger.warn(`New version ${version} available.`);
|
51
|
+
this.logger.info('Updating...');
|
52
|
+
await (0, await_spawn_1.default)('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
|
53
|
+
await (0, waait_1.default)(5000);
|
54
|
+
if (version !== await this.getInstalledVersion()) {
|
55
|
+
this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
|
56
|
+
return;
|
57
|
+
}
|
58
|
+
this.logger.warn(`Installed version ${version}`);
|
59
|
+
this.logger.warn(`Restarting...`);
|
60
|
+
// TODO: its restarting in the bg, but it should be in the fg
|
61
|
+
const subprocess = (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
|
62
|
+
cwd: process.cwd(),
|
63
|
+
stdio: "inherit",
|
64
|
+
// shell: process.env.SHELL,
|
65
|
+
});
|
66
|
+
subprocess.unref();
|
67
|
+
process.exit();
|
68
|
+
}
|
69
|
+
}
|
70
|
+
exports.default = AutoUpdateTask;
|
@@ -14,6 +14,7 @@ class BaseTask extends events_1.default {
|
|
14
14
|
this.started = false;
|
15
15
|
this.pollIntervalMs = 10 * 1000;
|
16
16
|
this.leadNodeOnly = false;
|
17
|
+
this.exceptLeadNode = false;
|
17
18
|
this.logger = logger !== null && logger !== void 0 ? logger : new logger_1.default('BaseTask');
|
18
19
|
}
|
19
20
|
async pollCheck() {
|
@@ -34,10 +35,17 @@ class BaseTask extends events_1.default {
|
|
34
35
|
}
|
35
36
|
}
|
36
37
|
prePollHandler() {
|
37
|
-
if (
|
38
|
-
|
38
|
+
if (config_1.default.isMaintenanceMode()) {
|
39
|
+
this.logger.warn('Maintenance mode is enabled. Skipping task.');
|
40
|
+
return false;
|
39
41
|
}
|
40
|
-
|
42
|
+
if (this.exceptLeadNode) {
|
43
|
+
return !config_1.default.isLeadNode();
|
44
|
+
}
|
45
|
+
if (this.leadNodeOnly) {
|
46
|
+
return config_1.default.isLeadNode();
|
47
|
+
}
|
48
|
+
return true;
|
41
49
|
}
|
42
50
|
async pollHandler() {
|
43
51
|
this.logger.warn('pollHandler not implemented');
|
@@ -0,0 +1,147 @@
|
|
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 waait_1 = __importDefault(require("waait"));
|
16
|
+
const net_1 = require("@/net");
|
17
|
+
const gnosis_1 = require("@/gnosis");
|
18
|
+
const generateGnosisTransaction = async (transactionData, safeContract) => {
|
19
|
+
console.log(transactionData);
|
20
|
+
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));
|
21
|
+
while (isExecuted == 1) {
|
22
|
+
transactionData.safeTxGas = ethers_1.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
|
23
|
+
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));
|
24
|
+
}
|
25
|
+
return transactionData;
|
26
|
+
};
|
27
|
+
class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
|
28
|
+
constructor({ chainId }) {
|
29
|
+
super({
|
30
|
+
logger: new logger_1.default("InteropXGateway::ProcessWithdrawEvents"),
|
31
|
+
});
|
32
|
+
this.leadNodeOnly = true;
|
33
|
+
this.chainId = chainId;
|
34
|
+
}
|
35
|
+
async pollHandler() {
|
36
|
+
var _a;
|
37
|
+
const blockNumber = await this.provider.getBlockNumber();
|
38
|
+
const transaction = await db_1.Transaction.findOne({
|
39
|
+
where: {
|
40
|
+
status: 'pending',
|
41
|
+
sourceStatus: 'success',
|
42
|
+
targetStatus: 'uninitialised',
|
43
|
+
action: 'withdraw',
|
44
|
+
sourceCreatedAt: {
|
45
|
+
[sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
|
46
|
+
},
|
47
|
+
targetDelayUntil: {
|
48
|
+
[sequelize_1.Op.or]: {
|
49
|
+
[sequelize_1.Op.is]: null,
|
50
|
+
[sequelize_1.Op.lt]: new Date(),
|
51
|
+
}
|
52
|
+
},
|
53
|
+
sourceBlockNumber: {
|
54
|
+
[sequelize_1.Op.lt]: blockNumber - 12,
|
55
|
+
},
|
56
|
+
sourceChainId: this.chainId,
|
57
|
+
}
|
58
|
+
});
|
59
|
+
if (!transaction) {
|
60
|
+
return;
|
61
|
+
}
|
62
|
+
console.log(`Processing transaction ${transaction.transactionHash}`);
|
63
|
+
transaction.targetStatus = 'pending';
|
64
|
+
await transaction.save();
|
65
|
+
// refresh event data?
|
66
|
+
const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(transaction.targetChainId));
|
67
|
+
const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
|
68
|
+
const safeAddress = constants_1.addresses[transaction.targetChainId].gnosisSafe;
|
69
|
+
const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
|
70
|
+
const ownersThreshold = await safeContract.getThreshold();
|
71
|
+
await (0, waait_1.default)(10000);
|
72
|
+
let gnosisTx = await generateGnosisTransaction({
|
73
|
+
baseGas: "0",
|
74
|
+
data: await (0, gnosis_1.buildGnosisData)(transaction),
|
75
|
+
gasPrice: "0",
|
76
|
+
gasToken: "0x0000000000000000000000000000000000000000",
|
77
|
+
nonce: '0',
|
78
|
+
operation: "1",
|
79
|
+
refundReceiver: "0x0000000000000000000000000000000000000000",
|
80
|
+
safeAddress: safeAddress,
|
81
|
+
safeTxGas: "79668",
|
82
|
+
to: constants_1.addresses[transaction.targetChainId].multisend,
|
83
|
+
value: "0",
|
84
|
+
}, safeContract);
|
85
|
+
const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
|
86
|
+
const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
|
87
|
+
console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
|
88
|
+
console.log(ownerPeerIds);
|
89
|
+
const signatures = await net_1.protocol.requestSignatures({
|
90
|
+
type: 'source',
|
91
|
+
transactionHash: transaction.transactionHash,
|
92
|
+
safeTxGas: gnosisTx.safeTxGas,
|
93
|
+
safeNonce: gnosisTx.nonce
|
94
|
+
}, ownerPeerIds);
|
95
|
+
const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x');
|
96
|
+
console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
|
97
|
+
if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
|
98
|
+
await transaction.save();
|
99
|
+
transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
|
100
|
+
transaction.targetStatus = 'uninitialised';
|
101
|
+
await transaction.save();
|
102
|
+
const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
|
103
|
+
throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
|
104
|
+
}
|
105
|
+
console.log(`Executing transaction for execution ${transaction.transactionHash}`);
|
106
|
+
const { data: txData } = await safeContract.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));
|
107
|
+
console.log({
|
108
|
+
from: targetWallet.address,
|
109
|
+
gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
|
110
|
+
to: safeAddress,
|
111
|
+
data: txData,
|
112
|
+
});
|
113
|
+
const txSent = await targetWallet.sendTransaction({
|
114
|
+
from: targetWallet.address,
|
115
|
+
gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
|
116
|
+
to: safeAddress,
|
117
|
+
data: txData,
|
118
|
+
});
|
119
|
+
const receipt = await txSent.wait();
|
120
|
+
const parsedLogs = [];
|
121
|
+
receipt.logs.forEach((log) => {
|
122
|
+
try {
|
123
|
+
parsedLogs.push(safeContract.interface.parseLog(log));
|
124
|
+
}
|
125
|
+
catch (e) { }
|
126
|
+
});
|
127
|
+
if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
|
128
|
+
console.log('ExecutionSuccess');
|
129
|
+
transaction.targetStatus = 'success';
|
130
|
+
transaction.targetTransactionHash = txSent.hash;
|
131
|
+
transaction.status = 'success';
|
132
|
+
await transaction.save();
|
133
|
+
}
|
134
|
+
else {
|
135
|
+
console.log('ExecutionFailure');
|
136
|
+
transaction.targetStatus = 'failed';
|
137
|
+
transaction.targetTransactionHash = txSent.hash;
|
138
|
+
transaction.status = 'failed';
|
139
|
+
await transaction.save();
|
140
|
+
}
|
141
|
+
}
|
142
|
+
async start() {
|
143
|
+
this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
144
|
+
await super.start();
|
145
|
+
}
|
146
|
+
}
|
147
|
+
exports.default = ProcessWithdrawEvents;
|
@@ -10,10 +10,10 @@ const abi_1 = __importDefault(require("@/abi"));
|
|
10
10
|
const db_1 = require("@/db");
|
11
11
|
const utils_1 = require("@/utils");
|
12
12
|
const config_1 = __importDefault(require("@/config"));
|
13
|
-
class
|
13
|
+
class SyncBurnEvents extends BaseTask_1.BaseTask {
|
14
14
|
constructor({ chainId, itokenAddress }) {
|
15
15
|
super({
|
16
|
-
logger: new logger_1.default("InteropBridgeToken::
|
16
|
+
logger: new logger_1.default("InteropBridgeToken::SyncBurnEvents"),
|
17
17
|
});
|
18
18
|
this.chainId = chainId;
|
19
19
|
this.itokenAddress = itokenAddress;
|
@@ -27,12 +27,12 @@ class SyncWithdrawEvents extends BaseTask_1.BaseTask {
|
|
27
27
|
if (!event.args) {
|
28
28
|
continue;
|
29
29
|
}
|
30
|
-
const { to, amount,
|
30
|
+
const { to, amount, sourceChainId, targetChainId } = event.args;
|
31
31
|
const uniqueIdentifier = {
|
32
32
|
action: 'withdraw',
|
33
33
|
submitTransactionHash: event.transactionHash,
|
34
|
-
sourceChainId:
|
35
|
-
targetChainId:
|
34
|
+
sourceChainId: sourceChainId,
|
35
|
+
targetChainId: targetChainId,
|
36
36
|
};
|
37
37
|
if (await db_1.Transaction.findOne({ where: uniqueIdentifier })) {
|
38
38
|
continue;
|
@@ -43,11 +43,15 @@ class SyncWithdrawEvents extends BaseTask_1.BaseTask {
|
|
43
43
|
sourceTransactionHash: event.transactionHash, sourceBlockNumber: event.blockNumber, sourceStatus: "success", targetStatus: "uninitialised", submitEvent: {
|
44
44
|
to,
|
45
45
|
amount: amount.toString(),
|
46
|
-
|
46
|
+
itoken: this.itokenAddress,
|
47
|
+
sourceChainId: sourceChainId,
|
48
|
+
targetChainId: targetChainId,
|
47
49
|
}, sourceEvent: {
|
48
50
|
to,
|
49
51
|
amount: amount.toString(),
|
50
|
-
|
52
|
+
itoken: this.itokenAddress,
|
53
|
+
sourceChainId: sourceChainId,
|
54
|
+
targetChainId: targetChainId,
|
51
55
|
}, status: "pending" }));
|
52
56
|
this.logger.info(`Withdraw queued: ${event.transactionHash} ${event.blockNumber}`);
|
53
57
|
}
|
@@ -59,10 +63,9 @@ class SyncWithdrawEvents extends BaseTask_1.BaseTask {
|
|
59
63
|
this.logger.info(`${processedEvents} events processed`);
|
60
64
|
}
|
61
65
|
async start() {
|
62
|
-
this.logger.info(`Starting execution watcher on interop chain`);
|
63
66
|
this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
64
67
|
this.contract = (0, utils_1.getContract)(this.itokenAddress, abi_1.default.interopBridgeToken, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
|
65
68
|
await super.start();
|
66
69
|
}
|
67
70
|
}
|
68
|
-
exports.default =
|
71
|
+
exports.default = SyncBurnEvents;
|
@@ -0,0 +1,67 @@
|
|
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 config_1 = __importDefault(require("@/config"));
|
13
|
+
class SyncMintEvents extends BaseTask_1.BaseTask {
|
14
|
+
constructor({ chainId, itokenAddress }) {
|
15
|
+
super({
|
16
|
+
logger: new logger_1.default("InteropBridgeToken::SyncMintEvents"),
|
17
|
+
});
|
18
|
+
this.chainId = chainId;
|
19
|
+
this.itokenAddress = itokenAddress;
|
20
|
+
}
|
21
|
+
async pollHandler() {
|
22
|
+
const currentBlock = await this.provider.getBlockNumber();
|
23
|
+
const events = await this.contract.queryFilter(this.contract.filters.Mint(), currentBlock - 500, currentBlock);
|
24
|
+
for (const event of events) {
|
25
|
+
try {
|
26
|
+
if (!event.args) {
|
27
|
+
continue;
|
28
|
+
}
|
29
|
+
const { sourceChainId, targetChainId, amount, to, submitTransactionHash } = event.args;
|
30
|
+
const uniqueIdentifier = {
|
31
|
+
action: 'deposit',
|
32
|
+
submitTransactionHash: submitTransactionHash,
|
33
|
+
sourceChainId: sourceChainId,
|
34
|
+
targetChainId: targetChainId,
|
35
|
+
targetEvent: null
|
36
|
+
};
|
37
|
+
const transaction = await db_1.Transaction.findOne({ where: uniqueIdentifier });
|
38
|
+
if (!transaction) {
|
39
|
+
return;
|
40
|
+
}
|
41
|
+
const tx = await event.getTransaction();
|
42
|
+
transaction.targetStatus = 'success';
|
43
|
+
transaction.targetErrors = [];
|
44
|
+
transaction.targetTransactionHash = tx.hash;
|
45
|
+
transaction.targetEvent = {
|
46
|
+
sourceChainId,
|
47
|
+
targetChainId,
|
48
|
+
amount: amount.toString(),
|
49
|
+
to,
|
50
|
+
submitTransactionHash
|
51
|
+
};
|
52
|
+
transaction.status = 'success';
|
53
|
+
await transaction.save();
|
54
|
+
this.logger.info(`Mint confirmation received: ${transaction.transactionHash} `);
|
55
|
+
}
|
56
|
+
catch (error) {
|
57
|
+
this.logger.error(error);
|
58
|
+
}
|
59
|
+
}
|
60
|
+
}
|
61
|
+
async start() {
|
62
|
+
this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
63
|
+
this.contract = (0, utils_1.getContract)(this.itokenAddress, abi_1.default.interopBridgeToken, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
|
64
|
+
await super.start();
|
65
|
+
}
|
66
|
+
}
|
67
|
+
exports.default = SyncMintEvents;
|
@@ -14,6 +14,7 @@ const config_1 = __importDefault(require("@/config"));
|
|
14
14
|
const sequelize_1 = require("sequelize");
|
15
15
|
const waait_1 = __importDefault(require("waait"));
|
16
16
|
const net_1 = require("@/net");
|
17
|
+
const gnosis_1 = require("@/gnosis");
|
17
18
|
const generateGnosisTransaction = async (transactionData, safeContract) => {
|
18
19
|
console.log(transactionData);
|
19
20
|
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));
|
@@ -68,9 +69,22 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
|
|
68
69
|
const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
|
69
70
|
const ownersThreshold = await safeContract.getThreshold();
|
70
71
|
await (0, waait_1.default)(10000);
|
72
|
+
let data;
|
73
|
+
try {
|
74
|
+
data = await (0, gnosis_1.buildGnosisData)(transaction);
|
75
|
+
}
|
76
|
+
catch (error) {
|
77
|
+
console.log(error);
|
78
|
+
transaction.targetStatus = 'failed';
|
79
|
+
transaction.targetErrors = [error.message];
|
80
|
+
transaction.status = 'failed';
|
81
|
+
await transaction.save();
|
82
|
+
net_1.protocol.sendTransaction(transaction);
|
83
|
+
return;
|
84
|
+
}
|
71
85
|
let gnosisTx = await generateGnosisTransaction({
|
72
86
|
baseGas: "0",
|
73
|
-
data
|
87
|
+
data,
|
74
88
|
gasPrice: "0",
|
75
89
|
gasToken: "0x0000000000000000000000000000000000000000",
|
76
90
|
nonce: '0',
|
@@ -126,18 +140,20 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
|
|
126
140
|
if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
|
127
141
|
console.log('ExecutionSuccess');
|
128
142
|
transaction.targetStatus = 'success';
|
143
|
+
transaction.targetTransactionHash = txSent.hash;
|
129
144
|
transaction.status = 'success';
|
130
145
|
await transaction.save();
|
131
146
|
}
|
132
147
|
else {
|
133
148
|
console.log('ExecutionFailure');
|
134
149
|
transaction.targetStatus = 'failed';
|
150
|
+
transaction.targetTransactionHash = txSent.hash;
|
135
151
|
transaction.status = 'failed';
|
136
152
|
await transaction.save();
|
137
153
|
}
|
154
|
+
net_1.protocol.sendTransaction(transaction);
|
138
155
|
}
|
139
156
|
async start() {
|
140
|
-
this.logger.info(`Starting execution watcher on interop chain`);
|
141
157
|
this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
|
142
158
|
this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
143
159
|
this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
|
@@ -31,8 +31,8 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
|
|
31
31
|
const uniqueIdentifier = {
|
32
32
|
action: 'deposit',
|
33
33
|
submitTransactionHash: event.transactionHash,
|
34
|
-
sourceChainId: sourceChainId
|
35
|
-
targetChainId: targetChainId
|
34
|
+
sourceChainId: sourceChainId,
|
35
|
+
targetChainId: targetChainId,
|
36
36
|
};
|
37
37
|
if (await db_1.Transaction.findOne({ where: uniqueIdentifier })) {
|
38
38
|
continue;
|
@@ -65,7 +65,6 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
|
|
65
65
|
this.logger.info(`${processedEvents} events processed`);
|
66
66
|
}
|
67
67
|
async start() {
|
68
|
-
this.logger.info(`Starting execution watcher on interop chain`);
|
69
68
|
this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
|
70
69
|
this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
71
70
|
this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
|
@@ -0,0 +1,72 @@
|
|
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
|
+
class SyncWithdrawEvents extends BaseTask_1.BaseTask {
|
15
|
+
constructor({ chainId }) {
|
16
|
+
super({
|
17
|
+
logger: new logger_1.default("InteropXGateway::SyncWithdrawEvents"),
|
18
|
+
});
|
19
|
+
this.chainId = chainId;
|
20
|
+
}
|
21
|
+
async pollHandler() {
|
22
|
+
const currentBlock = await this.provider.getBlockNumber();
|
23
|
+
const events = await this.contract.queryFilter(this.contract.filters.LogGatewayWithdraw(), currentBlock - 500, currentBlock);
|
24
|
+
let processedEvents = 0;
|
25
|
+
for (const event of events) {
|
26
|
+
try {
|
27
|
+
if (!event.args) {
|
28
|
+
continue;
|
29
|
+
}
|
30
|
+
const { user, token, amount, sourceChainId, targetChainId, transactionHash } = event.args;
|
31
|
+
const uniqueIdentifier = {
|
32
|
+
action: 'withdraw',
|
33
|
+
submitTransactionHash: transactionHash,
|
34
|
+
sourceChainId: sourceChainId,
|
35
|
+
targetChainId: targetChainId,
|
36
|
+
targetEvent: null
|
37
|
+
};
|
38
|
+
const transaction = await db_1.Transaction.findOne({ where: uniqueIdentifier });
|
39
|
+
if (!transaction) {
|
40
|
+
return;
|
41
|
+
}
|
42
|
+
const tx = await event.getTransaction();
|
43
|
+
transaction.targetStatus = 'success';
|
44
|
+
transaction.targetErrors = [];
|
45
|
+
transaction.targetTransactionHash = tx.hash;
|
46
|
+
transaction.targetEvent = {
|
47
|
+
user,
|
48
|
+
token,
|
49
|
+
amount: amount.toString(),
|
50
|
+
sourceChainId,
|
51
|
+
targetChainId,
|
52
|
+
transactionHash,
|
53
|
+
};
|
54
|
+
transaction.status = 'success';
|
55
|
+
await transaction.save();
|
56
|
+
this.logger.info(`Witdraw confirmation received: ${transaction.transactionHash} `);
|
57
|
+
}
|
58
|
+
catch (error) {
|
59
|
+
this.logger.error(error);
|
60
|
+
}
|
61
|
+
}
|
62
|
+
if (processedEvents > 0)
|
63
|
+
this.logger.info(`${processedEvents} events processed`);
|
64
|
+
}
|
65
|
+
async start() {
|
66
|
+
this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
|
67
|
+
this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
|
68
|
+
this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
|
69
|
+
await super.start();
|
70
|
+
}
|
71
|
+
}
|
72
|
+
exports.default = SyncWithdrawEvents;
|
@@ -0,0 +1,53 @@
|
|
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 net_1 = require("@/net");
|
9
|
+
const db_1 = require("@/db");
|
10
|
+
const sequelize_1 = require("sequelize");
|
11
|
+
class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
|
12
|
+
constructor() {
|
13
|
+
super({
|
14
|
+
logger: new logger_1.default("SyncTransactionStatusTask"),
|
15
|
+
});
|
16
|
+
this.pollIntervalMs = 60 * 1000;
|
17
|
+
this.exceptLeadNode = true;
|
18
|
+
}
|
19
|
+
async pollHandler() {
|
20
|
+
// if transaction is pending for more than 1 hour, check lead node for status
|
21
|
+
const leadNode = net_1.peerPool.getLeadPeer();
|
22
|
+
if (!leadNode) {
|
23
|
+
return;
|
24
|
+
}
|
25
|
+
const transaction = await db_1.Transaction.findOne({
|
26
|
+
where: {
|
27
|
+
status: 'pending',
|
28
|
+
sourceCreatedAt: {
|
29
|
+
[sequelize_1.Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
|
30
|
+
},
|
31
|
+
}
|
32
|
+
});
|
33
|
+
if (!transaction) {
|
34
|
+
return;
|
35
|
+
}
|
36
|
+
this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`);
|
37
|
+
const transactionStatus = await net_1.protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
|
38
|
+
if (!transactionStatus) {
|
39
|
+
return;
|
40
|
+
}
|
41
|
+
this.logger.info(`Received transaction status for ${transaction.transactionHash}`);
|
42
|
+
transaction.sourceStatus = transactionStatus.sourceStatus;
|
43
|
+
transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash;
|
44
|
+
transaction.sourceErrors = transactionStatus.sourceErrors;
|
45
|
+
transaction.targetStatus = transactionStatus.targetStatus;
|
46
|
+
transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
|
47
|
+
transaction.targetErrors = transactionStatus.targetErrors;
|
48
|
+
transaction.status = transactionStatus.status;
|
49
|
+
await transaction.save();
|
50
|
+
this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);
|
51
|
+
}
|
52
|
+
}
|
53
|
+
exports.default = SyncTransactionStatusTask;
|