From e95637243dfe42d5c214597848704c83eddefd7a Mon Sep 17 00:00:00 2001 From: simlecode <69969590+simlecode@users.noreply.github.com> Date: Thu, 23 Nov 2023 17:08:46 +0800 Subject: [PATCH 1/3] chore: bump version to v1.14.0 --- CHANGELOG.md | 4 ++++ go.mod | 6 +++--- go.sum | 12 ++++++------ version/version.go | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 267d98d6..c083060d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # sophon-message changelog +## v1.14.0 + +* update venus & sophon-auth + ## v1.14.0-rc3 * update venus & go-jsonrpc diff --git a/go.mod b/go.mod index 2bc2a487..3579e139 100644 --- a/go.mod +++ b/go.mod @@ -13,12 +13,12 @@ require ( github.com/filecoin-project/go-jsonrpc v0.1.5 github.com/filecoin-project/go-state-types v0.12.5 github.com/filecoin-project/specs-actors/v5 v5.0.6 - github.com/filecoin-project/venus v1.14.0-rc6 + github.com/filecoin-project/venus v1.14.0 github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 github.com/hunjixin/automapper v0.0.0-20191127090318-9b979ce72ce2 github.com/ipfs-force-community/metrics v1.0.1-0.20231011024528-8c881d456601 - github.com/ipfs-force-community/sophon-auth v1.14.0-rc1 + github.com/ipfs-force-community/sophon-auth v1.14.0 github.com/ipfs/go-cid v0.4.1 github.com/libp2p/go-libp2p v0.27.8 github.com/libp2p/go-libp2p-kad-dht v0.21.1 @@ -219,7 +219,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b // indirect - github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hraban/lrucache v0.0.0-20201130153820-17052bf09781 // indirect github.com/ipfs/boxo v0.10.1 // indirect github.com/ipfs/go-block-format v0.1.2 // indirect diff --git a/go.sum b/go.sum index 83661553..7b23a256 100644 --- a/go.sum +++ b/go.sum @@ -269,8 +269,8 @@ github.com/filecoin-project/specs-actors/v6 v6.0.2 h1:K1xPRJoW5PBvb08QF9+4w1Ajcn github.com/filecoin-project/specs-actors/v6 v6.0.2/go.mod h1:wnfVvPnYmzPZilNvSqCSSA/ZQX3rdV/U/Vf9EIoQhrI= github.com/filecoin-project/specs-actors/v7 v7.0.1 h1:w72xCxijK7xs1qzmJiw+WYJaVt2EPHN8oiwpA1Ay3/4= github.com/filecoin-project/specs-actors/v7 v7.0.1/go.mod h1:tPLEYXoXhcpyLh69Ccq91SOuLXsPWjHiY27CzawjUEk= -github.com/filecoin-project/venus v1.14.0-rc6 h1:NiLlvc11lX1tCvxeLRGbjU+GKZlxC+MT4wiLLDj0GKQ= -github.com/filecoin-project/venus v1.14.0-rc6/go.mod h1:/apMxQl6VYz1FMeBStrP3BUsBCmDhyGUW91SLjVg5e8= +github.com/filecoin-project/venus v1.14.0 h1:h2m5D+cpXJ618PmqbWeLcZmSLOaLx2bRBKRzAB+Fqyo= +github.com/filecoin-project/venus v1.14.0/go.mod h1:8dsvkGM89g+3tDduyWDEFxp8Fzc0cOAief2Riv6Q1ZY= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -491,8 +491,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/golang-lru/v2 v2.0.2 h1:Dwmkdr5Nc/oBiXgJS3CDHNhJtIHkuZ3DZF5twqnfBdU= -github.com/hashicorp/golang-lru/v2 v2.0.2/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -515,8 +515,8 @@ github.com/ipfs-force-community/go-jsonrpc v0.1.9 h1:5QavBltfvV6fz/+EbYsCkVxJ1MS github.com/ipfs-force-community/go-jsonrpc v0.1.9/go.mod h1:jBSvPTl8V1N7gSTuCR4bis8wnQnIjHbRPpROol6iQKM= github.com/ipfs-force-community/metrics v1.0.1-0.20231011024528-8c881d456601 h1:zxKQ30KAD6KfvSFAx9tuqQXLDsEHyF+eVaUBXXYC2bU= github.com/ipfs-force-community/metrics v1.0.1-0.20231011024528-8c881d456601/go.mod h1:wM6EmkEcnJgWOFcVytgvK0u15awEmt8He0f2kAdsFDA= -github.com/ipfs-force-community/sophon-auth v1.14.0-rc1 h1:r+TSz2r6H7K0ZtsiyS4Hmmf1bM62e5vQiHA8SYPIBz4= -github.com/ipfs-force-community/sophon-auth v1.14.0-rc1/go.mod h1:d6J6u3zyIwcEajRho5BhVBcoIChEf0K76wP4yJEfEhc= +github.com/ipfs-force-community/sophon-auth v1.14.0 h1:ctBJ6UHkcytEzfVPgiiHo0cW4FGQrE7r1H3Um0FcHbo= +github.com/ipfs-force-community/sophon-auth v1.14.0/go.mod h1:d6J6u3zyIwcEajRho5BhVBcoIChEf0K76wP4yJEfEhc= github.com/ipfs/bbloom v0.0.1/go.mod h1:oqo8CVWsJFMOZqTglBG4wydCE4IQA/G2/SEofB0rjUI= github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs= github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0= diff --git a/version/version.go b/version/version.go index ec701c7f..1b7b8386 100644 --- a/version/version.go +++ b/version/version.go @@ -3,7 +3,7 @@ package version var ( CurrentCommit string - BuildVersion = "1.14.0-rc3" + BuildVersion = "1.14.0" Version = BuildVersion + CurrentCommit ) From a8f3dde8730b6d95b72c486b4fd28090c39ba633 Mon Sep 17 00:00:00 2001 From: simlecode <69969590+simlecode@users.noreply.github.com> Date: Thu, 23 Nov 2023 17:16:05 +0800 Subject: [PATCH 2/3] chore: fix lint --- models/sqlite/address_test.go | 6 +++--- testhelper/mock_data.go | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/models/sqlite/address_test.go b/models/sqlite/address_test.go index 316b42db..c59aacdd 100644 --- a/models/sqlite/address_test.go +++ b/models/sqlite/address_test.go @@ -22,10 +22,10 @@ func TestAddress(t *testing.T) { ctx := context.Background() addressRepo := setupRepo(t).AddressRepo() - rand.Seed(time.Now().Unix()) - addr, err := address.NewIDAddress(rand.Uint64() / 2) + r := rand.New(rand.NewSource(time.Now().Unix())) + addr, err := address.NewIDAddress(r.Uint64() / 2) assert.NoError(t, err) - addr2, err := address.NewIDAddress(rand.Uint64() / 2) + addr2, err := address.NewIDAddress(r.Uint64() / 2) assert.NoError(t, err) addrInfo := &types.Address{ diff --git a/testhelper/mock_data.go b/testhelper/mock_data.go index f88c386c..3c244d37 100644 --- a/testhelper/mock_data.go +++ b/testhelper/mock_data.go @@ -1,6 +1,7 @@ package testhelper import ( + rand2 "crypto/rand" "math/rand" "time" @@ -159,7 +160,10 @@ func MockReplaceMessageParams() []*types.ReplacMessageParams { func GenBlockHead(miner address.Address, height abi.ChainEpoch, parents []cid.Cid) (*shared.BlockHeader, error) { data := make([]byte, 32) - rand.Read(data[:]) + _, err := rand2.Read(data[:]) + if err != nil { + return nil, err + } c, err := abi.CidBuilder.Sum(data) if err != nil { return nil, err From 59ea1681a2777da539da1f645772ce3650621f0e Mon Sep 17 00:00:00 2001 From: simlecode <69969590+simlecode@users.noreply.github.com> Date: Thu, 23 Nov 2023 17:55:58 +0800 Subject: [PATCH 3/3] chore: fix lint --- utils/convert_params_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/convert_params_test.go b/utils/convert_params_test.go index c009d2aa..211a5d52 100644 --- a/utils/convert_params_test.go +++ b/utils/convert_params_test.go @@ -307,7 +307,7 @@ func TestHasBitfield(t *testing.T) { {&eam.CreateReturn{}, true}, } for _, c := range cases { - testutil.Provide(t, c.typ) + testutil.Provide(t, c.typ, testutil.BytesFixedProvider(20)) if actual := isNeedConvert(reflect.ValueOf(c.typ)); actual != c.expect { t.Errorf("call %T failed, actual %v, expect %v", c.typ, actual, c.expect) }