fix(voucher): check validator existance on claim (#159)

Co-authored-by: mj <akbarian.dev@gmail.ccom>

Author: akbariandev

internal/engine/command/voucher/claim.go

@@ -2,6 +2,7 @@ package voucher
 
 import (
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/pagu-project/Pagu/internal/engine/command"
@@ -34,14 +35,21 @@ func (v *Voucher) claimHandler(
 	}
 
 	address := args["address"]
-	validatorInfo, err := v.clientManager.GetValidatorInfo(address)
+	valInfo, _ := v.clientManager.GetValidatorInfo(address)
+	if valInfo.Validator != nil {
+		err = errors.New("this address is already a staked validator")
+		log.Warn(fmt.Sprintf("staked validator found. %s", address))
+		return cmd.ErrorResult(err)
+	}
+
+	pubKey, err := v.clientManager.FindPublicKey(address, false)
 	if err != nil {
-		log.Error("error get validator info", "err", err)
+		log.Warn(fmt.Sprintf("peer not found. %s", address))
 		return cmd.ErrorResult(err)
 	}
 
-	pubKey := validatorInfo.GetValidator().GetPublicKey()
-	txHash, err := v.wallet.BondTransaction(pubKey, address, "Voucher claim from Pagu", voucher.Amount)
+	memo := fmt.Sprintf("voucher %s claimed by Pagu", code)
+	txHash, err := v.wallet.BondTransaction(pubKey, address, memo, voucher.Amount)
 	if err != nil {
 		return cmd.ErrorResult(err)
 	}

internal/engine/command/voucher/claim_test.go

@@ -2,6 +2,8 @@ package voucher
 
 import (
 	"errors"
+	"fmt"
+	"math/rand"
 	"testing"
 
 	pactus "github.com/pactus-project/pactus/www/grpc/gen/go"
@@ -14,6 +16,7 @@ import (
 func TestClaimNormal(t *testing.T) {
 	voucher, db, client, wallet := setup(t)
 
+	validatorAddr := fmt.Sprintf("pc1z%d", rand.Intn(1000000)) //nolint
 	t.Run("normal", func(t *testing.T) {
 		amt, _ := amount.NewAmount(100)
 		db.EXPECT().GetVoucherByCode("12345678").Return(
@@ -24,15 +27,17 @@ func TestClaimNormal(t *testing.T) {
 			}, nil,
 		).AnyTimes()
 
-		client.EXPECT().GetValidatorInfo("pc1z").Return(
+		client.EXPECT().GetValidatorInfo(validatorAddr).Return(
 			&pactus.GetValidatorResponse{
-				Validator: &pactus.ValidatorInfo{
-					PublicKey: "pc1z",
-				},
+				Validator: nil,
 			}, nil,
 		).AnyTimes()
 
-		wallet.EXPECT().BondTransaction("pc1z", "pc1z", "Voucher claim from Pagu", amt).Return(
+		client.EXPECT().FindPublicKey(validatorAddr, false).Return(
+			validatorAddr, nil,
+		).AnyTimes()
+
+		wallet.EXPECT().BondTransaction(validatorAddr, validatorAddr, "voucher 12345678 claimed by Pagu", amt).Return(
 			"0x1", nil,
 		).AnyTimes()
 
@@ -45,7 +50,7 @@ func TestClaimNormal(t *testing.T) {
 
 		args := make(map[string]string)
 		args["code"] = "12345678"
-		args["address"] = "pc1z"
+		args["address"] = validatorAddr
 		result := voucher.claimHandler(caller, cmd, args)
 		assert.True(t, result.Successful)
 		assert.Equal(t, result.Message, "Voucher claimed successfully!\n\n https://pacviewer.com/transaction/0x1")

internal/engine/command/wallet.middleware.go

@@ -1,14 +1,16 @@
 package command
 
 import (
-	"errors"
+	"fmt"
 
 	"github.com/pagu-project/Pagu/internal/entity"
 )
 
+const minWalletBalance = 500
+
 func (h *MiddlewareHandler) WalletBalance(_ *entity.User, _ *Command, _ map[string]string) error {
-	if h.wallet.Balance() < 5 {
-		return errors.New("the Pagu Wallet balance is less than 5 PAC")
+	if h.wallet.Balance() < minWalletBalance {
+		return fmt.Errorf("the Pagu Wallet balance is less than %d PAC", minWalletBalance)
 	}
 
 	return nil

pkg/client/client_mgr.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 	"time"
@@ -134,6 +135,7 @@ func (cm *Mgr) GetLastBlockTime() (lastBlockTime, lastBlockHeight uint32) {
 }
 
 func (cm *Mgr) GetNetworkInfo() (*pactus.GetNetworkInfoResponse, error) {
+	// TODO: use caching and object
 	for _, c := range cm.clients {
 		info, err := c.GetNetworkInfo(cm.ctx)
 		if err != nil {
@@ -248,3 +250,21 @@ func (cm *Mgr) GetCirculatingSupply() (int64, error) {
 	circulating := (addr1Out + addr2Out + addr3Out + addr4Out + addr5Out + addr6Out + int64(minted)) - staked - warm
 	return circulating, nil
 }
+
+func (cm *Mgr) FindPublicKey(address string, firstVal bool) (string, error) { //nolint
+	peerInfo, err := cm.GetPeerInfo(address)
+	if err != nil {
+		return "", err
+	}
+
+	for i, addr := range peerInfo.ConsensusAddresses {
+		if addr == address {
+			if firstVal && i != 0 {
+				return "", errors.New("please enter the first validator address")
+			}
+			return peerInfo.ConsensusKeys[i], nil
+		}
+	}
+
+	panic("unreachable")
+}

pkg/client/client_mgr_test.go

@@ -0,0 +1,65 @@
+package client
+
+import (
+	"context"
+	"testing"
+
+	pactus "github.com/pactus-project/pactus/www/grpc/gen/go"
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
+)
+
+func setup(t *testing.T) (Manager, *MockIClient) {
+	t.Helper()
+	ctrl := gomock.NewController(t)
+	mockClient := NewMockIClient(ctrl)
+
+	clientMgr := NewClientMgr(context.Background())
+	clientMgr.AddClient(mockClient)
+
+	return clientMgr, mockClient
+}
+
+func TestFindPublicKey(t *testing.T) {
+	clientMgr, mockClient := setup(t)
+
+	mockClient.EXPECT().GetNetworkInfo(gomock.Any()).Return(
+		&pactus.GetNetworkInfoResponse{
+			ConnectedPeers: []*pactus.PeerInfo{
+				{
+					ConsensusKeys:      []string{"pubKey-1", "pubKey-2"},
+					ConsensusAddresses: []string{"addr-1", "addr-2"},
+				},
+				{
+					ConsensusKeys:      []string{"pubKey-3", "pubKey-4"},
+					ConsensusAddresses: []string{"addr-3", "addr-4"},
+				},
+			},
+		}, nil,
+	).AnyTimes()
+
+	clientMgr.updateValMap()
+	t.Run("not found", func(t *testing.T) {
+		pubKey, err := clientMgr.FindPublicKey("not-exists", false)
+		assert.Error(t, err)
+		assert.Empty(t, pubKey)
+	})
+
+	t.Run("not first", func(t *testing.T) {
+		pubKey, err := clientMgr.FindPublicKey("addr-4", true)
+		assert.Error(t, err)
+		assert.Empty(t, pubKey)
+	})
+
+	t.Run("first-ok", func(t *testing.T) {
+		pubKey, err := clientMgr.FindPublicKey("addr-3", true)
+		assert.NoError(t, err)
+		assert.Equal(t, pubKey, "pubKey-3")
+	})
+
+	t.Run("any-ok", func(t *testing.T) {
+		pubKey, err := clientMgr.FindPublicKey("addr-4", false)
+		assert.NoError(t, err)
+		assert.Equal(t, pubKey, "pubKey-4")
+	})
+}

pkg/client/interface.go

@@ -37,4 +37,5 @@ type Manager interface {
 	GetBalance(addr string) (int64, error)
 	GetFee(amt int64) (int64, error)
 	GetCirculatingSupply() (int64, error)
+	FindPublicKey(address string, firstVal bool) (string, error)
 }