@instadapp/interop-x 0.0.0-dev.67e7c3a → 0.0.0-dev.733ff78

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.
Files changed (64) hide show
  1. package/dist/package.json +4 -3
  2. package/dist/src/abi/interopBridgeToken.json +21 -9
  3. package/dist/src/abi/interopXGateway.json +11 -11
  4. package/dist/src/api/index.js +6 -3
  5. package/dist/src/config/index.js +10 -1
  6. package/dist/src/constants/addresses.js +1 -1
  7. package/dist/src/constants/itokens.js +1 -1
  8. package/dist/src/db/models/transaction.js +8 -0
  9. package/dist/src/gnosis/actions/deposit.js +48 -0
  10. package/dist/src/gnosis/actions/index.js +11 -0
  11. package/dist/src/gnosis/actions/withdraw.js +50 -0
  12. package/dist/src/gnosis/index.js +20 -0
  13. package/dist/src/index.js +36 -6
  14. package/dist/src/net/peer/index.js +2 -1
  15. package/dist/src/net/pool/index.js +7 -2
  16. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +3 -8
  17. package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
  18. package/dist/src/net/protocol/index.js +26 -5
  19. package/dist/src/tasks/AutoUpdateTask.js +42 -16
  20. package/dist/src/tasks/BaseTask.js +11 -3
  21. package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +17 -2
  22. package/dist/src/tasks/InteropBridge/{SyncWithdrawEvents.js → SyncBurnEvents.js} +10 -9
  23. package/dist/src/tasks/InteropBridge/SyncMintEvents.js +67 -0
  24. package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +16 -2
  25. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +2 -3
  26. package/dist/src/tasks/InteropXGateway/SyncWithdrawtEvents.js +72 -0
  27. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +55 -0
  28. package/dist/src/tasks/index.js +17 -4
  29. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +23 -11
  30. package/dist/src/typechain/factories/InteropXGateway__factory.js +14 -14
  31. package/dist/src/utils/index.js +14 -85
  32. package/package.json +4 -3
  33. package/src/abi/interopBridgeToken.json +21 -9
  34. package/src/abi/interopXGateway.json +11 -11
  35. package/src/api/index.ts +5 -2
  36. package/src/config/index.ts +9 -1
  37. package/src/constants/addresses.ts +1 -1
  38. package/src/constants/itokens.ts +1 -1
  39. package/src/db/models/transaction.ts +10 -0
  40. package/src/gnosis/actions/deposit.ts +63 -0
  41. package/src/gnosis/actions/index.ts +7 -0
  42. package/src/gnosis/actions/withdraw.ts +67 -0
  43. package/src/gnosis/index.ts +19 -0
  44. package/src/index.ts +49 -8
  45. package/src/net/peer/index.ts +2 -1
  46. package/src/net/pool/index.ts +7 -3
  47. package/src/net/protocol/dial/SignatureDialProtocol.ts +5 -11
  48. package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
  49. package/src/net/protocol/index.ts +28 -6
  50. package/src/tasks/AutoUpdateTask.ts +48 -20
  51. package/src/tasks/BaseTask.ts +13 -3
  52. package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +24 -8
  53. package/src/tasks/InteropBridge/{SyncWithdrawEvents.ts → SyncBurnEvents.ts} +13 -15
  54. package/src/tasks/InteropBridge/SyncMintEvents.ts +99 -0
  55. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +22 -7
  56. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +2 -4
  57. package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts +105 -0
  58. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +67 -0
  59. package/src/tasks/index.ts +25 -4
  60. package/src/typechain/InteropBridgeToken.ts +23 -17
  61. package/src/typechain/InteropXGateway.ts +13 -13
  62. package/src/typechain/factories/InteropBridgeToken__factory.ts +23 -11
  63. package/src/typechain/factories/InteropXGateway__factory.ts +14 -14
  64. package/src/utils/index.ts +16 -125
