Skip to content

Commit

Permalink
[chore] Update [email protected] (#694)
Browse files Browse the repository at this point in the history 
* change action interface to include actor address

* moving around interfaces

* use signers

* working on sponsor integration

* working on signer transition

* chain transaction passing tests

* chain package updated

* update rpc

* update actions and auth for morepheus vm

* vm passing

* morephusvm compiles

* fix bls interface

* update state manager

* tokenvm builds

* update mocks

* update morpheusvm integration

* fix load tests

* update README

* nits

* update morepheusvm

* update usage of signatures

* wrong var

* update avalanchego

* update merkledb usage

* remove static handlers

* update ANR

* fix tstate test

* addd back mock file

* update ANR

* update mocks

* remove 1337 check

* clean up info log
  • Loading branch information
@patrick-ogrady
patrick-ogrady authored Jan 21, 2024
1 parent e3da174 commit 1cb53fe
Show file tree
Hide file tree
Showing 30 changed files with 284 additions and 576 deletions.
4 changes: 2 additions & 2 deletions chain/block.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ type StatelessBlock struct {
feeManager *FeeManager

vm VM
view merkledb.TrieView
view merkledb.View

sigJob workers.Job
}
Expand Down Expand Up @@ -266,7 +266,7 @@ func ParseStatefulBlock(
// [initializeBuilt] is invoked after a block is built
func (b *StatelessBlock) initializeBuilt(
ctx context.Context,
view merkledb.TrieView,
view merkledb.View,
results []*Result,
feeManager *FeeManager,
) error {
Expand Down
4 changes: 2 additions & 2 deletions chain/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func BuildBlock(
nextTime := time.Now().UnixMilli()
r := vm.Rules(nextTime)
if nextTime < parent.Tmstmp+r.GetMinBlockGap() {
log.Warn("block building failed", zap.Error(ErrTimestampTooEarly))
log.Debug("block building failed", zap.Error(ErrTimestampTooEarly))
return nil, ErrTimestampTooEarly
}
b := NewBlock(vm, parent, nextTime)
Expand Down Expand Up @@ -171,7 +171,7 @@ func BuildBlock(

// Ensure we can process if transaction includes a warp message
if tx.WarpMessage != nil && blockContext == nil {
log.Info(
log.Debug(
"dropping pending warp message because no context provided",
zap.Stringer("txID", tx.ID()),
)
Expand Down
15 changes: 10 additions & 5 deletions chain/mock_action.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions chain/mock_auth.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion chain/mock_auth_factory.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions chain/mock_rules.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ func (c *Config) GetMempoolSize() int { return 2_048 }
func (c *Config) GetMempoolSponsorSize() int { return 32 }
func (c *Config) GetMempoolExemptSponsors() []codec.Address { return nil }
func (c *Config) GetStreamingBacklogSize() int { return 1024 }
func (c *Config) GetStateEvictionBatchSize() int { return 4 * units.MiB }
func (c *Config) GetIntermediateNodeCacheSize() int { return 4 * units.GiB }
func (c *Config) GetStateIntermediateWriteBufferSize() int { return 32 * units.MiB }
func (c *Config) GetStateIntermediateWriteBatchSize() int { return 4 * units.MiB }
func (c *Config) GetValueNodeCacheSize() int { return 2 * units.GiB }
func (c *Config) GetTraceConfig() *trace.Config { return &trace.Config{Enabled: false} }
func (c *Config) GetStateSyncParallelism() int { return 4 }
Expand Down
41 changes: 19 additions & 22 deletions examples/morpheusvm/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ module github.com/ava-labs/hypersdk/examples/morpheusvm
go 1.20

require (
github.com/ava-labs/avalanche-network-runner v1.7.3-0.20231026155506-24d0d6a39855
github.com/ava-labs/avalanchego v1.10.15
github.com/ava-labs/avalanche-network-runner v1.7.4-rc.0
github.com/ava-labs/avalanchego v1.10.18
github.com/ava-labs/hypersdk v0.0.1
github.com/fatih/color v1.13.0
github.com/onsi/ginkgo/v2 v2.8.1
github.com/onsi/gomega v1.26.0
github.com/onsi/ginkgo/v2 v2.13.1
github.com/onsi/gomega v1.29.0
github.com/prometheus/client_golang v1.16.0
github.com/spf13/cobra v1.7.0
go.uber.org/zap v1.24.0
go.uber.org/zap v1.26.0
)

require (
Expand All @@ -20,7 +20,7 @@ require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
github.com/ava-labs/coreth v0.12.8-rc.1 // indirect
github.com/ava-labs/coreth v0.12.10-rc.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
Expand All @@ -42,17 +42,18 @@ require (
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
github.com/getsentry/sentry-go v0.18.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20230406165453-00490a63f317 // indirect
github.com/google/renameio/v2 v2.0.0 // indirect
github.com/google/uuid v1.3.0 // indirect
Expand All @@ -65,7 +66,6 @@ require (
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect
github.com/huin/goupnp v1.0.3 // indirect
Expand All @@ -87,7 +87,6 @@ require (
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/openzipkin/zipkin-go v0.4.1 // indirect
github.com/otiai10/copy v1.11.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
github.com/pires/go-proxyproto v0.6.2 // indirect
Expand All @@ -101,14 +100,13 @@ require (
github.com/rs/cors v1.7.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.12.0 // indirect
github.com/status-im/keycard-go v0.2.0 // indirect
github.com/stretchr/testify v1.8.3 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/supranational/blst v0.3.11 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
Expand All @@ -127,18 +125,17 @@ require (
go.opentelemetry.io/otel/sdk v1.11.2 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/mock v0.2.0 // indirect
go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
golang.org/x/tools v0.16.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
Expand Down
Loading

0 comments on commit 1cb53fe

Please sign in to comment.