Merge branch 'develop' into arbwasm_revert_fix

OffchainLabs · Sep 24, 2024 · db9f8b3 · db9f8b3
2 parents 7396313 + 2376ee7
commit db9f8b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/scripts/deploymentUtils.ts b/scripts/deploymentUtils.ts
@@ -228,6 +228,7 @@ export async function deployAllContracts(
   )
   const rollupUser = await deployContract('RollupUserLogic', signer, [], verify)
   const upgradeExecutor = await deployUpgradeExecutor(signer)
+  await upgradeExecutor.deployTransaction.wait()
   const validatorUtils = await deployContract(
     'ValidatorUtils',
     signer,

diff --git a/src/precompiles/ArbSys.sol b/src/precompiles/ArbSys.sol
@@ -29,7 +29,8 @@ interface ArbSys {
     function arbChainID() external view returns (uint256);
 
     /**
-     * @notice Get internal version number identifying an ArbOS build
+     * @notice Get internal version number identifying an ArbOS build, this is `55 + nitroArbOS version number`
+     *         e.g. on ArbOS 31 this would return 86. This is the only function that have the 55 offset.
      * @return version number as int
      */
     function arbOSVersion() external view returns (uint256);