@@ -0,0 +1,67 @@
1
+ import abi from "@/abi";
2
+ import config from "@/config";
3
+ import { addresses, itokens, tokens } from "@/constants";
4
+ import { Transaction } from "@/db";
5
+ import { InteropXGateway } 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.action !== 'withdraw') {
16
+ throw new Error(`Invalid action: ${transaction.action}`)
17
+ }
18
+
19
+ if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
20
+ throw Error('Cannot build data for pending withdraw transaction');
21
+ }
22
+
23
+ if (!transaction.submitEvent) {
24
+ throw Error('Cannot build data for transaction without submitEvent');
25
+ }
26
+
27
+ const { to, amount, sourceChainId, targetChainId, itoken: itokenAddress } = transaction.submitEvent;
28
+
29
+ const itoken = itokens[sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
30
+
31
+ if (!itoken) {
32
+ throw Error(`Unsupported itoken ${itokenAddress}`);
33
+ }
34
+
35
+ const token = tokens[targetChainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
36
+
37
+ if (!token) {
38
+ throw Error(`Unsupported token ${itoken.symbol}`);
39
+ }
40
+
41
+ const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(targetChainId as ChainId));
42
+ const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
43
+ const gatewayAddress = addresses[targetChainId].interopXGateway;
44
+ const interopBridgeContract = getContract<InteropXGateway>(gatewayAddress, abi.interopXGateway, targetWallet);
45
+
46
+ const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(
47
+ ethers.BigNumber.from(amount.toString()),
48
+ to,
49
+ token.address,
50
+ ethers.BigNumber.from(sourceChainId.toString()),
51
+ transaction.submitTransactionHash,
52
+ );
53
+
54
+ transactions.push({
55
+ to: gatewayAddress,
56
+ data: data!,
57
+ value: '0',
58
+ operation: OperationType.Call,
59
+ });
60
+
61
+ logs.push({
62
+ type: 'transfer',
63
+ message: `Transfer ${amount / 10 ** token.decimals} ${token.symbol} to ${to}`,
64
+ })
65
+
66
+ return { transactions, logs }
67
+ }
@@ -0,0 +1,19 @@
1
+ import { Transaction } from "@/db";
2
+ import { encodeMulti } from "ethers-multisend";
3
+ import actions from "./actions";
4
+
5
+ export const buildGnosisAction = async (transaction: Transaction, type?: 'source' | 'target') => {
6
+ type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
7
+
8
+ if (actions.hasOwnProperty(transaction.action)) {
9
+
10
+ const { transactions, logs } = await actions[transaction.action](transaction, type);
11
+
12
+ return {
13
+ data: encodeMulti(transactions).data,
14
+ logs
15
+ };
16
+ }
17
+
18
+ throw new Error(`Unknown action: ${transaction.action}`);
19
+ }
package/src/index.ts CHANGED
@@ -1,9 +1,11 @@
1
1
  import moduleAlias from 'module-alias';
