Merge pull request #143 from OffchainLabs/release-master-sync

Sync release and master branches

Author: Tristan-Wilson

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
       - master
       - develop
       - release
-  # run this job on the default branch daily
+  # run this job on the default branch (release) daily
   # the docker compose file contains some images with tags like 'latest' and 'stable'
   # we nightly run here just to double check no bugs have been merged into those tags and are now on release
   schedule:
@@ -20,6 +20,7 @@ jobs:
   build_and_run:
     runs-on: ubuntu-8
     strategy:
+      fail-fast: false
       matrix:
         pos: [pos, no-pos]
         l3node: [l3node, l3node-token-6, no-l3node]
@@ -46,20 +47,3 @@ jobs:
 
       - name: Startup Nitro testnode
         run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ (matrix.l3node == 'l3node' && '--l3node') || (matrix.l3node == 'l3node-token-6' && '--l3node --l3-fee-token --l3-token-bridge --l3-fee-token-decimals 6') || '' }} ${{ matrix.tokenbridge == 'tokenbridge' && '--tokenbridge' || '--no-tokenbridge' }} --detach ${{ matrix.pos == 'pos' && '--pos' || '' }} --simple ${{ (matrix.simple == 'simple' && '--simple') || (matrix.simple == 'no-simple' && '--no-simple') || '' }}
-
-  bold_upgrade:
-    runs-on: ubuntu-8
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: network=host
-
-      - name: Startup Nitro testnode
-        run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force --bold-upgrade --simple --detach

boldupgrader/Dockerfile

@@ -22,17 +22,6 @@
         "type=docker"
       ]
     },
