@instadapp/interop-x 0.0.0-dev.2c0a756 → 0.0.0-dev.3d62ebf

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 (42) hide show
  1. package/dist/package.json +2 -2
  2. package/dist/src/abi/interopBridgeToken.json +9 -21
  3. package/dist/src/abi/interopXGateway.json +11 -11
  4. package/dist/src/config/index.js +1 -10
  5. package/dist/src/constants/addresses.js +1 -1
  6. package/dist/src/constants/itokens.js +1 -1
  7. package/dist/src/index.js +5 -28
  8. package/dist/src/net/protocol/dial/{TransactionStatusDialProtocol.js → SignatureDialProtocol.1.js} +0 -0
  9. package/dist/src/net/protocol/index.js +6 -6
  10. package/dist/src/tasks/AutoUpdateTask.js +6 -11
  11. package/dist/src/tasks/BaseTask.js +0 -4
  12. package/dist/src/tasks/InteropBridge/{SyncBurnEvents.js → SyncWithdrawEvents.js} +8 -10
  13. package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +1 -14
  14. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +2 -2
  15. package/dist/src/tasks/index.js +5 -17
  16. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +11 -23
  17. package/dist/src/typechain/factories/InteropXGateway__factory.js +14 -14
  18. package/dist/src/utils/index.js +6 -6
  19. package/package.json +2 -2
  20. package/src/abi/interopBridgeToken.json +9 -21
  21. package/src/abi/interopXGateway.json +11 -11
  22. package/src/config/index.ts +1 -9
  23. package/src/constants/addresses.ts +1 -1
  24. package/src/constants/itokens.ts +1 -1
  25. package/src/index.ts +9 -41
  26. package/src/net/protocol/dial/{TransactionStatusDialProtocol.ts → SignatureDialProtocol.1.ts} +0 -0
  27. package/src/net/protocol/index.ts +5 -5
  28. package/src/tasks/AutoUpdateTask.ts +12 -15
  29. package/src/tasks/BaseTask.ts +0 -5
  30. package/src/tasks/InteropBridge/{SyncBurnEvents.ts → SyncWithdrawEvents.ts} +8 -10
  31. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +4 -18
  32. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +2 -2
  33. package/src/tasks/index.ts +4 -24
  34. package/src/typechain/InteropBridgeToken.ts +17 -23
  35. package/src/typechain/InteropXGateway.ts +13 -13
  36. package/src/typechain/factories/InteropBridgeToken__factory.ts +11 -23
  37. package/src/typechain/factories/InteropXGateway__factory.ts +14 -14
  38. package/src/utils/index.ts +6 -6
  39. package/dist/src/tasks/InteropBridge/SyncMintEvents.js +0 -66
  40. package/dist/src/tasks/InteropXGateway/SyncWithdrawtEvents.js +0 -71
  41. package/src/tasks/InteropBridge/SyncMintEvents.ts +0 -98
  42. package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts +0 -103