2
-
2
+ import expandHomeDir from "expand-home-dir";
3
+ import fs from 'fs-extra'
3
4
  moduleAlias.addAliases({
4
5
  "@/": __dirname + "/",
5
6
  "@/logger": __dirname + "/logger",
6
7
  "@/tasks": __dirname + "/tasks",
8
+ "@/gnosis": __dirname + "/gnosis",
7
9
  "@/utils": __dirname + "/utils",
8
10
  "@/api": __dirname + "/api",
9
11
  "@/net": __dirname + "/net",
@@ -25,12 +27,30 @@ dotenv.config();
25
27
  import Logger from "@/logger";
26
28
  const logger = new Logger('Process')
27
29
 
30
+ const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
31
+
28
32
  const printUsage = () => {
33
+ console.log()
34
+ console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
35
+ console.log()
36
+
29
37
  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')
38
+ console.log(' interop-x help Show this message')
39
+ console.log(' interop-x version Print out the installed version of Interop X')
40
+
41
+ console.log()
42
+
43
+ console.log(' interop-x down Put the node into maintenance mode')
44
+ console.log(' interop-x up Take the node out of maintenance mode')
45
+
46
+ console.log()
47
+
48
+ console.log(' PRIVATE_KEY=abcd1234 interop-x Start the node with the given private key')
49
+ console.log(' PRIVATE_KEY=abcd1234 STAGING=true interop-x Start the node in staging mode')
50
+ console.log(' PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x Start the node in auto update mode')
51
+ 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')
52
+ console.log()
53
+
34
54
  }
35
55
 
36
56
  if (process.argv.at(-1) === 'help') {
@@ -38,14 +58,27 @@ if (process.argv.at(-1) === 'help') {
38
58
  process.exit(0)
39
59
  }
40
60
 
41
- const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
61
+ const basePath = expandHomeDir(`~/.interop-x`);
62
+
63
+ if (process.argv.at(-1) === 'down') {
64
+ fs.outputFileSync(basePath + '/maintenance', Date.now().toString())
65
+ console.log(chalk.red('Maintenance mode enabled'))
66
+ process.exit(0)
67
+ }
68
+
69
+ if (process.argv.at(-1) === 'up') {
70
+ fs.removeSync(basePath + '/maintenance')
71
+ console.log(chalk.green('Maintenance mode disabled'))
72
+ process.exit(0)
73
+ }
74
+
42
75
 
43
76
  if (process.argv.at(-1) === 'version') {
44
77
  console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
45
78
  process.exit(0)
46
79
  }
47
80
 
48
- if(! process.env.PRIVATE_KEY) {
81
+ if (!process.env.PRIVATE_KEY) {
49
82
  console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
50
83
  printUsage()
51
84
  process.exit(1)
@@ -64,6 +97,7 @@ import { Tasks } from "@/tasks";
64
97
  import { startPeer, protocol, peerPool } from "@/net";
65
98
  import { startApiServer } from '@/api';
66
99
  import { Transaction } from './db';
100
+ import { shortenHash } from './utils';
67
101
 
68
102
  async function main() {
69
103
 
@@ -78,7 +112,12 @@ async function main() {
78
112
  protocol.on('TransactionStatus', async (payload) => {
79
113
  if (!peerPool.isLeadNode(payload.peerId)) {
80
114
  const peer = peerPool.getPeer(payload.peerId)
81
- logger.info(`ignored transaction status from ${payload.peerId} ${peer?.publicAddress} `)
115
+
116
+ if (!peer) {
117
+ return;
118
+ }
119
+
120
+ logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
82
121
  return;
83
122
  }
84
123
 
@@ -91,10 +130,12 @@ async function main() {
91
130
  transaction.sourceStatus = payload.data.sourceStatus
92
131
  transaction.sourceTransactionHash = payload.data.sourceTransactionHash
93
132
  transaction.sourceErrors = payload.data.sourceErrors
133
+ transaction.sourceLogs = payload.data.sourceLogs
94
134
 
95
135
  transaction.targetStatus = payload.data.targetStatus
96
136
  transaction.targetTransactionHash = payload.data.targetTransactionHash
97
137
  transaction.targetErrors = payload.data.targetErrors
138
+ transaction.targetLogs = payload.data.targetLogs
98
139
 
99
140
  transaction.status = payload.data.status
100
141
 
@@ -17,6 +17,7 @@ import KadDHT from "libp2p-kad-dht";
17
17
  import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
18
18
  import { protocol } from "@/net";
19
19
  import config from "@/config";
20
+ import chalk from "chalk";
20
21
 
21
22
  const logger = new Logger("Peer");
22
23
 
@@ -80,7 +81,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
80
81
  },
81
82
  });
82
83
 
83
- logger.info("Peer ID:", node.peerId.toB58String());
84
+ logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
84
85
 
85
86
  await node.start();
86
87
 
@@ -2,6 +2,8 @@ import { Event } from "@/types";
2
2
  import config from "@/config";
3
3
  import Logger from "@/logger";
4
4
  import { getAddress } from "ethers/lib/utils";
5
+ import { shortenHash } from "@/utils";
6
+ import chalk from "chalk";
5
7
 
6
8
 
7
9
  const logger = new Logger('PeerPool')
@@ -87,7 +89,7 @@ export class PeerPool {
87
89
 
88
90
  if (newPeer) {
89
91
  config.events.emit(Event.POOL_PEER_ADDED, peer)
90
- logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
92
+ logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
91
93
  }
92
94
  }
93
95
  }
@@ -102,7 +104,7 @@ export class PeerPool {
102
104
  if (this.pool.delete(peer.id)) {
103
105
  peer.pooled = false
104
106
  config.events.emit(Event.POOL_PEER_REMOVED, peer)
105
- logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`)
107
+ logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
106
108
  }
107
109
  }
108
110
  }
@@ -123,7 +125,6 @@ export class PeerPool {
123
125
  return this.activePeers.map((p) => p.id)
124
126
  }
125
127
 
126
-
127
128
  getPeer(id: string){
128
129
  return this.pool.get(id);
129
130
  }
@@ -138,6 +139,9 @@ export class PeerPool {
138
139
  return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
139
140
  }
140
141
 
142
+ getLeadPeer() {
143
+ return this.peers.find((p) => this.isLeadNode(p.id))
144
+ }
141
145
 
142
146
  cleanup() {
143
147
  // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
@@ -2,12 +2,13 @@ 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";
5
+ import { signGnosisSafeTx } from "@/utils";
6
6
  import { addresses } from "@/constants";
7
7
  import { ChainId } from "@/types";
8
+ import { buildGnosisAction } from "@/gnosis";
8
9
 
9
10
  export interface ISignatureRequest {
10
- type: 'source' | 'target' ,
11
+ type: 'source' | 'target',
11
12
  transactionHash: string
12
13
  safeTxGas: string
13
14
  safeNonce: string
@@ -46,18 +47,11 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
46
47
  error: 'Event not found'
47
48
  };
48
49
  }
49
-
50
- console.log("signing:", {
51
- to: addresses[transaction.targetChainId].multisend,
52
- data: await buildDataForTransaction(transaction, data.type),
53
- chainId: transaction.targetChainId as ChainId,
54
- safeTxGas: data.safeTxGas,
55
- nonce: data.safeNonce,
56
- });
50
+ const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
57
51
 
58
52
  const signedData = await signGnosisSafeTx({
59
53
  to: addresses[transaction.targetChainId].multisend,
60
- data: await buildDataForTransaction(transaction, data.type),
54
+ data: gnosisData,
61
55
  chainId: transaction.targetChainId as ChainId,
62
56
  safeTxGas: data.safeTxGas,
63
57
  nonce: data.safeNonce,
@@ -0,0 +1,33 @@
1
+ import { BaseDialProtocol } from "./BaseDialProtocol";
2
+ import { Transaction } from "@/db";
3
+
4
+ export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'> | null> {
5
+ protected timeout = 30000;
6
+
7
+ constructor(libp2p) {
8
+ super(libp2p, '/interop-x/transaction-status')
9
+ }
10
+
11
+ async response(transactionHash: string){
12
+ const transaction = await Transaction.findOne({ where: { transactionHash } })
13
+
14
+ if(! transaction){
15
+ return null
16
+ }
17
+ return {
18
+ transactionHash: transaction.transactionHash,
19
+
20
+ sourceStatus: transaction.sourceStatus,
21
+ sourceTransactionHash: transaction.sourceTransactionHash,
22
+ sourceErrors: transaction.sourceErrors,
23
+ sourceLogs: transaction.sourceLogs,
24
+
25
+ targetStatus: transaction.targetStatus,
26
+ targetTransactionHash: transaction.targetTransactionHash,
27
+ targetErrors: transaction.targetErrors,
28
+ targetLogs: transaction.targetLogs,
29
+
30
+ status: transaction.status,
31
+ }
32
+ }
33
+ }
@@ -6,6 +6,7 @@ import { IPeerInfo, peerPool } from "..";
6
6
  import config from "@/config";
7
7
  import { Event } from "@/types";
8
8
  import { Transaction } from "@/db";
9
+ import { TransactionStatusDialProtocol } from "./dial/TransactionStatusDialProtocol";
9
10
 
10
11
  export interface ProtocolOptions {
11
12
  /* Handshake timeout in ms (default: 8000) */
@@ -35,7 +36,7 @@ interface PeerInfoEvent extends BaseMessageEvent {
35
36
  }
36
37
 
37
38
  interface TransactionStatusEvent extends BaseMessageEvent {
38
- data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
39
+ data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'>
39
40
  }
40
41
 
41
42
  declare interface Protocol {
@@ -65,31 +66,42 @@ class Protocol extends EventEmitter {
65
66
  Buffer.from(transaction.transactionHash),
66
67
 
67
68
  Buffer.from(transaction.sourceStatus),
68
- Buffer.from(transaction.sourceTransactionHash),
69
+ Buffer.from(transaction.sourceTransactionHash || ''),
69
70
  transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
71
+ transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
70
72
 
71
73
  Buffer.from(transaction.targetStatus),
72
- Buffer.from(transaction.targetTransactionHash),
74
+ Buffer.from(transaction.targetTransactionHash || ''),
73
75
  transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
76
+ transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
74
77
 
75
78
  Buffer.from(transaction.status),
76
79
  ],
77
- decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
80
+ decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]: [Buffer, Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer]) => ({
78
81
  transactionHash: transactionHash.toString(),
79
82
 
80
83
  sourceStatus: sourceStatus.toString(),
81
- sourceTransactionHash: sourceTransactionHash.toString(),
84
+ sourceTransactionHash: sourceTransactionHash.toString() || null,
82
85
  sourceErrors: sourceErrors.map((e) => e.toString()),
86
+ sourceLogs: sourceLogs.map(e => ({
87
+ type: e[0].toString(),
88
+ message: e[1].toString(),
89
+ })),
83
90
 
84
91
  targetStatus: targetStatus.toString(),
85
- targetTransactionHash: targetTransactionHash.toString(),
92
+ targetTransactionHash: targetTransactionHash.toString() || null,
86
93
  targetErrors: targetErrors.map((e) => e.toString()),
94
+ targetLogs: targetLogs.map(e => ({
95
+ type: e[0].toString(),
96
+ message: e[1].toString(),
97
+ })),
87
98
 
88
99
  status: status.toString(),
89
100
  }),
90
101
  },
91
102
  ];
92
103
  private signature: SignatureDialProtocol;
104
+ private transactionStatus: TransactionStatusDialProtocol;
93
105
 
94
106
 
95
107
  start({ libp2p, topic = null, }) {
@@ -109,6 +121,7 @@ class Protocol extends EventEmitter {
109
121
  })
110
122
 
111
123
  this.signature = new SignatureDialProtocol(this.libp2p);
124
+ this.transactionStatus = new TransactionStatusDialProtocol(this.libp2p);
112
125
  }
113
126
 
114
127
 
@@ -177,6 +190,15 @@ class Protocol extends EventEmitter {
177
190
  return []
178
191
  }
179
192
  }
193
+
194
+ async requestTransactionStatus(transactionHash: string, peerId: string) {
195
+ try {
196
+ return await this.transactionStatus.send(transactionHash, peerId);
197
+ } catch (error) {
198
+ console.log(error);
199
+ return null
200
+ }
201
+ }
180
202
  }
181
203
 
182
204
  export const protocol = new Protocol();
@@ -1,13 +1,16 @@
1
1
  import { BaseTask } from "./BaseTask";
2
2
  import Logger from '@/logger';
3
- import packageJson from '../../package.json'
4
- import { http } from "@/utils";
5
- import { spawn } from 'child_process';
3
+ import spawnAsync from 'await-spawn';
4
+ import { spawn } from 'child_process'
6
5
  import config from "@/config";
6
+ import wait from "waait";
7
+ import packageJson from "../../package.json";
8
+
7
9
  const currentVersion = packageJson.version;
10
+ const tag = config.staging ? 'dev' : 'latest';
8
11
 
9
12
  class AutoUpdateTask extends BaseTask {
10
- pollIntervalMs: number = 60 * 1000
13
+ pollIntervalMs: number = 60 * 10 * 1000
11
14
 
12
15
  constructor() {
13
16
  super({
@@ -15,16 +18,32 @@ class AutoUpdateTask extends BaseTask {
15
18
  })
16
19
  }
17
20
 
18
-
19
21
  prePollHandler(): boolean {
20
22
  return config.autoUpdate && !config.isLeadNode();
21
23
  }
22
24
 
23
- async pollHandler() {
25
+ async getInstalledVersion() {
26
+ try {
27
+ const stdout = await spawnAsync('npm', ['-g', 'ls', '--depth=0', '--json'])
28
+ return JSON.parse(stdout.toString()).dependencies[packageJson.name].version
29
+ } catch (error) {
30
+ this.logger.error(error)
31
+ return currentVersion
32
+ }
33
+ }
24
34
 
25
- const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
35
+ async getLatestVersion() {
36
+ try {
37
+ const stdout = await spawnAsync('npm', ['view', `${packageJson.name}@${tag}`, 'version'])
38
+ return stdout.toString().trim()
39
+ } catch (error) {
40
+ this.logger.error(error)
41
+ return currentVersion
42
+ }
43
+ }
26
44
 
27
- const version = data['dist-tags'].latest
45
+ async pollHandler() {
46
+ const version = await this.getLatestVersion()
28
47
 
29
48
  if (version === currentVersion) {
30
49
  return;
@@ -32,22 +51,31 @@ class AutoUpdateTask extends BaseTask {
32
51
 
33
52
  this.logger.warn(`New version ${version} available.`)
34
53
 
54
+ this.logger.info('Updating...')
35
55
 
36
- const update = spawn('npm', ['-g', 'install', '@instadapp/interop-x']);
56
+ await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
37
57
 
38
- update.on("close", () => {
39
- this.logger.warn(`Installed version ${version}`)
40
- this.logger.warn(`Restarting...`)
58
+ await wait(5000)
41
59
 
42
- spawn(process.argv[0], process.argv.slice(1), {
43
- cwd: process.cwd(),
44
- env: Object.create(process.env),
45
- detached: true,
46
- stdio: "inherit"
47
- });
60
+ if (version !== await this.getInstalledVersion()) {
61
+ this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
62
+ return;
63
+ }
48
64
 
49
- process.exit()
50
- })
65
+ this.logger.warn(`Installed version ${version}`)
66
+ this.logger.warn(`Restarting...`)
67
+
68
+
69
+ // TODO: its restarting in the bg, but it should be in the fg
70
+ const subprocess = spawn(process.argv[0], process.argv.slice(1), {
71
+ cwd: process.cwd(),
72
+ stdio: "inherit",
73
+ // shell: process.env.SHELL,
74
+ });
75
+
76
+ subprocess.unref();
77
+
78
+ process.exit()
51
79
  }
52
80
  }
53
81
 
@@ -19,6 +19,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
19
19
  started: boolean = false
20
20
  pollIntervalMs: number = 10 * 1000
21
21
  leadNodeOnly: boolean = false
22
+ exceptLeadNode: boolean = false
22
23
 
23
24
  public constructor({ logger }: { logger?: Logger }) {
24
25
  super()
@@ -45,11 +46,20 @@ export class BaseTask extends EventEmitter implements IBaseTask {
45
46
  }
46
47
 
47
48
  prePollHandler(): boolean {
48
- if (!this.leadNodeOnly) {
49
- return true
49
+ if(config.isMaintenanceMode()){
50
+ this.logger.warn('Maintenance mode is enabled. Skipping task.')
51
+ return false
50
52
  }
51
53
 
52
- return config.isLeadNode()
54
+ if (this.exceptLeadNode) {
55
+ return !config.isLeadNode();
56
+ }
57
+
58
+ if (this.leadNodeOnly) {
59
+ return config.isLeadNode()
60
+ }
61
+
62
+ return true
53
63
  }
54
64
 
55
65
  async pollHandler() {
@@ -3,19 +3,20 @@ import Logger from '@/logger';
3
3
  import { BigNumber, ethers } from "ethers";
4
4
  import abi from "@/abi";
5
5
  import { Transaction } from "@/db";
6
- import { buildDataForTransaction, buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
6
+ import { buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
7
7
  import { addresses } from "@/constants";
8
8
  import { ChainId } from "@/types";
9
9
  import config from "@/config";
10
- import { GnosisSafe, InteropXGateway } from "@/typechain";
10
+ import { GnosisSafe } from "@/typechain";
11
11
  import { Op } from "sequelize";
12
12
  import wait from "waait";
13
13
  import { peerPool, protocol } from "@/net";
14
14
  import { LogDescription } from "ethers/lib/utils";
15
+ import { buildGnosisAction } from "@/gnosis";
15
16
 
16
17
  const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
17
18
  console.log(transactionData);
18
-
19
+
19
20
  let isExecuted = await safeContract.dataHashes(
20
21
  await safeContract.getTransactionHash(
21
22
  transactionData.to,
@@ -95,7 +96,7 @@ class ProcessWithdrawEvents extends BaseTask {
95
96
  }
96
97
 
97
98
  console.log(`Processing transaction ${transaction.transactionHash}`);
98
-
99
+
99
100
  transaction.targetStatus = 'pending';
100
101
  await transaction.save();
101
102
 
@@ -119,9 +120,23 @@ class ProcessWithdrawEvents extends BaseTask {
119
120
  const ownersThreshold = await safeContract.getThreshold();
120
121
  await wait(10000);
121
122
 
123
+ let data, logs = [];
124
+
125
+ try {
126
+ ({ data, logs } = await buildGnosisAction(transaction));
127
+ } catch (error) {
128
+ console.log(error);
129
+ transaction.targetStatus = 'failed';
130
+ transaction.targetErrors = [error.message];
131
+ transaction.status = 'failed'
132
+ await transaction.save();
133
+ protocol.sendTransaction(transaction)
134
+ return;
135
+ }
136
+
122
137
  let gnosisTx = await generateGnosisTransaction({
123
138
  baseGas: "0",
124
- data: await buildDataForTransaction(transaction),
139
+ data,
125
140
  gasPrice: "0",
126
141
  gasToken: "0x0000000000000000000000000000000000000000",
127
142
  nonce: '0',
@@ -140,7 +155,7 @@ class ProcessWithdrawEvents extends BaseTask {
140
155
  console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
141
156
 
142
157
  console.log(ownerPeerIds);
143
-
158
+
144
159
  const signatures = await protocol.requestSignatures({
145
160
  type: 'source',
146
161
  transactionHash: transaction.transactionHash,
@@ -208,6 +223,7 @@ class ProcessWithdrawEvents extends BaseTask {
208
223
  console.log('ExecutionSuccess')
209
224
  transaction.targetStatus = 'success'
210
225
  transaction.targetTransactionHash = txSent.hash
226
+ transaction.targetLogs = logs
211
227
  transaction.status = 'success'
212
228
  await transaction.save();
213
229
  } else {
@@ -217,11 +233,11 @@ class ProcessWithdrawEvents extends BaseTask {
217
233
  transaction.status = 'failed'
218
234
  await transaction.save();
219
235
  }
236
+
237
+ protocol.sendTransaction(transaction)
220
238
  }
221
239
 
222
240
  async start(): Promise<void> {
223
- this.logger.info(`Starting execution watcher on interop chain`);
224
-
225
241
  this.provider = new ethers.providers.JsonRpcProvider(
226
242
  getRpcProviderUrl(this.chainId)
227
243
  );