diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 27642f59..9b199413 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -3,11 +3,11 @@ package baseapp import ( "context" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/job" - "github.com/berachain/offchain-sdk/log" - "github.com/berachain/offchain-sdk/server" - "github.com/berachain/offchain-sdk/telemetry" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/job" + "github.com/berachain/offchain-sdk/v2/log" + "github.com/berachain/offchain-sdk/v2/server" + "github.com/berachain/offchain-sdk/v2/telemetry" ethdb "github.com/ethereum/go-ethereum/ethdb" ) @@ -25,6 +25,9 @@ type BaseApp struct { // svr is the server for the baseapp. svr *server.Server + + // chain is the eth client for the baseapp. + chain eth.Client } // New creates a new baseapp. @@ -49,7 +52,8 @@ func New( metrics: metrics, }, ), - svr: svr, + svr: svr, + chain: ethClient, } } @@ -86,3 +90,8 @@ func (b *BaseApp) Stop() { b.svr.Stop() } } + +// Chain returns the eth client for the baseapp. +func (b *BaseApp) Chain() eth.Client { + return b.chain +} diff --git a/baseapp/builder.go b/baseapp/builder.go index a1a8c89f..13633059 100644 --- a/baseapp/builder.go +++ b/baseapp/builder.go @@ -3,12 +3,11 @@ package baseapp import ( "errors" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/job" - "github.com/berachain/offchain-sdk/log" - "github.com/berachain/offchain-sdk/server" - "github.com/berachain/offchain-sdk/telemetry" - "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/job" + "github.com/berachain/offchain-sdk/v2/log" + "github.com/berachain/offchain-sdk/v2/server" + "github.com/berachain/offchain-sdk/v2/telemetry" ethdb "github.com/ethereum/go-ethereum/ethdb" ) @@ -21,14 +20,16 @@ type AppBuilder struct { ethClient eth.Client svr *server.Server metrics telemetry.Metrics + logger log.Logger } // NewAppBuilder creates a new app builder. -func NewAppBuilder(appName string) *AppBuilder { +func NewAppBuilder(appName string, logger log.Logger) *AppBuilder { return &AppBuilder{ appName: appName, jobs: []job.Basic{}, metrics: telemetry.NewNoopMetrics(), + logger: logger, } } @@ -88,15 +89,6 @@ func (ab *AppBuilder) RegisterMiddleware(m server.Middleware) error { return nil } -// RegisterPrometheusTelemetry registers a Prometheus metrics HTTP server. -func (ab *AppBuilder) RegisterPrometheusTelemetry() error { - if ab.svr == nil { - return errors.New("must enable the HTTP server to register Prometheus") - } - - return ab.RegisterHTTPHandler(&server.Handler{Path: "/metrics", Handler: promhttp.Handler()}) -} - // RegisterEthClient registers the eth client. // TODO: update this to connection pool on baseapp and context gets one for running func (ab *AppBuilder) RegisterEthClient(ethClient eth.Client) { @@ -104,12 +96,10 @@ func (ab *AppBuilder) RegisterEthClient(ethClient eth.Client) { } // BuildApp builds the app. -func (ab *AppBuilder) BuildApp( - logger log.Logger, -) *BaseApp { +func (ab *AppBuilder) BuildApp() *BaseApp { return New( ab.appName, - logger, + ab.logger, ab.ethClient, ab.jobs, ab.db, diff --git a/baseapp/context.go b/baseapp/context.go index 70c4458a..56553ab4 100644 --- a/baseapp/context.go +++ b/baseapp/context.go @@ -3,10 +3,10 @@ package baseapp import ( "context" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/log" - "github.com/berachain/offchain-sdk/telemetry" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/log" + "github.com/berachain/offchain-sdk/v2/telemetry" + sdk "github.com/berachain/offchain-sdk/v2/types" ethdb "github.com/ethereum/go-ethereum/ethdb" ) diff --git a/baseapp/job_manager.go b/baseapp/job_manager.go index f4222e2c..c7af3815 100644 --- a/baseapp/job_manager.go +++ b/baseapp/job_manager.go @@ -6,10 +6,10 @@ import ( "reflect" "sync" - "github.com/berachain/offchain-sdk/job" - "github.com/berachain/offchain-sdk/log" - sdk "github.com/berachain/offchain-sdk/types" - "github.com/berachain/offchain-sdk/worker" + "github.com/berachain/offchain-sdk/v2/job" + "github.com/berachain/offchain-sdk/v2/log" + sdk "github.com/berachain/offchain-sdk/v2/types" + "github.com/berachain/offchain-sdk/v2/worker" ) const ( diff --git a/baseapp/runners.go b/baseapp/runners.go index 749f899f..07d63663 100644 --- a/baseapp/runners.go +++ b/baseapp/runners.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "github.com/berachain/offchain-sdk/job" - workertypes "github.com/berachain/offchain-sdk/job/types" + "github.com/berachain/offchain-sdk/v2/job" + workertypes "github.com/berachain/offchain-sdk/v2/job/types" ) // producerTask returns a execution task for the given HasProducer job. diff --git a/client/eth/client_provider.go b/client/eth/client_provider.go index 3df81dad..ed112dce 100644 --- a/client/eth/client_provider.go +++ b/client/eth/client_provider.go @@ -6,7 +6,7 @@ import ( "math/big" "time" - "github.com/berachain/offchain-sdk/telemetry" + "github.com/berachain/offchain-sdk/v2/telemetry" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" diff --git a/client/eth/client_provider_test.go b/client/eth/client_provider_test.go index 6a796d9e..052873a6 100644 --- a/client/eth/client_provider_test.go +++ b/client/eth/client_provider_test.go @@ -5,9 +5,9 @@ import ( "math/big" "testing" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/client/eth/mocks" - tmocks "github.com/berachain/offchain-sdk/telemetry/mocks" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/client/eth/mocks" + tmocks "github.com/berachain/offchain-sdk/v2/telemetry/mocks" "github.com/stretchr/testify/mock" ) diff --git a/client/eth/client_test.go b/client/eth/client_test.go index ab39233d..984efa73 100644 --- a/client/eth/client_test.go +++ b/client/eth/client_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/berachain/offchain-sdk/client/eth" + "github.com/berachain/offchain-sdk/v2/client/eth" "github.com/stretchr/testify/assert" "github.com/ethereum/go-ethereum" diff --git a/client/eth/connection_pool.go b/client/eth/connection_pool.go index 268c4005..62fa624a 100644 --- a/client/eth/connection_pool.go +++ b/client/eth/connection_pool.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" lru "github.com/hashicorp/golang-lru/v2" ) diff --git a/client/eth/connection_pool_test.go b/client/eth/connection_pool_test.go index 1921bea3..668cf117 100644 --- a/client/eth/connection_pool_test.go +++ b/client/eth/connection_pool_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/log" "github.com/stretchr/testify/require" ) diff --git a/client/eth/health_client.go b/client/eth/health_client.go index d4ae3f13..feeaf72f 100644 --- a/client/eth/health_client.go +++ b/client/eth/health_client.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" "github.com/ethereum/go-ethereum/ethclient" ) @@ -78,7 +78,7 @@ func (c *HealthCheckedClient) StartHealthCheck(ctx context.Context) { c.logger.Error("eth client reporting unhealthy", "err", err, "url", c.dialurl) } else { c.SetHealthy(true) - c.logger.Info("eth client reporting healthy", "url", c.dialurl) + c.logger.Debug("eth client reporting healthy", "url", c.dialurl) } } time.Sleep(c.healthCheckInterval) diff --git a/client/eth/mocks/ConnectionPool.go b/client/eth/mocks/ConnectionPool.go index 1682b3bc..383ee023 100644 --- a/client/eth/mocks/ConnectionPool.go +++ b/client/eth/mocks/ConnectionPool.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - eth "github.com/berachain/offchain-sdk/client/eth" + eth "github.com/berachain/offchain-sdk/v2/client/eth" mock "github.com/stretchr/testify/mock" ) diff --git a/cmd/root.go b/cmd/root.go index cec00f13..50e5f153 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -3,7 +3,7 @@ package cmd import ( "os" - coreapp "github.com/berachain/offchain-sdk/core/app" + coreapp "github.com/berachain/offchain-sdk/v2/core/app" "github.com/spf13/cobra" ) diff --git a/cmd/start.go b/cmd/start.go index b6209e5e..3e0cc92c 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -7,14 +7,14 @@ import ( "os/signal" "syscall" - "github.com/berachain/offchain-sdk/baseapp" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/cmd/flags" - "github.com/berachain/offchain-sdk/config" - "github.com/berachain/offchain-sdk/config/toml" - coreapp "github.com/berachain/offchain-sdk/core/app" - "github.com/berachain/offchain-sdk/log" - "github.com/berachain/offchain-sdk/server" + "github.com/berachain/offchain-sdk/v2/baseapp" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/cmd/flags" + "github.com/berachain/offchain-sdk/v2/config" + "github.com/berachain/offchain-sdk/v2/config/toml" + coreapp "github.com/berachain/offchain-sdk/v2/core/app" + "github.com/berachain/offchain-sdk/v2/log" + "github.com/berachain/offchain-sdk/v2/server" "github.com/spf13/cobra" ) @@ -27,7 +27,7 @@ func StartCmd[C any](app coreapp.App[C], defaultAppHome string) *cobra.Command { } // StartCmdWithOptions runs the service passed in. -func StartCmdWithOptions[C any]( +func StartCmdWithOptions[C any]( //nolint:gocognit // TODO: refactor app coreapp.App[C], defaultAppHome string, _ StartCmdOptions, ) *cobra.Command { cmd := &cobra.Command{ @@ -64,9 +64,9 @@ func StartCmdWithOptions[C any]( return err } - ab := baseapp.NewAppBuilder(app.Name()) - logger := log.NewWithCfg(cmd.OutOrStdout(), app.Name(), cfg.Log) + + ab := baseapp.NewAppBuilder(app.Name(), logger) // // Maybe move this to BuildApp? // ethClient := eth.NewHealthCheckedClient(&cfg.Eth) // ab.RegisterEthClient(ethClient) @@ -95,7 +95,9 @@ func StartCmdWithOptions[C any]( } // Build the application, then start it. - app.Setup(ab, cfg.App, logger) + if err = app.Setup(ab, cfg.App, logger); err != nil { + return err + } if err = app.Start(ctx); err != nil { return err } diff --git a/config/config.go b/config/config.go index 3cb9ce5d..c4a1fc40 100644 --- a/config/config.go +++ b/config/config.go @@ -1,9 +1,9 @@ package config import ( - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/log" - "github.com/berachain/offchain-sdk/server" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/log" + "github.com/berachain/offchain-sdk/v2/server" ) // Reader defines an interface for reading in configuration data. diff --git a/core/app/app.go b/core/app/app.go index fcf98923..7eba8b8d 100644 --- a/core/app/app.go +++ b/core/app/app.go @@ -3,12 +3,12 @@ package app import ( "context" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" ) type App[C any] interface { Name() string - Setup(ab Builder, config C, logger log.Logger) + Setup(ab Builder, config C, logger log.Logger) error Start(context.Context) error Stop() } diff --git a/core/app/builder.go b/core/app/builder.go index 3b4e3202..4446b5cd 100644 --- a/core/app/builder.go +++ b/core/app/builder.go @@ -1,11 +1,10 @@ package app import ( - "github.com/berachain/offchain-sdk/baseapp" - "github.com/berachain/offchain-sdk/job" - "github.com/berachain/offchain-sdk/log" - "github.com/berachain/offchain-sdk/server" - "github.com/berachain/offchain-sdk/telemetry" + "github.com/berachain/offchain-sdk/v2/baseapp" + "github.com/berachain/offchain-sdk/v2/job" + "github.com/berachain/offchain-sdk/v2/server" + "github.com/berachain/offchain-sdk/v2/telemetry" "github.com/ethereum/go-ethereum/ethdb" ) @@ -13,11 +12,10 @@ import ( // Builder is a builder for an app. It follows a basic factory pattern. type Builder interface { AppName() string - BuildApp(log.Logger) *baseapp.BaseApp + BuildApp() *baseapp.BaseApp RegisterJob(job.Basic) RegisterMetrics(cfg *telemetry.Config) error RegisterDB(db ethdb.KeyValueStore) RegisterHTTPHandler(handler *server.Handler) error RegisterMiddleware(m server.Middleware) error - RegisterPrometheusTelemetry() error } diff --git a/core/transactor/config.go b/core/transactor/config.go index 4b6f649d..9c5e2329 100644 --- a/core/transactor/config.go +++ b/core/transactor/config.go @@ -3,7 +3,7 @@ package transactor import ( "time" - "github.com/berachain/offchain-sdk/types/queue/sqs" + "github.com/berachain/offchain-sdk/v2/types/queue/sqs" ) type Config struct { diff --git a/core/transactor/factory/batcher/batcher_test.go b/core/transactor/factory/batcher/batcher_test.go index 3e88378c..eec17151 100644 --- a/core/transactor/factory/batcher/batcher_test.go +++ b/core/transactor/factory/batcher/batcher_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/log" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/log" + sdk "github.com/berachain/offchain-sdk/v2/types" "github.com/stretchr/testify/assert" "github.com/ethereum/go-ethereum/common" diff --git a/core/transactor/factory/batcher/multicall3.go b/core/transactor/factory/batcher/multicall3.go index a2221fb0..2d143566 100644 --- a/core/transactor/factory/batcher/multicall3.go +++ b/core/transactor/factory/batcher/multicall3.go @@ -7,10 +7,10 @@ import ( "math/big" "strings" - "github.com/berachain/offchain-sdk/contracts/bindings" - "github.com/berachain/offchain-sdk/core/transactor/factory" - "github.com/berachain/offchain-sdk/core/transactor/types" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/contracts/bindings" + "github.com/berachain/offchain-sdk/v2/core/transactor/factory" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" + sdk "github.com/berachain/offchain-sdk/v2/types" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" diff --git a/core/transactor/factory/batcher/multicall3_test.go b/core/transactor/factory/batcher/multicall3_test.go index 48702ed9..1642ed69 100644 --- a/core/transactor/factory/batcher/multicall3_test.go +++ b/core/transactor/factory/batcher/multicall3_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - "github.com/berachain/offchain-sdk/contracts/bindings" - "github.com/berachain/offchain-sdk/core/transactor/factory/batcher" - "github.com/berachain/offchain-sdk/core/transactor/types" + "github.com/berachain/offchain-sdk/v2/contracts/bindings" + "github.com/berachain/offchain-sdk/v2/core/transactor/factory/batcher" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" "github.com/stretchr/testify/assert" "github.com/ethereum/go-ethereum/common" diff --git a/core/transactor/factory/batcher/payable_multicall.go b/core/transactor/factory/batcher/payable_multicall.go index 3a303cdd..3272afca 100644 --- a/core/transactor/factory/batcher/payable_multicall.go +++ b/core/transactor/factory/batcher/payable_multicall.go @@ -7,10 +7,10 @@ import ( "math/big" "strings" - "github.com/berachain/offchain-sdk/contracts/bindings" - "github.com/berachain/offchain-sdk/core/transactor/factory" - "github.com/berachain/offchain-sdk/core/transactor/types" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/contracts/bindings" + "github.com/berachain/offchain-sdk/v2/core/transactor/factory" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" + sdk "github.com/berachain/offchain-sdk/v2/types" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" diff --git a/core/transactor/factory/batcher/payable_multicall_test.go b/core/transactor/factory/batcher/payable_multicall_test.go index 5e608ceb..c250c005 100644 --- a/core/transactor/factory/batcher/payable_multicall_test.go +++ b/core/transactor/factory/batcher/payable_multicall_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - "github.com/berachain/offchain-sdk/contracts/bindings" - "github.com/berachain/offchain-sdk/core/transactor/factory/batcher" - "github.com/berachain/offchain-sdk/core/transactor/types" + "github.com/berachain/offchain-sdk/v2/contracts/bindings" + "github.com/berachain/offchain-sdk/v2/core/transactor/factory/batcher" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" "github.com/stretchr/testify/assert" "github.com/ethereum/go-ethereum/common" diff --git a/core/transactor/factory/factory.go b/core/transactor/factory/factory.go index b68ab356..9a824079 100644 --- a/core/transactor/factory/factory.go +++ b/core/transactor/factory/factory.go @@ -6,9 +6,9 @@ import ( "math/big" "time" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/core/transactor/sender" - kmstypes "github.com/berachain/offchain-sdk/types/kms/types" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/core/transactor/sender" + kmstypes "github.com/berachain/offchain-sdk/v2/types/kms/types" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" diff --git a/core/transactor/factory/types.go b/core/transactor/factory/types.go index 29fcc30e..d840f396 100644 --- a/core/transactor/factory/types.go +++ b/core/transactor/factory/types.go @@ -3,7 +3,7 @@ package factory import ( "context" - "github.com/berachain/offchain-sdk/core/transactor/types" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" diff --git a/core/transactor/loop.go b/core/transactor/loop.go index 9f315e6f..bb09897b 100644 --- a/core/transactor/loop.go +++ b/core/transactor/loop.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/berachain/offchain-sdk/core/transactor/tracker" - "github.com/berachain/offchain-sdk/core/transactor/types" + "github.com/berachain/offchain-sdk/v2/core/transactor/tracker" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" "github.com/ethereum/go-ethereum" ) diff --git a/core/transactor/sender/sender.go b/core/transactor/sender/sender.go index a2cff794..18108fd0 100644 --- a/core/transactor/sender/sender.go +++ b/core/transactor/sender/sender.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/core/transactor/types" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" + "github.com/berachain/offchain-sdk/v2/log" coretypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/core/transactor/tracker.go b/core/transactor/tracker.go index b51e1852..1092cf1b 100644 --- a/core/transactor/tracker.go +++ b/core/transactor/tracker.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/berachain/offchain-sdk/core/transactor/sender" - "github.com/berachain/offchain-sdk/core/transactor/tracker" - "github.com/berachain/offchain-sdk/core/transactor/types" + "github.com/berachain/offchain-sdk/v2/core/transactor/sender" + "github.com/berachain/offchain-sdk/v2/core/transactor/tracker" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" coretypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/core/transactor/tracker/mempool.go b/core/transactor/tracker/mempool.go index 922eaa3b..f6262847 100644 --- a/core/transactor/tracker/mempool.go +++ b/core/transactor/tracker/mempool.go @@ -3,7 +3,7 @@ package tracker import ( "context" - "github.com/berachain/offchain-sdk/client/eth" + "github.com/berachain/offchain-sdk/v2/client/eth" "github.com/ethereum/go-ethereum/common" ) diff --git a/core/transactor/tracker/noncer.go b/core/transactor/tracker/noncer.go index 8386ee97..3b73e560 100644 --- a/core/transactor/tracker/noncer.go +++ b/core/transactor/tracker/noncer.go @@ -6,7 +6,7 @@ import ( "time" "github.com/berachain/go-utils/utils" - "github.com/berachain/offchain-sdk/client/eth" + "github.com/berachain/offchain-sdk/v2/client/eth" "github.com/huandu/skiplist" "github.com/ethereum/go-ethereum/common" diff --git a/core/transactor/tracker/subscription.go b/core/transactor/tracker/subscription.go index e3e3bb76..c2689709 100644 --- a/core/transactor/tracker/subscription.go +++ b/core/transactor/tracker/subscription.go @@ -3,7 +3,7 @@ package tracker import ( "context" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" coretypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/core/transactor/tracker/tracker.go b/core/transactor/tracker/tracker.go index ea23eec5..ebeab7a2 100644 --- a/core/transactor/tracker/tracker.go +++ b/core/transactor/tracker/tracker.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/core/transactor/event" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/core/transactor/event" "github.com/ethereum/go-ethereum/common" coretypes "github.com/ethereum/go-ethereum/core/types" diff --git a/core/transactor/transactor.go b/core/transactor/transactor.go index 5dea1720..7da8ff5d 100644 --- a/core/transactor/transactor.go +++ b/core/transactor/transactor.go @@ -6,18 +6,18 @@ import ( "sync" "time" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/core/transactor/event" - "github.com/berachain/offchain-sdk/core/transactor/factory" - "github.com/berachain/offchain-sdk/core/transactor/sender" - "github.com/berachain/offchain-sdk/core/transactor/tracker" - "github.com/berachain/offchain-sdk/core/transactor/types" - "github.com/berachain/offchain-sdk/log" - sdk "github.com/berachain/offchain-sdk/types" - kmstypes "github.com/berachain/offchain-sdk/types/kms/types" - "github.com/berachain/offchain-sdk/types/queue/mem" - "github.com/berachain/offchain-sdk/types/queue/sqs" - queuetypes "github.com/berachain/offchain-sdk/types/queue/types" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/core/transactor/event" + "github.com/berachain/offchain-sdk/v2/core/transactor/factory" + "github.com/berachain/offchain-sdk/v2/core/transactor/sender" + "github.com/berachain/offchain-sdk/v2/core/transactor/tracker" + "github.com/berachain/offchain-sdk/v2/core/transactor/types" + "github.com/berachain/offchain-sdk/v2/log" + sdk "github.com/berachain/offchain-sdk/v2/types" + kmstypes "github.com/berachain/offchain-sdk/v2/types/kms/types" + "github.com/berachain/offchain-sdk/v2/types/queue/mem" + "github.com/berachain/offchain-sdk/v2/types/queue/sqs" + queuetypes "github.com/berachain/offchain-sdk/v2/types/queue/types" "github.com/ethereum/go-ethereum/common" ) @@ -111,7 +111,7 @@ func (t *TxrV2) Setup(ctx context.Context) error { // Execute implements job.Basic. func (t *TxrV2) Execute(context.Context, any) (any, error) { acquired, inFlight := t.noncer.Stats() - t.logger.Info( + t.logger.Debug( "🧠 system status", "waiting-tx", acquired, "in-flight-tx", inFlight, "pending-requests", t.requests.Len(), ) diff --git a/core/transactor/types/request.go b/core/transactor/types/request.go index 3532dec1..185f6fe7 100644 --- a/core/transactor/types/request.go +++ b/core/transactor/types/request.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/berachain/offchain-sdk/types/queue/types" + "github.com/berachain/offchain-sdk/v2/types/queue/types" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" diff --git a/examples/listener/app/app.go b/examples/listener/app/app.go index ba23bbf9..f85a6cc2 100644 --- a/examples/listener/app/app.go +++ b/examples/listener/app/app.go @@ -1,15 +1,15 @@ package app import ( - "github.com/berachain/offchain-sdk/log" - "github.com/berachain/offchain-sdk/telemetry" - "github.com/berachain/offchain-sdk/tools/limiter" + "github.com/berachain/offchain-sdk/v2/baseapp" + coreapp "github.com/berachain/offchain-sdk/v2/core/app" + "github.com/berachain/offchain-sdk/v2/examples/listener/config" + ljobs "github.com/berachain/offchain-sdk/v2/examples/listener/jobs" + "github.com/berachain/offchain-sdk/v2/log" + "github.com/berachain/offchain-sdk/v2/telemetry" + "github.com/berachain/offchain-sdk/v2/tools/limiter" + jobs "github.com/berachain/offchain-sdk/v2/x/jobs" - "github.com/berachain/offchain-sdk/baseapp" - coreapp "github.com/berachain/offchain-sdk/core/app" - "github.com/berachain/offchain-sdk/examples/listener/config" - ljobs "github.com/berachain/offchain-sdk/examples/listener/jobs" - jobs "github.com/berachain/offchain-sdk/x/jobs" memdb "github.com/ethereum/go-ethereum/ethdb/memorydb" ) @@ -21,7 +21,7 @@ var _ coreapp.App[config.Config] = &ListenerApp{} // The event is defined in the smart contract at: 0x18Df82C7E422A42D47345Ed86B0E935E9718eBda // The event is called: NumbreChanged(uint256) // The event is emitted when the number is changed in the smart contract. -// The event is watched by the offchain-sdk and when it is emitted, the execution function is called. +// The event is watched by the offchain-sdk and when emitted, the execution function is called. type ListenerApp struct { *baseapp.BaseApp metrics telemetry.Metrics @@ -37,21 +37,14 @@ func (app *ListenerApp) Setup( ab coreapp.Builder, config config.Config, logger log.Logger, -) { +) error { var err error // Set up metrics instance app.metrics, err = telemetry.NewMetrics(&config.Metrics) if err != nil { logger.Error("error setting up metrics", "error", err) - return - } - - // Spin up Prometheus HTTP server - if config.Metrics.Prometheus.Enabled { - if err = ab.RegisterPrometheusTelemetry(); err != nil { - panic(err) - } + return err } // This job is subscribed to the `NumberChanged(uint256)` event. @@ -90,9 +83,12 @@ func (app *ListenerApp) Setup( if config.RateLimit.Enabled { // We register a rate limiter with our app. rateLimiter := limiter.New(config.RateLimit) - ab.RegisterMiddleware(limiter.Middleware(rateLimiter)) + if err = ab.RegisterMiddleware(limiter.Middleware(rateLimiter)); err != nil { + return err + } } // And then we setup everything by calling `BuildApp`. - app.BaseApp = ab.BuildApp(logger) + app.BaseApp = ab.BuildApp() + return nil } diff --git a/examples/listener/config/config.go b/examples/listener/config/config.go index 25c80030..58ddc099 100644 --- a/examples/listener/config/config.go +++ b/examples/listener/config/config.go @@ -3,8 +3,8 @@ package config import ( "time" - "github.com/berachain/offchain-sdk/telemetry" - "github.com/berachain/offchain-sdk/tools/limiter" + "github.com/berachain/offchain-sdk/v2/telemetry" + "github.com/berachain/offchain-sdk/v2/tools/limiter" ) type SubStruct struct { diff --git a/examples/listener/jobs/block_watcher.go b/examples/listener/jobs/block_watcher.go index e2e562f3..44f8be3e 100644 --- a/examples/listener/jobs/block_watcher.go +++ b/examples/listener/jobs/block_watcher.go @@ -3,8 +3,8 @@ package jobs import ( "context" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" coretypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/examples/listener/jobs/db_writer.go b/examples/listener/jobs/db_writer.go index e16ac765..351b8c2d 100644 --- a/examples/listener/jobs/db_writer.go +++ b/examples/listener/jobs/db_writer.go @@ -4,8 +4,8 @@ import ( "context" "math/big" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" ) // Compile time check to ensure that Listener implements job.Basic. diff --git a/examples/listener/jobs/listener.go b/examples/listener/jobs/listener.go index 95ab7070..6dde9e2d 100644 --- a/examples/listener/jobs/listener.go +++ b/examples/listener/jobs/listener.go @@ -4,8 +4,8 @@ import ( "context" "math/big" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" ) // Compile time check to ensure that Listener implements job.Basic. diff --git a/examples/listener/jobs/polling_job.go b/examples/listener/jobs/polling_job.go index f59674a5..e93e7965 100644 --- a/examples/listener/jobs/polling_job.go +++ b/examples/listener/jobs/polling_job.go @@ -5,8 +5,8 @@ import ( "math/big" "time" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" ) // Compile time check to ensure that Listener implements job.Basic. diff --git a/examples/listener/main.go b/examples/listener/main.go index 9f635e6e..8038c66d 100644 --- a/examples/listener/main.go +++ b/examples/listener/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/berachain/offchain-sdk/cmd" - "github.com/berachain/offchain-sdk/examples/listener/app" - listenerconfig "github.com/berachain/offchain-sdk/examples/listener/config" + "github.com/berachain/offchain-sdk/v2/cmd" + "github.com/berachain/offchain-sdk/v2/examples/listener/app" + listenerconfig "github.com/berachain/offchain-sdk/v2/examples/listener/config" ) func main() { diff --git a/examples/simple-metrics-app/app/app.go b/examples/simple-metrics-app/app/app.go index f4af7050..b6c6e048 100644 --- a/examples/simple-metrics-app/app/app.go +++ b/examples/simple-metrics-app/app/app.go @@ -3,11 +3,11 @@ package app import ( "time" - "github.com/berachain/offchain-sdk/baseapp" - coreapp "github.com/berachain/offchain-sdk/core/app" - "github.com/berachain/offchain-sdk/examples/simple-metrics-app/config" - "github.com/berachain/offchain-sdk/examples/simple-metrics-app/jobs" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/baseapp" + coreapp "github.com/berachain/offchain-sdk/v2/core/app" + "github.com/berachain/offchain-sdk/v2/examples/simple-metrics-app/config" + "github.com/berachain/offchain-sdk/v2/examples/simple-metrics-app/jobs" + "github.com/berachain/offchain-sdk/v2/log" ) // We must conform to the `App` interface. @@ -28,21 +28,14 @@ func (app *SimpleMetricsApp) Setup( ab coreapp.Builder, config config.AppConfig, logger log.Logger, -) { +) error { var err error // Set up metrics instance err = ab.RegisterMetrics(&config.Metrics) if err != nil { logger.Error("error setting up metrics", "error", err) - return - } - - // Spin up Prometheus HTTP server - if config.Metrics.Prometheus.Enabled { - if err = ab.RegisterPrometheusTelemetry(); err != nil { - panic(err) - } + return err } // This job is querying the chain on a 1 second time interval. @@ -59,5 +52,6 @@ func (app *SimpleMetricsApp) Setup( ) // And then we setup everything by calling `BuildApp`. - app.BaseApp = ab.BuildApp(logger) + app.BaseApp = ab.BuildApp() + return nil } diff --git a/examples/simple-metrics-app/config/config.go b/examples/simple-metrics-app/config/config.go index 6e38a746..22fbee07 100644 --- a/examples/simple-metrics-app/config/config.go +++ b/examples/simple-metrics-app/config/config.go @@ -1,6 +1,6 @@ package config -import "github.com/berachain/offchain-sdk/telemetry" +import "github.com/berachain/offchain-sdk/v2/telemetry" type AppConfig struct { Metrics telemetry.Config diff --git a/examples/simple-metrics-app/jobs/metrics_parser.go b/examples/simple-metrics-app/jobs/metrics_parser.go index cfdce25e..b79727b4 100644 --- a/examples/simple-metrics-app/jobs/metrics_parser.go +++ b/examples/simple-metrics-app/jobs/metrics_parser.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" ) // Compile time check to ensure that Listener implements job.Basic. diff --git a/examples/simple-metrics-app/jobs/polling_job.go b/examples/simple-metrics-app/jobs/polling_job.go index 4e70b093..fa7502aa 100644 --- a/examples/simple-metrics-app/jobs/polling_job.go +++ b/examples/simple-metrics-app/jobs/polling_job.go @@ -5,8 +5,8 @@ import ( "math/big" "time" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" ) // Compile time check to ensure that Listener implements job.Basic. diff --git a/examples/simple-metrics-app/main.go b/examples/simple-metrics-app/main.go index 0ff61f4c..85827e73 100644 --- a/examples/simple-metrics-app/main.go +++ b/examples/simple-metrics-app/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/berachain/offchain-sdk/cmd" - "github.com/berachain/offchain-sdk/examples/simple-metrics-app/app" + "github.com/berachain/offchain-sdk/v2/cmd" + "github.com/berachain/offchain-sdk/v2/examples/simple-metrics-app/app" ) func main() { diff --git a/go.mod b/go.mod index 1cbd11df..25297e8f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/berachain/offchain-sdk +module github.com/berachain/offchain-sdk/v2 go 1.23.1 diff --git a/job/types.go b/job/types.go index 113ab37b..00be366e 100644 --- a/job/types.go +++ b/job/types.go @@ -4,7 +4,7 @@ import ( "context" "time" - jobtypes "github.com/berachain/offchain-sdk/job/types" + jobtypes "github.com/berachain/offchain-sdk/v2/job/types" "github.com/ethereum/go-ethereum" coretypes "github.com/ethereum/go-ethereum/core/types" diff --git a/log/log_test.go b/log/log_test.go index b079e6ef..129357e2 100644 --- a/log/log_test.go +++ b/log/log_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" ) func TestLogger(t *testing.T) { diff --git a/server/server.go b/server/server.go index b0908616..50493744 100644 --- a/server/server.go +++ b/server/server.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" ) // 10 seconds is a stable default. diff --git a/telemetry/handler_wrapper.go b/telemetry/handler_wrapper.go index feb45474..ad21d6ee 100644 --- a/telemetry/handler_wrapper.go +++ b/telemetry/handler_wrapper.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "go-micro.dev/v4/server" "google.golang.org/grpc/codes" diff --git a/telemetry/metrics.go b/telemetry/metrics.go index 4a0ffb10..640808a8 100644 --- a/telemetry/metrics.go +++ b/telemetry/metrics.go @@ -4,8 +4,8 @@ import ( "errors" "time" - "github.com/berachain/offchain-sdk/telemetry/datadog" - "github.com/berachain/offchain-sdk/telemetry/prometheus" + "github.com/berachain/offchain-sdk/v2/telemetry/datadog" + "github.com/berachain/offchain-sdk/v2/telemetry/prometheus" ) // Config serves as a global telemetry configuration. diff --git a/telemetry/prometheus/config.go b/telemetry/prometheus/config.go index a3012d9a..d99d44cd 100644 --- a/telemetry/prometheus/config.go +++ b/telemetry/prometheus/config.go @@ -15,6 +15,7 @@ type Config struct { Namespace string // optional Subsystem string // optional HistogramBucketCount int // Number of linear buckets for histogram, default to 10 + Port int // Port to expose the metrics on } func (c *Config) Validate() error { diff --git a/telemetry/prometheus/metrics.go b/telemetry/prometheus/metrics.go index 222376ae..227d5b38 100644 --- a/telemetry/prometheus/metrics.go +++ b/telemetry/prometheus/metrics.go @@ -2,13 +2,15 @@ package prometheus import ( "fmt" + "net/http" "strings" "sync" "time" "unicode" - "github.com/berachain/offchain-sdk/tools/rwstore" + "github.com/berachain/offchain-sdk/v2/tools/rwstore" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" ) const ( @@ -24,6 +26,8 @@ const ( errorMargin50 = 0.05 errorMargin90 = 0.01 errorMargin99 = 0.001 + + timeout = 5 * time.Second ) type metrics struct { @@ -54,6 +58,8 @@ func NewMetrics(cfg *Config) (*metrics, error) { //nolint:revive // only used as p.counterVecs = rwstore.NewRWMap[string, *prometheus.CounterVec]() p.histogramVecs = rwstore.NewRWMap[string, *prometheus.HistogramVec]() p.summaryVecs = rwstore.NewRWMap[string, *prometheus.SummaryVec]() + + p.expose() return p, nil } @@ -61,6 +67,25 @@ func (p *metrics) Close() error { return nil } +func (p *metrics) expose() { + if p.cfg.Port == 0 { + return + } + + go func() { + server := &http.Server{ + Addr: fmt.Sprintf(":%d", p.cfg.Port), + Handler: nil, // Use http.DefaultServeMux + ReadTimeout: timeout, + } + http.Handle("/metrics", promhttp.Handler()) + + if err := server.ListenAndServe(); err != nil { + panic(err) + } + }() +} + // Gauge implements the Gauge method of the Metrics interface using GaugeVec. func (p *metrics) Gauge(name string, value float64, _ float64, tags ...string) { if !p.cfg.Enabled { diff --git a/tools/limiter/limiter.go b/tools/limiter/limiter.go index 3f58f5cc..b2d7b755 100644 --- a/tools/limiter/limiter.go +++ b/tools/limiter/limiter.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/berachain/offchain-sdk/tools/store" + "github.com/berachain/offchain-sdk/v2/tools/store" ) type Limiter struct { diff --git a/types/context.go b/types/context.go index 3f9cfa22..62a28f00 100644 --- a/types/context.go +++ b/types/context.go @@ -3,9 +3,9 @@ package types import ( "context" - "github.com/berachain/offchain-sdk/client/eth" - "github.com/berachain/offchain-sdk/log" - "github.com/berachain/offchain-sdk/telemetry" + "github.com/berachain/offchain-sdk/v2/client/eth" + "github.com/berachain/offchain-sdk/v2/log" + "github.com/berachain/offchain-sdk/v2/telemetry" "github.com/ethereum/go-ethereum/ethdb" ) diff --git a/types/kms/aws/aws.go b/types/kms/aws/aws.go index 7c7b9a90..e8246267 100644 --- a/types/kms/aws/aws.go +++ b/types/kms/aws/aws.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/kms" awskmstype "github.com/aws/aws-sdk-go-v2/service/kms/types" - awsutils "github.com/berachain/offchain-sdk/types/aws" - "github.com/berachain/offchain-sdk/types/kms/types" + awsutils "github.com/berachain/offchain-sdk/v2/types/aws" + "github.com/berachain/offchain-sdk/v2/types/kms/types" ) // KeyManagementSystem is a wrapper around the AWS KMS client to provide diff --git a/types/kms/aws/client.go b/types/kms/aws/client.go index 35254f8e..420cdc80 100644 --- a/types/kms/aws/client.go +++ b/types/kms/aws/client.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/kms" - "github.com/berachain/offchain-sdk/types/kms/types" + "github.com/berachain/offchain-sdk/v2/types/kms/types" lru "github.com/hashicorp/golang-lru/v2" "github.com/ethereum/go-ethereum/crypto" diff --git a/types/kms/aws/signer.go b/types/kms/aws/signer.go index 1581ccf3..6d66040a 100644 --- a/types/kms/aws/signer.go +++ b/types/kms/aws/signer.go @@ -5,7 +5,7 @@ import ( "context" "math/big" - kmstypes "github.com/berachain/offchain-sdk/types/kms/types" + kmstypes "github.com/berachain/offchain-sdk/v2/types/kms/types" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" diff --git a/types/queue/mem/mem.go b/types/queue/mem/mem.go index 37bbfa97..fd62cd3d 100644 --- a/types/queue/mem/mem.go +++ b/types/queue/mem/mem.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/berachain/go-utils/utils" - "github.com/berachain/offchain-sdk/types/queue/types" + "github.com/berachain/offchain-sdk/v2/types/queue/types" ) // Queue is a thread-safe FIFO queue implementation. diff --git a/types/queue/sqs/sqs.go b/types/queue/sqs/sqs.go index 4eb7bfca..42c669e0 100644 --- a/types/queue/sqs/sqs.go +++ b/types/queue/sqs/sqs.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/sqs" sqstypes "github.com/aws/aws-sdk-go-v2/service/sqs/types" - awsutils "github.com/berachain/offchain-sdk/types/aws" - "github.com/berachain/offchain-sdk/types/queue/types" + awsutils "github.com/berachain/offchain-sdk/v2/types/aws" + "github.com/berachain/offchain-sdk/v2/types/queue/types" ) // awsMaxBatchSize is the max batch size for AWS. diff --git a/worker/options.go b/worker/options.go index 801b4bd4..5432b1e2 100644 --- a/worker/options.go +++ b/worker/options.go @@ -3,7 +3,7 @@ package worker import ( "runtime/debug" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" ) // PanicHandler builds a panic handler for the worker pool that logs the panic. diff --git a/worker/pool.go b/worker/pool.go index fde5a655..7e2a8e2b 100644 --- a/worker/pool.go +++ b/worker/pool.go @@ -4,7 +4,7 @@ import ( "context" "github.com/alitto/pond" - "github.com/berachain/offchain-sdk/log" + "github.com/berachain/offchain-sdk/v2/log" ) // and other functionality to the pool. diff --git a/x/jobs/block_header_job.go b/x/jobs/block_header_job.go index 0610be71..debdfb99 100644 --- a/x/jobs/block_header_job.go +++ b/x/jobs/block_header_job.go @@ -3,8 +3,8 @@ package jobs import ( "context" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" "github.com/ethereum/go-ethereum" coretypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/jobs/event_filter_job.go b/x/jobs/event_filter_job.go index fcc968a8..d9350eef 100644 --- a/x/jobs/event_filter_job.go +++ b/x/jobs/event_filter_job.go @@ -3,8 +3,8 @@ package jobs import ( "context" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" "github.com/ethereum/go-ethereum" coretypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/jobs/event_job.go b/x/jobs/event_job.go index 93f4be78..35c65e7d 100644 --- a/x/jobs/event_job.go +++ b/x/jobs/event_job.go @@ -3,8 +3,8 @@ package jobs import ( "context" - "github.com/berachain/offchain-sdk/job" - sdk "github.com/berachain/offchain-sdk/types" + "github.com/berachain/offchain-sdk/v2/job" + sdk "github.com/berachain/offchain-sdk/v2/types" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common"