Skip to content

Commit ee68a26

Browse files
patrick-ogradypatrick-ogrady
authored
* [email protected] * use uint for merkledb * update comment
1 parent 838307c commit ee68a26

File tree

9 files changed

+30
-32
lines changed

9 files changed

+30
-32
lines changed

Diff for: ‎examples/morpheusvm/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.20
44

55
require (
66
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02
7-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b
7+
github.com/ava-labs/avalanchego v1.10.10
88
github.com/ava-labs/hypersdk v0.0.1
99
github.com/fatih/color v1.13.0
1010
github.com/onsi/ginkgo/v2 v2.8.1
@@ -19,7 +19,7 @@ require (
1919
github.com/Microsoft/go-winio v0.5.2 // indirect
2020
github.com/NYTimes/gziphandler v1.1.1 // indirect
2121
github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
22-
github.com/ava-labs/coreth v0.12.5-rc.3 // indirect
22+
github.com/ava-labs/coreth v0.12.5-rc.6 // indirect
2323
github.com/beorn7/perks v1.0.1 // indirect
2424
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
2525
github.com/btcsuite/btcd/btcutil v1.1.3 // indirect

Diff for: ‎examples/morpheusvm/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
6161
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6262
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02 h1:VThDljvPfIWneBO6Y99Nboe3yrJwI8clhRiQ9zuHVB8=
6363
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02/go.mod h1:euKHwZ77sGvGfhVj4v9WPM4jD2b5N80ldE2XHqO7lwA=
64-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b h1:FlMhXn8LmX/ITa8phEdt5z+CTZjmJ6piUyQOmsR+tPQ=
65-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b/go.mod h1:C8R5uiltpc8MQ62ixxgODR+15mesWF0aAw3H+Qrl9Iw=
66-
github.com/ava-labs/coreth v0.12.5-rc.3 h1:cpmC+fSZMsO4gaFWqXHzAHrJACf05u5HPAYmwh7nmkU=
67-
github.com/ava-labs/coreth v0.12.5-rc.3/go.mod h1:HI+jTIflnDFBd0bledgkgid1Uurwr8q1h7zb3LsFsSo=
64+
github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
65+
github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
66+
github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
67+
github.com/ava-labs/coreth v0.12.5-rc.6/go.mod h1:s5wVyy+5UCCk2m0Tq3jVmy0UqOpKBDYqRE13gInCJVs=
6868
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
6969
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
7070
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

Diff for: ‎examples/morpheusvm/scripts/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if ! [[ "$0" =~ scripts/run.sh ]]; then
1717
exit 255
1818
fi
1919

20-
VERSION=2eabd228952b6b7c9075bc45653f70643d9a5a7c
20+
VERSION=v1.10.10
2121
MAX_UINT64=18446744073709551615
2222
MODE=${MODE:-run}
2323
LOGLEVEL=${LOGLEVEL:-info}

Diff for: ‎examples/tokenvm/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.20
44

55
require (
66
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02
7-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b
7+
github.com/ava-labs/avalanchego v1.10.10
88
github.com/ava-labs/hypersdk v0.0.1
99
github.com/fatih/color v1.13.0
1010
github.com/onsi/ginkgo/v2 v2.8.1
@@ -22,7 +22,7 @@ require (
2222
github.com/Microsoft/go-winio v0.5.2 // indirect
2323
github.com/NYTimes/gziphandler v1.1.1 // indirect
2424
github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
25-
github.com/ava-labs/coreth v0.12.5-rc.3 // indirect
25+
github.com/ava-labs/coreth v0.12.5-rc.6 // indirect
2626
github.com/beorn7/perks v1.0.1 // indirect
2727
github.com/bep/debounce v1.2.1 // indirect
2828
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect

Diff for: ‎examples/tokenvm/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
6161
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6262
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02 h1:VThDljvPfIWneBO6Y99Nboe3yrJwI8clhRiQ9zuHVB8=
6363
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02/go.mod h1:euKHwZ77sGvGfhVj4v9WPM4jD2b5N80ldE2XHqO7lwA=
64-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b h1:FlMhXn8LmX/ITa8phEdt5z+CTZjmJ6piUyQOmsR+tPQ=
65-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b/go.mod h1:C8R5uiltpc8MQ62ixxgODR+15mesWF0aAw3H+Qrl9Iw=
66-
github.com/ava-labs/coreth v0.12.5-rc.3 h1:cpmC+fSZMsO4gaFWqXHzAHrJACf05u5HPAYmwh7nmkU=
67-
github.com/ava-labs/coreth v0.12.5-rc.3/go.mod h1:HI+jTIflnDFBd0bledgkgid1Uurwr8q1h7zb3LsFsSo=
64+
github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
65+
github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
66+
github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
67+
github.com/ava-labs/coreth v0.12.5-rc.6/go.mod h1:s5wVyy+5UCCk2m0Tq3jVmy0UqOpKBDYqRE13gInCJVs=
6868
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
6969
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
7070
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

Diff for: ‎examples/tokenvm/scripts/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if ! [[ "$0" =~ scripts/run.sh ]]; then
1717
exit 255
1818
fi
1919

20-
VERSION=2eabd228952b6b7c9075bc45653f70643d9a5a7c
20+
VERSION=v1.10.10
2121
MAX_UINT64=18446744073709551615
2222
MODE=${MODE:-run}
2323
LOGLEVEL=${LOGLEVEL:-info}

Diff for: ‎go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ module github.com/ava-labs/hypersdk
33
go 1.20
44

55
require (
6+
github.com/NYTimes/gziphandler v1.1.1
67
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02
7-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b
8+
github.com/ava-labs/avalanchego v1.10.10
89
github.com/cockroachdb/pebble v0.0.0-20230224221607-fccb83b60d5c
910
github.com/golang/mock v1.6.0
11+
github.com/gorilla/mux v1.8.0
1012
github.com/gorilla/rpc v1.2.0
1113
github.com/gorilla/websocket v1.5.0
1214
github.com/manifoldco/promptui v0.9.0
@@ -15,6 +17,7 @@ require (
1517
github.com/onsi/ginkgo/v2 v2.8.1
1618
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
1719
github.com/prometheus/client_golang v1.16.0
20+
github.com/rs/cors v1.7.0
1821
github.com/stretchr/testify v1.8.3
1922
github.com/tetratelabs/wazero v1.3.0
2023
go.opentelemetry.io/otel v1.11.2
@@ -30,9 +33,8 @@ require (
3033
require (
3134
github.com/DataDog/zstd v1.5.2 // indirect
3235
github.com/Microsoft/go-winio v0.5.2 // indirect
33-
github.com/NYTimes/gziphandler v1.1.1 // indirect
3436
github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
35-
github.com/ava-labs/coreth v0.12.5-rc.3 // indirect
37+
github.com/ava-labs/coreth v0.12.5-rc.6 // indirect
3638
github.com/beorn7/perks v1.0.1 // indirect
3739
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
3840
github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
@@ -65,7 +67,6 @@ require (
6567
github.com/google/btree v1.1.2 // indirect
6668
github.com/google/pprof v0.0.0-20230406165453-00490a63f317 // indirect
6769
github.com/google/uuid v1.3.0 // indirect
68-
github.com/gorilla/mux v1.8.0 // indirect
6970
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7071
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
7172
github.com/hashicorp/go-bexpr v0.1.10 // indirect
@@ -101,7 +102,6 @@ require (
101102
github.com/prometheus/common v0.42.0 // indirect
102103
github.com/prometheus/procfs v0.10.1 // indirect
103104
github.com/rogpeppe/go-internal v1.9.0 // indirect
104-
github.com/rs/cors v1.7.0 // indirect
105105
github.com/russross/blackfriday/v2 v2.1.0 // indirect
106106
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
107107
github.com/spaolacci/murmur3 v1.1.0 // indirect

Diff for: ‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
6161
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6262
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02 h1:VThDljvPfIWneBO6Y99Nboe3yrJwI8clhRiQ9zuHVB8=
6363
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02/go.mod h1:euKHwZ77sGvGfhVj4v9WPM4jD2b5N80ldE2XHqO7lwA=
64-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b h1:FlMhXn8LmX/ITa8phEdt5z+CTZjmJ6piUyQOmsR+tPQ=
65-
github.com/ava-labs/avalanchego v1.10.10-rc.0.0.20230831160820-2eabd228952b/go.mod h1:C8R5uiltpc8MQ62ixxgODR+15mesWF0aAw3H+Qrl9Iw=
66-
github.com/ava-labs/coreth v0.12.5-rc.3 h1:cpmC+fSZMsO4gaFWqXHzAHrJACf05u5HPAYmwh7nmkU=
67-
github.com/ava-labs/coreth v0.12.5-rc.3/go.mod h1:HI+jTIflnDFBd0bledgkgid1Uurwr8q1h7zb3LsFsSo=
64+
github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
65+
github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
66+
github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
67+
github.com/ava-labs/coreth v0.12.5-rc.6/go.mod h1:s5wVyy+5UCCk2m0Tq3jVmy0UqOpKBDYqRE13gInCJVs=
6868
github.com/ava-labs/wazero v0.0.2-hypersdk h1:zsl0saXFEU/dnZ7/cFVDXoSKeavzjrqv1PoR/vKaKmY=
6969
github.com/ava-labs/wazero v0.0.2-hypersdk/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A=
7070
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=

Diff for: ‎vm/vm.go

+7-9
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,13 @@ func (vm *VM) Initialize(
207207
rootGenParallelism := math.Max(parallelism/2, 1)
208208
merkleRegistry := prometheus.NewRegistry()
209209
vm.stateDB, err = merkledb.New(ctx, vm.rawStateDB, merkledb.Config{
210-
// RootGenConcurrency only limits the number of goroutines
211-
// that a single root generation will use, not the number
212-
// of goroutines that all root generations will use if called
213-
// concurrently.
214-
RootGenConcurrency: rootGenParallelism,
215-
EvictionBatchSize: vm.config.GetStateEvictionBatchSize(),
216-
HistoryLength: vm.config.GetStateHistoryLength(),
217-
IntermediateNodeCacheSize: vm.config.GetIntermediateNodeCacheSize(),
218-
ValueNodeCacheSize: vm.config.GetValueNodeCacheSize(),
210+
// RootGenConcurrency limits the number of goroutines
211+
// that will be used across all concurrent root generations.
212+
RootGenConcurrency: uint(rootGenParallelism),
213+
EvictionBatchSize: uint(vm.config.GetStateEvictionBatchSize()),
214+
HistoryLength: uint(vm.config.GetStateHistoryLength()),
215+
IntermediateNodeCacheSize: uint(vm.config.GetIntermediateNodeCacheSize()),
216+
ValueNodeCacheSize: uint(vm.config.GetValueNodeCacheSize()),
219217
Reg: merkleRegistry,
220218
Tracer: vm.tracer,
221219
})

0 commit comments

Comments
 (0)