decode-raw-transaction API add tx_id and txinput add input_id (#1130)

diff --git a/api/query.go b/api/query.go
index 632e83b..1db5929 100644 (file)
--- a/api/query.go
+++ b/api/query.go
@@ -188,6 +188,7 @@ func (a *API) listUnconfirmedTxs(ctx context.Context) Response {
 
 // RawTx is the tx struct for getRawTransaction
 type RawTx struct {
+       ID        bc.Hash                  `json:"tx_id"`
        Version   uint64                   `json:"version"`
        Size      uint64                   `json:"size"`
        TimeRange uint64                   `json:"time_range"`
@@ -201,6 +202,7 @@ func (a *API) decodeRawTransaction(ctx context.Context, ins struct {
        Tx types.Tx `json:"raw_transaction"`
 }) Response {
        tx := &RawTx{
+               ID:        ins.Tx.ID,
                Version:   ins.Tx.Version,
                Size:      ins.Tx.SerializedSize,
                TimeRange: ins.Tx.TimeRange,

diff --git a/blockchain/query/annotated.go b/blockchain/query/annotated.go
index 6e94c21..c4a54ad 100644 (file)
--- a/blockchain/query/annotated.go
+++ b/blockchain/query/annotated.go
@@ -36,6 +36,7 @@ type AnnotatedInput struct {
        AccountID       string             `json:"account_id,omitempty"`
        AccountAlias    string             `json:"account_alias,omitempty"`
        Arbitrary       chainjson.HexBytes `json:"arbitrary,omitempty"`
+       InputID         bc.Hash            `json:"input_id"`
 }
 
 //AnnotatedOutput means an annotated transaction output.

diff --git a/wallet/annotated.go b/wallet/annotated.go
index 27c3bfe..aca87a1 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -204,6 +204,7 @@ func (w *Wallet) BuildAnnotatedInput(tx *types.Tx, i uint32) *query.AnnotatedInp
        }
 
        id := tx.Tx.InputIDs[i]
+       in.InputID = id
        e := tx.Entries[id]
        switch e := e.(type) {
        case *bc.Spend: