From 828808609551b11132f489c463cc4a26f2fceb80 Mon Sep 17 00:00:00 2001 From: Nick Kozlov <22479658+EnoRage@users.noreply.github.com> Date: Tue, 14 May 2024 18:20:18 +0200 Subject: [PATCH] chore: fixes --- codegen/openapi/traces-openapi.json | 25 +-------- sdk-clients/traces/api.go | 8 +-- sdk-clients/traces/examples/main.go | 2 +- sdk-clients/traces/traces_types.gen.go | 61 +++++++-------------- sdk-clients/traces/traces_types_extended.go | 61 +++++++++++++++++++++ 5 files changed, 89 insertions(+), 68 deletions(-) diff --git a/codegen/openapi/traces-openapi.json b/codegen/openapi/traces-openapi.json index c8b0b76..2b58481 100644 --- a/codegen/openapi/traces-openapi.json +++ b/codegen/openapi/traces-openapi.json @@ -290,7 +290,7 @@ "example": "0x3e48f" }, "gasUsed": { - "type": "string", + "type": "number", "example": "0x5da9" }, "input": { @@ -358,25 +358,6 @@ "CoreBuiltinTransactionRootSuccessTraceDto": { "type": "object", "properties": { - "chainId": { - "type": "number", - "example": 1, - "enum": [ - 1, - 45, - 137, - 10, - 56, - 42161, - 43114, - 100, - 250, - 1313161554, - 8217, - 324, - 8453 - ] - }, "type": { "type": "string", "enum": [ @@ -410,7 +391,7 @@ "example": "0x3e48f" }, "gasUsed": { - "type": "string", + "type": "number", "example": "0x5da9" }, "input": { @@ -506,7 +487,7 @@ "type": "string", "example": "v1.2.3" }, - "number": { + "blockNumber": { "type": "number", "example": "16123123" }, diff --git a/sdk-clients/traces/api.go b/sdk-clients/traces/api.go index ab6c595..bfb28b2 100644 --- a/sdk-clients/traces/api.go +++ b/sdk-clients/traces/api.go @@ -48,7 +48,7 @@ func (api *api) GetBlockTraceByNumber(ctx context.Context, param GetBlockTraceBy } // GetTxTraceByNumberAndHash Get transaction trace by block number and transaction hash -func (api *api) GetTxTraceByNumberAndHash(ctx context.Context, param GetTxTraceByNumberAndHashParams) (*PlainTransactionTraceWithTypeDto, error) { +func (api *api) GetTxTraceByNumberAndHash(ctx context.Context, param GetTxTraceByNumberAndHashParams) (*TransactionTraceResponse, error) { u := fmt.Sprintf("traces/v1.0/chain/%d/block-trace/%d/tx-hash/%s", api.chainId, param.BlockNumber, param.TransactionHash) payload := common.RequestPayload{ @@ -58,7 +58,7 @@ func (api *api) GetTxTraceByNumberAndHash(ctx context.Context, param GetTxTraceB Body: nil, } - var response PlainTransactionTraceWithTypeDto + var response TransactionTraceResponse err := api.httpExecutor.ExecuteRequest(ctx, payload, &response) if err != nil { return nil, err @@ -68,7 +68,7 @@ func (api *api) GetTxTraceByNumberAndHash(ctx context.Context, param GetTxTraceB } // GetTxTraceByNumberAndOffset Get transaction trace by block number and offset of transaction in block -func (api *api) GetTxTraceByNumberAndOffset(ctx context.Context, param GetTxTraceByNumberAndOffsetParams) (*PlainTransactionTraceWithTypeDto, error) { +func (api *api) GetTxTraceByNumberAndOffset(ctx context.Context, param GetTxTraceByNumberAndOffsetParams) (*TransactionTraceResponse, error) { u := fmt.Sprintf("traces/v1.0/chain/%d/block-trace/%d/offset/%d", api.chainId, param.BlockNumber, param.Offset) payload := common.RequestPayload{ @@ -78,7 +78,7 @@ func (api *api) GetTxTraceByNumberAndOffset(ctx context.Context, param GetTxTrac Body: nil, } - var response PlainTransactionTraceWithTypeDto + var response TransactionTraceResponse err := api.httpExecutor.ExecuteRequest(ctx, payload, &response) if err != nil { return nil, err diff --git a/sdk-clients/traces/examples/main.go b/sdk-clients/traces/examples/main.go index e00ceeb..c1ea2a7 100644 --- a/sdk-clients/traces/examples/main.go +++ b/sdk-clients/traces/examples/main.go @@ -40,7 +40,7 @@ func main() { fmt.Println("GetSyncedInterval:", interval) time.Sleep(time.Second) - blockTrace, err := client.GetBlockTraceByNumber(ctx, traces.GetBlockTraceByNumberParam(17378177)) + blockTrace, err := client.GetBlockTraceByNumber(ctx, traces.GetBlockTraceByNumberParam(17378176)) if err != nil { fmt.Println("failed to GetBlockTraceByNumber: %w", err) return diff --git a/sdk-clients/traces/traces_types.gen.go b/sdk-clients/traces/traces_types.gen.go index c201bc0..28be1d6 100644 --- a/sdk-clients/traces/traces_types.gen.go +++ b/sdk-clients/traces/traces_types.gen.go @@ -32,23 +32,6 @@ const ( CoreBuiltinCallTraceDtoTypeTRANSFERETHER CoreBuiltinCallTraceDtoType = "TRANSFER_ETHER" ) -// Defines values for CoreBuiltinTransactionRootSuccessTraceDtoChainId. -const ( - N1 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 1 - N10 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 10 - N100 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 100 - N1313161554e09 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 1.313161554e+09 - N137 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 137 - N250 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 250 - N324 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 324 - N42161 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 42161 - N43114 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 43114 - N45 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 45 - N56 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 56 - N8217 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 8217 - N8453 CoreBuiltinTransactionRootSuccessTraceDtoChainId = 8453 -) - // Defines values for CoreBuiltinTransactionRootSuccessTraceDtoType. const ( CoreBuiltinTransactionRootSuccessTraceDtoTypeCALL CoreBuiltinTransactionRootSuccessTraceDtoType = "CALL" @@ -124,8 +107,8 @@ const ( // CoreBuiltinBlockTracesDto defines model for CoreBuiltinBlockTracesDto. type CoreBuiltinBlockTracesDto struct { BlockHash string `json:"blockHash"` + BlockNumber *float32 `json:"blockNumber,omitempty"` BlockTimestamp string `json:"blockTimestamp"` - Number float32 `json:"number"` Traces []CoreBuiltinTransactionRootSuccessTraceDto `json:"traces"` Type CoreBuiltinBlockTracesDtoType `json:"type"` Version string `json:"version"` @@ -140,7 +123,7 @@ type CoreBuiltinCallTraceDto struct { Error string `json:"error"` From string `json:"from"` Gas string `json:"gas"` - GasUsed string `json:"gasUsed"` + GasUsed float32 `json:"gasUsed"` Input string `json:"input"` IsParentHasError bool `json:"isParentHasError"` Output string `json:"output"` @@ -161,30 +144,26 @@ type CoreBuiltinTraceLogDto struct { // CoreBuiltinTransactionRootSuccessTraceDto defines model for CoreBuiltinTransactionRootSuccessTraceDto. type CoreBuiltinTransactionRootSuccessTraceDto struct { - Calls []CoreBuiltinCallTraceDto `json:"calls"` - ChainId CoreBuiltinTransactionRootSuccessTraceDtoChainId `json:"chainId"` - Error string `json:"error"` - Events []CoreBuiltinTraceLogDto `json:"events"` - From string `json:"from"` - Gas string `json:"gas"` - GasHex string `json:"gasHex"` - GasPrice string `json:"gasPrice"` - GasUsed string `json:"gasUsed"` - Input string `json:"input"` - MaxFeePerGas string `json:"maxFeePerGas"` - MaxPriorityFeePerGas string `json:"maxPriorityFeePerGas"` - Nonce string `json:"nonce"` - Output string `json:"output"` - RevertReason string `json:"revertReason"` - To string `json:"to"` - TxHash string `json:"txHash"` - Type CoreBuiltinTransactionRootSuccessTraceDtoType `json:"type"` - Value string `json:"value"` + Calls []CoreBuiltinCallTraceDto `json:"calls"` + Error string `json:"error"` + Events []CoreBuiltinTraceLogDto `json:"events"` + From string `json:"from"` + Gas string `json:"gas"` + GasHex string `json:"gasHex"` + GasPrice string `json:"gasPrice"` + GasUsed float32 `json:"gasUsed"` + Input string `json:"input"` + MaxFeePerGas string `json:"maxFeePerGas"` + MaxPriorityFeePerGas string `json:"maxPriorityFeePerGas"` + Nonce string `json:"nonce"` + Output string `json:"output"` + RevertReason string `json:"revertReason"` + To string `json:"to"` + TxHash string `json:"txHash"` + Type CoreBuiltinTransactionRootSuccessTraceDtoType `json:"type"` + Value string `json:"value"` } -// CoreBuiltinTransactionRootSuccessTraceDtoChainId defines model for CoreBuiltinTransactionRootSuccessTraceDto.ChainId. -type CoreBuiltinTransactionRootSuccessTraceDtoChainId float32 - // CoreBuiltinTransactionRootSuccessTraceDtoType defines model for CoreBuiltinTransactionRootSuccessTraceDto.Type. type CoreBuiltinTransactionRootSuccessTraceDtoType string diff --git a/sdk-clients/traces/traces_types_extended.go b/sdk-clients/traces/traces_types_extended.go index ffd2888..f70a7dd 100644 --- a/sdk-clients/traces/traces_types_extended.go +++ b/sdk-clients/traces/traces_types_extended.go @@ -11,3 +11,64 @@ type GetTxTraceByNumberAndOffsetParams struct { BlockNumber int `json:"blockNumber" uri:"blockNumber"` Offset int `json:"offset" uri:"offset"` } + +type TransactionTraceResponse struct { + TransactionTrace TransactionTrace `json:"transactionTrace"` + Type string `json:"type"` +} + +type TransactionTrace struct { + TxHash string `json:"txHash"` + Nonce string `json:"nonce"` + GasPrice string `json:"gasPrice"` + Type string `json:"type"` + From string `json:"from"` + To string `json:"to"` + GasLimit int `json:"gasLimit"` + GasActual int `json:"gasActual"` + GasHex string `json:"gasHex"` + GasUsed int `json:"gasUsed"` + IntrinsicGas int `json:"intrinsicGas"` + GasRefund int `json:"gasRefund"` + Input string `json:"input"` + Calls []Call `json:"calls"` + Logs []Log `json:"logs"` + Status string `json:"status"` + Storage []StorageItem `json:"storage"` + Value string `json:"value"` + MaxFeePerGas string `json:"maxFeePerGas"` + MaxPriorityFeePerGas string `json:"maxPriorityFeePerGas"` + Depth int `json:"depth"` +} + +type Call struct { + Type string `json:"type"` + From string `json:"from"` + To string `json:"to"` + GasLimit int `json:"gasLimit"` + GasUsed int `json:"gasUsed"` + PrevGasLimit int `json:"prevGasLimit"` + Gas string `json:"gas"` + GasCost int `json:"gasCost"` + Input string `json:"input"` + Calls []Call `json:"calls"` + Logs []Log `json:"logs"` + Status string `json:"status"` + Storage []StorageItem `json:"storage"` + Success int `json:"success"` + Res string `json:"res"` + Depth int `json:"depth"` + Value string `json:"value"` +} + +type Log struct { + Topics []string `json:"topics"` + Contract string `json:"contract"` + Data string `json:"data"` +} + +type StorageItem struct { + Type string `json:"type"` + Key string `json:"key"` + Value string `json:"value"` +}