Skip to content

Commit 1460c75

Browse files
sendrasendra
committed
fix: solved conflicts
2 parents 6cc99a2 + f5ec0b5 commit 1460c75

16 files changed

+88
-88
lines changed

‎out/permissions/1-permissions.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@
11281128
"0x8b493f416F5F7933cC146b1899c069F2361cad60"
11291129
]
11301130
},
1131-
"latestBlockNumber": 23168709
1131+
"latestBlockNumber": 23168728
11321132
},
11331133
"gsmRoles": {},
11341134
"govV3": {
@@ -1144,7 +1144,7 @@
11441144
"0xb812d0944f8F581DfAA3a93Dda0d22EcEf51A9CF"
11451145
]
11461146
},
1147-
"latestBlockNumber": 23168709
1147+
"latestBlockNumber": 23168728
11481148
},
11491149
"contracts": {
11501150
"GranularGuardian": {
@@ -1724,7 +1724,7 @@
17241724
"0x9Ded9406f088C10621BE628EEFf40c1DF396c172",
17251725
"0xFe4683C18aaad791B6AFDF0a8e1Ed5C6e2c9ecD6"
17261726
],
1727-
"latestCCCBlockNumber": 23168709
1727+
"latestCCCBlockNumber": 23168728
17281728
},
17291729
"collector": {
17301730
"contracts": {
@@ -1812,7 +1812,7 @@
18121812
"0x22aC12a6937BBBC0a301AF9154d08EaD95673122"
18131813
]
18141814
},
1815-
"latestBlockNumber": 23168709
1815+
"latestBlockNumber": 23168728
18161816
}
18171817
},
18181818
"clinicSteward": {
@@ -1872,7 +1872,7 @@
18721872
"0x3Cbded22F878aFC8d39dCD744d3Fe62086B76193"
18731873
]
18741874
},
1875-
"latestBlockNumber": 23168709
1875+
"latestBlockNumber": 23168728
18761876
}
18771877
},
18781878
"umbrella": {
@@ -2136,7 +2136,7 @@
21362136
"0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A"
21372137
]
21382138
},
2139-
"latestBlockNumber": 23168709
2139+
"latestBlockNumber": 23168728
21402140
},
21412141
"umbrellaIncentivesRoles": {
21422142
"role": {
@@ -2148,7 +2148,7 @@
21482148
"0x2759de67aD133C747C9f41d56F1b8A343cE679a1"
21492149
]
21502150
},
2151-
"latestBlockNumber": 23168709
2151+
"latestBlockNumber": 23168728
21522152
}
21532153
}
21542154
},
@@ -2528,7 +2528,7 @@
25282528
"0x22aC12a6937BBBC0a301AF9154d08EaD95673122"
25292529
]
25302530
},
2531-
"latestBlockNumber": 23168710
2531+
"latestBlockNumber": 23168730
25322532
}
25332533
},
25342534
"clinicSteward": {},
@@ -2827,7 +2827,7 @@
28272827
"0x22aC12a6937BBBC0a301AF9154d08EaD95673122"
28282828
]
28292829
},
2830-
"latestBlockNumber": 23168710
2830+
"latestBlockNumber": 23168730
28312831
}
28322832
},
28332833
"clinicSteward": {},
@@ -3759,7 +3759,7 @@
37593759
"0x7e6a6B115D31d4A837E3C737c49Cf6Fafe6112C3"
37603760
]
37613761
},
3762-
"latestBlockNumber": 23168710
3762+
"latestBlockNumber": 23168729
37633763
},
37643764
"gsmRoles": {},
37653765
"govV3": {
@@ -3851,7 +3851,7 @@
38513851
"0x22aC12a6937BBBC0a301AF9154d08EaD95673122"
38523852
]
38533853
},
3854-
"latestBlockNumber": 23168710
3854+
"latestBlockNumber": 23168729
38553855
}
38563856
},
38573857
"clinicSteward": {
@@ -3911,7 +3911,7 @@
39113911
"0x3Cbded22F878aFC8d39dCD744d3Fe62086B76193"
39123912
]
39133913
},
3914-
"latestBlockNumber": 23168710
3914+
"latestBlockNumber": 23168729
39153915
}
39163916
},
39173917
"umbrella": {}
@@ -4454,7 +4454,7 @@
44544454
"0xBF79d8339303148E345277a994Eb2cD5d82F0067"
44554455
]
44564456
},
4457-
"latestBlockNumber": 23168710
4457+
"latestBlockNumber": 23168729
44584458
},
44594459
"gsmRoles": {},
44604460
"govV3": {
@@ -4546,7 +4546,7 @@
45464546
"0x22aC12a6937BBBC0a301AF9154d08EaD95673122"
45474547
]
45484548
},
4549-
"latestBlockNumber": 23168710
4549+
"latestBlockNumber": 23168730
45504550
}
45514551
},
45524552
"clinicSteward": {},
@@ -7207,7 +7207,7 @@
72077207
"0x46Aa1063e5265b43663E81329333B47c517A5409"
72087208
]
72097209
},
7210-
"latestBlockNumber": 23168710
7210+
"latestBlockNumber": 23168730
72117211
},
72127212
"gsmRoles": {
72137213
"GSM_USDC": {
@@ -7227,7 +7227,7 @@
72277227
"TOKEN_RESCUER_ROLE": [],
72287228
"LIQUIDATOR_ROLE": []
72297229
},
7230-
"latestBlockNumber": 23168710
7230+
"latestBlockNumber": 23168730
72317231
},
72327232
"GSM_USDT": {
72337233
"role": {
@@ -7246,7 +7246,7 @@
72467246
"TOKEN_RESCUER_ROLE": [],
72477247
"LIQUIDATOR_ROLE": []
72487248
},
7249-
"latestBlockNumber": 23168710
7249+
"latestBlockNumber": 23168730
72507250
}
72517251
},
72527252
"govV3": {

‎out/permissions/10-permissions.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@
528528
"0x59bAbc14Dd73761e38E5bdA171b2298DC14da92d"
529529
]
530530
},
531-
"latestBlockNumber": 139965291
531+
"latestBlockNumber": 139965408
532532
},
533533
"gsmRoles": {},
534534
"govV3": {
@@ -544,7 +544,7 @@
544544
"0x3A800fbDeAC82a4d9c68A9FA0a315e095129CDBF"
545545
]
546546
},
547-
"latestBlockNumber": 139965293
547+
"latestBlockNumber": 139965410
548548
},
549549
"contracts": {
550550
"GranularGuardian": {
@@ -810,7 +810,7 @@
810810
}
811811
},
812812
"senders": [],
813-
"latestCCCBlockNumber": 139965293
813+
"latestCCCBlockNumber": 139965410
814814
},
815815
"collector": {
816816
"contracts": {
@@ -887,7 +887,7 @@
887887
"0x4684b645386525057526EB85854045914Fe389d6"
888888
]
889889
},
890-
"latestBlockNumber": 139965293
890+
"latestBlockNumber": 139965410
891891
}
892892
},
893893
"clinicSteward": {
@@ -946,7 +946,7 @@
946946
"0x3Cbded22F878aFC8d39dCD744d3Fe62086B76193"
947947
]
948948
},
949-
"latestBlockNumber": 139965293
949+
"latestBlockNumber": 139965410
950950
}
951951
},
952952
"umbrella": {}

