Skip to content

Commit 5d0a4fa

Browse files
simlecodesimlecode
committed
rebase v1.22.0
chore: add build_upload.yml to workflows fix: update forcenet params chore: update venus-auth to v1.11.0-rc1
1 parent 7f54785 commit 5d0a4fa

File tree

7 files changed

+347
-60
lines changed

7 files changed

+347
-60
lines changed

Diff for: ‎.github/workflows/build_upload.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: build and upload
2+
3+
on:
4+
push:
5+
branches: ['**']
6+
tags: ['**']
7+
8+
jobs:
9+
build_upload:
10+
uses: filecoin-project/venus/.github/workflows/common_build_upload.yml@master
11+
with:
12+
bin_name: 'lotus'
13+
has_ffi: true
14+
secrets:
15+
OSS_KEY_ID: ${{secrets.OSS_KEY_ID}}
16+
OSS_KEY_SECRET: ${{secrets.OSS_KEY_SECRET}}
17+
OSS_ENDPOINT: ${{secrets.OSS_ENDPOINT}}
18+
OSS_BUCKET: ${{secrets.OSS_BUCKET}}
19+
FTP_HOST: ${{secrets.FTP_HOST}}
20+
FTP_USER: ${{secrets.FTP_USER}}
21+
FTP_PWD: ${{secrets.FTP_PWD}}
22+
GODEYE_URL: ${{secrets.GODEYE_URL}}
23+
token: ${{github.token}}

Diff for: ‎build/params_force.go

+13-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
const BootstrappersFile = ""
2020
const GenesisFile = ""
2121

22-
var NetworkBundle = "devnet"
22+
var NetworkBundle = "testing"
2323
var BundleOverrides map[actorstypes.Version]string
2424

25-
const GenesisNetworkVersion = network.Version16
25+
const GenesisNetworkVersion = network.Version18
2626

2727
var UpgradeBreezeHeight = abi.ChainEpoch(-1)
2828

@@ -56,7 +56,13 @@ var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
5656

5757
var UpgradeSkyrHeight = abi.ChainEpoch(-19)
5858

59-
var UpgradeSharkHeight = abi.ChainEpoch(100)
59+
var UpgradeSharkHeight = abi.ChainEpoch(-20)
60+
61+
var UpgradeHyggeHeight = abi.ChainEpoch(-21)
62+
63+
var UpgradeLightningHeight = abi.ChainEpoch(30)
64+
65+
var UpgradeThunderHeight = abi.ChainEpoch(1000)
6066

6167
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
6268
0: DrandMainnet,
@@ -65,6 +71,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
6571
var SupportedProofTypes = []abi.RegisteredSealProof{
6672
abi.RegisteredSealProof_StackedDrg8MiBV1,
6773
abi.RegisteredSealProof_StackedDrg512MiBV1,
74+
abi.RegisteredSealProof_StackedDrg32GiBV1,
6875
}
6976
var ConsensusMinerMinPower = abi.NewStoragePower(2048)
7077
var MinVerifiedDealSize = abi.NewStoragePower(256)
@@ -110,6 +117,9 @@ func init() {
110117
UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight)
111118
UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight)
112119
UpgradeSharkHeight = getUpgradeHeight("LOTUS_SHARK_HEIGHT", UpgradeSharkHeight)
120+
UpgradeHyggeHeight = getUpgradeHeight("LOTUS_HYGGE_HEIGHT", UpgradeHyggeHeight)
121+
UpgradeLightningHeight = getUpgradeHeight("LOTUS_LIGHTNING_HEIGHT", UpgradeLightningHeight)
122+
UpgradeThunderHeight = getUpgradeHeight("LOTUS_THUNDER_HEIGHT", UpgradeThunderHeight)
113123

114124
BuildType |= BuildForce
115125

