Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions evm/eth.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/yu-org/yu/core/tripod"
yu_types "github.com/yu-org/yu/core/types"

"github.com/reddio-com/reddio/config"
yuConfig "github.com/reddio-com/reddio/evm/config"
"github.com/reddio-com/reddio/evm/pending_state"
"github.com/reddio-com/reddio/metrics"
Expand Down Expand Up @@ -503,12 +504,23 @@ func (s *Solidity) executeContractCreation(ctx *context.WriteContext, txReq *TxR
func (s *Solidity) executeContractCall(ctx *context.WriteContext, txReq *TxRequest, ethState *pending_state.PendingStateWrapper, origin, coinBase common.Address, vmenv *vm.EVM, sender vm.AccountRef, rules params.Rules) (uint64, error) {
ethState.Prepare(rules, origin, coinBase, txReq.Address, vm.ActivePrecompiles(rules), nil)
ethState.SetNonce(txReq.Origin, ethState.GetNonce(txReq.Origin)+1)

// logrus.Printf("before transfer: account %s balance %d \n", sender.Address(), ethState.GetBalance(sender.Address()))

senderBalanceBefore := ethState.GetBalance(sender.Address())
code, leftOverGas, err := vmenv.Call(sender, *txReq.Address, txReq.Input, txReq.GasLimit, uint256.MustFromBig(txReq.Value))
isPureTransferTxn := IsPureTransfer(sender, txReq, ethState)
ethState.SubBalance(sender.Address(), uint256.NewInt(0), tracing.BalanceChangeUnspecified)
senderBalanceAferExecute := ethState.GetBalance(sender.Address())
isPureTransferTxn := false
if IsPureTransfer(sender, txReq, ethState) {
isPureTransferTxn = true
extraTransferGas := config.GlobalConfig.ExtraBalanceGas
if extraTransferGas > txReq.GasLimit {
extraTransferGas = txReq.GasLimit
}
ethState.SubBalance(sender.Address(), uint256.NewInt(extraTransferGas*txReq.GasPrice.Uint64()), tracing.BalanceChangeTransfer)
if leftOverGas >= extraTransferGas {
leftOverGas -= extraTransferGas
} else {
leftOverGas = 0
}
}
// logrus.Printf("after transfer: account %s balance %d \n", sender.Address(), ethState.GetBalance(sender.Address()))
if err != nil {
// byt, _ := json.Marshal(txReq)
Expand All @@ -520,6 +532,10 @@ func (s *Solidity) executeContractCall(ctx *context.WriteContext, txReq *TxReque
logrus.Errorf("contract call error, gasUsed:%v, gasLimit:%v, leftOver:%v, price:%v, isPureTransferTxn:%v, sender:%v", gasUsed, txReq.GasLimit, leftOverGas, txReq.GasPrice, isPureTransferTxn, sender.Address().String())
return gasUsed, err
}
senderBalanceAfterExtra := ethState.GetBalance(sender.Address())
logrus.Printf("contract call balance before:%v ,after execute:%v, after extra:%v, isPure:%v, sender:%v",
senderBalanceBefore.Uint64(), senderBalanceAferExecute.Uint64(), senderBalanceAfterExtra.Uint64(), isPureTransferTxn, sender.Address().String())

_, err2 := emitReceipt(ctx, vmenv, txReq, code, common.Address{}, leftOverGas, err)
// logrus.Printf("[Execute Txn] SendTx success. Oringin code = %v, Hex Code = %v, Left Gas = %v", code, hex.EncodeToString(code), leftOverGas)
return txReq.GasLimit - leftOverGas, err2
Expand Down
Loading