Fix when decoding strings using hex.DecodeString by stripping 0x … (#946) (#949)

* Fix bug when decoding strings using hex.DecodeString by stripping 0x prefix.

* Remove 0x prefix from value in SubmitValue and NoStakeReport messages.

(cherry picked from commit 16f2791)

Co-authored-by: akrem <71235284+akremstudy@users.noreply.github.com>

Author: github-actions[bot]

app/extend_vote.go

@@ -17,6 +17,7 @@ import (
 	"github.com/spf13/viper"
 	bridgetypes "github.com/tellor-io/layer/x/bridge/types"
 	oracletypes "github.com/tellor-io/layer/x/oracle/types"
+	registrytypes "github.com/tellor-io/layer/x/registry/types"
 
 	"cosmossdk.io/collections"
 	"cosmossdk.io/log"
@@ -376,7 +377,7 @@ func (h *VoteExtHandler) GetValidatorIndexInValset(ctx context.Context, evmAddre
 
 func (h *VoteExtHandler) EncodeAndSignMessage(checkpointString string) ([]byte, error) {
 	// Encode the checkpoint string to bytes
-	checkpoint, err := hex.DecodeString(checkpointString)
+	checkpoint, err := hex.DecodeString(registrytypes.Remove0xPrefix(checkpointString))
 	if err != nil {
 		h.logger.Error("Failed to decode checkpoint", "error", err)
 		return nil, err

x/bridge/keeper/attestation_slashing.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/tellor-io/layer/x/bridge/types"
+	registrytypes "github.com/tellor-io/layer/x/registry/types"
 
 	"cosmossdk.io/collections"
 	"cosmossdk.io/math"
@@ -43,11 +44,11 @@ func (k Keeper) CheckAttestationEvidence(ctx context.Context, request types.MsgS
 	}
 
 	// determine the snapshot from the inputted params
-	queryId, err := hex.DecodeString(request.QueryId)
+	queryId, err := hex.DecodeString(registrytypes.Remove0xPrefix(request.QueryId))
 	if err != nil {
 		return err
 	}
-	checkpoint, err := hex.DecodeString(request.ValsetCheckpoint)
+	checkpoint, err := hex.DecodeString(registrytypes.Remove0xPrefix(request.ValsetCheckpoint))
 	if err != nil {
 		return err
 	}
@@ -127,7 +128,7 @@ func (k Keeper) CheckAttestationEvidence(ctx context.Context, request types.MsgS
 }
 
 func (k Keeper) GetOperatorAddressFromSignature(ctx context.Context, msg []byte, sig string) (types.OperatorAddress, error) {
-	sigBytes, err := hex.DecodeString(sig)
+	sigBytes, err := hex.DecodeString(registrytypes.Remove0xPrefix(sig))
 	if err != nil {
 		return types.OperatorAddress{}, err
 	}

x/bridge/keeper/claim_deposit.go

@@ -14,6 +14,7 @@ import (
 	"github.com/tellor-io/layer/lib/metrics"
 	layer "github.com/tellor-io/layer/types"
 	"github.com/tellor-io/layer/x/bridge/types"
+	registrytypes "github.com/tellor-io/layer/x/registry/types"
 
 	"cosmossdk.io/collections"
 
@@ -166,8 +167,7 @@ func (k Keeper) DecodeDepositReportValue(ctx context.Context, reportValue string
 		{Type: Uint256Type},
 		{Type: Uint256Type},
 	}
-	// decode report value
-	reportValueBytes, err := hex.DecodeString(reportValue)
+	reportValueBytes, err := hex.DecodeString(registrytypes.Remove0xPrefix(reportValue))
 	if err != nil {
 		k.Logger(ctx).Error("DecodeDepositReportValue", "error", fmt.Errorf("failed to decode report value, err: %w", err))
 		return nil, sdk.Coins{}, sdk.Coins{}, err

x/bridge/keeper/keeper.go

@@ -20,6 +20,7 @@ import (
 	layertypes "github.com/tellor-io/layer/types"
 	"github.com/tellor-io/layer/x/bridge/types"
 	oracletypes "github.com/tellor-io/layer/x/oracle/types"
+	registrytypes "github.com/tellor-io/layer/x/registry/types"
 
 	"cosmossdk.io/collections"
 	storetypes "cosmossdk.io/core/store"
@@ -789,7 +790,7 @@ func (k Keeper) SetBridgeValsetSignature(ctx context.Context, operatorAddress st
 		return err
 	}
 	// decode the signature hex
-	signatureBytes, err := hex.DecodeString(signature)
+	signatureBytes, err := hex.DecodeString(registrytypes.Remove0xPrefix(signature))
 	if err != nil {
 		k.Logger(ctx).Info("Error decoding signature hex", "error", err)
 		return err
@@ -1177,8 +1178,7 @@ func (k Keeper) EncodeOracleAttestationData(
 	var queryIdBytes32 [32]byte
 	copy(queryIdBytes32[:], queryId)
 
-	// Convert value to bytes
-	valueBytes, err := hex.DecodeString(value)
+	valueBytes, err := hex.DecodeString(registrytypes.Remove0xPrefix(value))
 	if err != nil {
 		return nil, err
 	}
@@ -1317,7 +1317,7 @@ func (k Keeper) CreateNoStakeSnapshot(ctx context.Context, report *oracletypes.N
 		{Type: bytesType},
 		{Type: stringType},
 	}
-	valBz, err := hex.DecodeString(report.Value)
+	valBz, err := hex.DecodeString(registrytypes.Remove0xPrefix(report.Value))
 	if err != nil {
 		return err
 	}

x/bridge/keeper/msg_server_request_attestations.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/tellor-io/layer/x/bridge/types"
+	registrytypes "github.com/tellor-io/layer/x/registry/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -26,7 +27,7 @@ func (k msgServer) RequestAttestations(ctx context.Context, msg *types.MsgReques
 		return nil, err
 	}
 
-	queryId, err := hex.DecodeString(msg.QueryId)
+	queryId, err := hex.DecodeString(registrytypes.Remove0xPrefix(msg.QueryId))
 	if err != nil {
 		k.Keeper.Logger(sdkCtx).Error("failed to decode query id", "error", err)
 		return nil, status.Error(codes.InvalidArgument, err.Error())

x/bridge/keeper/valset_sig_slashing.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 
 	"github.com/tellor-io/layer/x/bridge/types"
+	registrytypes "github.com/tellor-io/layer/x/registry/types"
 
 	"cosmossdk.io/collections"
 
@@ -40,7 +41,7 @@ func (k Keeper) CheckValsetSignatureEvidence(ctx context.Context, request types.
 	}
 
 	// get the checkpoint from the inputted params
-	valsetHashBytes, err := hex.DecodeString(request.ValsetHash)
+	valsetHashBytes, err := hex.DecodeString(registrytypes.Remove0xPrefix(request.ValsetHash))
 	if err != nil {
 		return err
 	}

x/oracle/keeper/msg_no_stake_report.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/tellor-io/layer/utils"
 	"github.com/tellor-io/layer/x/oracle/types"
+	registrytypes "github.com/tellor-io/layer/x/registry/types"
 
 	"cosmossdk.io/collections"
 	errorsmod "cosmossdk.io/errors"
@@ -21,7 +22,7 @@ func (k msgServer) NoStakeReport(ctx context.Context, msg *types.MsgNoStakeRepor
 	}
 
 	queryData := msg.QueryData
-	value := msg.Value
+	value := registrytypes.Remove0xPrefix(msg.Value)
 	timestamp := sdkCtx.BlockTime().UnixMilli()
 	queryId := utils.QueryIDFromData(queryData)
 

x/oracle/keeper/msg_server_submit_value.go

@@ -8,6 +8,7 @@ import (
 	layertypes "github.com/tellor-io/layer/types"
 	"github.com/tellor-io/layer/utils"
 	"github.com/tellor-io/layer/x/oracle/types"
+	registrytypes "github.com/tellor-io/layer/x/registry/types"
 
 	"cosmossdk.io/collections"
 	errorsmod "cosmossdk.io/errors"
@@ -34,6 +35,7 @@ import (
 // 7. Set queryMeta.HasRevealedReports to true
 // 8. Emit an event for the new report
 func (k msgServer) SubmitValue(ctx context.Context, msg *types.MsgSubmitValue) (res *types.MsgSubmitValueResponse, err error) {
+	msg.Value = registrytypes.Remove0xPrefix(msg.Value)
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	err = validateSubmitValue(msg)
 	if err != nil {