-    "boldupgrader": {
-      "cache-from": [
-        "type=local,src=/tmp/.buildx-cache"
-      ],
-      "cache-to": [
-        "type=local,dest=/tmp/.buildx-cache,mode=max"
-      ],
-      "output": [
-        "type=docker"
-      ]
-    },
     "tokenbridge": {
       "cache-from": [
         "type=local,src=/tmp/.buildx-cache"

docker-compose-ci-cache.json

@@ -47,7 +47,7 @@ services:
       - "127.0.0.1:6379:6379"
 
   geth:
-    image: ethereum/client-go:stable
+    image: ethereum/client-go:v1.14.13
     ports:
       - "127.0.0.1:8545:8545"
       - "127.0.0.1:8551:8551"
@@ -370,26 +370,6 @@ services:
       - "tokenbridge-data:/workspace"
       - /var/run/docker.sock:/var/run/docker.sock
 
-  boldupgrader:
-    depends_on:
-      - geth
-      - sequencer
-    pid: host
-    build:
-      context: boldupgrader/
-      args:
-        BOLD_CONTRACTS_BRANCH: ${BOLD_CONTRACTS_BRANCH:-}
-    environment:
-      - L1_RPC_URL=http://geth:8545
-      - L1_PRIV_KEY=0xdc04c5399f82306ec4b4d654a342f40e2e0620fe39950d967e1e574b32d4dd36
-      - CONFIG_NETWORK_NAME=local
-      - DEPLOYED_CONTRACTS_DIR=./scripts/files/
-      - DISABLE_VERIFICATION=true
-    volumes:
-      - "config:/config"
-      - "boldupgrader-data:/workspace"
-      - /var/run/docker.sock:/var/run/docker.sock
-
   rollupcreator:
     depends_on:
       - geth
@@ -502,4 +482,3 @@ volumes:
   das-committee-b-data:
   das-mirror-data:
   timeboost-auctioneer-data:
-  boldupgrader-data:

docker-compose.yaml

@@ -5,6 +5,7 @@ ARG NITRO_CONTRACTS_BRANCH=main
 WORKDIR /workspace  
 RUN git clone --no-checkout https://github.com/OffchainLabs/nitro-contracts.git ./
 RUN git checkout ${NITRO_CONTRACTS_BRANCH}
+RUN git submodule update --init --recursive
 RUN yarn install && yarn cache clean
 RUN curl -L https://foundry.paradigm.xyz | bash
 ENV PATH="${PATH}:/root/.foundry/bin"

rollupcreator/Dockerfile

@@ -198,6 +198,11 @@ function writeConfigs(argv: any) {
             "info-files": [chainInfoFile],
         },
         "node": {
+            "bold": {
+                "rpc-block-number": "latest",
+                "strategy": "makeNodes",
+                "assertion-posting-interval": "10s"
+            },
             "staker": {
                 "dangerous": {
                     "without-block-validator": false
@@ -292,7 +297,7 @@ function writeConfigs(argv: any) {
     if (argv.simple) {
         let simpleConfig = JSON.parse(baseConfJSON)
         simpleConfig.node.staker.enable = true
-        simpleConfig.node.staker["use-smart-contract-wallet"] = true
+        simpleConfig.node.staker["use-smart-contract-wallet"] = false // TODO: set to true when fixed
         simpleConfig.node.staker.dangerous["without-block-validator"] = true
         simpleConfig.node.sequencer = true
         simpleConfig.node.dangerous["no-sequencer-coordinator"] = true
@@ -307,7 +312,7 @@ function writeConfigs(argv: any) {
     } else {
         let validatorConfig = JSON.parse(baseConfJSON)
         validatorConfig.node.staker.enable = true
-        validatorConfig.node.staker["use-smart-contract-wallet"] = true
+        validatorConfig.node.staker["use-smart-contract-wallet"] = false // TODO: set to true when fixed
         let validconfJSON = JSON.stringify(validatorConfig)
         fs.writeFileSync(path.join(consts.configpath, "validator_config.json"), validconfJSON)
 
@@ -321,11 +326,11 @@ function writeConfigs(argv: any) {
         sequencerConfig.execution["sequencer"].enable = true
         sequencerConfig.node["delayed-sequencer"].enable = true
         if (argv.timeboost) {
-          sequencerConfig.execution.sequencer.dangerous = {};
-          sequencerConfig.execution.sequencer.dangerous.timeboost = {
-             "enable": false, // Create it false initially, turn it on with sed in test-node.bash after contract setup.
-             "redis-url": argv.redisUrl
-          };
+            sequencerConfig.execution.sequencer.dangerous = {};
+            sequencerConfig.execution.sequencer.dangerous.timeboost = {
+                "enable": false, // Create it false initially, turn it on with sed in test-node.bash after contract setup.
+                "redis-url": argv.redisUrl
+            };
         }
         fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig))
 
@@ -340,13 +345,14 @@ function writeConfigs(argv: any) {
 
     let l3Config = JSON.parse(baseConfJSON)
     l3Config["parent-chain"].connection.url = argv.l2url
-    l3Config.node.staker["parent-chain-wallet"].account = namedAddress("l3owner")
+    // use the same account for l2 and l3 staker
+    // l3Config.node.staker["parent-chain-wallet"].account = namedAddress("l3owner")
     l3Config.node["batch-poster"]["parent-chain-wallet"].account = namedAddress("l3sequencer")
     l3Config.chain.id = 333333
     const l3ChainInfoFile = path.join(consts.configpath, "l3_chain_info.json")
     l3Config.chain["info-files"] = [l3ChainInfoFile]
     l3Config.node.staker.enable = true
-    l3Config.node.staker["use-smart-contract-wallet"] = true
+    l3Config.node.staker["use-smart-contract-wallet"] = false // TODO: set to true when fixed
     l3Config.node.sequencer = true
     l3Config.execution["sequencer"].enable = true
     l3Config.node["dangerous"]["no-sequencer-coordinator"] = true
@@ -403,7 +409,7 @@ function writeL2ChainConfig(argv: any) {
             "EnableArbOS": true,
             "AllowDebugPrecompiles": true,
             "DataAvailabilityCommittee": argv.anytrust,
-            "InitialArbOSVersion": 32, // TODO For Timeboost, this still needs to be set to 31
+            "InitialArbOSVersion": 40,
             "InitialChainOwner": argv.l2owner,
             "GenesisBlockNum": 0
         }
@@ -436,7 +442,7 @@ function writeL3ChainConfig(argv: any) {
             "EnableArbOS": true,
             "AllowDebugPrecompiles": true,
             "DataAvailabilityCommittee": false,
-            "InitialArbOSVersion": 31,
+            "InitialArbOSVersion": 40,
             "InitialChainOwner": argv.l2owner,
             "GenesisBlockNum": 0
         }
@@ -533,56 +539,56 @@ function dasBackendsJsonConfig(argv: any) {
 }
 
 export const writeTimeboostConfigsCommand = {
-  command: "write-timeboost-configs",
-  describe: "writes configs for the timeboost autonomous auctioneer and bid validator",
-  builder: {
-    "auction-contract": {
-      string: true,
-      describe: "auction contract address",
-      demandOption: true
+    command: "write-timeboost-configs",
+    describe: "writes configs for the timeboost autonomous auctioneer and bid validator",
+    builder: {
+        "auction-contract": {
+            string: true,
+            describe: "auction contract address",
+            demandOption: true
+        },
     },
-  },
-  handler: (argv: any) => {
-    writeAutonomousAuctioneerConfig(argv)
-    writeBidValidatorConfig(argv)
-  }
+    handler: (argv: any) => {
+        writeAutonomousAuctioneerConfig(argv)
+        writeBidValidatorConfig(argv)
+    }
 }
 
 function writeAutonomousAuctioneerConfig(argv: any) {
-  const autonomousAuctioneerConfig = {
-    "auctioneer-server": {
-      "auction-contract-address": argv.auctionContract,
-      "db-directory": "/data",
-      "redis-url": "redis://redis:6379",
-      "use-redis-coordinator": true,
-      "redis-coordinator-url": "redis://redis:6379",
-      "wallet":  {
-        "account": namedAddress("auctioneer"),
-        "password": consts.l1passphrase,
-        "pathname": consts.l1keystore
-      },
-    },
-    "bid-validator": {
-      "enable": false
+    const autonomousAuctioneerConfig = {
+        "auctioneer-server": {
+            "auction-contract-address": argv.auctionContract,
+            "db-directory": "/data",
+            "redis-url": "redis://redis:6379",
+            "use-redis-coordinator": true,
+            "redis-coordinator-url": "redis://redis:6379",
+            "wallet": {
+                "account": namedAddress("auctioneer"),
+                "password": consts.l1passphrase,
+                "pathname": consts.l1keystore
+            },
+        },
+        "bid-validator": {
+            "enable": false
+        }
     }
-  }
-  const autonomousAuctioneerConfigJSON = JSON.stringify(autonomousAuctioneerConfig)
-  fs.writeFileSync(path.join(consts.configpath, "autonomous_auctioneer_config.json"), autonomousAuctioneerConfigJSON)
+    const autonomousAuctioneerConfigJSON = JSON.stringify(autonomousAuctioneerConfig)
+    fs.writeFileSync(path.join(consts.configpath, "autonomous_auctioneer_config.json"), autonomousAuctioneerConfigJSON)
 }
 
 function writeBidValidatorConfig(argv: any) {
-  const bidValidatorConfig = {
-    "auctioneer-server": {
-      "enable": false
-    },
-    "bid-validator": {
-      "auction-contract-address": argv.auctionContract,
-      "redis-url": "redis://redis:6379",
-      "sequencer-endpoint": "http://sequencer:8547"
+    const bidValidatorConfig = {
+        "auctioneer-server": {
+            "enable": false
+        },
+        "bid-validator": {
+            "auction-contract-address": argv.auctionContract,
+            "redis-url": "redis://redis:6379",
+            "sequencer-endpoint": "http://sequencer:8547"
+        }
     }
-  }
-  const bidValidatorConfigJSON = JSON.stringify(bidValidatorConfig)
-  fs.writeFileSync(path.join(consts.configpath, "bid_validator_config.json"), bidValidatorConfigJSON)
+    const bidValidatorConfigJSON = JSON.stringify(bidValidatorConfig)
+    fs.writeFileSync(path.join(consts.configpath, "bid_validator_config.json"), bidValidatorConfigJSON)
 }
 
 export const writeConfigCommand = {

scripts/config.ts

@@ -10,6 +10,8 @@ import * as fs from "fs";
 import { ARB_OWNER } from "./consts";
 import * as TransparentUpgradeableProxy from "@openzeppelin/contracts/build/contracts/TransparentUpgradeableProxy.json"
 import * as ExpressLaneAuctionContract from "@arbitrum/nitro-contracts/build/contracts/src/express-lane-auction/ExpressLaneAuction.sol/ExpressLaneAuction.json"
+import * as StylusDeployerContract from "@arbitrum/nitro-contracts/build/contracts/src/stylus/StylusDeployer.sol/StylusDeployer.json"
+
 const path = require("path");
 
 async function sendTransaction(argv: any, threadId: number) {
@@ -185,6 +187,36 @@ async function deployWETHContract(deployerWallet: Wallet): Promise<string> {
     return weth.address;
 }
 
+async function createStylusDeployer(deployerWallet: Wallet): Promise<string> {
+  // this factory should be deployed by the rollupcreator when deploy helper is used
+  const create2factory = '0x4e59b44847b379578588920ca78fbf26c0b4956c'
+  if (await deployerWallet.provider.getCode(create2factory) === '0x') {
+    // wait for 30 seconds, check again before throwing an error
+    await new Promise(resolve => setTimeout(resolve, 30000));
+    if (await deployerWallet.provider.getCode(create2factory) === '0x') {
+      throw new Error('Create2 factory not yet deployed')
+    }
+  }
+
+  const salt = ethers.constants.HashZero
+  const stylusDeployerBytecode = StylusDeployerContract.bytecode
+  const stylusDeployerAddress = ethers.utils.getCreate2Address(create2factory, salt, ethers.utils.keccak256(stylusDeployerBytecode))
+
+  // check if the address is already deployed
+  const code = await deployerWallet.provider.getCode(stylusDeployerAddress)
+  if (code !== '0x') {
+    console.log("Stylus deployer already deployed")
+  } else {
+    const stylusDeployerTx = await deployerWallet.sendTransaction({
+      to: create2factory,
+      data: ethers.utils.concat([salt, stylusDeployerBytecode])
+    })
+    await stylusDeployerTx.wait()
+  }
+
+  return stylusDeployerAddress
+}
+
 export const bridgeFundsCommand = {
   command: "bridge-funds",
   describe: "sends funds from l1 to l2",
@@ -593,6 +625,30 @@ export const createWETHCommand = {
   },
 };
 
+export const createStylusDeployerCommand = {
+  command: "create-stylus-deployer",
+  describe: "deploys the stylus deployer contract",
+  builder: {
+    deployer: { string: true, describe: "account (see general help)" },
+    l3: { boolean: false, describe: "deploy on L3, otherwise deploy on L2" },
+  },
+  handler: async (argv: any) => {
+    console.log("create-stylus-deployer");
+
+    const provider = new ethers.providers.WebSocketProvider(argv.l3 ? argv.l3url : argv.l2url);
+    const deployerWallet = namedAccount(argv.deployer).connect(provider);
+
+    const stylusDeployerAddress = await createStylusDeployer(deployerWallet);
+    if (argv.l3) {
+      console.log("Stylus deployer deployed at L3 address:", stylusDeployerAddress);
+    } else {
+      console.log("Stylus deployer deployed at L2 address:", stylusDeployerAddress);
+    }
+
+    provider.destroy();
+  }
+};
+
 export const sendL1Command = {
   command: "send-l1",
   describe: "sends funds between l1 accounts",

scripts/ethcommands.ts

@@ -26,6 +26,7 @@ import {
   createERC20Command,
   deployExpressLaneAuctionContractCommand,
   createWETHCommand,
+  createStylusDeployerCommand,
   transferERC20Command,
   sendL1Command,
   sendL2Command,
@@ -56,6 +57,7 @@ async function main() {
     .command(createFeeTokenPricerCommand)
     .command(deployExpressLaneAuctionContractCommand)
     .command(createWETHCommand)
+    .command(createStylusDeployerCommand)
     .command(transferERC20Command)
     .command(sendL1Command)
     .command(sendL2Command)