@instadapp/interop-x 0.0.0-dev.80722d6 → 0.0.0-dev.8965b57
Sign up to get free protection for your applications and to get access to all the features.
- package/bin/interop-x +1 -1
- package/dist/package.json +73 -0
- package/dist/{abi → src/abi}/erc20.json +0 -0
- package/dist/{abi → src/abi}/gnosisSafe.json +0 -0
- package/dist/{abi → src/abi}/index.js +2 -4
- package/dist/src/abi/interopXContract.json +391 -0
- package/dist/src/alias.js +10 -0
- package/dist/src/api/index.js +36 -0
- package/dist/{config → src/config}/index.js +11 -1
- package/dist/{constants → src/constants}/addresses.js +3 -11
- package/dist/{constants → src/constants}/index.js +0 -0
- package/dist/{constants → src/constants}/tokens.js +31 -1
- package/dist/{db → src/db}/index.js +0 -0
- package/dist/{db → src/db}/models/index.js +0 -0
- package/dist/{db → src/db}/models/transaction.js +27 -9
- package/dist/{db → src/db}/sequelize.js +0 -0
- package/dist/src/gnosis/actions/index.js +9 -0
- package/dist/src/gnosis/actions/withdraw/index.js +55 -0
- package/dist/src/gnosis/index.js +20 -0
- package/dist/src/index.js +119 -0
- package/dist/{logger → src/logger}/index.js +0 -0
- package/dist/{net → src/net}/index.js +0 -0
- package/dist/{net → src/net}/peer/index.js +8 -3
- package/dist/{net → src/net}/pool/index.js +32 -9
- package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +0 -0
- package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +21 -12
- package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
- package/dist/{net → src/net}/protocol/index.js +51 -1
- package/dist/src/tasks/AutoUpdateTask.js +70 -0
- package/dist/{tasks → src/tasks}/BaseTask.js +12 -4
- package/dist/src/tasks/InteropXContract/ProcessBridgeRequestEvents.js +152 -0
- package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +77 -0
- package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +89 -0
- package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +55 -0
- package/dist/src/tasks/index.js +38 -0
- package/dist/{typechain → src/typechain}/Erc20.js +0 -0
- package/dist/{typechain → src/typechain}/GnosisSafe.js +0 -0
- package/dist/{typechain/InteropBridgeToken.js → src/typechain/InteropXContract.js} +0 -0
- package/dist/{typechain → src/typechain}/common.js +0 -0
- package/dist/{typechain → src/typechain}/factories/Erc20__factory.js +0 -0
- package/dist/{typechain → src/typechain}/factories/GnosisSafe__factory.js +0 -0
- package/dist/src/typechain/factories/InteropXContract__factory.js +526 -0
- package/dist/src/typechain/factories/index.js +12 -0
- package/dist/{typechain → src/typechain}/index.js +3 -5
- package/dist/{types.js → src/types.js} +0 -0
- package/dist/src/utils/index.js +168 -0
- package/package.json +13 -6
- package/patches/@ethersproject+properties+5.6.0.patch +13 -0
- package/src/abi/index.ts +2 -4
- package/src/abi/interopXContract.json +391 -0
- package/src/alias.ts +6 -0
- package/src/api/index.ts +36 -0
- package/src/config/index.ts +11 -1
- package/src/constants/addresses.ts +3 -11
- package/src/constants/tokens.ts +32 -2
- package/src/db/models/transaction.ts +68 -25
- package/src/gnosis/actions/index.ts +5 -0
- package/src/gnosis/actions/withdraw/index.ts +76 -0
- package/src/gnosis/index.ts +19 -0
- package/src/index.ts +101 -24
- package/src/net/peer/index.ts +9 -7
- package/src/net/pool/index.ts +41 -11
- package/src/net/protocol/dial/SignatureDialProtocol.ts +23 -13
- package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
- package/src/net/protocol/index.ts +67 -1
- package/src/tasks/AutoUpdateTask.ts +82 -0
- package/src/tasks/BaseTask.ts +14 -4
- package/src/tasks/InteropXContract/ProcessBridgeRequestEvents.ts +216 -0
- package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +114 -0
- package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +120 -0
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +67 -0
- package/src/tasks/index.ts +24 -5
- package/src/typechain/InteropXContract.ts +524 -0
- package/src/typechain/factories/InteropXContract__factory.ts +533 -0
- package/src/typechain/factories/index.ts +1 -2
- package/src/typechain/index.ts +2 -4
- package/src/utils/index.ts +119 -8
- package/tsconfig.json +7 -2
- package/dist/abi/interopBridgeToken.json +0 -286
- package/dist/abi/interopXGateway.json +0 -184
- package/dist/index.js +0 -63
- package/dist/tasks/InteropXGateway/SyncDepositEvents.js +0 -79
- package/dist/tasks/index.js +0 -27
- package/dist/typechain/InteropXGateway.js +0 -2
- package/dist/typechain/factories/InteropBridgeToken__factory.js +0 -459
- package/dist/typechain/factories/InteropXGateway__factory.js +0 -265
- package/dist/typechain/factories/index.js +0 -14
- package/dist/utils/index.js +0 -101
- package/src/abi/interopBridgeToken.json +0 -286
- package/src/abi/interopXGateway.json +0 -184
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -114
- package/src/typechain/InteropBridgeToken.ts +0 -686
- package/src/typechain/InteropXGateway.ts +0 -407
- package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
- package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
package/src/net/pool/index.ts
CHANGED
@@ -1,5 +1,12 @@
|
|
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
|
+
import { shortenHash } from "@/utils";
|
6
|
+
import chalk from "chalk";
|
7
|
+
|
8
|
+
|
9
|
+
const logger = new Logger('PeerPool')
|
3
10
|
|
4
11
|
export interface IPeerInfo {
|
5
12
|
id: string;
|
@@ -75,10 +82,15 @@ export class PeerPool {
|
|
75
82
|
* @emits {@link Event.POOL_PEER_ADDED}
|
76
83
|
*/
|
77
84
|
add(peer?: IPeerInfo) {
|
78
|
-
if (peer && peer.id
|
85
|
+
if (peer && peer.id) {
|
86
|
+
const newPeer = !this.pool.get(peer.id);
|
79
87
|
this.pool.set(peer.id, peer)
|
80
88
|
peer.pooled = true
|
81
|
-
|
89
|
+
|
90
|
+
if (newPeer) {
|
91
|
+
config.events.emit(Event.POOL_PEER_ADDED, peer)
|
92
|
+
logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
|
93
|
+
}
|
82
94
|
}
|
83
95
|
}
|
84
96
|
|
@@ -92,6 +104,7 @@ export class PeerPool {
|
|
92
104
|
if (this.pool.delete(peer.id)) {
|
93
105
|
peer.pooled = false
|
94
106
|
config.events.emit(Event.POOL_PEER_REMOVED, peer)
|
107
|
+
logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
|
95
108
|
}
|
96
109
|
}
|
97
110
|
}
|
@@ -100,7 +113,7 @@ export class PeerPool {
|
|
100
113
|
this.cleanup()
|
101
114
|
|
102
115
|
return this.peers.filter((p) => {
|
103
|
-
if(!p.pooled) return false;
|
116
|
+
if (!p.pooled) return false;
|
104
117
|
|
105
118
|
const now = new Date()
|
106
119
|
|
@@ -112,16 +125,33 @@ export class PeerPool {
|
|
112
125
|
return this.activePeers.map((p) => p.id)
|
113
126
|
}
|
114
127
|
|
128
|
+
getPeer(id: string){
|
129
|
+
return this.pool.get(id);
|
130
|
+
}
|
115
131
|
|
116
|
-
|
117
|
-
|
132
|
+
isLeadNode(id: string) {
|
133
|
+
const peer = this.pool.get(id);
|
118
134
|
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
135
|
+
if (!peer) {
|
136
|
+
return false;
|
137
|
+
}
|
138
|
+
|
139
|
+
return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
|
140
|
+
}
|
141
|
+
|
142
|
+
getLeadPeer() {
|
143
|
+
return this.peers.find((p) => this.isLeadNode(p.id))
|
144
|
+
}
|
145
|
+
|
146
|
+
cleanup() {
|
147
|
+
// let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
|
148
|
+
|
149
|
+
// this.peers.forEach((peerInfo) => {
|
150
|
+
// if (peerInfo.updated.getTime() < compDate) {
|
151
|
+
// console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
|
152
|
+
// this.remove(peerInfo)
|
153
|
+
// }
|
154
|
+
// })
|
125
155
|
}
|
126
156
|
}
|
127
157
|
|
@@ -2,9 +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 { signGnosisSafeTx } from "@/utils";
|
6
|
+
import { addresses } from "@/constants";
|
7
|
+
import { ChainId } from "@/types";
|
8
|
+
import { buildGnosisAction } from "@/gnosis";
|
5
9
|
|
6
10
|
export interface ISignatureRequest {
|
7
|
-
type:
|
11
|
+
type: 'source' | 'target',
|
8
12
|
transactionHash: string
|
9
13
|
safeTxGas: string
|
10
14
|
safeNonce: string
|
@@ -22,38 +26,44 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
|
|
22
26
|
}
|
23
27
|
|
24
28
|
async response(data: ISignatureRequest): Promise<ISignatureResponse> {
|
29
|
+
console.log({
|
30
|
+
tag: 'SignatureDialProtocol',
|
31
|
+
data
|
32
|
+
})
|
25
33
|
const signer = config.wallet;
|
26
34
|
|
27
|
-
let
|
35
|
+
let transaction: Transaction | null;
|
28
36
|
let maxTimeout = 20000;
|
29
37
|
|
30
38
|
do {
|
31
|
-
|
39
|
+
transaction = await Transaction.findOne({ where: { transactionHash: data.transactionHash } })
|
32
40
|
|
33
|
-
if (!
|
41
|
+
if (!transaction) {
|
34
42
|
await wait(1000);
|
35
43
|
maxTimeout -= 1000;
|
36
44
|
}
|
37
|
-
} while (!
|
45
|
+
} while (!transaction && maxTimeout > 0)
|
38
46
|
|
39
|
-
if (!
|
47
|
+
if (!transaction) {
|
40
48
|
return {
|
41
49
|
signer: signer.address,
|
42
50
|
data: null,
|
43
51
|
error: 'Event not found'
|
44
52
|
};
|
45
53
|
}
|
54
|
+
const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
|
46
55
|
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
56
|
+
const signedData = await signGnosisSafeTx({
|
57
|
+
to: addresses[transaction.sourceChainId].multisend,
|
58
|
+
data: gnosisData,
|
59
|
+
chainId: transaction.sourceChainId as ChainId,
|
60
|
+
safeTxGas: data.safeTxGas,
|
61
|
+
nonce: data.safeNonce,
|
62
|
+
}, { signer });
|
53
63
|
|
54
64
|
return {
|
55
65
|
signer: signer.address,
|
56
|
-
data:
|
66
|
+
data: signedData
|
57
67
|
}
|
58
68
|
}
|
59
69
|
}
|
@@ -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
|
+
}
|
@@ -5,6 +5,8 @@ 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";
|
9
|
+
import { TransactionStatusDialProtocol } from "./dial/TransactionStatusDialProtocol";
|
8
10
|
|
9
11
|
export interface ProtocolOptions {
|
10
12
|
/* Handshake timeout in ms (default: 8000) */
|
@@ -33,7 +35,12 @@ interface PeerInfoEvent extends BaseMessageEvent {
|
|
33
35
|
data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
|
34
36
|
}
|
35
37
|
|
38
|
+
interface TransactionStatusEvent extends BaseMessageEvent {
|
39
|
+
data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'>
|
40
|
+
}
|
41
|
+
|
36
42
|
declare interface Protocol {
|
43
|
+
on(event: 'TransactionStatus', listener: (payload: TransactionStatusEvent) => void): this;
|
37
44
|
on(event: 'PeerInfo', listener: (payload: PeerInfoEvent) => void): this;
|
38
45
|
on(event: string, listener: (payload: BaseMessageEvent) => void): this;
|
39
46
|
}
|
@@ -44,7 +51,7 @@ class Protocol extends EventEmitter {
|
|
44
51
|
private protocolMessages: Message[] = [
|
45
52
|
{
|
46
53
|
name: 'PeerInfo',
|
47
|
-
code:
|
54
|
+
code: 0x01,
|
48
55
|
encode: (info: Pick<IPeerInfo, 'publicAddress'>) => [
|
49
56
|
Buffer.from(info.publicAddress),
|
50
57
|
],
|
@@ -52,8 +59,49 @@ class Protocol extends EventEmitter {
|
|
52
59
|
publicAddress: publicAddress.toString(),
|
53
60
|
}),
|
54
61
|
},
|
62
|
+
{
|
63
|
+
name: 'TransactionStatus',
|
64
|
+
code: 0x02,
|
65
|
+
encode: (transaction: Transaction) => [
|
66
|
+
Buffer.from(transaction.transactionHash),
|
67
|
+
|
68
|
+
Buffer.from(transaction.sourceStatus),
|
69
|
+
Buffer.from(transaction.sourceTransactionHash || ''),
|
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)]) : [],
|
72
|
+
|
73
|
+
Buffer.from(transaction.targetStatus),
|
74
|
+
Buffer.from(transaction.targetTransactionHash || ''),
|
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)]) : [],
|
77
|
+
|
78
|
+
Buffer.from(transaction.status),
|
79
|
+
],
|
80
|
+
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]: [Buffer, Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer]) => ({
|
81
|
+
transactionHash: transactionHash.toString(),
|
82
|
+
|
83
|
+
sourceStatus: sourceStatus.toString(),
|
84
|
+
sourceTransactionHash: sourceTransactionHash.toString() || null,
|
85
|
+
sourceErrors: sourceErrors.map((e) => e.toString()),
|
86
|
+
sourceLogs: sourceLogs.map(e => ({
|
87
|
+
type: e[0].toString(),
|
88
|
+
message: e[1].toString(),
|
89
|
+
})),
|
90
|
+
|
91
|
+
targetStatus: targetStatus.toString(),
|
92
|
+
targetTransactionHash: targetTransactionHash.toString() || null,
|
93
|
+
targetErrors: targetErrors.map((e) => e.toString()),
|
94
|
+
targetLogs: targetLogs.map(e => ({
|
95
|
+
type: e[0].toString(),
|
96
|
+
message: e[1].toString(),
|
97
|
+
})),
|
98
|
+
|
99
|
+
status: status.toString(),
|
100
|
+
}),
|
101
|
+
},
|
55
102
|
];
|
56
103
|
private signature: SignatureDialProtocol;
|
104
|
+
private transactionStatus: TransactionStatusDialProtocol;
|
57
105
|
|
58
106
|
|
59
107
|
start({ libp2p, topic = null, }) {
|
@@ -73,6 +121,7 @@ class Protocol extends EventEmitter {
|
|
73
121
|
})
|
74
122
|
|
75
123
|
this.signature = new SignatureDialProtocol(this.libp2p);
|
124
|
+
this.transactionStatus = new TransactionStatusDialProtocol(this.libp2p);
|
76
125
|
}
|
77
126
|
|
78
127
|
|
@@ -121,6 +170,14 @@ class Protocol extends EventEmitter {
|
|
121
170
|
this.libp2p.pubsub.publish(this.topic, encoded)
|
122
171
|
}
|
123
172
|
|
173
|
+
public sendTransaction(transaction: Transaction) {
|
174
|
+
const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus')!
|
175
|
+
|
176
|
+
const encoded = rlp.encode([message.code, message.encode(transaction)]);
|
177
|
+
|
178
|
+
this.libp2p.pubsub.publish(this.topic, encoded)
|
179
|
+
}
|
180
|
+
|
124
181
|
async requestSignatures(data: ISignatureRequest, peerIds?: string[]) {
|
125
182
|
try {
|
126
183
|
peerIds = peerIds || peerPool.activePeerIds;
|
@@ -133,6 +190,15 @@ class Protocol extends EventEmitter {
|
|
133
190
|
return []
|
134
191
|
}
|
135
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
|
+
}
|
136
202
|
}
|
137
203
|
|
138
204
|
export const protocol = new Protocol();
|
@@ -0,0 +1,82 @@
|
|
1
|
+
import { BaseTask } from "./BaseTask";
|
2
|
+
import Logger from '@/logger';
|
3
|
+
import spawnAsync from 'await-spawn';
|
4
|
+
import { spawn } from 'child_process'
|
5
|
+
import config from "@/config";
|
6
|
+
import wait from "waait";
|
7
|
+
import packageJson from "../../package.json";
|
8
|
+
|
9
|
+
const currentVersion = packageJson.version;
|
10
|
+
const tag = config.staging ? 'dev' : 'latest';
|
11
|
+
|
12
|
+
class AutoUpdateTask extends BaseTask {
|
13
|
+
pollIntervalMs: number = 60 * 10 * 1000
|
14
|
+
|
15
|
+
constructor() {
|
16
|
+
super({
|
17
|
+
logger: new Logger("AutoUpdateTask"),
|
18
|
+
})
|
19
|
+
}
|
20
|
+
|
21
|
+
prePollHandler(): boolean {
|
22
|
+
return config.autoUpdate && !config.isLeadNode();
|
23
|
+
}
|
24
|
+
|
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
|
+
}
|
34
|
+
|
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
|
+
}
|
44
|
+
|
45
|
+
async pollHandler() {
|
46
|
+
const version = await this.getLatestVersion()
|
47
|
+
|
48
|
+
if (version === currentVersion) {
|
49
|
+
return;
|
50
|
+
}
|
51
|
+
|
52
|
+
this.logger.warn(`New version ${version} available.`)
|
53
|
+
|
54
|
+
this.logger.info('Updating...')
|
55
|
+
|
56
|
+
await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
|
57
|
+
|
58
|
+
await wait(5000)
|
59
|
+
|
60
|
+
if (version !== await this.getInstalledVersion()) {
|
61
|
+
this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
|
62
|
+
return;
|
63
|
+
}
|
64
|
+
|
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()
|
79
|
+
}
|
80
|
+
}
|
81
|
+
|
82
|
+
export default AutoUpdateTask;
|
package/src/tasks/BaseTask.ts
CHANGED
@@ -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()
|
@@ -37,7 +38,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
|
|
37
38
|
await this.pollHandler()
|
38
39
|
}
|
39
40
|
} catch (err) {
|
40
|
-
this.logger.error(`poll check error
|
41
|
+
this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`)
|
41
42
|
}
|
42
43
|
|
43
44
|
await this.postPollHandler()
|
@@ -45,11 +46,20 @@ export class BaseTask extends EventEmitter implements IBaseTask {
|
|
45
46
|
}
|
46
47
|
|
47
48
|
prePollHandler(): boolean {
|
48
|
-
if
|
49
|
-
|
49
|
+
if(config.isMaintenanceMode()){
|
50
|
+
this.logger.warn('Maintenance mode is enabled. Skipping task.')
|
51
|
+
return false
|
50
52
|
}
|
51
53
|
|
52
|
-
|
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() {
|
@@ -0,0 +1,216 @@
|
|
1
|
+
import { BaseTask } from "../BaseTask";
|
2
|
+
import Logger from '@/logger';
|
3
|
+
import { ethers, Wallet } from "ethers";
|
4
|
+
import abi from "@/abi";
|
5
|
+
import { Transaction } from "@/db";
|
6
|
+
import { buildSignatureBytes, generateGnosisTransaction, generateInteropTransactionHash, getContract, getRpcProviderUrl, Signature } from "@/utils";
|
7
|
+
import { addresses } from "@/constants";
|
8
|
+
import { Op } from "sequelize";
|
9
|
+
import { ChainId } from "@/types";
|
10
|
+
import config from "@/config";
|
11
|
+
import { GnosisSafe, InteropXContract } from "@/typechain";
|
12
|
+
import wait from "waait";
|
13
|
+
import { buildGnosisAction } from "@/gnosis";
|
14
|
+
import { peerPool, protocol } from "@/net";
|
15
|
+
import { LogDescription } from "ethers/lib/utils";
|
16
|
+
|
17
|
+
class ProccessBridgeRequestEvents extends BaseTask {
|
18
|
+
contractAddress: string;
|
19
|
+
safeContractAddress: string;
|
20
|
+
provider: ethers.providers.JsonRpcProvider;
|
21
|
+
contract: InteropXContract;
|
22
|
+
safeContract: GnosisSafe;
|
23
|
+
chainId: ChainId;
|
24
|
+
sourceWallet: Wallet;
|
25
|
+
|
26
|
+
leadNodeOnly: boolean = true;
|
27
|
+
|
28
|
+
constructor({ chainId }: { chainId: ChainId }) {
|
29
|
+
super({
|
30
|
+
logger: new Logger("InteropXContract::ProccessBridgeRequestEvents"),
|
31
|
+
})
|
32
|
+
this.chainId = chainId;
|
33
|
+
}
|
34
|
+
|
35
|
+
async pollHandler() {
|
36
|
+
const blockNumber = await this.provider.getBlockNumber()
|
37
|
+
|
38
|
+
const transaction = await Transaction.findOne({
|
39
|
+
where: {
|
40
|
+
status: 'pending',
|
41
|
+
sourceStatus: 'uninitialised',
|
42
|
+
createdAt: {
|
43
|
+
[Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
|
44
|
+
},
|
45
|
+
sourceDelayUntil: {
|
46
|
+
[Op.or]: {
|
47
|
+
[Op.is]: null,
|
48
|
+
[Op.lt]: new Date(),
|
49
|
+
}
|
50
|
+
},
|
51
|
+
requestBlockNumber: {
|
52
|
+
[Op.lt]: blockNumber - 12,
|
53
|
+
},
|
54
|
+
sourceChainId: this.chainId,
|
55
|
+
}
|
56
|
+
})
|
57
|
+
|
58
|
+
if (!transaction) {
|
59
|
+
return;
|
60
|
+
}
|
61
|
+
|
62
|
+
console.log(`Processing transaction ${transaction.transactionHash}`);
|
63
|
+
|
64
|
+
transaction.targetStatus = 'pending';
|
65
|
+
await transaction.save();
|
66
|
+
|
67
|
+
const ownersThreshold = await this.safeContract.getThreshold();
|
68
|
+
await wait(10000);
|
69
|
+
|
70
|
+
|
71
|
+
let data, logs = [];
|
72
|
+
|
73
|
+
try {
|
74
|
+
({ data, logs } = await buildGnosisAction(transaction, 'source'));
|
75
|
+
|
76
|
+
} catch (error) {
|
77
|
+
console.log(error);
|
78
|
+
transaction.sourceStatus = 'failed';
|
79
|
+
transaction.sourceErrors = [error.message];
|
80
|
+
transaction.targetStatus = 'failed';
|
81
|
+
|
82
|
+
transaction.status = 'failed'
|
83
|
+
await transaction.save();
|
84
|
+
protocol.sendTransaction(transaction)
|
85
|
+
return;
|
86
|
+
}
|
87
|
+
|
88
|
+
let gnosisTx = await generateGnosisTransaction({
|
89
|
+
baseGas: "0",
|
90
|
+
data,
|
91
|
+
gasPrice: "0",
|
92
|
+
gasToken: "0x0000000000000000000000000000000000000000",
|
93
|
+
nonce: '0',
|
94
|
+
operation: "1",
|
95
|
+
refundReceiver: "0x0000000000000000000000000000000000000000",
|
96
|
+
safeAddress: this.safeContractAddress,
|
97
|
+
safeTxGas: "79668",
|
98
|
+
to: addresses[transaction.sourceChainId].multisend,
|
99
|
+
value: "0",
|
100
|
+
}, this.safeContract);
|
101
|
+
|
102
|
+
const owners = await this.safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
|
103
|
+
|
104
|
+
const ownerPeerIds = peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id)
|
105
|
+
|
106
|
+
console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
|
107
|
+
|
108
|
+
console.log(ownerPeerIds);
|
109
|
+
|
110
|
+
const signatures = await protocol.requestSignatures({
|
111
|
+
type: 'source',
|
112
|
+
transactionHash: transaction.transactionHash,
|
113
|
+
safeTxGas: gnosisTx.safeTxGas,
|
114
|
+
safeNonce: gnosisTx.nonce
|
115
|
+
}, ownerPeerIds)
|
116
|
+
|
117
|
+
|
118
|
+
const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x') as Signature[];
|
119
|
+
|
120
|
+
console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
|
121
|
+
|
122
|
+
if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
|
123
|
+
await transaction.save();
|
124
|
+
transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
|
125
|
+
transaction.sourceStatus = 'uninitialised'
|
126
|
+
|
127
|
+
await transaction.save();
|
128
|
+
const errorMessage = signatures.find(s => !!s.error)?.error;
|
129
|
+
throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
|
130
|
+
}
|
131
|
+
|
132
|
+
console.log(`Executing transaction for execution ${transaction.transactionHash}`)
|
133
|
+
|
134
|
+
const { data: txData } = await this.safeContract.populateTransaction.execTransaction(
|
135
|
+
gnosisTx.to,
|
136
|
+
gnosisTx.value,
|
137
|
+
gnosisTx.data,
|
138
|
+
gnosisTx.operation,
|
139
|
+
gnosisTx.safeTxGas,
|
140
|
+
gnosisTx.baseGas,
|
141
|
+
gnosisTx.gasPrice,
|
142
|
+
gnosisTx.gasToken,
|
143
|
+
gnosisTx.refundReceiver,
|
144
|
+
buildSignatureBytes(validSignatures)
|
145
|
+
);
|
146
|
+
|
147
|
+
const txSent = await this.sourceWallet.sendTransaction({
|
148
|
+
from: this.sourceWallet.address,
|
149
|
+
gasPrice: ethers.BigNumber.from(120 * 10 ** 9),
|
150
|
+
to: this.safeContractAddress,
|
151
|
+
data: txData,
|
152
|
+
})
|
153
|
+
|
154
|
+
console.log(txSent);
|
155
|
+
|
156
|
+
|
157
|
+
const receipt = await txSent.wait();
|
158
|
+
|
159
|
+
const parsedLogs: LogDescription[] = [];
|
160
|
+
|
161
|
+
receipt.logs.forEach((log) => {
|
162
|
+
try {
|
163
|
+
parsedLogs.push(this.safeContract.interface.parseLog(log));
|
164
|
+
} catch (e) { }
|
165
|
+
});
|
166
|
+
|
167
|
+
if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
|
168
|
+
console.log('ExecutionSuccess')
|
169
|
+
transaction.sourceStatus = 'success'
|
170
|
+
if (txSent.blockNumber)
|
171
|
+
transaction.sourceBlockNumber = txSent.blockNumber;
|
172
|
+
transaction.sourceTransactionHash = txSent.hash
|
173
|
+
transaction.sourceLogs = logs;
|
174
|
+
transaction.status = 'success'
|
175
|
+
await transaction.save();
|
176
|
+
} else {
|
177
|
+
console.log('ExecutionFailure')
|
178
|
+
transaction.sourceStatus = 'failed'
|
179
|
+
if (txSent.blockNumber)
|
180
|
+
transaction.sourceBlockNumber = txSent.blockNumber;
|
181
|
+
transaction.sourceTransactionHash = txSent.hash
|
182
|
+
transaction.sourceTransactionHash = txSent.hash
|
183
|
+
transaction.status = 'failed'
|
184
|
+
await transaction.save();
|
185
|
+
}
|
186
|
+
|
187
|
+
protocol.sendTransaction(transaction)
|
188
|
+
}
|
189
|
+
|
190
|
+
async start(): Promise<void> {
|
191
|
+
this.contractAddress = addresses[this.chainId].interopXContract;
|
192
|
+
|
193
|
+
this.provider = new ethers.providers.JsonRpcProvider(
|
194
|
+
getRpcProviderUrl(this.chainId)
|
195
|
+
);
|
196
|
+
|
197
|
+
this.sourceWallet = new ethers.Wallet(config.privateKey!, this.provider);
|
198
|
+
|
199
|
+
this.contract = getContract<InteropXContract>(
|
200
|
+
this.contractAddress,
|
201
|
+
abi.interopXContract,
|
202
|
+
this.sourceWallet
|
203
|
+
);
|
204
|
+
|
205
|
+
this.safeContractAddress = addresses[this.chainId].gnosisSafe;
|
206
|
+
this.safeContract = getContract<GnosisSafe>(
|
207
|
+
this.safeContractAddress,
|
208
|
+
abi.gnosisSafe,
|
209
|
+
this.sourceWallet
|
210
|
+
);
|
211
|
+
|
212
|
+
await super.start()
|
213
|
+
}
|
214
|
+
}
|
215
|
+
|
216
|
+
export default ProccessBridgeRequestEvents;
|