@instadapp/interop-x 0.0.0-dev.80722d6 → 0.0.0-dev.80dece2
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/bin/interop-x +1 -1
- package/dist/package.json +72 -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 +0 -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/{index.js → src/index.js} +35 -3
- 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 +6 -2
- package/dist/{net → src/net}/pool/index.js +27 -9
- package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +0 -0
- package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +22 -12
- package/dist/{net → src/net}/protocol/index.js +30 -1
- package/dist/{tasks → src/tasks}/BaseTask.js +1 -1
- package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +147 -0
- package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +70 -0
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +150 -0
- package/dist/{tasks → src/tasks}/InteropXGateway/SyncDepositEvents.js +16 -20
- package/dist/{tasks → src/tasks}/index.js +13 -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 +228 -0
- package/package.json +10 -4
- package/patches/@ethersproject+properties+5.6.0.patch +13 -0
- package/src/api/index.ts +33 -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 +46 -5
- package/src/net/peer/index.ts +7 -6
- package/src/net/pool/index.ts +37 -11
- package/src/net/protocol/dial/SignatureDialProtocol.ts +25 -13
- package/src/net/protocol/index.ts +45 -1
- package/src/tasks/BaseTask.ts +1 -1
- package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +233 -0
- package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +121 -0
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +245 -0
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +23 -11
- package/src/tasks/index.ts +19 -2
- package/src/utils/index.ts +182 -4
- package/dist/utils/index.js +0 -101
package/bin/interop-x
CHANGED
@@ -1,2 +1,2 @@
|
|
1
1
|
#!/usr/bin/env node
|
2
|
-
require('../dist/index')
|
2
|
+
require('../dist/src/index')
|
@@ -0,0 +1,72 @@
|
|
1
|
+
{
|
2
|
+
"name": "@instadapp/interop-x",
|
3
|
+
"version": "0.0.0-dev.80dece2",
|
4
|
+
"license": "MIT",
|
5
|
+
"main": "dist/index.js",
|
6
|
+
"engines": {
|
7
|
+
"node": ">=16",
|
8
|
+
"yarn": "^1.22.0"
|
9
|
+
},
|
10
|
+
"scripts": {
|
11
|
+
"start": "yarn build && node bin/interop-x",
|
12
|
+
"build": "yarn generate-abi-types && export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/**/*.js",
|
13
|
+
"dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
|
14
|
+
"generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
|
15
|
+
"prepublishOnly": "yarn build",
|
16
|
+
"postinstall": "patch-package"
|
17
|
+
},
|
18
|
+
"nodemonConfig": {
|
19
|
+
"watch": [
|
20
|
+
"src"
|
21
|
+
],
|
22
|
+
"ext": "ts",
|
23
|
+
"exec": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register ./src/index.ts"
|
24
|
+
},
|
25
|
+
"dependencies": {
|
26
|
+
"@achingbrain/libp2p-gossipsub": "^0.12.2",
|
27
|
+
"axios": "^0.27.1",
|
28
|
+
"axios-retry": "^3.2.4",
|
29
|
+
"bignumber.js": "^9.0.2",
|
30
|
+
"chalk": "4.1.2",
|
31
|
+
"dotenv": "^16.0.0",
|
32
|
+
"ethereumjs-util": "^7.1.4",
|
33
|
+
"ethers": "^5.6.4",
|
34
|
+
"ethers-multisend": "^2.1.1",
|
35
|
+
"expand-home-dir": "^0.0.3",
|
36
|
+
"fastify": "^3.28.0",
|
37
|
+
"fastify-cors": "^6.0.3",
|
38
|
+
"libp2p": "^0.36.2",
|
39
|
+
"libp2p-bootstrap": "^0.14.0",
|
40
|
+
"libp2p-kad-dht": "^0.28.6",
|
41
|
+
"libp2p-mdns": "^0.18.0",
|
42
|
+
"libp2p-mplex": "^0.10.7",
|
43
|
+
"libp2p-noise": "^4.0.0",
|
44
|
+
"libp2p-pubsub-peer-discovery": "^4.0.0",
|
45
|
+
"libp2p-tcp": "^0.17.2",
|
46
|
+
"libp2p-websockets": "^0.16.2",
|
47
|
+
"luxon": "^2.3.2",
|
48
|
+
"module-alias": "^2.2.2",
|
49
|
+
"patch-package": "^6.4.7",
|
50
|
+
"postinstall-postinstall": "^2.1.0",
|
51
|
+
"sequelize": "6.18.0",
|
52
|
+
"sqlite3": "^5.0.5",
|
53
|
+
"waait": "^1.0.5"
|
54
|
+
},
|
55
|
+
"bin": {
|
56
|
+
"interop-x": "bin/interop-x",
|
57
|
+
"interopx": "bin/interop-x"
|
58
|
+
},
|
59
|
+
"devDependencies": {
|
60
|
+
"@typechain/ethers-v5": "^10.0.0",
|
61
|
+
"@types/bn.js": "^5.1.0",
|
62
|
+
"@types/fs-extra": "^9.0.13",
|
63
|
+
"@types/node": "^17.0.17",
|
64
|
+
"nodemon": "^2.0.15",
|
65
|
+
"replace-in-file": "^6.3.2",
|
66
|
+
"rimraf": "^3.0.2",
|
67
|
+
"ts-node": "^10.5.0",
|
68
|
+
"tsconfig-paths": "^3.12.0",
|
69
|
+
"typechain": "^8.0.0",
|
70
|
+
"typescript": "^4.5.5"
|
71
|
+
}
|
72
|
+
}
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -0,0 +1,33 @@
|
|
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
|
+
exports.startApiServer = void 0;
|
7
|
+
const fastify_1 = __importDefault(require("fastify"));
|
8
|
+
const fastify_cors_1 = __importDefault(require("fastify-cors"));
|
9
|
+
const logger_1 = __importDefault(require("@/logger"));
|
10
|
+
const db_1 = require("@/db");
|
11
|
+
const logger = new logger_1.default("RPC");
|
12
|
+
const server = (0, fastify_1.default)({ logger: false });
|
13
|
+
server.register(fastify_cors_1.default, {});
|
14
|
+
server.get('/', async () => 'Interop X API');
|
15
|
+
const startApiServer = async () => {
|
16
|
+
const HOST = process.env.API_HOST || '0.0.0.0';
|
17
|
+
const PORT = process.env.API_PORT || '8080';
|
18
|
+
try {
|
19
|
+
server.get('/transactions', async (req) => {
|
20
|
+
return await db_1.Transaction.findAndCountAll({
|
21
|
+
limit: 20,
|
22
|
+
offset: 0,
|
23
|
+
});
|
24
|
+
});
|
25
|
+
await server.listen(PORT, HOST);
|
26
|
+
logger.log(`RPC Server listening at http://${HOST}:${PORT}`);
|
27
|
+
}
|
28
|
+
catch (err) {
|
29
|
+
logger.error(err);
|
30
|
+
process.exit(1);
|
31
|
+
}
|
32
|
+
};
|
33
|
+
exports.startApiServer = startApiServer;
|
File without changes
|
@@ -6,23 +6,15 @@ exports.addresses = {
|
|
6
6
|
gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
|
7
7
|
multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
|
8
8
|
interopXGateway: '',
|
9
|
-
interopBridgeTokens: [],
|
10
9
|
},
|
11
10
|
137: {
|
12
11
|
gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
|
13
12
|
multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
|
14
13
|
interopXGateway: '',
|
15
|
-
interopBridgeTokens: [
|
16
|
-
{
|
17
|
-
address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
|
18
|
-
symbol: 'USDC',
|
19
|
-
}
|
20
|
-
],
|
21
14
|
},
|
22
15
|
43114: {
|
23
16
|
gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
|
24
17
|
multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
|
25
18
|
interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
|
26
|
-
interopBridgeTokens: [],
|
27
19
|
}
|
28
20
|
};
|
@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
17
17
|
__exportStar(require("./addresses"), exports);
|
18
18
|
__exportStar(require("./tokens"), exports);
|
19
|
+
__exportStar(require("./itokens"), exports);
|
@@ -0,0 +1,13 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.itokens = void 0;
|
4
|
+
exports.itokens = {
|
5
|
+
1: [],
|
6
|
+
137: [
|
7
|
+
{
|
8
|
+
address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
|
9
|
+
symbol: 'USDC',
|
10
|
+
}
|
11
|
+
],
|
12
|
+
43114: []
|
13
|
+
};
|
File without changes
|
File without changes
|
File without changes
|
@@ -12,8 +12,10 @@ Transaction.init({
|
|
12
12
|
autoIncrement: true,
|
13
13
|
primaryKey: true
|
14
14
|
},
|
15
|
+
submitTransactionHash: sequelize_2.DataTypes.NUMBER,
|
16
|
+
submitBlockNumber: sequelize_2.DataTypes.NUMBER,
|
15
17
|
transactionHash: sequelize_2.DataTypes.STRING,
|
16
|
-
|
18
|
+
action: sequelize_2.DataTypes.STRING,
|
17
19
|
from: sequelize_2.DataTypes.STRING,
|
18
20
|
to: sequelize_2.DataTypes.STRING,
|
19
21
|
sourceChainId: sequelize_2.DataTypes.NUMBER,
|
File without changes
|
@@ -9,6 +9,7 @@ module_alias_1.default.addAliases({
|
|
9
9
|
"@/logger": __dirname + "/logger",
|
10
10
|
"@/tasks": __dirname + "/tasks",
|
11
11
|
"@/utils": __dirname + "/utils",
|
12
|
+
"@/api": __dirname + "/api",
|
12
13
|
"@/net": __dirname + "/net",
|
13
14
|
"@/db": __dirname + "/db",
|
14
15
|
"@/config": __dirname + "/config",
|
@@ -18,19 +19,27 @@ module_alias_1.default.addAliases({
|
|
18
19
|
"@/typechain": __dirname + "/typechain"
|
19
20
|
});
|
20
21
|
(0, module_alias_1.default)();
|
21
|
-
const assert_1 = __importDefault(require("assert"));
|
22
22
|
const dotenv_1 = __importDefault(require("dotenv"));
|
23
23
|
const ethers_1 = require("ethers");
|
24
|
+
const package_json_1 = __importDefault(require("../package.json"));
|
24
25
|
dotenv_1.default.config();
|
25
26
|
const logger_1 = __importDefault(require("@/logger"));
|
26
27
|
const logger = new logger_1.default('Process');
|
27
|
-
|
28
|
+
const printUsage = () => {
|
28
29
|
console.log('Usage:');
|
29
30
|
console.log(' PRIVATE_KEY=abcd1234 interop-x');
|
30
31
|
console.log(' PRIVATE_KEY=abcd1234 STAGING=true interop-x');
|
32
|
+
console.log(' PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x');
|
33
|
+
};
|
34
|
+
if (process.argv.at(-1) === 'help') {
|
35
|
+
printUsage();
|
31
36
|
process.exit(0);
|
32
37
|
}
|
33
|
-
|
38
|
+
if (!process.env.PRIVATE_KEY) {
|
39
|
+
console.error('Please provide a private key\n\n');
|
40
|
+
printUsage();
|
41
|
+
process.exit(1);
|
42
|
+
}
|
34
43
|
try {
|
35
44
|
new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
|
36
45
|
}
|
@@ -38,12 +47,35 @@ catch (e) {
|
|
38
47
|
logger.error('Invalid private key');
|
39
48
|
process.exit(1);
|
40
49
|
}
|
50
|
+
logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.80dece2)`);
|
41
51
|
const tasks_1 = require("@/tasks");
|
42
52
|
const net_1 = require("@/net");
|
53
|
+
const api_1 = require("@/api");
|
54
|
+
const db_1 = require("./db");
|
43
55
|
async function main() {
|
44
56
|
(0, net_1.startPeer)({});
|
45
57
|
const tasks = new tasks_1.Tasks();
|
46
58
|
tasks.start();
|
59
|
+
(0, api_1.startApiServer)();
|
60
|
+
net_1.protocol.on('TransactionStatus', async (payload) => {
|
61
|
+
if (!net_1.peerPool.isLeadNode(payload.peerId)) {
|
62
|
+
const peer = net_1.peerPool.getPeer(payload.peerId);
|
63
|
+
logger.info(`ignored transaction status from ${payload.peerId} ${peer === null || peer === void 0 ? void 0 : peer.publicAddress} `);
|
64
|
+
return;
|
65
|
+
}
|
66
|
+
const transaction = await db_1.Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } });
|
67
|
+
if (!transaction) {
|
68
|
+
return;
|
69
|
+
}
|
70
|
+
transaction.sourceStatus = payload.data.sourceStatus;
|
71
|
+
transaction.sourceTransactionHash = payload.data.sourceTransactionHash;
|
72
|
+
transaction.sourceErrors = payload.data.sourceErrors;
|
73
|
+
transaction.targetStatus = payload.data.targetStatus;
|
74
|
+
transaction.targetTransactionHash = payload.data.targetTransactionHash;
|
75
|
+
transaction.targetErrors = payload.data.targetErrors;
|
76
|
+
transaction.status = payload.data.status;
|
77
|
+
await transaction.save();
|
78
|
+
});
|
47
79
|
}
|
48
80
|
main()
|
49
81
|
.then(() => {
|
File without changes
|
File without changes
|
@@ -82,8 +82,12 @@ const startPeer = async ({}) => {
|
|
82
82
|
net_1.protocol.start({
|
83
83
|
libp2p: node
|
84
84
|
});
|
85
|
-
node.on("peer:discovery", (peer) =>
|
86
|
-
|
85
|
+
node.on("peer:discovery", (peer) => {
|
86
|
+
// logger.log(`Discovered peer ${peer}`)
|
87
|
+
}); // peer disc.
|
88
|
+
node.connectionManager.on("peer:connect", (connection) => {
|
89
|
+
// logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
|
90
|
+
});
|
87
91
|
logger.log("Peer discovery started");
|
88
92
|
await (0, waait_1.default)(1000);
|
89
93
|
setInterval(() => net_1.protocol.sendPeerInfo({
|
@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.peerPool = exports.PeerPool = void 0;
|
7
7
|
const types_1 = require("@/types");
|
8
8
|
const config_1 = __importDefault(require("@/config"));
|
9
|
+
const logger_1 = __importDefault(require("@/logger"));
|
10
|
+
const utils_1 = require("ethers/lib/utils");
|
11
|
+
const logger = new logger_1.default('PeerPool');
|
9
12
|
class PeerPool {
|
10
13
|
constructor() {
|
11
14
|
this.PEERS_CLEANUP_TIME_LIMIT = 1;
|
@@ -62,10 +65,14 @@ class PeerPool {
|
|
62
65
|
* @emits {@link Event.POOL_PEER_ADDED}
|
63
66
|
*/
|
64
67
|
add(peer) {
|
65
|
-
if (peer && peer.id
|
68
|
+
if (peer && peer.id) {
|
69
|
+
const newPeer = !this.pool.get(peer.id);
|
66
70
|
this.pool.set(peer.id, peer);
|
67
71
|
peer.pooled = true;
|
68
|
-
|
72
|
+
if (newPeer) {
|
73
|
+
config_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
|
74
|
+
logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`);
|
75
|
+
}
|
69
76
|
}
|
70
77
|
}
|
71
78
|
/**
|
@@ -78,6 +85,7 @@ class PeerPool {
|
|
78
85
|
if (this.pool.delete(peer.id)) {
|
79
86
|
peer.pooled = false;
|
80
87
|
config_1.default.events.emit(types_1.Event.POOL_PEER_REMOVED, peer);
|
88
|
+
logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`);
|
81
89
|
}
|
82
90
|
}
|
83
91
|
}
|
@@ -93,14 +101,24 @@ class PeerPool {
|
|
93
101
|
get activePeerIds() {
|
94
102
|
return this.activePeers.map((p) => p.id);
|
95
103
|
}
|
104
|
+
getPeer(id) {
|
105
|
+
return this.pool.get(id);
|
106
|
+
}
|
107
|
+
isLeadNode(id) {
|
108
|
+
const peer = this.pool.get(id);
|
109
|
+
if (!peer) {
|
110
|
+
return false;
|
111
|
+
}
|
112
|
+
return (0, utils_1.getAddress)(peer.publicAddress) === (0, utils_1.getAddress)(config_1.default.leadNodeAddress);
|
113
|
+
}
|
96
114
|
cleanup() {
|
97
|
-
let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
|
98
|
-
this.peers.forEach((peerInfo) => {
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
})
|
115
|
+
// let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
|
116
|
+
// this.peers.forEach((peerInfo) => {
|
117
|
+
// if (peerInfo.updated.getTime() < compDate) {
|
118
|
+
// console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
|
119
|
+
// this.remove(peerInfo)
|
120
|
+
// }
|
121
|
+
// })
|
104
122
|
}
|
105
123
|
}
|
106
124
|
exports.PeerPool = PeerPool;
|
File without changes
|
@@ -8,6 +8,8 @@ const BaseDialProtocol_1 = require("./BaseDialProtocol");
|
|
8
8
|
const waait_1 = __importDefault(require("waait"));
|
9
9
|
const config_1 = __importDefault(require("@/config"));
|
10
10
|
const db_1 = require("@/db");
|
11
|
+
const utils_1 = require("@/utils");
|
12
|
+
const constants_1 = require("@/constants");
|
11
13
|
class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
|
12
14
|
constructor(libp2p) {
|
13
15
|
super(libp2p, '/interop-x/signatures');
|
@@ -15,31 +17,39 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
|
|
15
17
|
}
|
16
18
|
async response(data) {
|
17
19
|
const signer = config_1.default.wallet;
|
18
|
-
let
|
20
|
+
let transaction;
|
19
21
|
let maxTimeout = 20000;
|
20
22
|
do {
|
21
|
-
|
22
|
-
if (!
|
23
|
+
transaction = await db_1.Transaction.findOne({ where: { transactionHash: data.transactionHash } });
|
24
|
+
if (!transaction) {
|
23
25
|
await (0, waait_1.default)(1000);
|
24
26
|
maxTimeout -= 1000;
|
25
27
|
}
|
26
|
-
} while (!
|
27
|
-
if (!
|
28
|
+
} while (!transaction && maxTimeout > 0);
|
29
|
+
if (!transaction) {
|
28
30
|
return {
|
29
31
|
signer: signer.address,
|
30
32
|
data: null,
|
31
33
|
error: 'Event not found'
|
32
34
|
};
|
33
35
|
}
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
36
|
+
console.log("signing:", {
|
37
|
+
to: constants_1.addresses[transaction.targetChainId].multisend,
|
38
|
+
data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
|
39
|
+
chainId: transaction.targetChainId,
|
40
|
+
safeTxGas: data.safeTxGas,
|
41
|
+
nonce: data.safeNonce,
|
42
|
+
});
|
43
|
+
const signedData = await (0, utils_1.signGnosisSafeTx)({
|
44
|
+
to: constants_1.addresses[transaction.targetChainId].multisend,
|
45
|
+
data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
|
46
|
+
chainId: transaction.targetChainId,
|
47
|
+
safeTxGas: data.safeTxGas,
|
48
|
+
nonce: data.safeNonce,
|
49
|
+
}, { signer });
|
40
50
|
return {
|
41
51
|
signer: signer.address,
|
42
|
-
data:
|
52
|
+
data: signedData
|
43
53
|
};
|
44
54
|
}
|
45
55
|
}
|
@@ -16,7 +16,7 @@ class Protocol extends stream_1.EventEmitter {
|
|
16
16
|
this.protocolMessages = [
|
17
17
|
{
|
18
18
|
name: 'PeerInfo',
|
19
|
-
code:
|
19
|
+
code: 0x01,
|
20
20
|
encode: (info) => [
|
21
21
|
Buffer.from(info.publicAddress),
|
22
22
|
],
|
@@ -24,6 +24,30 @@ class Protocol extends stream_1.EventEmitter {
|
|
24
24
|
publicAddress: publicAddress.toString(),
|
25
25
|
}),
|
26
26
|
},
|
27
|
+
{
|
28
|
+
name: 'TransactionStatus',
|
29
|
+
code: 0x02,
|
30
|
+
encode: (transaction) => [
|
31
|
+
Buffer.from(transaction.transactionHash),
|
32
|
+
Buffer.from(transaction.sourceStatus),
|
33
|
+
Buffer.from(transaction.sourceTransactionHash),
|
34
|
+
transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
|
35
|
+
Buffer.from(transaction.targetStatus),
|
36
|
+
Buffer.from(transaction.targetTransactionHash),
|
37
|
+
transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
|
38
|
+
Buffer.from(transaction.status),
|
39
|
+
],
|
40
|
+
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
|
41
|
+
transactionHash: transactionHash.toString(),
|
42
|
+
sourceStatus: sourceStatus.toString(),
|
43
|
+
sourceTransactionHash: sourceTransactionHash.toString(),
|
44
|
+
sourceErrors: sourceErrors.map((e) => e.toString()),
|
45
|
+
targetStatus: targetStatus.toString(),
|
46
|
+
targetTransactionHash: targetTransactionHash.toString(),
|
47
|
+
targetErrors: targetErrors.map((e) => e.toString()),
|
48
|
+
status: status.toString(),
|
49
|
+
}),
|
50
|
+
},
|
27
51
|
];
|
28
52
|
}
|
29
53
|
start({ libp2p, topic = null, }) {
|
@@ -75,6 +99,11 @@ class Protocol extends stream_1.EventEmitter {
|
|
75
99
|
const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(data)]);
|
76
100
|
this.libp2p.pubsub.publish(this.topic, encoded);
|
77
101
|
}
|
102
|
+
sendTransaction(transaction) {
|
103
|
+
const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus');
|
104
|
+
const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(transaction)]);
|
105
|
+
this.libp2p.pubsub.publish(this.topic, encoded);
|
106
|
+
}
|
78
107
|
async requestSignatures(data, peerIds) {
|
79
108
|
try {
|
80
109
|
peerIds = peerIds || __1.peerPool.activePeerIds;
|
@@ -28,7 +28,7 @@ class BaseTask extends events_1.default {
|
|
28
28
|
}
|
29
29
|
}
|
30
30
|
catch (err) {
|
31
|
-
this.logger.error(`poll check error
|
31
|
+
this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`);
|
32
32
|
}
|
33
33
|
await this.postPollHandler();
|
34
34
|
}
|
@@ -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 generateGnosisTransaction = async (transactionData, safeContract) => {
|
18
|
+
console.log(transactionData);
|
19
|
+
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));
|
20
|
+
while (isExecuted == 1) {
|
21
|
+
transactionData.safeTxGas = ethers_1.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
|
22
|
+
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));
|
23
|
+
}
|
24
|
+
return transactionData;
|
25
|
+
};
|
26
|
+
class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
|
27
|
+
constructor({ chainId }) {
|
28
|
+
super({
|
29
|
+
logger: new logger_1.default("InteropXGateway::ProcessWithdrawEvents"),
|
30
|
+
});
|
31
|
+
this.leadNodeOnly = true;
|
32
|
+
this.chainId = chainId;
|
33
|
+
}
|
34
|
+
async pollHandler() {
|
35
|
+
var _a;
|
36
|
+
const blockNumber = await this.provider.getBlockNumber();
|
37
|
+
const transaction = await db_1.Transaction.findOne({
|
38
|
+
where: {
|
39
|
+
status: 'pending',
|
40
|
+
sourceStatus: 'success',
|
41
|
+
targetStatus: 'uninitialised',
|
42
|
+
action: 'withdraw',
|
43
|
+
sourceCreatedAt: {
|
44
|
+
[sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
|
45
|
+
},
|
46
|
+
targetDelayUntil: {
|
47
|
+
[sequelize_1.Op.or]: {
|
48
|
+
[sequelize_1.Op.is]: null,
|
49
|
+
[sequelize_1.Op.lt]: new Date(),
|
50
|
+
}
|
51
|
+
},
|
52
|
+
sourceBlockNumber: {
|
53
|
+
[sequelize_1.Op.lt]: blockNumber - 12,
|
54
|
+
},
|
55
|
+
sourceChainId: this.chainId,
|
56
|
+
}
|
57
|
+
});
|
58
|
+
if (!transaction) {
|
59
|
+
return;
|
60
|
+
}
|
61
|
+
console.log(`Processing transaction ${transaction.transactionHash}`);
|
62
|
+
transaction.targetStatus = 'pending';
|
63
|
+
await transaction.save();
|
64
|
+
// refresh event data?
|
65
|
+
const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(transaction.targetChainId));
|
66
|
+
const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
|
67
|
+
const safeAddress = constants_1.addresses[transaction.targetChainId].gnosisSafe;
|
68
|
+
const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
|
69
|
+
const ownersThreshold = await safeContract.getThreshold();
|
70
|
+
await (0, waait_1.default)(10000);
|
71
|
+
let gnosisTx = await generateGnosisTransaction({
|
72
|
+
baseGas: "0",
|
73
|
+
data: await (0, utils_1.buildDataForTransaction)(transaction),
|
74
|
+
gasPrice: "0",
|
75
|
+
gasToken: "0x0000000000000000000000000000000000000000",
|
76
|
+
nonce: '0',
|
77
|
+
operation: "1",
|
78
|
+
refundReceiver: "0x0000000000000000000000000000000000000000",
|
79
|
+
safeAddress: safeAddress,
|
80
|
+
safeTxGas: "79668",
|
81
|
+
to: constants_1.addresses[transaction.targetChainId].multisend,
|
82
|
+
value: "0",
|
83
|
+
}, safeContract);
|
84
|
+
const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
|
85
|
+
const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
|
86
|
+
console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
|
87
|
+
console.log(ownerPeerIds);
|
88
|
+
const signatures = await net_1.protocol.requestSignatures({
|
89
|
+
type: 'source',
|
90
|
+
transactionHash: transaction.transactionHash,
|
91
|
+
safeTxGas: gnosisTx.safeTxGas,
|
92
|
+
safeNonce: gnosisTx.nonce
|
93
|
+
}, ownerPeerIds);
|
94
|
+
const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x');
|
95
|
+
console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
|
96
|
+
if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
|
97
|
+
await transaction.save();
|
98
|
+
transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
|
99
|
+
transaction.targetStatus = 'uninitialised';
|
100
|
+
await transaction.save();
|
101
|
+
const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
|
102
|
+
throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
|
103
|
+
}
|
104
|
+
console.log(`Executing transaction for execution ${transaction.transactionHash}`);
|
105
|
+
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));
|
106
|
+
console.log({
|
107
|
+
from: targetWallet.address,
|
108
|
+
gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
|
109
|
+
to: safeAddress,
|
110
|
+
data: txData,
|
111
|
+
});
|
112
|
+
const txSent = await targetWallet.sendTransaction({
|
113
|
+
from: targetWallet.address,
|
114
|
+
gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
|
115
|
+
to: safeAddress,
|
116
|
+
data: txData,
|
117
|
+
});
|
118
|
+
const receipt = await txSent.wait();
|
119
|
+
const parsedLogs = [];
|
120
|
+
receipt.logs.forEach((log) => {
|
121
|
+
try {
|
122
|
+
parsedLogs.push(safeContract.interface.parseLog(log));
|
123
|
+
}
|
124
|
+
catch (e) { }
|
125
|
+
});
|
126
|
+
if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
|
127
|
+
console.log('ExecutionSuccess');
|
128
|
+
transaction.targetStatus = 'success';
|
129
|
+
transaction.targetTransactionHash = txSent.hash;
|
130
|
+
transaction.status = 'success';
|
131
|
+
await transaction.save();
|
132
|
+
}
|
133
|
+
else {
|
134
|
+
console.log('ExecutionFailure');
|
135
|
+
transaction.targetStatus = 'failed';
|
136
|
+
transaction.targetTransactionHash = txSent.hash;
|
137
|
+
transaction.status = 'failed';
|
138
|
+
await transaction.save();
|
139
|
+
}
|
140
|
+
}
|
141
|
+
async start() {
|
142
|
+
this.logger.info(`Starting execution watcher on interop chain`);
|
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;
|