use up exec npm package

package.json

@@ -79,6 +79,7 @@
     "@arbitrum/nitro-contracts": "1.1.1",
     "@arbitrum/token-bridge-contracts": "1.0.0-beta.0",
     "@gnosis.pm/safe-contracts": "1.3.0",
+    "@offchainlabs/upgrade-executor": "1.1.0-beta.0",
     "@openzeppelin/contracts": "4.7.3",
     "@openzeppelin/contracts-upgradeable": "4.7.3",
     "@types/yargs": "^17.0.17",

remappings.txt

@@ -1,5 +1,6 @@
 forge-std/=lib/forge-std/src/
 solady/=lib/solady/src/
+@offchainlabs/upgrade-executor/=node_modules/@offchainlabs/upgrade-executor/
 @arbitrum/token-bridge-contracts/=node_modules/@arbitrum/token-bridge-contracts/
 @arbitrum/nitro-contracts/=node_modules/@arbitrum/nitro-contracts/
 @openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/

src/L1GovernanceFactory.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import "./L1ArbitrumTimelock.sol";
-import "./UpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/UpgradeExecutor.sol";
 
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";

src/L2GovernanceFactory.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.16;
 import "./L2ArbitrumToken.sol";
 import "./L2ArbitrumGovernor.sol";
 import "./ArbitrumTimelock.sol";
-import "./UpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/UpgradeExecutor.sol";
 import "./FixedDelegateErc20Wallet.sol";
 import "./ArbitrumDAOConstitution.sol";
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

src/UpgradeExecRouteBuilder.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import "@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
-import "./UpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/IUpgradeExecutor.sol";
 import "./L1ArbitrumTimelock.sol";
 import "./security-council-mgmt/Common.sol";
 
@@ -136,7 +136,7 @@ contract UpgradeExecRouteBuilder {
             }
 
             bytes memory executorData = abi.encodeWithSelector(
-                UpgradeExecutor.execute.selector, actionAddresses[i], actionDatas[i]
+                IUpgradeExecutor.execute.selector, actionAddresses[i], actionDatas[i]
             );
 
             // for L1, inbox is set to address(0):

src/gov-action-contracts/AIPs/SecurityCouncilMgmt/GovernanceChainSCMgmtActivationAction.sol

@@ -5,7 +5,7 @@ import "../../../security-council-mgmt/interfaces/IGnosisSafe.sol";
 import "../../address-registries/L2AddressRegistryInterfaces.sol";
 import "./SecurityCouncilMgmtUpgradeLib.sol";
 import "../../../interfaces/IArbitrumDAOConstitution.sol";
-import "../../../interfaces/IUpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/UpgradeExecutor.sol";
 import "../../../interfaces/ICoreTimelock.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 
