Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

update to avago 1.9.3 #126

Merged
merged 4 commits into from
Nov 18, 2022
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
run: scripts/tests.integration.sh
- name: Run e2e tests
shell: bash
run: E2E=true scripts/run.sh 1.9.2
run: E2E=true scripts/run.sh 1.9.3
env:
E2E: true
build_test_release:
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ this to its logical conclusion).
[v0.0.8] AvalancheGo@v1.8.0-v1.8.6
[v0.0.9] AvalancheGo@v1.9.0-1.9.1
[v0.0.10] AvalancheGo@v1.9.2
[v0.0.11] AvalancheGo@v1.9.2
[v0.0.12] AvalancheGo@v1.9.3
```

## Introduction
Expand Down
7 changes: 4 additions & 3 deletions chain/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package chain

import (
"context"
"fmt"
"time"

Expand Down Expand Up @@ -204,7 +205,7 @@ func (b *StatelessBlock) verify() (*StatelessBlock, *versiondb.Database, error)
}

// implements "snowman.Block"
func (b *StatelessBlock) Verify() error {
func (b *StatelessBlock) Verify(ctx context.Context) error {
parent, onAcceptDB, err := b.verify()
if err != nil {
log.Debug("block verification failed", "blkID", b.ID(), "error", err)
Expand All @@ -223,7 +224,7 @@ func (b *StatelessBlock) Verify() error {
}

// implements "snowman.Block.choices.Decidable"
func (b *StatelessBlock) Accept() error {
func (b *StatelessBlock) Accept(ctx context.Context) error {
if err := b.onAcceptDB.Commit(); err != nil {
return err
}
Expand All @@ -238,7 +239,7 @@ func (b *StatelessBlock) Accept() error {
}

// implements "snowman.Block.choices.Decidable"
func (b *StatelessBlock) Reject() error {
func (b *StatelessBlock) Reject(ctx context.Context) error {
b.st = choices.Rejected
b.vm.Rejected(b)
return nil
Expand Down
3 changes: 2 additions & 1 deletion chain/block_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package chain

import (
"context"
"errors"
"testing"
"time"
Expand Down Expand Up @@ -150,7 +151,7 @@ func TestBlock(t *testing.T) {
}
for i, tv := range tt {
blk := tv.createBlk()
err := blk.Verify()
err := blk.Verify(context.Background())
if !errors.Is(err, tv.expectedVerifyErr) {
t.Fatalf("#%d: block verify expected error %v, got %v", i, tv.expectedVerifyErr, err)
}
Expand Down
3 changes: 2 additions & 1 deletion compatibility.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"rpcChainVMProtocolVersion": {
"v0.0.12": 19,
"v0.0.11": 19,
"v0.0.10": 19,
"v0.0.9": 17,
Expand All @@ -12,4 +13,4 @@
"v0.0.2": 10,
"v0.0.1": 9
}
}
}
41 changes: 21 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ module github.com/ava-labs/spacesvm
go 1.18

require (
github.com/ava-labs/avalanche-network-runner-sdk v0.2.0
github.com/ava-labs/avalanchego v1.9.2
github.com/ethereum/go-ethereum v1.10.25
github.com/ava-labs/avalanche-network-runner-sdk v0.3.0
github.com/ava-labs/avalanchego v1.9.3
github.com/ethereum/go-ethereum v1.10.26
github.com/fatih/color v1.13.0
github.com/golang/mock v1.6.0
github.com/gorilla/rpc v1.2.0
github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac
github.com/onsi/ginkgo/v2 v2.1.4
github.com/onsi/gomega v1.19.0
github.com/onsi/ginkgo/v2 v2.4.0
github.com/onsi/gomega v1.24.0
github.com/spf13/cobra v1.3.0
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.8.1
sigs.k8s.io/yaml v1.3.0
)

Expand All @@ -30,8 +30,9 @@ require (
github.com/go-stack/stack v1.8.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 // indirect
github.com/hashicorp/go-hclog v1.2.2 // indirect
github.com/hashicorp/go-plugin v1.4.4 // indirect
github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect
Expand All @@ -44,10 +45,10 @@ require (
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/supranational/blst v0.3.11-0.20220920110316-f72618070295 // indirect
Expand All @@ -63,20 +64,20 @@ require (
go.opentelemetry.io/otel/sdk v1.11.0 // indirect
go.opentelemetry.io/otel/trace v1.11.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
golang.org/x/exp v0.0.0-20220426173459-3bcf042a4bf5 // indirect
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/genproto v0.0.0-20220712132514-bdd2acd4974d // indirect
google.golang.org/grpc v1.50.0-dev // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading