Merge branch 'tomoX' of github.com:tomochain/tomochain into tomoX

Author: thanhson1085

common/constants.go

@@ -41,7 +41,8 @@ var TomoXBaseFee = big.NewInt(1000)
 var MinGasPrice = big.NewInt(DefaultMinGasPrice)
 var TRC21IssuerSMCTestNet = HexToAddress("0x7081C72c9DC44686C7B7EAB1d338EA137Fa9f0D3")
 var TRC21IssuerSMC = HexToAddress("0x8c0faeb5C6bEd2129b8674F262Fd45c4e9468bee")
-var TRC21GasPrice = big.NewInt(DefaultMinGasPrice)
+var TRC21GasPriceBefore = big.NewInt(2500)
+var TRC21GasPrice = big.NewInt(250000000)
 var Blacklist = map[Address]bool{
 	HexToAddress("0x5248bfb72fd4f234e062d3e9bb76f08643004fcd"): true,
 	HexToAddress("0x5ac26105b35ea8935be382863a70281ec7a985e9"): true,

core/state_processor.go

@@ -205,7 +205,7 @@ func ApplyTransaction(config *params.ChainConfig, tokensFee map[common.Address]*
 			balanceFee = value
 		}
 	}
-	msg, err := tx.AsMessage(types.MakeSigner(config, header.Number), balanceFee)
+	msg, err := tx.AsMessage(types.MakeSigner(config, header.Number), balanceFee,header.Number)
 	if err != nil {
 		return nil, 0, err, false
 	}

core/types/transaction.go

@@ -241,7 +241,7 @@ func (tx *Transaction) Size() common.StorageSize {
 // AsMessage requires a signer to derive the sender.
 //
 // XXX Rename message to something less arbitrary?
-func (tx *Transaction) AsMessage(s Signer, balanceFee *big.Int) (Message, error) {
+func (tx *Transaction) AsMessage(s Signer, balanceFee *big.Int, number *big.Int) (Message, error) {
 	msg := Message{
 		nonce:           tx.data.AccountNonce,
 		gasLimit:        tx.data.GasLimit,
@@ -255,7 +255,11 @@ func (tx *Transaction) AsMessage(s Signer, balanceFee *big.Int) (Message, error)
 	var err error
 	msg.from, err = Sender(s, tx)
 	if balanceFee != nil {
-		msg.gasPrice = common.TRC21GasPrice
+		if number.Cmp(common.TIPTRC21Fee) > 0 {
+			msg.gasPrice = common.TRC21GasPrice
+		} else {
+			msg.gasPrice = common.TRC21GasPriceBefore
+		}
 	}
 	return msg, err
 }

eth/api_tracer.go

@@ -199,7 +199,7 @@ func (api *PrivateDebugAPI) traceChain(ctx context.Context, start, end *types.Bl
 							balacne = value
 						}
 					}
-					msg, _ := tx.AsMessage(signer, balacne)
+					msg, _ := tx.AsMessage(signer, balacne,task.block.Number())
 					vmctx := core.NewEVMContext(msg, task.block.Header(), api.eth.blockchain, nil)
 
 					res, err := api.traceTx(ctx, msg, vmctx, task.statedb, config)
@@ -438,7 +438,7 @@ func (api *PrivateDebugAPI) traceBlock(ctx context.Context, block *types.Block,
 						balacne = value
 					}
 				}
-				msg, _ := txs[task.index].AsMessage(signer, balacne)
+				msg, _ := txs[task.index].AsMessage(signer, balacne,block.Number())
 				vmctx := core.NewEVMContext(msg, block.Header(), api.eth.blockchain, nil)
 
 				res, err := api.traceTx(ctx, msg, vmctx, task.statedb, config)
@@ -463,7 +463,7 @@ func (api *PrivateDebugAPI) traceBlock(ctx context.Context, block *types.Block,
 			}
 		}
 		// Generate the next state snapshot fast without tracing
-		msg, _ := tx.AsMessage(signer, balacne)
+		msg, _ := tx.AsMessage(signer, balacne,block.Number())
 		vmctx := core.NewEVMContext(msg, block.Header(), api.eth.blockchain, nil)
 
 		vmenv := vm.NewEVM(vmctx, statedb, api.config, vm.Config{})
@@ -660,7 +660,7 @@ func (api *PrivateDebugAPI) computeTxEnv(blockHash common.Hash, txIndex int, ree
 			}
 		}
 		// Assemble the transaction call message and return if the requested offset
-		msg, _ := tx.AsMessage(signer, balacne)
+		msg, _ := tx.AsMessage(signer, balacne,block.Number())
 		context := core.NewEVMContext(msg, block.Header(), api.eth.blockchain, nil)
 		if idx == txIndex {
 			return msg, context, statedb, nil

eth/tracers/tracers_test.go

@@ -169,7 +169,7 @@ func TestCallTracer(t *testing.T) {
 			}
 			evm := vm.NewEVM(context, statedb, test.Genesis.Config, vm.Config{Debug: true, Tracer: tracer})
 
-			msg, err := tx.AsMessage(signer, nil)
+			msg, err := tx.AsMessage(signer, nil,common.Big0)
 			if err != nil {
 				t.Fatalf("failed to prepare transaction for tracing: %v", err)
 			}