‎out/permissions/100-permissions.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@
501501
"0x6e637e1E48025E51315d50ab96d5b3be1971A715"
502502
]
503503
},
504-
"latestBlockNumber": 41668242
504+
"latestBlockNumber": 41668287
505505
},
506506
"gsmRoles": {},
507507
"govV3": {
@@ -511,7 +511,7 @@
511511
"RETRY_ROLE": [],
512512
"SOLVE_EMERGENCY_ROLE": []
513513
},
514-
"latestBlockNumber": 41668242
514+
"latestBlockNumber": 41668287
515515
},
516516
"contracts": {
517517
"GranularGuardian": {
@@ -806,7 +806,7 @@
806806
}
807807
},
808808
"senders": [],
809-
"latestCCCBlockNumber": 41668242
809+
"latestCCCBlockNumber": 41668287
810810
},
811811
"collector": {
812812
"contracts": {
@@ -872,7 +872,7 @@
872872
"0x0447Be151c126D2d704b1Ce5F5b3ed6b7D50FABA"
873873
]
874874
},
875-
"latestBlockNumber": 41668242
875+
"latestBlockNumber": 41668287
876876
}
877877
},
878878
"clinicSteward": {
@@ -931,7 +931,7 @@
931931
"0x3Cbded22F878aFC8d39dCD744d3Fe62086B76193"
932932
]
933933
},
934-
"latestBlockNumber": 41668242
934+
"latestBlockNumber": 41668287
935935
}
936936
},
937937
"umbrella": {}