@@ -167,20 +167,20 @@ const buildWithdrawDataForTransaction = async (transaction, type) => {
167
167
  if (!transaction.submitEvent) {
168
168
  throw Error('Cannot build data for transaction without submitEvent');
169
169
  }
170
- const { to, amount, sourceChainId, targetChainId, itoken: itokenAddress } = transaction.submitEvent;
171
- const itoken = constants_1.itokens[sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
170
+ const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
171
+ const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
172
172
  if (!itoken) {
173
173
  throw Error('Cannot build data for transaction without itoken');
174
174
  }
175
- const token = constants_1.tokens[targetChainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
175
+ const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
176
176
  if (!token) {
177
177
  throw Error('Cannot build data for transaction without token');
178
178
  }
179
- const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(targetChainId));
179
+ const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
180
180
  const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
181
- const gatewayAddress = constants_1.addresses[targetChainId].interopXGateway;
181
+ const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
182
182
  const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
183
- const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(sourceChainId.toString()), transaction.submitTransactionHash);
183
+ 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);
184
184
  transactions.push({
185
185
  to: gatewayAddress,
186
186
  data: data,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instadapp/interop-x",
3
- "version": "0.0.0-dev.2c0a756",
3
+ "version": "0.0.0-dev.3d62ebf",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "engines": {
@@ -28,6 +28,7 @@
28
28
  "await-spawn": "^4.0.2",
29
29
  "axios": "^0.27.1",
30
30
  "axios-retry": "^3.2.4",
31
+ "bignumber.js": "^9.0.2",
31
32
  "chalk": "4.1.2",
32
33
  "dotenv": "^16.0.0",
33
34
  "ethereumjs-util": "^7.1.4",
@@ -35,7 +36,6 @@
35
36
  "ethers-multisend": "^2.1.1",
36
37
  "expand-home-dir": "^0.0.3",
37
38
  "fastify": "^3.28.0",
38
- "fs-extra": "^10.1.0",
39
39
  "libp2p": "^0.36.2",
40
40
  "libp2p-bootstrap": "^0.14.0",
41
41
  "libp2p-kad-dht": "^0.28.6",
@@ -46,17 +46,11 @@
46
46
  "name": "amount",
47
47
  "type": "uint256"
48
48
  },
49
- {
50
- "indexed": false,
51
- "internalType": "uint32",
52
- "name": "sourceChainId",
53
- "type": "uint32"
54
- },
55
49
  {
56
50
  "indexed": true,
57
- "internalType": "uint32",
58
- "name": "targetChainId",
59
- "type": "uint32"
51
+ "internalType": "uint256",
52
+ "name": "chainId",
53
+ "type": "uint256"
60
54
  }
61
55
  ],
62
56
  "name": "Burn",
@@ -79,20 +73,14 @@
79
73
  },
80
74
  {
81
75
  "indexed": true,
82
- "internalType": "uint32",
83
- "name": "sourceChainId",
84
- "type": "uint32"
85
- },
86
- {
87
- "indexed": false,
88
- "internalType": "uint32",
89
- "name": "targetChainId",
90
- "type": "uint32"
76
+ "internalType": "uint256",
77
+ "name": "chainId",
78
+ "type": "uint256"
91
79
  },
92
80
  {
93
81
  "indexed": true,
94
82
  "internalType": "bytes32",
95
- "name": "submitTransactionHash",
83
+ "name": "transactionHash",
96
84
  "type": "bytes32"
97
85
  }
98
86
  ],
@@ -176,7 +164,7 @@
176
164
  "inputs": [
177
165
  { "internalType": "address", "name": "to", "type": "address" },
178
166
  { "internalType": "uint256", "name": "amount", "type": "uint256" },
179
- { "internalType": "uint32", "name": "chainId", "type": "uint32" }
167
+ { "internalType": "uint256", "name": "chainId", "type": "uint256" }
180
168
  ],
181
169
  "name": "burn",
182
170
  "outputs": [],
@@ -218,7 +206,7 @@
218
206
  "inputs": [
219
207
  { "internalType": "address", "name": "to", "type": "address" },
220
208
  { "internalType": "uint256", "name": "amount", "type": "uint256" },
221
- { "internalType": "uint32", "name": "chainId", "type": "uint32" },
209
+ { "internalType": "uint256", "name": "chainId", "type": "uint256" },
222
210
  {
223
211
  "internalType": "bytes32",
224
212
  "name": "transactionHash",
@@ -35,15 +35,15 @@
35
35
  },
36
36
  {
37
37
  "indexed": false,
38
- "internalType": "uint32",
38
+ "internalType": "uint256",
39
39
  "name": "sourceChainId",
40
- "type": "uint32"
40
+ "type": "uint256"
41
41
  },
42
42
  {
43
43
  "indexed": true,
44
- "internalType": "uint32",
44
+ "internalType": "uint256",
45
45
  "name": "targetChainId",
46
- "type": "uint32"
46
+ "type": "uint256"
47
47
  }
48
48
  ],
49
49
  "name": "LogGatewayDeposit",
@@ -72,15 +72,15 @@
72
72
  },
73
73
  {
74
74
  "indexed": true,
75
- "internalType": "uint32",
75
+ "internalType": "uint256",
76
76
  "name": "sourceChainId",
77
- "type": "uint32"
77
+ "type": "uint256"
78
78
  },
