@instadapp/interop-x 0.0.0-dev.a168c79 → 0.0.0-dev.adea608
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/interop-x +1 -1
- package/dist/package.json +6 -3
- package/dist/src/constants/itokens.js +1 -1
- package/dist/src/index.js +19 -1
- package/dist/src/net/peer/index.js +6 -2
- package/dist/src/net/pool/index.js +24 -9
- package/dist/src/net/protocol/dial/SignatureDialProtocol.js +11 -4
- package/dist/src/net/protocol/index.js +30 -1
- package/dist/src/tasks/BaseTask.js +1 -1
- package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +147 -0
- package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +70 -0
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +32 -22
- package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +4 -4
- package/dist/src/tasks/index.js +13 -0
- package/dist/src/utils/index.js +92 -6
- package/package.json +6 -3
- package/patches/@ethersproject+properties+5.6.0.patch +13 -0
- package/src/constants/itokens.ts +1 -1
- package/src/index.ts +26 -1
- package/src/net/peer/index.ts +7 -6
- package/src/net/pool/index.ts +33 -11
- package/src/net/protocol/dial/SignatureDialProtocol.ts +12 -4
- package/src/net/protocol/index.ts +45 -1
- package/src/tasks/BaseTask.ts +1 -1
- package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +233 -0
- package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +121 -0
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +44 -31
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +6 -6
- package/src/tasks/index.ts +19 -2
- package/src/utils/index.ts +124 -8
package/dist/src/utils/index.js
CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
|
6
|
+
exports.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
|
7
7
|
/**
|
8
8
|
* @module util
|
9
9
|
*/
|
@@ -104,9 +104,20 @@ const generateInteropTransactionHash = (data) => {
|
|
104
104
|
exports.generateInteropTransactionHash = generateInteropTransactionHash;
|
105
105
|
const buildDataForTransaction = async (transaction, type) => {
|
106
106
|
type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
|
107
|
+
switch (transaction.action) {
|
108
|
+
case "deposit":
|
109
|
+
return await (0, exports.buildDepositDataForTransaction)(transaction, type);
|
110
|
+
case "withdraw":
|
111
|
+
return await (0, exports.buildWithdrawDataForTransaction)(transaction, type);
|
112
|
+
default:
|
113
|
+
throw new Error(`Unknown action: ${transaction.action}`);
|
114
|
+
}
|
115
|
+
};
|
116
|
+
exports.buildDataForTransaction = buildDataForTransaction;
|
117
|
+
const buildDepositDataForTransaction = async (transaction, type) => {
|
107
118
|
const transactions = [];
|
108
|
-
if (transaction.action
|
109
|
-
throw new Error(
|
119
|
+
if (transaction.action !== 'deposit') {
|
120
|
+
throw new Error(`Invalid action: ${transaction.action}`);
|
110
121
|
}
|
111
122
|
if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
|
112
123
|
throw Error('Cannot build data for pending deposit transaction');
|
@@ -124,8 +135,8 @@ const buildDataForTransaction = async (transaction, type) => {
|
|
124
135
|
}
|
125
136
|
const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
|
126
137
|
const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
|
127
|
-
const interopBridgeContract =
|
128
|
-
const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.
|
138
|
+
const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
|
139
|
+
const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.user, ethers_1.ethers.BigNumber.from(transaction.submitEvent.amount.toString()), ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.submitTransactionHash);
|
129
140
|
transactions.push({
|
130
141
|
to: itoken.address,
|
131
142
|
data: data,
|
@@ -134,4 +145,79 @@ const buildDataForTransaction = async (transaction, type) => {
|
|
134
145
|
});
|
135
146
|
return (0, ethers_multisend_1.encodeMulti)(transactions).data;
|
136
147
|
};
|
137
|
-
exports.
|
148
|
+
exports.buildDepositDataForTransaction = buildDepositDataForTransaction;
|
149
|
+
const buildWithdrawDataForTransaction = async (transaction, type) => {
|
150
|
+
const transactions = [];
|
151
|
+
if (transaction.action !== 'withdraw') {
|
152
|
+
throw new Error(`Invalid action: ${transaction.action}`);
|
153
|
+
}
|
154
|
+
if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
|
155
|
+
throw Error('Cannot build data for pending withdraw transaction');
|
156
|
+
}
|
157
|
+
if (!transaction.submitEvent) {
|
158
|
+
throw Error('Cannot build data for transaction without submitEvent');
|
159
|
+
}
|
160
|
+
const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
|
161
|
+
const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
|
162
|
+
if (!itoken) {
|
163
|
+
throw Error('Cannot build data for transaction without itoken');
|
164
|
+
}
|
165
|
+
const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
|
166
|
+
if (!token) {
|
167
|
+
throw Error('Cannot build data for transaction without token');
|
168
|
+
}
|
169
|
+
const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
|
170
|
+
const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
|
171
|
+
const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
|
172
|
+
const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
|
173
|
+
const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.sourceChainId.toString()), transaction.submitTransactionHash);
|
174
|
+
transactions.push({
|
175
|
+
to: gatewayAddress,
|
176
|
+
data: data,
|
177
|
+
value: '0',
|
178
|
+
operation: ethers_multisend_1.OperationType.Call,
|
179
|
+
});
|
180
|
+
return (0, ethers_multisend_1.encodeMulti)(transactions).data;
|
181
|
+
};
|
182
|
+
exports.buildWithdrawDataForTransaction = buildWithdrawDataForTransaction;
|
183
|
+
function getContract(address, contractInterface, signerOrProvider) {
|
184
|
+
if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
|
185
|
+
throw Error(`Invalid 'address' parameter '${address}'.`);
|
186
|
+
}
|
187
|
+
const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
|
188
|
+
return new Proxy(contract, {
|
189
|
+
get(target, prop, receiver) {
|
190
|
+
const value = Reflect.get(target, prop, receiver);
|
191
|
+
if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
|
192
|
+
return async (...args) => {
|
193
|
+
try {
|
194
|
+
return await value.bind(contract)(...args);
|
195
|
+
}
|
196
|
+
catch (error) {
|
197
|
+
throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
|
198
|
+
}
|
199
|
+
};
|
200
|
+
}
|
201
|
+
if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
|
202
|
+
const parentProp = String(prop);
|
203
|
+
return new Proxy(value, {
|
204
|
+
get(target, prop, receiver) {
|
205
|
+
const value = Reflect.get(target, prop, receiver);
|
206
|
+
if (typeof value === 'function') {
|
207
|
+
return async (...args) => {
|
208
|
+
try {
|
209
|
+
return await value.bind(contract)(...args);
|
210
|
+
}
|
211
|
+
catch (error) {
|
212
|
+
throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
|
213
|
+
}
|
214
|
+
};
|
215
|
+
}
|
216
|
+
}
|
217
|
+
});
|
218
|
+
}
|
219
|
+
return value;
|
220
|
+
},
|
221
|
+
});
|
222
|
+
}
|
223
|
+
exports.getContract = getContract;
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@instadapp/interop-x",
|
3
|
-
"version": "0.0.0-dev.
|
3
|
+
"version": "0.0.0-dev.adea608",
|
4
4
|
"license": "MIT",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"engines": {
|
@@ -12,7 +12,8 @@
|
|
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
14
|
"generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
|
15
|
-
"prepublishOnly": "yarn build"
|
15
|
+
"prepublishOnly": "yarn build",
|
16
|
+
"postinstall": "patch-package"
|
16
17
|
},
|
17
18
|
"nodemonConfig": {
|
18
19
|
"watch": [
|
@@ -45,7 +46,7 @@
|
|
45
46
|
"libp2p-websockets": "^0.16.2",
|
46
47
|
"luxon": "^2.3.2",
|
47
48
|
"module-alias": "^2.2.2",
|
48
|
-
"sequelize": "
|
49
|
+
"sequelize": "6.18.0",
|
49
50
|
"sqlite3": "^5.0.5",
|
50
51
|
"waait": "^1.0.5"
|
51
52
|
},
|
@@ -59,6 +60,8 @@
|
|
59
60
|
"@types/fs-extra": "^9.0.13",
|
60
61
|
"@types/node": "^17.0.17",
|
61
62
|
"nodemon": "^2.0.15",
|
63
|
+
"patch-package": "^6.4.7",
|
64
|
+
"postinstall-postinstall": "^2.1.0",
|
62
65
|
"replace-in-file": "^6.3.2",
|
63
66
|
"rimraf": "^3.0.2",
|
64
67
|
"ts-node": "^10.5.0",
|
@@ -0,0 +1,13 @@
|
|
1
|
+
diff --git a/node_modules/@ethersproject/properties/lib/index.js b/node_modules/@ethersproject/properties/lib/index.js
|
2
|
+
index 41e0b52..4c7a9e3 100644
|
3
|
+
--- a/node_modules/@ethersproject/properties/lib/index.js
|
4
|
+
+++ b/node_modules/@ethersproject/properties/lib/index.js
|
5
|
+
@@ -44,7 +44,7 @@ function defineReadOnly(object, name, value) {
|
6
|
+
Object.defineProperty(object, name, {
|
7
|
+
enumerable: true,
|
8
|
+
value: value,
|
9
|
+
- writable: false,
|
10
|
+
+ writable: true,
|
11
|
+
});
|
12
|
+
}
|
13
|
+
exports.defineReadOnly = defineReadOnly;
|
package/src/constants/itokens.ts
CHANGED
package/src/index.ts
CHANGED
@@ -45,8 +45,9 @@ try {
|
|
45
45
|
logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
|
46
46
|
|
47
47
|
import { Tasks } from "@/tasks";
|
48
|
-
import { startPeer } from "@/net";
|
48
|
+
import { startPeer, protocol, peerPool } from "@/net";
|
49
49
|
import { startApiServer } from '@/api';
|
50
|
+
import { Transaction } from './db';
|
50
51
|
|
51
52
|
async function main() {
|
52
53
|
|
@@ -57,6 +58,30 @@ async function main() {
|
|
57
58
|
tasks.start();
|
58
59
|
|
59
60
|
startApiServer()
|
61
|
+
|
62
|
+
protocol.on('Transaction', async (payload) => {
|
63
|
+
if (!peerPool.isLeadNode(payload.peerId)) {
|
64
|
+
return;
|
65
|
+
}
|
66
|
+
|
67
|
+
const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
|
68
|
+
|
69
|
+
if (!transaction) {
|
70
|
+
return;
|
71
|
+
}
|
72
|
+
|
73
|
+
transaction.sourceStatus = payload.data.sourceStatus
|
74
|
+
transaction.sourceTransactionHash = payload.data.sourceTransactionHash
|
75
|
+
transaction.sourceErrors = payload.data.sourceErrors
|
76
|
+
|
77
|
+
transaction.targetStatus = payload.data.targetStatus
|
78
|
+
transaction.targetTransactionHash = payload.data.targetTransactionHash
|
79
|
+
transaction.targetErrors = payload.data.targetErrors
|
80
|
+
|
81
|
+
transaction.status = payload.data.status
|
82
|
+
|
83
|
+
await transaction.save()
|
84
|
+
})
|
60
85
|
}
|
61
86
|
|
62
87
|
main()
|
package/src/net/peer/index.ts
CHANGED
@@ -88,12 +88,13 @@ export const startPeer = async ({ }: IPeerOptions) => {
|
|
88
88
|
libp2p: node
|
89
89
|
})
|
90
90
|
|
91
|
-
node.on("peer:discovery", (peer) =>
|
92
|
-
logger.log(`Discovered peer ${peer}`)
|
93
|
-
); // peer disc.
|
94
|
-
|
95
|
-
|
96
|
-
|
91
|
+
node.on("peer:discovery", (peer) => {
|
92
|
+
// logger.log(`Discovered peer ${peer}`)
|
93
|
+
}); // peer disc.
|
94
|
+
|
95
|
+
node.connectionManager.on("peer:connect", (connection) => {
|
96
|
+
// logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
|
97
|
+
});
|
97
98
|
|
98
99
|
logger.log("Peer discovery started");
|
99
100
|
|
package/src/net/pool/index.ts
CHANGED
@@ -1,5 +1,10 @@
|
|
1
1
|
import { Event } from "@/types";
|
2
2
|
import config from "@/config";
|
3
|
+
import Logger from "@/logger";
|
4
|
+
import { getAddress } from "ethers/lib/utils";
|
5
|
+
|
6
|
+
|
7
|
+
const logger = new Logger('PeerPool')
|
3
8
|
|
4
9
|
export interface IPeerInfo {
|
5
10
|
id: string;
|
@@ -75,10 +80,15 @@ export class PeerPool {
|
|
75
80
|
* @emits {@link Event.POOL_PEER_ADDED}
|
76
81
|
*/
|
77
82
|
add(peer?: IPeerInfo) {
|
78
|
-
if (peer && peer.id
|
83
|
+
if (peer && peer.id) {
|
84
|
+
const newPeer = !this.pool.get(peer.id);
|
79
85
|
this.pool.set(peer.id, peer)
|
80
86
|
peer.pooled = true
|
81
|
-
|
87
|
+
|
88
|
+
if (newPeer) {
|
89
|
+
config.events.emit(Event.POOL_PEER_ADDED, peer)
|
90
|
+
logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
|
91
|
+
}
|
82
92
|
}
|
83
93
|
}
|
84
94
|
|
@@ -92,6 +102,7 @@ export class PeerPool {
|
|
92
102
|
if (this.pool.delete(peer.id)) {
|
93
103
|
peer.pooled = false
|
94
104
|
config.events.emit(Event.POOL_PEER_REMOVED, peer)
|
105
|
+
logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`)
|
95
106
|
}
|
96
107
|
}
|
97
108
|
}
|
@@ -100,7 +111,7 @@ export class PeerPool {
|
|
100
111
|
this.cleanup()
|
101
112
|
|
102
113
|
return this.peers.filter((p) => {
|
103
|
-
if(!p.pooled) return false;
|
114
|
+
if (!p.pooled) return false;
|
104
115
|
|
105
116
|
const now = new Date()
|
106
117
|
|
@@ -113,15 +124,26 @@ export class PeerPool {
|
|
113
124
|
}
|
114
125
|
|
115
126
|
|
116
|
-
|
117
|
-
|
127
|
+
isLeadNode(id: string) {
|
128
|
+
const peer = this.pool.get(id);
|
118
129
|
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
130
|
+
if (!peer) {
|
131
|
+
return false;
|
132
|
+
}
|
133
|
+
|
134
|
+
return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
|
135
|
+
}
|
136
|
+
|
137
|
+
|
138
|
+
cleanup() {
|
139
|
+
// let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
|
140
|
+
|
141
|
+
// this.peers.forEach((peerInfo) => {
|
142
|
+
// if (peerInfo.updated.getTime() < compDate) {
|
143
|
+
// console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
|
144
|
+
// this.remove(peerInfo)
|
145
|
+
// }
|
146
|
+
// })
|
125
147
|
}
|
126
148
|
}
|
127
149
|
|
@@ -47,12 +47,20 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
|
|
47
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
|
+
});
|
57
|
+
|
50
58
|
const signedData = await signGnosisSafeTx({
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
chainId: transaction.sourceChainId as ChainId,
|
59
|
+
to: addresses[transaction.targetChainId].multisend,
|
60
|
+
data: await buildDataForTransaction(transaction, data.type),
|
61
|
+
chainId: transaction.targetChainId as ChainId,
|
55
62
|
safeTxGas: data.safeTxGas,
|
63
|
+
nonce: data.safeNonce,
|
56
64
|
}, { signer });
|
57
65
|
|
58
66
|
return {
|
@@ -5,6 +5,7 @@ import { SignatureDialProtocol, ISignatureRequest, ISignatureResponse } from "./
|
|
5
5
|
import { IPeerInfo, peerPool } from "..";
|
6
6
|
import config from "@/config";
|
7
7
|
import { Event } from "@/types";
|
8
|
+
import { Transaction } from "@/db";
|
8
9
|
|
9
10
|
export interface ProtocolOptions {
|
10
11
|
/* Handshake timeout in ms (default: 8000) */
|
@@ -33,7 +34,12 @@ interface PeerInfoEvent extends BaseMessageEvent {
|
|
33
34
|
data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
|
34
35
|
}
|
35
36
|
|
37
|
+
interface TransactionEvent extends BaseMessageEvent {
|
38
|
+
data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
|
39
|
+
}
|
40
|
+
|
36
41
|
declare interface Protocol {
|
42
|
+
on(event: 'Transaction', listener: (payload: TransactionEvent) => void): this;
|
37
43
|
on(event: 'PeerInfo', listener: (payload: PeerInfoEvent) => void): this;
|
38
44
|
on(event: string, listener: (payload: BaseMessageEvent) => void): this;
|
39
45
|
}
|
@@ -44,7 +50,7 @@ class Protocol extends EventEmitter {
|
|
44
50
|
private protocolMessages: Message[] = [
|
45
51
|
{
|
46
52
|
name: 'PeerInfo',
|
47
|
-
code:
|
53
|
+
code: 0x01,
|
48
54
|
encode: (info: Pick<IPeerInfo, 'publicAddress'>) => [
|
49
55
|
Buffer.from(info.publicAddress),
|
50
56
|
],
|
@@ -52,6 +58,36 @@ class Protocol extends EventEmitter {
|
|
52
58
|
publicAddress: publicAddress.toString(),
|
53
59
|
}),
|
54
60
|
},
|
61
|
+
{
|
62
|
+
name: 'Transaction',
|
63
|
+
code: 0x02,
|
64
|
+
encode: (transaction: Transaction) => [
|
65
|
+
Buffer.from(transaction.transactionHash),
|
66
|
+
|
67
|
+
Buffer.from(transaction.sourceStatus),
|
68
|
+
Buffer.from(transaction.sourceTransactionHash),
|
69
|
+
transaction.sourceErrors.map((e) => Buffer.from(e)),
|
70
|
+
|
71
|
+
Buffer.from(transaction.targetStatus),
|
72
|
+
Buffer.from(transaction.targetTransactionHash),
|
73
|
+
transaction.targetErrors.map((e) => Buffer.from(e)),
|
74
|
+
|
75
|
+
Buffer.from(transaction.status),
|
76
|
+
],
|
77
|
+
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
|
78
|
+
transactionHash: transactionHash.toString(),
|
79
|
+
|
80
|
+
sourceStatus: sourceStatus.toString(),
|
81
|
+
sourceTransactionHash: sourceTransactionHash.toString(),
|
82
|
+
sourceErrors: sourceErrors.map((e) => e.toString()),
|
83
|
+
|
84
|
+
targetStatus: targetStatus.toString(),
|
85
|
+
targetTransactionHash: targetTransactionHash.toString(),
|
86
|
+
targetErrors: targetErrors.map((e) => e.toString()),
|
87
|
+
|
88
|
+
status: status.toString(),
|
89
|
+
}),
|
90
|
+
},
|
55
91
|
];
|
56
92
|
private signature: SignatureDialProtocol;
|
57
93
|
|
@@ -121,6 +157,14 @@ class Protocol extends EventEmitter {
|
|
121
157
|
this.libp2p.pubsub.publish(this.topic, encoded)
|
122
158
|
}
|
123
159
|
|
160
|
+
public sendTransaction(transaction: Transaction) {
|
161
|
+
const message = this.protocolMessages.find((m) => m.name === 'Transaction')!
|
162
|
+
|
163
|
+
const encoded = rlp.encode([message.code, message.encode(transaction)]);
|
164
|
+
|
165
|
+
this.libp2p.pubsub.publish(this.topic, encoded)
|
166
|
+
}
|
167
|
+
|
124
168
|
async requestSignatures(data: ISignatureRequest, peerIds?: string[]) {
|
125
169
|
try {
|
126
170
|
peerIds = peerIds || peerPool.activePeerIds;
|
package/src/tasks/BaseTask.ts
CHANGED
@@ -37,7 +37,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
|
|
37
37
|
await this.pollHandler()
|
38
38
|
}
|
39
39
|
} catch (err) {
|
40
|
-
this.logger.error(`poll check error
|
40
|
+
this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`)
|
41
41
|
}
|
42
42
|
|
43
43
|
await this.postPollHandler()
|
@@ -0,0 +1,233 @@
|
|
1
|
+
import { BaseTask } from "../BaseTask";
|
2
|
+
import Logger from '@/logger';
|
3
|
+
import { BigNumber, ethers } from "ethers";
|
4
|
+
import abi from "@/abi";
|
5
|
+
import { Transaction } from "@/db";
|
6
|
+
import { buildDataForTransaction, buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
|
7
|
+
import { addresses } from "@/constants";
|
8
|
+
import { ChainId } from "@/types";
|
9
|
+
import config from "@/config";
|
10
|
+
import { GnosisSafe, InteropXGateway } from "@/typechain";
|
11
|
+
import { Op } from "sequelize";
|
12
|
+
import wait from "waait";
|
13
|
+
import { peerPool, protocol } from "@/net";
|
14
|
+
import { LogDescription } from "ethers/lib/utils";
|
15
|
+
|
16
|
+
const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
|
17
|
+
console.log(transactionData);
|
18
|
+
|
19
|
+
let isExecuted = await safeContract.dataHashes(
|
20
|
+
await safeContract.getTransactionHash(
|
21
|
+
transactionData.to,
|
22
|
+
transactionData.value,
|
23
|
+
transactionData.data,
|
24
|
+
transactionData.operation,
|
25
|
+
transactionData.safeTxGas,
|
26
|
+
transactionData.baseGas,
|
27
|
+
transactionData.gasPrice,
|
28
|
+
transactionData.gasToken,
|
29
|
+
transactionData.refundReceiver,
|
30
|
+
transactionData.nonce
|
31
|
+
)
|
32
|
+
)
|
33
|
+
|
34
|
+
while (isExecuted == 1) {
|
35
|
+
transactionData.safeTxGas = BigNumber.from(String(transactionData.safeTxGas)).add(1).toString()
|
36
|
+
|
37
|
+
isExecuted = await safeContract.dataHashes(
|
38
|
+
await safeContract.getTransactionHash(
|
39
|
+
transactionData.to,
|
40
|
+
transactionData.value,
|
41
|
+
transactionData.data,
|
42
|
+
transactionData.operation,
|
43
|
+
transactionData.safeTxGas,
|
44
|
+
transactionData.baseGas,
|
45
|
+
transactionData.gasPrice,
|
46
|
+
transactionData.gasToken,
|
47
|
+
transactionData.refundReceiver,
|
48
|
+
transactionData.nonce
|
49
|
+
)
|
50
|
+
)
|
51
|
+
}
|
52
|
+
|
53
|
+
return transactionData
|
54
|
+
}
|
55
|
+
|
56
|
+
class ProcessWithdrawEvents extends BaseTask {
|
57
|
+
provider: ethers.providers.JsonRpcProvider;
|
58
|
+
chainId: ChainId;
|
59
|
+
leadNodeOnly = true
|
60
|
+
|
61
|
+
constructor({ chainId }: { chainId: ChainId }) {
|
62
|
+
super({
|
63
|
+
logger: new Logger("InteropXGateway::ProcessWithdrawEvents"),
|
64
|
+
})
|
65
|
+
this.chainId = chainId;
|
66
|
+
}
|
67
|
+
|
68
|
+
async pollHandler() {
|
69
|
+
const blockNumber = await this.provider.getBlockNumber()
|
70
|
+
|
71
|
+
const transaction = await Transaction.findOne({
|
72
|
+
where: {
|
73
|
+
status: 'pending',
|
74
|
+
sourceStatus: 'success',
|
75
|
+
targetStatus: 'uninitialised',
|
76
|
+
action: 'withdraw',
|
77
|
+
sourceCreatedAt: {
|
78
|
+
[Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
|
79
|
+
},
|
80
|
+
targetDelayUntil: {
|
81
|
+
[Op.or]: {
|
82
|
+
[Op.is]: null,
|
83
|
+
[Op.lt]: new Date(),
|
84
|
+
}
|
85
|
+
},
|
86
|
+
sourceBlockNumber: {
|
87
|
+
[Op.lt]: blockNumber - 12,
|
88
|
+
},
|
89
|
+
sourceChainId: this.chainId,
|
90
|
+
}
|
91
|
+
})
|
92
|
+
|
93
|
+
if (!transaction) {
|
94
|
+
return;
|
95
|
+
}
|
96
|
+
|
97
|
+
console.log(`Processing transaction ${transaction.transactionHash}`);
|
98
|
+
|
99
|
+
transaction.targetStatus = 'pending';
|
100
|
+
await transaction.save();
|
101
|
+
|
102
|
+
// refresh event data?
|
103
|
+
|
104
|
+
const targetChainProvider = new ethers.providers.JsonRpcProvider(
|
105
|
+
getRpcProviderUrl(transaction.targetChainId as ChainId)
|
106
|
+
);
|
107
|
+
|
108
|
+
const targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
|
109
|
+
|
110
|
+
const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
|
111
|
+
|
112
|
+
|
113
|
+
const safeContract = getContract<GnosisSafe>(
|
114
|
+
safeAddress,
|
115
|
+
abi.gnosisSafe,
|
116
|
+
targetWallet
|
117
|
+
)
|
118
|
+
|
119
|
+
const ownersThreshold = await safeContract.getThreshold();
|
120
|
+
await wait(10000);
|
121
|
+
|
122
|
+
let gnosisTx = await generateGnosisTransaction({
|
123
|
+
baseGas: "0",
|
124
|
+
data: await buildDataForTransaction(transaction),
|
125
|
+
gasPrice: "0",
|
126
|
+
gasToken: "0x0000000000000000000000000000000000000000",
|
127
|
+
nonce: '0',
|
128
|
+
operation: "1",
|
129
|
+
refundReceiver: "0x0000000000000000000000000000000000000000",
|
130
|
+
safeAddress: safeAddress,
|
131
|
+
safeTxGas: "79668",
|
132
|
+
to: addresses[transaction.targetChainId].multisend,
|
133
|
+
value: "0",
|
134
|
+
}, safeContract);
|
135
|
+
|
136
|
+
const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
|
137
|
+
|
138
|
+
const ownerPeerIds = peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id)
|
139
|
+
|
140
|
+
console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
|
141
|
+
|
142
|
+
console.log(ownerPeerIds);
|
143
|
+
|
144
|
+
const signatures = await protocol.requestSignatures({
|
145
|
+
type: 'source',
|
146
|
+
transactionHash: transaction.transactionHash,
|
147
|
+
safeTxGas: gnosisTx.safeTxGas,
|
148
|
+
safeNonce: gnosisTx.nonce
|
149
|
+
}, ownerPeerIds)
|
150
|
+
|
151
|
+
|
152
|
+
const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x') as Signature[];
|
153
|
+
|
154
|
+
console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
|
155
|
+
|
156
|
+
if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
|
157
|
+
await transaction.save();
|
158
|
+
transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
|
159
|
+
transaction.targetStatus = 'uninitialised'
|
160
|
+
|
161
|
+
await transaction.save();
|
162
|
+
const errorMessage = signatures.find(s => !!s.error)?.error;
|
163
|
+
throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
|
164
|
+
}
|
165
|
+
|
166
|
+
|
167
|
+
console.log(`Executing transaction for execution ${transaction.transactionHash}`)
|
168
|
+
|
169
|
+
const { data: txData } = await safeContract.populateTransaction.execTransaction(
|
170
|
+
gnosisTx.to,
|
171
|
+
gnosisTx.value,
|
172
|
+
gnosisTx.data,
|
173
|
+
gnosisTx.operation,
|
174
|
+
gnosisTx.safeTxGas,
|
175
|
+
gnosisTx.baseGas,
|
176
|
+
gnosisTx.gasPrice,
|
177
|
+
gnosisTx.gasToken,
|
178
|
+
gnosisTx.refundReceiver,
|
179
|
+
buildSignatureBytes(validSignatures)
|
180
|
+
);
|
181
|
+
|
182
|
+
console.log({
|
183
|
+
from: targetWallet.address,
|
184
|
+
gasPrice: BigNumber.from(120 * 10 ** 9).toString(),
|
185
|
+
to: safeAddress,
|
186
|
+
data: txData,
|
187
|
+
})
|
188
|
+
|
189
|
+
|
190
|
+
const txSent = await targetWallet.sendTransaction({
|
191
|
+
from: targetWallet.address,
|
192
|
+
gasPrice: BigNumber.from(120 * 10 ** 9),
|
193
|
+
to: safeAddress,
|
194
|
+
data: txData,
|
195
|
+
})
|
196
|
+
|
197
|
+
const receipt = await txSent.wait();
|
198
|
+
|
199
|
+
const parsedLogs: LogDescription[] = [];
|
200
|
+
|
201
|
+
receipt.logs.forEach((log) => {
|
202
|
+
try {
|
203
|
+
parsedLogs.push(safeContract.interface.parseLog(log));
|
204
|
+
} catch (e) { }
|
205
|
+
});
|
206
|
+
|
207
|
+
if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
|
208
|
+
console.log('ExecutionSuccess')
|
209
|
+
transaction.targetStatus = 'success'
|
210
|
+
transaction.targetTransactionHash = txSent.hash
|
211
|
+
transaction.status = 'success'
|
212
|
+
await transaction.save();
|
213
|
+
} else {
|
214
|
+
console.log('ExecutionFailure')
|
215
|
+
transaction.targetStatus = 'failed'
|
216
|
+
transaction.targetTransactionHash = txSent.hash
|
217
|
+
transaction.status = 'failed'
|
218
|
+
await transaction.save();
|
219
|
+
}
|
220
|
+
}
|
221
|
+
|
222
|
+
async start(): Promise<void> {
|
223
|
+
this.logger.info(`Starting execution watcher on interop chain`);
|
224
|
+
|
225
|
+
this.provider = new ethers.providers.JsonRpcProvider(
|
226
|
+
getRpcProviderUrl(this.chainId)
|
227
|
+
);
|
228
|
+
|
229
|
+
await super.start()
|
230
|
+
}
|
231
|
+
}
|
232
|
+
|
233
|
+
export default ProcessWithdrawEvents;
|