TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-05-03 01:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

rpc: fix adding extra network fee to tx

Browse source
This commit is contained in:
Anna Shaleva 2020-07-06 10:49:24 +03:00
parent 3c551788c9
commit 966ad8a0b1
2 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pkg/rpc/client/rpc.go
View file

@ -449,7 +449,7 @@ func (c *Client) SignAndPushInvocationTx(script []byte, acc *wallet.Account, sys
}
tx.Sender = addr
err = c.AddNetworkFee(tx, acc)
err = c.AddNetworkFee(tx, int64(netfee), acc)
if err != nil {
return txHash, errors.Wrapf(err, "failed to add network fee")
}
@ -512,8 +512,9 @@ func (c *Client) CalculateValidUntilBlock() (uint32, error) {
return blockCount + validatorsCount, nil
}
// AddNetworkFee adds network fee for each witness script to transaction.
func (c *Client) AddNetworkFee(tx *transaction.Transaction, acc *wallet.Account) error {
// AddNetworkFee adds network fee for each witness script and optional extra
// network fee to transaction.
func (c *Client) AddNetworkFee(tx *transaction.Transaction, extraFee int64, acc *wallet.Account) error {
size := io.GetVarSize(tx)
if acc.Contract != nil {
netFee, sizeDelta := core.CalculateNetworkFee(acc.Contract.Script)
@ -540,6 +541,6 @@ func (c *Client) AddNetworkFee(tx *transaction.Transaction, acc *wallet.Account)
if err != nil {
return err
}
tx.NetworkFee += int64(size) * fee
tx.NetworkFee += int64(size)*fee + extraFee
return nil
}