Skip to content

Commit 90e699b

Browse files
authored
Merge pull request #193 from covalenthq/develop
Bsp-geth-DTM-RC:v1.7.0
2 parents dafd3d8 + e82ed55 commit 90e699b

File tree

324 files changed

+7259
-3168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+7259
-3168
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
go-version: 1.21.4
1919
- name: Run tests
20-
run: go test ./...
20+
run: go test -short ./...
2121
env:
2222
GOOS: linux
2323
GOARCH: 386

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,25 @@ GOBIN = ./build/bin
88
GO ?= latest
99
GORUN = go run
1010

11+
#? geth: Build geth
1112
geth:
1213
$(GORUN) build/ci.go install ./cmd/geth
1314
@echo "Done building."
1415
@echo "Run \"$(GOBIN)/geth\" to launch geth."
1516

17+
#? all: Build all packages and executables
1618
all:
1719
$(GORUN) build/ci.go install
1820

21+
#? test: Run the tests
1922
test: all
2023
$(GORUN) build/ci.go test -coverage
2124

25+
#? lint: Run certain pre-selected linters
2226
lint: ## Run linters.
2327
$(GORUN) build/ci.go lint
2428

29+
#? clean: Clean go cache, built executables, and the auto generated folder
2530
clean:
2631
go clean -cache
2732
rm -fr build/_workspace/pkg/ $(GOBIN)/*
@@ -40,10 +45,17 @@ run-geth-bsp:
4045
# The devtools target installs tools required for 'go generate'.
4146
# You need to put $GOBIN (or $GOPATH/bin) in your PATH to use 'go generate'.
4247

48+
#? devtools: Install recommended developer tools
4349
devtools:
4450
env GOBIN= go install golang.org/x/tools/cmd/stringer@latest
4551
env GOBIN= go install github.com/fjl/gencodec@latest
4652
env GOBIN= go install github.com/golang/protobuf/protoc-gen-go@latest
4753
env GOBIN= go install ./cmd/abigen
4854
@type "solc" 2> /dev/null || echo 'Please install solc'
4955
@type "protoc" 2> /dev/null || echo 'Please install protoc'
56+
57+
#? help: Get more info on make commands.
58+
help: Makefile
59+
@echo " Choose a command run in go-ethereum:"
60+
@sed -n 's/^#?//p' $< | column -t -s ':' | sort | sed -e 's/^/ /'
61+
.PHONY: help

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,13 @@ If both `--replica-result` & `--replica-specimen` are selected then a `block-rep
362362
363363
## <span id="geth">Go Ethereum</span>
364364
365-
Official Golang execution layer implementation of the Ethereum protocol.
365+
Golang execution layer implementation of the Ethereum protocol.
366366
367367
[![API Reference](
368-
https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667
368+
https://pkg.go.dev/badge/github.com/ethereum/go-ethereum
369369
)](https://pkg.go.dev/github.com/ethereum/go-ethereum?tab=doc)
370370
[![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum)
371-
[![Travis](https://travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.com/ethereum/go-ethereum)
371+
[![Travis](https://app.travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://app.travis-ci.com/github/ethereum/go-ethereum)
372372
[![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv)
373373
374374
Automated builds are available for stable releases and the unstable master branch. Binary

accounts/abi/abi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
)
3030

3131
// The ABI holds information about a contract's context and available
32-
// invokable methods. It will allow you to type check function calls and
32+
// invocable methods. It will allow you to type check function calls and
3333
// packs data accordingly.
3434
type ABI struct {
3535
Constructor Method

accounts/abi/bind/backends/simulated.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121

2222
"github.com/ethereum/go-ethereum/common"
23-
"github.com/ethereum/go-ethereum/core"
23+
"github.com/ethereum/go-ethereum/core/types"
2424
"github.com/ethereum/go-ethereum/ethclient/simulated"
2525
)
2626

@@ -43,8 +43,8 @@ func (b *SimulatedBackend) Fork(ctx context.Context, parentHash common.Hash) err
4343
//
4444
// Deprecated: please use simulated.Backend from package
4545
// github.com/ethereum/go-ethereum/ethclient/simulated instead.
46-
func NewSimulatedBackend(alloc core.GenesisAlloc, gasLimit uint64) *SimulatedBackend {
47-
b := simulated.New(alloc, gasLimit)
46+
func NewSimulatedBackend(alloc types.GenesisAlloc, gasLimit uint64) *SimulatedBackend {
47+
b := simulated.NewBackend(alloc, simulated.WithBlockGasLimit(gasLimit))
4848
return &SimulatedBackend{
4949
Backend: b,
5050
Client: b.Client(),

0 commit comments

Comments
 (0)