Support BOLD Challenges on Sepolia

.gitmodules

@@ -23,6 +23,9 @@
 [submodule "nitro-testnode"]
  path = nitro-testnode
  url = https://github.com/OffchainLabs/nitro-testnode.git
+[submodule "bold"]
+ path = bold
+ url = https://github.com/OffchainLabs/bold.git
 [submodule "arbitrator/langs/rust"]
  path = arbitrator/langs/rust
  url = https://github.com/OffchainLabs/stylus-sdk-rs.git

Dockerfile

@@ -85,6 +85,7 @@ COPY ./contracts/package.json ./contracts/yarn.lock ./contracts/
 COPY ./solgen/gen.go ./solgen/
 COPY ./fastcache ./fastcache
 COPY ./go-ethereum ./go-ethereum
+COPY ./bold ./bold
 COPY --from=brotli-wasm-export / target/
 COPY --from=contracts-builder workspace/contracts/build/contracts/src/precompiles/ contracts/build/contracts/src/precompiles/
 COPY --from=contracts-builder workspace/contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json contracts/
@@ -220,6 +221,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 COPY go.mod go.sum ./
 COPY go-ethereum/go.mod go-ethereum/go.sum go-ethereum/
 COPY fastcache/go.mod fastcache/go.sum fastcache/
+COPY bold/go.mod bold/go.sum bold/
 RUN go mod download
 COPY . ./
 COPY --from=contracts-builder workspace/contracts/build/ contracts/build/
@@ -310,6 +312,7 @@ USER root
 RUN rm -f /home/user/target/machines/latest
 COPY --from=prover-export /bin/jit /usr/local/bin/
 COPY --from=node-builder /workspace/target/bin/deploy /usr/local/bin/
+COPY --from=node-builder /workspace/target/bin/bold-deploy /usr/local/bin/
 COPY --from=node-builder /workspace/target/bin/seq-coordinator-invalidate /usr/local/bin/
 COPY --from=module-root-calc /workspace/target/machines/latest/machine.wavm.br /home/user/target/machines/latest/
 COPY --from=module-root-calc /workspace/target/machines/latest/until-host-io-state.bin /home/user/target/machines/latest/

Makefile

@@ -153,7 +153,7 @@ push: lint test-go .make/fmt
 all: build build-replay-env test-gen-proofs
  @touch .make/all
 
-build: $(patsubst %,$(output_root)/bin/%, nitro deploy relay daserver datool seq-coordinator-invalidate nitro-val seq-coordinator-manager)
+build: $(patsubst %,$(output_root)/bin/%, nitro deploy bold-deploy relay daserver datool seq-coordinator-invalidate nitro-val seq-coordinator-manager)
  @printf $(done)
 
 build-node-deps: $(go_source) build-prover-header build-prover-lib build-jit .make/solgen .make/cbrotli-lib
@@ -248,6 +248,9 @@ $(output_root)/bin/nitro: $(DEP_PREDICATE) build-node-deps
 $(output_root)/bin/deploy: $(DEP_PREDICATE) build-node-deps
  go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/deploy"
 
+$(output_root)/bin/bold-deploy: $(DEP_PREDICATE) build-node-deps
+ go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/bold-deploy"
+
 $(output_root)/bin/relay: $(DEP_PREDICATE) build-node-deps
  go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/relay"
 

arbitrator/prover/src/lib.rs

@@ -113,11 +113,17 @@ unsafe fn arbitrator_load_machine_impl(
 }
 
 #[no_mangle]
