Skip to content

Commit

Permalink
Merge pull request from GHSA-4vx6-m7jv-g2ch
Browse files Browse the repository at this point in the history
Fix debug namespace API
  • Loading branch information
iv0rish committed Nov 22, 2022
2 parents febce7b + 58a8068 commit 25804bd
Show file tree
Hide file tree
Showing 11 changed files with 220 additions and 132 deletions.
12 changes: 12 additions & 0 deletions api/api_private_debug.go
Expand Up @@ -21,9 +21,11 @@
package api

import (
"context"
"fmt"
"strings"

"github.com/davecgh/go-spew/spew"
"github.com/klaytn/klaytn/networks/rpc"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/util"
Expand Down Expand Up @@ -84,3 +86,13 @@ func (api *PrivateDebugAPI) SetHead(number rpc.BlockNumber) {
}
api.b.SetHead(uint64(number))
}

// PrintBlock retrieves a block and returns its pretty printed form.
func (api *PrivateDebugAPI) PrintBlock(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (string, error) {
block, _ := api.b.BlockByNumberOrHash(ctx, blockNrOrHash)
if block == nil {
blockNumberOrHashString, _ := blockNrOrHash.NumberOrHashString()
return "", fmt.Errorf("block %v not found", blockNumberOrHashString)
}
return spew.Sdump(block), nil
}
11 changes: 0 additions & 11 deletions api/api_public_debug.go
Expand Up @@ -24,7 +24,6 @@ import (
"context"
"fmt"

"github.com/davecgh/go-spew/spew"
"github.com/klaytn/klaytn/networks/rpc"
"github.com/klaytn/klaytn/rlp"
)
Expand Down Expand Up @@ -54,13 +53,3 @@ func (api *PublicDebugAPI) GetBlockRlp(ctx context.Context, blockNrOrHash rpc.Bl
}
return fmt.Sprintf("%x", encoded), nil
}

// PrintBlock retrieves a block and returns its pretty printed form.
func (api *PublicDebugAPI) PrintBlock(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (string, error) {
block, _ := api.b.BlockByNumberOrHash(ctx, blockNrOrHash)
if block == nil {
blockNumberOrHashString, _ := blockNrOrHash.NumberOrHashString()
return "", fmt.Errorf("block %v not found", blockNumberOrHashString)
}
return spew.Sdump(block), nil
}
5 changes: 3 additions & 2 deletions api/backend.go
Expand Up @@ -135,11 +135,12 @@ func GetAPIs(apiBackend Backend) ([]rpc.API, *EthereumAPI) {
Namespace: "debug",
Version: "1.0",
Service: NewPublicDebugAPI(apiBackend),
Public: true,
Public: false,
}, {
Namespace: "debug",
Namespace: "unsafedebug",
Version: "1.0",
Service: NewPrivateDebugAPI(apiBackend),
Public: false,
}, {
Namespace: "klay",
Version: "1.0",
Expand Down

0 comments on commit 25804bd

Please sign in to comment.