Skip to content

Commit 2f5ae03

Browse files
LinZexiaoLinZexiao
authored
Merge pull request #240 from ipfs-force-community/chore/bump-v1.15.0-rc1
chore: bump version to v1.15.0-rc1
2 parents 5cc0ae5 + 00344cc commit 2f5ae03

File tree

6 files changed

+119
-146
lines changed

6 files changed

+119
-146
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# sophon-miner changelog
22

3+
## v1.15.0-rc1
4+
5+
* Feat/add more metrics [[#238](https://github.com/ipfs-force-community/sophon-miner/pull/238)]
6+
37
## 1.14.0
48

59
* refactor: Only pass the information needed to computeTicket [[#222](https://github.com/ipfs-force-community/sophon-miner/pull/222)]

‎build/version.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package build
33
var CurrentCommit string
44

55
// BuildVersion is the local build version, set by build system
6-
const BuildVersion = "1.14.0"
7-
const Version = "1140"
6+
const BuildVersion = "1.15.0-rc1"
7+
const Version = "1150"
88

99
func UserVersion() string {
1010
return BuildVersion + CurrentCommit

‎cmd/run.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
manet "github.com/multiformats/go-multiaddr/net"
2121
"github.com/urfave/cli/v2"
2222

23+
"github.com/ipfs-force-community/sophon-auth/core"
2324
"github.com/ipfs-force-community/sophon-auth/jwtclient"
2425

2526
lapi "github.com/ipfs-force-community/sophon-miner/api"
@@ -267,7 +268,7 @@ func serveRPC(minerAPI lapi.MinerAPI,
267268
signal.Notify(sigChan, syscall.SIGTERM, syscall.SIGINT)
268269

269270
ctx := context.Background()
270-
metrics.ApiState.Set(ctx, 1)
271-
defer metrics.ApiState.Set(ctx, 0)
271+
core.ApiState.Set(ctx, 1)
272+
defer core.ApiState.Set(ctx, 0)
272273
return srv.Serve(manet.NetListener(lst))
273274
}

‎go.mod

+30-28
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ retract v1.14.0 // Accidentally force-pushed tag, use v1.14.1+ instead.
66

77
require (
88
contrib.go.opencensus.io/exporter/jaeger v0.2.1
9-
github.com/BurntSushi/toml v1.2.0
9+
github.com/BurntSushi/toml v1.3.0
1010
github.com/etherlabsio/healthcheck/v2 v2.0.0
1111
github.com/filecoin-project/go-address v1.1.0
1212
github.com/filecoin-project/go-bitfield v0.2.4
1313
github.com/filecoin-project/go-jsonrpc v0.1.8
14-
github.com/filecoin-project/go-state-types v0.12.8
14+
github.com/filecoin-project/go-state-types v0.13.0-rc.2
1515
github.com/filecoin-project/specs-actors/v2 v2.3.6
1616
github.com/filecoin-project/specs-actors/v7 v7.0.1
17-
github.com/filecoin-project/venus v1.14.0
17+
github.com/filecoin-project/venus v1.15.0-rc1
1818
github.com/golang/mock v1.6.0
1919
github.com/google/uuid v1.3.0
2020
github.com/gorilla/mux v1.8.0
2121
github.com/ipfs-force-community/metrics v1.0.1-0.20231207081445-30178e706d09
22-
github.com/ipfs-force-community/sophon-auth v1.14.0
22+
github.com/ipfs-force-community/sophon-auth v1.15.0-rc1
2323
github.com/ipfs/go-cid v0.4.1
2424
github.com/ipfs/go-datastore v0.6.0
2525
github.com/ipfs/go-ds-leveldb v0.5.0
@@ -29,16 +29,16 @@ require (
2929
github.com/ipfs/go-metrics-interface v0.0.1
3030
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
3131
github.com/mitchellh/go-homedir v1.1.0
32-
github.com/multiformats/go-multiaddr v0.9.0
32+
github.com/multiformats/go-multiaddr v0.12.2
3333
github.com/raulk/clock v1.1.0
3434
github.com/stretchr/testify v1.8.4
3535
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
36-
github.com/urfave/cli/v2 v2.16.3
36+
github.com/urfave/cli/v2 v2.25.5
3737
go.opencensus.io v0.24.0
38-
go.uber.org/fx v1.19.2
39-
go.uber.org/zap v1.24.0
40-
golang.org/x/text v0.13.0
41-
golang.org/x/tools v0.7.0
38+
go.uber.org/fx v1.20.0
39+
go.uber.org/zap v1.25.0
40+
golang.org/x/text v0.14.0
41+
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846
4242
gorm.io/driver/mysql v1.3.5
4343
gorm.io/driver/sqlite v1.3.6
4444
gorm.io/gorm v1.23.8
@@ -49,7 +49,7 @@ require (
4949
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
5050
github.com/DataDog/zstd v1.4.5 // indirect
5151
github.com/ahmetb/go-linq/v3 v3.2.0 // indirect
52-
github.com/benbjohnson/clock v1.3.0 // indirect
52+
github.com/benbjohnson/clock v1.3.5 // indirect
5353
github.com/beorn7/perks v1.0.1 // indirect
5454
github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833 // indirect
5555
github.com/bytedance/sonic v1.9.1 // indirect
@@ -58,7 +58,7 @@ require (
5858
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
5959
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
6060
github.com/davecgh/go-spew v1.1.1 // indirect
61-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
61+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
6262
github.com/deepmap/oapi-codegen v1.3.13 // indirect
6363
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
6464
github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
@@ -139,18 +139,18 @@ require (
139139
github.com/jinzhu/now v1.1.5 // indirect
140140
github.com/jpillora/backoff v1.0.0 // indirect
141141
github.com/json-iterator/go v1.1.12 // indirect
142-
github.com/klauspost/compress v1.16.6 // indirect
143-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
142+
github.com/klauspost/compress v1.16.7 // indirect
143+
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
144144
github.com/leodido/go-urn v1.2.4 // indirect
145145
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
146146
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
147-
github.com/libp2p/go-libp2p v0.27.8 // indirect
147+
github.com/libp2p/go-libp2p v0.31.1 // indirect
148148
github.com/libp2p/go-libp2p-pubsub v0.9.3 // indirect
149149
github.com/libp2p/go-msgio v0.3.0 // indirect
150150
github.com/magefile/mage v1.11.0 // indirect
151151
github.com/magiconair/properties v1.8.6 // indirect
152152
github.com/mattn/go-isatty v0.0.19 // indirect
153-
github.com/mattn/go-sqlite3 v1.14.16 // indirect
153+
github.com/mattn/go-sqlite3 v1.14.22 // indirect
154154
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
155155
github.com/minio/sha256-simd v1.0.1 // indirect
156156
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -171,13 +171,13 @@ require (
171171
github.com/pkg/errors v0.9.1 // indirect
172172
github.com/pmezard/go-difflib v1.0.0 // indirect
173173
github.com/polydawn/refmt v0.89.0 // indirect
174-
github.com/prometheus/client_golang v1.14.0 // indirect
175-
github.com/prometheus/client_model v0.3.0 // indirect
176-
github.com/prometheus/common v0.42.0 // indirect
177-
github.com/prometheus/procfs v0.9.0 // indirect
174+
github.com/prometheus/client_golang v1.16.0 // indirect
175+
github.com/prometheus/client_model v0.4.0 // indirect
176+
github.com/prometheus/common v0.44.0 // indirect
177+
github.com/prometheus/procfs v0.10.1 // indirect
178178
github.com/prometheus/statsd_exporter v0.23.0 // indirect
179179
github.com/russross/blackfriday/v2 v2.1.0 // indirect
180-
github.com/sirupsen/logrus v1.9.0 // indirect
180+
github.com/sirupsen/logrus v1.9.2 // indirect
181181
github.com/spaolacci/murmur3 v1.1.0 // indirect
182182
github.com/spf13/afero v1.8.2 // indirect
183183
github.com/spf13/cast v1.5.0 // indirect
@@ -188,9 +188,10 @@ require (
188188
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
189189
github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect
190190
github.com/ugorji/go/codec v1.2.11 // indirect
191-
github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f // indirect
191+
github.com/whyrusleeping/cbor-gen v0.1.0 // indirect
192192
github.com/whyrusleeping/go-logging v0.0.1 // indirect
193193
github.com/x448/float16 v0.8.4 // indirect
194+
github.com/xlab/c-for-go v1.2.0 // indirect
194195
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
195196
go.opentelemetry.io/otel v1.16.0 // indirect
196197
go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect
@@ -199,16 +200,17 @@ require (
199200
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
200201
go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
201202
go.opentelemetry.io/otel/trace v1.16.0 // indirect
202-
go.uber.org/atomic v1.10.0 // indirect
203-
go.uber.org/dig v1.16.1 // indirect
203+
go.uber.org/atomic v1.11.0 // indirect
204+
go.uber.org/dig v1.17.0 // indirect
204205
go.uber.org/multierr v1.11.0 // indirect
205206
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
206207
golang.org/x/arch v0.3.0 // indirect
207-
golang.org/x/crypto v0.14.0 // indirect
208-
golang.org/x/mod v0.10.0 // indirect
208+
golang.org/x/crypto v0.18.0 // indirect
209+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
210+
golang.org/x/mod v0.12.0 // indirect
209211
golang.org/x/net v0.17.0 // indirect
210-
golang.org/x/sync v0.1.0 // indirect
211-
golang.org/x/sys v0.13.0 // indirect
212+
golang.org/x/sync v0.3.0 // indirect
213+
golang.org/x/sys v0.16.0 // indirect
212214
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
213215
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
214216
google.golang.org/api v0.81.0 // indirect

0 commit comments

Comments
 (0)