Skip to content

Commit c14edba

Browse files
sakulstrasakulstra
committed
fix: stash current state
1 parent 34d9cb0 commit c14edba

11 files changed

Lines changed: 109 additions & 89 deletions

‎.gitmodules‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77
[submodule "lib/aave-v3-origin-private"]
88
path = lib/aave-v3-origin-private
99
url = https://github.com/bgd-labs/aave-v3-origin-private
10-
branch = v3.4.0
10+
branch = refactor/remove-gho-custom-logic
11+
[submodule "lib/GhoDirectMinter"]
12+
path = lib/GhoDirectMinter
13+
url = https://github.com/bgd-labs/GhoDirectMinter

‎lib/GhoDirectMinter‎

Submodule GhoDirectMinter added at 4b9e7a2

‎lib/aave-helpers‎

‎lib/aave-v3-origin-private‎

‎remappings.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ forge-std/=lib/forge-std/src/
88
openzeppelin-contracts-upgradeable/=lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/
99
openzeppelin-contracts/=lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/
1010
solidity-utils/=lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/lib/solidity-utils/src/
11+
gho-direct-minter/=lib/GhoDirectMinter/src/

‎reports/UpgradePayload3_4_after.json‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
7676
"variableDebtTokenName": "Aave Ethereum Variable Debt 1INCH",
7777
"variableDebtTokenSymbol": "variableDebtEth1INCH",
78-
"virtualAccountingActive": true,
7978
"virtualBalance": "2819265454145512894411203"
8079
},
8180
"0x18084fbA666a33d37592fA2633fD49a74DD93a88": {
@@ -113,7 +112,6 @@
113112
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
114113
"variableDebtTokenName": "Aave Ethereum Variable Debt tBTC",
115114
"variableDebtTokenSymbol": "variableDebtEthtBTC",
116-
"virtualAccountingActive": true,
117115
"virtualBalance": "1464189470458766409796"
118116
},
119117
"0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": {
@@ -151,7 +149,6 @@
151149
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
152150
"variableDebtTokenName": "Aave Ethereum Variable Debt UNI",
153151
"variableDebtTokenSymbol": "variableDebtEthUNI",
154-
"virtualAccountingActive": true,
155152
"virtualBalance": "4133160457131550764353908"
156153
},
157154
"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599": {
@@ -188,7 +185,6 @@
188185
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
189186
"variableDebtTokenName": "Aave Ethereum Variable Debt WBTC",
190187
"variableDebtTokenSymbol": "variableDebtEthWBTC",
191-
"virtualAccountingActive": true,
192188
"virtualBalance": "3619923868867"
193189
},
194190
"0x3432B6A60D23Ca0dFCa7761B7ab56459D9C964D0": {
@@ -226,7 +222,6 @@
226222
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
227223
"variableDebtTokenName": "Aave Ethereum Variable Debt FXS",
228224
"variableDebtTokenSymbol": "variableDebtEthFXS",
229-
"virtualAccountingActive": true,
230225
"virtualBalance": "4246057181762034351878"
231226
},
232227
"0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f": {
@@ -263,7 +258,6 @@
263258
"variableDebtTokenImpl": "0xF62849F9A0B5Bf2913b396098F7c7019b51A820a",
264259
"variableDebtTokenName": "hello",
265260
"variableDebtTokenSymbol": "yay",
266-
"virtualAccountingActive": false,
267261
"virtualBalance": "0"
268262
},
269263
"0x4c9EDD5852cd905f086C759E8383e09bff1E68B3": {
@@ -301,7 +295,6 @@
301295
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
302296
"variableDebtTokenName": "Aave Ethereum Variable Debt USDe",
303297
"variableDebtTokenSymbol": "variableDebtEthUSDe",
304-
"virtualAccountingActive": true,
305298
"virtualBalance": "9773498520196232338038725"
306299
},
307300
"0x514910771AF9Ca656af840dff83E8264EcF986CA": {
@@ -339,7 +332,6 @@
339332
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
340333
"variableDebtTokenName": "Aave Ethereum Variable Debt LINK",
341334
"variableDebtTokenSymbol": "variableDebtEthLINK",
342-
"virtualAccountingActive": true,
343335
"virtualBalance": "12740044120202097820211467"
344336
},
345337
"0x5A98FcBEA516Cf06857215779Fd812CA3beF1B32": {
@@ -377,7 +369,6 @@
377369
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
378370
"variableDebtTokenName": "Aave Ethereum Variable Debt LDO",
379371
"variableDebtTokenSymbol": "variableDebtEthLDO",
380-
"virtualAccountingActive": true,
381372
"virtualBalance": "5458213117283173266640939"
382373
},
383374
"0x5f98805A4E8be255a32880FDeC7F6728C6568bA0": {
@@ -415,7 +406,6 @@
415406
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
416407
"variableDebtTokenName": "Aave Ethereum Variable Debt LUSD",
417408
"variableDebtTokenSymbol": "variableDebtEthLUSD",
418-
"virtualAccountingActive": true,
419409
"virtualBalance": "936352834598278051816912"
420410
},
421411
"0x6B175474E89094C44Da98b954EedeAC495271d0F": {
@@ -453,7 +443,6 @@
453443
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
454444
"variableDebtTokenName": "Aave Ethereum Variable Debt DAI",
455445
"variableDebtTokenSymbol": "variableDebtEthDAI",
456-
"virtualAccountingActive": true,
457446
"virtualBalance": "13038600430369502968593936"
458447
},
459448
"0x6c3ea9036406852006290770BEdFcAbA0e23A0e8": {
@@ -491,7 +480,6 @@
491480
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
492481
"variableDebtTokenName": "Aave Ethereum Variable Debt PYUSD",
493482
"variableDebtTokenSymbol": "variableDebtEthPYUSD",
494-
"virtualAccountingActive": true,
495483
"virtualBalance": "2274020351219"
496484
},
497485
"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9": {
@@ -529,7 +517,6 @@
529517
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
530518
"variableDebtTokenName": "Aave Ethereum Variable Debt AAVE",
531519
"variableDebtTokenSymbol": "variableDebtEthAAVE",
532-
"virtualAccountingActive": true,
533520
"virtualBalance": "1234500089591291540682636"
534521
},
535522
"0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0": {
@@ -567,7 +554,6 @@
567554
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
568555
"variableDebtTokenName": "Aave Ethereum Variable Debt wstETH",
569556
"variableDebtTokenSymbol": "variableDebtEthwstETH",
570-
"virtualAccountingActive": true,
571557
"virtualBalance": "992947135909879209145120"
572558
},
573559
"0x83F20F44975D03b1b09e64809B757c47f942BEeA": {
@@ -605,7 +591,6 @@
605591
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
606592
"variableDebtTokenName": "Aave Ethereum Variable Debt sDAI",
607593
"variableDebtTokenSymbol": "variableDebtEthsDAI",
608-
"virtualAccountingActive": true,
609594
"virtualBalance": "6221662931490840895769561"
610595
},
611596
"0x853d955aCEf822Db058eb8505911ED77F175b99e": {
@@ -643,7 +628,6 @@
643628
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
644629
"variableDebtTokenName": "Aave Ethereum Variable Debt FRAX",
645630
"variableDebtTokenSymbol": "variableDebtEthFRAX",
646-
"virtualAccountingActive": true,
647631
"virtualBalance": "25516418880290449175406"
648632
},
649633
"0x9D39A5DE30e57443BfF2A8307A4256c8797A3497": {
@@ -681,7 +665,6 @@
681665
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
682666
"variableDebtTokenName": "Aave Ethereum Variable Debt sUSDe",
683667
"variableDebtTokenSymbol": "variableDebtEthsUSDe",
684-
"virtualAccountingActive": true,
685668
"virtualBalance": "63999999998565436121373799"
686669
},
687670
"0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2": {
@@ -719,7 +702,6 @@
719702
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
720703
"variableDebtTokenName": "Aave Ethereum Variable Debt MKR",
721704
"variableDebtTokenSymbol": "variableDebtEthMKR",
722-
"virtualAccountingActive": true,
723705
"virtualBalance": "22341374722708870194799"
724706
},
725707
"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48": {
@@ -757,7 +739,6 @@
757739
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
758740
"variableDebtTokenName": "Aave Ethereum Variable Debt USDC",
759741
"variableDebtTokenSymbol": "variableDebtEthUSDC",
760-
"virtualAccountingActive": true,
761742
"virtualBalance": "129609619179491"
762743
},
763744
"0xA1290d69c65A6Fe4DF752f95823fae25cB99e5A7": {
@@ -795,7 +776,6 @@
795776
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
796777
"variableDebtTokenName": "Aave Ethereum Variable Debt rsETH",
797778
"variableDebtTokenSymbol": "variableDebtEthrsETH",
798-
"virtualAccountingActive": true,
799779
"virtualBalance": "37999999999988489204398"
800780
},
801781
"0xA35b1B31Ce002FBF2058D22F30f95D405200A15b": {
@@ -833,7 +813,6 @@
833813
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
834814
"variableDebtTokenName": "Aave Ethereum Variable Debt ETHx",
835815
"variableDebtTokenSymbol": "variableDebtEthETHx",
836-
"virtualAccountingActive": true,
837816
"virtualBalance": "5498949862037976675782"
838817
},
839818
"0xAf5191B0De278C7286d6C7CC6ab6BB8A73bA2Cd6": {
@@ -871,7 +850,6 @@
871850
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
872851
"variableDebtTokenName": "Aave Ethereum Variable Debt STG",
873852
"variableDebtTokenSymbol": "variableDebtEthSTG",
874-
"virtualAccountingActive": true,
875853
"virtualBalance": "467787578123221116239"
876854
},
877855
"0xBe9895146f7AF43049ca1c1AE358B0541Ea49704": {
@@ -909,7 +887,6 @@
909887
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
910888
"variableDebtTokenName": "Aave Ethereum Variable Debt cbETH",
911889
"variableDebtTokenSymbol": "variableDebtEthcbETH",
912-
"virtualAccountingActive": true,
913890
"virtualBalance": "5784569405344029650810"
914891
},
915892
"0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F": {
@@ -947,7 +924,6 @@
947924
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
948925
"variableDebtTokenName": "Aave Ethereum Variable Debt SNX",
949926
"variableDebtTokenSymbol": "variableDebtEthSNX",
950-
"virtualAccountingActive": true,
951927
"virtualBalance": "2792535501446491383618859"
952928
},
953929
"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": {
@@ -985,7 +961,6 @@
985961
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
986962
"variableDebtTokenName": "Aave Ethereum Variable Debt WETH",
987963
"variableDebtTokenSymbol": "variableDebtEthWETH",
988-
"virtualAccountingActive": true,
989964
"virtualBalance": "241530404661663012251150"
990965
},
991966
"0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72": {
@@ -1023,7 +998,6 @@
1023998
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
1024999
"variableDebtTokenName": "Aave Ethereum Variable Debt ENS",
10251000
"variableDebtTokenSymbol": "variableDebtEthENS",
1026-
"virtualAccountingActive": true,
10271001
"virtualBalance": "259264535035221961438522"
10281002
},
10291003
"0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee": {
@@ -1061,7 +1035,6 @@
10611035
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
10621036
"variableDebtTokenName": "Aave Ethereum Variable Debt weETH",
10631037
"variableDebtTokenSymbol": "variableDebtEthweETH",
1064-
"virtualAccountingActive": true,
10651038
"virtualBalance": "1079745911527141908298666"
10661039
},
10671040
"0xD33526068D116cE69F19A9ee46F0bd304F21A51f": {
@@ -1099,7 +1072,6 @@
10991072
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
11001073
"variableDebtTokenName": "Aave Ethereum Variable Debt RPL",
11011074
"variableDebtTokenSymbol": "variableDebtEthRPL",
1102-
"virtualAccountingActive": true,
11031075
"virtualBalance": "279734424812824058082581"
11041076
},
11051077
"0xD533a949740bb3306d119CC777fa900bA034cd52": {
@@ -1137,7 +1109,6 @@
11371109
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
11381110
"variableDebtTokenName": "Aave Ethereum Variable Debt CRV",
11391111
"variableDebtTokenSymbol": "variableDebtEthCRV",
1140-
"virtualAccountingActive": true,
11411112
"virtualBalance": "6300186974025729474086581"
11421113
},
11431114
"0xae78736Cd615f374D3085123A210448E74Fc6393": {
@@ -1175,7 +1146,6 @@
11751146
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
11761147
"variableDebtTokenName": "Aave Ethereum Variable Debt rETH",
11771148
"variableDebtTokenSymbol": "variableDebtEthrETH",
1178-
"virtualAccountingActive": true,
11791149
"virtualBalance": "41888150001145414056805"
11801150
},
11811151
"0xba100000625a3754423978a60c9317c58a424e3D": {
@@ -1213,7 +1183,6 @@
12131183
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
12141184
"variableDebtTokenName": "Aave Ethereum Variable Debt BAL",
12151185
"variableDebtTokenSymbol": "variableDebtEthBAL",
1216-
"virtualAccountingActive": true,
12171186
"virtualBalance": "5432702321115096513464544"
12181187
},
12191188
"0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf": {
@@ -1251,7 +1220,6 @@
12511220
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
12521221
"variableDebtTokenName": "Aave Ethereum Variable Debt cbBTC",
12531222
"variableDebtTokenSymbol": "variableDebtEthcbBTC",
1254-
"virtualAccountingActive": true,
12551223
"virtualBalance": "915839678062"
12561224
},
12571225
"0xdAC17F958D2ee523a2206206994597C13D831ec7": {
@@ -1289,7 +1257,6 @@
12891257
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
12901258
"variableDebtTokenName": "Aave Ethereum Variable Debt USDT",
12911259
"variableDebtTokenSymbol": "variableDebtEthUSDT",
1292-
"virtualAccountingActive": true,
12931260
"virtualBalance": "180864497437573"
12941261
},
12951262
"0xdC035D45d973E3EC169d2276DDab16f1e407384F": {
@@ -1327,7 +1294,6 @@
13271294
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
13281295
"variableDebtTokenName": "Aave Ethereum Variable Debt USDS",
13291296
"variableDebtTokenSymbol": "variableDebtEthUSDS",
1330-
"virtualAccountingActive": true,
13311297
"virtualBalance": "69350780963244685713552878"
13321298
},
13331299
"0xdeFA4e8a7bcBA345F687a2f1456F5Edd9CE97202": {
@@ -1365,7 +1331,6 @@
13651331
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
13661332
"variableDebtTokenName": "Aave Ethereum Variable Debt KNC",
13671333
"variableDebtTokenSymbol": "variableDebtEthKNC",
1368-
"virtualAccountingActive": true,
13691334
"virtualBalance": "51945613145003933963981"
13701335
},
13711336
"0xf1C9acDc66974dFB6dEcB12aA385b9cD01190E38": {
@@ -1403,7 +1368,6 @@
14031368
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
14041369
"variableDebtTokenName": "Aave Ethereum Variable Debt osETH",
14051370
"variableDebtTokenSymbol": "variableDebtEthosETH",
1406-
"virtualAccountingActive": true,
14071371
"virtualBalance": "4580200533366371878141"
14081372
},
14091373
"0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E": {
@@ -1441,7 +1405,6 @@
14411405
"variableDebtTokenImpl": "0xaC725CB59D16C81061BDeA61041a8A5e73DA9EC6",
14421406
"variableDebtTokenName": "Aave Ethereum Variable Debt crvUSD",
14431407
"variableDebtTokenSymbol": "variableDebtEthcrvUSD",
1444-
"virtualAccountingActive": true,
14451408
"virtualBalance": "102994043204395413868094"
14461409
}
14471410
},

0 commit comments

Comments
 (0)