@instadapp/interop-x 0.0.0-dev.dc4f10a → 0.0.0-dev.de23e71
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/alias.js +10 -0
- 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/db/models/transaction.js +8 -0
- package/dist/src/gnosis/actions/deposit.js +48 -0
- package/dist/src/gnosis/actions/index.js +11 -0
- package/dist/src/gnosis/actions/withdraw.js +50 -0
- package/dist/src/gnosis/index.js +20 -0
- package/dist/src/index.js +72 -23
- 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 +3 -8
- package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
- package/dist/src/net/protocol/index.js +51 -1
- package/dist/src/tasks/AutoUpdateTask.js +70 -0
- package/dist/src/tasks/BaseTask.js +11 -3
- package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +19 -4
- package/dist/src/tasks/InteropBridge/{SyncWithdrawEvents.js → SyncBurnEvents.js} +10 -9
- package/dist/src/tasks/InteropBridge/SyncMintEvents.js +67 -0
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +19 -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 +55 -0
- package/dist/src/tasks/index.js +19 -4
- 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 -85
- package/package.json +6 -5
- package/src/abi/interopBridgeToken.json +21 -9
- package/src/abi/interopXGateway.json +11 -11
- package/src/alias.ts +6 -0
- 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/db/models/transaction.ts +10 -0
- package/src/gnosis/actions/deposit.ts +63 -0
- package/src/gnosis/actions/index.ts +7 -0
- package/src/gnosis/actions/withdraw.ts +67 -0
- package/src/gnosis/index.ts +19 -0
- package/src/index.ts +93 -25
- package/src/net/peer/index.ts +2 -1
- package/src/net/pool/index.ts +25 -5
- package/src/net/protocol/dial/SignatureDialProtocol.ts +5 -11
- package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
- package/src/net/protocol/index.ts +67 -1
- package/src/tasks/AutoUpdateTask.ts +82 -0
- package/src/tasks/BaseTask.ts +13 -3
- package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +26 -18
- package/src/tasks/InteropBridge/{SyncWithdrawEvents.ts → SyncBurnEvents.ts} +13 -15
- package/src/tasks/InteropBridge/SyncMintEvents.ts +99 -0
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +26 -7
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +2 -4
- package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts +105 -0
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +67 -0
- package/src/tasks/index.ts +28 -4
- 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 -125
- package/tsconfig.json +7 -2
@@ -57,11 +57,17 @@ const _abi = [
|
|
57
57
|
name: "amount",
|
58
58
|
type: "uint256",
|
59
59
|
},
|
60
|
+
{
|
61
|
+
indexed: false,
|
62
|
+
internalType: "uint32",
|
63
|
+
name: "sourceChainId",
|
64
|
+
type: "uint32",
|
65
|
+
},
|
60
66
|
{
|
61
67
|
indexed: true,
|
62
|
-
internalType: "
|
63
|
-
name: "
|
64
|
-
type: "
|
68
|
+
internalType: "uint32",
|
69
|
+
name: "targetChainId",
|
70
|
+
type: "uint32",
|
65
71
|
},
|
66
72
|
],
|
67
73
|
name: "Burn",
|
@@ -84,14 +90,20 @@ const _abi = [
|
|
84
90
|
},
|
85
91
|
{
|
86
92
|
indexed: true,
|
87
|
-
internalType: "
|
88
|
-
name: "
|
89
|
-
type: "
|
93
|
+
internalType: "uint32",
|
94
|
+
name: "sourceChainId",
|
95
|
+
type: "uint32",
|
96
|
+
},
|
97
|
+
{
|
98
|
+
indexed: false,
|
99
|
+
internalType: "uint32",
|
100
|
+
name: "targetChainId",
|
101
|
+
type: "uint32",
|
90
102
|
},
|
91
103
|
{
|
92
104
|
indexed: true,
|
93
105
|
internalType: "bytes32",
|
94
|
-
name: "
|
106
|
+
name: "submitTransactionHash",
|
95
107
|
type: "bytes32",
|
96
108
|
},
|
97
109
|
],
|
@@ -222,9 +234,9 @@ const _abi = [
|
|
222
234
|
type: "uint256",
|
223
235
|
},
|
224
236
|
{
|
225
|
-
internalType: "
|
237
|
+
internalType: "uint32",
|
226
238
|
name: "chainId",
|
227
|
-
type: "
|
239
|
+
type: "uint32",
|
228
240
|
},
|
229
241
|
],
|
230
242
|
name: "burn",
|
@@ -306,9 +318,9 @@ const _abi = [
|
|
306
318
|
type: "uint256",
|
307
319
|
},
|
308
320
|
{
|
309
|
-
internalType: "
|
321
|
+
internalType: "uint32",
|
310
322
|
name: "chainId",
|
311
|
-
type: "
|
323
|
+
type: "uint32",
|
312
324
|
},
|
313
325
|
{
|
314
326
|
internalType: "bytes32",
|
@@ -46,15 +46,15 @@ const _abi = [
|
|
46
46
|
},
|
47
47
|
{
|
48
48
|
indexed: false,
|
49
|
-
internalType: "
|
49
|
+
internalType: "uint32",
|
50
50
|
name: "sourceChainId",
|
51
|
-
type: "
|
51
|
+
type: "uint32",
|
52
52
|
},
|
53
53
|
{
|
54
54
|
indexed: true,
|
55
|
-
internalType: "
|
55
|
+
internalType: "uint32",
|
56
56
|
name: "targetChainId",
|
57
|
-
type: "
|
57
|
+
type: "uint32",
|
58
58
|
},
|
59
59
|
],
|
60
60
|
name: "LogGatewayDeposit",
|
@@ -83,15 +83,15 @@ const _abi = [
|
|
83
83
|
},
|
84
84
|
{
|
85
85
|
indexed: true,
|
86
|
-
internalType: "
|
86
|
+
internalType: "uint32",
|
87
87
|
name: "sourceChainId",
|
88
|
-
type: "
|
88
|
+
type: "uint32",
|
89
89
|
},
|
90
90
|
{
|
91
91
|
indexed: false,
|
92
|
-
internalType: "
|
92
|
+
internalType: "uint32",
|
93
93
|
name: "targetChainId",
|
94
|
-
type: "
|
94
|
+
type: "uint32",
|
95
95
|
},
|
96
96
|
{
|
97
97
|
indexed: true,
|
@@ -148,9 +148,9 @@ const _abi = [
|
|
148
148
|
type: "uint256",
|
149
149
|
},
|
150
150
|
{
|
151
|
-
internalType: "
|
151
|
+
internalType: "uint32",
|
152
152
|
name: "chainId_",
|
153
|
-
type: "
|
153
|
+
type: "uint32",
|
154
154
|
},
|
155
155
|
],
|
156
156
|
name: "deposit",
|
@@ -176,9 +176,9 @@ const _abi = [
|
|
176
176
|
type: "uint256",
|
177
177
|
},
|
178
178
|
{
|
179
|
-
internalType: "
|
179
|
+
internalType: "uint32",
|
180
180
|
name: "chainId_",
|
181
|
-
type: "
|
181
|
+
type: "uint32",
|
182
182
|
},
|
183
183
|
],
|
184
184
|
name: "depositFor",
|
@@ -224,9 +224,9 @@ const _abi = [
|
|
224
224
|
type: "address",
|
225
225
|
},
|
226
226
|
{
|
227
|
-
internalType: "
|
227
|
+
internalType: "uint32",
|
228
228
|
name: "chainId_",
|
229
|
-
type: "
|
229
|
+
type: "uint32",
|
230
230
|
},
|
231
231
|
{
|
232
232
|
internalType: "bytes32",
|
package/dist/src/utils/index.js
CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.getContract = exports.
|
6
|
+
exports.getContract = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
|
7
7
|
/**
|
8
8
|
* @module util
|
9
9
|
*/
|
@@ -11,11 +11,18 @@ const axios_1 = __importDefault(require("axios"));
|
|
11
11
|
const axios_retry_1 = __importDefault(require("axios-retry"));
|
12
12
|
const constants_1 = require("@/constants");
|
13
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
14
|
exports.http = axios_1.default.create();
|
18
15
|
(0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
|
16
|
+
function shortenHash(hash, length = 4) {
|
17
|
+
if (!hash)
|
18
|
+
return;
|
19
|
+
if (hash.length < 12)
|
20
|
+
return hash;
|
21
|
+
const beginningChars = hash.startsWith("0x") ? length + 2 : length;
|
22
|
+
const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
|
23
|
+
return shortened;
|
24
|
+
}
|
25
|
+
exports.shortenHash = shortenHash;
|
19
26
|
function short(buffer) {
|
20
27
|
return buffer.toString('hex').slice(0, 8) + '...';
|
21
28
|
}
|
@@ -59,11 +66,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
|
|
59
66
|
const getRpcProviderUrl = (chainId) => {
|
60
67
|
switch (chainId) {
|
61
68
|
case 1:
|
62
|
-
return 'https://rpc.
|
69
|
+
return 'https://rpc.ankr.com/eth';
|
63
70
|
case 137:
|
64
|
-
return 'https://rpc.
|
71
|
+
return 'https://rpc.ankr.com/polygon';
|
65
72
|
case 43114:
|
66
|
-
return 'https://rpc.
|
73
|
+
return 'https://rpc.ankr.com/avalanche';
|
67
74
|
default:
|
68
75
|
throw new Error(`Unknown chainId: ${chainId}`);
|
69
76
|
}
|
@@ -102,89 +109,16 @@ const generateInteropTransactionHash = (data) => {
|
|
102
109
|
]);
|
103
110
|
};
|
104
111
|
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, 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.submitEvent.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
112
|
function getContract(address, contractInterface, signerOrProvider) {
|
184
113
|
if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
|
185
114
|
throw Error(`Invalid 'address' parameter '${address}'.`);
|
186
115
|
}
|
187
116
|
const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
|
117
|
+
// Make sure the contract properties is writable
|
118
|
+
const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
|
119
|
+
if (!desc || desc.writable !== true) {
|
120
|
+
return contract;
|
121
|
+
}
|
188
122
|
return new Proxy(contract, {
|
189
123
|
get(target, prop, receiver) {
|
190
124
|
const value = Reflect.get(target, prop, receiver);
|
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.de23e71",
|
4
4
|
"license": "MIT",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"engines": {
|
@@ -24,9 +24,10 @@
|
|
24
24
|
},
|
25
25
|
"dependencies": {
|
26
26
|
"@achingbrain/libp2p-gossipsub": "^0.12.2",
|
27
|
+
"@fastify/cors": "^7.0.0",
|
28
|
+
"await-spawn": "^4.0.2",
|
27
29
|
"axios": "^0.27.1",
|
28
30
|
"axios-retry": "^3.2.4",
|
29
|
-
"bignumber.js": "^9.0.2",
|
30
31
|
"chalk": "4.1.2",
|
31
32
|
"dotenv": "^16.0.0",
|
32
33
|
"ethereumjs-util": "^7.1.4",
|
@@ -34,7 +35,7 @@
|
|
34
35
|
"ethers-multisend": "^2.1.1",
|
35
36
|
"expand-home-dir": "^0.0.3",
|
36
37
|
"fastify": "^3.28.0",
|
37
|
-
"
|
38
|
+
"fs-extra": "^10.1.0",
|
38
39
|
"libp2p": "^0.36.2",
|
39
40
|
"libp2p-bootstrap": "^0.14.0",
|
40
41
|
"libp2p-kad-dht": "^0.28.6",
|
@@ -46,6 +47,8 @@
|
|
46
47
|
"libp2p-websockets": "^0.16.2",
|
47
48
|
"luxon": "^2.3.2",
|
48
49
|
"module-alias": "^2.2.2",
|
50
|
+
"patch-package": "^6.4.7",
|
51
|
+
"postinstall-postinstall": "^2.1.0",
|
49
52
|
"sequelize": "6.18.0",
|
50
53
|
"sqlite3": "^5.0.5",
|
51
54
|
"waait": "^1.0.5"
|
@@ -60,8 +63,6 @@
|
|
60
63
|
"@types/fs-extra": "^9.0.13",
|
61
64
|
"@types/node": "^17.0.17",
|
62
65
|
"nodemon": "^2.0.15",
|
63
|
-
"patch-package": "^6.4.7",
|
64
|
-
"postinstall-postinstall": "^2.1.0",
|
65
66
|
"replace-in-file": "^6.3.2",
|
66
67
|
"rimraf": "^3.0.2",
|
67
68
|
"ts-node": "^10.5.0",
|
@@ -46,11 +46,17 @@
|
|
46
46
|
"name": "amount",
|
47
47
|
"type": "uint256"
|
48
48
|
},
|
49
|
+
{
|
50
|
+
"indexed": false,
|
51
|
+
"internalType": "uint32",
|
52
|
+
"name": "sourceChainId",
|
53
|
+
"type": "uint32"
|
54
|
+
},
|
49
55
|
{
|
50
56
|
"indexed": true,
|
51
|
-
"internalType": "
|
52
|
-
"name": "
|
53
|
-
"type": "
|
57
|
+
"internalType": "uint32",
|
58
|
+
"name": "targetChainId",
|
59
|
+
"type": "uint32"
|
54
60
|
}
|
55
61
|
],
|
56
62
|
"name": "Burn",
|
@@ -73,14 +79,20 @@
|
|
73
79
|
},
|
74
80
|
{
|
75
81
|
"indexed": true,
|
76
|
-
"internalType": "
|
77
|
-
"name": "
|
78
|
-
"type": "
|
82
|
+
"internalType": "uint32",
|
83
|
+
"name": "sourceChainId",
|
84
|
+
"type": "uint32"
|
85
|
+
},
|
86
|
+
{
|
87
|
+
"indexed": false,
|
88
|
+
"internalType": "uint32",
|
89
|
+
"name": "targetChainId",
|
90
|
+
"type": "uint32"
|
79
91
|
},
|
80
92
|
{
|
81
93
|
"indexed": true,
|
82
94
|
"internalType": "bytes32",
|
83
|
-
"name": "
|
95
|
+
"name": "submitTransactionHash",
|
84
96
|
"type": "bytes32"
|
85
97
|
}
|
86
98
|
],
|
@@ -164,7 +176,7 @@
|
|
164
176
|
"inputs": [
|
165
177
|
{ "internalType": "address", "name": "to", "type": "address" },
|
166
178
|
{ "internalType": "uint256", "name": "amount", "type": "uint256" },
|
167
|
-
{ "internalType": "
|
179
|
+
{ "internalType": "uint32", "name": "chainId", "type": "uint32" }
|
168
180
|
],
|
169
181
|
"name": "burn",
|
170
182
|
"outputs": [],
|
@@ -206,7 +218,7 @@
|
|
206
218
|
"inputs": [
|
207
219
|
{ "internalType": "address", "name": "to", "type": "address" },
|
208
220
|
{ "internalType": "uint256", "name": "amount", "type": "uint256" },
|
209
|
-
{ "internalType": "
|
221
|
+
{ "internalType": "uint32", "name": "chainId", "type": "uint32" },
|
210
222
|
{
|
211
223
|
"internalType": "bytes32",
|
212
224
|
"name": "transactionHash",
|
@@ -35,15 +35,15 @@
|
|
35
35
|
},
|
36
36
|
{
|
37
37
|
"indexed": false,
|
38
|
-
"internalType": "
|
38
|
+
"internalType": "uint32",
|
39
39
|
"name": "sourceChainId",
|
40
|
-
"type": "
|
40
|
+
"type": "uint32"
|
41
41
|
},
|
42
42
|
{
|
43
43
|
"indexed": true,
|
44
|
-
"internalType": "
|
44
|
+
"internalType": "uint32",
|
45
45
|
"name": "targetChainId",
|
46
|
-
"type": "
|
46
|
+
"type": "uint32"
|
47
47
|
}
|
48
48
|
],
|
49
49
|
"name": "LogGatewayDeposit",
|
@@ -72,15 +72,15 @@
|
|
72
72
|
},
|
73
73
|
{
|
74
74
|
"indexed": true,
|
75
|
-
"internalType": "
|
75
|
+
"internalType": "uint32",
|
76
76
|
"name": "sourceChainId",
|
77
|
-
"type": "
|
77
|
+
"type": "uint32"
|
78
78
|
},
|
79
79
|
{
|
80
80
|
"indexed": false,
|
81
|
-
"internalType": "
|
81
|
+
"internalType": "uint32",
|
82
82
|
"name": "targetChainId",
|
83
|
-
"type": "
|
83
|
+
"type": "uint32"
|
84
84
|
},
|
85
85
|
{
|
86
86
|
"indexed": true,
|
@@ -122,7 +122,7 @@
|
|
122
122
|
"inputs": [
|
123
123
|
{ "internalType": "address", "name": "token_", "type": "address" },
|
124
124
|
{ "internalType": "uint256", "name": "amount_", "type": "uint256" },
|
125
|
-
{ "internalType": "
|
125
|
+
{ "internalType": "uint32", "name": "chainId_", "type": "uint32" }
|
126
126
|
],
|
127
127
|
"name": "deposit",
|
128
128
|
"outputs": [],
|
@@ -134,7 +134,7 @@
|
|
134
134
|
{ "internalType": "address", "name": "to_", "type": "address" },
|
135
135
|
{ "internalType": "address", "name": "token_", "type": "address" },
|
136
136
|
{ "internalType": "uint256", "name": "amount_", "type": "uint256" },
|
137
|
-
{ "internalType": "
|
137
|
+
{ "internalType": "uint32", "name": "chainId_", "type": "uint32" }
|
138
138
|
],
|
139
139
|
"name": "depositFor",
|
140
140
|
"outputs": [],
|
@@ -160,7 +160,7 @@
|
|
160
160
|
{ "internalType": "uint256", "name": "amount_", "type": "uint256" },
|
161
161
|
{ "internalType": "address", "name": "user_", "type": "address" },
|
162
162
|
{ "internalType": "address", "name": "token_", "type": "address" },
|
163
|
-
{ "internalType": "
|
163
|
+
{ "internalType": "uint32", "name": "chainId_", "type": "uint32" },
|
164
164
|
{
|
165
165
|
"internalType": "bytes32",
|
166
166
|
"name": "transactionHash_",
|
package/src/alias.ts
ADDED
package/src/api/index.ts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import fastify from "fastify"
|
2
|
-
import cors from 'fastify
|
2
|
+
import cors from '@fastify/cors'
|
3
3
|
import Logger from "@/logger"
|
4
4
|
import { Transaction } from "@/db";
|
5
5
|
|
@@ -20,6 +20,9 @@ export const startApiServer = async () => {
|
|
20
20
|
return await Transaction.findAndCountAll({
|
21
21
|
limit: 20,
|
22
22
|
offset: 0,
|
23
|
+
order: [
|
24
|
+
['createdAt', 'DESC']
|
25
|
+
]
|
23
26
|
})
|
24
27
|
})
|
25
28
|
|
@@ -27,7 +30,7 @@ export const startApiServer = async () => {
|
|
27
30
|
|
28
31
|
logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
|
29
32
|
} catch (err) {
|
30
|
-
logger.error(err)
|
33
|
+
logger.error(err.message)
|
31
34
|
process.exit(1)
|
32
35
|
}
|
33
36
|
}
|
package/src/config/index.ts
CHANGED
@@ -1,5 +1,7 @@
|
|
1
1
|
import { ethers, Wallet } from "ethers"
|
2
2
|
import { EventBus, EventBusType } from "@/types"
|
3
|
+
import fs from 'fs-extra'
|
4
|
+
import expandHomeDir from "expand-home-dir";
|
3
5
|
|
4
6
|
class Config {
|
5
7
|
public readonly events: EventBusType
|
@@ -8,14 +10,18 @@ class Config {
|
|
8
10
|
public readonly privateKey: string
|
9
11
|
public readonly wallet: Wallet
|
10
12
|
public readonly staging: boolean
|
13
|
+
public readonly autoUpdate: boolean
|
14
|
+
public readonly baseConfigPath: string
|
11
15
|
|
12
16
|
constructor() {
|
13
17
|
this.events = new EventBus() as EventBusType
|
14
|
-
this.maxPeers =
|
18
|
+
this.maxPeers = 20
|
15
19
|
this.privateKey = process.env.PRIVATE_KEY as string;
|
16
20
|
this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
|
21
|
+
this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
|
17
22
|
this.wallet = new Wallet(this.privateKey);
|
18
23
|
this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
|
24
|
+
this.baseConfigPath = expandHomeDir(`~/.interop-x`);
|
19
25
|
}
|
20
26
|
|
21
27
|
get publicAddress(){
|
@@ -25,6 +31,10 @@ class Config {
|
|
25
31
|
isLeadNode() {
|
26
32
|
return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
|
27
33
|
}
|
34
|
+
|
35
|
+
isMaintenanceMode(){
|
36
|
+
return fs.existsSync(this.baseConfigPath + '/maintenance')
|
37
|
+
}
|
28
38
|
}
|
29
39
|
|
30
40
|
export default new Config()
|
@@ -12,6 +12,6 @@ export const addresses = {
|
|
12
12
|
43114: {
|
13
13
|
gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
|
14
14
|
multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
|
15
|
-
interopXGateway: '
|
15
|
+
interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
|
16
16
|
}
|
17
17
|
}
|
package/src/constants/itokens.ts
CHANGED
@@ -17,6 +17,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
|
|
17
17
|
declare sourceBlockNumber: CreationOptional<number>;
|
18
18
|
declare sourceStatus: string;
|
19
19
|
declare sourceErrors: CreationOptional<string[]>;
|
20
|
+
declare sourceLogs: CreationOptional<any[]>;
|
20
21
|
declare sourceCreatedAt: CreationOptional<Date>;
|
21
22
|
declare sourceDelayUntil: CreationOptional<Date>;
|
22
23
|
|
@@ -25,6 +26,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
|
|
25
26
|
declare targetBlockNumber: CreationOptional<number>;
|
26
27
|
declare targetStatus: string;
|
27
28
|
declare targetErrors: CreationOptional<string[]>;
|
29
|
+
declare targetLogs: CreationOptional<any[]>;
|
28
30
|
declare targetCreatedAt: CreationOptional<Date>;
|
29
31
|
declare targetDelayUntil: CreationOptional<Date>;
|
30
32
|
|
@@ -64,6 +66,10 @@ Transaction.init({
|
|
64
66
|
type: DataTypes.JSON,
|
65
67
|
// defaultValue: [],
|
66
68
|
},
|
69
|
+
sourceLogs: {
|
70
|
+
type: DataTypes.JSON,
|
71
|
+
// defaultValue: [],
|
72
|
+
},
|
67
73
|
sourceCreatedAt: {
|
68
74
|
type: DataTypes.DATE,
|
69
75
|
defaultValue: Date.now()
|
@@ -78,6 +84,10 @@ Transaction.init({
|
|
78
84
|
type: DataTypes.JSON,
|
79
85
|
// defaultValue: [],
|
80
86
|
},
|
87
|
+
targetLogs: {
|
88
|
+
type: DataTypes.JSON,
|
89
|
+
// defaultValue: [],
|
90
|
+
},
|
81
91
|
targetCreatedAt: DataTypes.DATE,
|
82
92
|
targetDelayUntil: DataTypes.DATE,
|
83
93
|
|
@@ -0,0 +1,63 @@
|
|
1
|
+
import abi from "@/abi";
|
2
|
+
import config from "@/config";
|
3
|
+
import { itokens, tokens } from "@/constants";
|
4
|
+
import { Transaction } from "@/db";
|
5
|
+
import { InteropBridgeToken } from "@/typechain";
|
6
|
+
import { ChainId } from "@/types";
|
7
|
+
import { getContract, getRpcProviderUrl } from "@/utils";
|
8
|
+
import { ethers } from "ethers";
|
9
|
+
import { MetaTransaction, OperationType } from "ethers-multisend";
|
10
|
+
|
11
|
+
export default async function (transaction: Transaction, type: 'source' | 'target') {
|
12
|
+
const transactions: MetaTransaction[] = [];
|
13
|
+
const logs: any[] = [];
|
14
|
+
|
15
|
+
if (transaction.sourceStatus === 'pending') {
|
16
|
+
throw Error('Cannot build data for pending deposit transaction');
|
17
|
+
}
|
18
|
+
|
19
|
+
if (!transaction.submitEvent) {
|
20
|
+
throw Error('Cannot build data for transaction without submitEvent');
|
21
|
+
}
|
22
|
+
|
23
|
+
|
24
|
+
const token = tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
|
25
|
+
|
26
|
+
if (!token) {
|
27
|
+
throw Error(`Unsupported token ${transaction.submitEvent.token}`);
|
28
|
+
}
|
29
|
+
|
30
|
+
const itoken = itokens[transaction.targetChainId].find(t => t.symbol.toLowerCase() === token.symbol.toLowerCase());
|
31
|
+
|
32
|
+
if (!itoken) {
|
33
|
+
throw Error(`Unsupported itoken ${token.symbol}`);
|
34
|
+
}
|
35
|
+
|
36
|
+
const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
|
37
|
+
const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
|
38
|
+
const interopBridgeContract = getContract<InteropBridgeToken>(itoken.address, abi.interopBridgeToken, targetWallet);
|
39
|
+
|
40
|
+
const { data } = await interopBridgeContract.populateTransaction.mint(
|
41
|
+
transaction.submitEvent.user,
|
42
|
+
ethers.BigNumber.from(transaction.submitEvent.amount.toString()),
|
43
|
+
ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()),
|
44
|
+
transaction.submitTransactionHash,
|
45
|
+
);
|
46
|
+
|
47
|
+
transactions.push({
|
48
|
+
to: itoken.address,
|
49
|
+
data: data!,
|
50
|
+
value: '0',
|
51
|
+
operation: OperationType.Call,
|
52
|
+
});
|
53
|
+
|
54
|
+
logs.push({
|
55
|
+
type: 'mint', // mint, approved, burn, transfer, borrow, swap, repay, collected, traded, .....
|
56
|
+
message: `Minted ${transaction.submitEvent.amount / 10 ** token.decimals} ${token.symbol} to ${transaction.submitEvent.user}`,
|
57
|
+
})
|
58
|
+
|
59
|
+
return {
|
60
|
+
transactions,
|
61
|
+
logs,
|
62
|
+
}
|
63
|
+
}
|