@instadapp/interop-x 0.0.0-dev.a846f65 → 0.0.0-dev.a9cd1d2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (76) hide show
  1. package/dist/package.json +14 -12
  2. package/dist/src/abi/index.js +2 -4
  3. package/dist/src/abi/interopX.json +1436 -0
  4. package/dist/src/alias.js +10 -0
  5. package/dist/src/api/index.js +3 -0
  6. package/dist/src/config/index.js +10 -1
  7. package/dist/src/constants/addresses.js +2 -7
  8. package/dist/src/constants/index.js +0 -1
  9. package/dist/src/constants/tokens.js +62 -39
  10. package/dist/src/db/models/transaction.js +29 -11
  11. package/dist/src/gnosis/actions/index.js +9 -0
  12. package/dist/src/gnosis/actions/withdraw/index.js +114 -0
  13. package/dist/src/gnosis/index.js +20 -0
  14. package/dist/src/index.js +34 -22
  15. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
  16. package/dist/src/net/protocol/dial/{SignatureDialProtocol.1.js → TransactionStatusDialProtocol.js} +2 -0
  17. package/dist/src/net/protocol/index.js +17 -7
  18. package/dist/src/tasks/AutoUpdateTask.js +11 -8
  19. package/dist/src/tasks/BaseTask.js +4 -0
  20. package/dist/src/tasks/InteropX/SyncLogSubmitEvents.js +84 -0
  21. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +6 -2
  22. package/dist/src/tasks/index.js +7 -19
  23. package/dist/src/typechain/{InteropBridgeToken.js → InteropX.js} +0 -0
  24. package/dist/src/typechain/factories/InteropX__factory.js +1928 -0
  25. package/dist/src/typechain/factories/index.js +3 -5
  26. package/dist/src/typechain/index.js +3 -5
  27. package/dist/src/utils/index.js +46 -89
  28. package/package.json +14 -12
  29. package/src/abi/index.ts +2 -4
  30. package/src/abi/interopX.json +1436 -0
  31. package/src/alias.ts +6 -0
  32. package/src/api/index.ts +3 -0
  33. package/src/config/index.ts +9 -1
  34. package/src/constants/addresses.ts +3 -8
  35. package/src/constants/index.ts +0 -1
  36. package/src/constants/tokens.ts +63 -40
  37. package/src/db/models/transaction.ts +65 -25
  38. package/src/gnosis/actions/index.ts +5 -0
  39. package/src/gnosis/actions/withdraw/index.ts +155 -0
  40. package/src/gnosis/index.ts +19 -0
  41. package/src/index.ts +47 -26
  42. package/src/net/protocol/dial/SignatureDialProtocol.ts +11 -13
  43. package/src/net/protocol/dial/{SignatureDialProtocol.1.ts → TransactionStatusDialProtocol.ts} +3 -1
  44. package/src/net/protocol/index.ts +17 -7
  45. package/src/tasks/AutoUpdateTask.ts +15 -14
  46. package/src/tasks/BaseTask.ts +5 -0
  47. package/src/tasks/InteropX/SyncLogSubmitEvents.ts +136 -0
  48. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +6 -2
  49. package/src/tasks/index.ts +12 -23
  50. package/src/typechain/InteropX.ts +1216 -0
  51. package/src/typechain/factories/InteropX__factory.ts +1932 -0
  52. package/src/typechain/factories/index.ts +1 -2
  53. package/src/typechain/index.ts +2 -4
  54. package/src/utils/index.ts +98 -128
  55. package/tsconfig.json +7 -2
  56. package/dist/src/abi/interopBridgeToken.json +0 -286
  57. package/dist/src/abi/interopXGateway.json +0 -184
  58. package/dist/src/constants/itokens.js +0 -13
  59. package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +0 -146
  60. package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +0 -69
  61. package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +0 -149
  62. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
  63. package/dist/src/typechain/InteropXGateway.js +0 -2
  64. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -459
  65. package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
  66. package/src/abi/interopBridgeToken.json +0 -286
  67. package/src/abi/interopXGateway.json +0 -184
  68. package/src/constants/itokens.ts +0 -10
  69. package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +0 -231
  70. package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +0 -119
  71. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -243
  72. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
  73. package/src/typechain/InteropBridgeToken.ts +0 -686
  74. package/src/typechain/InteropXGateway.ts +0 -407
  75. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
  76. package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.InteropXGateway__factory = exports.InteropBridgeToken__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
