RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary data from socket.io interface

Browse Source
This commit is contained in:
Martin Boehm 2018-03-02 16:08:08 +01:00
parent a165d71597
commit 13e08a07a9
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
server/socketio.go
View File

@ -281,16 +281,16 @@ type addressHistoryIndexes struct {
type txInputs struct { type txInputs struct {
OutputIndex int `json:"outputIndex"` OutputIndex int `json:"outputIndex"`
Script *string `json:"script"` Script *string `json:"script"`
ScriptAsm *string `json:"scriptAsm"` // ScriptAsm *string `json:"scriptAsm"`
Sequence int64 `json:"sequence"` Sequence int64 `json:"sequence"`
Address *string `json:"address"` Address *string `json:"address"`
Satoshis int64 `json:"satoshis"` Satoshis int64 `json:"satoshis"`
} }
type txOutputs struct { type txOutputs struct {
Satoshis int64 `json:"satoshis"` Satoshis int64 `json:"satoshis"`
Script *string `json:"script"` Script *string `json:"script"`
ScriptAsm *string `json:"scriptAsm"` // ScriptAsm *string `json:"scriptAsm"`
SpentTxID *string `json:"spentTxId,omitempty"` SpentTxID *string `json:"spentTxId,omitempty"`
SpentIndex int `json:"spentIndex,omitempty"` SpentIndex int `json:"spentIndex,omitempty"`
SpentHeight int `json:"spentHeight,omitempty"` SpentHeight int `json:"spentHeight,omitempty"`
@ -298,19 +298,19 @@ type txOutputs struct {
} }
type resTx struct { type resTx struct {
Hex string `json:"hex"` Hex string `json:"hex"`
BlockHash string `json:"blockHash,omitempty"` // BlockHash string `json:"blockHash,omitempty"`
Height int `json:"height"` Height int `json:"height"`
BlockTimestamp int64 `json:"blockTimestamp,omitempty"` BlockTimestamp int64 `json:"blockTimestamp,omitempty"`
Version int `json:"version"` // Version int `json:"version"`
Hash string `json:"hash"` Hash string `json:"hash"`
Locktime int `json:"locktime,omitempty"` Locktime int `json:"locktime,omitempty"`
Size int `json:"size,omitempty"` // Size int `json:"size,omitempty"`
Inputs []txInputs `json:"inputs"` Inputs []txInputs `json:"inputs"`
InputSatoshis int64 `json:"inputSatoshis,omitempty"` // InputSatoshis int64 `json:"inputSatoshis,omitempty"`
Outputs []txOutputs `json:"outputs"` Outputs []txOutputs `json:"outputs"`
OutputSatoshis int64 `json:"outputSatoshis,omitempty"` // OutputSatoshis int64 `json:"outputSatoshis,omitempty"`
FeeSatoshis int64 `json:"feeSatoshis,omitempty"` // FeeSatoshis int64 `json:"feeSatoshis,omitempty"`
} }
type addressHistoryItem struct { type addressHistoryItem struct {
@ -349,7 +349,7 @@ func txToResTx(tx *bchain.Tx, height int, hi []txInputs, ho []txOutputs) resTx {
Locktime: int(tx.LockTime), Locktime: int(tx.LockTime),
Outputs: ho, Outputs: ho,
// OutputSatoshis, // OutputSatoshis,
Version: int(tx.Version), // Version: int(tx.Version),
} }
} }
@ -365,11 +365,16 @@ func (s *SocketIoServer) getAddressHistory(addr []string, rr *reqRange) (res res
txids := txr.Result txids := txr.Result
res.Result.TotalCount = len(txids) res.Result.TotalCount = len(txids)
res.Result.Items = make([]addressHistoryItem, 0) res.Result.Items = make([]addressHistoryItem, 0)
txCache := make(map[string]*bchain.Tx, len(txids))
for i, txid := range txids { for i, txid := range txids {
if i >= rr.From && i < rr.To { if i >= rr.From && i < rr.To {
tx, err := s.chain.GetTransaction(txid) tx, ok := txCache[txid]
if err != nil { if !ok {
return res, err tx, err = s.chain.GetTransaction(txid)
if err != nil {
return res, err
}
txCache[txid] = tx
} }
ads := make(map[string]addressHistoryIndexes) ads := make(map[string]addressHistoryIndexes)
hi := make([]txInputs, 0) hi := make([]txInputs, 0)
@ -377,14 +382,17 @@ func (s *SocketIoServer) getAddressHistory(addr []string, rr *reqRange) (res res
for _, vin := range tx.Vin { for _, vin := range tx.Vin {
ai := txInputs{ ai := txInputs{
Script: &vin.ScriptSig.Hex, Script: &vin.ScriptSig.Hex,
ScriptAsm: &vin.ScriptSig.Asm,
Sequence: int64(vin.Sequence), Sequence: int64(vin.Sequence),
OutputIndex: int(vin.Vout), OutputIndex: int(vin.Vout),
} }
if vin.Txid != "" { if vin.Txid != "" {
otx, err := s.chain.GetTransaction(vin.Txid) otx, ok := txCache[vin.Txid]
if err != nil { if !ok {
return res, err otx, err = s.chain.GetTransaction(vin.Txid)
if err != nil {
return res, err
}
txCache[vin.Txid] = otx
} }
if len(otx.Vout) > int(vin.Vout) { if len(otx.Vout) > int(vin.Vout) {
vout := otx.Vout[vin.Vout] vout := otx.Vout[vin.Vout]
@ -412,7 +420,6 @@ func (s *SocketIoServer) getAddressHistory(addr []string, rr *reqRange) (res res
ao := txOutputs{ ao := txOutputs{
Satoshis: int64(vout.Value * 1E8), Satoshis: int64(vout.Value * 1E8),
Script: &vout.ScriptPubKey.Hex, Script: &vout.ScriptPubKey.Hex,
ScriptAsm: &vout.ScriptPubKey.Asm,
SpentIndex: int(vout.N), SpentIndex: int(vout.N),
} }
if len(vout.ScriptPubKey.Addresses) == 1 { if len(vout.ScriptPubKey.Addresses) == 1 {
@ -606,7 +613,6 @@ func (s *SocketIoServer) getDetailedTransaction(txid string) (res resultGetDetai
for _, vin := range tx.Vin { for _, vin := range tx.Vin {
ai := txInputs{ ai := txInputs{
Script: &vin.ScriptSig.Hex, Script: &vin.ScriptSig.Hex,
ScriptAsm: &vin.ScriptSig.Asm,
Sequence: int64(vin.Sequence), Sequence: int64(vin.Sequence),
OutputIndex: int(vin.Vout), OutputIndex: int(vin.Vout),
} }
@ -629,7 +635,6 @@ func (s *SocketIoServer) getDetailedTransaction(txid string) (res resultGetDetai
ao := txOutputs{ ao := txOutputs{
Satoshis: int64(vout.Value * 1E8), Satoshis: int64(vout.Value * 1E8),
Script: &vout.ScriptPubKey.Hex, Script: &vout.ScriptPubKey.Hex,
ScriptAsm: &vout.ScriptPubKey.Asm,
SpentIndex: int(vout.N), SpentIndex: int(vout.N),
} }
if len(vout.ScriptPubKey.Addresses) == 1 { if len(vout.ScriptPubKey.Addresses) == 1 {