@instadapp/interop-x 0.0.0-dev.59f2858 → 0.0.0-dev.73da8c9
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 +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/{api → src/api}/index.js +0 -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 +2 -0
- package/dist/{db → src/db}/sequelize.js +0 -0
- package/dist/{index.js → src/index.js} +2 -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 +6 -2
- package/dist/{net → src/net}/pool/index.js +16 -9
- package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +0 -0
- package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +15 -12
- package/dist/{net → src/net}/protocol/index.js +0 -0
- package/dist/{tasks → src/tasks}/BaseTask.js +1 -1
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +158 -0
- package/dist/{tasks → src/tasks}/InteropXGateway/SyncDepositEvents.js +13 -4
- package/dist/{tasks → src/tasks}/index.js +4 -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 +178 -0
- package/package.json +6 -3
- package/patches/@ethersproject+properties+5.6.0.patch +13 -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 +6 -2
- package/src/index.ts +3 -0
- package/src/net/peer/index.ts +7 -6
- package/src/net/pool/index.ts +20 -10
- package/src/net/protocol/dial/SignatureDialProtocol.ts +17 -13
- package/src/tasks/BaseTask.ts +1 -1
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +253 -0
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +21 -6
- package/src/tasks/index.ts +7 -2
- package/src/utils/index.ts +112 -3
- package/dist/utils/index.js +0 -101
@@ -0,0 +1,178 @@
|
|
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.getContract = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
|
7
|
+
/**
|
8
|
+
* @module util
|
9
|
+
*/
|
10
|
+
const axios_1 = __importDefault(require("axios"));
|
11
|
+
const axios_retry_1 = __importDefault(require("axios-retry"));
|
12
|
+
const constants_1 = require("@/constants");
|
13
|
+
const ethers_1 = require("ethers");
|
14
|
+
const ethers_multisend_1 = require("ethers-multisend");
|
15
|
+
const config_1 = __importDefault(require("@/config"));
|
16
|
+
const abi_1 = __importDefault(require("@/abi"));
|
17
|
+
exports.http = axios_1.default.create();
|
18
|
+
(0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
|
19
|
+
function short(buffer) {
|
20
|
+
return buffer.toString('hex').slice(0, 8) + '...';
|
21
|
+
}
|
22
|
+
exports.short = short;
|
23
|
+
const signGnosisSafeTx = async ({ to, data = null, value = '0', operation = '1', baseGas = '0', gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }, { signer }) => {
|
24
|
+
const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
|
25
|
+
const domain = {
|
26
|
+
verifyingContract: gnosisSafe,
|
27
|
+
chainId,
|
28
|
+
};
|
29
|
+
const types = {
|
30
|
+
SafeTx: [
|
31
|
+
{ type: 'address', name: 'to' },
|
32
|
+
{ type: 'uint256', name: 'value' },
|
33
|
+
{ type: 'bytes', name: 'data' },
|
34
|
+
{ type: 'uint8', name: 'operation' },
|
35
|
+
{ type: 'uint256', name: 'safeTxGas' },
|
36
|
+
{ type: 'uint256', name: 'baseGas' },
|
37
|
+
{ type: 'uint256', name: 'gasPrice' },
|
38
|
+
{ type: 'address', name: 'gasToken' },
|
39
|
+
{ type: 'address', name: 'refundReceiver' },
|
40
|
+
{ type: 'uint256', name: 'nonce' },
|
41
|
+
],
|
42
|
+
};
|
43
|
+
const message = {
|
44
|
+
baseGas,
|
45
|
+
data,
|
46
|
+
gasPrice,
|
47
|
+
gasToken,
|
48
|
+
nonce: Number(nonce),
|
49
|
+
operation,
|
50
|
+
refundReceiver,
|
51
|
+
safeAddress: gnosisSafe,
|
52
|
+
safeTxGas: String(safeTxGas),
|
53
|
+
to,
|
54
|
+
value,
|
55
|
+
};
|
56
|
+
return await signer._signTypedData(domain, types, message);
|
57
|
+
};
|
58
|
+
exports.signGnosisSafeTx = signGnosisSafeTx;
|
59
|
+
const getRpcProviderUrl = (chainId) => {
|
60
|
+
switch (chainId) {
|
61
|
+
case 1:
|
62
|
+
return 'https://rpc.instadapp.io/mainnet';
|
63
|
+
case 137:
|
64
|
+
return 'https://rpc.instadapp.io/polygon';
|
65
|
+
case 43114:
|
66
|
+
return 'https://rpc.instadapp.io/avalanche';
|
67
|
+
default:
|
68
|
+
throw new Error(`Unknown chainId: ${chainId}`);
|
69
|
+
}
|
70
|
+
};
|
71
|
+
exports.getRpcProviderUrl = getRpcProviderUrl;
|
72
|
+
const buildSignatureBytes = (signatures) => {
|
73
|
+
signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
|
74
|
+
let signatureBytes = "0x";
|
75
|
+
for (const sig of signatures) {
|
76
|
+
signatureBytes += sig.data.slice(2);
|
77
|
+
}
|
78
|
+
return signatureBytes;
|
79
|
+
};
|
80
|
+
exports.buildSignatureBytes = buildSignatureBytes;
|
81
|
+
/**
|
82
|
+
* Call an async function with a maximum time limit (in milliseconds) for the timeout
|
83
|
+
* Resolved promise for async function call, or an error if time limit reached
|
84
|
+
*/
|
85
|
+
const asyncCallWithTimeout = async (asyncPromise, timeout) => {
|
86
|
+
let timeoutHandle;
|
87
|
+
const timeoutPromise = new Promise((_resolve, reject) => {
|
88
|
+
timeoutHandle = setTimeout(() => reject(new Error('Async call timeout limit reached')), timeout);
|
89
|
+
});
|
90
|
+
return Promise.race([asyncPromise, timeoutPromise]).then(result => {
|
91
|
+
clearTimeout(timeoutHandle);
|
92
|
+
return result;
|
93
|
+
});
|
94
|
+
};
|
95
|
+
exports.asyncCallWithTimeout = asyncCallWithTimeout;
|
96
|
+
const generateInteropTransactionHash = (data) => {
|
97
|
+
return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
|
98
|
+
String(data.action),
|
99
|
+
String(data.submitTransactionHash),
|
100
|
+
String(data.sourceChainId),
|
101
|
+
String(data.targetChainId),
|
102
|
+
]);
|
103
|
+
};
|
104
|
+
exports.generateInteropTransactionHash = generateInteropTransactionHash;
|
105
|
+
const buildDataForTransaction = async (transaction, type) => {
|
106
|
+
type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
|
107
|
+
const transactions = [];
|
108
|
+
if (transaction.action != 'deposit') {
|
109
|
+
throw new Error('Invalid action');
|
110
|
+
}
|
111
|
+
if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
|
112
|
+
throw Error('Cannot build data for pending deposit transaction');
|
113
|
+
}
|
114
|
+
if (!transaction.submitEvent) {
|
115
|
+
throw Error('Cannot build data for transaction without submitEvent');
|
116
|
+
}
|
117
|
+
const token = constants_1.tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
|
118
|
+
if (!token) {
|
119
|
+
throw Error('Cannot build data for transaction without token');
|
120
|
+
}
|
121
|
+
const itoken = constants_1.itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
|
122
|
+
if (!itoken) {
|
123
|
+
throw Error('Cannot build data for transaction without itoken');
|
124
|
+
}
|
125
|
+
const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
|
126
|
+
const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
|
127
|
+
const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
|
128
|
+
const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.user, ethers_1.ethers.BigNumber.from(transaction.submitEvent.amount.toString()), ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.sourceTransactionHash);
|
129
|
+
transactions.push({
|
130
|
+
to: itoken.address,
|
131
|
+
data: data,
|
132
|
+
value: '0',
|
133
|
+
operation: ethers_multisend_1.OperationType.Call,
|
134
|
+
});
|
135
|
+
return (0, ethers_multisend_1.encodeMulti)(transactions).data;
|
136
|
+
};
|
137
|
+
exports.buildDataForTransaction = buildDataForTransaction;
|
138
|
+
function getContract(address, contractInterface, signerOrProvider) {
|
139
|
+
if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
|
140
|
+
throw Error(`Invalid 'address' parameter '${address}'.`);
|
141
|
+
}
|
142
|
+
const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
|
143
|
+
return new Proxy(contract, {
|
144
|
+
get(target, prop, receiver) {
|
145
|
+
const value = Reflect.get(target, prop, receiver);
|
146
|
+
if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
|
147
|
+
return async (...args) => {
|
148
|
+
try {
|
149
|
+
return await value.bind(contract)(...args);
|
150
|
+
}
|
151
|
+
catch (error) {
|
152
|
+
throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
|
153
|
+
}
|
154
|
+
};
|
155
|
+
}
|
156
|
+
if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
|
157
|
+
const parentProp = String(prop);
|
158
|
+
return new Proxy(value, {
|
159
|
+
get(target, prop, receiver) {
|
160
|
+
const value = Reflect.get(target, prop, receiver);
|
161
|
+
if (typeof value === 'function') {
|
162
|
+
return async (...args) => {
|
163
|
+
try {
|
164
|
+
return await value.bind(contract)(...args);
|
165
|
+
}
|
166
|
+
catch (error) {
|
167
|
+
throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
|
168
|
+
}
|
169
|
+
};
|
170
|
+
}
|
171
|
+
}
|
172
|
+
});
|
173
|
+
}
|
174
|
+
return value;
|
175
|
+
},
|
176
|
+
});
|
177
|
+
}
|
178
|
+
exports.getContract = getContract;
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@instadapp/interop-x",
|
3
|
-
"version": "0.0.0-dev.
|
3
|
+
"version": "0.0.0-dev.73da8c9",
|
4
4
|
"license": "MIT",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"engines": {
|
@@ -12,7 +12,8 @@
|
|
12
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
13
|
"dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
|
14
14
|
"generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
|
15
|
-
"prepublishOnly": "yarn build"
|
15
|
+
"prepublishOnly": "yarn build",
|
16
|
+
"postinstall": "patch-package"
|
16
17
|
},
|
17
18
|
"nodemonConfig": {
|
18
19
|
"watch": [
|
@@ -45,7 +46,7 @@
|
|
45
46
|
"libp2p-websockets": "^0.16.2",
|
46
47
|
"luxon": "^2.3.2",
|
47
48
|
"module-alias": "^2.2.2",
|
48
|
-
"sequelize": "
|
49
|
+
"sequelize": "6.18.0",
|
49
50
|
"sqlite3": "^5.0.5",
|
50
51
|
"waait": "^1.0.5"
|
51
52
|
},
|
@@ -59,6 +60,8 @@
|
|
59
60
|
"@types/fs-extra": "^9.0.13",
|
60
61
|
"@types/node": "^17.0.17",
|
61
62
|
"nodemon": "^2.0.15",
|
63
|
+
"patch-package": "^6.4.7",
|
64
|
+
"postinstall-postinstall": "^2.1.0",
|
62
65
|
"replace-in-file": "^6.3.2",
|
63
66
|
"rimraf": "^3.0.2",
|
64
67
|
"ts-node": "^10.5.0",
|
@@ -0,0 +1,13 @@
|
|
1
|
+
diff --git a/node_modules/@ethersproject/properties/lib/index.js b/node_modules/@ethersproject/properties/lib/index.js
|
2
|
+
index 41e0b52..4c7a9e3 100644
|
3
|
+
--- a/node_modules/@ethersproject/properties/lib/index.js
|
4
|
+
+++ b/node_modules/@ethersproject/properties/lib/index.js
|
5
|
+
@@ -44,7 +44,7 @@ function defineReadOnly(object, name, value) {
|
6
|
+
Object.defineProperty(object, name, {
|
7
|
+
enumerable: true,
|
8
|
+
value: value,
|
9
|
+
- writable: false,
|
10
|
+
+ writable: true,
|
11
|
+
});
|
12
|
+
}
|
13
|
+
exports.defineReadOnly = defineReadOnly;
|
@@ -3,23 +3,15 @@ export const addresses = {
|
|
3
3
|
gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
|
4
4
|
multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
|
5
5
|
interopXGateway: '',
|
6
|
-
interopBridgeTokens: [],
|
7
6
|
},
|
8
7
|
137: {
|
9
8
|
gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
|
10
9
|
multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
|
11
10
|
interopXGateway: '',
|
12
|
-
interopBridgeTokens: [
|
13
|
-
{
|
14
|
-
address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
|
15
|
-
symbol : 'USDC',
|
16
|
-
}
|
17
|
-
],
|
18
11
|
},
|
19
12
|
43114: {
|
20
13
|
gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
|
21
14
|
multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
|
22
15
|
interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
|
23
|
-
interopBridgeTokens: [],
|
24
16
|
}
|
25
17
|
}
|
package/src/constants/index.ts
CHANGED
@@ -9,10 +9,12 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
|
|
9
9
|
declare from: string;
|
10
10
|
declare to: string;
|
11
11
|
|
12
|
+
declare submitTransactionHash: string;
|
13
|
+
declare submitBlockNumber: number;
|
12
14
|
|
13
15
|
declare sourceChainId: number;
|
14
|
-
declare sourceTransactionHash: string
|
15
|
-
declare sourceBlockNumber: number
|
16
|
+
declare sourceTransactionHash: CreationOptional<string>;
|
17
|
+
declare sourceBlockNumber: CreationOptional<number>;
|
16
18
|
declare sourceStatus: string;
|
17
19
|
declare sourceErrors: CreationOptional<string[]>;
|
18
20
|
declare sourceCreatedAt: CreationOptional<Date>;
|
@@ -45,6 +47,8 @@ Transaction.init({
|
|
45
47
|
primaryKey: true
|
46
48
|
},
|
47
49
|
|
50
|
+
submitTransactionHash: DataTypes.NUMBER,
|
51
|
+
submitBlockNumber: DataTypes.NUMBER,
|
48
52
|
|
49
53
|
transactionHash: DataTypes.STRING,
|
50
54
|
action: DataTypes.STRING,
|
package/src/index.ts
CHANGED
@@ -19,6 +19,7 @@ moduleAlias();
|
|
19
19
|
import assert from "assert";
|
20
20
|
import dotenv from "dotenv";
|
21
21
|
import { ethers } from "ethers";
|
22
|
+
import packageJson from '../package.json'
|
22
23
|
dotenv.config();
|
23
24
|
|
24
25
|
import Logger from "@/logger";
|
@@ -41,6 +42,8 @@ try {
|
|
41
42
|
process.exit(1)
|
42
43
|
}
|
43
44
|
|
45
|
+
logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
|
46
|
+
|
44
47
|
import { Tasks } from "@/tasks";
|
45
48
|
import { startPeer } from "@/net";
|
46
49
|
import { startApiServer } from '@/api';
|
package/src/net/peer/index.ts
CHANGED
@@ -88,12 +88,13 @@ export const startPeer = async ({ }: IPeerOptions) => {
|
|
88
88
|
libp2p: node
|
89
89
|
})
|
90
90
|
|
91
|
-
node.on("peer:discovery", (peer) =>
|
92
|
-
logger.log(`Discovered peer ${peer}`)
|
93
|
-
); // peer disc.
|
94
|
-
|
95
|
-
|
96
|
-
|
91
|
+
node.on("peer:discovery", (peer) => {
|
92
|
+
// logger.log(`Discovered peer ${peer}`)
|
93
|
+
}); // peer disc.
|
94
|
+
|
95
|
+
node.connectionManager.on("peer:connect", (connection) => {
|
96
|
+
// logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
|
97
|
+
});
|
97
98
|
|
98
99
|
logger.log("Peer discovery started");
|
99
100
|
|
package/src/net/pool/index.ts
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
import { Event } from "@/types";
|
2
2
|
import config from "@/config";
|
3
|
+
import Logger from "@/logger";
|
4
|
+
|
5
|
+
|
6
|
+
const logger = new Logger('PeerPool')
|
3
7
|
|
4
8
|
export interface IPeerInfo {
|
5
9
|
id: string;
|
@@ -75,10 +79,15 @@ export class PeerPool {
|
|
75
79
|
* @emits {@link Event.POOL_PEER_ADDED}
|
76
80
|
*/
|
77
81
|
add(peer?: IPeerInfo) {
|
78
|
-
if (peer && peer.id
|
82
|
+
if (peer && peer.id) {
|
83
|
+
const newPeer = !this.pool.get(peer.id);
|
79
84
|
this.pool.set(peer.id, peer)
|
80
85
|
peer.pooled = true
|
81
|
-
|
86
|
+
|
87
|
+
if(newPeer) {
|
88
|
+
config.events.emit(Event.POOL_PEER_ADDED, peer)
|
89
|
+
logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
|
90
|
+
}
|
82
91
|
}
|
83
92
|
}
|
84
93
|
|
@@ -92,6 +101,7 @@ export class PeerPool {
|
|
92
101
|
if (this.pool.delete(peer.id)) {
|
93
102
|
peer.pooled = false
|
94
103
|
config.events.emit(Event.POOL_PEER_REMOVED, peer)
|
104
|
+
logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`)
|
95
105
|
}
|
96
106
|
}
|
97
107
|
}
|
@@ -114,14 +124,14 @@ export class PeerPool {
|
|
114
124
|
|
115
125
|
|
116
126
|
cleanup() {
|
117
|
-
let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
|
118
|
-
|
119
|
-
this.peers.forEach((peerInfo) => {
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
})
|
127
|
+
// let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
|
128
|
+
|
129
|
+
// this.peers.forEach((peerInfo) => {
|
130
|
+
// if (peerInfo.updated.getTime() < compDate) {
|
131
|
+
// console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
|
132
|
+
// this.remove(peerInfo)
|
133
|
+
// }
|
134
|
+
// })
|
125
135
|
}
|
126
136
|
}
|
127
137
|
|
@@ -2,9 +2,12 @@ import { BaseDialProtocol } from "./BaseDialProtocol";
|
|
2
2
|
import wait from "waait";
|
3
3
|
import config from "@/config";
|
4
4
|
import { Transaction } from "@/db";
|
5
|
+
import { buildDataForTransaction, signGnosisSafeTx } from "@/utils";
|
6
|
+
import { addresses } from "@/constants";
|
7
|
+
import { ChainId } from "@/types";
|
5
8
|
|
6
9
|
export interface ISignatureRequest {
|
7
|
-
type:
|
10
|
+
type: 'source' | 'target' ,
|
8
11
|
transactionHash: string
|
9
12
|
safeTxGas: string
|
10
13
|
safeNonce: string
|
@@ -24,19 +27,19 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
|
|
24
27
|
async response(data: ISignatureRequest): Promise<ISignatureResponse> {
|
25
28
|
const signer = config.wallet;
|
26
29
|
|
27
|
-
let
|
30
|
+
let transaction: Transaction | null;
|
28
31
|
let maxTimeout = 20000;
|
29
32
|
|
30
33
|
do {
|
31
|
-
|
34
|
+
transaction = await Transaction.findOne({ where: { transactionHash: data.transactionHash } })
|
32
35
|
|
33
|
-
if (!
|
36
|
+
if (!transaction) {
|
34
37
|
await wait(1000);
|
35
38
|
maxTimeout -= 1000;
|
36
39
|
}
|
37
|
-
} while (!
|
40
|
+
} while (!transaction && maxTimeout > 0)
|
38
41
|
|
39
|
-
if (!
|
42
|
+
if (!transaction) {
|
40
43
|
return {
|
41
44
|
signer: signer.address,
|
42
45
|
data: null,
|
@@ -44,16 +47,17 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
|
|
44
47
|
};
|
45
48
|
}
|
46
49
|
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
50
|
+
const signedData = await signGnosisSafeTx({
|
51
|
+
//TODO: chain id depends on event type
|
52
|
+
to: addresses[transaction.sourceChainId].multisend,
|
53
|
+
data: await buildDataForTransaction(transaction, data.type),
|
54
|
+
chainId: transaction.sourceChainId as ChainId,
|
55
|
+
safeTxGas: data.safeTxGas,
|
56
|
+
}, { signer });
|
53
57
|
|
54
58
|
return {
|
55
59
|
signer: signer.address,
|
56
|
-
data:
|
60
|
+
data: signedData
|
57
61
|
}
|
58
62
|
}
|
59
63
|
}
|
package/src/tasks/BaseTask.ts
CHANGED
@@ -37,7 +37,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
|
|
37
37
|
await this.pollHandler()
|
38
38
|
}
|
39
39
|
} catch (err) {
|
40
|
-
this.logger.error(`poll check error
|
40
|
+
this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`)
|
41
41
|
}
|
42
42
|
|
43
43
|
await this.postPollHandler()
|