Diff for: ‎cmd/lotus/daemon.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ var DaemonCmd = &cli.Command{
9393
Name: "auth-url",
9494
Value: "",
9595
},
96+
&cli.StringFlag{
97+
Name: "auth-token",
98+
Value: "",
99+
},
96100
&cli.StringFlag{
97101
Name: makeGenFlag,
98102
Value: "",
@@ -375,8 +379,11 @@ var DaemonCmd = &cli.Command{
375379
serverOptions = append(serverOptions, jsonrpc.WithMaxRequestSize(int64(maxRequestSize)))
376380
}
377381

382+
authURL := cctx.String("auth-url")
383+
authToken := cctx.String("auth-token")
384+
log.Infof("auth url: %v, auth token: %v", authURL, authToken)
378385
// Instantiate the full node handler.
379-
h, err := node.FullNodeHandler(api, true, cctx.String("auth-url"), serverOptions...)
386+
h, err := node.FullNodeHandler(api, true, authURL, authToken, serverOptions...)
380387
if err != nil {
381388
return fmt.Errorf("failed to instantiate rpc handler: %s", err)
382389
}

Diff for: ‎go.mod

+31-19
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
github.com/filecoin-project/specs-actors/v7 v7.0.1
6161
github.com/filecoin-project/specs-actors/v8 v8.0.1
6262
github.com/filecoin-project/test-vectors/schema v0.0.6-0.20230822140104-bed37e1ca04f
63-
github.com/filecoin-project/venus-auth v1.10.0
63+
github.com/filecoin-project/venus-auth v1.11.0-rc1
6464
github.com/gbrlsnchs/jwt/v3 v3.0.1
6565
github.com/gdamore/tcell/v2 v2.2.0
6666
github.com/go-openapi/spec v0.19.11
@@ -165,6 +165,15 @@ require (
165165
gotest.tools v2.2.0+incompatible
166166
)
167167

168+
require (
169+
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
170+
github.com/goccy/go-json v0.10.0 // indirect
171+
github.com/subosito/gotenv v1.4.0 // indirect
172+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
173+
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
174+
gopkg.in/ini.v1 v1.66.6 // indirect
175+
)
176+
168177
require (
169178
contrib.go.opencensus.io/exporter/jaeger v0.2.1 // indirect
170179
github.com/GeertJohan/go.incremental v1.0.0 // indirect
@@ -173,11 +182,12 @@ require (
173182
github.com/StackExchange/wmi v1.2.1 // indirect
174183
github.com/akavel/rsrc v0.8.0 // indirect
175184
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
176-
github.com/armon/go-metrics v0.3.9 // indirect
185+
github.com/armon/go-metrics v0.3.10 // indirect
177186
github.com/benbjohnson/clock v1.3.5 // indirect
178187
github.com/beorn7/perks v1.0.1 // indirect
179188
github.com/bep/debounce v1.2.1 // indirect
180189
github.com/boltdb/bolt v1.3.1 // indirect
190+
github.com/bytedance/sonic v1.8.0 // indirect
181191
github.com/cespare/xxhash v1.1.0 // indirect
182192
github.com/cespare/xxhash/v2 v2.2.0 // indirect
183193
github.com/cilium/ebpf v0.9.1 // indirect
@@ -195,6 +205,7 @@ require (
195205
github.com/drand/kyber-bls12381 v0.2.3 // indirect
196206
github.com/elastic/go-windows v1.0.0 // indirect
197207
github.com/etclabscore/go-jsonschema-walk v0.0.6 // indirect
208+
github.com/etherlabsio/healthcheck/v2 v2.0.0 // indirect
198209
github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 // indirect
199210
github.com/filecoin-project/go-amt-ipld/v3 v3.1.0 // indirect
200211
github.com/filecoin-project/go-commp-utils/nonffi v0.0.0-20220905160352-62059082a837 // indirect
@@ -207,7 +218,7 @@ require (
207218
github.com/fsnotify/fsnotify v1.6.0 // indirect
208219
github.com/gdamore/encoding v1.0.0 // indirect
209220
github.com/gin-contrib/sse v0.1.0 // indirect
210-
github.com/gin-gonic/gin v1.7.7 // indirect
221+
github.com/gin-gonic/gin v1.9.0 // indirect
211222
github.com/go-kit/log v0.2.1 // indirect
212223
github.com/go-logfmt/logfmt v0.5.1 // indirect
213224
github.com/go-logr/logr v1.2.4 // indirect
@@ -216,9 +227,9 @@ require (
216227
github.com/go-openapi/jsonpointer v0.19.3 // indirect
217228
github.com/go-openapi/jsonreference v0.19.4 // indirect
218229
github.com/go-openapi/swag v0.19.11 // indirect
219-
github.com/go-playground/locales v0.13.0 // indirect
220-
github.com/go-playground/universal-translator v0.17.0 // indirect
221-
github.com/go-playground/validator/v10 v10.4.1 // indirect
230+
github.com/go-playground/locales v0.14.1 // indirect
231+
github.com/go-playground/universal-translator v0.18.1 // indirect
232+
github.com/go-playground/validator/v10 v10.11.2 // indirect
222233
github.com/go-redis/redis/v7 v7.0.0-beta // indirect
223234
github.com/go-redis/redis_rate/v7 v7.0.1 // indirect
224235
github.com/go-resty/resty/v2 v2.4.0 // indirect
@@ -230,7 +241,7 @@ require (
230241
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
231242
github.com/golang/protobuf v1.5.3 // indirect
232243
github.com/golang/snappy v0.0.4 // indirect
233-
github.com/google/flatbuffers v1.12.0 // indirect
244+
github.com/google/flatbuffers v2.0.0+incompatible // indirect
234245
github.com/google/go-cmp v0.5.9 // indirect
235246
github.com/google/gopacket v1.1.19 // indirect
236247
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
@@ -244,7 +255,7 @@ require (
244255
github.com/iancoleman/orderedmap v0.1.0 // indirect
245256
github.com/influxdata/influxdb-client-go/v2 v2.2.2 // indirect
246257
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
247-
github.com/ipfs-force-community/metrics v1.0.0 // indirect
258+
github.com/ipfs-force-community/metrics v1.0.1-0.20211022060227-11142a08b729 // indirect
248259
github.com/ipfs/go-bitfield v1.1.0 // indirect
249260
github.com/ipfs/go-blockservice v0.5.1 // indirect
250261
github.com/ipfs/go-ipfs-blockstore v1.3.0 // indirect
@@ -289,7 +300,7 @@ require (
289300
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
290301
github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
291302
github.com/magefile/mage v1.11.0 // indirect
292-
github.com/magiconair/properties v1.8.0 // indirect
303+
github.com/magiconair/properties v1.8.6 // indirect
293304
github.com/mailru/easyjson v0.7.7 // indirect
294305
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
295306
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -299,7 +310,7 @@ require (
299310
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
300311
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
301312
github.com/minio/sha256-simd v1.0.1 // indirect
302-
github.com/mitchellh/mapstructure v1.1.2 // indirect
313+
github.com/mitchellh/mapstructure v1.5.0 // indirect
303314
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
304315
github.com/modern-go/reflect2 v1.0.2 // indirect
305316
github.com/mr-tron/base58 v1.2.0 // indirect
@@ -313,7 +324,8 @@ require (
313324
github.com/opencontainers/runtime-spec v1.1.0 // indirect
314325
github.com/opentracing/opentracing-go v1.2.0 // indirect
315326
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
316-
github.com/pelletier/go-toml v1.2.0 // indirect
327+
github.com/pelletier/go-toml v1.9.5 // indirect
328+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
317329
github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 // indirect
318330
github.com/pkg/errors v0.9.1 // indirect
319331
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -331,15 +343,15 @@ require (
331343
github.com/shirou/gopsutil v2.18.12+incompatible // indirect
332344
github.com/sirupsen/logrus v1.9.0 // indirect
333345
github.com/spaolacci/murmur3 v1.1.0 // indirect
334-
github.com/spf13/afero v1.1.2 // indirect
335-
github.com/spf13/cast v1.3.0 // indirect
336-
github.com/spf13/jwalterweatherman v1.0.0 // indirect
337-
github.com/spf13/pflag v1.0.3 // indirect
338-
github.com/spf13/viper v1.3.2 // indirect
346+
github.com/spf13/afero v1.8.2 // indirect
347+
github.com/spf13/cast v1.5.0 // indirect
348+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
349+
github.com/spf13/pflag v1.0.5 // indirect
350+
github.com/spf13/viper v1.12.0 // indirect
339351
github.com/tidwall/gjson v1.14.4 // indirect
340352
github.com/twmb/murmur3 v1.1.6 // indirect
341353
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
342-
github.com/ugorji/go/codec v1.2.6 // indirect
354+
github.com/ugorji/go/codec v1.2.9 // indirect
343355
github.com/valyala/bytebufferpool v1.0.0 // indirect
344356
github.com/valyala/fasttemplate v1.1.0 // indirect
345357
github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 // indirect
@@ -359,10 +371,10 @@ require (
359371
golang.org/x/mod v0.12.0 // indirect
360372
golang.org/x/text v0.12.0 // indirect
361373
gonum.org/v1/gonum v0.13.0 // indirect
362-
google.golang.org/api v0.30.0 // indirect
374+
google.golang.org/api v0.81.0 // indirect
363375
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
364376
google.golang.org/grpc v1.55.0 // indirect
365-
google.golang.org/protobuf v1.30.0 // indirect
377+
google.golang.org/protobuf v1.30.0 // indirect; indirects
366378
gopkg.in/yaml.v2 v2.4.0 // indirect
367379
gopkg.in/yaml.v3 v3.0.1 // indirect
368380
gorm.io/driver/mysql v1.1.1 // indirect

0 commit comments

Comments
 (0)