mirror of
https://github.com/nspcc-dev/neo-go.git
synced 2024-12-05 03:58:23 +00:00
Merge pull request #1393 from nspcc-dev/tx-set-vout-position
transaction: set output position when decoding
This commit is contained in:
commit
75ed6c8c08
3 changed files with 32 additions and 4 deletions
|
@ -117,6 +117,7 @@ func (t *Transaction) DecodeBinary(br *io.BinReader) {
|
|||
br.Err = errors.New("negative output")
|
||||
return
|
||||
}
|
||||
t.Outputs[i].Position = i
|
||||
}
|
||||
br.ReadArray(&t.Scripts)
|
||||
|
||||
|
|
|
@ -30,10 +30,6 @@ type TransactionMetadata struct {
|
|||
func NewTransactionOutputRaw(tx *transaction.Transaction, header *block.Header, chain core.Blockchainer) TransactionOutputRaw {
|
||||
// confirmations formula
|
||||
confirmations := int(chain.BlockHeight() - header.Base.Index + 1)
|
||||
// set index position
|
||||
for i, o := range tx.Outputs {
|
||||
o.Position = i
|
||||
}
|
||||
return TransactionOutputRaw{
|
||||
Transaction: tx,
|
||||
TransactionMetadata: TransactionMetadata{
|
||||
|
|
|
@ -1086,6 +1086,37 @@ func testRPCProtocol(t *testing.T, doRPCCall func(string, string, *testing.T) []
|
|||
assert.Equal(t, TXHash, actual.Transaction.Hash())
|
||||
})
|
||||
|
||||
t.Run("getrawtransaction verbose, check outputs", func(t *testing.T) {
|
||||
block, _ := chain.GetBlock(chain.GetHeaderHash(1))
|
||||
TXHash := block.Transactions[1].Hash()
|
||||
rpc := fmt.Sprintf(`{"jsonrpc": "2.0", "id": 1, "method": "getrawtransaction", "params": ["%s", 1]}"`, TXHash.StringLE())
|
||||
body := doRPCCall(rpc, httpSrv.URL, t)
|
||||
txOut := checkErrGetResult(t, body, false)
|
||||
actual := result.TransactionOutputRaw{}
|
||||
err := json.Unmarshal(txOut, &actual)
|
||||
require.NoErrorf(t, err, "could not parse response: %s", txOut)
|
||||
neoID := core.GoverningTokenID()
|
||||
multiAddr, err := util.Uint160DecodeStringBE("be48d3a3f5d10013ab9ffee489706078714f1ea2")
|
||||
require.NoError(t, err)
|
||||
singleAddr, err := keys.NewPrivateKeyFromWIF("KxyjQ8eUa4FHt3Gvioyt1Wz29cTUrE4eTqX3yFSk1YFCsPL8uNsY")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, transaction.ContractType, actual.Transaction.Type)
|
||||
assert.Equal(t, []transaction.Output{
|
||||
{
|
||||
AssetID: neoID,
|
||||
Amount: util.Fixed8FromInt64(99999000),
|
||||
ScriptHash: singleAddr.GetScriptHash(),
|
||||
Position: 0,
|
||||
},
|
||||
{
|
||||
AssetID: neoID,
|
||||
Amount: util.Fixed8FromInt64(1000),
|
||||
ScriptHash: multiAddr,
|
||||
Position: 1,
|
||||
},
|
||||
}, actual.Transaction.Outputs)
|
||||
})
|
||||
|
||||
t.Run("gettxout", func(t *testing.T) {
|
||||
block, _ := chain.GetBlock(chain.GetHeaderHash(0))
|
||||
tx := block.Transactions[3]
|
||||
|
|
Loading…
Reference in a new issue