Skip to content

Commit fdb2853

Browse files
gabrielbazan7gabrielbazan7
committed
[FIX] for fee and amount checks - paypro
1 parent 25fb204 commit fdb2853

File tree

5 files changed

+549
-13
lines changed

5 files changed

+549
-13
lines changed

‎packages/bitcore-wallet-client/src/lib/common/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ export class Utils {
367367
}
368368
const unsignedTxs = [];
369369
const isERC20 = tokenAddress && !payProUrl;
370-
const isETHMULTISIG = multisigContractAddress && !payProUrl;
370+
const isETHMULTISIG = multisigContractAddress;
371371
const chain = isETHMULTISIG ? 'ETHMULTISIG' : isERC20 ? 'ERC20' : this.getChain(coin);
372372
for (let index = 0; index < recipients.length; index++) {
373373
const rawTx = Transactions.create({

‎packages/bitcore-wallet-service/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"dependencies": {
2525
"@sendgrid/mail": "^6.3.1",
26+
"abi-decoder": "2.0.1",
2627
"async": "^0.9.2",
2728
"bitcore-lib": "^8.23.1",
2829
"bitcore-lib-cash": "^8.23.1",

‎packages/bitcore-wallet-service/src/lib/chain/eth/abi-erc20.ts

Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
export const ERC20Abi = [
2+
{
3+
constant: true,
4+
inputs: [],
5+
name: 'name',
6+
outputs: [
7+
{
8+
name: '',
9+
type: 'string'
10+
}
11+
],
12+
payable: false,
13+
stateMutability: 'view',
14+
type: 'function'
15+
},
16+
{
17+
constant: false,
18+
inputs: [
19+
{
20+
name: '_spender',
21+
type: 'address'
22+
},
23+
{
24+
name: '_value',
25+
type: 'uint256'
26+
}
27+
],
28+
name: 'approve',
29+
outputs: [
30+
{
31+
name: '',
32+
type: 'bool'
33+
}
34+
],
35+
payable: false,
36+
stateMutability: 'nonpayable',
37+
type: 'function'
38+
},
39+
{
40+
constant: true,
41+
inputs: [],
42+
name: 'totalSupply',
43+
outputs: [
44+
{
45+
name: '',
46+
type: 'uint256'
47+
}
48+
],
49+
payable: false,
50+
stateMutability: 'view',
51+
type: 'function'
52+
},
53+
{
54+
constant: false,
55+
inputs: [
56+
{
57+
name: '_from',
58+
type: 'address'
59+
},
60+
{
61+
name: '_to',
62+
type: 'address'
63+
},
64+
{
65+
name: '_value',
66+
type: 'uint256'
67+
}
68+
],
69+
name: 'transferFrom',
70+
outputs: [
71+
{
72+
name: '',
73+
type: 'bool'
74+
}
75+
],
76+
payable: false,
77+
stateMutability: 'nonpayable',
78+
type: 'function'
79+
},
80+
{
81+
constant: true,
82+
inputs: [],
83+
name: 'decimals',
84+
outputs: [
85+
{
86+
name: '',
87+
type: 'uint8'
88+
}
89+
],
90+
payable: false,
91+
stateMutability: 'view',
92+
type: 'function'
93+
},
94+
{
95+
constant: true,
96+
inputs: [
97+
{
98+
name: '_owner',
99+
type: 'address'
100+
}
101+
],
102+
name: 'balanceOf',
103+
outputs: [
104+
{
105+
name: 'balance',
106+
type: 'uint256'
107+
}
108+
],
109+
payable: false,
110+
stateMutability: 'view',
111+
type: 'function'
112+
},
113+
{
114+
constant: true,
115+
inputs: [],
116+
name: 'symbol',
117+
outputs: [
118+
{
119+
name: '',
120+
type: 'string'
121+
}
122+
],
123+
payable: false,
124+
stateMutability: 'view',
125+
type: 'function'
126+
},
127+
{
128+
constant: false,
129+
inputs: [
130+
{
131+
name: '_to',
132+
type: 'address'
133+
},
134+
{
135+
name: '_value',
136+
type: 'uint256'
137+
}
138+
],
139+
name: 'transfer',
140+
outputs: [
141+
{
142+
name: '',
143+
type: 'bool'
144+
}
145+
],
146+
payable: false,
147+
stateMutability: 'nonpayable',
148+
type: 'function'
149+
},
150+
{
151+
constant: true,
152+
inputs: [
153+
{
154+
name: '_owner',
155+
type: 'address'
156+
},
157+
{
158+
name: '_spender',
159+
type: 'address'
160+
}
161+
],
162+
name: 'allowance',
163+
outputs: [
164+
{
165+
name: '',
166+
type: 'uint256'
167+
}
168+
],
169+
payable: false,
170+
stateMutability: 'view',
171+
type: 'function'
172+
},
173+
{
174+
payable: true,
175+
stateMutability: 'payable',
176+
type: 'fallback'
177+
},
178+
{
179+
anonymous: false,
180+
inputs: [
181+
{
182+
indexed: true,
183+
name: 'owner',
184+
type: 'address'
185+
},
186+
{
187+
indexed: true,
188+
name: 'spender',
189+
type: 'address'
190+
},
191+
{
192+
indexed: false,
193+
name: 'value',
194+
type: 'uint256'
195+
}
196+
],
197+
name: 'Approval',
198+
type: 'event'
199+
},
200+
{
201+
anonymous: false,
202+
inputs: [
203+
{
204+
indexed: true,
205+
name: 'from',
206+
type: 'address'
207+
},
208+
{
209+
indexed: true,
210+
name: 'to',
211+
type: 'address'
212+
},
213+
{
214+
indexed: false,
215+
name: 'value',
216+
type: 'uint256'
217+
}
218+
],
219+
name: 'Transfer',
220+
type: 'event'
221+
}
222+
];

0 commit comments

Comments
 (0)