mirror of
https://github.com/arnaucube/hermez-node.git
synced 2026-02-07 03:16:45 +01:00
Merge branch 'develop' into feature/getPoolTxs
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +1,2 @@
|
||||
bin/
|
||||
dist/
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
before:
|
||||
hooks:
|
||||
- go mod download
|
||||
- make migration-pack
|
||||
|
||||
builds:
|
||||
- main: ./cli/node/main.go
|
||||
@@ -9,10 +10,8 @@ builds:
|
||||
goos:
|
||||
- linux
|
||||
- darwin
|
||||
- windows
|
||||
hooks:
|
||||
pre: make migration-pack
|
||||
post: make migration-clean
|
||||
goarch:
|
||||
- amd64
|
||||
|
||||
archives:
|
||||
- replacements:
|
||||
|
||||
@@ -245,15 +245,15 @@ func (c *EthereumClient) EthBlockByNumber(ctx context.Context, number int64) (*c
|
||||
if number == -1 {
|
||||
blockNum = nil
|
||||
}
|
||||
block, err := c.client.BlockByNumber(ctx, blockNum)
|
||||
header, err := c.client.HeaderByNumber(ctx, blockNum)
|
||||
if err != nil {
|
||||
return nil, tracerr.Wrap(err)
|
||||
}
|
||||
b := &common.Block{
|
||||
Num: block.Number().Int64(),
|
||||
Timestamp: time.Unix(int64(block.Time()), 0),
|
||||
ParentHash: block.ParentHash(),
|
||||
Hash: block.Hash(),
|
||||
Num: header.Number.Int64(),
|
||||
Timestamp: time.Unix(int64(header.Time), 0),
|
||||
ParentHash: header.ParentHash,
|
||||
Hash: header.Hash(),
|
||||
}
|
||||
return b, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user