@instadapp/interop-x 0.0.0-dev.b70f25f → 0.0.0-dev.bfeca30
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/package.json +14 -13
- package/dist/src/abi/index.js +2 -4
- package/dist/src/abi/interopXContract.json +454 -0
- package/dist/src/alias.js +10 -0
- package/dist/src/api/index.js +3 -0
- package/dist/src/config/index.js +10 -1
- package/dist/src/constants/addresses.js +3 -3
- package/dist/src/constants/index.js +0 -1
- package/dist/src/constants/tokens.js +31 -1
- package/dist/src/db/models/transaction.js +27 -11
- package/dist/src/gnosis/actions/index.js +9 -0
- package/dist/src/gnosis/actions/withdraw/index.js +55 -0
- package/dist/src/gnosis/index.js +20 -0
- package/dist/src/index.js +34 -22
- package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
- package/dist/src/net/protocol/dial/{SignatureDialProtocol.1.js → TransactionStatusDialProtocol.js} +2 -0
- package/dist/src/net/protocol/index.js +17 -7
- package/dist/src/tasks/AutoUpdateTask.js +34 -12
- package/dist/src/tasks/BaseTask.js +4 -0
- package/dist/src/tasks/{InteropXGateway/ProcessDepositEvents.js → InteropXContract/ProcessBridgeRequestEvents.js} +54 -51
- package/dist/src/tasks/InteropXContract/SyncBridgeCommittedEvents.js +92 -0
- package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +78 -0
- package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +90 -0
- package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +2 -0
- package/dist/src/tasks/index.js +16 -19
- package/dist/src/typechain/{InteropBridgeToken.js → InteropXContract.js} +0 -0
- package/dist/src/typechain/factories/InteropXContract__factory.js +635 -0
- package/dist/src/typechain/factories/index.js +3 -5
- package/dist/src/typechain/index.js +3 -5
- package/dist/src/utils/index.js +37 -89
- package/package.json +14 -13
- package/src/abi/index.ts +2 -4
- package/src/abi/interopXContract.json +454 -0
- package/src/alias.ts +6 -0
- package/src/api/index.ts +3 -0
- package/src/config/index.ts +9 -1
- package/src/constants/addresses.ts +3 -3
- package/src/constants/index.ts +0 -1
- package/src/constants/tokens.ts +32 -2
- package/src/db/models/transaction.ts +76 -27
- package/src/gnosis/actions/index.ts +5 -0
- package/src/gnosis/actions/withdraw/index.ts +77 -0
- package/src/gnosis/index.ts +19 -0
- package/src/index.ts +47 -26
- package/src/net/protocol/dial/SignatureDialProtocol.ts +11 -13
- package/src/net/protocol/dial/{SignatureDialProtocol.1.ts → TransactionStatusDialProtocol.ts} +3 -1
- package/src/net/protocol/index.ts +17 -7
- package/src/tasks/AutoUpdateTask.ts +36 -15
- package/src/tasks/BaseTask.ts +5 -0
- package/src/tasks/{InteropBridge/ProcessWithdrawEvents.ts → InteropXContract/ProcessBridgeRequestEvents.ts} +79 -94
- package/src/tasks/InteropXContract/SyncBridgeCommittedEvents.ts +124 -0
- package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +115 -0
- package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +121 -0
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +2 -0
- package/src/tasks/index.ts +21 -20
- package/src/typechain/InteropXContract.ts +680 -0
- package/src/typechain/factories/InteropXContract__factory.ts +642 -0
- package/src/typechain/factories/index.ts +1 -2
- package/src/typechain/index.ts +2 -4
- package/src/utils/index.ts +75 -126
- package/tsconfig.json +7 -2
- package/dist/src/abi/interopBridgeToken.json +0 -286
- package/dist/src/abi/interopXGateway.json +0 -184
- package/dist/src/constants/itokens.js +0 -13
- package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +0 -146
- package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +0 -69
- package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
- package/dist/src/typechain/InteropXGateway.js +0 -2
- package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -459
- package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
- package/src/abi/interopBridgeToken.json +0 -286
- package/src/abi/interopXGateway.json +0 -184
- package/src/constants/itokens.ts +0 -10
- package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +0 -119
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -243
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
- package/src/typechain/InteropBridgeToken.ts +0 -686
- package/src/typechain/InteropXGateway.ts +0 -407
- package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
- package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -4,30 +4,42 @@ exports.tokens = void 0;
|
|
4
4
|
exports.tokens = {
|
5
5
|
1: [
|
6
6
|
{
|
7
|
+
aliases: ['eth'],
|
7
8
|
symbol: "ETH",
|
8
9
|
name: "Ethereum",
|
9
10
|
address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
|
10
11
|
decimals: 18,
|
11
12
|
},
|
12
13
|
{
|
14
|
+
aliases: ['weth'],
|
15
|
+
symbol: "WETH",
|
16
|
+
name: "Wrapped Ethereum",
|
17
|
+
address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
|
18
|
+
decimals: 18,
|
19
|
+
},
|
20
|
+
{
|
21
|
+
aliases: ['dai'],
|
13
22
|
symbol: "DAI",
|
14
23
|
name: "DAI Stable",
|
15
24
|
address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
|
16
25
|
decimals: 18,
|
17
26
|
},
|
18
27
|
{
|
28
|
+
aliases: ['usdc'],
|
19
29
|
symbol: "USDC",
|
20
30
|
name: "USD Coin",
|
21
31
|
address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
|
22
32
|
decimals: 6,
|
23
33
|
},
|
24
34
|
{
|
35
|
+
aliases: ['usdt'],
|
25
36
|
symbol: "USDT",
|
26
37
|
name: "Tether USD Coin",
|
27
38
|
address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
|
28
39
|
decimals: 6,
|
29
40
|
},
|
30
41
|
{
|
42
|
+
aliases: ['wbtc'],
|
31
43
|
symbol: "WBTC",
|
32
44
|
name: "Wrapped BTC",
|
33
45
|
address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
|
@@ -36,36 +48,42 @@ exports.tokens = {
|
|
36
48
|
],
|
37
49
|
137: [
|
38
50
|
{
|
51
|
+
aliases: ['eth', 'weth'],
|
39
52
|
symbol: "ETH",
|
40
53
|
name: "Ethereum",
|
41
54
|
address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
|
42
55
|
decimals: 18,
|
43
56
|
},
|
44
57
|
{
|
58
|
+
aliases: ['dai'],
|
45
59
|
symbol: "DAI",
|
46
60
|
name: "DAI Stable",
|
47
61
|
address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
|
48
62
|
decimals: 18,
|
49
63
|
},
|
50
64
|
{
|
65
|
+
aliases: ['usdc'],
|
51
66
|
symbol: "USDC",
|
52
67
|
name: "USD Coin",
|
53
68
|
address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
|
54
69
|
decimals: 6,
|
55
70
|
},
|
56
71
|
{
|
72
|
+
aliases: ['usdt'],
|
57
73
|
symbol: "USDT",
|
58
74
|
name: "Tether USD Coin",
|
59
75
|
address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
|
60
76
|
decimals: 6,
|
61
77
|
},
|
62
78
|
{
|
79
|
+
aliases: ['wbtc'],
|
63
80
|
symbol: "WBTC",
|
64
81
|
name: "Wrapped BTC",
|
65
82
|
address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
|
66
83
|
decimals: 8,
|
67
84
|
},
|
68
85
|
{
|
86
|
+
aliases: ['avax'],
|
69
87
|
symbol: "AVAX",
|
70
88
|
name: "Avalanche Token",
|
71
89
|
address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
|
@@ -74,30 +92,42 @@ exports.tokens = {
|
|
74
92
|
],
|
75
93
|
43114: [
|
76
94
|
{
|
95
|
+
aliases: ['eth', 'weth'],
|
77
96
|
symbol: "ETH",
|
78
97
|
name: "Ethereum",
|
79
98
|
address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
|
80
99
|
decimals: 18,
|
81
100
|
},
|
82
101
|
{
|
102
|
+
aliases: ['dai'],
|
83
103
|
symbol: "DAI",
|
84
104
|
name: "DAI Stable",
|
85
105
|
address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
|
86
106
|
decimals: 18,
|
87
107
|
},
|
88
108
|
{
|
109
|
+
aliases: ['usdc'],
|
89
110
|
symbol: "USDC",
|
90
111
|
name: "USD Coin",
|
91
112
|
address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
|
92
113
|
decimals: 6,
|
93
114
|
},
|
94
115
|
{
|
95
|
-
|
116
|
+
aliases: ['usdt'],
|
117
|
+
symbol: "USDt",
|
96
118
|
name: "Tether USD Coin",
|
119
|
+
address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
|
120
|
+
decimals: 6,
|
121
|
+
},
|
122
|
+
{
|
123
|
+
aliases: ['usdt'],
|
124
|
+
symbol: "USDT.e",
|
125
|
+
name: "Tether USD",
|
97
126
|
address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
|
98
127
|
decimals: 6,
|
99
128
|
},
|
100
129
|
{
|
130
|
+
aliases: ["wbtc"],
|
101
131
|
symbol: "WBTC",
|
102
132
|
name: "Wrapped BTC",
|
103
133
|
address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
|
@@ -12,20 +12,26 @@ Transaction.init({
|
|
12
12
|
autoIncrement: true,
|
13
13
|
primaryKey: true
|
14
14
|
},
|
15
|
-
|
16
|
-
|
15
|
+
requestTransactionHash: sequelize_2.DataTypes.NUMBER,
|
16
|
+
requestBlockNumber: sequelize_2.DataTypes.NUMBER,
|
17
17
|
transactionHash: sequelize_2.DataTypes.STRING,
|
18
|
-
|
19
|
-
|
20
|
-
to: sequelize_2.DataTypes.STRING,
|
18
|
+
actionId: sequelize_2.DataTypes.STRING,
|
19
|
+
bridger: sequelize_2.DataTypes.STRING,
|
21
20
|
sourceChainId: sequelize_2.DataTypes.NUMBER,
|
22
21
|
sourceTransactionHash: sequelize_2.DataTypes.STRING,
|
23
22
|
sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
|
24
|
-
sourceStatus:
|
23
|
+
sourceStatus: {
|
24
|
+
type: sequelize_2.DataTypes.STRING,
|
25
|
+
defaultValue: 'uninitialised'
|
26
|
+
},
|
25
27
|
sourceErrors: {
|
26
28
|
type: sequelize_2.DataTypes.JSON,
|
27
29
|
// defaultValue: [],
|
28
30
|
},
|
31
|
+
sourceLogs: {
|
32
|
+
type: sequelize_2.DataTypes.JSON,
|
33
|
+
// defaultValue: [],
|
34
|
+
},
|
29
35
|
sourceCreatedAt: {
|
30
36
|
type: sequelize_2.DataTypes.DATE,
|
31
37
|
defaultValue: Date.now()
|
@@ -34,17 +40,27 @@ Transaction.init({
|
|
34
40
|
targetChainId: sequelize_2.DataTypes.NUMBER,
|
35
41
|
targetTransactionHash: sequelize_2.DataTypes.STRING,
|
36
42
|
targetBlockNumber: sequelize_2.DataTypes.NUMBER,
|
37
|
-
targetStatus:
|
43
|
+
targetStatus: {
|
44
|
+
type: sequelize_2.DataTypes.STRING,
|
45
|
+
defaultValue: 'uninitialised'
|
46
|
+
},
|
38
47
|
targetErrors: {
|
39
48
|
type: sequelize_2.DataTypes.JSON,
|
40
49
|
// defaultValue: [],
|
41
50
|
},
|
51
|
+
targetLogs: {
|
52
|
+
type: sequelize_2.DataTypes.JSON,
|
53
|
+
// defaultValue: [],
|
54
|
+
},
|
42
55
|
targetCreatedAt: sequelize_2.DataTypes.DATE,
|
43
56
|
targetDelayUntil: sequelize_2.DataTypes.DATE,
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
57
|
+
requestEvent: {
|
58
|
+
type: sequelize_2.DataTypes.JSON,
|
59
|
+
allowNull: false
|
60
|
+
},
|
61
|
+
requestSentEvent: sequelize_2.DataTypes.JSON,
|
62
|
+
committedEvent: sequelize_2.DataTypes.JSON,
|
63
|
+
completedEvent: sequelize_2.DataTypes.JSON,
|
48
64
|
status: {
|
49
65
|
type: sequelize_2.DataTypes.STRING,
|
50
66
|
defaultValue: 'pending'
|
@@ -0,0 +1,9 @@
|
|
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 withdraw_1 = __importDefault(require("./withdraw"));
|
7
|
+
exports.default = {
|
8
|
+
withdraw: withdraw_1.default,
|
9
|
+
};
|
@@ -0,0 +1,55 @@
|
|
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 abi_1 = __importDefault(require("@/abi"));
|
7
|
+
const config_1 = __importDefault(require("@/config"));
|
8
|
+
const constants_1 = require("@/constants");
|
9
|
+
const utils_1 = require("@/utils");
|
10
|
+
const ethers_1 = require("ethers");
|
11
|
+
const ethers_multisend_1 = require("ethers-multisend");
|
12
|
+
async function default_1(transaction, type) {
|
13
|
+
const transactions = [];
|
14
|
+
const logs = [];
|
15
|
+
if (transaction.actionId !== 'withdraw') {
|
16
|
+
throw new Error(`Invalid action: ${transaction.actionId}`);
|
17
|
+
}
|
18
|
+
if (type !== 'source') {
|
19
|
+
throw new Error(`[WIP] Type not supported: ${type}`);
|
20
|
+
}
|
21
|
+
if (transaction.sourceStatus === 'pending') {
|
22
|
+
throw Error('Source transaction already processesing');
|
23
|
+
}
|
24
|
+
if (transaction.sourceStatus === 'pending') {
|
25
|
+
throw Error('Source transaction already processed');
|
26
|
+
}
|
27
|
+
if (!transaction.requestEvent) {
|
28
|
+
throw Error('Something went wrong, source transaction has no request event');
|
29
|
+
}
|
30
|
+
const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = transaction.requestEvent;
|
31
|
+
const sourceChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
|
32
|
+
const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
|
33
|
+
const contractAddress = constants_1.addresses[sourceChainId].interopXContract;
|
34
|
+
const contract = (0, utils_1.getContract)(contractAddress, abi_1.default.interopXContract, sourceWallet);
|
35
|
+
const sourceToken = constants_1.tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
|
36
|
+
if (!sourceToken) {
|
37
|
+
throw Error('Source token not found');
|
38
|
+
}
|
39
|
+
const targetToken = constants_1.tokens[targetChainId].find(t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
|
40
|
+
if (!targetToken) {
|
41
|
+
throw Error('Target token not found');
|
42
|
+
}
|
43
|
+
if (!sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
|
44
|
+
throw Error('Source and target token must be the same');
|
45
|
+
}
|
46
|
+
const { data } = await contract.populateTransaction.withdrawRequested(actionId, bridger, position.withdraw[0].sourceToken, position.withdraw[0].targetToken, position.withdraw[0].amount, targetChainId, transaction.requestTransactionHash, metadata);
|
47
|
+
transactions.push({
|
48
|
+
to: contractAddress,
|
49
|
+
data: data,
|
50
|
+
value: '0',
|
51
|
+
operation: ethers_multisend_1.OperationType.Call,
|
52
|
+
});
|
53
|
+
return { transactions, logs };
|
54
|
+
}
|
55
|
+
exports.default = default_1;
|
@@ -0,0 +1,20 @@
|
|
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.buildGnosisAction = void 0;
|
7
|
+
const ethers_multisend_1 = require("ethers-multisend");
|
8
|
+
const actions_1 = __importDefault(require("./actions"));
|
9
|
+
const buildGnosisAction = async (transaction, type) => {
|
10
|
+
// type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
|
11
|
+
if (actions_1.default.hasOwnProperty(transaction.actionId)) {
|
12
|
+
const { transactions, logs } = await actions_1.default[transaction.actionId](transaction, type);
|
13
|
+
return {
|
14
|
+
data: (0, ethers_multisend_1.encodeMulti)(transactions).data,
|
15
|
+
logs
|
16
|
+
};
|
17
|
+
}
|
18
|
+
throw new Error(`Unknown action: ${transaction.actionId}`);
|
19
|
+
};
|
20
|
+
exports.buildGnosisAction = buildGnosisAction;
|
package/dist/src/index.js
CHANGED
@@ -3,22 +3,9 @@ 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
|
-
|
7
|
-
|
8
|
-
|
9
|
-
"@/logger": __dirname + "/logger",
|
10
|
-
"@/tasks": __dirname + "/tasks",
|
11
|
-
"@/utils": __dirname + "/utils",
|
12
|
-
"@/api": __dirname + "/api",
|
13
|
-
"@/net": __dirname + "/net",
|
14
|
-
"@/db": __dirname + "/db",
|
15
|
-
"@/config": __dirname + "/config",
|
16
|
-
"@/types": __dirname + "/types",
|
17
|
-
"@/abi": __dirname + "/abi",
|
18
|
-
"@/constants": __dirname + "/constants",
|
19
|
-
"@/typechain": __dirname + "/typechain"
|
20
|
-
});
|
21
|
-
(0, module_alias_1.default)();
|
6
|
+
require("./alias");
|
7
|
+
const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
|
8
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
22
9
|
const dotenv_1 = __importDefault(require("dotenv"));
|
23
10
|
const chalk_1 = __importDefault(require("chalk"));
|
24
11
|
const ethers_1 = require("ethers");
|
@@ -26,18 +13,39 @@ const package_json_1 = __importDefault(require("../package.json"));
|
|
26
13
|
dotenv_1.default.config();
|
27
14
|
const logger_1 = __importDefault(require("@/logger"));
|
28
15
|
const logger = new logger_1.default('Process');
|
16
|
+
const GIT_SHORT_HASH = 'bfeca30';
|
29
17
|
const printUsage = () => {
|
18
|
+
console.log();
|
19
|
+
console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
|
20
|
+
console.log();
|
30
21
|
console.log('Usage:');
|
31
|
-
console.log('
|
32
|
-
console.log('
|
33
|
-
console.log(
|
34
|
-
console.log('
|
22
|
+
console.log(' interop-x help Show this message');
|
23
|
+
console.log(' interop-x version Print out the installed version of Interop X');
|
24
|
+
console.log();
|
25
|
+
console.log(' interop-x down Put the node into maintenance mode');
|
26
|
+
console.log(' interop-x up Take the node out of maintenance mode');
|
27
|
+
console.log();
|
28
|
+
console.log(' PRIVATE_KEY=abcd1234 interop-x Start the node with the given private key');
|
29
|
+
console.log(' PRIVATE_KEY=abcd1234 STAGING=true interop-x Start the node in staging mode');
|
30
|
+
console.log(' PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x Start the node in auto update mode');
|
31
|
+
console.log(' PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x Start the node with custom API host and port');
|
32
|
+
console.log();
|
35
33
|
};
|
36
34
|
if (process.argv.at(-1) === 'help') {
|
37
35
|
printUsage();
|
38
36
|
process.exit(0);
|
39
37
|
}
|
40
|
-
const
|
38
|
+
const basePath = (0, expand_home_dir_1.default)(`~/.interop-x`);
|
39
|
+
if (process.argv.at(-1) === 'down') {
|
40
|
+
fs_extra_1.default.outputFileSync(basePath + '/maintenance', Date.now().toString());
|
41
|
+
console.log(chalk_1.default.red('Maintenance mode enabled'));
|
42
|
+
process.exit(0);
|
43
|
+
}
|
44
|
+
if (process.argv.at(-1) === 'up') {
|
45
|
+
fs_extra_1.default.removeSync(basePath + '/maintenance');
|
46
|
+
console.log(chalk_1.default.green('Maintenance mode disabled'));
|
47
|
+
process.exit(0);
|
48
|
+
}
|
41
49
|
if (process.argv.at(-1) === 'version') {
|
42
50
|
console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
|
43
51
|
process.exit(0);
|
@@ -64,7 +72,9 @@ const utils_1 = require("./utils");
|
|
64
72
|
async function main() {
|
65
73
|
(0, net_1.startPeer)({});
|
66
74
|
const tasks = new tasks_1.Tasks();
|
67
|
-
|
75
|
+
setTimeout(() => {
|
76
|
+
tasks.start();
|
77
|
+
}, 10000);
|
68
78
|
(0, api_1.startApiServer)();
|
69
79
|
net_1.protocol.on('TransactionStatus', async (payload) => {
|
70
80
|
if (!net_1.peerPool.isLeadNode(payload.peerId)) {
|
@@ -82,9 +92,11 @@ async function main() {
|
|
82
92
|
transaction.sourceStatus = payload.data.sourceStatus;
|
83
93
|
transaction.sourceTransactionHash = payload.data.sourceTransactionHash;
|
84
94
|
transaction.sourceErrors = payload.data.sourceErrors;
|
95
|
+
transaction.sourceLogs = payload.data.sourceLogs;
|
85
96
|
transaction.targetStatus = payload.data.targetStatus;
|
86
97
|
transaction.targetTransactionHash = payload.data.targetTransactionHash;
|
87
98
|
transaction.targetErrors = payload.data.targetErrors;
|
99
|
+
transaction.targetLogs = payload.data.targetLogs;
|
88
100
|
transaction.status = payload.data.status;
|
89
101
|
await transaction.save();
|
90
102
|
});
|
@@ -10,12 +10,17 @@ const config_1 = __importDefault(require("@/config"));
|
|
10
10
|
const db_1 = require("@/db");
|
11
11
|
const utils_1 = require("@/utils");
|
12
12
|
const constants_1 = require("@/constants");
|
13
|
+
const gnosis_1 = require("@/gnosis");
|
13
14
|
class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
|
14
15
|
constructor(libp2p) {
|
15
16
|
super(libp2p, '/interop-x/signatures');
|
16
17
|
this.timeout = 30000;
|
17
18
|
}
|
18
19
|
async response(data) {
|
20
|
+
console.log({
|
21
|
+
tag: 'SignatureDialProtocol',
|
22
|
+
data
|
23
|
+
});
|
19
24
|
const signer = config_1.default.wallet;
|
20
25
|
let transaction;
|
21
26
|
let maxTimeout = 20000;
|
@@ -33,17 +38,11 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
|
|
33
38
|
error: 'Event not found'
|
34
39
|
};
|
35
40
|
}
|
36
|
-
|
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
|
-
});
|
41
|
+
const { data: gnosisData } = await (0, gnosis_1.buildGnosisAction)(transaction, data.type);
|
43
42
|
const signedData = await (0, utils_1.signGnosisSafeTx)({
|
44
|
-
to: constants_1.addresses[transaction.
|
45
|
-
data:
|
46
|
-
chainId: transaction.
|
43
|
+
to: constants_1.addresses[transaction.sourceChainId].multisend,
|
44
|
+
data: gnosisData,
|
45
|
+
chainId: transaction.sourceChainId,
|
47
46
|
safeTxGas: data.safeTxGas,
|
48
47
|
nonce: data.safeNonce,
|
49
48
|
}, { signer });
|
package/dist/src/net/protocol/dial/{SignatureDialProtocol.1.js → TransactionStatusDialProtocol.js}
RENAMED
@@ -18,9 +18,11 @@ class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol
|
|
18
18
|
sourceStatus: transaction.sourceStatus,
|
19
19
|
sourceTransactionHash: transaction.sourceTransactionHash,
|
20
20
|
sourceErrors: transaction.sourceErrors,
|
21
|
+
sourceLogs: transaction.sourceLogs,
|
21
22
|
targetStatus: transaction.targetStatus,
|
22
23
|
targetTransactionHash: transaction.targetTransactionHash,
|
23
24
|
targetErrors: transaction.targetErrors,
|
25
|
+
targetLogs: transaction.targetLogs,
|
24
26
|
status: transaction.status,
|
25
27
|
};
|
26
28
|
}
|
@@ -10,7 +10,7 @@ const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
|
|
10
10
|
const __1 = require("..");
|
11
11
|
const config_1 = __importDefault(require("@/config"));
|
12
12
|
const types_1 = require("@/types");
|
13
|
-
const
|
13
|
+
const TransactionStatusDialProtocol_1 = require("./dial/TransactionStatusDialProtocol");
|
14
14
|
class Protocol extends stream_1.EventEmitter {
|
15
15
|
constructor() {
|
16
16
|
super(...arguments);
|
@@ -31,21 +31,31 @@ class Protocol extends stream_1.EventEmitter {
|
|
31
31
|
encode: (transaction) => [
|
32
32
|
Buffer.from(transaction.transactionHash),
|
33
33
|
Buffer.from(transaction.sourceStatus),
|
34
|
-
Buffer.from(transaction.sourceTransactionHash),
|
34
|
+
Buffer.from(transaction.sourceTransactionHash || ''),
|
35
35
|
transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
|
36
|
+
transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
|
36
37
|
Buffer.from(transaction.targetStatus),
|
37
|
-
Buffer.from(transaction.targetTransactionHash),
|
38
|
+
Buffer.from(transaction.targetTransactionHash || ''),
|
38
39
|
transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
|
40
|
+
transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
|
39
41
|
Buffer.from(transaction.status),
|
40
42
|
],
|
41
|
-
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
|
43
|
+
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]) => ({
|
42
44
|
transactionHash: transactionHash.toString(),
|
43
45
|
sourceStatus: sourceStatus.toString(),
|
44
|
-
sourceTransactionHash: sourceTransactionHash.toString(),
|
46
|
+
sourceTransactionHash: sourceTransactionHash.toString() || null,
|
45
47
|
sourceErrors: sourceErrors.map((e) => e.toString()),
|
48
|
+
sourceLogs: sourceLogs.map(e => ({
|
49
|
+
type: e[0].toString(),
|
50
|
+
message: e[1].toString(),
|
51
|
+
})),
|
46
52
|
targetStatus: targetStatus.toString(),
|
47
|
-
targetTransactionHash: targetTransactionHash.toString(),
|
53
|
+
targetTransactionHash: targetTransactionHash.toString() || null,
|
48
54
|
targetErrors: targetErrors.map((e) => e.toString()),
|
55
|
+
targetLogs: targetLogs.map(e => ({
|
56
|
+
type: e[0].toString(),
|
57
|
+
message: e[1].toString(),
|
58
|
+
})),
|
49
59
|
status: status.toString(),
|
50
60
|
}),
|
51
61
|
},
|
@@ -65,7 +75,7 @@ class Protocol extends stream_1.EventEmitter {
|
|
65
75
|
});
|
66
76
|
});
|
67
77
|
this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
|
68
|
-
this.transactionStatus = new
|
78
|
+
this.transactionStatus = new TransactionStatusDialProtocol_1.TransactionStatusDialProtocol(this.libp2p);
|
69
79
|
}
|
70
80
|
init() {
|
71
81
|
this.libp2p.pubsub.subscribe(this.topic);
|
@@ -5,43 +5,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
const BaseTask_1 = require("./BaseTask");
|
7
7
|
const logger_1 = __importDefault(require("@/logger"));
|
8
|
-
const utils_1 = require("@/utils");
|
9
8
|
const await_spawn_1 = __importDefault(require("await-spawn"));
|
9
|
+
const child_process_1 = require("child_process");
|
10
10
|
const config_1 = __importDefault(require("@/config"));
|
11
11
|
const waait_1 = __importDefault(require("waait"));
|
12
12
|
const package_json_1 = __importDefault(require("../../package.json"));
|
13
13
|
const currentVersion = package_json_1.default.version;
|
14
|
-
const
|
14
|
+
const tag = config_1.default.staging ? 'dev' : 'latest';
|
15
15
|
class AutoUpdateTask extends BaseTask_1.BaseTask {
|
16
16
|
constructor() {
|
17
17
|
super({
|
18
18
|
logger: new logger_1.default("AutoUpdateTask"),
|
19
19
|
});
|
20
|
-
this.pollIntervalMs = 60 *
|
20
|
+
this.pollIntervalMs = 60 * 10 * 1000;
|
21
21
|
}
|
22
22
|
prePollHandler() {
|
23
23
|
return config_1.default.autoUpdate && !config_1.default.isLeadNode();
|
24
24
|
}
|
25
|
+
async getInstalledVersion() {
|
26
|
+
try {
|
27
|
+
const stdout = await (0, await_spawn_1.default)('npm', ['-g', 'ls', '--depth=0', '--json']);
|
28
|
+
return JSON.parse(stdout.toString()).dependencies[package_json_1.default.name].version;
|
29
|
+
}
|
30
|
+
catch (error) {
|
31
|
+
this.logger.error(error);
|
32
|
+
return currentVersion;
|
33
|
+
}
|
34
|
+
}
|
35
|
+
async getLatestVersion() {
|
36
|
+
try {
|
37
|
+
const stdout = await (0, await_spawn_1.default)('npm', ['view', `${package_json_1.default.name}@${tag}`, 'version']);
|
38
|
+
return stdout.toString().trim();
|
39
|
+
}
|
40
|
+
catch (error) {
|
41
|
+
this.logger.error(error);
|
42
|
+
return currentVersion;
|
43
|
+
}
|
44
|
+
}
|
25
45
|
async pollHandler() {
|
26
|
-
const
|
27
|
-
const version = data['dist-tags'].latest;
|
46
|
+
const version = await this.getLatestVersion();
|
28
47
|
if (version === currentVersion) {
|
29
48
|
return;
|
30
49
|
}
|
31
50
|
this.logger.warn(`New version ${version} available.`);
|
32
51
|
this.logger.info('Updating...');
|
33
|
-
await (0, await_spawn_1.default)('npm', ['-g', 'install',
|
52
|
+
await (0, await_spawn_1.default)('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
|
34
53
|
await (0, waait_1.default)(5000);
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
54
|
+
if (version !== await this.getInstalledVersion()) {
|
55
|
+
this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
|
56
|
+
return;
|
57
|
+
}
|
39
58
|
this.logger.warn(`Installed version ${version}`);
|
40
59
|
this.logger.warn(`Restarting...`);
|
41
|
-
|
60
|
+
// TODO: its restarting in the bg, but it should be in the fg
|
61
|
+
const subprocess = (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
|
42
62
|
cwd: process.cwd(),
|
43
|
-
stdio: "inherit"
|
63
|
+
stdio: "inherit",
|
64
|
+
// shell: process.env.SHELL,
|
44
65
|
});
|
66
|
+
subprocess.unref();
|
45
67
|
process.exit();
|
46
68
|
}
|
47
69
|
}
|
@@ -35,6 +35,10 @@ class BaseTask extends events_1.default {
|
|
35
35
|
}
|
36
36
|
}
|
37
37
|
prePollHandler() {
|
38
|
+
if (config_1.default.isMaintenanceMode()) {
|
39
|
+
this.logger.warn('Maintenance mode is enabled. Skipping task.');
|
40
|
+
return false;
|
41
|
+
}
|
38
42
|
if (this.exceptLeadNode) {
|
39
43
|
return !config_1.default.isLeadNode();
|
40
44
|
}
|