From eec2eb9ee4c8c095ff58bdb825c5368f46b0bb99 Mon Sep 17 00:00:00 2001 From: Calin Martinconi Date: Mon, 29 Dec 2025 19:16:04 +0200 Subject: [PATCH 1/2] fix: chain backend should not be used for ultra light nodes --- pkg/node/node.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/node/node.go b/pkg/node/node.go index 8499bff301a..f99fabaa8a6 100644 --- a/pkg/node/node.go +++ b/pkg/node/node.go @@ -489,21 +489,21 @@ func NewBee( b.apiCloser = apiServer } - // Sync the with the given Ethereum backend: - isSynced, _, err := transaction.IsSynced(ctx, chainBackend, maxDelay) - if err != nil { - return nil, fmt.Errorf("is synced: %w", err) - } - if !isSynced { - logger.Info("waiting to sync with the blockchain backend") - - err := transaction.WaitSynced(ctx, logger, chainBackend, maxDelay) + if o.SwapEnable { + // Sync the with the given Ethereum backend: + isSynced, _, err := transaction.IsSynced(ctx, chainBackend, maxDelay) if err != nil { - return nil, fmt.Errorf("waiting backend sync: %w", err) + return nil, fmt.Errorf("is synced: %w", err) + } + if !isSynced { + logger.Info("waiting to sync with the blockchain backend") + + err := transaction.WaitSynced(ctx, logger, chainBackend, maxDelay) + if err != nil { + return nil, fmt.Errorf("waiting backend sync: %w", err) + } } - } - if o.SwapEnable { chequebookFactory, err := InitChequebookFactory(logger, chainBackend, chainID, transactionService, o.SwapFactoryAddress) if err != nil { return nil, fmt.Errorf("init chequebook factory: %w", err) From b425f9334268911efe71b4edbb2609bd90b488bb Mon Sep 17 00:00:00 2001 From: Calin Martinconi Date: Tue, 30 Dec 2025 16:56:15 +0200 Subject: [PATCH 2/2] fix: use chain enabled check instead --- pkg/node/node.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/node/node.go b/pkg/node/node.go index f99fabaa8a6..d17ec0fe83a 100644 --- a/pkg/node/node.go +++ b/pkg/node/node.go @@ -489,7 +489,7 @@ func NewBee( b.apiCloser = apiServer } - if o.SwapEnable { + if chainEnabled { // Sync the with the given Ethereum backend: isSynced, _, err := transaction.IsSynced(ctx, chainBackend, maxDelay) if err != nil { @@ -503,7 +503,9 @@ func NewBee( return nil, fmt.Errorf("waiting backend sync: %w", err) } } + } + if o.SwapEnable { chequebookFactory, err := InitChequebookFactory(logger, chainBackend, chainID, transactionService, o.SwapFactoryAddress) if err != nil { return nil, fmt.Errorf("init chequebook factory: %w", err)