Skip to content

fix transfer gas #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ReyisaRuby wants to merge 10 commits into from
Closed

fix transfer gas #407

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0d342c2
fix
ReyisaRuby Jun 25, 2025
c0756c2
fix
ReyisaRuby Jun 25, 2025
c892b70
fix fee
ReyisaRuby Jun 25, 2025
b849803
fix
ReyisaRuby Jun 25, 2025
323b81e
fix
ReyisaRuby Jun 25, 2025
d4919d6
fix
ReyisaRuby Jun 25, 2025
3a0d356
remove log
ReyisaRuby Jun 25, 2025
c161331
fix
ReyisaRuby Jun 25, 2025
d01f127
fix
ReyisaRuby Jun 25, 2025
e3f5859
fix
ReyisaRuby Jun 25, 2025
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
51 changes: 19 additions & 32 deletions evm/eth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,20 +313,20 @@ func (s *Solidity) ExecuteTxn(ctx *context.WriteContext) (err error) {
}
}()

var gasUsed uint64
//var gasUsed uint64
if txReq.Address == nil {
gasUsed, err = s.executeContractCreation(ctx, txReq, pd, txReq.Origin, coinbase, vmenv, sender, rules)
_, err = s.executeContractCreation(ctx, txReq, pd, txReq.Origin, coinbase, vmenv, sender, rules)
} else {
gasUsed, err = s.executeContractCall(ctx, txReq, pd, txReq.Origin, coinbase, vmenv, sender, rules)
_, err = s.executeContractCall(ctx, txReq, pd, txReq.Origin, coinbase, vmenv, sender, rules)
}

if !rules.IsLondon {
// Before EIP-3529: refunds were capped to gasUsed / 2
s.refundGas(vmenv.StateDB, txReq, gasUsed, params.RefundQuotient)
} else {
// After EIP-3529: refunds are capped to gasUsed / 5
s.refundGas(vmenv.StateDB, txReq, gasUsed, params.RefundQuotientEIP3529)
}
//if !rules.IsLondon {
// // Before EIP-3529: refunds were capped to gasUsed / 2
// s.refundGas(vmenv.StateDB, txReq, gasUsed, params.RefundQuotient)
//} else {
// // After EIP-3529: refunds are capped to gasUsed / 5
// s.refundGas(vmenv.StateDB, txReq, gasUsed, params.RefundQuotientEIP3529)
//}

ctx.ExtraInterface = pd

Expand Down Expand Up @@ -493,8 +493,10 @@ func (s *Solidity) executeContractCreation(ctx *context.WriteContext, txReq *TxR
code, address, leftOverGas, err := vmenv.Create(sender, txReq.Input, txReq.GasLimit, uint256.MustFromBig(txReq.Value))
if err != nil {
gasUsed, _ := emitReceipt(ctx, vmenv, txReq, code, address, leftOverGas, err)
stateDB.SubBalance(sender.Address(), uint256.NewInt(gasUsed*txReq.GasPrice.Uint64()), tracing.BalanceChangeUnspecified)
logrus.Errorf("contract creation error, gasUsed:%v, gasLimit:%v, leftOver:%v, price:%v, address:%v", gasUsed, txReq.GasLimit, leftOverGas, txReq.GasPrice, sender.Address().String())
//fee := new(big.Int).Mul(txReq.GasPrice, new(big.Int).SetUint64(gasUsed))
//gasFeeU256, _ := uint256.FromBig(fee)
stateDB.SubBalance(sender.Address(), uint256.NewInt(0), tracing.BalanceChangeUnspecified)
logrus.Errorf("contract creation error, gasUsed:%v, gasLimit:%v, leftOver:%v,sender:%v", gasUsed, txReq.GasLimit, leftOverGas, sender.Address().String())
return txReq.GasLimit - leftOverGas, err
}
_, err2 := emitReceipt(ctx, vmenv, txReq, code, address, leftOverGas, err)
Expand All @@ -504,22 +506,10 @@ 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)
senderBalanceBefore := ethState.GetBalance(sender.Address())
code, leftOverGas, err := vmenv.Call(sender, *txReq.Address, txReq.Input, txReq.GasLimit, uint256.MustFromBig(txReq.Value))
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
}
isPureTransferTxn := IsPureTransfer(sender, txReq, ethState)
if isPureTransferTxn {
leftOverGas = txReq.GasLimit - config.GlobalConfig.ExtraBalanceGas
}
// logrus.Printf("after transfer: account %s balance %d \n", sender.Address(), ethState.GetBalance(sender.Address()))
if err != nil {
Expand All @@ -529,13 +519,10 @@ func (s *Solidity) executeContractCall(ctx *context.WriteContext, txReq *TxReque
if !isPureTransferTxn {
ethState.SubBalance(sender.Address(), uint256.NewInt(0), tracing.BalanceChangeUnspecified)
}
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())
logrus.Errorf("contract call error, gasUsed:%v, gasLimit:%v, leftOver:%v, sender:%v", gasUsed, txReq.GasLimit, leftOverGas, 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())

logrus.Infof("contract call balance gasLimit:%v,leftOver:%v,isPure:%v,sender:%v", txReq.GasLimit, leftOverGas, 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