3
+ exports.InteropX__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
4
4
  /* Autogenerated file. Do not edit manually. */
5
5
  /* tslint:disable */
6
6
  /* eslint-disable */
@@ -8,7 +8,5 @@ var Erc20__factory_1 = require("./Erc20__factory");
8
8
  Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
9
9
  var GnosisSafe__factory_1 = require("./GnosisSafe__factory");
10
10
  Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
11
- var InteropBridgeToken__factory_1 = require("./InteropBridgeToken__factory");
12
- Object.defineProperty(exports, "InteropBridgeToken__factory", { enumerable: true, get: function () { return InteropBridgeToken__factory_1.InteropBridgeToken__factory; } });
13
- var InteropXGateway__factory_1 = require("./InteropXGateway__factory");
14
- Object.defineProperty(exports, "InteropXGateway__factory", { enumerable: true, get: function () { return InteropXGateway__factory_1.InteropXGateway__factory; } });
11
+ var InteropX__factory_1 = require("./InteropX__factory");
12
+ Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__factory; } });
@@ -23,13 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.InteropXGateway__factory = exports.InteropBridgeToken__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
26
+ exports.InteropX__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
27
27
  exports.factories = __importStar(require("./factories"));
28
28
  var Erc20__factory_1 = require("./factories/Erc20__factory");
29
29
  Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
30
30
  var GnosisSafe__factory_1 = require("./factories/GnosisSafe__factory");
31
31
  Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
32
- var InteropBridgeToken__factory_1 = require("./factories/InteropBridgeToken__factory");
33
- Object.defineProperty(exports, "InteropBridgeToken__factory", { enumerable: true, get: function () { return InteropBridgeToken__factory_1.InteropBridgeToken__factory; } });
34
- var InteropXGateway__factory_1 = require("./factories/InteropXGateway__factory");
35
- Object.defineProperty(exports, "InteropXGateway__factory", { enumerable: true, get: function () { return InteropXGateway__factory_1.InteropXGateway__factory; } });
32
+ var InteropX__factory_1 = require("./factories/InteropX__factory");
33
+ Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__factory; } });
@@ -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.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
6
+ exports.LiquidityError = exports.generateGnosisTransaction = exports.getContract = exports.ContractError = 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,9 +11,7 @@ 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"));
14
+ const async_retry_1 = __importDefault(require("async-retry"));
17
15
  exports.http = axios_1.default.create();
