Skip to content

Commit

Permalink
Merge pull request #259 from spacemeshos/4095-enforce-max-size-for-scale
Browse files Browse the repository at this point in the history
Specify max size of variable size types encoded with scale
  • Loading branch information
fasmat authored Mar 23, 2023
2 parents 7e7e309 + c21226e commit c35147b
Show file tree
Hide file tree
Showing 16 changed files with 374 additions and 303 deletions.
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ VERSION ?= $(shell git describe --tags)
GOLANGCI_LINT_VERSION := v1.52.0
STATICCHECK_VERSION := v0.4.3
GOTESTSUM_VERSION := v1.9.0
GOSCALE_VERSION := v1.1.1
GOSCALE_VERSION := v1.1.6

BUF_VERSION := 1.8.0
PROTOC_VERSION = 21.8
Expand Down Expand Up @@ -51,6 +51,8 @@ GOTESTSUM := $(GOBIN)/gotestsum
GOVULNCHECK := $(GOBIN)/govulncheck
GOLINES := $(GOBIN)/golines

FUZZTIME ?= "10s"

$(GOVULNCHECK):
@go install golang.org/x/vuln/cmd/govulncheck@latest

Expand Down Expand Up @@ -182,3 +184,7 @@ test-generate:
@make generate
@git diff --name-only --diff-filter=AM --exit-code . || { echo "\nPlease rerun 'make generate' and commit changes.\n"; exit 1; }
.PHONY: test-generate

fuzz:
./scripts/fuzz.sh $(FUZZTIME)
.PHONY: fuzz
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/nullstyle/go-xdr v0.0.0-20180726165426-f4c839f75077
github.com/prometheus/client_golang v1.14.0
github.com/spacemeshos/api/release/go v1.5.6
github.com/spacemeshos/go-scale v1.1.4
github.com/spacemeshos/go-scale v1.1.6
github.com/spacemeshos/merkle-tree v0.2.1
github.com/spacemeshos/sha256-simd v0.1.0
github.com/stretchr/testify v1.8.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/spacemeshos/api/release/go v1.5.6 h1:ubcUppvafyRLyq+yvOzXS3u7//rxEkJ85kmcOQWQwUc=
github.com/spacemeshos/api/release/go v1.5.6/go.mod h1:4EIC5bex4jpz6RbP3i1KhacBLn+2g5xGA4Rw1JfYfZI=
github.com/spacemeshos/go-scale v1.1.4 h1:lvUUTX5ujFSkJ1If9CYCBegQI3q/qAZGPb+lYI+9wUM=
github.com/spacemeshos/go-scale v1.1.4/go.mod h1:bZscMRJOaT9TpwaqU+ca/8GmMw71KC1CIfcSPSihiT0=
github.com/spacemeshos/go-scale v1.1.6 h1:gieW5CvgoBbJTlqk5vGAu9t4NdHQcgfEL8qtJFo6BQ0=
github.com/spacemeshos/go-scale v1.1.6/go.mod h1:AxKr+yCe5qn7EsM5ZAygGdulxVVfU+Fe2bc4PsnNakM=
github.com/spacemeshos/merkle-tree v0.2.1 h1:BSs/zt1n3ceZcpWdcqNFRvTeAWDlc0W+bql0XQH/Gz4=
github.com/spacemeshos/merkle-tree v0.2.1/go.mod h1:IsrdlW6AHZ4HSi89H7G94ravFCMFZLGnm6To0tQ0SPY=
github.com/spacemeshos/sha256-simd v0.1.0 h1:G7Mfu5RYdQiuE+wu4ZyJ7I0TI74uqLhFnKblEnSpjYI=
Expand Down
259 changes: 129 additions & 130 deletions release/proto/go/rpc/api/v1/api.pb.go

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions release/proto/go/rpc/api/v1/api.pb.gw.go

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

64 changes: 32 additions & 32 deletions release/proto/go/rpc/api/v1/api_grpc.pb.go

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

Loading

0 comments on commit c35147b

Please sign in to comment.