fix: commited stake

pkg/api/router.go

@@ -567,6 +567,14 @@ func (s *Service) mountBusinessDebug() {
 		})),
 	)
 
+	handle("/stake/withdrawable", web.ChainHandlers(
+		s.stakingAccessHandler,
+		s.gasConfigMiddleware("get withdrawable stake"),
+		web.FinalHandler(jsonhttp.MethodHandler{
+			"GET": http.HandlerFunc(s.getWithdrawableStakeHandler),
+		})),
+	)
+
 	handle("/stake/{amount}", web.ChainHandlers(
 		s.stakingAccessHandler,
 		s.gasConfigMiddleware("deposit stake"),
@@ -579,7 +587,7 @@ func (s *Service) mountBusinessDebug() {
 		s.stakingAccessHandler,
 		s.gasConfigMiddleware("get or withdraw stake"),
 		web.FinalHandler(jsonhttp.MethodHandler{
-			"GET":    http.HandlerFunc(s.getStakedAmountHandler),
+			"GET":    http.HandlerFunc(s.getCommittedStakeHandler),
 			"DELETE": http.HandlerFunc(s.withdrawStakeHandler),
 		})),
 	)

pkg/api/staking.go

@@ -78,10 +78,24 @@ func (s *Service) stakingDepositHandler(w http.ResponseWriter, r *http.Request)
 	})
 }
 
-func (s *Service) getStakedAmountHandler(w http.ResponseWriter, r *http.Request) {
+func (s *Service) getCommittedStakeHandler(w http.ResponseWriter, r *http.Request) {
 	logger := s.logger.WithName("get_stake").Build()
 
-	stakedAmount, err := s.stakingContract.GetStake(r.Context())
+	stakedAmount, err := s.stakingContract.GetCommittedStake(r.Context())
+	if err != nil {
+		logger.Debug("get staked amount failed", "overlayAddr", s.overlay, "error", err)
+		logger.Error(nil, "get staked amount failed")
+		jsonhttp.InternalServerError(w, "get staked amount failed")
+		return
+	}
+
+	jsonhttp.OK(w, getStakeResponse{StakedAmount: bigint.Wrap(stakedAmount)})
+}
+
+func (s *Service) getWithdrawableStakeHandler(w http.ResponseWriter, r *http.Request) {
+	logger := s.logger.WithName("get_stake").Build()
+
+	stakedAmount, err := s.stakingContract.GetWithdrawableStake(r.Context())
 	if err != nil {
 		logger.Debug("get staked amount failed", "overlayAddr", s.overlay, "error", err)
 		logger.Error(nil, "get staked amount failed")

pkg/api/staking_test.go

@@ -105,7 +105,7 @@ func TestDepositStake(t *testing.T) {
 	})
 }
 
-func TestGetStake(t *testing.T) {
+func TestGetStakeCommitted(t *testing.T) {
 	t.Parallel()
 
 	t.Run("ok", func(t *testing.T) {
@@ -135,6 +135,36 @@ func TestGetStake(t *testing.T) {
 	})
 }
 
+func TestGetStakeWithdrawable(t *testing.T) {
+	t.Parallel()
+
+	t.Run("ok", func(t *testing.T) {
+		t.Parallel()
+
+		contract := stakingContractMock.New(
+			stakingContractMock.WithGetStake(func(ctx context.Context) (*big.Int, error) {
+				return big.NewInt(1), nil
+			}),
+		)
+		ts, _, _, _ := newTestServer(t, testServerOptions{StakingContract: contract})
+		jsonhttptest.Request(t, ts, http.MethodGet, "/stake/withdrawable", http.StatusOK,
+			jsonhttptest.WithExpectedJSONResponse(&api.GetStakeResponse{StakedAmount: bigint.Wrap(big.NewInt(1))}))
+	})
+
+	t.Run("with error", func(t *testing.T) {
+		t.Parallel()
+
+		contractWithError := stakingContractMock.New(
+			stakingContractMock.WithGetStake(func(ctx context.Context) (*big.Int, error) {
+				return big.NewInt(0), fmt.Errorf("get stake failed")
+			}),
+		)
+		ts, _, _, _ := newTestServer(t, testServerOptions{StakingContract: contractWithError})
+		jsonhttptest.Request(t, ts, http.MethodGet, "/stake/withdrawable", http.StatusInternalServerError,
+			jsonhttptest.WithExpectedJSONResponse(&jsonhttp.StatusResponse{Code: http.StatusInternalServerError, Message: "get staked amount failed"}))
+	})
+}
+
 func Test_stakingDepositHandler_invalidInputs(t *testing.T) {
 	t.Parallel()
 

pkg/node/node.go

@@ -971,7 +971,7 @@ func NewBee(
 	stakingContract := staking.New(overlayEthAddress, stakingContractAddress, abiutil.MustParseABI(chainCfg.StakingABI), bzzTokenAddress, transactionService, common.BytesToHash(nonce), o.TrxDebugMode)
 
 	if chainEnabled && changedOverlay {
-		stake, err := stakingContract.GetStake(ctx)
+		stake, err := stakingContract.GetCommittedStake(ctx)
 		if err != nil {
 			return nil, errors.New("getting stake balance")
 		}