Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade lotus to 1.27.1 #1304

Merged
merged 4 commits into from
Jun 26, 2024
Merged

chore: upgrade lotus to 1.27.1 #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c76ee3
chore: upgrade lotus to 1.27.1
Terryhung Jun 25, 2024
0447015
Change log for test
Terryhung Jun 26, 2024
b84ffd9
update the filecoin-ffi
Terryhung Jun 26, 2024
99b49d7
update go.sum
Terryhung Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chain/watch/watcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func init() {

func TestWatcher(t *testing.T) {
if testing.Short() {
t.Skip("short testing requested")
t.Skip("short testing requested!")
}

ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
Expand Down
5 changes: 0 additions & 5 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ var log = logging.Logger("lily/config")
// Conf defines the daemon config. It should be compatible with Lotus config.
type Conf struct {
config.Common
Client config.Client
Chainstore config.Chainstore
Storage StorageConf
Queue QueueConfig
Expand Down Expand Up @@ -181,10 +180,6 @@ func DefaultConf() *Conf {
RemoteTracer: "/dns4/pubsub-tracer.filecoin.io/tcp/4001/p2p/QmTd6UvR47vUidRNZ1ZKXHrAFhqTJAD27rKL9XYghEKgKX",
},
},
Client: config.Client{
SimultaneousTransfersForStorage: config.DefaultSimultaneousTransfers,
SimultaneousTransfersForRetrieval: config.DefaultSimultaneousTransfers,
},
}
}

