From 77463b2bbf4a5a2b0a401080b42cc66492d0765f Mon Sep 17 00:00:00 2001 From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:27:53 -0600 Subject: [PATCH] Revert "graphql: add 4844 blob fields (#27963)" This reverts commit 92902c352041b8efdb7baf576b3da64c11bd288c. --- graphql/graphql.go | 88 +++++----------------------------------------- graphql/schema.go | 80 ++++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 126 deletions(-) diff --git a/graphql/graphql.go b/graphql/graphql.go index 8304a64cf49f..6417fc9ed383 100644 --- a/graphql/graphql.go +++ b/graphql/graphql.go @@ -272,6 +272,8 @@ func (t *Transaction) GasPrice(ctx context.Context) hexutil.Big { return hexutil.Big{} } switch tx.Type() { + case types.AccessListTxType: + return hexutil.Big(*tx.GasPrice()) case types.DynamicFeeTxType: if block != nil { if baseFee, _ := block.BaseFeePerGas(ctx); baseFee != nil { @@ -310,7 +312,9 @@ func (t *Transaction) MaxFeePerGas(ctx context.Context) *hexutil.Big { return nil } switch tx.Type() { - case types.DynamicFeeTxType, types.BlobTxType: + case types.AccessListTxType: + return nil + case types.DynamicFeeTxType: return (*hexutil.Big)(tx.GasFeeCap()) default: return nil @@ -323,33 +327,15 @@ func (t *Transaction) MaxPriorityFeePerGas(ctx context.Context) *hexutil.Big { return nil } switch tx.Type() { - case types.DynamicFeeTxType, types.BlobTxType: + case types.AccessListTxType: + return nil + case types.DynamicFeeTxType: return (*hexutil.Big)(tx.GasTipCap()) default: return nil } } -func (t *Transaction) MaxFeePerBlobGas(ctx context.Context) *hexutil.Big { - tx, _ := t.resolve(ctx) - if tx == nil { - return nil - } - return (*hexutil.Big)(tx.BlobGasFeeCap()) -} - -func (t *Transaction) BlobVersionedHashes(ctx context.Context) *[]common.Hash { - tx, _ := t.resolve(ctx) - if tx == nil { - return nil - } - if tx.Type() != types.BlobTxType { - return nil - } - blobHashes := tx.BlobHashes() - return &blobHashes -} - func (t *Transaction) EffectiveTip(ctx context.Context) (*hexutil.Big, error) { tx, block := t.resolve(ctx) if tx == nil { @@ -482,40 +468,6 @@ func (t *Transaction) CumulativeGasUsed(ctx context.Context) (*hexutil.Uint64, e return &ret, nil } -func (t *Transaction) BlobGasUsed(ctx context.Context) (*hexutil.Uint64, error) { - tx, _ := t.resolve(ctx) - if tx == nil { - return nil, nil - } - if tx.Type() != types.BlobTxType { - return nil, nil - } - - receipt, err := t.getReceipt(ctx) - if err != nil || receipt == nil { - return nil, err - } - ret := hexutil.Uint64(receipt.BlobGasUsed) - return &ret, nil -} - -func (t *Transaction) BlobGasPrice(ctx context.Context) (*hexutil.Big, error) { - tx, _ := t.resolve(ctx) - if tx == nil { - return nil, nil - } - if tx.Type() != types.BlobTxType { - return nil, nil - } - - receipt, err := t.getReceipt(ctx) - if err != nil || receipt == nil { - return nil, err - } - ret := (*hexutil.Big)(receipt.BlobGasPrice) - return ret, nil -} - func (t *Transaction) CreatedContract(ctx context.Context, args BlockNumberArgs) (*Account, error) { receipt, err := t.getReceipt(ctx) if err != nil || receipt == nil || receipt.ContractAddress == (common.Address{}) { @@ -1067,30 +1019,6 @@ func (b *Block) Withdrawals(ctx context.Context) (*[]*Withdrawal, error) { return &ret, nil } -func (b *Block) BlobGasUsed(ctx context.Context) (*hexutil.Uint64, error) { - header, err := b.resolveHeader(ctx) - if err != nil { - return nil, err - } - if header.BlobGasUsed == nil { - return nil, nil - } - ret := hexutil.Uint64(*header.BlobGasUsed) - return &ret, nil -} - -func (b *Block) ExcessBlobGas(ctx context.Context) (*hexutil.Uint64, error) { - header, err := b.resolveHeader(ctx) - if err != nil { - return nil, err - } - if header.ExcessBlobGas == nil { - return nil, nil - } - ret := hexutil.Uint64(*header.ExcessBlobGas) - return &ret, nil -} - // BlockFilterCriteria encapsulates criteria passed to a `logs` accessor inside // a block. type BlockFilterCriteria struct { diff --git a/graphql/schema.go b/graphql/schema.go index 5738923fc170..5de5bad305e8 100644 --- a/graphql/schema.go +++ b/graphql/schema.go @@ -71,8 +71,8 @@ const schema string = ` transaction: Transaction! } - # EIP-2718 - type AccessTuple { + #EIP-2718 + type AccessTuple{ address: Address! storageKeys : [Bytes32!]! } @@ -112,8 +112,6 @@ const schema string = ` maxFeePerGas: BigInt # MaxPriorityFeePerGas is the maximum miner tip per gas offered to include a transaction, in wei. maxPriorityFeePerGas: BigInt - # MaxFeePerBlobGas is the maximum blob gas fee cap per blob the sender is willing to pay for blob transaction, in wei. - maxFeePerBlobGas: BigInt # EffectiveTip is the actual amount of reward going to miner after considering the max fee cap. effectiveTip: BigInt # Gas is the maximum amount of gas this transaction can consume. @@ -143,10 +141,6 @@ const schema string = ` # coerced into the EIP-1559 format by setting both maxFeePerGas and # maxPriorityFeePerGas as the transaction's gas price. effectiveGasPrice: BigInt - # BlobGasUsed is the amount of blob gas used by this transaction. - blobGasUsed: Long - # blobGasPrice is the actual value per blob gas deducted from the senders account. - blobGasPrice: BigInt # CreatedContract is the account that was created by a contract creation # transaction. If the transaction was not a contract creation transaction, # or it has not yet been mined, this field will be null. @@ -168,8 +162,6 @@ const schema string = ` # RawReceipt is the canonical encoding of the receipt. For post EIP-2718 typed transactions # this is equivalent to TxType || ReceiptEncoding. rawReceipt: Bytes! - # BlobVersionedHashes is a set of hash outputs from the blobs in the transaction. - blobVersionedHashes: [Bytes32!] } # BlockFilterCriteria encapsulates log filter criteria for a filter applied @@ -179,16 +171,16 @@ const schema string = ` # empty, results will not be filtered by address. addresses: [Address!] # Topics list restricts matches to particular event topics. Each event has a list - # of topics. Topics matches a prefix of that list. An empty element array matches any - # topic. Non-empty elements represent an alternative that matches any of the - # contained topics. - # - # Examples: - # - [] or nil matches any topic list - # - [[A]] matches topic A in first position - # - [[], [B]] matches any topic in first position, B in second position - # - [[A], [B]] matches topic A in first position, B in second position - # - [[A, B]], [C, D]] matches topic (A OR B) in first position, (C OR D) in second position + # of topics. Topics matches a prefix of that list. An empty element array matches any + # topic. Non-empty elements represent an alternative that matches any of the + # contained topics. + # + # Examples: + # - [] or nil matches any topic list + # - [[A]] matches topic A in first position + # - [[], [B]] matches any topic in first position, B in second position + # - [[A], [B]] matches topic A in first position, B in second position + # - [[A, B]], [C, D]] matches topic (A OR B) in first position, (C OR D) in second position topics: [[Bytes32!]!] } @@ -275,10 +267,6 @@ const schema string = ` # Withdrawals is a list of withdrawals associated with this block. If # withdrawals are unavailable for this block, this field will be null. withdrawals: [Withdrawal!] - # BlobGasUsed is the total amount of gas used by the transactions. - blobGasUsed: Long - # ExcessBlobGas is a running total of blob gas consumed in excess of the target, prior to the block. - excessBlobGas: Long } # CallData represents the data associated with a local contract call. @@ -324,21 +312,21 @@ const schema string = ` # empty, results will not be filtered by address. addresses: [Address!] # Topics list restricts matches to particular event topics. Each event has a list - # of topics. Topics matches a prefix of that list. An empty element array matches any - # topic. Non-empty elements represent an alternative that matches any of the - # contained topics. - # - # Examples: - # - [] or nil matches any topic list - # - [[A]] matches topic A in first position - # - [[], [B]] matches any topic in first position, B in second position - # - [[A], [B]] matches topic A in first position, B in second position - # - [[A, B]], [C, D]] matches topic (A OR B) in first position, (C OR D) in second position + # of topics. Topics matches a prefix of that list. An empty element array matches any + # topic. Non-empty elements represent an alternative that matches any of the + # contained topics. + # + # Examples: + # - [] or nil matches any topic list + # - [[A]] matches topic A in first position + # - [[], [B]] matches any topic in first position, B in second position + # - [[A], [B]] matches topic A in first position, B in second position + # - [[A, B]], [C, D]] matches topic (A OR B) in first position, (C OR D) in second position topics: [[Bytes32!]!] } # SyncState contains the current synchronisation state of the client. - type SyncState { + type SyncState{ # StartingBlock is the block number at which synchronisation started. startingBlock: Long! # CurrentBlock is the point at which synchronisation has presently reached. @@ -349,17 +337,17 @@ const schema string = ` # Pending represents the current pending state. type Pending { - # TransactionCount is the number of transactions in the pending state. - transactionCount: Long! - # Transactions is a list of transactions in the current pending state. - transactions: [Transaction!] - # Account fetches an Ethereum account for the pending state. - account(address: Address!): Account! - # Call executes a local call operation for the pending state. - call(data: CallData!): CallResult - # EstimateGas estimates the amount of gas that will be required for - # successful execution of a transaction for the pending state. - estimateGas(data: CallData!): Long! + # TransactionCount is the number of transactions in the pending state. + transactionCount: Long! + # Transactions is a list of transactions in the current pending state. + transactions: [Transaction!] + # Account fetches an Ethereum account for the pending state. + account(address: Address!): Account! + # Call executes a local call operation for the pending state. + call(data: CallData!): CallResult + # EstimateGas estimates the amount of gas that will be required for + # successful execution of a transaction for the pending state. + estimateGas(data: CallData!): Long! } type Query {