Skip to content

Go ethereum version upgrade to Punisher (v1.8.27) #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pdyraga merged 7 commits into from
Jul 8, 2019
Merged

Go ethereum version upgrade to Punisher (v1.8.27) #901

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6625693
Changing import of crypto/sha3
dimpar Jul 4, 2019
2ff040c
Fixing a couple of tests that a new version of go-ethereum broke
dimpar Jul 4, 2019
9f38842
Upgrading go-ethereum from Budapest v1.8.16 to Punisher v1.8.27
dimpar Jul 4, 2019
f3a81a8
Merge remote-tracking branch 'origin' into go-ethereum-version-upgrade
dimpar Jul 8, 2019
abf8e51
Fixing error_resolver_test.go
dimpar Jul 8, 2019
28c5b03
Adding an explanation for parametes in &fixedReturnCaller{}
dimpar Jul 8, 2019
b211cd4
Adding Gopkg.lock after go-ethereum upgrade
dimpar Jul 8, 2019
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
3 changes: 2 additions & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,10 @@ required = ["github.com/gogo/protobuf/protoc-gen-gogoslick", "github.com/ethereu
revision = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"
source = "https://github.com/keep-network/cli.git"

# Punisher (v1.8.27)
[[constraint]]
name = "github.com/ethereum/go-ethereum"
revision = "477eb0933b9529f7deeccc233cc815fe34a8ea56"
revision = "4bcc0a37ab70cb79b16893556cffdaad6974e7d8"
source = "https://github.com/keep-network/go-ethereum.git"

[[constraint]]
Expand Down
2 changes: 1 addition & 1 deletion pkg/chain/ethereum/ethutil/error_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (er *ErrorResolver) ResolveError(
)
}

errorID, encodedReturns := response[0:3], response[4:]
errorID, encodedReturns := response[0:4], response[5:]
Comment thread
pdyraga marked this conversation as resolved.
Outdated

errorMethod, err := errorABI.MethodById(errorID)
if err != nil {
Expand Down
10 changes: 5 additions & 5 deletions pkg/chain/ethereum/ethutil/error_resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func TestErrorResolverHandlesShortResponses(t *testing.T) {
}

func TestErrorResolverHandlesUnknownMethodResponses(t *testing.T) {
caller := &fixedReturnCaller{[]byte{0, 0, 0, 1}}
caller := &fixedReturnCaller{[]byte{0, 0, 0, 0, 1}}
resolver := ethutil.NewErrorResolver(caller, &testABI, &testAddress)

err := resolver.ResolveError(errOriginal, common.Address{}, nil, "Test")
Expand All @@ -137,7 +137,7 @@ func TestErrorResolverHandlesUnknownMethodResponses(t *testing.T) {
}

func TestErrorResolverHandlesBadParameterResponses(t *testing.T) {
caller := &fixedReturnCaller{[]byte{8, 195, 121, 160}}
caller := &fixedReturnCaller{[]byte{8, 195, 121, 160, 42}}
Comment thread
pdyraga marked this conversation as resolved.
Outdated
resolver := ethutil.NewErrorResolver(caller, &testABI, &testAddress)

// bad response length
Expand All @@ -164,7 +164,7 @@ func TestErrorResolverHandlesBadParameterResponses(t *testing.T) {
)

// good response length, good data offset, bad string length in response
caller.returnedBytes = []byte{8, 195, 121, 160}
caller.returnedBytes = []byte{8, 195, 121, 160, 42}
caller.returnedBytes = append(caller.returnedBytes, buildingBlock[:]...)
caller.returnedBytes[len(caller.returnedBytes)-1] = 32
caller.returnedBytes = append(caller.returnedBytes, buildingBlock[:]...)
Expand All @@ -180,7 +180,7 @@ func TestErrorResolverHandlesBadParameterResponses(t *testing.T) {
}

func TestErrorResolverHandlesGoodErrorResponse(t *testing.T) {
caller := &fixedReturnCaller{[]byte{8, 195, 121, 160}}
caller := &fixedReturnCaller{[]byte{8, 195, 121, 160, 42}}

// Build a blank error message.
buildingBlock := [32]byte{}
Expand All @@ -200,7 +200,7 @@ func TestErrorResolverHandlesGoodErrorResponse(t *testing.T) {

// Build an error message.
errorMessage := "Something's gone awry."
caller.returnedBytes = []byte{8, 195, 121, 160}
caller.returnedBytes = []byte{8, 195, 121, 160, 42}
caller.returnedBytes = append(caller.returnedBytes, buildingBlock[:]...)
caller.returnedBytes[len(caller.returnedBytes)-1] = 32 // data offset, fixed
caller.returnedBytes = append(caller.returnedBytes, buildingBlock[:]...)
Expand Down
2 changes: 1 addition & 1 deletion pkg/chain/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"sort"
"sync"

"github.com/ethereum/go-ethereum/crypto/sha3"
relaychain "github.com/keep-network/keep-core/pkg/beacon/relay/chain"
relayconfig "github.com/keep-network/keep-core/pkg/beacon/relay/config"
"github.com/keep-network/keep-core/pkg/beacon/relay/event"
Expand All @@ -18,6 +17,7 @@ import (
"github.com/keep-network/keep-core/pkg/gen/async"
"github.com/keep-network/keep-core/pkg/operator"
"github.com/keep-network/keep-core/pkg/subscription"
"golang.org/x/crypto/sha3"
)

var seedGroupPublicKey = []byte("seed to group public key")
Expand Down