fix: new deployment

Author: sendra

.gitmodules

@@ -1,7 +1,6 @@
 [submodule "lib/aave-delivery-infrastructure"]
 	path = lib/aave-delivery-infrastructure
 	url = https://github.com/bgd-labs/aave-delivery-infrastructure
-	branch = feat/bob
 [submodule "lib/aave-helpers"]
 	path = lib/aave-helpers
 	url = https://github.com/bgd-labs/aave-helpers

Makefile

@@ -26,7 +26,7 @@ custom_ethereum := --with-gas-price 2000000000 # 53 gwei
 custom_zksync := --zksync
 custom_linea-testnet :=  --legacy --with-gas-price 27000000000 --force # 1 gwei
 custom_linea :=  --with-gas-price 1000000000 --force # 1 gwei
-custom_bob :=  --with-gas-price 100000000 --force # 0.1 gwei
+# custom_bob :=  --with-gas-price 100000000 --force # 0.1 gwei
 custom_ethereum-testnet :=  --legacy --with-gas-price 27000000000 --force # 1 gwei
 
 # params:

deployments/bob.json

@@ -1,17 +1,17 @@
 {
   "arbAdapter": "0x0000000000000000000000000000000000000000",
   "baseAdapter": "0x0000000000000000000000000000000000000000",
-  "bobAdapter": "0xE0952BC7C31E73431549E58f11FffF31d63BBEe2",
+  "bobAdapter": "0x2171E8AD4045342AF92DdC1227ADC659f2a00535",
   "ccipAdapter": "0x0000000000000000000000000000000000000000",
   "chainId": 60808,
   "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
   "create3Factory": "0x0000000000000000000000000000000000000000",
-  "crossChainController": "0xef59a4eF559Bc7DA51B4A11E8cE24fC8bA0a8561",
-  "crossChainControllerImpl": "0xDE5A4ed7570494cd6cC556b6a8F933a2A7D89b34",
+  "crossChainController": "0xf630C8A7bC033FD20fcc45d8B43bFe92dE73154F",
+  "crossChainControllerImpl": "0x931F1da6E2Bc9Ef1842b3094b908E9E6E24D1198",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
-  "executor": "0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A",
+  "executor": "0x90800d1F54384523723eD3962c7Cd59d7866c83d",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "granularCCCGuardian": "0x80235F027952d69121d3FCa0b996708AC5aDCB5B",
+  "granularCCCGuardian": "0xb2C672931Bd1Da226e29997Ec8cEB60Fb1DA3959",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x0000000000000000000000000000000000000000",
   "inkAdapter": "0x0000000000000000000000000000000000000000",
@@ -23,7 +23,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdminCCC": "0x122340c9b391BD581a8632217735cA2470F232c4",
+  "proxyAdminCCC": "0x628ca0cB6e8A163bB1C4a50B75D7D4E7D38e8b18",
   "proxyFactory": "0xEB0682d148e874553008730f0686ea89db7DA412",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

lib/aave-delivery-infrastructure

@@ -331,7 +331,7 @@ contract Soneium is DeployGranularGuardian {
 
 contract Bob is DeployGranularGuardian {
   function DEFAULT_ADMIN() internal pure override returns (address) {
-    return 0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A; //GovernanceV3Bob.EXECUTOR_LVL_1;
+    return 0x90800d1F54384523723eD3962c7Cd59d7866c83d; //GovernanceV3Bob.EXECUTOR_LVL_1;
   }
 
   function RETRY_GUARDIAN() internal pure override returns (address) {

scripts/access_control/network_scripts/GranularGuardianNetworkDeploys.s.sol

@@ -115,19 +115,18 @@ contract Soneium is Script, UpdateCCCPermissionsSoneium {
   }
 }
 
-
 contract UpdateCCCPermissionsBob is UpdateCCCPermissions {
   function targetOwner() public pure override returns (address) {
-    return 0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A; // executor
+    return 0x90800d1F54384523723eD3962c7Cd59d7866c83d; // executor
   }
 
   function targetADIGuardian() public pure override returns (address) {
-    return 0x80235F027952d69121d3FCa0b996708AC5aDCB5B; // Granular Guardian
+    return 0xb2C672931Bd1Da226e29997Ec8cEB60Fb1DA3959; // Granular Guardian
   }
 
   function aDIContractsToUpdate() public pure override returns (address[] memory) {
     address[] memory contracts = new address[](1);
-    contracts[0] = 0xef59a4eF559Bc7DA51B4A11E8cE24fC8bA0a8561; // CCC
+    contracts[0] = 0xf630C8A7bC033FD20fcc45d8B43bFe92dE73154F; // CCC
     return contracts;
   }
 }
@@ -140,4 +139,4 @@ contract Bob is Script, UpdateCCCPermissionsBob {
 
     vm.stopBroadcast();
   }
-}
+}