18
16
  (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
19
17
  function shortenHash(hash, length = 4) {
@@ -104,92 +102,20 @@ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
104
102
  };
105
103
  exports.asyncCallWithTimeout = asyncCallWithTimeout;
106
104
  const generateInteropTransactionHash = (data) => {
107
- return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
108
- String(data.action),
109
- String(data.submitTransactionHash),
105
+ return ethers_1.ethers.utils.solidityKeccak256(Array.from(Array(7), () => 'string'), [
106
+ String(data.actionId),
107
+ String(data.vnonce),
108
+ String(data.sourceSender),
110
109
  String(data.sourceChainId),
110
+ String(data.sourceDsaId),
111
111
  String(data.targetChainId),
112
+ String(data.targetDsaId),
112
113
  ]);
113
114
  };
114
115
  exports.generateInteropTransactionHash = generateInteropTransactionHash;
115
- const buildDataForTransaction = async (transaction, type) => {
116
- type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
117
- switch (transaction.action) {
118
- case "deposit":
119
- return await (0, exports.buildDepositDataForTransaction)(transaction, type);
120
- case "withdraw":
121
- return await (0, exports.buildWithdrawDataForTransaction)(transaction, type);
122
- default:
123
- throw new Error(`Unknown action: ${transaction.action}`);
124
- }
125
- };
126
- exports.buildDataForTransaction = buildDataForTransaction;
127
- const buildDepositDataForTransaction = async (transaction, type) => {
128
- const transactions = [];
129
- if (transaction.action !== 'deposit') {
130
- throw new Error(`Invalid action: ${transaction.action}`);
131
- }
132
- if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
133
- throw Error('Cannot build data for pending deposit transaction');
134
- }
135
- if (!transaction.submitEvent) {
136
- throw Error('Cannot build data for transaction without submitEvent');
137
- }
138
- const token = constants_1.tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
139
- if (!token) {
140
- throw Error('Cannot build data for transaction without token');
141
- }
142
- const itoken = constants_1.itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
143
- if (!itoken) {
144
- throw Error('Cannot build data for transaction without itoken');
145
- }
146
- const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
147
- const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
148
- const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
149
- 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);
150
- transactions.push({
151
- to: itoken.address,
152
- data: data,
153
- value: '0',
154
- operation: ethers_multisend_1.OperationType.Call,
155
- });
156
- return (0, ethers_multisend_1.encodeMulti)(transactions).data;
157
- };
158
- exports.buildDepositDataForTransaction = buildDepositDataForTransaction;
159
- const buildWithdrawDataForTransaction = async (transaction, type) => {
160
- const transactions = [];
161
- if (transaction.action !== 'withdraw') {
162
- throw new Error(`Invalid action: ${transaction.action}`);
163
- }
164
- if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
165
- throw Error('Cannot build data for pending withdraw transaction');
166
- }
167
- if (!transaction.submitEvent) {
168
- throw Error('Cannot build data for transaction without submitEvent');
169
- }
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
- if (!itoken) {
173
- throw Error('Cannot build data for transaction without itoken');
174
- }
175
- const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
176
- if (!token) {
177
- throw Error('Cannot build data for transaction without token');
178
- }
179
- const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
180
- const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
181
- const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
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(transaction.sourceChainId.toString()), transaction.submitTransactionHash);
184
- transactions.push({
185
- to: gatewayAddress,
186
- data: data,
187
- value: '0',
188
- operation: ethers_multisend_1.OperationType.Call,
189
- });
190
- return (0, ethers_multisend_1.encodeMulti)(transactions).data;
191
- };
192
- exports.buildWithdrawDataForTransaction = buildWithdrawDataForTransaction;
116
+ class ContractError extends Error {
117
+ }
118
+ exports.ContractError = ContractError;
193
119
  function getContract(address, contractInterface, signerOrProvider) {
194
120
  if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
195
121
  throw Error(`Invalid 'address' parameter '${address}'.`);
@@ -204,12 +130,22 @@ function getContract(address, contractInterface, signerOrProvider) {
204
130
  get(target, prop, receiver) {
205
131
  const value = Reflect.get(target, prop, receiver);
206
132
  if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
133
+ let isConstant = false;
134
+ try {
135
+ isConstant = contract.interface.getFunction(String(prop)).constant;
136
+ }
137
+ catch (error) {
138
+ }
207
139
  return async (...args) => {
208
140
  try {
209
- return await value.bind(contract)(...args);
141
+ return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: isConstant ? 1 : 3 });
210
142
  }
211
143
  catch (error) {
212
- throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
144
+ const err = new ContractError(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
145
+ err.method = String(prop);
146
+ err.address = address;
147
+ err.args = [...args];
148
+ throw err;
213
149
  }
214
150
  };
215
151
  }
@@ -221,10 +157,14 @@ function getContract(address, contractInterface, signerOrProvider) {
221
157
  if (typeof value === 'function') {
222
158
  return async (...args) => {
223
159
  try {
224
- return await value.bind(contract)(...args);
160
+ return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: parentProp === 'callStatic' ? 3 : 1 });
225
161
  }
226
162
  catch (error) {
227
- throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
163
+ const err = new ContractError(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
164
+ err.method = String(prop);
165
+ err.address = address;
166
+ err.args = [...args];
167
+ throw err;
228
168
  }
229
169
  };
230
170
  }
@@ -236,3 +176,20 @@ function getContract(address, contractInterface, signerOrProvider) {
236
176
  });
237
177
  }
238
178
  exports.getContract = getContract;
