Merge branch 'master' into extend-node-interface

joshuacolvin0 · Apr 27, 2022 · 426875b · 426875b
2 parents 22148c3 + 9ff50a5
commit 426875b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/graphql/graphql.go b/graphql/graphql.go
@@ -265,6 +265,9 @@ func (t *Transaction) EffectiveGasPrice(ctx context.Context) (*hexutil.Big, erro
 	if header.BaseFee == nil {
 		return (*hexutil.Big)(tx.GasPrice()), nil
 	}
+	if t.backend.ChainConfig().IsArbitrum() {
+		return (*hexutil.Big)(header.BaseFee), nil
+	}
 	return (*hexutil.Big)(math.BigMin(new(big.Int).Add(tx.GasTipCap(), header.BaseFee), tx.GasFeeCap())), nil
 }
 

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1805,6 +1805,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha
 		if err != nil {
 			return nil, err
 		}
+		fields["effectiveGasPrice"] = hexutil.Uint64(header.BaseFee.Uint64())
 		info, err := types.DeserializeHeaderExtraInformation(header)
 		if err != nil {
 			log.Error("Expected header to contain arbitrum data", "blockHash", blockHash)