@instadapp/interop-x 0.0.0-dev.733ff78 → 0.0.0-dev.76d0265
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/package.json +13 -12
- package/dist/src/abi/index.js +2 -4
- package/dist/src/abi/interopXContract.json +454 -0
- package/dist/src/alias.js +10 -0
- package/dist/src/constants/addresses.js +7 -7
- package/dist/src/constants/index.js +0 -1
- package/dist/src/constants/tokens.js +62 -39
- package/dist/src/db/models/transaction.js +19 -11
- package/dist/src/gnosis/actions/index.js +0 -2
- package/dist/src/gnosis/actions/withdraw/index.js +115 -0
- package/dist/src/gnosis/index.js +4 -4
- package/dist/src/index.js +5 -19
- package/dist/src/net/protocol/dial/SignatureDialProtocol.js +6 -2
- package/dist/src/tasks/{InteropBridge/ProcessWithdrawEvents.js → InteropXContract/ProcessBridgeRequestEvents.js} +50 -53
- package/dist/src/tasks/InteropXContract/SyncBridgeCommittedEvents.js +93 -0
- package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +78 -0
- package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +90 -0
- package/dist/src/tasks/index.js +16 -30
- package/dist/src/typechain/{InteropBridgeToken.js → InteropXContract.js} +0 -0
- package/dist/src/typechain/factories/InteropXContract__factory.js +635 -0
- package/dist/src/typechain/factories/index.js +3 -5
- package/dist/src/typechain/index.js +3 -5
- package/dist/src/utils/index.js +44 -8
- package/package.json +13 -12
- package/src/abi/index.ts +2 -4
- package/src/abi/interopXContract.json +454 -0
- package/src/alias.ts +6 -0
- package/src/constants/addresses.ts +8 -8
- package/src/constants/index.ts +0 -1
- package/src/constants/tokens.ts +63 -40
- package/src/db/models/transaction.ts +66 -27
- package/src/gnosis/actions/index.ts +0 -2
- package/src/gnosis/actions/withdraw/index.ts +155 -0
- package/src/gnosis/index.ts +5 -5
- package/src/index.ts +4 -18
- package/src/net/protocol/dial/SignatureDialProtocol.ts +6 -2
- package/src/tasks/{InteropBridge/ProcessWithdrawEvents.ts → InteropXContract/ProcessBridgeRequestEvents.ts} +78 -100
- package/src/tasks/InteropXContract/SyncBridgeCommittedEvents.ts +125 -0
- package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +115 -0
- package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +121 -0
- package/src/tasks/index.ts +18 -36
- package/src/typechain/InteropXContract.ts +680 -0
- package/src/typechain/factories/InteropXContract__factory.ts +642 -0
- package/src/typechain/factories/index.ts +1 -2
- package/src/typechain/index.ts +2 -4
- package/src/utils/index.ts +85 -8
- package/tsconfig.json +7 -2
- package/dist/src/abi/interopBridgeToken.json +0 -298
- package/dist/src/abi/interopXGateway.json +0 -184
- package/dist/src/constants/itokens.js +0 -13
- package/dist/src/gnosis/actions/deposit.js +0 -48
- package/dist/src/gnosis/actions/withdraw.js +0 -50
- package/dist/src/tasks/InteropBridge/SyncBurnEvents.js +0 -71
- package/dist/src/tasks/InteropBridge/SyncMintEvents.js +0 -67
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +0 -164
- package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
- package/dist/src/tasks/InteropXGateway/SyncWithdrawtEvents.js +0 -72
- package/dist/src/typechain/InteropXGateway.js +0 -2
- package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -471
- package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
- package/src/abi/interopBridgeToken.json +0 -298
- package/src/abi/interopXGateway.json +0 -184
- package/src/constants/itokens.ts +0 -10
- package/src/gnosis/actions/deposit.ts +0 -63
- package/src/gnosis/actions/withdraw.ts +0 -67
- package/src/tasks/InteropBridge/SyncBurnEvents.ts +0 -119
- package/src/tasks/InteropBridge/SyncMintEvents.ts +0 -99
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -260
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
- package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts +0 -105
- package/src/typechain/InteropBridgeToken.ts +0 -692
- package/src/typechain/InteropXGateway.ts +0 -407
- package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -478
- package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
package/src/constants/tokens.ts
CHANGED
@@ -1,104 +1,127 @@
|
|
1
1
|
export const tokens = {
|
2
|
-
1: [
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
2
|
+
// 1: [
|
3
|
+
// {
|
4
|
+
// aliases: ['eth'],
|
5
|
+
// symbol: "ETH",
|
6
|
+
// name: "Ethereum",
|
7
|
+
// address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
|
8
|
+
// decimals: 18,
|
9
|
+
// },
|
10
|
+
// {
|
11
|
+
// aliases: ['weth'],
|
12
|
+
// symbol: "WETH",
|
13
|
+
// name: "Wrapped Ethereum",
|
14
|
+
// address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
|
15
|
+
// decimals: 18,
|
16
|
+
// },
|
17
|
+
// {
|
18
|
+
// aliases: ['dai'],
|
19
|
+
// symbol: "DAI",
|
20
|
+
// name: "DAI Stable",
|
21
|
+
// address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
|
22
|
+
// decimals: 18,
|
23
|
+
// },
|
24
|
+
// {
|
25
|
+
// aliases: ['usdc'],
|
26
|
+
// symbol: "USDC",
|
27
|
+
// name: "USD Coin",
|
28
|
+
// address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
|
29
|
+
// decimals: 6,
|
30
|
+
// },
|
31
|
+
// {
|
32
|
+
// aliases: ['usdt'],
|
33
|
+
// symbol: "USDT",
|
34
|
+
// name: "Tether USD Coin",
|
35
|
+
// address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
|
36
|
+
// decimals: 6,
|
37
|
+
// },
|
38
|
+
// {
|
39
|
+
// aliases: ['wbtc'],
|
40
|
+
// symbol: "WBTC",
|
41
|
+
// name: "Wrapped BTC",
|
42
|
+
// address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
|
43
|
+
// decimals: 8,
|
44
|
+
// },
|
45
|
+
// ],
|
34
46
|
137: [
|
35
47
|
{
|
48
|
+
aliases: ['eth', 'weth'],
|
36
49
|
symbol: "ETH",
|
37
50
|
name: "Ethereum",
|
38
51
|
address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
|
39
52
|
decimals: 18,
|
40
53
|
},
|
41
54
|
{
|
55
|
+
aliases: ['dai'],
|
42
56
|
symbol: "DAI",
|
43
57
|
name: "DAI Stable",
|
44
58
|
address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
|
45
59
|
decimals: 18,
|
46
60
|
},
|
47
61
|
{
|
62
|
+
aliases: ['usdc'],
|
48
63
|
symbol: "USDC",
|
49
64
|
name: "USD Coin",
|
50
65
|
address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
|
51
66
|
decimals: 6,
|
52
67
|
},
|
53
68
|
{
|
69
|
+
aliases: ['usdt'],
|
54
70
|
symbol: "USDT",
|
55
71
|
name: "Tether USD Coin",
|
56
72
|
address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
|
57
73
|
decimals: 6,
|
58
74
|
},
|
59
75
|
{
|
76
|
+
aliases: ['wbtc'],
|
60
77
|
symbol: "WBTC",
|
61
78
|
name: "Wrapped BTC",
|
62
79
|
address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
|
63
80
|
decimals: 8,
|
64
81
|
},
|
65
|
-
{
|
66
|
-
symbol: "AVAX",
|
67
|
-
name: "Avalanche Token",
|
68
|
-
address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
|
69
|
-
decimals: 18,
|
70
|
-
},
|
71
82
|
],
|
72
83
|
43114: [
|
73
84
|
{
|
85
|
+
aliases: ['eth', 'weth'],
|
74
86
|
symbol: "ETH",
|
75
87
|
name: "Ethereum",
|
76
88
|
address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
|
77
89
|
decimals: 18,
|
78
90
|
},
|
79
91
|
{
|
92
|
+
aliases: ['dai'],
|
80
93
|
symbol: "DAI",
|
81
94
|
name: "DAI Stable",
|
82
95
|
address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
|
83
96
|
decimals: 18,
|
84
97
|
},
|
85
98
|
{
|
99
|
+
aliases: ['usdc'],
|
86
100
|
symbol: "USDC",
|
87
101
|
name: "USD Coin",
|
88
102
|
address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
|
89
103
|
decimals: 6,
|
90
104
|
},
|
91
105
|
{
|
92
|
-
|
106
|
+
aliases: ['usdt'],
|
107
|
+
symbol: "USDt",
|
93
108
|
name: "Tether USD Coin",
|
109
|
+
address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
|
110
|
+
decimals: 6,
|
111
|
+
},
|
112
|
+
{
|
113
|
+
aliases: ['usdt'],
|
114
|
+
symbol: "USDT.e",
|
115
|
+
name: "Tether USD",
|
94
116
|
address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
|
95
117
|
decimals: 6,
|
96
118
|
},
|
97
119
|
{
|
120
|
+
aliases: ["wbtc"],
|
98
121
|
symbol: "WBTC",
|
99
122
|
name: "Wrapped BTC",
|
100
123
|
address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
|
101
124
|
decimals: 8,
|
102
125
|
},
|
103
126
|
],
|
104
|
-
}
|
127
|
+
} as Record<number, { aliases: string[], symbol: string, name: string, address: string, decimals: number }[]>;
|
@@ -1,21 +1,32 @@
|
|
1
1
|
import { sequelize } from '@/db/sequelize'
|
2
2
|
import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
|
3
3
|
|
4
|
+
export interface IPositionTokenInfo{
|
5
|
+
amount: string;
|
6
|
+
sourceToken: string;
|
7
|
+
targetToken: string;
|
8
|
+
}
|
9
|
+
|
10
|
+
export interface IPosition {
|
11
|
+
supply: IPositionTokenInfo[];
|
12
|
+
withdraw: IPositionTokenInfo[];
|
13
|
+
}
|
14
|
+
|
4
15
|
export class Transaction extends Model<InferAttributes<Transaction>, InferCreationAttributes<Transaction>> {
|
5
16
|
declare id: CreationOptional<number>;
|
6
17
|
|
7
18
|
declare transactionHash: string;
|
8
|
-
|
9
|
-
declare
|
10
|
-
declare
|
19
|
+
|
20
|
+
declare actionId: string;
|
21
|
+
declare bridger: string;
|
22
|
+
declare requestTransactionHash: string;
|
11
23
|
|
12
|
-
declare
|
13
|
-
declare submitBlockNumber: number;
|
24
|
+
declare requestBlockNumber: number;
|
14
25
|
|
15
26
|
declare sourceChainId: number;
|
16
27
|
declare sourceTransactionHash: CreationOptional<string>;
|
17
28
|
declare sourceBlockNumber: CreationOptional<number>;
|
18
|
-
declare sourceStatus: string
|
29
|
+
declare sourceStatus: CreationOptional<string>;
|
19
30
|
declare sourceErrors: CreationOptional<string[]>;
|
20
31
|
declare sourceLogs: CreationOptional<any[]>;
|
21
32
|
declare sourceCreatedAt: CreationOptional<Date>;
|
@@ -24,19 +35,41 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
|
|
24
35
|
declare targetChainId: number;
|
25
36
|
declare targetTransactionHash: CreationOptional<string>;
|
26
37
|
declare targetBlockNumber: CreationOptional<number>;
|
27
|
-
declare targetStatus: string
|
38
|
+
declare targetStatus: CreationOptional<string>;
|
28
39
|
declare targetErrors: CreationOptional<string[]>;
|
29
40
|
declare targetLogs: CreationOptional<any[]>;
|
30
41
|
declare targetCreatedAt: CreationOptional<Date>;
|
31
42
|
declare targetDelayUntil: CreationOptional<Date>;
|
32
43
|
|
33
|
-
declare
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
44
|
+
declare requestEvent: {
|
45
|
+
actionId: string;
|
46
|
+
bridger: string;
|
47
|
+
metadata: string;
|
48
|
+
position: IPosition;
|
49
|
+
sourceChainId: number;
|
50
|
+
targetChainId: number;
|
51
|
+
};
|
52
|
+
declare requestSentEvent: CreationOptional<{
|
53
|
+
actionId: string;
|
54
|
+
bridger: string;
|
55
|
+
metadata: string;
|
56
|
+
position: IPosition;
|
57
|
+
sourceChainId: number;
|
58
|
+
targetChainId: number;
|
59
|
+
requestTransactionHash: string;
|
60
|
+
}>;
|
61
|
+
declare committedEvent: CreationOptional<{
|
62
|
+
actionId: string;
|
63
|
+
bridger: string;
|
64
|
+
metadata: string;
|
65
|
+
position: IPosition;
|
66
|
+
sourceChainId: number;
|
67
|
+
targetChainId: number;
|
68
|
+
requestTransactionHash: string;
|
69
|
+
}>;
|
70
|
+
declare completedEvent: CreationOptional<any>;
|
71
|
+
|
72
|
+
declare status: CreationOptional<string>;
|
40
73
|
|
41
74
|
declare createdAt: CreationOptional<Date>;
|
42
75
|
declare updatedAt: CreationOptional<Date>;
|
@@ -49,19 +82,20 @@ Transaction.init({
|
|
49
82
|
primaryKey: true
|
50
83
|
},
|
51
84
|
|
52
|
-
|
53
|
-
|
85
|
+
requestTransactionHash: DataTypes.NUMBER,
|
86
|
+
requestBlockNumber: DataTypes.NUMBER,
|
54
87
|
|
55
88
|
transactionHash: DataTypes.STRING,
|
56
|
-
|
57
|
-
|
58
|
-
from: DataTypes.STRING,
|
59
|
-
to: DataTypes.STRING,
|
89
|
+
actionId: DataTypes.STRING,
|
90
|
+
bridger: DataTypes.STRING,
|
60
91
|
|
61
92
|
sourceChainId: DataTypes.NUMBER,
|
62
93
|
sourceTransactionHash: DataTypes.STRING,
|
63
94
|
sourceBlockNumber: DataTypes.NUMBER,
|
64
|
-
sourceStatus:
|
95
|
+
sourceStatus: {
|
96
|
+
type: DataTypes.STRING,
|
97
|
+
defaultValue: 'uninitialised'
|
98
|
+
},
|
65
99
|
sourceErrors: {
|
66
100
|
type: DataTypes.JSON,
|
67
101
|
// defaultValue: [],
|
@@ -79,7 +113,10 @@ Transaction.init({
|
|
79
113
|
targetChainId: DataTypes.NUMBER,
|
80
114
|
targetTransactionHash: DataTypes.STRING,
|
81
115
|
targetBlockNumber: DataTypes.NUMBER,
|
82
|
-
targetStatus:
|
116
|
+
targetStatus: {
|
117
|
+
type: DataTypes.STRING,
|
118
|
+
defaultValue: 'uninitialised'
|
119
|
+
},
|
83
120
|
targetErrors: {
|
84
121
|
type: DataTypes.JSON,
|
85
122
|
// defaultValue: [],
|
@@ -91,11 +128,13 @@ Transaction.init({
|
|
91
128
|
targetCreatedAt: DataTypes.DATE,
|
92
129
|
targetDelayUntil: DataTypes.DATE,
|
93
130
|
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
131
|
+
requestEvent: {
|
132
|
+
type: DataTypes.JSON,
|
133
|
+
allowNull: false
|
134
|
+
},
|
135
|
+
requestSentEvent: DataTypes.JSON,
|
136
|
+
committedEvent: DataTypes.JSON,
|
137
|
+
completedEvent: DataTypes.JSON,
|
99
138
|
|
100
139
|
status: {
|
101
140
|
type: DataTypes.STRING,
|
@@ -0,0 +1,155 @@
|
|
1
|
+
import abi from "@/abi";
|
2
|
+
import config from "@/config";
|
3
|
+
import { addresses, tokens } from "@/constants";
|
4
|
+
import { Transaction } from "@/db";
|
5
|
+
import { Erc20, InteropXContract } from "@/typechain";
|
6
|
+
import { ChainId } from "@/types";
|
7
|
+
import { getContract, getRpcProviderUrl, LiquidityError } from "@/utils";
|
8
|
+
import { BigNumber, ethers } from "ethers";
|
9
|
+
import { MetaTransaction, OperationType } from "ethers-multisend";
|
10
|
+
|
11
|
+
|
12
|
+
const getBridgeAmounts = async (user: string, tokens: string[], chainId: ChainId) => {
|
13
|
+
const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(chainId));
|
14
|
+
const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
|
15
|
+
const contractAddress = addresses[chainId].interopXContract;
|
16
|
+
const contract = getContract<InteropXContract>(contractAddress, abi.interopXContract, sourceWallet);
|
17
|
+
const data = await contract.getBridgeAmounts(user, tokens);
|
18
|
+
|
19
|
+
|
20
|
+
return data.map((item, index) => ({
|
21
|
+
token: tokens[index],
|
22
|
+
deposit: item.deposit,
|
23
|
+
withdraw: item.withdraw,
|
24
|
+
}))
|
25
|
+
}
|
26
|
+
|
27
|
+
export default async function (transaction: Transaction, type: 'source' | 'target') {
|
28
|
+
const transactions: MetaTransaction[] = [];
|
29
|
+
const logs: any[] = [];
|
30
|
+
|
31
|
+
if (transaction.actionId !== 'withdraw') {
|
32
|
+
throw new Error(`Invalid action: ${transaction.actionId}`)
|
33
|
+
}
|
34
|
+
|
35
|
+
if (type !== 'source') {
|
36
|
+
throw new Error(`[WIP] Type not supported: ${type}`)
|
37
|
+
}
|
38
|
+
|
39
|
+
if (transaction.sourceStatus === 'pending') {
|
40
|
+
throw Error('Source transaction already processesing')
|
41
|
+
}
|
42
|
+
|
43
|
+
if (transaction.sourceStatus === 'pending') {
|
44
|
+
throw Error('Source transaction already processed')
|
45
|
+
}
|
46
|
+
|
47
|
+
if (!transaction.requestEvent) {
|
48
|
+
throw Error('Something went wrong, source transaction has no request event')
|
49
|
+
}
|
50
|
+
|
51
|
+
const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = transaction.requestEvent;
|
52
|
+
|
53
|
+
const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(sourceChainId as ChainId));
|
54
|
+
const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
|
55
|
+
const contractAddress = addresses[sourceChainId].interopXContract;
|
56
|
+
const contract = getContract<InteropXContract>(contractAddress, abi.interopXContract, sourceWallet);
|
57
|
+
|
58
|
+
const sourceToken = tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
|
59
|
+
|
60
|
+
if (!sourceToken) {
|
61
|
+
throw Error('Source token not found')
|
62
|
+
}
|
63
|
+
|
64
|
+
const targetToken = tokens[targetChainId].find(t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
|
65
|
+
|
66
|
+
if (!targetToken) {
|
67
|
+
throw Error('Target token not found')
|
68
|
+
}
|
69
|
+
|
70
|
+
if (!sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
|
71
|
+
throw Error('Source and target token must be the same')
|
72
|
+
}
|
73
|
+
|
74
|
+
const networks: ChainId[] = [137, 43114];
|
75
|
+
const networkUserData = {}
|
76
|
+
for (const network of networks) {
|
77
|
+
networkUserData[network] = await getBridgeAmounts(bridger, tokens[network].map(t => t.address), network)
|
78
|
+
}
|
79
|
+
|
80
|
+
for (const tokenSymbol of ["dai", "usdc", "usdt", "eth", "wbtc"]) {
|
81
|
+
let totalDeposit = BigNumber.from(0)
|
82
|
+
let totalWithdraw = BigNumber.from(0)
|
83
|
+
|
84
|
+
for (const network of networks) {
|
85
|
+
// on avax might we have 2 usdc/usdt tokens
|
86
|
+
const matchedTokens = tokens[network].filter(t => t.aliases.includes(tokenSymbol));
|
87
|
+
|
88
|
+
for (const matchedToken of matchedTokens) {
|
89
|
+
const data = networkUserData[network].find(t => t.token.toLowerCase() === matchedToken.address.toLowerCase());
|
90
|
+
|
91
|
+
if (data) {
|
92
|
+
totalDeposit = totalDeposit.add(data.deposit)
|
93
|
+
totalWithdraw = totalWithdraw.add(data.withdraw)
|
94
|
+
}
|
95
|
+
}
|
96
|
+
|
97
|
+
// on Mainent add weth too
|
98
|
+
if (tokenSymbol === "eth" && network === 1) {
|
99
|
+
const weth = tokens[1].find(t => t.symbol === 'WETH');
|
100
|
+
|
101
|
+
if (weth) {
|
102
|
+
const data = networkUserData[1].find(t => t.token.toLowerCase() === weth.address.toLowerCase());
|
103
|
+
|
104
|
+
if (data) {
|
105
|
+
totalDeposit = totalDeposit.add(data.deposit)
|
106
|
+
totalWithdraw = totalWithdraw.add(data.withdraw)
|
107
|
+
}
|
108
|
+
}
|
109
|
+
}
|
110
|
+
|
111
|
+
if (totalWithdraw.gt(totalDeposit)) {
|
112
|
+
throw Error(`if withdraw > deposit, user has debt and we can't process the withdraw and reject it`)
|
113
|
+
}
|
114
|
+
|
115
|
+
if (totalWithdraw.lt(totalDeposit)) {
|
116
|
+
throw Error('Something went wrong')
|
117
|
+
}
|
118
|
+
}
|
119
|
+
}
|
120
|
+
|
121
|
+
let balance = BigNumber.from(0);
|
122
|
+
|
123
|
+
if (position.withdraw[0].sourceToken.toLowerCase() === '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'.toLowerCase()) {
|
124
|
+
balance = await sourceChainProvider.getBalance(bridger);
|
125
|
+
|
126
|
+
} else {
|
127
|
+
const erc20 = getContract<Erc20>(position.withdraw[0].sourceToken, abi.erc20, sourceChainProvider);
|
128
|
+
balance = await erc20.balanceOf(addresses[sourceChainId].gnosisSafe);
|
129
|
+
}
|
130
|
+
|
131
|
+
if (balance.lt(position.withdraw[0].amount)) {
|
132
|
+
throw new LiquidityError()
|
133
|
+
}
|
134
|
+
|
135
|
+
|
136
|
+
const { data } = await contract.populateTransaction.withdrawRequested(
|
137
|
+
actionId,
|
138
|
+
bridger,
|
139
|
+
position.withdraw[0].sourceToken,
|
140
|
+
position.withdraw[0].targetToken,
|
141
|
+
position.withdraw[0].amount,
|
142
|
+
targetChainId,
|
143
|
+
transaction.requestTransactionHash,
|
144
|
+
metadata,
|
145
|
+
);
|
146
|
+
|
147
|
+
transactions.push({
|
148
|
+
to: contractAddress,
|
149
|
+
data: data!,
|
150
|
+
value: '0',
|
151
|
+
operation: OperationType.Call,
|
152
|
+
});
|
153
|
+
|
154
|
+
return { transactions, logs }
|
155
|
+
}
|
package/src/gnosis/index.ts
CHANGED
@@ -2,12 +2,12 @@ import { Transaction } from "@/db";
|
|
2
2
|
import { encodeMulti } from "ethers-multisend";
|
3
3
|
import actions from "./actions";
|
4
4
|
|
5
|
-
export const buildGnosisAction = async (transaction: Transaction, type
|
6
|
-
type = type || transaction.sourceStatus === '
|
5
|
+
export const buildGnosisAction = async (transaction: Transaction, type: 'source' | 'target') => {
|
6
|
+
// type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
|
7
7
|
|
8
|
-
if (actions.hasOwnProperty(transaction.
|
8
|
+
if (actions.hasOwnProperty(transaction.actionId)) {
|
9
9
|
|
10
|
-
const { transactions, logs } = await actions[transaction.
|
10
|
+
const { transactions, logs } = await actions[transaction.actionId](transaction, type);
|
11
11
|
|
12
12
|
return {
|
13
13
|
data: encodeMulti(transactions).data,
|
@@ -15,5 +15,5 @@ export const buildGnosisAction = async (transaction: Transaction, type?: 'source
|
|
15
15
|
};
|
16
16
|
}
|
17
17
|
|
18
|
-
throw new Error(`Unknown action: ${transaction.
|
18
|
+
throw new Error(`Unknown action: ${transaction.actionId}`);
|
19
19
|
}
|
package/src/index.ts
CHANGED
@@ -1,23 +1,7 @@
|
|
1
|
-
import
|
1
|
+
import './alias'
|
2
2
|
import expandHomeDir from "expand-home-dir";
|
3
3
|
import fs from 'fs-extra'
|
4
|
-
moduleAlias.addAliases({
|
5
|
-
"@/": __dirname + "/",
|
6
|
-
"@/logger": __dirname + "/logger",
|
7
|
-
"@/tasks": __dirname + "/tasks",
|
8
|
-
"@/gnosis": __dirname + "/gnosis",
|
9
|
-
"@/utils": __dirname + "/utils",
|
10
|
-
"@/api": __dirname + "/api",
|
11
|
-
"@/net": __dirname + "/net",
|
12
|
-
"@/db": __dirname + "/db",
|
13
|
-
"@/config": __dirname + "/config",
|
14
|
-
"@/types": __dirname + "/types",
|
15
|
-
"@/abi": __dirname + "/abi",
|
16
|
-
"@/constants": __dirname + "/constants",
|
17
|
-
"@/typechain": __dirname + "/typechain"
|
18
|
-
})
|
19
4
|
|
20
|
-
moduleAlias();
|
21
5
|
import dotenv from "dotenv";
|
22
6
|
import chalk from 'chalk';
|
23
7
|
import { ethers } from "ethers";
|
@@ -105,7 +89,9 @@ async function main() {
|
|
105
89
|
|
106
90
|
const tasks = new Tasks()
|
107
91
|
|
108
|
-
|
92
|
+
setTimeout(() => {
|
93
|
+
tasks.start();
|
94
|
+
}, 10000)
|
109
95
|
|
110
96
|
startApiServer()
|
111
97
|
|
@@ -26,6 +26,10 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
|
|
26
26
|
}
|
27
27
|
|
28
28
|
async response(data: ISignatureRequest): Promise<ISignatureResponse> {
|
29
|
+
console.log({
|
30
|
+
tag: 'SignatureDialProtocol',
|
31
|
+
data
|
32
|
+
})
|
29
33
|
const signer = config.wallet;
|
30
34
|
|
31
35
|
let transaction: Transaction | null;
|
@@ -50,9 +54,9 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
|
|
50
54
|
const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
|
51
55
|
|
52
56
|
const signedData = await signGnosisSafeTx({
|
53
|
-
to: addresses[transaction.
|
57
|
+
to: addresses[transaction.sourceChainId].multisend,
|
54
58
|
data: gnosisData,
|
55
|
-
chainId: transaction.
|
59
|
+
chainId: transaction.sourceChainId as ChainId,
|
56
60
|
safeTxGas: data.safeTxGas,
|
57
61
|
nonce: data.safeNonce,
|
58
62
|
}, { signer });
|