forked from TrueCloudLab/neoneo-go
rpc/server: use strings for sys and net fees in TransferTx
The same they're displayed for transactions.
This commit is contained in:
parent
08782e265b
commit
b8705bdb79
4 changed files with 56 additions and 57 deletions
99
docs/rpc.md
99
docs/rpc.md
|
@ -151,38 +151,37 @@ Reply:
|
||||||
"result" : [
|
"result" : [
|
||||||
{
|
{
|
||||||
"txid" : "0x1cb7e089bb52cabb35c480de9d99c41c6fea7f5a276b41d71ab3fc7c470dcb74",
|
"txid" : "0x1cb7e089bb52cabb35c480de9d99c41c6fea7f5a276b41d71ab3fc7c470dcb74",
|
||||||
|
"net_fee" : "0",
|
||||||
"events" : [
|
"events" : [
|
||||||
{
|
{
|
||||||
"type" : "send",
|
|
||||||
"asset" : "3a4acd3647086e7c44398aac0349802e6a171129",
|
"asset" : "3a4acd3647086e7c44398aac0349802e6a171129",
|
||||||
"value" : "20000000000",
|
"type" : "send",
|
||||||
"address" : "ALuZLuuDssJqG2E4foANKwbLamYHuffFjg"
|
"address" : "ALuZLuuDssJqG2E4foANKwbLamYHuffFjg",
|
||||||
|
"value" : "20000000000"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"net_fee" : 0,
|
"sys_fee" : "0",
|
||||||
"block_index" : 6163114,
|
|
||||||
"timestamp" : 1600094117,
|
"timestamp" : 1600094117,
|
||||||
"sys_fee" : 0
|
"block_index" : 6163114
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"block_index" : 6162995,
|
"block_index" : 6162995,
|
||||||
"net_fee" : 0,
|
|
||||||
"timestamp" : 1600092165,
|
"timestamp" : 1600092165,
|
||||||
|
"sys_fee" : "0",
|
||||||
"events" : [
|
"events" : [
|
||||||
{
|
{
|
||||||
|
"asset" : "3a4acd3647086e7c44398aac0349802e6a171129",
|
||||||
"address" : "ALuZLuuDssJqG2E4foANKwbLamYHuffFjg",
|
"address" : "ALuZLuuDssJqG2E4foANKwbLamYHuffFjg",
|
||||||
"value" : "20000000000",
|
|
||||||
"type" : "receive",
|
"type" : "receive",
|
||||||
"asset" : "3a4acd3647086e7c44398aac0349802e6a171129"
|
"value" : "20000000000"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txid" : "0xc8b45480ade5395a4a239bb44eea6d86113f32090c4854b0c4aeee1b9485edab",
|
"net_fee" : "0",
|
||||||
"sys_fee" : 0
|
"txid" : "0xc8b45480ade5395a4a239bb44eea6d86113f32090c4854b0c4aeee1b9485edab"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"id" : 5
|
"id" : 5
|
||||||
}
|
}
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Another request:
|
Another request:
|
||||||
|
@ -196,18 +195,10 @@ Reply:
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
|
"jsonrpc" : "2.0",
|
||||||
|
"id" : 5,
|
||||||
"result" : [
|
"result" : [
|
||||||
{
|
{
|
||||||
"timestamp" : 1561566911,
|
|
||||||
"net_fee" : 1,
|
|
||||||
"events" : [
|
|
||||||
{
|
|
||||||
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv",
|
|
||||||
"asset" : "1578103c13e39df15d0d29826d957e85d770d8c9",
|
|
||||||
"type" : "receive",
|
|
||||||
"value" : "2380844141430"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"elements" : [
|
"elements" : [
|
||||||
{
|
{
|
||||||
"asset" : "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7",
|
"asset" : "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7",
|
||||||
|
@ -216,48 +207,56 @@ Reply:
|
||||||
"type" : "input"
|
"type" : "input"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv",
|
"value" : "0.0000083",
|
||||||
"asset" : "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7",
|
|
||||||
"type" : "output",
|
"type" : "output",
|
||||||
"value" : "0.0000083"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sys_fee" : 0,
|
|
||||||
"txid" : "0xb4f1bdb466d8bd3524502008a0bc1f9342356b4eea67be19d384845c670442a6",
|
|
||||||
"block_index" : 3929554
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"elements" : [
|
|
||||||
{
|
|
||||||
"value" : "0.00000838",
|
|
||||||
"type" : "input",
|
|
||||||
"asset" : "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7",
|
"asset" : "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7",
|
||||||
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv"
|
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv"
|
||||||
},
|
|
||||||
{
|
|
||||||
"asset" : "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7",
|
|
||||||
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv",
|
|
||||||
"value" : "0.00000837",
|
|
||||||
"type" : "output"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"events" : [
|
"events" : [
|
||||||
{
|
{
|
||||||
"asset" : "1578103c13e39df15d0d29826d957e85d770d8c9",
|
"asset" : "1578103c13e39df15d0d29826d957e85d770d8c9",
|
||||||
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv",
|
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv",
|
||||||
"value" : "2100000000",
|
"type" : "receive",
|
||||||
"type" : "receive"
|
"value" : "2380844141430"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"timestamp" : 1561566300,
|
"timestamp" : 1561566911,
|
||||||
"net_fee" : 1,
|
"net_fee" : "0.00000001",
|
||||||
|
"block_index" : 3929554,
|
||||||
|
"sys_fee" : "0",
|
||||||
|
"txid" : "0xb4f1bdb466d8bd3524502008a0bc1f9342356b4eea67be19d384845c670442a6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"txid" : "0xc045c0612b34218b7e5eaee973114af3eff925f859adf23cf953930f667cdc93",
|
||||||
|
"sys_fee" : "0",
|
||||||
"block_index" : 3929523,
|
"block_index" : 3929523,
|
||||||
"sys_fee" : 0,
|
"net_fee" : "0.00000001",
|
||||||
"txid" : "0xc045c0612b34218b7e5eaee973114af3eff925f859adf23cf953930f667cdc93"
|
"timestamp" : 1561566300,
|
||||||
|
"events" : [
|
||||||
|
{
|
||||||
|
"asset" : "1578103c13e39df15d0d29826d957e85d770d8c9",
|
||||||
|
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv",
|
||||||
|
"type" : "receive",
|
||||||
|
"value" : "2100000000"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"id" : 5,
|
"elements" : [
|
||||||
"jsonrpc" : "2.0"
|
{
|
||||||
|
"asset" : "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7",
|
||||||
|
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv",
|
||||||
|
"type" : "input",
|
||||||
|
"value" : "0.00000838"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value" : "0.00000837",
|
||||||
|
"type" : "output",
|
||||||
|
"address" : "AZCcft1uYtmZXxzHPr5tY7L6M85zG7Dsrv",
|
||||||
|
"asset" : "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -76,8 +76,8 @@ type TransferTx struct {
|
||||||
TxID util.Uint256 `json:"txid"`
|
TxID util.Uint256 `json:"txid"`
|
||||||
Timestamp uint32 `json:"timestamp"`
|
Timestamp uint32 `json:"timestamp"`
|
||||||
Index uint32 `json:"block_index"`
|
Index uint32 `json:"block_index"`
|
||||||
SystemFee int64 `json:"sys_fee"`
|
SystemFee string `json:"sys_fee"`
|
||||||
NetworkFee int64 `json:"net_fee"`
|
NetworkFee string `json:"net_fee"`
|
||||||
Elements []TransferTxEvent `json:"elements,omitempty"`
|
Elements []TransferTxEvent `json:"elements,omitempty"`
|
||||||
Events []TransferTxEvent `json:"events,omitempty"`
|
Events []TransferTxEvent `json:"events,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -935,8 +935,8 @@ func (s *Server) getAllTransferTx(ps request.Params) (interface{}, *response.Err
|
||||||
respErr = response.NewInternalServerError("invalid NEP5 transfer log", err)
|
respErr = response.NewInternalServerError("invalid NEP5 transfer log", err)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
transfer.NetworkFee = int64(s.chain.NetworkFee(tx))
|
transfer.NetworkFee = s.chain.NetworkFee(tx).String()
|
||||||
transfer.SystemFee = int64(s.chain.SystemFee(tx))
|
transfer.SystemFee = s.chain.SystemFee(tx).String()
|
||||||
|
|
||||||
inouts, err := s.chain.References(tx)
|
inouts, err := s.chain.References(tx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -1257,8 +1257,8 @@ func testRPCProtocol(t *testing.T, doRPCCall func(string, string, *testing.T) []
|
||||||
tx, h, err := e.chain.GetTransaction(id)
|
tx, h, err := e.chain.GetTransaction(id)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, h, ttx.Index)
|
require.Equal(t, h, ttx.Index)
|
||||||
require.Equal(t, int64(e.chain.SystemFee(tx)), ttx.SystemFee)
|
require.Equal(t, e.chain.SystemFee(tx).String(), ttx.SystemFee)
|
||||||
require.Equal(t, int64(e.chain.NetworkFee(tx)), ttx.NetworkFee)
|
require.Equal(t, e.chain.NetworkFee(tx).String(), ttx.NetworkFee)
|
||||||
require.Equal(t, len(tx.Inputs)+len(tx.Outputs), len(ttx.Elements))
|
require.Equal(t, len(tx.Inputs)+len(tx.Outputs), len(ttx.Elements))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue