Skip to content

[WIP] graphql: gas-related queries use Long instead of hex string #21898

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
renaynay wants to merge 10 commits into from
Closed

[WIP] graphql: gas-related queries use Long instead of hex string #21898

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24e1337
Use a decimal representation for gas limit and gas used
atoulme Nov 21, 2020
afff525
Use Long for block number
atoulme Nov 24, 2020
4c991ca
Don't accept strings for block numbers
atoulme Nov 27, 2020
d7b868e
graphql: remove unnecessary cast
holiman Nov 27, 2020
bd8d69c
graphql: make tests table-based, simplify code
holiman Nov 27, 2020
13334d5
Code review changes
atoulme Nov 28, 2020
f2ec01f
Appease ci
atoulme Nov 28, 2020
9032c8d
Remove test names, print test body instead
atoulme Nov 28, 2020
8a3ed1e
gasUsed, estimateGas
renaynay Nov 30, 2020
bdb7c0e
lint
renaynay Jan 6, 2021
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
27 changes: 14 additions & 13 deletions graphql/graphql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,21 +301,21 @@ func (t *Transaction) Status(ctx context.Context) (*hexutil.Uint64, error) {
return &ret, nil
}

func (t *Transaction) GasUsed(ctx context.Context) (*hexutil.Uint64, error) {
func (t *Transaction) GasUsed(ctx context.Context) (*Long, error) {
receipt, err := t.getReceipt(ctx)
if err != nil || receipt == nil {
return nil, err
}
ret := hexutil.Uint64(receipt.GasUsed)
ret := Long(receipt.GasUsed)
return &ret, nil
}

func (t *Transaction) CumulativeGasUsed(ctx context.Context) (*hexutil.Uint64, error) {
func (t *Transaction) CumulativeGasUsed(ctx context.Context) (*Long, error) {
receipt, err := t.getReceipt(ctx)
if err != nil || receipt == nil {
return nil, err
}
ret := hexutil.Uint64(receipt.CumulativeGasUsed)
ret := Long(receipt.CumulativeGasUsed)
return &ret, nil
}

Expand Down Expand Up @@ -811,15 +811,15 @@ type CallData struct {
// CallResult encapsulates the result of an invocation of the `call` accessor.
type CallResult struct {
data hexutil.Bytes // The return data from the call
gasUsed hexutil.Uint64 // The amount of gas used
gasUsed Long // The amount of gas used
status hexutil.Uint64 // The return status of the call - 0 for failure or 1 for success.
}

func (c *CallResult) Data() hexutil.Bytes {
return c.data
}

func (c *CallResult) GasUsed() hexutil.Uint64 {
func (c *CallResult) GasUsed() Long {
return c.gasUsed
}

Expand Down Expand Up @@ -847,22 +847,22 @@ func (b *Block) Call(ctx context.Context, args struct {

return &CallResult{
data: result.ReturnData,
gasUsed: hexutil.Uint64(result.UsedGas),
gasUsed: Long(result.UsedGas),
status: status,
}, nil
}

func (b *Block) EstimateGas(ctx context.Context, args struct {
Data ethapi.CallArgs
}) (hexutil.Uint64, error) {
}) (Long, error) {
if b.numberOrHash == nil {
_, err := b.resolveHeader(ctx)
if err != nil {
return hexutil.Uint64(0), err
return 0, err
}
}
gas, err := ethapi.DoEstimateGas(ctx, b.backend, args.Data, *b.numberOrHash, b.backend.RPCGasCap())
return gas, err
return Long(gas), err
}

type Pending struct {
Expand Down Expand Up @@ -917,16 +917,17 @@ func (p *Pending) Call(ctx context.Context, args struct {

return &CallResult{
data: result.ReturnData,
gasUsed: hexutil.Uint64(result.UsedGas),
gasUsed: Long(result.UsedGas),
status: status,
}, nil
}

func (p *Pending) EstimateGas(ctx context.Context, args struct {
Data ethapi.CallArgs
}) (hexutil.Uint64, error) {
}) (Long, error) {
pendingBlockNr := rpc.BlockNumberOrHashWithNumber(rpc.PendingBlockNumber)
return ethapi.DoEstimateGas(ctx, p.backend, args.Data, pendingBlockNr, p.backend.RPCGasCap())
gas, err := ethapi.DoEstimateGas(ctx, p.backend, args.Data, pendingBlockNr, p.backend.RPCGasCap())
return Long(gas), err
}

// Resolver is the top-level object in the GraphQL hierarchy.
Expand Down