From 1f0c3f6747b2f3fb9ed89727c06158dae99eb92d Mon Sep 17 00:00:00 2001 From: Calin Martinconi Date: Fri, 11 Oct 2024 17:10:01 +0300 Subject: [PATCH] fix: get wallet endpoint available if swap not enabled (#4859) --- pkg/api/router.go | 6 +++--- pkg/node/node.go | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/api/router.go b/pkg/api/router.go index eb2fbd4867..d7511c1c52 100644 --- a/pkg/api/router.go +++ b/pkg/api/router.go @@ -508,10 +508,10 @@ func (s *Service) mountBusinessDebug() { ), }) + handle("/wallet", jsonhttp.MethodHandler{ + "GET": http.HandlerFunc(s.walletHandler), + }) if s.swapEnabled { - handle("/wallet", jsonhttp.MethodHandler{ - "GET": http.HandlerFunc(s.walletHandler), - }) handle("/wallet/withdraw/{coin}", jsonhttp.MethodHandler{ "POST": web.ChainHandlers( s.gasConfigMiddleware("wallet withdraw"), diff --git a/pkg/node/node.go b/pkg/node/node.go index 486e76e324..96320d3e1f 100644 --- a/pkg/node/node.go +++ b/pkg/node/node.go @@ -489,19 +489,19 @@ func NewBee( } } - if o.SwapEnable { - chequebookFactory, err = InitChequebookFactory(logger, chainBackend, chainID, transactionService, o.SwapFactoryAddress) - if err != nil { - return nil, err - } + chequebookFactory, err = InitChequebookFactory(logger, chainBackend, chainID, transactionService, o.SwapFactoryAddress) + if err != nil { + return nil, err + } - erc20Address, err := chequebookFactory.ERC20Address(ctx) - if err != nil { - return nil, fmt.Errorf("factory fail: %w", err) - } + erc20Address, err := chequebookFactory.ERC20Address(ctx) + if err != nil { + return nil, fmt.Errorf("factory fail: %w", err) + } - erc20Service = erc20.New(transactionService, erc20Address) + erc20Service = erc20.New(transactionService, erc20Address) + if o.SwapEnable { if o.ChequebookEnable && chainEnabled { chequebookService, err = InitChequebookService( ctx,