-#[cfg(feature = "native")]
-pub unsafe extern "C" fn arbitrator_load_wavm_binary(binary_path: *const c_char) -> *mut Machine {
+pub unsafe extern "C" fn arbitrator_load_wavm_binary(
+ binary_path: *const c_char,
+ always_merkleize: u8,
+) -> *mut Machine {
  let binary_path = cstr_to_string(binary_path);
  let binary_path = Path::new(&binary_path);
- match Machine::new_from_wavm(binary_path) {
+ let mut merkleize = false;
+ if always_merkleize == 1 {
+ merkleize = true;
+ }
+ match Machine::new_from_wavm(binary_path, merkleize) {
  Ok(mach) => Box::into_raw(Box::new(mach)),
  Err(err) => {
  eprintln!("Error loading binary: {err}");

arbitrator/prover/src/machine.rs

@@ -1551,7 +1551,7 @@ impl Machine {
  Ok(mach)
  }
 
- pub fn new_from_wavm(wavm_binary: &Path) -> Result<Machine> {
+ pub fn new_from_wavm(wavm_binary: &Path, always_merkleize: bool) -> Result<Machine> {
  let mut modules: Vec<Module> = {
  let compressed = std::fs::read(wavm_binary)?;
  let Ok(modules) = brotli::decompress(&compressed, Dictionary::Empty) else {
@@ -1577,6 +1577,16 @@ impl Machine {
  MerkleType::Function,
  module.funcs.iter().map(Function::hash).collect(),
  ));
+ if always_merkleize {
+ module.memory.cache_merkle_tree();
+ }
+ }
+ let mut modules_merkle = None;
+ if always_merkleize {
+ modules_merkle = Some(Merkle::new(
+ MerkleType::Module,
+ modules.iter().map(Module::hash).collect(),
+ ));
  }
  let mut mach = Machine {
  status: MachineStatus::Running,
@@ -1586,7 +1596,7 @@ impl Machine {
  internal_stack: Vec::new(),
  frame_stacks: vec![Vec::new()],
  modules,
- modules_merkle: None,
+ modules_merkle,
  global_state: Default::default(),
  pc: ProgramCounter::default(),
  stdio_output: Vec::new(),

arbnode/dataposter/data_poster.go

@@ -680,13 +680,27 @@ func (p *DataPoster) feeAndTipCaps(ctx context.Context, nonce uint64, gasLimit u
  return newBaseFeeCap, newTipCap, newBlobFeeCap, nil
 }
 
+func (p *DataPoster) PostSimpleTransactionAutoNonce(ctx context.Context, to common.Address, calldata []byte, gasLimit uint64, value *big.Int) (*types.Transaction, error) {
+ p.mutex.Lock()
+ defer p.mutex.Unlock()
+ nonce, _, _, _, err := p.getNextNonceAndMaybeMeta(ctx, 1)
+ if err != nil {
+ return nil, err
+ }
+ return p.postTransaction(ctx, time.Now(), nonce, nil, to, calldata, gasLimit, value, nil, nil)
+}
+
 func (p *DataPoster) PostSimpleTransaction(ctx context.Context, nonce uint64, to common.Address, calldata []byte, gasLimit uint64, value *big.Int) (*types.Transaction, error) {
  return p.PostTransaction(ctx, time.Now(), nonce, nil, to, calldata, gasLimit, value, nil, nil)
 }
 
 func (p *DataPoster) PostTransaction(ctx context.Context, dataCreatedAt time.Time, nonce uint64, meta []byte, to common.Address, calldata []byte, gasLimit uint64, value *big.Int, kzgBlobs []kzg4844.Blob, accessList types.AccessList) (*types.Transaction, error) {
  p.mutex.Lock()
  defer p.mutex.Unlock()
+ return p.postTransaction(ctx, dataCreatedAt, nonce, meta, to, calldata, gasLimit, value, kzgBlobs, accessList)
+}
+
+func (p *DataPoster) postTransaction(ctx context.Context, dataCreatedAt time.Time, nonce uint64, meta []byte, to common.Address, calldata []byte, gasLimit uint64, value *big.Int, kzgBlobs []kzg4844.Blob, accessList types.AccessList) (*types.Transaction, error) {
 
  var weight uint64 = 1
  if len(kzgBlobs) > 0 {

arbnode/node.go

@@ -639,7 +639,7 @@ func createNodeImpl(
  confirmedNotifiers = append(confirmedNotifiers, messagePruner)
  }
 
- stakerObj, err = staker.NewStaker(l1Reader, wallet, bind.CallOpts{}, config.Staker, blockValidator, statelessBlockValidator, nil, confirmedNotifiers, deployInfo.ValidatorUtils, fatalErrChan)
+ stakerObj, err = staker.NewStaker(l1Reader, wallet, bind.CallOpts{}, config.Staker, blockValidator, statelessBlockValidator, nil, confirmedNotifiers, deployInfo.ValidatorUtils, deployInfo.Bridge, fatalErrChan)
  if err != nil {
  return nil, err
  }