path/book validation

model/client/path/book_offers_request.go

@@ -2,6 +2,7 @@ package path
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -20,6 +21,21 @@ func (*BookOffersRequest) Method() string {
 	return "book_offers"
 }
 
+func (r *BookOffersRequest) Validate() error {
+	if err := r.TakerGets.Validate(); err != nil {
+		return fmt.Errorf("book offers taker gets: %w", err)
+	}
+	if err := r.TakerPays.Validate(); err != nil {
+		return fmt.Errorf("book offers taker pays: %w", err)
+	}
+
+	if err := r.Taker.Validate(); r.Taker != "" && err != nil {
+		return fmt.Errorf("book offers taker: %w", err)
+	}
+
+	return nil
+}
+
 func (r *BookOffersRequest) UnmarshalJSON(data []byte) error {
 	type borHelper struct {
 		TakerGets   types.IssuedCurrencyAmount `json:"taker_gets"`

model/client/path/deposit_authorized_request.go

@@ -2,6 +2,7 @@ package path
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -18,6 +19,17 @@ func (*DepositAuthorizedRequest) Method() string {
 	return "deposit_authorized"
 }
 
+func (r *DepositAuthorizedRequest) Validate() error {
+	if err := r.SourceAccount.Validate(); err != nil {
+		return fmt.Errorf("deposit authorized source: %w", err)
+	}
+	if err := r.DestinationAccount.Validate(); err != nil {
+		return fmt.Errorf("deposit authorized destination: %w", err)
+	}
+
+	return nil
+}
+
 func (r *DepositAuthorizedRequest) UnmarshalJSON(data []byte) error {
 	type darHelper struct {
 		SourceAccount      types.Address     `json:"source_account"`

model/client/path/nftoken_buy_offers_request.go

@@ -2,6 +2,7 @@ package path
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -19,6 +20,13 @@ func (*NFTokenBuyOffersRequest) Method() string {
 	return "nft_buy_offers"
 }
 
+func (r *NFTokenBuyOffersRequest) Validat() error {
+	if r.NFTokenID == "" {
+		return fmt.Errorf("nft buy offer missing token id")
+	}
+	return nil
+}
+
 func (r *NFTokenBuyOffersRequest) UnmarshalJSON(data []byte) error {
 	type borHelper struct {
 		NFTokenID   types.NFTokenID   `json:"nft_id"`

model/client/path/nftoken_sell_offers_request.go

@@ -2,6 +2,7 @@ package path
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -19,6 +20,13 @@ func (*NFTokenSellOffersRequest) Method() string {
 	return "nft_sell_offers"
 }
 
+func (r *NFTokenSellOffersRequest) Validate() error {
+	if r.NFTokenID == "" {
+		return fmt.Errorf("nft sell offer missing token id")
+	}
+	return nil
+}
+
 func (r *NFTokenSellOffersRequest) UnmarshalJSON(data []byte) error {
 	type borHelper struct {
 		NFTokenID   types.NFTokenID   `json:"nft_id"`

model/client/path/path_find_request.go

@@ -2,6 +2,7 @@ package path
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/transactions"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -28,6 +29,31 @@ func (*PathFindRequest) Method() string {
 	return "path_find"
 }
 
+func (r *PathFindRequest) Validate() error {
+	switch r.Subcommand {
+	case CREATE:
+		if err := r.SourceAccount.Validate(); err != nil {
+			return fmt.Errorf("path find create source: %w", err)
+		}
+		if err := r.DestinationAccount.Validate(); err != nil {
+			return fmt.Errorf("path find create destination: %w", err)
+		}
+		if err := r.DestinationAmount.Validate(); err != nil {
+			return fmt.Errorf("path find create destination amount: %w", err)
+		}
+		if r.SendMax != nil {
+			if err := r.SendMax.Validate(); err != nil {
+				return fmt.Errorf("path find create send max: %w", err)
+			}
+		}
+		return nil
+	case CLOSE, STATUS:
+		return nil
+	default:
+		return fmt.Errorf("path find: invalid subcommand")
+	}
+}
+
 func (r *PathFindRequest) UnmarshalJSON(data []byte) error {
 	type pfrHelper struct {
 		Subcommand         PathSubCommand          `json:"subcommand"`

model/client/path/ripple_path_find_request.go

@@ -2,6 +2,7 @@ package path
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -21,6 +22,34 @@ func (*RipplePathFindRequest) Method() string {
 	return "ripple_path_find"
 }
 
+func (r *RipplePathFindRequest) Validate() error {
+	if err := r.SourceAccount.Validate(); err != nil {
+		return fmt.Errorf("ripple path find source: %w", err)
+	}
+	if err := r.DestinationAccount.Validate(); err != nil {
+		return fmt.Errorf("ripple path find destination: %w", err)
+	}
+	if err := r.DestinationAmount.Validate(); err != nil {
+		return fmt.Errorf("ripple path find destination amount: %w", err)
+	}
+	if r.SendMax != nil && len(r.SourceCurrencies) != 0 {
+		return fmt.Errorf("ripple path find cannot have send max and source currencies set simultaneously")
+	}
+	if r.SendMax != nil {
+		if err := r.SendMax.Validate(); err != nil {
+			return fmt.Errorf("ripple path find send max: %w", err)
+		}
+	}
+	if len(r.SourceCurrencies) != 0 {
+		for _, c := range r.SourceCurrencies {
+			if err := c.Validate(); err != nil {
+				return fmt.Errorf("ripple path find source currencies: %w", err)
+			}
+		}
+	}
+	return nil
+}
+
 func (r *RipplePathFindRequest) UnmarshalJSON(data []byte) error {
 	type rpfHelper struct {
 		SourceAccount      types.Address                `json:"source_account"`

model/transactions/types/currency_amount.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"encoding/json"
+	"fmt"
 	"strconv"
 )
 
@@ -14,6 +15,7 @@ const (
 
 type CurrencyAmount interface {
 	Kind() CurrencyKind
+	Validate() error
 }
 
 func UnmarshalCurrencyAmount(data []byte) (CurrencyAmount, error) {
@@ -42,6 +44,26 @@ type IssuedCurrencyAmount struct {
 	Value    string  `json:"value,omitempty"`
 }
 
+func (i IssuedCurrencyAmount) Validate() error {
+	if i.Currency == "" {
+		return fmt.Errorf("issued currency: missing currency code")
+	}
+	if i.Currency == "XRP" && i.Issuer != "" {
+		return fmt.Errorf("issued currency: xrp cannot be issued")
+
+	}
+	/*
+		// Issuer not required for source currencies field (path find request)
+		if i.Currency != "XRP" && i.Issuer == "" {
+			return fmt.Errorf("issued currency: non-xrp currencies require and issuer")
+		}
+	*/
+	if err := i.Issuer.Validate(); i.Issuer != "" && err != nil {
+		return fmt.Errorf("issued currency: %w", err)
+	}
+	return nil
+}
+
 func (IssuedCurrencyAmount) Kind() CurrencyKind {
 	return ISSUED
 }
@@ -52,6 +74,10 @@ func (XRPCurrencyAmount) Kind() CurrencyKind {
 	return XRP
 }
 
+func (XRPCurrencyAmount) Validate() error {
+	return nil
+}
+
 func (a XRPCurrencyAmount) MarshalJSON() ([]byte, error) {
 	s := strconv.FormatUint(uint64(a), 10)
 	return json.Marshal(s)