Skip to content

Commit

Permalink
Add extra data to basic transfer and diamond txn construction endpoin…
Browse files Browse the repository at this point in the history
…ts (#516)
  • Loading branch information
lazynina authored Dec 20, 2023
1 parent c407d81 commit 253ad8c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
2 changes: 1 addition & 1 deletion routes/exchange.go
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ func (fes *APIServer) APITransferDeSo(ww http.ResponseWriter, rr *http.Request)
if transferDeSoRequest.AmountNanos < 0 {
// Create a MAX transaction
txnn, totalInputt, spendAmountt, feeNanoss, err = fes.blockchain.CreateMaxSpend(
senderPublicKeyBytes, recipientPub.SerializeCompressed(),
senderPublicKeyBytes, recipientPub.SerializeCompressed(), nil,
uint64(minFeeRateNanosPerKB),
fes.backendServer.GetMempool(), additionalOutputs)
if err != nil {
Expand Down
30 changes: 25 additions & 5 deletions routes/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -993,10 +993,11 @@ func (fes *APIServer) ExceedsDeSoBalance(nanosPurchased uint64, seed string) (bo

// SendDeSoRequest ...
type SendDeSoRequest struct {
SenderPublicKeyBase58Check string `safeForLogging:"true"`
RecipientPublicKeyOrUsername string `safeForLogging:"true"`
AmountNanos int64 `safeForLogging:"true"`
MinFeeRateNanosPerKB uint64 `safeForLogging:"true"`
SenderPublicKeyBase58Check string `safeForLogging:"true"`
RecipientPublicKeyOrUsername string `safeForLogging:"true"`
AmountNanos int64 `safeForLogging:"true"`
MinFeeRateNanosPerKB uint64 `safeForLogging:"true"`
ExtraData map[string]string `safeForLogging:"true"`

// No need to specify ProfileEntryResponse in each TransactionFee
TransactionFees []TransactionFee `safeForLogging:"true"`
Expand Down Expand Up @@ -1074,6 +1075,12 @@ func (fes *APIServer) SendDeSo(ww http.ResponseWriter, req *http.Request) {
return
}

extraData, err := EncodeExtraDataMap(requestData.ExtraData)
if err != nil {
_AddBadRequestError(ww, fmt.Sprintf("SendDeSo: Problem encoding ExtraData: %v", err))
return
}

// If the AmountNanos is less than zero then we have a special case where we create
// a transaction with the maximum spend.
var txnn *lib.MsgDeSoTxn
Expand All @@ -1084,7 +1091,7 @@ func (fes *APIServer) SendDeSo(ww http.ResponseWriter, req *http.Request) {
if requestData.AmountNanos < 0 {
// Create a MAX transaction
txnn, totalInputt, spendAmountt, feeNanoss, err = fes.blockchain.CreateMaxSpend(
senderPkBytes, recipientPkBytes, requestData.MinFeeRateNanosPerKB,
senderPkBytes, recipientPkBytes, extraData, requestData.MinFeeRateNanosPerKB,
fes.backendServer.GetMempool(), additionalOutputs)
if err != nil {
_AddBadRequestError(ww, fmt.Sprintf("SendDeSo: Error processing MAX transaction: %v", err))
Expand Down Expand Up @@ -1115,6 +1122,10 @@ func (fes *APIServer) SendDeSo(ww http.ResponseWriter, req *http.Request) {
// inputs and change.
}

if len(extraData) > 0 {
txnn.ExtraData = extraData
}

// Add inputs to the transaction and do signing, validation, and broadcast
// depending on what the user requested.
totalInputt, spendAmountt, changeAmountt, feeNanoss, err =
Expand Down Expand Up @@ -2116,6 +2127,8 @@ type SendDiamondsRequest struct {

MinFeeRateNanosPerKB uint64 `safeForLogging:"true"`

ExtraData map[string]string `safeForLogging:"true"`

// No need to specify ProfileEntryResponse in each TransactionFee
TransactionFees []TransactionFee `safeForLogging:"true"`

Expand Down Expand Up @@ -2191,6 +2204,12 @@ func (fes *APIServer) SendDiamonds(ww http.ResponseWriter, req *http.Request) {
return
}

extraData, err := EncodeExtraDataMap(requestData.ExtraData)
if err != nil {
_AddBadRequestError(ww, fmt.Sprintf("SendDiamonds: Problem encoding extra data: %v", err))
return
}

// Try and create the transfer with diamonds for the user.
// We give diamonds in DESO if we're past the corresponding block height.
blockHeight := fes.blockchain.BlockTip().Height + 1
Expand All @@ -2210,6 +2229,7 @@ func (fes *APIServer) SendDiamonds(ww http.ResponseWriter, req *http.Request) {
senderPublicKeyBytes,
diamondPostHash,
requestData.DiamondLevel,
extraData,
// Standard transaction fields
requestData.MinFeeRateNanosPerKB, fes.backendServer.GetMempool(), additionalOutputs)
if err != nil {
Expand Down

0 comments on commit 253ad8c

Please sign in to comment.