update contracts with new owners

Author: PeterMPhillips

script/EnsoCCIPReceiverDeployer.s.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.28;
 
 import { EnsoCCIPReceiver } from "../src/bridge/EnsoCCIPReceiver.sol";
-import { ChainId } from "../src/libraries/DataTypes.sol";
+import { ChainId, ChainOwner } from "../src/libraries/ChainOwner.sol";
 import { Script } from "forge-std/Script.sol";
 
 contract EnsoCCIPReceiverDeployer is Script {
@@ -14,7 +14,7 @@ contract EnsoCCIPReceiverDeployer is Script {
     function run() public returns (address ensoCcipReceiver, address owner, address ccipRouter, address ensoRouter) {
         uint256 chainId = block.chainid;
 
-        owner = vm.envAddress("DEPLOYER_ADDRESS"); // NOTE: owner is deployer
+        owner = ChainOwner.ownerFor(chainId);
         if (chainId == ChainId.ETHEREUM) {
             ccipRouter = 0x80226fc0Ee2b096224EeAc085Bb9a8cba1146f7D;
             ensoRouter = 0xF75584eF6673aD213a685a1B58Cc0330B8eA22Cf;

script/EnsoReceiverAndPaymasterDeployer.s.sol

@@ -3,28 +3,30 @@ pragma solidity ^0.8.28;
 
 import { EnsoReceiver } from "../src/delegate/EnsoReceiver.sol";
 import { ERC4337CloneFactory } from "../src/factory/ERC4337CloneFactory.sol";
+import { ChainOwner } from "../src/libraries/ChainOwner.sol";
 import { SignaturePaymaster } from "../src/paymaster/SignaturePaymaster.sol";
 import { IEntryPoint } from "account-abstraction-v7/interfaces/IEntryPoint.sol";
 import { Script } from "forge-std/Script.sol";
 
 contract EnsoReceiverAndPaymasterDeployer is Script {
     address ENTRY_POINT_V7 = 0x0000000071727De22E5E9d8BAf0edAc6f37da032;
-
-    address OWNER = 0x826e0BB2276271eFdF2a500597f37b94f6c153bA;
-    address BACKEND_SIGNER = 0xFE503EE14863F6aCEE10BCdc66aC5e2301b3A946;
+    address BACKEND_SIGNER = 0x89B3c70f6dF4Fc6Ba0613de208c9da5132b8ecc2;
 
     function run()
         public
         returns (EnsoReceiver implementation, ERC4337CloneFactory factory, SignaturePaymaster paymaster)
     {
         vm.startBroadcast();
 
+        address owner = ChainOwner.ownerFor(block.chainid);
+        address deployer = msg.sender;
         address entryPoint = ENTRY_POINT_V7;
         implementation = new EnsoReceiver{ salt: "EnsoReceiver" }();
         implementation.initialize(address(0), address(0), address(0)); // brick the implementation
         factory = new ERC4337CloneFactory{ salt: "ERC4337CloneFactory" }(address(implementation), entryPoint);
-        paymaster = new SignaturePaymaster{ salt: "SignaturePaymaster" }(IEntryPoint(entryPoint), OWNER);
+        paymaster = new SignaturePaymaster{ salt: "SignaturePaymaster" }(IEntryPoint(entryPoint), deployer);
         paymaster.setSigner(BACKEND_SIGNER, true);
+        paymaster.transferOwnership(owner);
 
         vm.stopBroadcast();
     }

script/EnsoReceiverDeployer.s.sol

@@ -9,9 +9,6 @@ import { Script } from "forge-std/Script.sol";
 contract EnsoReceiverDeployer is Script {
     address ENTRY_POINT_V7 = 0x0000000071727De22E5E9d8BAf0edAc6f37da032;
 
-    address OWNER = 0x826e0BB2276271eFdF2a500597f37b94f6c153bA;
-    address BACKEND_SIGNER = 0xFE503EE14863F6aCEE10BCdc66aC5e2301b3A946;
-
     function run() public returns (EnsoReceiver implementation, ERC4337CloneFactory factory) {
         vm.startBroadcast();
 

script/FlashloanAdapterDeployer.s.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.28;
 import { EnsoRouterFlashloanAdapter } from "../src/flashloan/EnsoRouterFlashloanAdapter.sol";
 import { EnsoSafeFlashloanAdapter } from "../src/flashloan/EnsoSafeFlashloanAdapter.sol";
 import { EnsoWalletFlashloanAdapter } from "../src/flashloan/EnsoWalletFlashloanAdapter.sol";
+import { ChainOwner } from "../src/libraries/ChainOwner.sol";
 import { FlashloanAdapterConfig, LenderProtocol } from "./FlashloanAdapterConfig.s.sol";
 import { Script } from "forge-std/Script.sol";
 
@@ -27,7 +28,7 @@ contract EnsoWalletFlashloanAdapterDeployer is Script, FlashloanAdapterConfig {
 
         vm.startBroadcast();
 
-        address owner = vm.envAddress("DEPLOYER_ADDRESS");
+        address owner = ChainOwner.ownerFor(block.chainid);
 
         if (router != address(0)) {
             routerAdapter =

script/LayerZeroDeployer.s.sol

@@ -2,15 +2,15 @@
 pragma solidity ^0.8.28;
 
 import { LayerZeroReceiver } from "../src/bridge/LayerZeroReceiver.sol";
-import { ChainId } from "../src/libraries/DataTypes.sol";
+import { ChainId, ChainOwner } from "../src/libraries/ChainOwner.sol";
 import { Script } from "forge-std/Script.sol";
 
 contract LayerZeroDeployer is Script {
     function run() public returns (address lzReceiver, address endpoint, address router) {
         vm.startBroadcast();
 
-        address deployer = 0x826e0BB2276271eFdF2a500597f37b94f6c153bA;
         uint256 chainId = block.chainid;
+        address owner = ChainOwner.ownerFor(chainId);
         if (chainId == ChainId.ZKSYNC) {
             endpoint = 0xd07C30aF3Ff30D96BDc9c6044958230Eb797DDBF; // zksync
             router = 0x1BD8CefD703CF6b8fF886AD2E32653C32bc62b5C;
@@ -55,7 +55,7 @@ contract LayerZeroDeployer is Script {
             router = 0xF75584eF6673aD213a685a1B58Cc0330B8eA22Cf;
         }
 
-        lzReceiver = address(new LayerZeroReceiver{ salt: "LayerZeroReceiver" }(endpoint, router, deployer));
+        lzReceiver = address(new LayerZeroReceiver{ salt: "LayerZeroReceiver" }(endpoint, router, owner));
 
         vm.stopBroadcast();
     }