Out of Band Reimbursement Daemon

containers/threadsafe/map.go

@@ -86,6 +86,16 @@ func (s *Map[K, V]) Delete(k K) {
 	}
 }
 
+func (s *Map[K, V]) Copy() map[K]V {
+	s.RLock()
+	defer s.RUnlock()
+	m := make(map[K]V)
+	for k, v := range s.items {
+		m[k] = v
+	}
+	return m
+}
+
 func (s *Map[K, V]) ForEach(fn func(k K, v V) error) error {
 	s.RLock()
 	defer s.RUnlock()

testing/endtoend/BUILD.bazel

@@ -35,6 +35,7 @@ go_test(
         "//testing/endtoend/backend",
         "//testing/mocks/state-provider",
         "//testing/setup:setup_lib",
+        "//util",
         "@com_github_ethereum_go_ethereum//:go-ethereum",
         "@com_github_ethereum_go_ethereum//accounts/abi",
         "@com_github_ethereum_go_ethereum//accounts/abi/bind",
@@ -57,6 +58,7 @@ go_library(
         "//runtime",
         "//solgen/go/rollupgen",
         "//testing/setup:setup_lib",
+        "//util",
         "@com_github_ethereum_go_ethereum//accounts/abi/bind",
         "@com_github_stretchr_testify//require",
     ],

testing/endtoend/backend/BUILD.bazel

@@ -17,6 +17,7 @@ go_library(
         "//solgen/go/rollupgen",
         "//testing",
         "//testing/setup:setup_lib",
+        "//util",
         "@com_github_ethereum_go_ethereum//accounts/abi/bind",
         "@com_github_ethereum_go_ethereum//common",
         "@com_github_ethereum_go_ethereum//common/hexutil",
@@ -39,6 +40,7 @@ go_test(
     visibility = ["//testing/endtoend:__subpackages__"],
     deps = [
         "//runtime",
+        "//util",
         "@com_github_stretchr_testify//require",
     ],
 )

testing/endtoend/backend/anvil_local.go

@@ -17,6 +17,7 @@ import (
 	"github.com/OffchainLabs/bold/solgen/go/rollupgen"
 	challenge_testing "github.com/OffchainLabs/bold/testing"
 	"github.com/OffchainLabs/bold/testing/setup"
+	"github.com/OffchainLabs/bold/util"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -250,7 +251,7 @@ func (a *AnvilLocal) DeployRollup(ctx context.Context, opts ...challenge_testing
 	if err != nil {
 		return nil, err
 	}
-	chalManagerAddr, err := rollupCaller.ChallengeManager(&bind.CallOpts{})
+	chalManagerAddr, err := rollupCaller.ChallengeManager(util.GetSafeCallOpts(&bind.CallOpts{}))
 	if err != nil {
 		return nil, err
 	}

testing/endtoend/backend/anvil_local_test.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	retry "github.com/OffchainLabs/bold/runtime"
+	"github.com/OffchainLabs/bold/util"
 	"github.com/stretchr/testify/require"
 )
 
@@ -45,7 +46,7 @@ func TestLocalAnvilStarts(t *testing.T) {
 	require.NoError(t, err)
 
 	// There should be at least 100 blocks
-	bn, err2 := a.Client().HeaderByNumber(ctx, nil)
+	bn, err2 := a.Client().HeaderByNumber(ctx, util.GetSafeBlockNumber())
 	if err2 != nil {
 		t.Fatal(err2)
 	}

testing/endtoend/backend/simulated.go

@@ -2,6 +2,7 @@ package backend
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	protocol "github.com/OffchainLabs/bold/chain-abstraction"
@@ -69,5 +70,7 @@ func NewSimulated(blockTime time.Duration, opts ...setup.Opt) (*LocalSimulatedBa
 	if err != nil {
 		return nil, err
 	}
+	fmt.Println("Rollup addr", setup.Addrs.Rollup)
+	time.Sleep(time.Second * 10)
 	return &LocalSimulatedBackend{blockTime: blockTime, setup: setup}, nil
 }

testing/endtoend/e2e_test.go

@@ -105,7 +105,7 @@ type protocolParams struct {
 func defaultProtocolParams() protocolParams {
 	return protocolParams{
 		numBigStepLevels:      1,
-		challengePeriodBlocks: 60,
+		challengePeriodBlocks: 50,
 		layerZeroHeights: protocol.LayerZeroHeights{
 			BlockChallengeHeight:     1 << 5,
 			BigStepChallengeHeight:   1 << 5,
@@ -336,6 +336,7 @@ func runEndToEndTest(t *testing.T, cfg *e2eConfig) {
 		})
 	}
 	require.NoError(t, g.Wait())
+	time.Sleep(time.Hour)
 }
 
 type seqMessage struct {

testing/endtoend/expectations.go

@@ -9,6 +9,7 @@ import (
 	retry "github.com/OffchainLabs/bold/runtime"
 	"github.com/OffchainLabs/bold/solgen/go/rollupgen"
 	"github.com/OffchainLabs/bold/testing/setup"
+	"github.com/OffchainLabs/bold/util"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/stretchr/testify/require"
 )
@@ -36,7 +37,7 @@ func expectAssertionConfirmedByChallengeWin(
 			require.NoError(t, err)
 			for i.Next() {
 				assertionNode, err := retry.UntilSucceeds(ctx, func() (rollupgen.AssertionNode, error) {
-					return rc.GetAssertion(&bind.CallOpts{Context: ctx}, i.Event.AssertionHash)
+					return rc.GetAssertion(util.GetSafeCallOpts(&bind.CallOpts{Context: ctx}), i.Event.AssertionHash)
 				})
 				require.NoError(t, err)
 				if assertionNode.Status != uint8(protocol.AssertionConfirmed) {

testing/endtoend/helpers_test.go

@@ -12,6 +12,7 @@ import (
 	challengemanager "github.com/OffchainLabs/bold/challenge-manager"
 	l2stateprovider "github.com/OffchainLabs/bold/layer2-state-provider"
 	"github.com/OffchainLabs/bold/solgen/go/rollupgen"
+	"github.com/OffchainLabs/bold/util"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -35,7 +36,7 @@ func setupChallengeManager(
 	)
 	require.NoError(t, err)
 	challengeManagerAddr, err := assertionChainBinding.RollupUserLogicCaller.ChallengeManager(
-		&bind.CallOpts{Context: ctx},
+		util.GetSafeCallOpts(&bind.CallOpts{Context: ctx}),
 	)
 	require.NoError(t, err)
 	chain, err := solimpl.NewAssertionChain(

testing/mocks/BUILD.bazel

@@ -12,7 +12,6 @@ go_library(
         "//layer2-state-provider",
         "//solgen/go/rollupgen",
         "//state-commitments/history",
-        "@com_github_ethereum_go_ethereum//accounts/abi/bind",
         "@com_github_ethereum_go_ethereum//common",
         "@com_github_ethereum_go_ethereum//core/types",
         "@com_github_stretchr_testify//mock",

testing/mocks/mocks.go

@@ -1,4 +1,4 @@
 // Package mocks includes simple mocks for unit testing BOLD.
 //
 // Copyright 2023, Offchain Labs, Inc.
 // For license information, see https://github.com/offchainlabs/bold/blob/main/LICENSE
@@ -6,8 +6,6 @@
 
 import (
 	"context"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"math/big"
 
 	protocol "github.com/OffchainLabs/bold/chain-abstraction"
 	"github.com/OffchainLabs/bold/containers/option"
@@ -20,9 +18,9 @@
 )
 
 var (
 	_ = protocol.SpecChallengeManager(&MockSpecChallengeManager{})
 	_ = protocol.SpecEdge(&MockSpecEdge{})
 	_ = protocol.AssertionChain(&MockProtocol{})
 	_ = l2stateprovider.Provider(&MockStateManager{})
 )
 
@@ -168,8 +166,8 @@
 	args := m.Called(ctx)
 	return args.Get(0).(uint64), args.Error(1)
 }
-func (m *MockSpecChallengeManager) MultiUpdateInheritedTimers(ctx context.Context, branch []protocol.ReadOnlyEdge, desiredTimerForLastEdge uint64) (*types.Transaction, error) {
-	args := m.Called(ctx, branch, desiredTimerForLastEdge)
+func (m *MockSpecChallengeManager) MultiUpdateInheritedTimers(ctx context.Context, branch []protocol.ReadOnlyEdge) (*types.Transaction, error) {
+	args := m.Called(ctx, branch)
 	return args.Get(0).(*types.Transaction), args.Error(1)
 }
 func (m *MockSpecChallengeManager) GetEdge(
@@ -379,17 +377,6 @@
 	mock.Mock
 }
 
-func (m *MockProtocol) GetCallOptsWithDesiredRpcHeadBlockNumber(opts *bind.CallOpts) *bind.CallOpts {
-	if opts == nil {
-		opts = &bind.CallOpts{}
-	}
-	return opts
-}
-
-func (m *MockProtocol) GetDesiredRpcHeadBlockNumber() *big.Int {
-	return nil
-}
-
 // Read-only methods.
 func (m *MockProtocol) Backend() protocol.ChainBackend {
 	args := m.Called()

testing/setup/BUILD.bazel

@@ -22,15 +22,18 @@ go_library(
         "//solgen/go/yulgen",
         "//testing",
         "//testing/mocks/state-provider",
+        "//util",
         "@com_github_ethereum_go_ethereum//:go-ethereum",
         "@com_github_ethereum_go_ethereum//accounts/abi",
         "@com_github_ethereum_go_ethereum//accounts/abi/bind",
         "@com_github_ethereum_go_ethereum//common",
         "@com_github_ethereum_go_ethereum//core",
         "@com_github_ethereum_go_ethereum//core/types",
         "@com_github_ethereum_go_ethereum//crypto",
+        "@com_github_ethereum_go_ethereum//eth/ethconfig",
         "@com_github_ethereum_go_ethereum//ethclient/simulated",
         "@com_github_ethereum_go_ethereum//log",
+        "@com_github_ethereum_go_ethereum//node",
         "@com_github_pkg_errors//:errors",
     ],
 )

testing/setup/rollup_stack.go

@@ -23,14 +23,17 @@ import (
 	"github.com/OffchainLabs/bold/solgen/go/yulgen"
 	challenge_testing "github.com/OffchainLabs/bold/testing"
 	statemanager "github.com/OffchainLabs/bold/testing/mocks/state-provider"
+	"github.com/OffchainLabs/bold/util"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/eth/ethconfig"
 	"github.com/ethereum/go-ethereum/ethclient/simulated"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/node"
 	"github.com/pkg/errors"
 )
 
@@ -320,7 +323,7 @@ func ChainsWithEdgeChallengeManager(opts ...Opt) (*ChainSetup, error) {
 		}
 		var challengeManagerAddr common.Address
 		challengeManagerAddr, err = assertionChainBinding.RollupUserLogicCaller.ChallengeManager(
-			&bind.CallOpts{Context: ctx},
+			util.GetSafeCallOpts(&bind.CallOpts{Context: ctx}),
 		)
 		if err != nil {
 			return nil, err
@@ -1032,6 +1035,16 @@ func Accounts(numAccounts uint64) ([]*TestAccount, *SimulatedBackendWrapper, err
 			TxOpts:      txOpts,
 		}
 	}
-	backend := NewSimulatedBackendWrapper(simulated.NewBackend(genesis, simulated.WithBlockGasLimit(gasLimit)))
+	backend := NewSimulatedBackendWrapper(simulated.NewBackend(genesis, simulated.WithBlockGasLimit(gasLimit), WithHttpApi(8545)))
 	return accs, backend, nil
 }
+
+// WithBlockGasLimit configures the simulated backend to target a specific gas limit
+// when producing blocks.
+func WithHttpApi(port int) func(nodeConf *node.Config, ethConf *ethconfig.Config) {
+	return func(nodeConf *node.Config, ethConf *ethconfig.Config) {
+		nodeConf.HTTPHost = "localhost"
+		nodeConf.HTTPPort = port
+		nodeConf.HTTPModules = append(nodeConf.HTTPModules, "eth")
+	}
+}

tools/reimbursement-service/BUILD.bazel

@@ -0,0 +1,35 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+
+go_library(
+    name = "reimbursement-service_lib",
+    srcs = [
+        "challenge_protocol_graph.go",
+        "event_scraper.go",
+        "main.go",
+        "payments.go",
+        "reimbursement_computation.go",
+    ],
+    importpath = "github.com/OffchainLabs/bold/tools/reimbursement-service",
+    visibility = ["//visibility:private"],
+    deps = [
+        "//chain-abstraction:protocol",
+        "//containers/option",
+        "//containers/threadsafe",
+        "//solgen/go/challengeV2gen",
+        "//solgen/go/rollupgen",
+        "//util",
+        "@com_github_ethereum_go_ethereum//:go-ethereum",
+        "@com_github_ethereum_go_ethereum//accounts/abi/bind",
+        "@com_github_ethereum_go_ethereum//common",
+        "@com_github_ethereum_go_ethereum//core/types",
+        "@com_github_ethereum_go_ethereum//ethclient",
+        "@com_github_ethereum_go_ethereum//log",
+        "@com_github_ethereum_go_ethereum//rpc",
+    ],
+)
+
+go_binary(
+    name = "reimbursement-service",
+    embed = [":reimbursement-service_lib"],
+    visibility = ["//visibility:public"],
+)