diff --git a/api/types.go b/api/types.go index 74d0cce72..ae9c75c98 100644 --- a/api/types.go +++ b/api/types.go @@ -8,7 +8,6 @@ import ( "github.com/google/uuid" "github.com/ipfs/go-cid" "github.com/ipfs/go-graphsync" - "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index 0bc6e15c1..aeb7555df 100644 Binary files a/build/openrpc/full.json.gz and b/build/openrpc/full.json.gz differ diff --git a/build/openrpc/gateway.json.gz b/build/openrpc/gateway.json.gz index 3db11ade1..22c4f769f 100644 Binary files a/build/openrpc/gateway.json.gz and b/build/openrpc/gateway.json.gz differ diff --git a/chain/messagesigner/messagesigner.go b/chain/messagesigner/messagesigner.go index 214fe9fda..cdfd1a3ee 100644 --- a/chain/messagesigner/messagesigner.go +++ b/chain/messagesigner/messagesigner.go @@ -3,9 +3,9 @@ package messagesigner import ( "bytes" "context" - "github.com/google/uuid" "sync" + "github.com/google/uuid" "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" logging "github.com/ipfs/go-log/v2" diff --git a/cmd/lotus-miner/run.go b/cmd/lotus-miner/run.go index f363a7b1f..93dfea2fc 100644 --- a/cmd/lotus-miner/run.go +++ b/cmd/lotus-miner/run.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "github.com/filecoin-project/lotus/api/v1api" _ "net/http/pprof" "os" @@ -15,6 +14,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" + "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/lib/ulimit" diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md index 9a5cf0cde..b090a7a53 100644 --- a/documentation/en/api-v0-methods.md +++ b/documentation/en/api-v0-methods.md @@ -2231,7 +2231,8 @@ Inputs: } }, { - "MaxFee": "0" + "MaxFee": "0", + "MsgUuid": "07070707-0707-0707-0707-070707070707" }, [ { @@ -2705,7 +2706,8 @@ Inputs: } ], { - "MaxFee": "0" + "MaxFee": "0", + "MsgUuid": "07070707-0707-0707-0707-070707070707" } ] ``` @@ -2963,7 +2965,8 @@ Inputs: } }, { - "MaxFee": "0" + "MaxFee": "0", + "MsgUuid": "07070707-0707-0707-0707-070707070707" } ] ``` diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md index d523be1f5..0afad3fb0 100644 --- a/documentation/en/api-v1-unstable-methods.md +++ b/documentation/en/api-v1-unstable-methods.md @@ -2243,7 +2243,8 @@ Inputs: } }, { - "MaxFee": "0" + "MaxFee": "0", + "MsgUuid": "07070707-0707-0707-0707-070707070707" }, [ { @@ -2717,7 +2718,8 @@ Inputs: } ], { - "MaxFee": "0" + "MaxFee": "0", + "MsgUuid": "07070707-0707-0707-0707-070707070707" } ] ``` @@ -3106,7 +3108,8 @@ Inputs: } }, { - "MaxFee": "0" + "MaxFee": "0", + "MsgUuid": "07070707-0707-0707-0707-070707070707" } ] ``` diff --git a/itests/kit/ensemble.go b/itests/kit/ensemble.go index 420925f7c..8ad7a2394 100644 --- a/itests/kit/ensemble.go +++ b/itests/kit/ensemble.go @@ -6,7 +6,6 @@ import ( "crypto/rand" "encoding/binary" "fmt" - "github.com/filecoin-project/lotus/api/v1api" "io/ioutil" "net" "net/http" @@ -33,6 +32,7 @@ import ( power3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/power" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain" "github.com/filecoin-project/lotus/chain/actors" diff --git a/node/builder_miner.go b/node/builder_miner.go index fb2dd0fb8..db3e8d4ac 100644 --- a/node/builder_miner.go +++ b/node/builder_miner.go @@ -2,7 +2,6 @@ package node import ( "errors" - "github.com/filecoin-project/lotus/api/v1api" "time" "go.uber.org/fx" @@ -16,6 +15,7 @@ import ( provider "github.com/filecoin-project/index-provider" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/gen/slashfilter" diff --git a/node/impl/full/mpool.go b/node/impl/full/mpool.go index 9bf0d7e77..98b2ac8a6 100644 --- a/node/impl/full/mpool.go +++ b/node/impl/full/mpool.go @@ -3,12 +3,12 @@ package full import ( "context" "encoding/json" - "github.com/filecoin-project/go-address" - "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "go.uber.org/fx" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/lotus/api" diff --git a/node/modules/storageminer.go b/node/modules/storageminer.go index 52a08b476..9ffc19f9d 100644 --- a/node/modules/storageminer.go +++ b/node/modules/storageminer.go @@ -5,13 +5,13 @@ import ( "context" "errors" "fmt" - "github.com/google/uuid" "net/http" "os" "path/filepath" "strings" "time" + "github.com/google/uuid" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace"