@defisaver/sdk 1.3.33 → 1.3.34
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/AccessLists/UtilsAccessLists.ts +0 -4
- package/esm/AccessLists/UtilsAccessLists.js +0 -3
- package/esm/src/DfsWeb3.js +10 -2
- package/esm/src/abis/DFSProxyRegistry.json +250 -42
- package/esm/src/addresses.js +5 -5
- package/package.json +1 -1
- package/src/DfsWeb3.ts +8 -2
- package/src/abis/DFSProxyRegistry.json +251 -43
- package/src/addresses.ts +5 -5
- package/test/DfsWeb3.js +4 -2
- package/test/accessLists/MockAccessLists.json +0 -13
- package/umd/index.js +17 -12
|
@@ -13,9 +13,6 @@ export const UtilsAccessLists = {
|
|
|
13
13
|
PullToken: [],
|
|
14
14
|
SumInputs: [],
|
|
15
15
|
SubInputs: [],
|
|
16
|
-
ChangeProxyOwner: [
|
|
17
|
-
['0xF8f8B3C98Cf2E63Df3041b73f80F362a4cf3A576', []], // DFSProxyRegistryController
|
|
18
|
-
],
|
|
19
16
|
TokenBalance: [],
|
|
20
17
|
AutomationV2Unsub: [
|
|
21
18
|
['0x5c55B921f590a89C1Ebe84dF170E655a82b62126', []], // DefisaverLogger
|
package/esm/src/DfsWeb3.js
CHANGED
|
@@ -34,6 +34,7 @@ export class DfsWeb3 {
|
|
|
34
34
|
throw new Error('Method not implemented.');
|
|
35
35
|
}
|
|
36
36
|
prepareAccount() {
|
|
37
|
+
var _a, _b, _c;
|
|
37
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
39
|
const accounts = yield this.web3.eth.getAccounts();
|
|
39
40
|
if (!accounts || !accounts.length)
|
|
@@ -42,8 +43,15 @@ export class DfsWeb3 {
|
|
|
42
43
|
const DFSPRoxyRegistyAbiItems = DFSPRoxyRegistyAbi.map(item => (Object.assign(Object.assign({}, item), { stateMutability: item.stateMutability, type: item.type })));
|
|
43
44
|
const dfsRegistry = new this.web3.eth.Contract(DFSPRoxyRegistyAbiItems, getAddr('DFSProxyRegistry', CONFIG.chainId));
|
|
44
45
|
const proxies = yield dfsRegistry.methods.getAllProxies(this.account).call();
|
|
45
|
-
|
|
46
|
-
|
|
46
|
+
const mcdProxy = (_a = proxies.mcdProxy) !== null && _a !== void 0 ? _a : proxies[0];
|
|
47
|
+
const additionalProxies = (_c = (_b = proxies.validAdditionalProxies) !== null && _b !== void 0 ? _b : proxies[1]) !== null && _c !== void 0 ? _c : [];
|
|
48
|
+
// DFSProxyRegistryV2 only returns mcdProxy when Maker registry still matches current owner.
|
|
49
|
+
// Ownership-transferred wallets show up in validAdditionalProxies instead.
|
|
50
|
+
if (mcdProxy && mcdProxy !== '0x0000000000000000000000000000000000000000') {
|
|
51
|
+
this.proxy = mcdProxy;
|
|
52
|
+
}
|
|
53
|
+
else if (additionalProxies.length > 0) {
|
|
54
|
+
this.proxy = additionalProxies[0];
|
|
47
55
|
}
|
|
48
56
|
this.accountReady = true;
|
|
49
57
|
});
|
|
@@ -3,50 +3,144 @@
|
|
|
3
3
|
"inputs": [
|
|
4
4
|
{
|
|
5
5
|
"internalType": "address",
|
|
6
|
-
"name": "
|
|
6
|
+
"name": "proxy",
|
|
7
|
+
"type": "address"
|
|
8
|
+
}
|
|
9
|
+
],
|
|
10
|
+
"name": "InvalidDSProxy",
|
|
11
|
+
"type": "error"
|
|
12
|
+
},
|
|
13
|
+
{
|
|
14
|
+
"inputs": [],
|
|
15
|
+
"name": "NonContractCall",
|
|
16
|
+
"type": "error"
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
"inputs": [],
|
|
20
|
+
"name": "SenderNotAdmin",
|
|
21
|
+
"type": "error"
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
"inputs": [],
|
|
25
|
+
"name": "SenderNotOwner",
|
|
26
|
+
"type": "error"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"inputs": [
|
|
30
|
+
{
|
|
31
|
+
"internalType": "address",
|
|
32
|
+
"name": "sender",
|
|
7
33
|
"type": "address"
|
|
8
34
|
},
|
|
9
35
|
{
|
|
10
36
|
"internalType": "address",
|
|
11
|
-
"name": "
|
|
37
|
+
"name": "user",
|
|
12
38
|
"type": "address"
|
|
13
39
|
}
|
|
14
40
|
],
|
|
15
|
-
"name": "
|
|
16
|
-
"
|
|
17
|
-
"stateMutability": "nonpayable",
|
|
18
|
-
"type": "function"
|
|
41
|
+
"name": "SenderNotUserOrOwner",
|
|
42
|
+
"type": "error"
|
|
19
43
|
},
|
|
20
44
|
{
|
|
45
|
+
"anonymous": false,
|
|
21
46
|
"inputs": [
|
|
22
47
|
{
|
|
48
|
+
"indexed": true,
|
|
23
49
|
"internalType": "address",
|
|
24
|
-
"name": "",
|
|
50
|
+
"name": "user",
|
|
25
51
|
"type": "address"
|
|
26
52
|
},
|
|
27
53
|
{
|
|
28
|
-
"
|
|
29
|
-
"
|
|
30
|
-
"
|
|
54
|
+
"indexed": true,
|
|
55
|
+
"internalType": "address",
|
|
56
|
+
"name": "proxy",
|
|
57
|
+
"type": "address"
|
|
31
58
|
}
|
|
32
59
|
],
|
|
33
|
-
"name": "
|
|
34
|
-
"
|
|
60
|
+
"name": "AdditionalProxyAdded",
|
|
61
|
+
"type": "event"
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
"anonymous": false,
|
|
65
|
+
"inputs": [
|
|
35
66
|
{
|
|
67
|
+
"indexed": true,
|
|
36
68
|
"internalType": "address",
|
|
37
|
-
"name": "",
|
|
69
|
+
"name": "user",
|
|
70
|
+
"type": "address"
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
"indexed": true,
|
|
74
|
+
"internalType": "address",
|
|
75
|
+
"name": "proxy",
|
|
38
76
|
"type": "address"
|
|
39
77
|
}
|
|
40
78
|
],
|
|
41
|
-
"
|
|
42
|
-
"type": "
|
|
79
|
+
"name": "AdditionalProxyRemoved",
|
|
80
|
+
"type": "event"
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
"anonymous": false,
|
|
84
|
+
"inputs": [
|
|
85
|
+
{
|
|
86
|
+
"indexed": true,
|
|
87
|
+
"internalType": "address",
|
|
88
|
+
"name": "user",
|
|
89
|
+
"type": "address"
|
|
90
|
+
},
|
|
91
|
+
{
|
|
92
|
+
"indexed": true,
|
|
93
|
+
"internalType": "address",
|
|
94
|
+
"name": "proxy",
|
|
95
|
+
"type": "address"
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
"indexed": true,
|
|
99
|
+
"internalType": "address",
|
|
100
|
+
"name": "caller",
|
|
101
|
+
"type": "address"
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
"indexed": false,
|
|
105
|
+
"internalType": "bool",
|
|
106
|
+
"name": "excluded",
|
|
107
|
+
"type": "bool"
|
|
108
|
+
}
|
|
109
|
+
],
|
|
110
|
+
"name": "ProxyExclusionUpdated",
|
|
111
|
+
"type": "event"
|
|
112
|
+
},
|
|
113
|
+
{
|
|
114
|
+
"anonymous": false,
|
|
115
|
+
"inputs": [
|
|
116
|
+
{
|
|
117
|
+
"indexed": true,
|
|
118
|
+
"internalType": "address",
|
|
119
|
+
"name": "proxy",
|
|
120
|
+
"type": "address"
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
"indexed": true,
|
|
124
|
+
"internalType": "address",
|
|
125
|
+
"name": "oldOwner",
|
|
126
|
+
"type": "address"
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
"indexed": true,
|
|
130
|
+
"internalType": "address",
|
|
131
|
+
"name": "newOwner",
|
|
132
|
+
"type": "address"
|
|
133
|
+
}
|
|
134
|
+
],
|
|
135
|
+
"name": "ProxySynced",
|
|
136
|
+
"type": "event"
|
|
43
137
|
},
|
|
44
138
|
{
|
|
45
139
|
"inputs": [],
|
|
46
|
-
"name": "
|
|
140
|
+
"name": "MCD_REGISTRY",
|
|
47
141
|
"outputs": [
|
|
48
142
|
{
|
|
49
|
-
"internalType": "contract
|
|
143
|
+
"internalType": "contract IDSProxyRegistry",
|
|
50
144
|
"name": "",
|
|
51
145
|
"type": "address"
|
|
52
146
|
}
|
|
@@ -58,47 +152,82 @@
|
|
|
58
152
|
"inputs": [
|
|
59
153
|
{
|
|
60
154
|
"internalType": "address",
|
|
61
|
-
"name": "
|
|
155
|
+
"name": "user",
|
|
62
156
|
"type": "address"
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
"internalType": "uint256",
|
|
160
|
+
"name": "",
|
|
161
|
+
"type": "uint256"
|
|
63
162
|
}
|
|
64
163
|
],
|
|
65
|
-
"name": "
|
|
66
|
-
"outputs": [
|
|
67
|
-
|
|
164
|
+
"name": "additionalProxies",
|
|
165
|
+
"outputs": [
|
|
166
|
+
{
|
|
167
|
+
"internalType": "address",
|
|
168
|
+
"name": "proxies",
|
|
169
|
+
"type": "address"
|
|
170
|
+
}
|
|
171
|
+
],
|
|
172
|
+
"stateMutability": "view",
|
|
68
173
|
"type": "function"
|
|
69
174
|
},
|
|
70
175
|
{
|
|
71
176
|
"inputs": [
|
|
72
177
|
{
|
|
73
178
|
"internalType": "address",
|
|
74
|
-
"name": "
|
|
179
|
+
"name": "user",
|
|
75
180
|
"type": "address"
|
|
76
181
|
},
|
|
77
182
|
{
|
|
78
183
|
"internalType": "address",
|
|
79
|
-
"name": "
|
|
184
|
+
"name": "proxy",
|
|
80
185
|
"type": "address"
|
|
81
186
|
}
|
|
82
187
|
],
|
|
83
|
-
"name": "
|
|
84
|
-
"outputs": [
|
|
85
|
-
|
|
188
|
+
"name": "additionalProxyIndex",
|
|
189
|
+
"outputs": [
|
|
190
|
+
{
|
|
191
|
+
"internalType": "uint256",
|
|
192
|
+
"name": "indexPlusOne",
|
|
193
|
+
"type": "uint256"
|
|
194
|
+
}
|
|
195
|
+
],
|
|
196
|
+
"stateMutability": "view",
|
|
197
|
+
"type": "function"
|
|
198
|
+
},
|
|
199
|
+
{
|
|
200
|
+
"inputs": [],
|
|
201
|
+
"name": "adminVault",
|
|
202
|
+
"outputs": [
|
|
203
|
+
{
|
|
204
|
+
"internalType": "contract IAdminVault",
|
|
205
|
+
"name": "",
|
|
206
|
+
"type": "address"
|
|
207
|
+
}
|
|
208
|
+
],
|
|
209
|
+
"stateMutability": "view",
|
|
86
210
|
"type": "function"
|
|
87
211
|
},
|
|
88
212
|
{
|
|
89
213
|
"inputs": [
|
|
90
214
|
{
|
|
91
215
|
"internalType": "address",
|
|
92
|
-
"name": "",
|
|
216
|
+
"name": "_user",
|
|
93
217
|
"type": "address"
|
|
94
218
|
}
|
|
95
219
|
],
|
|
96
|
-
"name": "
|
|
220
|
+
"name": "getAllProxies",
|
|
97
221
|
"outputs": [
|
|
98
222
|
{
|
|
99
223
|
"internalType": "address",
|
|
100
|
-
"name": "",
|
|
224
|
+
"name": "mcdProxy",
|
|
101
225
|
"type": "address"
|
|
226
|
+
},
|
|
227
|
+
{
|
|
228
|
+
"internalType": "address[]",
|
|
229
|
+
"name": "validAdditionalProxies",
|
|
230
|
+
"type": "address[]"
|
|
102
231
|
}
|
|
103
232
|
],
|
|
104
233
|
"stateMutability": "view",
|
|
@@ -112,20 +241,33 @@
|
|
|
112
241
|
"type": "address"
|
|
113
242
|
}
|
|
114
243
|
],
|
|
115
|
-
"name": "
|
|
244
|
+
"name": "getMcdProxy",
|
|
116
245
|
"outputs": [
|
|
117
246
|
{
|
|
118
247
|
"internalType": "address",
|
|
119
|
-
"name": "",
|
|
248
|
+
"name": "proxy",
|
|
249
|
+
"type": "address"
|
|
250
|
+
}
|
|
251
|
+
],
|
|
252
|
+
"stateMutability": "view",
|
|
253
|
+
"type": "function"
|
|
254
|
+
},
|
|
255
|
+
{
|
|
256
|
+
"inputs": [
|
|
257
|
+
{
|
|
258
|
+
"internalType": "address",
|
|
259
|
+
"name": "_user",
|
|
120
260
|
"type": "address"
|
|
121
261
|
},
|
|
122
262
|
{
|
|
123
263
|
"internalType": "address[]",
|
|
124
|
-
"name": "",
|
|
264
|
+
"name": "_proxies",
|
|
125
265
|
"type": "address[]"
|
|
126
266
|
}
|
|
127
267
|
],
|
|
128
|
-
"
|
|
268
|
+
"name": "removeAdditionalProxies",
|
|
269
|
+
"outputs": [],
|
|
270
|
+
"stateMutability": "nonpayable",
|
|
129
271
|
"type": "function"
|
|
130
272
|
},
|
|
131
273
|
{
|
|
@@ -134,33 +276,99 @@
|
|
|
134
276
|
"internalType": "address",
|
|
135
277
|
"name": "_user",
|
|
136
278
|
"type": "address"
|
|
279
|
+
},
|
|
280
|
+
{
|
|
281
|
+
"internalType": "address",
|
|
282
|
+
"name": "_proxy",
|
|
283
|
+
"type": "address"
|
|
137
284
|
}
|
|
138
285
|
],
|
|
139
|
-
"name": "
|
|
140
|
-
"outputs": [
|
|
286
|
+
"name": "removeAdditionalProxy",
|
|
287
|
+
"outputs": [],
|
|
288
|
+
"stateMutability": "nonpayable",
|
|
289
|
+
"type": "function"
|
|
290
|
+
},
|
|
291
|
+
{
|
|
292
|
+
"inputs": [
|
|
141
293
|
{
|
|
142
294
|
"internalType": "address",
|
|
143
|
-
"name": "",
|
|
295
|
+
"name": "user",
|
|
296
|
+
"type": "address"
|
|
297
|
+
},
|
|
298
|
+
{
|
|
299
|
+
"internalType": "address",
|
|
300
|
+
"name": "proxy",
|
|
144
301
|
"type": "address"
|
|
145
302
|
}
|
|
146
303
|
],
|
|
304
|
+
"name": "removedProxies",
|
|
305
|
+
"outputs": [
|
|
306
|
+
{
|
|
307
|
+
"internalType": "bool",
|
|
308
|
+
"name": "removed",
|
|
309
|
+
"type": "bool"
|
|
310
|
+
}
|
|
311
|
+
],
|
|
147
312
|
"stateMutability": "view",
|
|
148
313
|
"type": "function"
|
|
149
314
|
},
|
|
150
315
|
{
|
|
151
|
-
"inputs": [
|
|
152
|
-
|
|
316
|
+
"inputs": [
|
|
317
|
+
{
|
|
318
|
+
"internalType": "address",
|
|
319
|
+
"name": "_user",
|
|
320
|
+
"type": "address"
|
|
321
|
+
},
|
|
322
|
+
{
|
|
323
|
+
"internalType": "address",
|
|
324
|
+
"name": "_proxy",
|
|
325
|
+
"type": "address"
|
|
326
|
+
}
|
|
327
|
+
],
|
|
328
|
+
"name": "restoreAdditionalProxy",
|
|
153
329
|
"outputs": [],
|
|
154
330
|
"stateMutability": "nonpayable",
|
|
155
331
|
"type": "function"
|
|
156
332
|
},
|
|
157
333
|
{
|
|
158
|
-
"inputs": [
|
|
159
|
-
|
|
334
|
+
"inputs": [
|
|
335
|
+
{
|
|
336
|
+
"internalType": "address[]",
|
|
337
|
+
"name": "_proxies",
|
|
338
|
+
"type": "address[]"
|
|
339
|
+
}
|
|
340
|
+
],
|
|
341
|
+
"name": "syncProxies",
|
|
342
|
+
"outputs": [],
|
|
343
|
+
"stateMutability": "nonpayable",
|
|
344
|
+
"type": "function"
|
|
345
|
+
},
|
|
346
|
+
{
|
|
347
|
+
"inputs": [
|
|
348
|
+
{
|
|
349
|
+
"internalType": "address",
|
|
350
|
+
"name": "_proxy",
|
|
351
|
+
"type": "address"
|
|
352
|
+
}
|
|
353
|
+
],
|
|
354
|
+
"name": "syncProxy",
|
|
355
|
+
"outputs": [],
|
|
356
|
+
"stateMutability": "nonpayable",
|
|
357
|
+
"type": "function"
|
|
358
|
+
},
|
|
359
|
+
{
|
|
360
|
+
"inputs": [
|
|
361
|
+
{
|
|
362
|
+
"internalType": "address",
|
|
363
|
+
"name": "proxy",
|
|
364
|
+
"type": "address"
|
|
365
|
+
}
|
|
366
|
+
],
|
|
367
|
+
"name": "trackedOwner",
|
|
160
368
|
"outputs": [
|
|
161
369
|
{
|
|
162
|
-
"internalType": "
|
|
163
|
-
"name": "",
|
|
370
|
+
"internalType": "address",
|
|
371
|
+
"name": "owner",
|
|
164
372
|
"type": "address"
|
|
165
373
|
}
|
|
166
374
|
],
|
package/esm/src/addresses.js
CHANGED
|
@@ -9,7 +9,7 @@ export const actionAddresses = {
|
|
|
9
9
|
SendTokens: '0x7d05c0ABeF6d91300a237026507c4a2631ddAdEa',
|
|
10
10
|
SumInputs: '0x70907d840aBBc984Fd949311d2f005e6aC4a4D7a',
|
|
11
11
|
SubInputs: '0xe1804b756188F63f723d2FECc02988D0Cc1aB823',
|
|
12
|
-
ChangeProxyOwner: '
|
|
12
|
+
ChangeProxyOwner: '0x1cc4A7f6B17a4C900F2afe4A0718A73714AC33f2',
|
|
13
13
|
TokenBalance: '0xa92B177950F1460119940436515FD857C24494BC',
|
|
14
14
|
AutomationV2Unsub: '0xe35Fb12fE9796847751076aCf5ee7d124108612C',
|
|
15
15
|
SendTokenAndUnwrap: '0x4155537e6933E59a62deb68f6ad93d237d07242a',
|
|
@@ -357,7 +357,7 @@ export const actionAddresses = {
|
|
|
357
357
|
CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
|
|
358
358
|
TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
|
|
359
359
|
TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
|
|
360
|
-
ChangeProxyOwner: '
|
|
360
|
+
ChangeProxyOwner: '0xf573585C38d947D8A70F7F6c83D060F1F89855AE',
|
|
361
361
|
PermitToken: '0xE70c05125E7Cfe929f7ccC1baD348004aCF0f0d6',
|
|
362
362
|
HandleAuth: '0x7f143607250ee51e4dce31254c8ad33ec4c2dad5',
|
|
363
363
|
MerklClaim: '0xa7574a72D93D236040648b1dc80ddA3E7A4de40F',
|
|
@@ -418,7 +418,7 @@ export const actionAddresses = {
|
|
|
418
418
|
CreateSub: '0xbFD17a0a844b75976585a382a5BcCaFC9EAd731f',
|
|
419
419
|
TokenBalance: '0x483B903E702F60698Dd8124558C6199922737f1F',
|
|
420
420
|
TokenizedVaultAdapter: '0xD05C512bDFf6D3eAc5328807B3bC075F35271167',
|
|
421
|
-
ChangeProxyOwner: '
|
|
421
|
+
ChangeProxyOwner: '0xacf5bAD9543A98EcAcC620cF6CB989Ec88f1650D',
|
|
422
422
|
PermitToken: '0x2E5E7a691092C158bb8341b936eF24FCcA6c0e00',
|
|
423
423
|
HandleAuth: '0xbfcab1339e1a56a0a836cbca6457eaf71f148fcb',
|
|
424
424
|
UpdateSub: '0x3511f444362F8cBd185DbF21C9488D16c1306461',
|
|
@@ -515,7 +515,7 @@ export const actionAddresses = {
|
|
|
515
515
|
SumInputs: '0xC856ef8fe425B2EFe373e0e7038fAFF4a4f764fE',
|
|
516
516
|
SubInputs: '0xd244B1991Fcb8FC0f32FA55bce37714fc5929B95',
|
|
517
517
|
TokenBalance: '0xc44bcE580B1b3339fE9272D3bC3d6566083ea59C',
|
|
518
|
-
ChangeProxyOwner: '
|
|
518
|
+
ChangeProxyOwner: '0x7b55d25BfF49Fd62563823570f47E9a35AA39541',
|
|
519
519
|
PermitToken: '0x57c8ae94a5A11dA33e0518054102488b604628D0',
|
|
520
520
|
HandleAuth: '0x18a90e6db79199ace00140631ef931e0bd97837c',
|
|
521
521
|
ToggleSub: '0x5F16C0a08d52b67fc73706c494F7535Dd3382b58',
|
|
@@ -679,7 +679,7 @@ export const otherAddresses = {
|
|
|
679
679
|
[NETWORKS.ethereum.chainId]: {
|
|
680
680
|
RecipeExecutor: '0xbc3Fc959FeF3F12a41738f406c02198cdeE7481F',
|
|
681
681
|
DFSRegistry: '0x287778F121F134C66212FB16c9b53eC991D32f5b',
|
|
682
|
-
DFSProxyRegistry: '
|
|
682
|
+
DFSProxyRegistry: '0x0cCB1F91beb8590949880D2a61C26C11d6280319',
|
|
683
683
|
ProxyRegistry: '0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4',
|
|
684
684
|
SFProxyEntryPoint: '0xAa15ca459659F35B1064EC546A44d962d54bA89e',
|
|
685
685
|
McdCdpManager: '0x5ef30b9986345249bc32d8928b7ee64de9435e39',
|
package/package.json
CHANGED
package/src/DfsWeb3.ts
CHANGED
|
@@ -47,8 +47,14 @@ export class DfsWeb3 {
|
|
|
47
47
|
const DFSPRoxyRegistyAbiItems : AbiItem[] = DFSPRoxyRegistyAbi.map(item => ({ ...item, stateMutability: item.stateMutability as StateMutabilityType, type: item.type as AbiType }));
|
|
48
48
|
const dfsRegistry = new this.web3.eth.Contract(DFSPRoxyRegistyAbiItems, getAddr('DFSProxyRegistry', CONFIG.chainId));
|
|
49
49
|
const proxies = await dfsRegistry.methods.getAllProxies(this.account).call();
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
const mcdProxy = proxies.mcdProxy ?? proxies[0];
|
|
51
|
+
const additionalProxies = proxies.validAdditionalProxies ?? proxies[1] ?? [];
|
|
52
|
+
// DFSProxyRegistryV2 only returns mcdProxy when Maker registry still matches current owner.
|
|
53
|
+
// Ownership-transferred wallets show up in validAdditionalProxies instead.
|
|
54
|
+
if (mcdProxy && mcdProxy !== '0x0000000000000000000000000000000000000000') {
|
|
55
|
+
this.proxy = mcdProxy;
|
|
56
|
+
} else if (additionalProxies.length > 0) {
|
|
57
|
+
this.proxy = additionalProxies[0];
|
|
52
58
|
}
|
|
53
59
|
this.accountReady = true;
|
|
54
60
|
}
|
|
@@ -3,50 +3,144 @@
|
|
|
3
3
|
"inputs": [
|
|
4
4
|
{
|
|
5
5
|
"internalType": "address",
|
|
6
|
-
"name": "
|
|
6
|
+
"name": "proxy",
|
|
7
|
+
"type": "address"
|
|
8
|
+
}
|
|
9
|
+
],
|
|
10
|
+
"name": "InvalidDSProxy",
|
|
11
|
+
"type": "error"
|
|
12
|
+
},
|
|
13
|
+
{
|
|
14
|
+
"inputs": [],
|
|
15
|
+
"name": "NonContractCall",
|
|
16
|
+
"type": "error"
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
"inputs": [],
|
|
20
|
+
"name": "SenderNotAdmin",
|
|
21
|
+
"type": "error"
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
"inputs": [],
|
|
25
|
+
"name": "SenderNotOwner",
|
|
26
|
+
"type": "error"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"inputs": [
|
|
30
|
+
{
|
|
31
|
+
"internalType": "address",
|
|
32
|
+
"name": "sender",
|
|
7
33
|
"type": "address"
|
|
8
34
|
},
|
|
9
35
|
{
|
|
10
36
|
"internalType": "address",
|
|
11
|
-
"name": "
|
|
37
|
+
"name": "user",
|
|
12
38
|
"type": "address"
|
|
13
39
|
}
|
|
14
40
|
],
|
|
15
|
-
"name": "
|
|
16
|
-
"
|
|
17
|
-
"stateMutability": "nonpayable",
|
|
18
|
-
"type": "function"
|
|
41
|
+
"name": "SenderNotUserOrOwner",
|
|
42
|
+
"type": "error"
|
|
19
43
|
},
|
|
20
44
|
{
|
|
45
|
+
"anonymous": false,
|
|
21
46
|
"inputs": [
|
|
22
47
|
{
|
|
48
|
+
"indexed": true,
|
|
23
49
|
"internalType": "address",
|
|
24
|
-
"name": "",
|
|
50
|
+
"name": "user",
|
|
25
51
|
"type": "address"
|
|
26
52
|
},
|
|
27
53
|
{
|
|
28
|
-
"
|
|
29
|
-
"
|
|
30
|
-
"
|
|
54
|
+
"indexed": true,
|
|
55
|
+
"internalType": "address",
|
|
56
|
+
"name": "proxy",
|
|
57
|
+
"type": "address"
|
|
31
58
|
}
|
|
32
59
|
],
|
|
33
|
-
"name": "
|
|
34
|
-
"
|
|
60
|
+
"name": "AdditionalProxyAdded",
|
|
61
|
+
"type": "event"
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
"anonymous": false,
|
|
65
|
+
"inputs": [
|
|
35
66
|
{
|
|
67
|
+
"indexed": true,
|
|
36
68
|
"internalType": "address",
|
|
37
|
-
"name": "",
|
|
69
|
+
"name": "user",
|
|
70
|
+
"type": "address"
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
"indexed": true,
|
|
74
|
+
"internalType": "address",
|
|
75
|
+
"name": "proxy",
|
|
38
76
|
"type": "address"
|
|
39
77
|
}
|
|
40
78
|
],
|
|
41
|
-
"
|
|
42
|
-
"type": "
|
|
79
|
+
"name": "AdditionalProxyRemoved",
|
|
80
|
+
"type": "event"
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
"anonymous": false,
|
|
84
|
+
"inputs": [
|
|
85
|
+
{
|
|
86
|
+
"indexed": true,
|
|
87
|
+
"internalType": "address",
|
|
88
|
+
"name": "user",
|
|
89
|
+
"type": "address"
|
|
90
|
+
},
|
|
91
|
+
{
|
|
92
|
+
"indexed": true,
|
|
93
|
+
"internalType": "address",
|
|
94
|
+
"name": "proxy",
|
|
95
|
+
"type": "address"
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
"indexed": true,
|
|
99
|
+
"internalType": "address",
|
|
100
|
+
"name": "caller",
|
|
101
|
+
"type": "address"
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
"indexed": false,
|
|
105
|
+
"internalType": "bool",
|
|
106
|
+
"name": "excluded",
|
|
107
|
+
"type": "bool"
|
|
108
|
+
}
|
|
109
|
+
],
|
|
110
|
+
"name": "ProxyExclusionUpdated",
|
|
111
|
+
"type": "event"
|
|
112
|
+
},
|
|
113
|
+
{
|
|
114
|
+
"anonymous": false,
|
|
115
|
+
"inputs": [
|
|
116
|
+
{
|
|
117
|
+
"indexed": true,
|
|
118
|
+
"internalType": "address",
|
|
119
|
+
"name": "proxy",
|
|
120
|
+
"type": "address"
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
"indexed": true,
|
|
124
|
+
"internalType": "address",
|
|
125
|
+
"name": "oldOwner",
|
|
126
|
+
"type": "address"
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
"indexed": true,
|
|
130
|
+
"internalType": "address",
|
|
131
|
+
"name": "newOwner",
|
|
132
|
+
"type": "address"
|
|
133
|
+
}
|
|
134
|
+
],
|
|
135
|
+
"name": "ProxySynced",
|
|
136
|
+
"type": "event"
|
|
43
137
|
},
|
|
44
138
|
{
|
|
45
139
|
"inputs": [],
|
|
46
|
-
"name": "
|
|
140
|
+
"name": "MCD_REGISTRY",
|
|
47
141
|
"outputs": [
|
|
48
142
|
{
|
|
49
|
-
"internalType": "contract
|
|
143
|
+
"internalType": "contract IDSProxyRegistry",
|
|
50
144
|
"name": "",
|
|
51
145
|
"type": "address"
|
|
52
146
|
}
|
|
@@ -58,47 +152,82 @@
|
|
|
58
152
|
"inputs": [
|
|
59
153
|
{
|
|
60
154
|
"internalType": "address",
|
|
61
|
-
"name": "
|
|
155
|
+
"name": "user",
|
|
62
156
|
"type": "address"
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
"internalType": "uint256",
|
|
160
|
+
"name": "",
|
|
161
|
+
"type": "uint256"
|
|
63
162
|
}
|
|
64
163
|
],
|
|
65
|
-
"name": "
|
|
66
|
-
"outputs": [
|
|
67
|
-
|
|
164
|
+
"name": "additionalProxies",
|
|
165
|
+
"outputs": [
|
|
166
|
+
{
|
|
167
|
+
"internalType": "address",
|
|
168
|
+
"name": "proxies",
|
|
169
|
+
"type": "address"
|
|
170
|
+
}
|
|
171
|
+
],
|
|
172
|
+
"stateMutability": "view",
|
|
68
173
|
"type": "function"
|
|
69
174
|
},
|
|
70
175
|
{
|
|
71
176
|
"inputs": [
|
|
72
177
|
{
|
|
73
178
|
"internalType": "address",
|
|
74
|
-
"name": "
|
|
179
|
+
"name": "user",
|
|
75
180
|
"type": "address"
|
|
76
181
|
},
|
|
77
182
|
{
|
|
78
183
|
"internalType": "address",
|
|
79
|
-
"name": "
|
|
184
|
+
"name": "proxy",
|
|
80
185
|
"type": "address"
|
|
81
186
|
}
|
|
82
187
|
],
|
|
83
|
-
"name": "
|
|
84
|
-
"outputs": [
|
|
85
|
-
|
|
188
|
+
"name": "additionalProxyIndex",
|
|
189
|
+
"outputs": [
|
|
190
|
+
{
|
|
191
|
+
"internalType": "uint256",
|
|
192
|
+
"name": "indexPlusOne",
|
|
193
|
+
"type": "uint256"
|
|
194
|
+
}
|
|
195
|
+
],
|
|
196
|
+
"stateMutability": "view",
|
|
197
|
+
"type": "function"
|
|
198
|
+
},
|
|
199
|
+
{
|
|
200
|
+
"inputs": [],
|
|
201
|
+
"name": "adminVault",
|
|
202
|
+
"outputs": [
|
|
203
|
+
{
|
|
204
|
+
"internalType": "contract IAdminVault",
|
|
205
|
+
"name": "",
|
|
206
|
+
"type": "address"
|
|
207
|
+
}
|
|
208
|
+
],
|
|
209
|
+
"stateMutability": "view",
|
|
86
210
|
"type": "function"
|
|
87
211
|
},
|
|
88
212
|
{
|
|
89
213
|
"inputs": [
|
|
90
214
|
{
|
|
91
215
|
"internalType": "address",
|
|
92
|
-
"name": "",
|
|
216
|
+
"name": "_user",
|
|
93
217
|
"type": "address"
|
|
94
218
|
}
|
|
95
219
|
],
|
|
96
|
-
"name": "
|
|
220
|
+
"name": "getAllProxies",
|
|
97
221
|
"outputs": [
|
|
98
222
|
{
|
|
99
223
|
"internalType": "address",
|
|
100
|
-
"name": "",
|
|
224
|
+
"name": "mcdProxy",
|
|
101
225
|
"type": "address"
|
|
226
|
+
},
|
|
227
|
+
{
|
|
228
|
+
"internalType": "address[]",
|
|
229
|
+
"name": "validAdditionalProxies",
|
|
230
|
+
"type": "address[]"
|
|
102
231
|
}
|
|
103
232
|
],
|
|
104
233
|
"stateMutability": "view",
|
|
@@ -112,20 +241,33 @@
|
|
|
112
241
|
"type": "address"
|
|
113
242
|
}
|
|
114
243
|
],
|
|
115
|
-
"name": "
|
|
244
|
+
"name": "getMcdProxy",
|
|
116
245
|
"outputs": [
|
|
117
246
|
{
|
|
118
247
|
"internalType": "address",
|
|
119
|
-
"name": "",
|
|
248
|
+
"name": "proxy",
|
|
249
|
+
"type": "address"
|
|
250
|
+
}
|
|
251
|
+
],
|
|
252
|
+
"stateMutability": "view",
|
|
253
|
+
"type": "function"
|
|
254
|
+
},
|
|
255
|
+
{
|
|
256
|
+
"inputs": [
|
|
257
|
+
{
|
|
258
|
+
"internalType": "address",
|
|
259
|
+
"name": "_user",
|
|
120
260
|
"type": "address"
|
|
121
261
|
},
|
|
122
262
|
{
|
|
123
263
|
"internalType": "address[]",
|
|
124
|
-
"name": "",
|
|
264
|
+
"name": "_proxies",
|
|
125
265
|
"type": "address[]"
|
|
126
266
|
}
|
|
127
267
|
],
|
|
128
|
-
"
|
|
268
|
+
"name": "removeAdditionalProxies",
|
|
269
|
+
"outputs": [],
|
|
270
|
+
"stateMutability": "nonpayable",
|
|
129
271
|
"type": "function"
|
|
130
272
|
},
|
|
131
273
|
{
|
|
@@ -134,33 +276,99 @@
|
|
|
134
276
|
"internalType": "address",
|
|
135
277
|
"name": "_user",
|
|
136
278
|
"type": "address"
|
|
279
|
+
},
|
|
280
|
+
{
|
|
281
|
+
"internalType": "address",
|
|
282
|
+
"name": "_proxy",
|
|
283
|
+
"type": "address"
|
|
137
284
|
}
|
|
138
285
|
],
|
|
139
|
-
"name": "
|
|
140
|
-
"outputs": [
|
|
286
|
+
"name": "removeAdditionalProxy",
|
|
287
|
+
"outputs": [],
|
|
288
|
+
"stateMutability": "nonpayable",
|
|
289
|
+
"type": "function"
|
|
290
|
+
},
|
|
291
|
+
{
|
|
292
|
+
"inputs": [
|
|
141
293
|
{
|
|
142
294
|
"internalType": "address",
|
|
143
|
-
"name": "",
|
|
295
|
+
"name": "user",
|
|
296
|
+
"type": "address"
|
|
297
|
+
},
|
|
298
|
+
{
|
|
299
|
+
"internalType": "address",
|
|
300
|
+
"name": "proxy",
|
|
144
301
|
"type": "address"
|
|
145
302
|
}
|
|
146
303
|
],
|
|
304
|
+
"name": "removedProxies",
|
|
305
|
+
"outputs": [
|
|
306
|
+
{
|
|
307
|
+
"internalType": "bool",
|
|
308
|
+
"name": "removed",
|
|
309
|
+
"type": "bool"
|
|
310
|
+
}
|
|
311
|
+
],
|
|
147
312
|
"stateMutability": "view",
|
|
148
313
|
"type": "function"
|
|
149
314
|
},
|
|
150
315
|
{
|
|
151
|
-
"inputs": [
|
|
152
|
-
|
|
316
|
+
"inputs": [
|
|
317
|
+
{
|
|
318
|
+
"internalType": "address",
|
|
319
|
+
"name": "_user",
|
|
320
|
+
"type": "address"
|
|
321
|
+
},
|
|
322
|
+
{
|
|
323
|
+
"internalType": "address",
|
|
324
|
+
"name": "_proxy",
|
|
325
|
+
"type": "address"
|
|
326
|
+
}
|
|
327
|
+
],
|
|
328
|
+
"name": "restoreAdditionalProxy",
|
|
153
329
|
"outputs": [],
|
|
154
330
|
"stateMutability": "nonpayable",
|
|
155
331
|
"type": "function"
|
|
156
332
|
},
|
|
157
333
|
{
|
|
158
|
-
"inputs": [
|
|
159
|
-
|
|
334
|
+
"inputs": [
|
|
335
|
+
{
|
|
336
|
+
"internalType": "address[]",
|
|
337
|
+
"name": "_proxies",
|
|
338
|
+
"type": "address[]"
|
|
339
|
+
}
|
|
340
|
+
],
|
|
341
|
+
"name": "syncProxies",
|
|
342
|
+
"outputs": [],
|
|
343
|
+
"stateMutability": "nonpayable",
|
|
344
|
+
"type": "function"
|
|
345
|
+
},
|
|
346
|
+
{
|
|
347
|
+
"inputs": [
|
|
348
|
+
{
|
|
349
|
+
"internalType": "address",
|
|
350
|
+
"name": "_proxy",
|
|
351
|
+
"type": "address"
|
|
352
|
+
}
|
|
353
|
+
],
|
|
354
|
+
"name": "syncProxy",
|
|
355
|
+
"outputs": [],
|
|
356
|
+
"stateMutability": "nonpayable",
|
|
357
|
+
"type": "function"
|
|
358
|
+
},
|
|
359
|
+
{
|
|
360
|
+
"inputs": [
|
|
361
|
+
{
|
|
362
|
+
"internalType": "address",
|
|
363
|
+
"name": "proxy",
|
|
364
|
+
"type": "address"
|
|
365
|
+
}
|
|
366
|
+
],
|
|
367
|
+
"name": "trackedOwner",
|
|
160
368
|
"outputs": [
|
|
161
369
|
{
|
|
162
|
-
"internalType": "
|
|
163
|
-
"name": "",
|
|
370
|
+
"internalType": "address",
|
|
371
|
+
"name": "owner",
|
|
164
372
|
"type": "address"
|
|
165
373
|
}
|
|
166
374
|
],
|
|
@@ -190,4 +398,4 @@
|
|
|
190
398
|
"stateMutability": "nonpayable",
|
|
191
399
|
"type": "function"
|
|
192
400
|
}
|
|
193
|
-
]
|
|
401
|
+
]
|
package/src/addresses.ts
CHANGED
|
@@ -11,7 +11,7 @@ export const actionAddresses = {
|
|
|
11
11
|
SendTokens: '0x7d05c0ABeF6d91300a237026507c4a2631ddAdEa',
|
|
12
12
|
SumInputs: '0x70907d840aBBc984Fd949311d2f005e6aC4a4D7a',
|
|
13
13
|
SubInputs: '0xe1804b756188F63f723d2FECc02988D0Cc1aB823',
|
|
14
|
-
ChangeProxyOwner: '
|
|
14
|
+
ChangeProxyOwner: '0x1cc4A7f6B17a4C900F2afe4A0718A73714AC33f2',
|
|
15
15
|
TokenBalance: '0xa92B177950F1460119940436515FD857C24494BC',
|
|
16
16
|
AutomationV2Unsub: '0xe35Fb12fE9796847751076aCf5ee7d124108612C',
|
|
17
17
|
SendTokenAndUnwrap: '0x4155537e6933E59a62deb68f6ad93d237d07242a',
|
|
@@ -431,7 +431,7 @@ export const actionAddresses = {
|
|
|
431
431
|
CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
|
|
432
432
|
TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
|
|
433
433
|
TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
|
|
434
|
-
ChangeProxyOwner: '
|
|
434
|
+
ChangeProxyOwner: '0xf573585C38d947D8A70F7F6c83D060F1F89855AE',
|
|
435
435
|
PermitToken: '0xE70c05125E7Cfe929f7ccC1baD348004aCF0f0d6',
|
|
436
436
|
HandleAuth: '0x7f143607250ee51e4dce31254c8ad33ec4c2dad5',
|
|
437
437
|
MerklClaim: '0xa7574a72D93D236040648b1dc80ddA3E7A4de40F',
|
|
@@ -500,7 +500,7 @@ export const actionAddresses = {
|
|
|
500
500
|
CreateSub: '0xbFD17a0a844b75976585a382a5BcCaFC9EAd731f',
|
|
501
501
|
TokenBalance: '0x483B903E702F60698Dd8124558C6199922737f1F',
|
|
502
502
|
TokenizedVaultAdapter: '0xD05C512bDFf6D3eAc5328807B3bC075F35271167',
|
|
503
|
-
ChangeProxyOwner: '
|
|
503
|
+
ChangeProxyOwner: '0xacf5bAD9543A98EcAcC620cF6CB989Ec88f1650D',
|
|
504
504
|
PermitToken: '0x2E5E7a691092C158bb8341b936eF24FCcA6c0e00',
|
|
505
505
|
HandleAuth: '0xbfcab1339e1a56a0a836cbca6457eaf71f148fcb',
|
|
506
506
|
UpdateSub: '0x3511f444362F8cBd185DbF21C9488D16c1306461',
|
|
@@ -612,7 +612,7 @@ export const actionAddresses = {
|
|
|
612
612
|
SumInputs: '0xC856ef8fe425B2EFe373e0e7038fAFF4a4f764fE',
|
|
613
613
|
SubInputs: '0xd244B1991Fcb8FC0f32FA55bce37714fc5929B95',
|
|
614
614
|
TokenBalance: '0xc44bcE580B1b3339fE9272D3bC3d6566083ea59C',
|
|
615
|
-
ChangeProxyOwner: '
|
|
615
|
+
ChangeProxyOwner: '0x7b55d25BfF49Fd62563823570f47E9a35AA39541',
|
|
616
616
|
PermitToken: '0x57c8ae94a5A11dA33e0518054102488b604628D0',
|
|
617
617
|
HandleAuth: '0x18a90e6db79199ace00140631ef931e0bd97837c',
|
|
618
618
|
ToggleSub: '0x5F16C0a08d52b67fc73706c494F7535Dd3382b58',
|
|
@@ -796,7 +796,7 @@ export const otherAddresses = {
|
|
|
796
796
|
[NETWORKS.ethereum.chainId]: {
|
|
797
797
|
RecipeExecutor: '0xbc3Fc959FeF3F12a41738f406c02198cdeE7481F',
|
|
798
798
|
DFSRegistry: '0x287778F121F134C66212FB16c9b53eC991D32f5b',
|
|
799
|
-
DFSProxyRegistry: '
|
|
799
|
+
DFSProxyRegistry: '0x0cCB1F91beb8590949880D2a61C26C11d6280319',
|
|
800
800
|
ProxyRegistry: '0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4',
|
|
801
801
|
SFProxyEntryPoint: '0xAa15ca459659F35B1064EC546A44d962d54bA89e',
|
|
802
802
|
|
package/test/DfsWeb3.js
CHANGED
|
@@ -5,13 +5,15 @@ const dfs = require('../src');
|
|
|
5
5
|
const {getIlkInfo, assetAmountInWei} = require("@defisaver/tokens");
|
|
6
6
|
|
|
7
7
|
describe('DfsWeb3', () => {
|
|
8
|
+
// Current owner of previously used test proxy 0x9cCf... (ownership transferred from 0x0a80...)
|
|
9
|
+
const testAccount = '0xa9BB3c0637a9Bc10A43b6D9565A8e1C287B3d2DE';
|
|
8
10
|
let dfsWeb3;
|
|
9
11
|
before(async () => {
|
|
10
12
|
const web3 = new Web3(process.env.RPC);
|
|
11
13
|
|
|
12
|
-
web3.eth.getAccounts = () => [
|
|
14
|
+
web3.eth.getAccounts = () => [testAccount];
|
|
13
15
|
dfsWeb3 = new dfs.DfsWeb3(web3);
|
|
14
|
-
dfsWeb3.account =
|
|
16
|
+
dfsWeb3.account = testAccount;
|
|
15
17
|
|
|
16
18
|
await dfsWeb3.prepareAccount();
|
|
17
19
|
assert.containsAllKeys(dfsWeb3, ['web3', 'account', 'proxy']);
|
|
@@ -1372,19 +1372,6 @@
|
|
|
1372
1372
|
[ 8, 4, 12, 3, 13, 9 ]
|
|
1373
1373
|
]
|
|
1374
1374
|
],
|
|
1375
|
-
"ChangeProxyOwner": [
|
|
1376
|
-
[
|
|
1377
|
-
"0x32cEdFfF6e64f6cD1907Ae0b27b78c36320587E7",
|
|
1378
|
-
[ 3, 11, 1, 15, 10, 8 ]
|
|
1379
|
-
],
|
|
1380
|
-
[
|
|
1381
|
-
"0xF8f8B3C98Cf2E63Df3041b73f80F362a4cf3A576",
|
|
1382
|
-
[
|
|
1383
|
-
10, 5, 8, 6,
|
|
1384
|
-
13, 2, 0
|
|
1385
|
-
]
|
|
1386
|
-
]
|
|
1387
|
-
],
|
|
1388
1375
|
"TokenBalance": [
|
|
1389
1376
|
[
|
|
1390
1377
|
"0xFEb82445aEaA675D59A43CD5833f5A6807f97ea2",
|
package/umd/index.js
CHANGED
|
@@ -982,8 +982,6 @@ var UtilsAccessLists = {
|
|
|
982
982
|
PullToken: [],
|
|
983
983
|
SumInputs: [],
|
|
984
984
|
SubInputs: [],
|
|
985
|
-
ChangeProxyOwner: [['0xF8f8B3C98Cf2E63Df3041b73f80F362a4cf3A576', []] // DFSProxyRegistryController
|
|
986
|
-
],
|
|
987
985
|
TokenBalance: [],
|
|
988
986
|
AutomationV2Unsub: [['0x5c55B921f590a89C1Ebe84dF170E655a82b62126', []] // DefisaverLogger
|
|
989
987
|
]
|
|
@@ -1325,7 +1323,7 @@ var actionAddresses = {
|
|
|
1325
1323
|
SendTokens: '0x7d05c0ABeF6d91300a237026507c4a2631ddAdEa',
|
|
1326
1324
|
SumInputs: '0x70907d840aBBc984Fd949311d2f005e6aC4a4D7a',
|
|
1327
1325
|
SubInputs: '0xe1804b756188F63f723d2FECc02988D0Cc1aB823',
|
|
1328
|
-
ChangeProxyOwner: '
|
|
1326
|
+
ChangeProxyOwner: '0x1cc4A7f6B17a4C900F2afe4A0718A73714AC33f2',
|
|
1329
1327
|
TokenBalance: '0xa92B177950F1460119940436515FD857C24494BC',
|
|
1330
1328
|
AutomationV2Unsub: '0xe35Fb12fE9796847751076aCf5ee7d124108612C',
|
|
1331
1329
|
SendTokenAndUnwrap: '0x4155537e6933E59a62deb68f6ad93d237d07242a',
|
|
@@ -1673,7 +1671,7 @@ var actionAddresses = {
|
|
|
1673
1671
|
CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
|
|
1674
1672
|
TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
|
|
1675
1673
|
TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
|
|
1676
|
-
ChangeProxyOwner: '
|
|
1674
|
+
ChangeProxyOwner: '0xf573585C38d947D8A70F7F6c83D060F1F89855AE',
|
|
1677
1675
|
PermitToken: '0xE70c05125E7Cfe929f7ccC1baD348004aCF0f0d6',
|
|
1678
1676
|
HandleAuth: '0x7f143607250ee51e4dce31254c8ad33ec4c2dad5',
|
|
1679
1677
|
MerklClaim: '0xa7574a72D93D236040648b1dc80ddA3E7A4de40F',
|
|
@@ -1735,7 +1733,7 @@ var actionAddresses = {
|
|
|
1735
1733
|
CreateSub: '0xbFD17a0a844b75976585a382a5BcCaFC9EAd731f',
|
|
1736
1734
|
TokenBalance: '0x483B903E702F60698Dd8124558C6199922737f1F',
|
|
1737
1735
|
TokenizedVaultAdapter: '0xD05C512bDFf6D3eAc5328807B3bC075F35271167',
|
|
1738
|
-
ChangeProxyOwner: '
|
|
1736
|
+
ChangeProxyOwner: '0xacf5bAD9543A98EcAcC620cF6CB989Ec88f1650D',
|
|
1739
1737
|
PermitToken: '0x2E5E7a691092C158bb8341b936eF24FCcA6c0e00',
|
|
1740
1738
|
HandleAuth: '0xbfcab1339e1a56a0a836cbca6457eaf71f148fcb',
|
|
1741
1739
|
UpdateSub: '0x3511f444362F8cBd185DbF21C9488D16c1306461',
|
|
@@ -1834,7 +1832,7 @@ var actionAddresses = {
|
|
|
1834
1832
|
SumInputs: '0xC856ef8fe425B2EFe373e0e7038fAFF4a4f764fE',
|
|
1835
1833
|
SubInputs: '0xd244B1991Fcb8FC0f32FA55bce37714fc5929B95',
|
|
1836
1834
|
TokenBalance: '0xc44bcE580B1b3339fE9272D3bC3d6566083ea59C',
|
|
1837
|
-
ChangeProxyOwner: '
|
|
1835
|
+
ChangeProxyOwner: '0x7b55d25BfF49Fd62563823570f47E9a35AA39541',
|
|
1838
1836
|
PermitToken: '0x57c8ae94a5A11dA33e0518054102488b604628D0',
|
|
1839
1837
|
HandleAuth: '0x18a90e6db79199ace00140631ef931e0bd97837c',
|
|
1840
1838
|
ToggleSub: '0x5F16C0a08d52b67fc73706c494F7535Dd3382b58',
|
|
@@ -2002,7 +2000,7 @@ var otherAddresses = {
|
|
|
2002
2000
|
[_config__WEBPACK_IMPORTED_MODULE_0__.NETWORKS.ethereum.chainId]: {
|
|
2003
2001
|
RecipeExecutor: '0xbc3Fc959FeF3F12a41738f406c02198cdeE7481F',
|
|
2004
2002
|
DFSRegistry: '0x287778F121F134C66212FB16c9b53eC991D32f5b',
|
|
2005
|
-
DFSProxyRegistry: '
|
|
2003
|
+
DFSProxyRegistry: '0x0cCB1F91beb8590949880D2a61C26C11d6280319',
|
|
2006
2004
|
ProxyRegistry: '0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4',
|
|
2007
2005
|
SFProxyEntryPoint: '0xAa15ca459659F35B1064EC546A44d962d54bA89e',
|
|
2008
2006
|
McdCdpManager: '0x5ef30b9986345249bc32d8928b7ee64de9435e39',
|
|
@@ -2211,6 +2209,7 @@ class DfsWeb3 {
|
|
|
2211
2209
|
prepareAccount() {
|
|
2212
2210
|
var _this = this;
|
|
2213
2211
|
return _asyncToGenerator(function* () {
|
|
2212
|
+
var _proxies$mcdProxy, _ref, _proxies$validAdditio;
|
|
2214
2213
|
var accounts = yield _this.web3.eth.getAccounts();
|
|
2215
2214
|
if (!accounts || !accounts.length) throw new Error('Supplied web3 has no account');
|
|
2216
2215
|
_this.account = accounts[0];
|
|
@@ -2220,8 +2219,14 @@ class DfsWeb3 {
|
|
|
2220
2219
|
}));
|
|
2221
2220
|
var dfsRegistry = new _this.web3.eth.Contract(DFSPRoxyRegistyAbiItems, (0,_addresses__WEBPACK_IMPORTED_MODULE_4__.getAddr)('DFSProxyRegistry', _config__WEBPACK_IMPORTED_MODULE_5__.CONFIG.chainId));
|
|
2222
2221
|
var proxies = yield dfsRegistry.methods.getAllProxies(_this.account).call();
|
|
2223
|
-
|
|
2224
|
-
|
|
2222
|
+
var mcdProxy = (_proxies$mcdProxy = proxies.mcdProxy) !== null && _proxies$mcdProxy !== void 0 ? _proxies$mcdProxy : proxies[0];
|
|
2223
|
+
var additionalProxies = (_ref = (_proxies$validAdditio = proxies.validAdditionalProxies) !== null && _proxies$validAdditio !== void 0 ? _proxies$validAdditio : proxies[1]) !== null && _ref !== void 0 ? _ref : [];
|
|
2224
|
+
// DFSProxyRegistryV2 only returns mcdProxy when Maker registry still matches current owner.
|
|
2225
|
+
// Ownership-transferred wallets show up in validAdditionalProxies instead.
|
|
2226
|
+
if (mcdProxy && mcdProxy !== '0x0000000000000000000000000000000000000000') {
|
|
2227
|
+
_this.proxy = mcdProxy;
|
|
2228
|
+
} else if (additionalProxies.length > 0) {
|
|
2229
|
+
_this.proxy = additionalProxies[0];
|
|
2225
2230
|
}
|
|
2226
2231
|
_this.accountReady = true;
|
|
2227
2232
|
})();
|
|
@@ -2252,7 +2257,7 @@ class DfsWeb3 {
|
|
|
2252
2257
|
var transactions = [];
|
|
2253
2258
|
var approvals = yield action.getAssetsToApprove();
|
|
2254
2259
|
yield Promise.all(approvals.map(/*#__PURE__*/function () {
|
|
2255
|
-
var
|
|
2260
|
+
var _ref2 = _asyncToGenerator(function* (a) {
|
|
2256
2261
|
if (a.owner.toLowerCase() === _this3.proxy.toLowerCase()) {
|
|
2257
2262
|
var Erc20AbiItems = _abis_Erc20_json__WEBPACK_IMPORTED_MODULE_3__.map(item => _objectSpread(_objectSpread({}, item), {}, {
|
|
2258
2263
|
stateMutability: item.stateMutability,
|
|
@@ -2266,7 +2271,7 @@ class DfsWeb3 {
|
|
|
2266
2271
|
}
|
|
2267
2272
|
});
|
|
2268
2273
|
return function (_x) {
|
|
2269
|
-
return
|
|
2274
|
+
return _ref2.apply(this, arguments);
|
|
2270
2275
|
};
|
|
2271
2276
|
}()));
|
|
2272
2277
|
return transactions;
|
|
@@ -2313,7 +2318,7 @@ class DfsWeb3 {
|
|
|
2313
2318
|
/* 31 */
|
|
2314
2319
|
/***/ ((module) => {
|
|
2315
2320
|
|
|
2316
|
-
module.exports = /*#__PURE__*/JSON.parse('[{"inputs":[{"internalType":"address","name":"
|
|
2321
|
+
module.exports = /*#__PURE__*/JSON.parse('[{"inputs":[{"internalType":"address","name":"proxy","type":"address"}],"name":"InvalidDSProxy","type":"error"},{"inputs":[],"name":"NonContractCall","type":"error"},{"inputs":[],"name":"SenderNotAdmin","type":"error"},{"inputs":[],"name":"SenderNotOwner","type":"error"},{"inputs":[{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"SenderNotUserOrOwner","type":"error"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":true,"internalType":"address","name":"proxy","type":"address"}],"name":"AdditionalProxyAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":true,"internalType":"address","name":"proxy","type":"address"}],"name":"AdditionalProxyRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":true,"internalType":"address","name":"proxy","type":"address"},{"indexed":true,"internalType":"address","name":"caller","type":"address"},{"indexed":false,"internalType":"bool","name":"excluded","type":"bool"}],"name":"ProxyExclusionUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"proxy","type":"address"},{"indexed":true,"internalType":"address","name":"oldOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"ProxySynced","type":"event"},{"inputs":[],"name":"MCD_REGISTRY","outputs":[{"internalType":"contract IDSProxyRegistry","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"user","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"additionalProxies","outputs":[{"internalType":"address","name":"proxies","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"user","type":"address"},{"internalType":"address","name":"proxy","type":"address"}],"name":"additionalProxyIndex","outputs":[{"internalType":"uint256","name":"indexPlusOne","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"adminVault","outputs":[{"internalType":"contract IAdminVault","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"}],"name":"getAllProxies","outputs":[{"internalType":"address","name":"mcdProxy","type":"address"},{"internalType":"address[]","name":"validAdditionalProxies","type":"address[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"}],"name":"getMcdProxy","outputs":[{"internalType":"address","name":"proxy","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"},{"internalType":"address[]","name":"_proxies","type":"address[]"}],"name":"removeAdditionalProxies","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"},{"internalType":"address","name":"_proxy","type":"address"}],"name":"removeAdditionalProxy","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"user","type":"address"},{"internalType":"address","name":"proxy","type":"address"}],"name":"removedProxies","outputs":[{"internalType":"bool","name":"removed","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"},{"internalType":"address","name":"_proxy","type":"address"}],"name":"restoreAdditionalProxy","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address[]","name":"_proxies","type":"address[]"}],"name":"syncProxies","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_proxy","type":"address"}],"name":"syncProxy","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"proxy","type":"address"}],"name":"trackedOwner","outputs":[{"internalType":"address","name":"owner","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"address","name":"_receiver","type":"address"},{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"withdrawStuckFunds","outputs":[],"stateMutability":"nonpayable","type":"function"}]');
|
|
2317
2322
|
|
|
2318
2323
|
/***/ }),
|
|
2319
2324
|
/* 32 */
|