modify calculate tx fee

[bytom/vapor.git] / blockchain / txbuilder / finalize.go

diff --git a/blockchain/txbuilder/finalize.go b/blockchain/txbuilder/finalize.go
index a8e002a..577830f 100644 (file)
--- a/blockchain/txbuilder/finalize.go
+++ b/blockchain/txbuilder/finalize.go
@@ -4,9 +4,10 @@ import (
        "bytes"
        "context"
 
-       "github.com/vapor/common/compute"
+       "github.com/vapor/common/arithmetic"
        cfg "github.com/vapor/config"
        "github.com/vapor/errors"
+       "github.com/vapor/math/checked"
        "github.com/vapor/protocol"
        "github.com/vapor/protocol/bc/types"
        "github.com/vapor/protocol/vm"
@@ -31,7 +32,9 @@ var (
 // assembles a fully signed tx, and stores the effects of
 // its changes on the UTXO set.
 func FinalizeTx(ctx context.Context, c *protocol.Chain, tx *types.Tx) error {
-       if fee := compute.CalculateTxFee(tx); fee > cfg.CommonConfig.Wallet.MaxTxFee {
+       if fee, err := arithmetic.CalculateTxFee(tx); err != nil {
+               return checked.ErrOverflow
+       } else if fee > cfg.CommonConfig.Wallet.MaxTxFee {
                return ErrExtTxFee
        }