79
79
  {
80
80
  "indexed": false,
81
- "internalType": "uint32",
81
+ "internalType": "uint256",
82
82
  "name": "targetChainId",
83
- "type": "uint32"
83
+ "type": "uint256"
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": "uint32", "name": "chainId_", "type": "uint32" }
125
+ { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
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": "uint32", "name": "chainId_", "type": "uint32" }
137
+ { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
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": "uint32", "name": "chainId_", "type": "uint32" },
163
+ { "internalType": "uint256", "name": "chainId_", "type": "uint256" },
164
164
  {
165
165
  "internalType": "bytes32",
166
166
  "name": "transactionHash_",
@@ -1,7 +1,5 @@
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";
5
3
 
6
4
  class Config {
7
5
  public readonly events: EventBusType
@@ -11,17 +9,15 @@ class Config {
11
9
  public readonly wallet: Wallet
12
10
  public readonly staging: boolean
13
11
  public readonly autoUpdate: boolean
14
- public readonly baseConfigPath: string
15
12
 
16
13
  constructor() {
17
14
  this.events = new EventBus() as EventBusType
18
- this.maxPeers = 20
15
+ this.maxPeers = 10
19
16
  this.privateKey = process.env.PRIVATE_KEY as string;
20
17
  this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
21
18
  this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
22
19
  this.wallet = new Wallet(this.privateKey);
23
20
  this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
24
- this.baseConfigPath = expandHomeDir(`~/.interop-x`);
25
21
  }
26
22
 
27
23
  get publicAddress(){
@@ -31,10 +27,6 @@ class Config {
31
27
  isLeadNode() {
32
28
  return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
33
29
  }
34
-
35
- isMaintenanceMode(){
36
- return fs.existsSync(this.baseConfigPath + '/maintenance')
37
- }
38
30
  }
39
31
 
40
32
  export default new Config()
@@ -12,6 +12,6 @@ export const addresses = {
12
12
  43114: {
13
13
  gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
14
14
  multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
15
- interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
15
+ interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
16
16
  }
17
17
  }
@@ -2,7 +2,7 @@ export const itokens = {
2
2
  1: [],
3
3
  137: [
4
4
  {
5
- address: '0x62C0045f3277E7067cAcad3c8038eEaBB1Bd92D1',
5
+ address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
6
6
  symbol: 'USDC',
7
7
  }
8
8
  ],
package/src/index.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import moduleAlias from 'module-alias';
2
- import expandHomeDir from "expand-home-dir";
3
- import fs from 'fs-extra'
2
+
4
3
  moduleAlias.addAliases({
5
4
  "@/": __dirname + "/",
6
5
  "@/logger": __dirname + "/logger",
@@ -26,30 +25,12 @@ dotenv.config();
26
25
  import Logger from "@/logger";
27
26
  const logger = new Logger('Process')
28
27
 
29
- const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
30
-
31
28
  const printUsage = () => {
32
- console.log()
33
- console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
34
- console.log()
35
-
36
29
  console.log('Usage:')
37
- console.log(' interop-x help Show this message')
38
- console.log(' interop-x version Print out the installed version of Interop X')
39
-
40
- console.log()
41
-
42
- console.log(' interop-x down Put the node into maintenance mode')
43
- console.log(' interop-x up Take the node out of maintenance mode')
44
-
45
- console.log()
46
-
47
- console.log(' PRIVATE_KEY=abcd1234 interop-x Start the node with the given private key')
48
- console.log(' PRIVATE_KEY=abcd1234 STAGING=true interop-x Start the node in staging mode')
49
- console.log(' PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x Start the node in auto update mode')
50
- 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')
51
- console.log()
52
-
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')
53
34
  }
54
35
 
55
36
  if (process.argv.at(-1) === 'help') {
@@ -57,27 +38,14 @@ if (process.argv.at(-1) === 'help') {
57
38
  process.exit(0)
58
39
  }
59
40
 
60
- const basePath = expandHomeDir(`~/.interop-x`);
61
-
62
- if (process.argv.at(-1) === 'down') {
63
- fs.outputFileSync(basePath + '/maintenance', Date.now().toString())
64
- console.log(chalk.red('Maintenance mode enabled'))
65
- process.exit(0)
66
- }
67
-
68
- if (process.argv.at(-1) === 'up') {
69
- fs.removeSync(basePath + '/maintenance')
70
- console.log(chalk.green('Maintenance mode disabled'))
71
- process.exit(0)
72
- }
73
-
41
+ const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
74
42
 
75
43
  if (process.argv.at(-1) === 'version') {
76
44
  console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
77
45
  process.exit(0)
78
46
  }
79
47
 
80
- if (!process.env.PRIVATE_KEY) {
48
+ if(! process.env.PRIVATE_KEY) {
81
49
  console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
82
50
  printUsage()
83
51
  process.exit(1)
@@ -112,10 +80,10 @@ async function main() {
112
80
  if (!peerPool.isLeadNode(payload.peerId)) {
113
81
  const peer = peerPool.getPeer(payload.peerId)
114
82
 
115
- if (!peer) {
83
+ if(! peer) {
116
84
  return;
117
85
  }
118
-
86
+
119
87
  logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
120
88
  return;
121
89
  }
@@ -6,7 +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
+ import { TransactionStatusDialProtocol } from "./dial/SignatureDialProtocol.1";
10
10
 
11
11
  export interface ProtocolOptions {
12
12
  /* Handshake timeout in ms (default: 8000) */
@@ -66,11 +66,11 @@ class Protocol extends EventEmitter {
66
66
  Buffer.from(transaction.transactionHash),
67
67
 
68
68
  Buffer.from(transaction.sourceStatus),
69
- Buffer.from(transaction.sourceTransactionHash || ''),
69
+ Buffer.from(transaction.sourceTransactionHash),
70
70
  transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
71
71
 
72
72
  Buffer.from(transaction.targetStatus),
73
- Buffer.from(transaction.targetTransactionHash || ''),
73
+ Buffer.from(transaction.targetTransactionHash),
74
74
  transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
75
75
 
76
76
  Buffer.from(transaction.status),
@@ -79,11 +79,11 @@ class Protocol extends EventEmitter {
79
79
  transactionHash: transactionHash.toString(),
80
80
 
81
81
  sourceStatus: sourceStatus.toString(),
82
- sourceTransactionHash: sourceTransactionHash.toString() || null,
82
+ sourceTransactionHash: sourceTransactionHash.toString(),
83
83
  sourceErrors: sourceErrors.map((e) => e.toString()),
84
84
 
85
85
  targetStatus: targetStatus.toString(),
86
- targetTransactionHash: targetTransactionHash.toString()|| null,
86
+ targetTransactionHash: targetTransactionHash.toString(),
87
87
  targetErrors: targetErrors.map((e) => e.toString()),
88
88
 
89
89
  status: status.toString(),
@@ -1,16 +1,15 @@
1
1
  import { BaseTask } from "./BaseTask";
2
2
  import Logger from '@/logger';
3
- import spawnAsync from 'await-spawn';
4
- import { spawn } from 'child_process'
3
+ import { http } from "@/utils";
4
+ import spawn from 'await-spawn';
5
5
  import config from "@/config";
6
6
  import wait from "waait";
7
7
  import packageJson from "../../package.json";
8
8
 
9
9
  const currentVersion = packageJson.version;
10
- const tag = config.staging ? 'dev' : 'latest';
11
10
 
12
11
  class AutoUpdateTask extends BaseTask {
13
- pollIntervalMs: number = 60 * 10 * 1000
12
+ pollIntervalMs: number = 60 * 5 * 1000
14
13
 
15
14
  constructor() {
16
15
  super({
@@ -24,20 +23,22 @@ class AutoUpdateTask extends BaseTask {
24
23
 
25
24
  async getInstalledVersion() {
26
25
  try {
27
- const stdout = await spawnAsync('npm', ['-g', 'ls', '--depth=0', '--json'])
26
+ const stdout = await spawn('npm', ['-g', 'ls', '--depth=0', '--json'])
28
27
  return JSON.parse(stdout.toString()).dependencies[packageJson.name].version
29
28
  } catch (error) {
30
29
  this.logger.error(error)
30
+
31
31
  return currentVersion
32
32
  }
33
33
  }
34
34
 
35
35
  async getLatestVersion() {
36
36
  try {
37
- const stdout = await spawnAsync('npm', ['view', `${packageJson.name}@${tag}`, 'version'])
38
- return stdout.toString().trim()
37
+ const stdout = await spawn('npm', ['view', packageJson.name, 'version'])
38
+ return stdout.toString()
39
39
  } catch (error) {
40
40
  this.logger.error(error)
41
+
41
42
  return currentVersion
42
43
  }
43
44
  }
@@ -51,9 +52,10 @@ class AutoUpdateTask extends BaseTask {
51
52
 
52
53
  this.logger.warn(`New version ${version} available.`)
53
54
 
55
+
54
56
  this.logger.info('Updating...')
55
57
 
56
- await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
58
+ await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
57
59
 
58
60
  await wait(5000)
59
61
 
@@ -65,16 +67,11 @@ class AutoUpdateTask extends BaseTask {
65
67
  this.logger.warn(`Installed version ${version}`)
66
68
  this.logger.warn(`Restarting...`)
67
69
 
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), {
70
+ spawn(process.argv[0], process.argv.slice(1), {
71
71
  cwd: process.cwd(),
72
- stdio: "inherit",
73
- // shell: process.env.SHELL,
72
+ stdio: "inherit"
74
73
  });
75
74
 
76
- subprocess.unref();
77
-
78
75
  process.exit()
79
76
  }
80
77
  }
@@ -46,11 +46,6 @@ export class BaseTask extends EventEmitter implements IBaseTask {
46
46
  }
47
47
 
48
48
  prePollHandler(): boolean {
49
- if(config.isMaintenanceMode()){
50
- this.logger.warn('Maintenance mode is enabled. Skipping task.')
51
- return false
52
- }
53
-
54
49
  if (this.exceptLeadNode) {
55
50
  return !config.isLeadNode();
56
51
  }
@@ -8,7 +8,7 @@ import { ChainId } from "@/types";
8
8
  import config from "@/config";
9
9
  import { InteropBridgeToken } from "@/typechain";
10
10
 
11
- class SyncBurnEvents extends BaseTask {
11
+ class SyncWithdrawEvents extends BaseTask {
12
12
  contractAddress: string;
13
13
  provider: ethers.providers.JsonRpcProvider;
14
14
  contract: InteropBridgeToken;
@@ -17,7 +17,7 @@ class SyncBurnEvents extends BaseTask {
17
17
 
18
18
  constructor({ chainId, itokenAddress }: { chainId: ChainId, itokenAddress: string }) {
19
19
  super({
20
- logger: new Logger("InteropBridgeToken::SyncBurnEvents"),
20
+ logger: new Logger("InteropBridgeToken::SyncWithdrawEvents"),
21
21
  })
22
22
  this.chainId = chainId;
23
23
  this.itokenAddress = itokenAddress;
@@ -41,13 +41,13 @@ class SyncBurnEvents extends BaseTask {
41
41
  continue;
42
42
  }
43
43
 
44
- const { to, amount, sourceChainId, targetChainId } = event.args;
44
+ const { to, amount, chainId } = event.args;
45
45
 
46
46
  const uniqueIdentifier = {
47
47
  action: 'withdraw',
48
48
  submitTransactionHash: event.transactionHash,
49
- sourceChainId: sourceChainId,
50
- targetChainId: targetChainId,
49
+ sourceChainId:this.chainId,
50
+ targetChainId: chainId.toNumber(),
51
51
  }
52
52
 
53
53
  if (await Transaction.findOne({ where: uniqueIdentifier })) {
@@ -77,16 +77,14 @@ class SyncBurnEvents extends BaseTask {
77
77
  to,
78
78
  amount: amount.toString(),
79
79
  itoken: this.itokenAddress,
80
- sourceChainId: sourceChainId,
81
- targetChainId: targetChainId,
80
+ chainId: chainId.toString()
82
81
  },
83
82
 
84
83
  sourceEvent: {
85
84
  to,
86
85
  amount: amount.toString(),
87
86
  itoken: this.itokenAddress,
88
- sourceChainId: sourceChainId,
89
- targetChainId: targetChainId,
87
+ chainId: chainId.toString(),
90
88
  },
91
89
  status: "pending",
92
90
  })
@@ -118,4 +116,4 @@ class SyncBurnEvents extends BaseTask {
118
116
  }
119
117
  }
120
118
 
121
- export default SyncBurnEvents;
119
+ export default SyncWithdrawEvents;
@@ -15,7 +15,7 @@ import { LogDescription } from "ethers/lib/utils";
15
15
 
16
16
  const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
17
17
  console.log(transactionData);
18
-
18
+
19
19
  let isExecuted = await safeContract.dataHashes(
20
20
  await safeContract.getTransactionHash(
21
21
  transactionData.to,
@@ -97,7 +97,7 @@ class ProcessDepositEvents extends BaseTask {
97
97
  }
98
98
 
99
99
  console.log(`Processing transaction ${transaction.transactionHash}`);
100
-
100
+
101
101
  transaction.targetStatus = 'pending';
102
102
  await transaction.save();
103
103
 
@@ -121,23 +121,9 @@ class ProcessDepositEvents extends BaseTask {
121
121
  const ownersThreshold = await safeContract.getThreshold();
122
122
  await wait(10000);
123
123
 
124
- let data;
125
-
126
- try {
127
- data = await buildDataForTransaction(transaction);
128
- } catch (error) {
129
- console.log(error);
130
- transaction.targetStatus = 'failed';
131
- transaction.targetErrors = [error.message];
132
- transaction.status = 'failed'
133
- await transaction.save();
134
- protocol.sendTransaction(transaction)
135
- return;
136
- }
137
-
138
124
  let gnosisTx = await generateGnosisTransaction({
139
125
  baseGas: "0",
140
- data,
126
+ data: await buildDataForTransaction(transaction),
141
127
  gasPrice: "0",
142
128
  gasToken: "0x0000000000000000000000000000000000000000",
143
129
  nonce: '0',
@@ -156,7 +142,7 @@ class ProcessDepositEvents extends BaseTask {
156
142
  console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
157
143
 
158
144
  console.log(ownerPeerIds);
159
-
145
+
160
146
  const signatures = await protocol.requestSignatures({
161
147
  type: 'source',
162
148
  transactionHash: transaction.transactionHash,
@@ -45,8 +45,8 @@ class SyncDepositEvents extends BaseTask {
45
45
  const uniqueIdentifier = {
46
46
  action: 'deposit',
47
47
  submitTransactionHash: event.transactionHash,
48
- sourceChainId: sourceChainId,
49
- targetChainId: targetChainId,
48
+ sourceChainId: sourceChainId.toNumber(),
49
+ targetChainId: targetChainId.toNumber(),
50
50
  }
51
51
 
52
52
  if (await Transaction.findOne({ where: uniqueIdentifier })) {
@@ -1,15 +1,11 @@
1
1
  import { BaseTask } from "./BaseTask";
2
2
  import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
3
3
  import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
4
- import InteropXGatewaySyncWithdrawEvents from "./InteropXGateway/SyncWithdrawtEvents";
5
-
6
- import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncBurnEvents";
7
- import InteropBridgeSyncBurnEvents from "./InteropBridge/SyncBurnEvents";
8
- import InteropBridgeSyncMintEvents from "./InteropBridge/SyncMintEvents";
9
-
10
- import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
11
4
 
5
+ import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
6
+ import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
12
7
  import AutoUpdateTask from "./AutoUpdateTask";
8
+ import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
13
9
 
14
10
  export class Tasks {
15
11
 
@@ -17,8 +13,6 @@ export class Tasks {
17
13
  new SyncTransactionStatusTask(),
18
14
  new AutoUpdateTask(),
19
15
 
20
- // InteropXGateway
21
-
22
16
  new InteropXGatewaySyncDepositEvents({
23
17
  chainId: 43114
24
18
  }),
@@ -27,27 +21,13 @@ export class Tasks {
27
21
  chainId: 43114
28
22
  }),
29
23
 
30
-
31
- new InteropXGatewaySyncWithdrawEvents({
32
- chainId: 43114
33
- }),
34
-
35
-
36
- // InteropBridge
37
-
38
24
  new InteropBridgeSyncWithdrawEvents({
39
25
  chainId: 137,
40
26
  itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
41
27
  }),
42
28
 
43
- new InteropBridgeSyncMintEvents({
44
- chainId: 137,
45
- itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
46
- }),
47
-
48
- new InteropBridgeSyncBurnEvents({
29
+ new InteropBridgeProcessWithdrawEvents({
49
30
  chainId: 137,
50
- itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
51
31
  })
52
32
  ];
53
33