feat: bold upgrade action

foundry.toml

@@ -6,7 +6,7 @@ libs = ['lib']
 optimizer = true
 optimizer_runs = 20000
 via_ir = false
-solc_version = '0.8.16'
+solc_version = '0.8.17'
 
 [profile.sec_council_mgmt]
 optimizer_runs = 750

hardhat.config.ts

@@ -6,7 +6,7 @@ dotenv.config();
 // when changing optimizer settings, make sure to also change settings in foundry.toml
 const solidityProfiles = {
   default: {
-    version: "0.8.16",
+    version: "0.8.17",
     settings: {
       optimizer: {
         enabled: true,
@@ -15,7 +15,7 @@ const solidityProfiles = {
     }
   },
   sec_council_mgmt: {
-    version: "0.8.16",
+    version: "0.8.17",
     settings: {
       optimizer: {
         enabled: true,

package.json

@@ -76,7 +76,7 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@arbitrum/nitro-contracts": "1.1.1",
+    "@arbitrum/nitro-contracts": "3.0.0-alpha.2",
     "@arbitrum/token-bridge-contracts": "1.0.0-beta.0",
     "@gnosis.pm/safe-contracts": "1.3.0",
     "@openzeppelin/contracts": "4.7.3",

scripts/contractVerifier.ts

@@ -11,7 +11,7 @@ export class ContractVerifier {
   deployedContracts: DeployProgressCache;
 
   readonly NUM_OF_OPTIMIZATIONS = 20000;
-  readonly COMPILER_VERSION = "0.8.16";
+  readonly COMPILER_VERSION = "0.8.17";
 
   ///// List of contract addresses and their corresponding source code files
   readonly TUP =

src-ts/proposalStage.ts

@@ -1384,12 +1384,12 @@ export class RetryableExecutionStage implements ProposalStage {
       throw new Error("Message is not a writer");
     }
 
-    while (true) {
-      try {
-        await (await this.l1ToL2Message.redeem()).wait();
-        break;
-      } catch {
-        const id = this.l1ToL2Message.retryableCreationId.toLowerCase();
+    try {
+      await (await this.l1ToL2Message.redeem()).wait();
+    } catch {
+      const id = this.l1ToL2Message.retryableCreationId.toLowerCase();
+      const redeemed = await this.l1ToL2Message.status();
+      if (redeemed !== L1ToL2MessageStatus.REDEEMED) {
         console.error(`Failed to redeem retryable ${id}, retrying in 60s`);
         await wait(60_000);
       }

src/ArbitrumDAOConstitution.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 

src/ArbitrumFoundationVestingWallet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/finance/VestingWalletUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

src/ArbitrumTimelock.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";
 

src/ArbitrumVestingWallet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/finance/VestingWallet.sol";
 import "@openzeppelin/contracts-upgradeable/governance/IGovernorUpgradeable.sol";

src/ArbitrumVestingWalletFactory.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./ArbitrumVestingWallet.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";

src/FixedDelegateErc20Wallet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/governance/utils/IVotesUpgradeable.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

src/L1ArbitrumMessenger.sol

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.17;
 
 import "@arbitrum/nitro-contracts/src/bridge/IInbox.sol";
 import "@arbitrum/nitro-contracts/src/bridge/IOutbox.sol";

src/L1ArbitrumTimelock.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@arbitrum/nitro-contracts/src/bridge/IInbox.sol";
 import "./L1ArbitrumMessenger.sol";

src/L1ArbitrumToken.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol";
 import "@arbitrum/token-bridge-contracts/contracts/tokenbridge/ethereum/ICustomToken.sol";

src/L1GovernanceFactory.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./L1ArbitrumTimelock.sol";
 import "./UpgradeExecutor.sol";

src/L2ArbitrumGovernor.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorSettingsUpgradeable.sol";

src/L2ArbitrumToken.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";

src/L2GovernanceFactory.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./L2ArbitrumToken.sol";
 import "./L2ArbitrumGovernor.sol";

src/TokenDistributor.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import {IERC20VotesUpgradeable} from "./Util.sol";
 

src/TransferAndCallToken.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 // solhint-disable-next-line compiler-version
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.17;
 
 // This file was copied from
 // * https://github.com/OffchainLabs/token-bridge-contracts/blob/e304fa491f0574c984e80705f9f6d7cf8f0d798e/contracts/tokenbridge/libraries/TransferAndCallToken.sol
 // * https://github.com/OffchainLabs/token-bridge-contracts/blob/e304fa491f0574c984e80705f9f6d7cf8f0d798e/contracts/tokenbridge/libraries/ITransferAndCall.sol
-// But the version was updated from >0.6.0 <0.8.0 to ^0.8.16 and the
+// But the version was updated from >0.6.0 <0.8.0 to ^0.8.17 and the
 // imports where made from upgradeable instead of 0.6
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";

src/UpgradeExecRouteBuilder.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
 import "./UpgradeExecutor.sol";

src/UpgradeExecutor.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";

src/Util.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import

src/gov-action-contracts/AIPs/AIP1Point1Target.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 /// @notice contract for AIP-1.1 https://forum.arbitrum.foundation/t/proposal-aip-1-1-lockup-budget-transparency/13360.
 ///  AIP-1.1 Is a non-constitutional proposal as per the constitution and thus is to be put to an on-chain vote; however,

src/gov-action-contracts/AIPs/AIP1Point2Action.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../address-registries/L2AddressRegistry.sol";
 

src/gov-action-contracts/AIPs/AIP4844/AIP4844Action.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import "../../address-registries/L1AddressRegistry.sol";

src/gov-action-contracts/AIPs/AIP4844/ArbOneAIP4844Action.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./AIP4844Action.sol";
 

src/gov-action-contracts/AIPs/AIP4844/ArbOneSetBatchPosterManagerAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./SetBatchPosterManager.sol";
 

src/gov-action-contracts/AIPs/AIP4844/NovaAIP4844Action.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./AIP4844Action.sol";
 

src/gov-action-contracts/AIPs/AIP4844/NovaSetBatchPosterManagerAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./SetBatchPosterManager.sol";
 

src/gov-action-contracts/AIPs/AIP4844/SetArbOS20VersionAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../../arbos-upgrade/UpgradeArbOSVersionAction.sol";
 import "../../address-registries/L1AddressRegistry.sol";

src/gov-action-contracts/AIPs/AIP4844/SetBatchPosterManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../../address-registries/L1AddressRegistry.sol";
 import "@openzeppelin/contracts/utils/Address.sol";

src/gov-action-contracts/AIPs/AIP4Action.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../address-registries/L2AddressRegistry.sol";
 

src/gov-action-contracts/AIPs/AIP7/SetSweepReceiverAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../../address-registries/L2AddressRegistry.sol";
 import "../../../TokenDistributor.sol";

src/gov-action-contracts/AIPs/AIP7/UpdateGasChargeAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@arbitrum/nitro-contracts/src/precompiles/ArbOwner.sol";
 import "@arbitrum/nitro-contracts/src/precompiles/ArbGasInfo.sol";

src/gov-action-contracts/AIPs/AIP7/UpdateL1CoreTimelockAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import "../../address-registries/L1AddressRegistry.sol";

src/gov-action-contracts/AIPs/AIPArbOS31/ArbOneAIPArbOS31AddWasmCacheManagerAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./parent_contracts/AIPArbOS31AddWasmCacheManagerAction.sol";
 

src/gov-action-contracts/AIPs/AIPArbOS31/ArbOneAIPArbOS31UpgradeChallengeManagerAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./parent_contracts/AIPArbOS31UpgradeChallengeManagerAction.sol";
 import "@arbitrum/nitro-contracts/src/osp/IOneStepProofEntry.sol";

src/gov-action-contracts/AIPs/AIPArbOS31/NovaAIPArbOS31AddWasmCacheManagerAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./parent_contracts/AIPArbOS31AddWasmCacheManagerAction.sol";
 

src/gov-action-contracts/AIPs/AIPArbOS31/NovaAIPArbOS31UpgradeChallengeManagerAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "./parent_contracts/AIPArbOS31UpgradeChallengeManagerAction.sol";
 import "@arbitrum/nitro-contracts/src/osp/IOneStepProofEntry.sol";

src/gov-action-contracts/AIPs/AIPArbOS31/SetArbOS31VersionAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../../arbos-upgrade/UpgradeArbOSVersionAtTimestampAction.sol";
 

src/gov-action-contracts/AIPs/AIPArbOS31/parent_contracts/AIPArbOS31AddWasmCacheManagerAction.sol

@@ -1,5 +1,5 @@
     // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
 

src/gov-action-contracts/AIPs/AIPArbOS31/parent_contracts/AIPArbOS31UpgradeChallengeManagerAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
 import "@arbitrum/nitro-contracts/src/osp/IOneStepProofEntry.sol";

src/gov-action-contracts/AIPs/AIPNovaFeeRoutingAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/utils/Address.sol";
 

src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11VersionAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../../arbos-upgrade/UpgradeArbOSVersionAction.sol";
 import "../../address-registries/L1AddressRegistry.sol";

src/gov-action-contracts/AIPs/ArbOS11/SetArbOneArbOS11ModuleRootAciton.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../../arbos-upgrade/SetWasmModuleRootAction.sol";
 import "../../address-registries/L1AddressRegistry.sol";

src/gov-action-contracts/AIPs/ArbOS11/SetNovaArbOS11ModuleRootAction.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.17;
 
 import "../../arbos-upgrade/SetWasmModuleRootAction.sol";
 import "../../address-registries/L1AddressRegistry.sol";