diff --git a/api/types.go b/api/types.go index 0d21a284..cd1c7450 100644 --- a/api/types.go +++ b/api/types.go @@ -93,11 +93,12 @@ type Vin struct { Sequence int64 `json:"sequence,omitempty"` N int `json:"n"` AddrDesc bchain.AddressDescriptor `json:"-"` - Addresses []string `json:"addresses"` + Addresses []string `json:"addresses,omitempty"` Searchable bool `json:"-"` ValueSat *Amount `json:"value,omitempty"` Hex string `json:"hex,omitempty"` Asm string `json:"asm,omitempty"` + Coinbase string `json:"coinbase,omitempty"` } // Vout contains information about single transaction output @@ -165,7 +166,6 @@ type Tx struct { Blockhash string `json:"blockhash,omitempty"` Blockheight int `json:"blockheight"` Confirmations uint32 `json:"confirmations"` - Time int64 `json:"time,omitempty"` Blocktime int64 `json:"blocktime"` Size int `json:"size,omitempty"` ValueOutSat *Amount `json:"value"` @@ -205,7 +205,7 @@ type AddressFilter struct { // Address holds information about address and its transactions type Address struct { Paging - AddrStr string `json:"addrStr"` + AddrStr string `json:"address"` BalanceSat *Amount `json:"balance"` TotalReceivedSat *Amount `json:"totalReceived,omitempty"` TotalSentSat *Amount `json:"totalSent,omitempty"` diff --git a/api/typesv1.go b/api/typesv1.go index d80e0372..52703d49 100644 --- a/api/typesv1.go +++ b/api/typesv1.go @@ -154,7 +154,7 @@ func (w *Worker) TxToV1(tx *Tx) *TxV1 { Hex: tx.Hex, Locktime: tx.Locktime, Size: tx.Size, - Time: tx.Time, + Time: tx.Blocktime, Txid: tx.Txid, ValueIn: tx.ValueInSat.DecimalString(d), ValueInSat: tx.ValueInSat.AsBigInt(), diff --git a/api/worker.go b/api/worker.go index f538683c..9318ef5a 100644 --- a/api/worker.go +++ b/api/worker.go @@ -145,6 +145,7 @@ func (w *Worker) GetTransactionFromBchainTx(bchainTx *bchain.Tx, height uint32, vin.Vout = bchainVin.Vout vin.Sequence = int64(bchainVin.Sequence) vin.Hex = bchainVin.ScriptSig.Hex + vin.Coinbase = bchainVin.Coinbase if w.chainType == bchain.ChainBitcoinType { // bchainVin.Txid=="" is coinbase transaction if bchainVin.Txid != "" { @@ -298,7 +299,6 @@ func (w *Worker) GetTransactionFromBchainTx(bchainTx *bchain.Tx, height uint32, Confirmations: bchainTx.Confirmations, FeesSat: (*Amount)(&feesSat), Locktime: bchainTx.LockTime, - Time: bchainTx.Time, Txid: bchainTx.Txid, ValueInSat: (*Amount)(pValInSat), ValueOutSat: (*Amount)(&valOutSat), @@ -449,7 +449,6 @@ func (w *Worker) txFromTxAddress(txid string, ta *db.TxAddresses, bi *db.BlockIn Blocktime: bi.Time, Confirmations: bestheight - ta.Height + 1, FeesSat: (*Amount)(&feesSat), - Time: bi.Time, Txid: txid, ValueInSat: (*Amount)(&valInSat), ValueOutSat: (*Amount)(&valOutSat), diff --git a/server/public_test.go b/server/public_test.go index 7bb9f440..525a7248 100644 --- a/server/public_test.go +++ b/server/public_test.go @@ -397,7 +397,7 @@ func httpTests_BitcoinType(t *testing.T, ts *httptest.Server) { status: http.StatusOK, contentType: "application/json; charset=utf-8", body: []string{ - `{"txid":"05e2e48aeabdd9b75def7b48d756ba304713c2aba7b522bf9dbc893fc4231b07","vin":[{"txid":"effd9ef509383d536b1c8af5bf434c8efbf521a4f2befd4022bbd68694b4ac75","vout":2,"n":0,"addresses":["2NEVv9LJmAnY99W1pFoc5UJjVdypBqdnvu1"],"value":"9876"}],"vout":[{"value":"9000","n":0,"hex":"a914e921fc4912a315078f370d959f2c4f7b6d2a683c87","addresses":["2NEVv9LJmAnY99W1pFoc5UJjVdypBqdnvu1"]}],"blockhash":"00000000eb0443fd7dc4a1ed5c686a8e995057805f9a161d9a5a77a95e72b7b6","blockheight":225494,"confirmations":1,"time":22549400002,"blocktime":22549400002,"value":"9000","valueIn":"9876","fees":"876"}`, + `{"txid":"05e2e48aeabdd9b75def7b48d756ba304713c2aba7b522bf9dbc893fc4231b07","vin":[{"txid":"effd9ef509383d536b1c8af5bf434c8efbf521a4f2befd4022bbd68694b4ac75","vout":2,"n":0,"addresses":["2NEVv9LJmAnY99W1pFoc5UJjVdypBqdnvu1"],"value":"9876"}],"vout":[{"value":"9000","n":0,"hex":"a914e921fc4912a315078f370d959f2c4f7b6d2a683c87","addresses":["2NEVv9LJmAnY99W1pFoc5UJjVdypBqdnvu1"]}],"blockhash":"00000000eb0443fd7dc4a1ed5c686a8e995057805f9a161d9a5a77a95e72b7b6","blockheight":225494,"confirmations":1,"blocktime":22549400002,"value":"9000","valueIn":"9876","fees":"876"}`, }, }, { @@ -433,7 +433,7 @@ func httpTests_BitcoinType(t *testing.T, ts *httptest.Server) { status: http.StatusOK, contentType: "application/json; charset=utf-8", body: []string{ - `{"page":1,"totalPages":1,"itemsOnPage":1000,"addrStr":"mv9uLThosiEnGRbVPS7Vhyw6VssbVRsiAw","balance":"0","totalReceived":"1234567890123","totalSent":"1234567890123","unconfirmedBalance":"0","unconfirmedTxs":0,"txs":2,"txids":["7c3be24063f268aaa1ed81b64776798f56088757641a34fb156c4f51ed2e9d25","effd9ef509383d536b1c8af5bf434c8efbf521a4f2befd4022bbd68694b4ac75"]}`, + `{"page":1,"totalPages":1,"itemsOnPage":1000,"address":"mv9uLThosiEnGRbVPS7Vhyw6VssbVRsiAw","balance":"0","totalReceived":"1234567890123","totalSent":"1234567890123","unconfirmedBalance":"0","unconfirmedTxs":0,"txs":2,"txids":["7c3be24063f268aaa1ed81b64776798f56088757641a34fb156c4f51ed2e9d25","effd9ef509383d536b1c8af5bf434c8efbf521a4f2befd4022bbd68694b4ac75"]}`, }, }, {