179
+ const generateGnosisTransaction = async (transactionData, safeContract) => {
180
+ console.log(transactionData);
181
+ let isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
182
+ while (isExecuted == 1) {
183
+ transactionData.safeTxGas = ethers_1.ethers.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
184
+ isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
185
+ }
186
+ return transactionData;
187
+ };
188
+ exports.generateGnosisTransaction = generateGnosisTransaction;
189
+ class LiquidityError extends Error {
190
+ constructor(message) {
191
+ super(message || 'Not enough liquidity');
192
+ Object.setPrototypeOf(this, new.target.prototype);
193
+ }
194
+ }
195
+ exports.LiquidityError = LiquidityError;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instadapp/interop-x",
3
- "version": "0.0.0-dev.a846f65",
3
+ "version": "0.0.0-dev.a9cd1d2",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "engines": {
@@ -11,7 +11,7 @@
11
11
  "start": "yarn build && node bin/interop-x",
12
12
  "build": "yarn generate-abi-types && export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/**/*.js",
13
13
  "dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
14
- "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
14
+ "generate-abi-types": "rimraf src/typechain && typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
15
15
  "prepublishOnly": "yarn build",
16
16
  "postinstall": "patch-package"
17
17
  },
@@ -25,16 +25,18 @@
25
25
  "dependencies": {
26
26
  "@achingbrain/libp2p-gossipsub": "^0.12.2",
27
27
  "@fastify/cors": "^7.0.0",
28
+ "async-retry": "^1.3.3",
28
29
  "await-spawn": "^4.0.2",
29
- "axios": "^0.27.1",
30
- "axios-retry": "^3.2.4",
30
+ "axios": "^0.27.2",
31
+ "axios-retry": "^3.2.5",
31
32
  "chalk": "4.1.2",
32
- "dotenv": "^16.0.0",
33
+ "dotenv": "^16.0.1",
33
34
  "ethereumjs-util": "^7.1.4",
34
- "ethers": "^5.6.4",
35
+ "ethers": "^5.6.5",
35
36
  "ethers-multisend": "^2.1.1",
36
37
  "expand-home-dir": "^0.0.3",
37
- "fastify": "^3.28.0",
38
+ "fastify": "^3.29.0",
39
+ "fs-extra": "^10.1.0",
38
40
  "libp2p": "^0.36.2",
39
41
  "libp2p-bootstrap": "^0.14.0",
40
42
  "libp2p-kad-dht": "^0.28.6",
@@ -44,12 +46,12 @@
44
46
  "libp2p-pubsub-peer-discovery": "^4.0.0",
45
47
  "libp2p-tcp": "^0.17.2",
46
48
  "libp2p-websockets": "^0.16.2",
47
- "luxon": "^2.3.2",
49
+ "luxon": "^2.4.0",
48
50
  "module-alias": "^2.2.2",
49
51
  "patch-package": "^6.4.7",
50
52
  "postinstall-postinstall": "^2.1.0",
51
53
  "sequelize": "6.18.0",
52
- "sqlite3": "^5.0.5",
54
+ "sqlite3": "^5.0.8",
53
55
  "waait": "^1.0.5"
54
56
  },
55
57
  "bin": {
@@ -60,13 +62,13 @@
60
62
  "@typechain/ethers-v5": "^10.0.0",
61
63
  "@types/bn.js": "^5.1.0",
62
64
  "@types/fs-extra": "^9.0.13",
63
- "@types/node": "^17.0.17",
64
- "nodemon": "^2.0.15",
65
+ "@types/node": "^17.0.33",
66
+ "nodemon": "^2.0.16",
65
67
  "replace-in-file": "^6.3.2",
66
68
  "rimraf": "^3.0.2",
67
69
  "ts-node": "^10.5.0",
68
70
  "tsconfig-paths": "^3.12.0",
69
71
  "typechain": "^8.0.0",
70
- "typescript": "^4.5.5"
72
+ "typescript": "^4.6.4"
71
73
  }
72
74
  }
package/src/abi/index.ts CHANGED
@@ -1,11 +1,9 @@
1
1
  import gnosisSafe from "./gnosisSafe.json";
2
2
  import erc20 from "./erc20.json";
3
- import interopXGateway from "./interopXGateway.json";
4
- import interopBridgeToken from "./interopBridgeToken.json";
3
+ import interopX from "./interopX.json";
5
4
 
6
5
  export default {
7
6
  gnosisSafe,
8
7
  erc20,
9
- interopXGateway,
10
- interopBridgeToken,
8
+ interopX,
11
9
  }