add free gas (#295)

[bytom/vapor.git] / protocol / validation / tx.go

diff --git a/protocol/validation/tx.go b/protocol/validation/tx.go
index 8a5bf14..d360854 100644 (file)
--- a/protocol/validation/tx.go
+++ b/protocol/validation/tx.go
@@ -58,17 +58,20 @@ func (g *GasState) setGas(BTMValue int64, txSize int64) error {
        }
 
        g.BTMValue = uint64(BTMValue)
-
        var ok bool
-       if g.GasLeft, ok = checked.DivInt64(BTMValue, consensus.VMGasRate); !ok {
+       if g.GasLeft, ok = checked.DivInt64(BTMValue, consensus.ActiveNetParams.VMGasRate); !ok {
                return errors.Wrap(ErrGasCalculate, "setGas calc gas amount")
        }
 
-       if g.GasLeft > consensus.MaxGasAmount {
-               g.GasLeft = consensus.MaxGasAmount
+       if g.GasLeft, ok = checked.AddInt64(g.GasLeft, consensus.ActiveNetParams.DefaultGasCredit); !ok {
+               return errors.Wrap(ErrGasCalculate, "setGas calc free gas")
+       }
+
+       if g.GasLeft > consensus.ActiveNetParams.MaxGasAmount {
+               g.GasLeft = consensus.ActiveNetParams.MaxGasAmount
        }
 
-       if g.StorageGas, ok = checked.MulInt64(txSize, consensus.StorageGasRate); !ok {
+       if g.StorageGas, ok = checked.MulInt64(txSize, consensus.ActiveNetParams.StorageGasRate); !ok {
                return errors.Wrap(ErrGasCalculate, "setGas calc tx storage gas")
        }
        return nil
@@ -100,7 +103,7 @@ func (g *GasState) updateUsage(gasLeft int64) error {
                return errors.Wrap(ErrGasCalculate, "updateUsage calc gas diff")
        }
 
-       if !g.GasValid && (g.GasUsed > consensus.DefaultGasCredit || g.StorageGas > g.GasLeft) {
+       if !g.GasValid && (g.GasUsed > consensus.ActiveNetParams.DefaultGasCredit || g.StorageGas > g.GasLeft) {
                return ErrOverGasCredit
        }
        return nil
@@ -172,16 +175,19 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
                        parity[*dest.Value.AssetId] = diff
                }
 
+               btmAmount := int64(0)
                for assetID, amount := range parity {
                        if assetID == *consensus.BTMAssetID {
-                               if err = vs.gasStatus.setGas(amount, int64(vs.tx.SerializedSize)); err != nil {
-                                       return err
-                               }
+                               btmAmount = amount
                        } else if amount != 0 {
                                return errors.WithDetailf(ErrUnbalanced, "asset %x sources - destinations = %d (should be 0)", assetID.Bytes(), amount)
                        }
                }
 
+               if err = vs.gasStatus.setGas(btmAmount, int64(vs.tx.SerializedSize)); err != nil {
+                       return err
+               }
+
                for _, BTMInputID := range vs.tx.GasInputIDs {
                        e, ok := vs.tx.Entries[BTMInputID]
                        if !ok {
@@ -238,9 +244,6 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
                if err = checkValidSrc(&vs2, e.Source); err != nil {
                        return errors.Wrap(err, "checking vote output source")
                }
-               if e.Source.Value.Amount < consensus.MinVoteOutputAmount {
-                       return ErrVoteOutputAmount
-               }
 
        case *bc.Retirement:
                vs2 := *vs
@@ -269,7 +272,7 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
                        Code:      config.FederationWScript(config.CommonConfig),
                }
 
-               if _, err := vm.Verify(NewTxVMContext(vs, e, prog, e.WitnessArguments), consensus.DefaultGasCredit); err != nil {
+               if _, err := vm.Verify(NewTxVMContext(vs, e, prog, e.WitnessArguments), consensus.ActiveNetParams.DefaultGasCredit); err != nil {
                        return errors.Wrap(err, "checking cross-chain input control program")
                }
 
@@ -385,7 +388,7 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
                        return ErrWrongCoinbaseAsset
                }
 
-               if e.Arbitrary != nil && len(e.Arbitrary) > consensus.CoinbaseArbitrarySizeLimit {
+               if e.Arbitrary != nil && len(e.Arbitrary) > consensus.ActiveNetParams.CoinbaseArbitrarySizeLimit {
                        return ErrCoinbaseArbitraryOversize
                }