‎out/permissions/1088-permissions.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
"ASSET_LISTING_ADMIN": [],
377377
"FLASH_BORROWER": []
378378
},
379-
"latestBlockNumber": 21017294
379+
"latestBlockNumber": 21017308
380380
},
381381
"gsmRoles": {},
382382
"govV3": {
@@ -392,7 +392,7 @@
392392
"0x9853589F951D724D9f7c6724E0fD63F9d888C429"
393393
]
394394
},
395-
"latestBlockNumber": 21017294
395+
"latestBlockNumber": 21017308
396396
},
397397
"contracts": {
398398
"GranularGuardian": {
@@ -658,7 +658,7 @@
658658
}
659659
},
660660
"senders": [],
661-
"latestCCCBlockNumber": 21017294
661+
"latestCCCBlockNumber": 21017308
662662
},
663663
"collector": {
664664
"contracts": {
@@ -724,7 +724,7 @@
724724
"0x53d3c1B2d42578F56ef4c0142F19CDB54CE55040"
725725
]
726726
},
727-
"latestBlockNumber": 21017294
727+
"latestBlockNumber": 21017308
728728
}
729729
},
730730
"clinicSteward": {
@@ -779,7 +779,7 @@
779779
"0x3Cbded22F878aFC8d39dCD744d3Fe62086B76193"
780780
]
781781
},
782-
"latestBlockNumber": 21017294
782+
"latestBlockNumber": 21017308
783783
}
784784
},
785785
"umbrella": {}

‎out/permissions/137-permissions.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@
547547
"0x460b60565cb73845d56564384ab84BF84c13e47D"
548548
]
549549
},
550-
"latestBlockNumber": 75361261
550+
"latestBlockNumber": 75361370
551551
},
552552
"gsmRoles": {},
553553
"govV3": {
@@ -563,7 +563,7 @@
563563
"0xbCEB4f363f2666E2E8E430806F37e97C405c130b"
564564
]
565565
},
566-
"latestBlockNumber": 75361261
566+
"latestBlockNumber": 75361370
567567
},
568568
"contracts": {
569569
"GranularGuardian": {
@@ -942,7 +942,7 @@
942942
"0xc8a2ADC4261c6b669CdFf69E717E77C9cFeB420d",
943943
"0x44c8b753229006A8047A05b90379A7e92185E97C"
944944
],
945-
"latestCCCBlockNumber": 75361261
945+
"latestCCCBlockNumber": 75361370
946946
},
947947
"collector": {
948948
"contracts": {
@@ -1019,7 +1019,7 @@
10191019
"0xE5b11ab4D36E58C9171e3DB98Ba17336606Cd6ef"
10201020
]
10211021
},
1022-
"latestBlockNumber": 75361261
1022+
"latestBlockNumber": 75361370
10231023
}
10241024
},
10251025
"clinicSteward": {
@@ -1074,7 +1074,7 @@
10741074
"0x3Cbded22F878aFC8d39dCD744d3Fe62086B76193"
10751075
]
10761076
},
1077-
"latestBlockNumber": 75361261
1077+
"latestBlockNumber": 75361370
10781078
}
10791079
},
10801080
"umbrella": {}
@@ -1448,7 +1448,7 @@
14481448
"0xE5b11ab4D36E58C9171e3DB98Ba17336606Cd6ef"
14491449
]
14501450
},
1451-
"latestBlockNumber": 75361264
1451+
"latestBlockNumber": 75361374
14521452
}
14531453
},
14541454
"clinicSteward": {},

‎out/permissions/146-permissions.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@
457457
"0xdb93e2712a8B36835078f8D28c70fCC95FD6d37c"
458458
]
459459
},
460-
"latestBlockNumber": 43538488
460+
"latestBlockNumber": 43538925
461461
},
462462
"gsmRoles": {},
463463
"govV3": {
@@ -473,7 +473,7 @@
473473
"0x7837d7a167732aE41627A3B829871d9e32e2e7f2"
474474
]
475475
},
476-
"latestBlockNumber": 43538501
476+
"latestBlockNumber": 43538942
477477
},
478478
"contracts": {
479479
"GranularGuardian": {
@@ -832,7 +832,7 @@
832832
}
833833
},
834834
"senders": [],
835-
"latestCCCBlockNumber": 43538501
835+
"latestCCCBlockNumber": 43538942
836836
},
837837
"collector": {
838838
"contracts": {
@@ -918,7 +918,7 @@
918918
"0x4A137d528444Cc0346320CFa5C80FFc68087D7F9"
919919
]
920920
},
921-
"latestBlockNumber": 43538501
921+
"latestBlockNumber": 43538942
922922
}
923923
},
924924
"clinicSteward": {},

0 commit comments

Comments
 (0)