Expand Down
2 changes: 1 addition & 1 deletion extern/filecoin-ffi
Open in desktop
Submodule filecoin-ffi updated 11 files
+4 −4 go.mod
+16 −107 go.sum
+23 −13 install-filcrypto
+1,052 −407 rust/Cargo.lock
+5 −4 rust/Cargo.toml
+1 −1 rust/rust-toolchain.toml
+2 −2 rust/src/bls/api.rs
+13 −66 rust/src/fvm/engine.rs
+67 −2 rust/src/fvm/machine.rs
+1 −0 rust/src/fvm/mod.rs
+12 −12 rust/src/proofs/api.rs
32 changes: 5 additions & 27 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ require (
github.com/filecoin-project/go-amt-ipld/v3 v3.1.1 // indirect
github.com/filecoin-project/go-bitfield v0.2.4
github.com/filecoin-project/go-hamt-ipld/v3 v3.3.1-0.20230511074215-a0b13f309e1b
github.com/filecoin-project/go-jsonrpc v0.3.1
github.com/filecoin-project/go-jsonrpc v0.3.2
github.com/filecoin-project/go-paramfetch v0.0.4
github.com/filecoin-project/go-state-types v0.13.3
github.com/filecoin-project/lotus v1.27.0
github.com/filecoin-project/go-state-types v0.14.0-dev
github.com/filecoin-project/lotus v1.27.1
github.com/filecoin-project/specs-actors v0.9.15
github.com/filecoin-project/specs-actors/v2 v2.3.6
github.com/filecoin-project/specs-actors/v3 v3.1.2
Expand Down Expand Up @@ -83,17 +83,13 @@ require (
github.com/GeertJohan/go.rice v1.0.3 // indirect
github.com/Gurpartap/async v0.0.0-20180927173644-4f7f499dd9ee // indirect
github.com/Jorropo/jsync v1.0.1 // indirect
github.com/KarpelesLab/reflink v1.0.1 // indirect
github.com/Kubuxu/imtui v0.0.0-20210401140320-41663d68d0fa // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/akavel/rsrc v0.8.0 // indirect
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bep/debounce v1.2.1 // indirect
github.com/buger/goterm v1.0.3 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand Down Expand Up @@ -123,17 +119,12 @@ require (
github.com/elastic/go-windows v1.0.0 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/filecoin-project/dagstore v0.5.2 // indirect
github.com/filecoin-project/filecoin-ffi v0.30.4-0.20220519234331-bfd1f5f9fe38 // indirect
github.com/filecoin-project/go-cbor-util v0.0.1 // indirect
github.com/filecoin-project/go-commp-utils v0.1.3 // indirect
github.com/filecoin-project/go-commp-utils/nonffi v0.0.0-20220905160352-62059082a837 // indirect
github.com/filecoin-project/go-crypto v0.0.1 // indirect
github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc8 // indirect
github.com/filecoin-project/go-ds-versioning v0.1.2 // indirect
github.com/filecoin-project/go-fil-commcid v0.1.0 // indirect
github.com/filecoin-project/go-fil-commp-hashhash v0.1.0 // indirect
github.com/filecoin-project/go-fil-markets v1.28.3 // indirect
github.com/filecoin-project/go-hamt-ipld v0.1.5 // indirect
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 // indirect
github.com/filecoin-project/go-padreader v0.0.1 // indirect
Expand All @@ -148,7 +139,7 @@ require (
github.com/gbrlsnchs/jwt/v3 v3.0.1 // indirect
github.com/gdamore/encoding v1.0.0 // indirect
github.com/gdamore/tcell/v2 v2.2.0 // indirect
github.com/georgysavva/scany/v2 v2.0.0 // indirect
github.com/georgysavva/scany/v2 v2.1.3 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
Expand All @@ -171,7 +162,6 @@ require (
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 // indirect
github.com/hannahhoward/cbor-gen-for v0.0.0-20230214144701-5d17c9d5243c // indirect
github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand All @@ -181,15 +171,12 @@ require (
github.com/icza/backscanner v0.0.0-20210726202459-ac2ffc679f94 // indirect
github.com/invopop/jsonschema v0.12.0 // indirect
github.com/ipfs/bbloom v0.0.4 // indirect
github.com/ipfs/go-bitfield v1.1.0 // indirect
github.com/ipfs/go-blockservice v0.5.2 // indirect
github.com/ipfs/go-cidutil v0.1.0 // indirect
github.com/ipfs/go-datastore v0.6.0 // indirect
github.com/ipfs/go-ds-badger2 v0.1.3 // indirect
github.com/ipfs/go-ds-leveldb v0.5.0 // indirect
github.com/ipfs/go-ds-measure v0.2.0 // indirect
github.com/ipfs/go-graphsync v0.17.0 // indirect
github.com/ipfs/go-ipfs-blocksutil v0.0.1 // indirect
github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
github.com/ipfs/go-ipfs-ds-help v1.1.1 // indirect
github.com/ipfs/go-ipfs-exchange-interface v0.2.1 // indirect
Expand All @@ -200,28 +187,21 @@ require (
github.com/ipfs/go-merkledag v0.11.0 // indirect
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
github.com/ipfs/go-unixfsnode v1.9.0 // indirect
github.com/ipfs/go-verifcid v0.0.3 // indirect
github.com/ipld/go-car/v2 v2.13.1 // indirect
github.com/ipld/go-codec-dagpb v1.6.0 // indirect
github.com/ipld/go-ipld-adl-hamt v0.0.0-20220616142416-9004dbd839e0 // indirect
github.com/ipld/go-ipld-selector-text-lite v0.0.1 // indirect
github.com/ipni/go-libipni v0.0.8 // indirect
github.com/ipni/index-provider v0.12.0 // indirect
github.com/ipsn/go-secp256k1 v0.0.0-20180726113642-9d62b9f0bc52 // indirect
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa // indirect
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
github.com/jackc/pgx/v5 v5.4.1 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/jessevdk/go-flags v1.4.0 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/kilic/bls12-381 v0.1.0 // indirect
github.com/klauspost/compress v1.17.8 // indirect
Expand All @@ -231,7 +211,6 @@ require (
github.com/libp2p/go-cidranger v1.1.0 // indirect
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
github.com/libp2p/go-libp2p-gostream v0.6.0 // indirect
github.com/libp2p/go-libp2p-kad-dht v0.25.2 // indirect
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
github.com/libp2p/go-libp2p-pubsub v0.11.0 // indirect
Expand Down Expand Up @@ -310,7 +289,6 @@ require (
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
github.com/triplewz/poseidon v0.0.0-20230828015038-79d8165c88ed // indirect
github.com/twmb/murmur3 v1.1.6 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.0.1 // indirect
github.com/vmihailenco/bufpool v0.1.11 // indirect
Expand Down
Loading