@@ -49,7 +49,7 @@ contract GovernanceChainSCMgmtActivationAction {
     }
 
     function perform() external {
-        IUpgradeExecutor upgradeExecutor = IUpgradeExecutor(l2AddressRegistry.coreGov().owner());
+        UpgradeExecutor upgradeExecutor = UpgradeExecutor(l2AddressRegistry.coreGov().owner());
 
         // swap in new emergency security council
         SecurityCouncilMgmtUpgradeLib.replaceEmergencySecurityCouncil({

src/gov-action-contracts/AIPs/SecurityCouncilMgmt/L1SCMgmtActivationAction.sol

@@ -2,22 +2,22 @@
 pragma solidity 0.8.16;
 
 import "../../../security-council-mgmt/interfaces/IGnosisSafe.sol";
-import "../../../interfaces/IUpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/IUpgradeExecutor.sol";
 import "../../../interfaces/ICoreTimelock.sol";
 import "./SecurityCouncilMgmtUpgradeLib.sol";
 
 contract L1SCMgmtActivationAction {
     IGnosisSafe public immutable newEmergencySecurityCouncil;
     IGnosisSafe public immutable prevEmergencySecurityCouncil;
     uint256 public immutable emergencySecurityCouncilThreshold;
-    IUpgradeExecutor public immutable l1UpgradeExecutor;
+    UpgradeExecutor public immutable l1UpgradeExecutor;
     ICoreTimelock public immutable l1Timelock;
 
     constructor(
         IGnosisSafe _newEmergencySecurityCouncil,
         IGnosisSafe _prevEmergencySecurityCouncil,
         uint256 _emergencySecurityCouncilThreshold,
-        IUpgradeExecutor _l1UpgradeExecutor,
+        UpgradeExecutor _l1UpgradeExecutor,
         ICoreTimelock _l1Timelock
     ) {
         newEmergencySecurityCouncil = _newEmergencySecurityCouncil;

src/gov-action-contracts/AIPs/SecurityCouncilMgmt/NonGovernanceChainSCMgmtActivationAction.sol

@@ -8,13 +8,13 @@ contract NonGovernanceChainSCMgmtActivationAction {
     IGnosisSafe public immutable newEmergencySecurityCouncil;
     IGnosisSafe public immutable prevEmergencySecurityCouncil;
     uint256 public immutable emergencySecurityCouncilThreshold;
-    IUpgradeExecutor public immutable upgradeExecutor;
+    UpgradeExecutor public immutable upgradeExecutor;
 
     constructor(
         IGnosisSafe _newEmergencySecurityCouncil,
         IGnosisSafe _prevEmergencySecurityCouncil,
         uint256 _emergencySecurityCouncilThreshold,
-        IUpgradeExecutor _upgradeExecutor
+        UpgradeExecutor _upgradeExecutor
     ) {
         newEmergencySecurityCouncil = _newEmergencySecurityCouncil;
         prevEmergencySecurityCouncil = _prevEmergencySecurityCouncil;

src/gov-action-contracts/AIPs/SecurityCouncilMgmt/SecurityCouncilMgmtUpgradeLib.sol

@@ -2,14 +2,14 @@
 pragma solidity 0.8.16;
 
 import "../../../security-council-mgmt/interfaces/IGnosisSafe.sol";
-import "../../../interfaces/IUpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/UpgradeExecutor.sol";
 
 library SecurityCouncilMgmtUpgradeLib {
     function replaceEmergencySecurityCouncil(
         IGnosisSafe _prevSecurityCouncil,
         IGnosisSafe _newSecurityCouncil,
         uint256 _threshold,
-        IUpgradeExecutor _upgradeExecutor
+        UpgradeExecutor _upgradeExecutor
     ) internal {
         requireSafesEquivalent(_prevSecurityCouncil, _newSecurityCouncil, _threshold);
         bytes32 EXECUTOR_ROLE = _upgradeExecutor.EXECUTOR_ROLE();

src/security-council-mgmt/SecurityCouncilManager.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import "../ArbitrumTimelock.sol";
-import "../UpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/IUpgradeExecutor.sol";
 import "../L1ArbitrumTimelock.sol";
 import "./SecurityCouncilMgmtUtils.sol";
 import "./interfaces/ISecurityCouncilManager.sol";

src/security-council-mgmt/governors/SecurityCouncilMemberElectionGovernor.sol

@@ -4,6 +4,7 @@ pragma solidity 0.8.16;
 import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorSettingsUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import "@openzeppelin/contracts/utils/Address.sol";
 import "./modules/SecurityCouncilMemberElectionGovernorCountingUpgradeable.sol";
 import "../interfaces/ISecurityCouncilMemberElectionGovernor.sol";
 import "../interfaces/ISecurityCouncilNomineeElectionGovernor.sol";

src/security-council-mgmt/governors/SecurityCouncilMemberRemovalGovernor.sol

@@ -7,6 +7,7 @@ import
     "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorCountingSimpleUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorSettingsUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import "@openzeppelin/contracts/utils/Address.sol";
 import "./../interfaces/ISecurityCouncilManager.sol";
 import "../Common.sol";
 import "./modules/ArbitrumGovernorVotesQuorumFractionUpgradeable.sol";

src/security-council-mgmt/governors/SecurityCouncilNomineeElectionGovernor.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.16;
 
 import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorSettingsUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import "@openzeppelin/contracts/utils/Address.sol";
 import "../interfaces/ISecurityCouncilMemberElectionGovernor.sol";
 import "../interfaces/ISecurityCouncilNomineeElectionGovernor.sol";
 import "./modules/SecurityCouncilNomineeElectionGovernorCountingUpgradeable.sol";

test/L2GovernanceFactory.t.sol

@@ -3,7 +3,7 @@
 
 import "../src/L2GovernanceFactory.sol";
 import "../src/L2ArbitrumGovernor.sol";
-import "../src/UpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/UpgradeExecutor.sol";
 import "../src/ArbitrumTimelock.sol";
 import "../src/ArbitrumDAOConstitution.sol";
 

test/gov-actions/AIPNovaFeeRoutingAction.t.sol

@@ -6,7 +6,7 @@ pragma solidity 0.8.16;
 import "forge-std/Test.sol";
 
 import "../../src/gov-action-contracts/AIPs/AIPNovaFeeRoutingAction.sol";
-import "../../src/UpgradeExecutor.sol";
+import "@offchainlabs/upgrade-executor/src/UpgradeExecutor.sol";
 
 contract AIPNovaFeeRoutingActionTest is Test {
     UpgradeExecutor constant upExec = UpgradeExecutor(0x86a02dD71363c440b21F4c0E5B2Ad01Ffe1A7482);