@@ -630,14 +630,18 @@ func (st *StateTransition) distributeTxFees() error {
630
630
"coinbaseFeeRecipient" , st .evm .Context .Coinbase , "coinbaseFee" , tipTxFee ,
631
631
"comunityFundRecipient" , governanceAddress , "communityFundFee" , baseTxFee )
632
632
if feeCurrency == nil {
633
- if gatewayFeeRecipient != & common .ZeroAddress {
634
- st .state .AddBalance (* gatewayFeeRecipient , st .msg .GatewayFee ())
635
- }
636
- if governanceAddress != common .ZeroAddress {
637
- st .state .AddBalance (governanceAddress , baseTxFee )
633
+ if ! st .evm .ChainConfig ().IsGFork (st .evm .Context .BlockNumber ) {
634
+ if gatewayFeeRecipient != & common .ZeroAddress {
635
+ st .state .AddBalance (* gatewayFeeRecipient , st .msg .GatewayFee ())
636
+ }
637
+ if governanceAddress != common .ZeroAddress {
638
+ st .state .AddBalance (governanceAddress , baseTxFee )
639
+ }
640
+ st .state .AddBalance (st .evm .Context .Coinbase , tipTxFee )
641
+ st .state .AddBalance (from , refund )
642
+ } else {
643
+ // TODO, volpe's burn logic
638
644
}
639
- st .state .AddBalance (st .evm .Context .Coinbase , tipTxFee )
640
- st .state .AddBalance (from , refund )
641
645
} else {
642
646
if err = st .creditGasFees (from , st .evm .Context .Coinbase , gatewayFeeRecipient , governanceAddress , refund , tipTxFee , st .msg .GatewayFee (), baseTxFee , feeCurrency ); err != nil {
643
647
log .Error ("Error crediting" , "from" , from , "coinbase" , st .evm .Context .Coinbase , "gateway" , gatewayFeeRecipient , "fund" , governanceAddress )
0 commit comments