@instadapp/interop-x 0.0.0-dev.f78418c → 0.0.0-dev.fd7fd6f
Sign up to get free protection for your applications and to get access to all the features.
- package/.env.example +2 -1
- 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 +5 -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 +2 -1
- package/dist/src/index.js +103 -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 +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/src/tasks/AutoUpdateTask.js +44 -0
- 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 +15 -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 -17
- package/patches/@ethersproject+properties+5.6.0.patch +13 -0
- package/src/api/index.ts +33 -0
- package/src/config/index.ts +8 -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/db/sequelize.ts +2 -1
- package/src/index.ts +79 -6
- 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/AutoUpdateTask.ts +53 -0
- 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 +22 -2
- package/src/utils/index.ts +182 -4
- package/dist/index.js +0 -43
- package/dist/utils/index.js +0 -101
@@ -0,0 +1,228 @@
|
|
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.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = 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
|
+
switch (transaction.action) {
|
108
|
+
case "deposit":
|
109
|
+
return await (0, exports.buildDepositDataForTransaction)(transaction, type);
|
110
|
+
case "withdraw":
|
111
|
+
return await (0, exports.buildWithdrawDataForTransaction)(transaction, type);
|
112
|
+
default:
|
113
|
+
throw new Error(`Unknown action: ${transaction.action}`);
|
114
|
+
}
|
115
|
+
};
|
116
|
+
exports.buildDataForTransaction = buildDataForTransaction;
|
117
|
+
const buildDepositDataForTransaction = async (transaction, type) => {
|
118
|
+
const transactions = [];
|
119
|
+
if (transaction.action !== 'deposit') {
|
120
|
+
throw new Error(`Invalid action: ${transaction.action}`);
|
121
|
+
}
|
122
|
+
if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
|
123
|
+
throw Error('Cannot build data for pending deposit transaction');
|
124
|
+
}
|
125
|
+
if (!transaction.submitEvent) {
|
126
|
+
throw Error('Cannot build data for transaction without submitEvent');
|
127
|
+
}
|
128
|
+
const token = constants_1.tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
|
129
|
+
if (!token) {
|
130
|
+
throw Error('Cannot build data for transaction without token');
|
131
|
+
}
|
132
|
+
const itoken = constants_1.itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
|
133
|
+
if (!itoken) {
|
134
|
+
throw Error('Cannot build data for transaction without itoken');
|
135
|
+
}
|
136
|
+
const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
|
137
|
+
const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
|
138
|
+
const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
|
139
|
+
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.submitTransactionHash);
|
140
|
+
transactions.push({
|
141
|
+
to: itoken.address,
|
142
|
+
data: data,
|
143
|
+
value: '0',
|
144
|
+
operation: ethers_multisend_1.OperationType.Call,
|
145
|
+
});
|
146
|
+
return (0, ethers_multisend_1.encodeMulti)(transactions).data;
|
147
|
+
};
|
148
|
+
exports.buildDepositDataForTransaction = buildDepositDataForTransaction;
|
149
|
+
const buildWithdrawDataForTransaction = async (transaction, type) => {
|
150
|
+
const transactions = [];
|
151
|
+
if (transaction.action !== 'withdraw') {
|
152
|
+
throw new Error(`Invalid action: ${transaction.action}`);
|
153
|
+
}
|
154
|
+
if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
|
155
|
+
throw Error('Cannot build data for pending withdraw transaction');
|
156
|
+
}
|
157
|
+
if (!transaction.submitEvent) {
|
158
|
+
throw Error('Cannot build data for transaction without submitEvent');
|
159
|
+
}
|
160
|
+
const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
|
161
|
+
const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
|
162
|
+
if (!itoken) {
|
163
|
+
throw Error('Cannot build data for transaction without itoken');
|
164
|
+
}
|
165
|
+
const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
|
166
|
+
if (!token) {
|
167
|
+
throw Error('Cannot build data for transaction without token');
|
168
|
+
}
|
169
|
+
const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
|
170
|
+
const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
|
171
|
+
const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
|
172
|
+
const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
|
173
|
+
const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.sourceChainId.toString()), transaction.submitTransactionHash);
|
174
|
+
transactions.push({
|
175
|
+
to: gatewayAddress,
|
176
|
+
data: data,
|
177
|
+
value: '0',
|
178
|
+
operation: ethers_multisend_1.OperationType.Call,
|
179
|
+
});
|
180
|
+
return (0, ethers_multisend_1.encodeMulti)(transactions).data;
|
181
|
+
};
|
182
|
+
exports.buildWithdrawDataForTransaction = buildWithdrawDataForTransaction;
|
183
|
+
function getContract(address, contractInterface, signerOrProvider) {
|
184
|
+
if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
|
185
|
+
throw Error(`Invalid 'address' parameter '${address}'.`);
|
186
|
+
}
|
187
|
+
const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
|
188
|
+
// Make sure the contract properties is writable
|
189
|
+
const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
|
190
|
+
if (!desc || desc.writable !== true) {
|
191
|
+
return contract;
|
192
|
+
}
|
193
|
+
return new Proxy(contract, {
|
194
|
+
get(target, prop, receiver) {
|
195
|
+
const value = Reflect.get(target, prop, receiver);
|
196
|
+
if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
|
197
|
+
return async (...args) => {
|
198
|
+
try {
|
199
|
+
return await value.bind(contract)(...args);
|
200
|
+
}
|
201
|
+
catch (error) {
|
202
|
+
throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
|
203
|
+
}
|
204
|
+
};
|
205
|
+
}
|
206
|
+
if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
|
207
|
+
const parentProp = String(prop);
|
208
|
+
return new Proxy(value, {
|
209
|
+
get(target, prop, receiver) {
|
210
|
+
const value = Reflect.get(target, prop, receiver);
|
211
|
+
if (typeof value === 'function') {
|
212
|
+
return async (...args) => {
|
213
|
+
try {
|
214
|
+
return await value.bind(contract)(...args);
|
215
|
+
}
|
216
|
+
catch (error) {
|
217
|
+
throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
|
218
|
+
}
|
219
|
+
};
|
220
|
+
}
|
221
|
+
}
|
222
|
+
});
|
223
|
+
}
|
224
|
+
return value;
|
225
|
+
},
|
226
|
+
});
|
227
|
+
}
|
228
|
+
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.fd7fd6f",
|
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": [
|
@@ -32,6 +33,8 @@
|
|
32
33
|
"ethers": "^5.6.4",
|
33
34
|
"ethers-multisend": "^2.1.1",
|
34
35
|
"expand-home-dir": "^0.0.3",
|
36
|
+
"fastify": "^3.28.0",
|
37
|
+
"fastify-cors": "^6.0.3",
|
35
38
|
"libp2p": "^0.36.2",
|
36
39
|
"libp2p-bootstrap": "^0.14.0",
|
37
40
|
"libp2p-kad-dht": "^0.28.6",
|
@@ -43,12 +46,15 @@
|
|
43
46
|
"libp2p-websockets": "^0.16.2",
|
44
47
|
"luxon": "^2.3.2",
|
45
48
|
"module-alias": "^2.2.2",
|
46
|
-
"
|
49
|
+
"patch-package": "^6.4.7",
|
50
|
+
"postinstall-postinstall": "^2.1.0",
|
51
|
+
"sequelize": "6.18.0",
|
47
52
|
"sqlite3": "^5.0.5",
|
48
53
|
"waait": "^1.0.5"
|
49
54
|
},
|
50
55
|
"bin": {
|
51
|
-
"interop-
|
56
|
+
"interop-x": "bin/interop-x",
|
57
|
+
"interopx": "bin/interop-x"
|
52
58
|
},
|
53
59
|
"devDependencies": {
|
54
60
|
"@typechain/ethers-v5": "^10.0.0",
|
@@ -62,18 +68,5 @@
|
|
62
68
|
"tsconfig-paths": "^3.12.0",
|
63
69
|
"typechain": "^8.0.0",
|
64
70
|
"typescript": "^4.5.5"
|
65
|
-
},
|
66
|
-
"_moduleAliases": {
|
67
|
-
"@/": "./dist",
|
68
|
-
"@/logger": "./dist/logger",
|
69
|
-
"@/tasks": "./dist/tasks",
|
70
|
-
"@/utils": "./dist/utils",
|
71
|
-
"@/net": "./dist/net",
|
72
|
-
"@/db": "./dist/db",
|
73
|
-
"@/config": "./dist/config",
|
74
|
-
"@/types": "./dist/types",
|
75
|
-
"@/abi": "./dist/abi",
|
76
|
-
"@/constants": "./dist/constants",
|
77
|
-
"@/typechain": "./dist/typechain"
|
78
71
|
}
|
79
72
|
}
|
@@ -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;
|
package/src/api/index.ts
ADDED
@@ -0,0 +1,33 @@
|
|
1
|
+
import fastify from "fastify"
|
2
|
+
import cors from 'fastify-cors'
|
3
|
+
import Logger from "@/logger"
|
4
|
+
import { Transaction } from "@/db";
|
5
|
+
|
6
|
+
const logger = new Logger("RPC");
|
7
|
+
|
8
|
+
|
9
|
+
const server = fastify({ logger: false })
|
10
|
+
|
11
|
+
server.register(cors, {})
|
12
|
+
|
13
|
+
server.get('/', async () => 'Interop X API')
|
14
|
+
|
15
|
+
export 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 Transaction.findAndCountAll({
|
21
|
+
limit: 20,
|
22
|
+
offset: 0,
|
23
|
+
})
|
24
|
+
})
|
25
|
+
|
26
|
+
await server.listen(PORT, HOST)
|
27
|
+
|
28
|
+
logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
|
29
|
+
} catch (err) {
|
30
|
+
logger.error(err)
|
31
|
+
process.exit(1)
|
32
|
+
}
|
33
|
+
}
|
package/src/config/index.ts
CHANGED
@@ -7,15 +7,23 @@ class Config {
|
|
7
7
|
public readonly leadNodeAddress: string
|
8
8
|
public readonly privateKey: string
|
9
9
|
public readonly wallet: Wallet
|
10
|
+
public readonly staging: boolean
|
11
|
+
public readonly autoUpdate: boolean
|
10
12
|
|
11
13
|
constructor() {
|
12
14
|
this.events = new EventBus() as EventBusType
|
13
15
|
this.maxPeers = 10
|
14
16
|
this.privateKey = process.env.PRIVATE_KEY as string;
|
17
|
+
this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
|
18
|
+
this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
|
15
19
|
this.wallet = new Wallet(this.privateKey);
|
16
20
|
this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
|
17
21
|
}
|
18
22
|
|
23
|
+
get publicAddress(){
|
24
|
+
return this.wallet.address
|
25
|
+
}
|
26
|
+
|
19
27
|
isLeadNode() {
|
20
28
|
return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
|
21
29
|
}
|
@@ -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
@@ -5,14 +5,16 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
|
|
5
5
|
declare id: CreationOptional<number>;
|
6
6
|
|
7
7
|
declare transactionHash: string;
|
8
|
-
declare
|
8
|
+
declare action: string;
|
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,9 +47,11 @@ 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,
|
51
55
|
|
52
56
|
from: DataTypes.STRING,
|
53
57
|
to: DataTypes.STRING,
|
package/src/db/sequelize.ts
CHANGED
@@ -1,9 +1,10 @@
|
|
1
1
|
//@ts-ignore
|
2
|
+
import config from "@/config";
|
2
3
|
import expandHomeDir from "expand-home-dir";
|
3
4
|
|
4
5
|
import { Sequelize } from 'sequelize';
|
5
6
|
|
6
|
-
const basePath = expandHomeDir(
|
7
|
+
const basePath = expandHomeDir(`~/.interop-x/data/${config.publicAddress}/${config.staging ? 'staging' : ''}`);
|
7
8
|
|
8
9
|
export const sequelize = new Sequelize({
|
9
10
|
dialect: 'sqlite',
|
package/src/index.ts
CHANGED
@@ -1,24 +1,69 @@
|
|
1
|
-
import 'module-alias
|
2
|
-
|
1
|
+
import moduleAlias from 'module-alias';
|
2
|
+
|
3
|
+
moduleAlias.addAliases({
|
4
|
+
"@/": __dirname + "/",
|
5
|
+
"@/logger": __dirname + "/logger",
|
6
|
+
"@/tasks": __dirname + "/tasks",
|
7
|
+
"@/utils": __dirname + "/utils",
|
8
|
+
"@/api": __dirname + "/api",
|
9
|
+
"@/net": __dirname + "/net",
|
10
|
+
"@/db": __dirname + "/db",
|
11
|
+
"@/config": __dirname + "/config",
|
12
|
+
"@/types": __dirname + "/types",
|
13
|
+
"@/abi": __dirname + "/abi",
|
14
|
+
"@/constants": __dirname + "/constants",
|
15
|
+
"@/typechain": __dirname + "/typechain"
|
16
|
+
})
|
17
|
+
|
18
|
+
moduleAlias();
|
3
19
|
import dotenv from "dotenv";
|
20
|
+
import chalk from 'chalk';
|
4
21
|
import { ethers } from "ethers";
|
22
|
+
import packageJson from '../package.json'
|
5
23
|
dotenv.config();
|
6
24
|
|
7
25
|
import Logger from "@/logger";
|
8
26
|
const logger = new Logger('Process')
|
9
27
|
|
10
|
-
|
28
|
+
const printUsage = () => {
|
29
|
+
console.log('Usage:')
|
30
|
+
console.log(' PRIVATE_KEY=abcd1234 interop-x')
|
31
|
+
console.log(' PRIVATE_KEY=abcd1234 STAGING=true interop-x')
|
32
|
+
console.log(' PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x')
|
33
|
+
console.log(' PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x')
|
34
|
+
}
|
35
|
+
|
36
|
+
if (process.argv.at(-1) === 'help') {
|
37
|
+
printUsage()
|
38
|
+
process.exit(0)
|
39
|
+
}
|
40
|
+
|
41
|
+
const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
|
42
|
+
|
43
|
+
if (process.argv.at(-1) === 'version') {
|
44
|
+
console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
|
45
|
+
process.exit(0)
|
46
|
+
}
|
11
47
|
|
48
|
+
if(! process.env.PRIVATE_KEY) {
|
49
|
+
console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
|
50
|
+
printUsage()
|
51
|
+
process.exit(1)
|
52
|
+
}
|
12
53
|
try {
|
13
54
|
new ethers.Wallet(process.env.PRIVATE_KEY!)
|
14
55
|
} catch (e) {
|
15
|
-
|
56
|
+
console.error(chalk.bgRed.white('Invalid private key\n'))
|
57
|
+
printUsage()
|
16
58
|
process.exit(1)
|
17
59
|
}
|
18
60
|
|
19
|
-
|
20
|
-
import { startPeer } from "@/net";
|
61
|
+
logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
|
21
62
|
|
63
|
+
import { Tasks } from "@/tasks";
|
64
|
+
import { startPeer, protocol, peerPool } from "@/net";
|
65
|
+
import { startApiServer } from '@/api';
|
66
|
+
import { Transaction } from './db';
|
22
67
|
|
23
68
|
async function main() {
|
24
69
|
|
@@ -27,6 +72,34 @@ async function main() {
|
|
27
72
|
const tasks = new Tasks()
|
28
73
|
|
29
74
|
tasks.start();
|
75
|
+
|
76
|
+
startApiServer()
|
77
|
+
|
78
|
+
protocol.on('TransactionStatus', async (payload) => {
|
79
|
+
if (!peerPool.isLeadNode(payload.peerId)) {
|
80
|
+
const peer = peerPool.getPeer(payload.peerId)
|
81
|
+
logger.info(`ignored transaction status from ${payload.peerId} ${peer?.publicAddress} `)
|
82
|
+
return;
|
83
|
+
}
|
84
|
+
|
85
|
+
const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
|
86
|
+
|
87
|
+
if (!transaction) {
|
88
|
+
return;
|
89
|
+
}
|
90
|
+
|
91
|
+
transaction.sourceStatus = payload.data.sourceStatus
|
92
|
+
transaction.sourceTransactionHash = payload.data.sourceTransactionHash
|
93
|
+
transaction.sourceErrors = payload.data.sourceErrors
|
94
|
+
|
95
|
+
transaction.targetStatus = payload.data.targetStatus
|
96
|
+
transaction.targetTransactionHash = payload.data.targetTransactionHash
|
97
|
+
transaction.targetErrors = payload.data.targetErrors
|
98
|
+
|
99
|
+
transaction.status = payload.data.status
|
100
|
+
|
101
|
+
await transaction.save()
|
102
|
+
})
|
30
103
|
}
|
31
104
|
|
32
105
|
main()
|
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,10 @@
|
|
1
1
|
import { Event } from "@/types";
|
2
2
|
import config from "@/config";
|
3
|
+
import Logger from "@/logger";
|
4
|
+
import { getAddress } from "ethers/lib/utils";
|
5
|
+
|
6
|
+
|
7
|
+
const logger = new Logger('PeerPool')
|
3
8
|
|
4
9
|
export interface IPeerInfo {
|
5
10
|
id: string;
|
@@ -75,10 +80,15 @@ export class PeerPool {
|
|
75
80
|
* @emits {@link Event.POOL_PEER_ADDED}
|
76
81
|
*/
|
77
82
|
add(peer?: IPeerInfo) {
|
78
|
-
if (peer && peer.id
|
83
|
+
if (peer && peer.id) {
|
84
|
+
const newPeer = !this.pool.get(peer.id);
|
79
85
|
this.pool.set(peer.id, peer)
|
80
86
|
peer.pooled = true
|
81
|
-
|
87
|
+
|
88
|
+
if (newPeer) {
|
89
|
+
config.events.emit(Event.POOL_PEER_ADDED, peer)
|
90
|
+
logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
|
91
|
+
}
|
82
92
|
}
|
83
93
|
}
|
84
94
|
|
@@ -92,6 +102,7 @@ export class PeerPool {
|
|
92
102
|
if (this.pool.delete(peer.id)) {
|
93
103
|
peer.pooled = false
|
94
104
|
config.events.emit(Event.POOL_PEER_REMOVED, peer)
|
105
|
+
logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`)
|
95
106
|
}
|
96
107
|
}
|
97
108
|
}
|
@@ -100,7 +111,7 @@ export class PeerPool {
|
|
100
111
|
this.cleanup()
|
101
112
|
|
102
113
|
return this.peers.filter((p) => {
|
103
|
-
if(!p.pooled) return false;
|
114
|
+
if (!p.pooled) return false;
|
104
115
|
|
105
116
|
const now = new Date()
|
106
117
|
|
@@ -113,15 +124,30 @@ export class PeerPool {
|
|
113
124
|
}
|
114
125
|
|
115
126
|
|
116
|
-
|
117
|
-
|
127
|
+
getPeer(id: string){
|
128
|
+
return this.pool.get(id);
|
129
|
+
}
|
118
130
|
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
}
|
131
|
+
isLeadNode(id: string) {
|
132
|
+
const peer = this.pool.get(id);
|
133
|
+
|
134
|
+
if (!peer) {
|
135
|
+
return false;
|
136
|
+
}
|
137
|
+
|
138
|
+
return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
|
139
|
+
}
|
140
|
+
|
141
|
+
|
142
|
+
cleanup() {
|
143
|
+
// let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
|
144
|
+
|
145
|
+
// this.peers.forEach((peerInfo) => {
|
146
|
+
// if (peerInfo.updated.getTime() < compDate) {
|
147
|
+
// console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
|
148
|
+
// this.remove(peerInfo)
|
149
|
+
// }
|
150
|
+
// })
|
125
151
|
}
|
126
152
|
}
|
127
153
|
|