Add asset flag to rvasps

cmd/rvasp/main.go

@@ -160,6 +160,11 @@ func main() {
 					Name:  "d, amount",
 					Usage: "the amount to transfer to the beneficiary",
 				},
+				&cli.StringFlag{
+					Name:  "t, asset-type",
+					Usage: "the type of virtual asset",
+					Value: "Bitcoin",
+				},
 				&cli.StringFlag{
 					Name:  "B, beneficiary-vasp",
 					Usage: "the common name or vasp directory searchable name of the beneficiary vasp",
@@ -343,6 +348,7 @@ func transfer(c *cli.Context) (err error) {
 		Beneficiary:     c.String("beneficiary"),
 		BeneficiaryVasp: c.String("beneficiary-vasp"),
 		Amount:          float32(c.Float64("amount")),
+		AssetType:       c.String("asset-type"),
 		ExternalDemo:    c.Bool("external-demo"),
 	}
 

lib/python/rvaspy/rvaspy/api_pb2_grpc.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-import rvaspy.api_pb2 as api__pb2
+import api_pb2 as api__pb2
 
 
 class TRISADemoStub(object):

pkg/rvasp/db/db.go

@@ -259,6 +259,7 @@ type Transaction struct {
 	BeneficiaryID uint                `gorm:"column:beneficiary_id;not null"`
 	Beneficiary   Identity            `gorm:"foreignKey:BeneficiaryID"`
 	Amount        decimal.Decimal     `gorm:"type:decimal(15,8)"`
+	AssetType     string              `gorm:"not null"`
 	Debit         bool                `gorm:"not null"`
 	State         pb.TransactionState `gorm:"not null;default:0"`
 	StateString   string              `gorm:"column:state_string;not null"`
@@ -284,7 +285,7 @@ func (t *Transaction) SetState(state pb.TransactionState) {
 
 // Identity holds raw data for an originator or a beneficiary that was sent as
 // part of the transaction process. This should not be stored in the wallet since the
-// wallet is a representation of the local VASPs knowledge about customers and bercause
+// wallet is a representation of the local VASPs knowledge about customers and because
 // the identity information could change between transactions. This intermediate table
 // is designed to more closely mimic data storage as part of a blockchain transaction.
 type Identity struct {
@@ -301,7 +302,7 @@ func (Identity) TableName() string {
 	return "identities"
 }
 
-// BalanceFloat converts the balance decmial into an exact two precision float32 for
+// BalanceFloat converts the balance decimal into an exact two precision float32 for
 // use with the protocol buffers.
 func (a Account) BalanceFloat() float32 {
 	bal, _ := a.Balance.Truncate(2).Float64()
@@ -364,7 +365,7 @@ func (t Transaction) GetBeneficiary(db *DB) (identity *Identity, err error) {
 	return identity, nil
 }
 
-// AmountFloat converts the amount decmial into an exact two precision float32 for
+// AmountFloat converts the amount decimal into an exact two precision float32 for
 // use with the protocol buffers.
 func (t Transaction) AmountFloat() float32 {
 	bal, _ := t.Amount.Truncate(2).Float64()

pkg/rvasp/rvasp.go

@@ -203,6 +203,7 @@ func (s *Server) Transfer(ctx context.Context, req *pb.TransferRequest) (reply *
 	}
 	xfer.Account = account
 	xfer.Amount = decimal.NewFromFloat32(req.Amount)
+	xfer.AssetType = req.AssetType
 	xfer.Debit = true
 
 	// Run the scenario for the wallet's configured policy
@@ -314,7 +315,7 @@ func (s *Server) sendTransfer(xfer *db.Transaction, beneficiary *db.Wallet, part
 	// Fetch the signing key
 	var signKey *rsa.PublicKey
 	if signKey, err = s.fetchSigningKey(peer); err != nil {
-		log.Warn().Err(err).Msg("could not fetch signing key from benficiary peer")
+		log.Warn().Err(err).Msg("could not fetch signing key from beneficiary peer")
 		return status.Errorf(codes.FailedPrecondition, "could not fetch signing key from beneficiary peer: %s", err)
 	}
 
@@ -336,6 +337,7 @@ func (s *Server) sendTransfer(xfer *db.Transaction, beneficiary *db.Wallet, part
 		Originator:  xfer.Account.WalletAddress,
 		Beneficiary: beneficiary.Address,
 		Network:     "TestNet",
+		AssetType:   xfer.AssetType,
 		Timestamp:   xfer.Timestamp.Format(time.RFC3339),
 	}
 
@@ -593,7 +595,7 @@ func (s *Server) respondAsync(peer *peers.Peer, payload *protocol.Payload, ident
 		}
 		xfer.SetState(pb.TransactionState_COMPLETED)
 	default:
-		log.Error().Str("state", xfer.State.String()).Msg("unepected transaction state")
+		log.Error().Str("state", xfer.State.String()).Msg("unexpected transaction state")
 		return nil, protocol.Errorf(protocol.ComplianceCheckFail, "unexpected transaction state: %s", xfer.State.String())
 	}
 
@@ -924,7 +926,7 @@ func (s *Server) handleTransaction(client string, req *pb.Command) (err error) {
 	if signKey, err = peer.ExchangeKeys(true); err != nil {
 		log.Error().Err(err).Msg("could not exchange keys with remote peer")
 		return s.updates.SendTransferError(client, req.Id,
-			pb.Errorf(pb.ErrInternal, "could not exchange keyrs with remote peer"),
+			pb.Errorf(pb.ErrInternal, "could not exchange keys with remote peer"),
 		)
 	}
 
@@ -1107,7 +1109,7 @@ func (s *Server) handleTransaction(client string, req *pb.Command) (err error) {
 		)
 	}
 
-	message = fmt.Sprintf("transaction %04d complete: %s transfered from %s to %s", xfer.ID, xfer.Amount.String(), xfer.Originator.WalletAddress, xfer.Beneficiary.WalletAddress)
+	message = fmt.Sprintf("transaction %04d complete: %s transferred from %s to %s", xfer.ID, xfer.Amount.String(), xfer.Originator.WalletAddress, xfer.Beneficiary.WalletAddress)
 	s.updates.Broadcast(req.Id, message, pb.MessageCategory_BLOCKCHAIN)
 	time.Sleep(time.Duration(rand.Int63n(1000)) * time.Millisecond)
 

proto/rvasp/v1/api.proto

@@ -44,7 +44,7 @@ message Transaction {
     Account beneficiary = 2;    // Target described by wallet address or email of beneficiary
     float amount = 3;           // amount of the transaction
     string timestamp = 4;       // timestamp of completion on the account provider side
-    string envelope_id = 5;        // envelope ID from TRISA (not included between TRISA peers)
+    string envelope_id = 5;     // envelope ID from TRISA (not included between TRISA peers)
     string identity = 6;        // identity payload from TRISA (not included between TRISA peers)
     TransactionState state = 7; // state of the transaction
 }
@@ -74,6 +74,7 @@ message TransferRequest {
     string beneficiary_vasp = 5;  // common name of the beneficiary VASP for demo UI error handling or external demo lookup (optional if external_demo is false)
     bool check_beneficiary = 6;   // if set, confirm that the beneficiary wallet belongs to the beneficiary VASP (optional)
     bool external_demo = 7;       // if true, beneficiary is resolved via beneficiary_vasp common name and the directory service
+    string asset_type = 8;        // the type of virtual asset for multi-asset chains
 }
 
 // The transfer reply will contain the details of the transaction initiated or completed