Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 10 additions & 16 deletions cmd/relayer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"fmt"
"math/big"
"os"
"strconv"

"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp"
"github.com/tranvictor/ethashproof"
"github.com/tranvictor/ethashproof/ethash"
"github.com/tranvictor/ethashproof/mtree"
"github.com/tranvictor/ethutils/reader"
)

type Output struct {
Expand All @@ -24,24 +24,23 @@ type Output struct {

func main() {
if len(os.Args) < 2 {
fmt.Printf("Block number param is missing. Please run ./relayer <blocknumber> instead.\n")
fmt.Printf("Block rlp param is missing. Please run ./relayer <blockrlp> instead.\n")
return
}
if len(os.Args) > 2 {
fmt.Printf("Please pass only 1 param as a block number. Please run ./relayer <blocknumber> instead.\n")
fmt.Printf("Please pass only 1 param as a hex-encoded block rlp. Please run ./relayer <blockrlp> instead.\n")
return
}
number, err := strconv.Atoi(os.Args[1])
rlpheader, err := hexutil.Decode(os.Args[1])
if err != nil {
fmt.Printf("Please pass a number as a block number. Please run ./relayer <integer> instead.\n")
fmt.Printf("Please pass a hex as a block rlp. Please run ./relayer <hex> instead.\n")
fmt.Printf("Error: %s\n", err)
return
}
fmt.Printf("Getting block header\n")
r := reader.NewEthReader()
header, err := r.HeaderByNumber(int64(number))
if err != nil {
fmt.Printf("Getting header failed: %s\n", err)
fmt.Printf("Decoding block header\n")
var header *types.Header
if err := rlp.DecodeBytes(rlpheader, &header); err != nil {
fmt.Printf("RLP decoding of header failed: %s\n", err)
return
}

Expand Down Expand Up @@ -70,11 +69,6 @@ func main() {

fmt.Printf("Proof length: %d\n", cache.ProofLength)

rlpheader, err := ethashproof.RLPHeader(header)
if err != nil {
fmt.Printf("Can't rlp encode the header: %s\n", err)
}

output := &Output{
HeaderRLP: hexutil.Encode(rlpheader),
MerkleRoot: cache.RootHash.Hex(),
Expand Down
26 changes: 0 additions & 26 deletions utils.go

This file was deleted.