From 9246788bff07b5901a067800233d2b294204ba4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 10 Dec 2019 00:19:46 +0100 Subject: [PATCH 01/35] Don't allow retrieval of unsealed data --- storage/sectorblocks/blockstore.go | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/storage/sectorblocks/blockstore.go b/storage/sectorblocks/blockstore.go index de6039ff5..b0807ef3a 100644 --- a/storage/sectorblocks/blockstore.go +++ b/storage/sectorblocks/blockstore.go @@ -2,6 +2,8 @@ package sectorblocks import ( "context" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/storage" "io/ioutil" blocks "github.com/ipfs/go-block-format" @@ -72,11 +74,22 @@ func (s *SectorBlockStore) Get(c cid.Cid) (blocks.Block, error) { return nil, blockstore.ErrNotFound } - best := refs[0] // TODO: better strategy (e.g. look for already unsealed) - - si, err := s.sectorBlocks.Miner.GetSectorInfo(best.SectorID) - if err != nil { - return nil, xerrors.Errorf("getting sector info: %w", err) + // TODO: better strategy (e.g. look for already unsealed) + var best api.SealedRef + var bestSi storage.SectorInfo + for _, r := range refs { + si, err := s.sectorBlocks.Miner.GetSectorInfo(r.SectorID) + if err != nil { + return nil, xerrors.Errorf("getting sector info: %w", err) + } + if si.State == api.Proving { + best = r + bestSi = si + break + } + } + if bestSi.State == api.UndefinedSectorState { + return nil, xerrors.New("no sealed sector found") } log.Infof("reading block %s from sector %d(+%d;%d)", c, best.SectorID, best.Offset, best.Size) @@ -85,8 +98,8 @@ func (s *SectorBlockStore) Get(c cid.Cid) (blocks.Block, error) { best.SectorID, best.Offset, best.Size, - si.Ticket.TicketBytes, - si.CommD, + bestSi.Ticket.TicketBytes, + bestSi.CommD, ) if err != nil { return nil, xerrors.Errorf("unsealing block: %w", err) From 168661133c7f162aa4c3c0308e422e9234553e0f Mon Sep 17 00:00:00 2001 From: wwwjim Date: Tue, 10 Dec 2019 02:01:26 -0800 Subject: [PATCH 02/35] documentation: support for scripting auth environment variables --- documentation/cn/api-scripting-support.md | 3 ++ documentation/cn/updating-lotus.md | 3 ++ documentation/en/api-scripting-support.md | 31 +++++++++++++++++++++ documentation/en/api.md | 34 +++++++++++------------ documentation/en/join-devnet.md | 2 +- documentation/en/mining.md | 4 ++- 6 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 documentation/cn/api-scripting-support.md create mode 100644 documentation/cn/updating-lotus.md create mode 100644 documentation/en/api-scripting-support.md diff --git a/documentation/cn/api-scripting-support.md b/documentation/cn/api-scripting-support.md new file mode 100644 index 000000000..4f16a070a --- /dev/null +++ b/documentation/cn/api-scripting-support.md @@ -0,0 +1,3 @@ +# API Scripting Support + +工作正在进行中 diff --git a/documentation/cn/updating-lotus.md b/documentation/cn/updating-lotus.md new file mode 100644 index 000000000..fcf1ec4f9 --- /dev/null +++ b/documentation/cn/updating-lotus.md @@ -0,0 +1,3 @@ +# Updating Lotus + +工作正在进行中 \ No newline at end of file diff --git a/documentation/en/api-scripting-support.md b/documentation/en/api-scripting-support.md new file mode 100644 index 000000000..27bc59aa5 --- /dev/null +++ b/documentation/en/api-scripting-support.md @@ -0,0 +1,31 @@ +# API Scripting Support + +You may want to delegate the work **Lotus Storage Miner** or **Lotus Node** perform to other machines. Here is how to setup the necessary authorization and environment variables. + +## Generate a JWT + +To generate a JWT for your environment variables, use this command: + +```sh +lotus auth create-token --perm admin +lotus-storage-miner auth create-token --perm admin +``` + +## Environment variables + +Environmental variables are variables that are defined for the current shell and are inherited by any child shells or processes. Environmental variables are used to pass information into processes that are spawned from the shell. + +Using the JWT you generated, you can assign it and the **multiaddr** to the appropriate environment variable. + +```sh +# Lotus Node +FULLNODE_API_INFO="JWT_TOKEN:/ip4/127.0.0.1/tcp/1234/http" + +# Lotus Storage Miner +STORAGE_API_INFO="JWT_TOKEN:/ip4/127.0.0.1/tcp/2345/http" +``` + +* The **Lotus Node**'s `mutliaddr` is in `~/.lotus/api`. +* The default token is in `~/.lotus/token`. +* The **Lotus Storage Miner**'s `multiaddr` is in `~/.lotusstorage/config`. +* The default token is in `~/.lotusstorage/token`. \ No newline at end of file diff --git a/documentation/en/api.md b/documentation/en/api.md index bb6791206..b32a38782 100644 --- a/documentation/en/api.md +++ b/documentation/en/api.md @@ -49,7 +49,7 @@ curl -X POST \ > In the future we will add a playground to make it easier to build and experiment with API requests. -## Authorization +## CURL authorization To authorize your request, you will need to include the **JWT** in a HTTP header, for example: @@ -59,23 +59,23 @@ To authorize your request, you will need to include the **JWT** in a HTTP header Admin token is stored in `~/.lotus/token` for the **Lotus Node** or `~/.lotusstorage/token` for the **Lotus Storage Miner**. -## Authorization types +## How do I generate a token? + +To generate a JWT with custom permissions, use this command: + +```sh +# Lotus Node +lotus auth create-token --perm admin + +# Lotus Storage Miner +lotus-storage-miner auth create-token --perm admin +``` + +## What authorization level should I use? When viewing [api/struct.go](https://github.com/filecoin-project/lotus/blob/master/api/struct.go), you will encounter these types: - `read` - Read node state, no private data. -- `write` - Write to local store / chain, read private data. -- `sign` - Use private keys stored in wallet for signing. -- `admin` - Manage permissions. - -Payload - -```json -{ - "Allow": [ - "read", - "write", - /* other options */ - ] -} -``` +- `write` - Write to local store / chain, and `read` permissions. +- `sign` - Use private keys stored in wallet for signing, `read` and `write` permissions. +- `admin` - Manage permissions, `read`, `write`, and `sign` permissions. diff --git a/documentation/en/join-devnet.md b/documentation/en/join-devnet.md index ac8c8dd1c..9a40ce107 100644 --- a/documentation/en/join-devnet.md +++ b/documentation/en/join-devnet.md @@ -49,7 +49,7 @@ Here is an example of the response t3vhfme4qfvegqaz7m7q6o6afjcs67n6kpzv7t2eozio4chwpafwa2y4l7zhwd5eom7jmihzdg4s52dpvnclza ``` -- Visit the [faucet](https://lotus-faucet.kittyhawk.wtf/funds.html) +- Visit the [faucet](https://lotus-faucet.kittyhawk.wtf/funds.html) to add funds. - Paste the address you created. - Press the send button. diff --git a/documentation/en/mining.md b/documentation/en/mining.md index e9b338c64..d0b0d1cf4 100644 --- a/documentation/en/mining.md +++ b/documentation/en/mining.md @@ -17,7 +17,7 @@ lotus wallet list With your wallet address: - Visit the [faucet](https://lotus-faucet.kittyhawk.wtf/miner.html) -- Click "Create Miner +- Click "Create Miner" - DO NOT REFRESH THE PAGE. THIS OPERATION CAN TAKE SOME TIME. The task will be complete when you see: @@ -50,6 +50,8 @@ To mine: lotus-storage-miner run ``` +If you are downloading **Filecoin Parameters**, the download can take some time. + Get information about your miner: ```sh From 707f7878e3ee06a2af3c8077114754a52e5ac7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 10 Dec 2019 13:09:56 +0100 Subject: [PATCH 03/35] paramfetch: respect FIL_PROOFS_PARAMETER_CACHE --- build/paramfetch.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build/paramfetch.go b/build/paramfetch.go index b647f675b..14bb80f29 100644 --- a/build/paramfetch.go +++ b/build/paramfetch.go @@ -25,6 +25,7 @@ var log = logging.Logger("build") //const gateway = "http://198.211.99.118/ipfs/" const gateway = "https://ipfs.io/ipfs/" const paramdir = "/var/tmp/filecoin-proof-parameters" +const dirEnv = "FIL_PROOFS_PARAMETER_CACHE" type paramFile struct { Cid string `json:"cid"` @@ -39,8 +40,15 @@ type fetch struct { errs []error } +func getParamDir() string { + if os.Getenv(dirEnv) == "" { + return paramdir + } + return os.Getenv(dirEnv) +} + func GetParams(storageSize uint64) error { - if err := os.Mkdir(paramdir, 0755); err != nil && !os.IsExist(err) { + if err := os.Mkdir(getParamDir(), 0755); err != nil && !os.IsExist(err) { return err } @@ -70,7 +78,7 @@ func (ft *fetch) maybeFetchAsync(name string, info paramFile) { go func() { defer ft.wg.Done() - path := filepath.Join(paramdir, name) + path := filepath.Join(getParamDir(), name) err := ft.checkFile(path, info) if !os.IsNotExist(err) && err != nil { From 5e7402cbfaa85cff1f6ab36269c1fe8656fe9f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 10 Dec 2019 13:10:15 +0100 Subject: [PATCH 04/35] gofmt --- api/api_storage.go | 4 ++-- node/impl/storminer.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/api_storage.go b/api/api_storage.go index 816ad74bf..f34bb3367 100644 --- a/api/api_storage.go +++ b/api/api_storage.go @@ -87,9 +87,9 @@ type SectorInfo struct { Deals []uint64 Ticket sectorbuilder.SealTicket Seed sectorbuilder.SealSeed - Retries uint64 + Retries uint64 - LastErr string + LastErr string } type SealedRef struct { diff --git a/node/impl/storminer.go b/node/impl/storminer.go index 2b3a0352e..a31bd07a9 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -167,7 +167,7 @@ func (sm *StorageMinerAPI) SectorsStatus(ctx context.Context, sid uint64) (api.S Deals: deals, Ticket: info.Ticket.SB(), Seed: info.Seed.SB(), - Retries: info.Nonce, + Retries: info.Nonce, LastErr: info.LastErr, }, nil From ee675b411eb2b164d3c5be4a3120ce40ab99b87f Mon Sep 17 00:00:00 2001 From: wwwjim Date: Tue, 10 Dec 2019 07:43:12 -0800 Subject: [PATCH 05/35] documentation: adds additional command to update instructions --- documentation/en/updating-lotus.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/documentation/en/updating-lotus.md b/documentation/en/updating-lotus.md index bfb9ec065..0c721884c 100644 --- a/documentation/en/updating-lotus.md +++ b/documentation/en/updating-lotus.md @@ -3,7 +3,11 @@ If you installed Lotus on your machine, you can upgrade to the latest version by doing the following: ```sh +# get the latest git pull origin master + +# clean and remake the binaries +make clean build ``` Sometimes when you run Lotus after a pull, certain commands such as `lotus daemon` may break. From e6dd4711031708d77c453d3235a47badffc6fe2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 11 Dec 2019 01:22:58 +0100 Subject: [PATCH 06/35] Version fixes --- build/version.go | 12 ++++++++---- cli/version.go | 6 +++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build/version.go b/build/version.go index 8ff70926d..5b2079a61 100644 --- a/build/version.go +++ b/build/version.go @@ -1,7 +1,7 @@ package build // Version is the local build version, set by build system -const Version = "0.11.0" +const Version = "0.1.0" // APIVersion is a hex semver version of the rpc api exposed // @@ -12,15 +12,19 @@ const Version = "0.11.0" // R R H // |\vv/| // vv vv -const APIVersion = 0x000b01 +const APIVersion = 0x000100 const ( MajorMask = 0xff0000 MinorMask = 0xffff00 PatchMask = 0xffffff -) + + MajorOnlyMask = 0xff0000 + MinorOnlyMask = 0x00ff00 + PatchOnlyMask = 0x0000ff +c) // VersionInts returns (major, minor, patch) versions func VersionInts(version uint32) (uint32, uint32, uint32) { - return (version & MajorMask) >> 16, (version & MinorMask) >> 8, version & PatchMask + return (version & MajorOnlyMask) >> 16, (version & MinorOnlyMask) >> 8, version & PatchOnlyMask } diff --git a/cli/version.go b/cli/version.go index f451b4514..cf4ad2932 100644 --- a/cli/version.go +++ b/cli/version.go @@ -19,7 +19,11 @@ var versionCmd = &cli.Command{ ctx := ReqContext(cctx) // TODO: print more useful things - fmt.Println(api.Version(ctx)) + v, err := api.Version(ctx) + if err != nil { + return err + } + fmt.Println(v) cli.VersionPrinter(cctx) return nil }, From 4ff1b2c4aee86398fc33d00bfe4eeb3fff81fa8f Mon Sep 17 00:00:00 2001 From: wwwjim Date: Tue, 10 Dec 2019 17:50:13 -0800 Subject: [PATCH 07/35] documentation: updates from the testing session --- documentation/en/api-troubleshooting.md | 2 +- documentation/en/api.md | 8 +++- documentation/en/hardware-mining.md | 45 ++++++++++++++++++- documentation/en/join-devnet.md | 10 ++++- documentation/en/mining.md | 2 +- documentation/en/retrieving-data.md | 2 +- documentation/en/setup-troubleshooting.md | 6 +++ .../en/storing-data-troubleshooting.md | 12 ++++- documentation/en/storing-data.md | 2 +- 9 files changed, 79 insertions(+), 10 deletions(-) diff --git a/documentation/en/api-troubleshooting.md b/documentation/en/api-troubleshooting.md index 9282764a3..72f3d81ae 100644 --- a/documentation/en/api-troubleshooting.md +++ b/documentation/en/api-troubleshooting.md @@ -17,7 +17,7 @@ curl -X POST \ ## Sending a CID -If you do not serialize the CID as a JSON IPLD link, you will receive an error. Here is an example of a broken CURL request: +If you do not serialize the CID as a [JSON IPLD link](https://did-ipid.github.io/ipid-did-method/#txref), you will receive an error. Here is an example of a broken CURL request: ```sh curl -X POST \ diff --git a/documentation/en/api.md b/documentation/en/api.md index b32a38782..cb1f9a1f7 100644 --- a/documentation/en/api.md +++ b/documentation/en/api.md @@ -6,7 +6,7 @@ Implementation details for the **JSON-RPC** package are [here](https://github.co ## Overview -API requests are made against `127.0.0.1:1234` unless you modify `~/.lotus/api`. +API requests are made against `127.0.0.1:1234` unless you modify `.lotus/config.toml`. Options: @@ -16,7 +16,11 @@ Options: ## What methods can I use? -Every `method` is available in [api/api.go](https://github.com/filecoin-project/lotus/blob/master/api/api_full.go). +For now, you can look into different files to find methods available to you based on your needs: + +* [Both Lotus node + storage miner APIs](https://github.com/filecoin-project/lotus/blob/master/api/api_common.go) +* [Lotus node API](https://github.com/filecoin-project/lotus/blob/master/api/api_full.go) +* [Storage miner API](https://github.com/filecoin-project/lotus/blob/master/api/api_storage.go) The necessary permissions for each are in [api/struct.go](https://github.com/filecoin-project/lotus/blob/master/api/struct.go). diff --git a/documentation/en/hardware-mining.md b/documentation/en/hardware-mining.md index 4e047c50d..045a00607 100644 --- a/documentation/en/hardware-mining.md +++ b/documentation/en/hardware-mining.md @@ -1,5 +1,46 @@ # Mining Hardware -> This page is a work in progress. EVERYTHING HERE CAN CHANGE AND WILL CHANGE. PURCHASE HARDWARE AT YOUR OWN RISK. +> This documentation page describes the standard testing configuration the Protocol Labs team has used to test **Lotus Storage Miner**s on Lotus. There is no guarantee this testing configuration will be suitable for Filecoin storage mining at MainNet launch. If you need to buy new hardware to join the Filecoin TestNet, we recommend to buy no more hardware than you require for testing. To learn more please read this [hardware blog post](https://filecoin.io/blog/filecoin-testnet-mining/) -Please check out this [GitHub issue](https://github.com/filecoin-project/lotus/issues/694) to see benchmarks from existing hardware setups if you plan on participating in the **Filecoin TestNet** \ No newline at end of file +**Sector sizes** and **minimum pledged storage** required to mine blocks are two very important Filecoin TestNet parameters that impact hardware decisions. We will continue to refine all parameters during TestNet. + +BECAUSE OF THIS, OUR STANDARD TESTING CONFIGURATION FOR FILECOIN MAINNET CAN AND WILL CHANGE. YOU HAVE BEEN WARNED. + +## Example configuration + +The setup below is a minimal example for sealing 32 GiB sectors on Lotus: + +* 3 TB of hard drive space. +* 8 to 12 core CPU +* 256 GB of RAM + +## Benchmarked GPUs + +GPUs are a must for getting **block rewards**. Here are a few that have been tried in the past: + +* GeForce RTX 2080 Ti +* GeForce RTX 2080 SUPER +* GeForce RTX 2080 +* GeForce GTX 1080 Ti +* GeForce GTX 1080 +* GeForce GTX 1060 + +## Testing other GPUs + +If you want to test other GPUs, such as the GeForce GTX 1660, you can use the following configuration flag: + +```sh +BELLMAN_CUSTOM_GPU=":" +``` + +Here is an example of trying a GeForce GTX 1660 ti with 1536 cores. + +```sh +BELLMAN_CUSTOM_GPU="GeForce GTX 1660 Ti:1536" +``` + +To get the number of cores for your GPU, you will need to check your cards specifications. + +## Benchmarking + +Here is a [benchmarking tool](https://github.com/filecoin-project/lotus/tree/testnet-staging/cmd/lotus-bench) and a [GitHub issue thread](https://github.com/filecoin-project/lotus/issues/694) for those who wish to experiment with and contribute hardware setups for the **Filecoin TestNet**. \ No newline at end of file diff --git a/documentation/en/join-devnet.md b/documentation/en/join-devnet.md index 9a40ce107..8efba8e5e 100644 --- a/documentation/en/join-devnet.md +++ b/documentation/en/join-devnet.md @@ -55,7 +55,7 @@ t3vhfme4qfvegqaz7m7q6o6afjcs67n6kpzv7t2eozio4chwpafwa2y4l7zhwd5eom7jmihzdg4s52dp ## Check wallet address balance -Wallet balances in the devnet are in **FIL**, the smallest denomination of FIL is an **attoFil**, where 1 attoFil = 10^-18 FIL. +Wallet balances in the Lotus DevNet are in **FIL**, the smallest denomination of FIL is an **attoFil**, where 1 attoFil = 10^-18 FIL. ```sh lotus wallet balance @@ -63,6 +63,14 @@ lotus wallet balance You will not see any attoFIL in your wallet if your **chain** is not fully synced. +## Send FIL to another wallet + +To send FIL to another wallet, use this command: + +``` +lotus send +``` + ## Monitor the dashboard To see the latest network activity, including **chain block height**, **block height**, **blocktime**, **total network power**, largest **block producer miner**, check out the [monitoring dashboard](https://lotus-metrics.kittyhawk.wtf). diff --git a/documentation/en/mining.md b/documentation/en/mining.md index d0b0d1cf4..38c81176f 100644 --- a/documentation/en/mining.md +++ b/documentation/en/mining.md @@ -50,7 +50,7 @@ To mine: lotus-storage-miner run ``` -If you are downloading **Filecoin Parameters**, the download can take some time. +If you are downloading **Filecoin Proof Parameters**, the download can take some time. Get information about your miner: diff --git a/documentation/en/retrieving-data.md b/documentation/en/retrieving-data.md index 7f86873e7..56f8296e8 100644 --- a/documentation/en/retrieving-data.md +++ b/documentation/en/retrieving-data.md @@ -2,7 +2,7 @@ > There are recent bug reports with these instructions. If you happen to encounter any problems, please create a [GitHub issue](https://github.com/filecoin-project/lotus/issues/new) and a maintainer will address the problem as soon as they can. -Here are the operations you can perform after you have stored a **Data CID** with the **Lotus Storage Miner** in the network. +Here are the operations you can perform after you have stored and sealed a **Data CID** with the **Lotus Storage Miner** in the network. If you would like to learn how to store a **Data CID** on a miner, read the instructions [here](https://docs.lotu.sh/en+storing-data). diff --git a/documentation/en/setup-troubleshooting.md b/documentation/en/setup-troubleshooting.md index 63d7234f9..c14d0a996 100644 --- a/documentation/en/setup-troubleshooting.md +++ b/documentation/en/setup-troubleshooting.md @@ -23,6 +23,12 @@ ERROR hello hello/hello.go:81 other peer has different genesis! * Try deleting your file system's `~/.lotus` directory. Check that it exists with `ls ~/.lotus`. +```sh +- repo is already locked +``` + +* You already have another lotus deamon running. + ## Failed messages Some errors will occur that do not prevent Lotus from working: diff --git a/documentation/en/storing-data-troubleshooting.md b/documentation/en/storing-data-troubleshooting.md index d39e73cf7..19f77934f 100644 --- a/documentation/en/storing-data-troubleshooting.md +++ b/documentation/en/storing-data-troubleshooting.md @@ -10,4 +10,14 @@ WARN main lotus/main.go:72 routing: not found WARN main lotus/main.go:72 failed to start deal: computing commP failed: generating CommP: Piece must be at least 127 bytes ``` -* There is a minimum file size of 127 bytes. \ No newline at end of file +* There is a minimum file size of 127 bytes. + +## Troubleshooting Sealing + +Miners can check sealing progress with this command: + +```sh +lotus-storage-miner sectors list +``` + +When sealing is complete, `pSet: NO` will become `pSet: YES`. From now on the **Data CID** is [retrievable](https://docs.lotu.sh/en+retrieving-data) from the **Lotus Storage Miner**. \ No newline at end of file diff --git a/documentation/en/storing-data.md b/documentation/en/storing-data.md index 723088cd7..ef178f94d 100644 --- a/documentation/en/storing-data.md +++ b/documentation/en/storing-data.md @@ -52,4 +52,4 @@ lotus client deal Upon success, this command will return a **Deal CID**. -From now on the **Data CID** is [retrievable](https://docs.lotu.sh/en+retrieving-data) from the **Lotus Storage Miner**. \ No newline at end of file +To retrieve this file it must be sealed. If the **Lotus Storage Miner** is not running on a machine designed for sealing, the process will take a very long time. From 1888b68e38a060b747fcc920ec0bd46e98f26260 Mon Sep 17 00:00:00 2001 From: lanzafame Date: Wed, 11 Dec 2019 12:06:28 +1000 Subject: [PATCH 08/35] accept humanized size values to cli flags --- cli/params.go | 12 +++++++++--- cmd/lotus-bench/main.go | 12 +++++++++--- go.mod | 1 + go.sum | 2 ++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cli/params.go b/cli/params.go index df7e240ec..11a956120 100644 --- a/cli/params.go +++ b/cli/params.go @@ -1,6 +1,7 @@ package cli import ( + "github.com/docker/go-units" "github.com/filecoin-project/lotus/build" "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" @@ -10,13 +11,18 @@ var fetchParamCmd = &cli.Command{ Name: "fetch-params", Usage: "Fetch proving parameters", Flags: []cli.Flag{ - &cli.Uint64Flag{ + &cli.StringFlag{ Name: "proving-params", - Usage: "download params used creating proofs for given size", + Usage: "download params used creating proofs for given size, i.e. 32GiB", }, }, Action: func(cctx *cli.Context) error { - err := build.GetParams(cctx.Uint64("proving-params")) + sectorSizeInt, err := units.FromHumanSize(cctx.String("proving-params")) + if err != nil { + return err + } + sectorSize := uint64(sectorSizeInt) + err = build.GetParams(sectorSize) if err != nil { return xerrors.Errorf("fetching proof parameters: %w", err) } diff --git a/cmd/lotus-bench/main.go b/cmd/lotus-bench/main.go index 7964186f2..b94cb8fa0 100644 --- a/cmd/lotus-bench/main.go +++ b/cmd/lotus-bench/main.go @@ -5,6 +5,7 @@ import ( "context" "crypto/sha256" "fmt" + "github.com/docker/go-units" "io/ioutil" "math/rand" "os" @@ -60,9 +61,10 @@ func main() { Value: "~/.lotus-bench", Usage: "Path to the storage directory that will store sectors long term", }, - &cli.Uint64Flag{ + &cli.StringFlag{ Name: "sector-size", - Value: 1024, + Value: "1GiB", + Usage: "size of the sectors in bytes, i.e. 32GiB", }, &cli.BoolFlag{ Name: "no-gpu", @@ -95,7 +97,11 @@ func main() { return err } - sectorSize := c.Uint64("sector-size") + sectorSizeInt, err := units.FromHumanSize(c.String("sector-size")) + if err != nil { + return err + } + sectorSize := uint64(sectorSizeInt) mds := datastore.NewMapDatastore() cfg := §orbuilder.Config{ diff --git a/go.mod b/go.mod index 32b469d60..b6d315e20 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/GeertJohan/go.rice v1.0.0 github.com/Gurpartap/async v0.0.0-20180927173644-4f7f499dd9ee github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect + github.com/docker/go-units v0.4.0 github.com/fatih/color v1.7.0 // indirect github.com/filecoin-project/chain-validation v0.0.3 github.com/filecoin-project/filecoin-ffi v0.0.0-20191204125133-ebb3e13addf1 diff --git a/go.sum b/go.sum index c6c110dab..057e138a0 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,8 @@ github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhY github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= From 1030229cb6fc97f7c44f3da627c64aee06ddcc29 Mon Sep 17 00:00:00 2001 From: dtynn Date: Wed, 11 Dec 2019 10:25:48 +0800 Subject: [PATCH 09/35] use actual symlink flag --- lib/sectorbuilder/sectorbuilder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sectorbuilder/sectorbuilder.go b/lib/sectorbuilder/sectorbuilder.go index 319143785..84b505fce 100644 --- a/lib/sectorbuilder/sectorbuilder.go +++ b/lib/sectorbuilder/sectorbuilder.go @@ -692,15 +692,15 @@ func fallbackPostChallengeCount(sectors uint64) uint64 { } func (sb *SectorBuilder) ImportFrom(osb *SectorBuilder, symlink bool) error { - if err := migrate(osb.cacheDir, sb.cacheDir, true); err != nil { + if err := migrate(osb.cacheDir, sb.cacheDir, symlink); err != nil { return err } - if err := migrate(osb.sealedDir, sb.sealedDir, true); err != nil { + if err := migrate(osb.sealedDir, sb.sealedDir, symlink); err != nil { return err } - if err := migrate(osb.stagedDir, sb.stagedDir, true); err != nil { + if err := migrate(osb.stagedDir, sb.stagedDir, symlink); err != nil { return err } From 6b749d97d8f724145034190a7942a2a540c9fa83 Mon Sep 17 00:00:00 2001 From: wwwjim Date: Wed, 11 Dec 2019 04:29:48 -0800 Subject: [PATCH 10/35] documentation: mining updates from recent TestNet updates --- documentation/en/hardware-mining.md | 8 ++++++-- documentation/en/mining-troubleshooting.md | 21 ++++++++++++++++++++- documentation/en/mining.md | 2 ++ documentation/en/storing-data.md | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/documentation/en/hardware-mining.md b/documentation/en/hardware-mining.md index 045a00607..208449af5 100644 --- a/documentation/en/hardware-mining.md +++ b/documentation/en/hardware-mining.md @@ -11,8 +11,12 @@ BECAUSE OF THIS, OUR STANDARD TESTING CONFIGURATION FOR FILECOIN MAINNET CAN AND The setup below is a minimal example for sealing 32 GiB sectors on Lotus: * 3 TB of hard drive space. -* 8 to 12 core CPU -* 256 GB of RAM +* 8 core CPU +* 128 GB of RAM + +## TestNet discoveries + +* 256GB **NVMe** Swap on an SSD for anyone that has 128GB RAM to avoid out of memory issues while mining. ## Benchmarked GPUs diff --git a/documentation/en/mining-troubleshooting.md b/documentation/en/mining-troubleshooting.md index 3ca04ec56..e5fffc9b8 100644 --- a/documentation/en/mining-troubleshooting.md +++ b/documentation/en/mining-troubleshooting.md @@ -1,5 +1,13 @@ # Mining Troubleshooting +```sh +mining block failed: computing election proof: github.com/filecoin-project/lotus/miner.(*Miner).mineOne +``` + +This bug occurs when the storage miner can't acquire the `bellman.lock`. To fix it you need to stop the `lotus-storage-miner` and remove `/tmp/bellman.lock` + +## Your miner is not ready + ```sh lotus-storage-miner info # WARN main lotus-storage-miner/main.go:73 failed to get api endpoint: (/Users/myrmidon/.lotusstorage) %!w(*errors.errorString=&{API not running (no endpoint)}): @@ -7,8 +15,19 @@ lotus-storage-miner info If you see this, that means your **Lotus Storage Miner** isn't ready yet. +## Your computer is too slow + ```sh CAUTION: block production took longer than the block delay. Your computer may not be fast enough to keep up ``` -If you see this, that means your computer is too slow and your blocks are not included in the chain, and you will not receive any rewards. \ No newline at end of file +If you see this, that means your computer is too slow and your blocks are not included in the chain, and you will not receive any rewards. + +## Running out of storage + +``` +lotus-storage-miner pledge-sector +# No space left on device (os error 28) +``` + +If you see this, that means `pledge-sector` wrote too much data to `$TMPDIR` which by default is the root partition (This is common for Linux setups). Usually your root partition does not get the largest partition of storage so you will need to change the environment variable to something else. \ No newline at end of file diff --git a/documentation/en/mining.md b/documentation/en/mining.md index 38c81176f..4c7b1cdfc 100644 --- a/documentation/en/mining.md +++ b/documentation/en/mining.md @@ -65,6 +65,8 @@ lotus-storage-miner info lotus-storage-miner pledge-sector ``` +* Warning: On Linux configurations, this command will write data to `$TMPDIR` which is not usually the largest partition. You should point the value to a larger partition if possible. + Get **miner power** and **sector usage**: ```sh diff --git a/documentation/en/storing-data.md b/documentation/en/storing-data.md index ef178f94d..9bab322f8 100644 --- a/documentation/en/storing-data.md +++ b/documentation/en/storing-data.md @@ -48,7 +48,7 @@ lotus client deal ``` * Price is in attoFIL. -* The `duration`, which represents how long the miner will keep your file hosted, is represented in blocks. Each block represents 30 seconds. +* The `duration`, which represents how long the miner will keep your file hosted, is represented in blocks. Each block represents 45 seconds. Upon success, this command will return a **Deal CID**. From 8fd624fd5bcecc06e1484d2bb686e91371fbcbef Mon Sep 17 00:00:00 2001 From: dtynn Date: Wed, 11 Dec 2019 20:37:52 +0800 Subject: [PATCH 11/35] fix: duplicate unsub calls when client quits --- chain/store/store.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chain/store/store.go b/chain/store/store.go index b371ec6e1..fc82bcd54 100644 --- a/chain/store/store.go +++ b/chain/store/store.go @@ -155,6 +155,8 @@ func (cs *ChainStore) SubHeadChanges(ctx context.Context) chan []*HeadChange { go func() { defer close(out) + var unsubOnce sync.Once + for { select { case val, ok := <-subch: @@ -170,7 +172,9 @@ func (cs *ChainStore) SubHeadChanges(ctx context.Context) chan []*HeadChange { case <-ctx.Done(): } case <-ctx.Done(): - go cs.bestTips.Unsub(subch) + unsubOnce.Do(func() { + go cs.bestTips.Unsub(subch) + }) } } }() From 032e59907b7491a9d8d6d7616f0761d9fa6135fc Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 00:36:40 +0100 Subject: [PATCH 12/35] Add metric on election winners License: MIT Signed-off-by: Jakub Sztandera --- tools/stats/metrics.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/stats/metrics.go b/tools/stats/metrics.go index 8d63f1c6d..8082e3c51 100644 --- a/tools/stats/metrics.go +++ b/tools/stats/metrics.go @@ -124,8 +124,11 @@ func RecordTipsetPoints(ctx context.Context, api api.FullNode, pl *PointList, ti if err != nil { return err } + p := NewPoint("chain.election", 1) + p.AddTag("miner", blockheader.Miner.String()) + pl.AddPoint(p) - p := NewPoint("chain.blockheader_size", len(bs)) + p = NewPoint("chain.blockheader_size", len(bs)) pl.AddPoint(p) } From 5f4127859e2d7e3b614a7ca8740f6d9de520605a Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 01:53:18 +0100 Subject: [PATCH 13/35] decode actor address and revamt the dashboard License: MIT Signed-off-by: Jakub Sztandera --- tools/stats/chain.dashboard.json | 1237 +++++++++++++++++------------- tools/stats/metrics.go | 9 +- 2 files changed, 699 insertions(+), 547 deletions(-) diff --git a/tools/stats/chain.dashboard.json b/tools/stats/chain.dashboard.json index 9effbf85f..0592d77c5 100644 --- a/tools/stats/chain.dashboard.json +++ b/tools/stats/chain.dashboard.json @@ -14,7 +14,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "6.4.2" + "version": "6.5.0-pre" }, { "type": "panel", @@ -60,6 +60,451 @@ "id": null, "links": [], "panels": [ + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "${DS_INFLUXDB}", + "decimals": 2, + "fill": 3, + "fillGradient": 0, + "gridPos": { + "h": 14, + "w": 24, + "x": 0, + "y": 0 + }, + "hideTimeOverride": false, + "id": 38, + "interval": "", + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": false, + "min": false, + "rightSide": true, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": true, + "steppedLine": false, + "targets": [ + { + "alias": "$tag_miner", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "miner" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "chain.election", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT moving_average(count(\"value\"), 20) FROM \"chain.election\" WHERE $timeFilter -10m GROUP BY time($__interval), \"miner\" fill(null)", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "count" + }, + { + "params": [ + "20" + ], + "type": "moving_average" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Blocks Won", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 2, + "format": "none", + "label": "", + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "decimals": null, + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "${DS_INFLUXDB}", + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 4, + "w": 8, + "x": 0, + "y": 14 + }, + "id": 22, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": false, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "groupBy": [], + "measurement": "chain.power", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total Power", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "${DS_INFLUXDB}", + "format": "s", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 4, + "w": 8, + "x": 8, + "y": 14 + }, + "id": 12, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "options": {}, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": 0 + }, + "tableColumn": "", + "targets": [ + { + "groupBy": [], + "measurement": "chain.blocktime", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT difference(mean(\"value\")) FROM \"chain.blocktime\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "difference" + } + ] + ], + "tags": [] + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Avg Blocktime", + "type": "singlestat", + "valueFontSize": "100%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "${DS_INFLUXDB}", + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 4, + "w": 8, + "x": 16, + "y": 14 + }, + "id": 6, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "options": {}, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": 0 + }, + "tableColumn": "", + "targets": [ + { + "groupBy": [], + "measurement": "chain.block_count", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + } + ] + ], + "tags": [] + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Blocks In Tipset", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, { "cacheTimeout": null, "colorBackground": false, @@ -83,7 +528,7 @@ "h": 3, "w": 4, "x": 0, - "y": 0 + "y": 18 }, "id": 4, "interval": null, @@ -181,7 +626,7 @@ "h": 3, "w": 4, "x": 4, - "y": 0 + "y": 18 }, "id": 14, "interval": null, @@ -261,104 +706,6 @@ ], "valueName": "current" }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_INFLUXDB}", - "format": "decbytes", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 4, - "x": 8, - "y": 0 - }, - "id": 22, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": 0 - }, - "tableColumn": "", - "targets": [ - { - "groupBy": [], - "measurement": "chain.power", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - } - ] - ], - "tags": [] - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Total Power", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, { "cacheTimeout": null, "colorBackground": false, @@ -380,8 +727,8 @@ "gridPos": { "h": 3, "w": 4, - "x": 12, - "y": 0 + "x": 8, + "y": 18 }, "id": 32, "interval": null, @@ -495,8 +842,8 @@ "gridPos": { "h": 3, "w": 4, - "x": 16, - "y": 0 + "x": 12, + "y": 18 }, "id": 20, "interval": null, @@ -610,8 +957,8 @@ "gridPos": { "h": 3, "w": 4, - "x": 20, - "y": 0 + "x": 16, + "y": 18 }, "id": 8, "interval": null, @@ -704,6 +1051,124 @@ ], "valueName": "avg" }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "${DS_INFLUXDB}", + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 4, + "x": 20, + "y": 18 + }, + "id": 10, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "options": {}, + "pluginVersion": "6.4.2", + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": 0 + }, + "tableColumn": "", + "targets": [ + { + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "chain.message_count", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT sum(\"value\") FROM (SELECT \"value\" FROM \"chain.message_count\" GROUP BY \"height\") WHERE $timeFilter GROUP BY time($__interval) fill(0)", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Avg Messages in Tipset", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, { "cacheTimeout": null, "colorBackground": false, @@ -727,7 +1192,7 @@ "h": 3, "w": 4, "x": 0, - "y": 3 + "y": 21 }, "id": 16, "interval": "", @@ -809,424 +1274,6 @@ ], "valueName": "current" }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_INFLUXDB}", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 4, - "x": 4, - "y": 3 - }, - "id": 6, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": 0 - }, - "tableColumn": "", - "targets": [ - { - "groupBy": [], - "measurement": "chain.block_count", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - } - ] - ], - "tags": [] - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Blocks In Tipset", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_INFLUXDB}", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 4, - "x": 8, - "y": 3 - }, - "id": 30, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "FIL", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "groupBy": [], - "measurement": "chain.pledge_collateral", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - } - ] - ], - "tags": [] - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Pledge Collateral", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_INFLUXDB}", - "format": "s", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 4, - "x": 16, - "y": 3 - }, - "id": 12, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": 0 - }, - "tableColumn": "", - "targets": [ - { - "groupBy": [], - "measurement": "chain.blocktime", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT difference(mean(\"value\")) FROM \"chain.blocktime\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "difference" - } - ] - ], - "tags": [] - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Avg Blocktime", - "type": "singlestat", - "valueFontSize": "100%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_INFLUXDB}", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 4, - "x": 20, - "y": 3 - }, - "id": 10, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "pluginVersion": "6.4.2", - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": 0 - }, - "tableColumn": "", - "targets": [ - { - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "0" - ], - "type": "fill" - } - ], - "measurement": "chain.message_count", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"value\") FROM (SELECT \"value\" FROM \"chain.message_count\" GROUP BY \"height\") WHERE $timeFilter GROUP BY time($__interval) fill(0)", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Avg Messages in Tipset", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, { "aliasColors": {}, "bars": false, @@ -1237,10 +1284,10 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "h": 4, - "w": 24, - "x": 0, - "y": 6 + "h": 3, + "w": 16, + "x": 4, + "y": 21 }, "id": 2, "legend": { @@ -1380,6 +1427,104 @@ "alignLevel": null } }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "${DS_INFLUXDB}", + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 4, + "x": 20, + "y": 21 + }, + "id": 30, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "options": {}, + "postfix": "FIL", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "groupBy": [], + "measurement": "chain.pledge_collateral", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + } + ] + ], + "tags": [] + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Pledge Collateral", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, { "columns": [], "datasource": "${DS_INFLUXDB}", @@ -1388,7 +1533,7 @@ "h": 16, "w": 4, "x": 0, - "y": 10 + "y": 24 }, "id": 28, "options": {}, @@ -1478,9 +1623,9 @@ "h": 8, "w": 12, "x": 4, - "y": 10 + "y": 24 }, - "id": 26, + "id": 40, "interval": "", "legend": { "alignAsTable": true, @@ -1613,7 +1758,7 @@ "h": 16, "w": 8, "x": 16, - "y": 10 + "y": 24 }, "id": 18, "options": {}, @@ -1710,7 +1855,7 @@ "h": 8, "w": 12, "x": 4, - "y": 18 + "y": 32 }, "id": 24, "legend": { @@ -1830,7 +1975,7 @@ "h": 9, "w": 12, "x": 0, - "y": 26 + "y": 40 }, "id": 34, "legend": { @@ -1962,7 +2107,7 @@ "h": 9, "w": 12, "x": 12, - "y": 26 + "y": 40 }, "id": 36, "legend": { @@ -2000,12 +2145,6 @@ ], "type": "time" }, - { - "params": [ - "actor" - ], - "type": "tag" - }, { "params": [ "method" @@ -2018,6 +2157,12 @@ ], "type": "tag" }, + { + "params": [ + "actor" + ], + "type": "tag" + }, { "params": [ "null" @@ -2089,7 +2234,7 @@ } } ], - "refresh": "5s", + "refresh": "30s", "schemaVersion": 20, "style": "dark", "tags": [], @@ -2117,5 +2262,5 @@ "timezone": "", "title": "Chain", "uid": "z6FtI92Zz", - "version": 12 -} \ No newline at end of file + "version": 5 +} diff --git a/tools/stats/metrics.go b/tools/stats/metrics.go index 8082e3c51..652002ca1 100644 --- a/tools/stats/metrics.go +++ b/tools/stats/metrics.go @@ -14,6 +14,7 @@ import ( "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/address" "github.com/filecoin-project/lotus/chain/types" + "github.com/multiformats/go-multihash" _ "github.com/influxdata/influxdb1-client" models "github.com/influxdata/influxdb1-client/models" @@ -215,7 +216,13 @@ func RecordTipsetMessagesPoints(ctx context.Context, api api.FullNode, pl *Point } p = NewPoint("chain.message_count", 1) - p.AddTag("actor", actor.Code.String()) + + dm, err := multihash.Decode(actor.Code.Hash()) + if err != nil { + continue + } + + p.AddTag("actor", string(dm.Digest)) p.AddTag("method", fmt.Sprintf("%d", msg.Message.Method)) p.AddTag("exitcode", fmt.Sprintf("%d", recp[i].ExitCode)) pl.AddPoint(p) From 38cb0164ebfb423d17c1097413e1a4055de5cf0c Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 14:55:03 +0100 Subject: [PATCH 14/35] Caution if lotus is installed License: MIT Signed-off-by: Jakub Sztandera --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 04f88a6b8..797a71192 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +SHELL=/usr/bin/env bash + all: build .PHONY: all @@ -76,7 +78,14 @@ lotus-shed: $(BUILD_DEPS) .PHONY: lotus-seal-worker BINS+=lotus-seal-worker +ccred:=$(shell tput setaf 1) +ccbold=$(shell tput bold) +ccend=$(shell tput sgr0) + build: lotus lotus-storage-miner lotus-seal-worker + @[[ $$(type -P "cat") ]] && echo "$(ccred)$(ccbold)Caution$(ccend): you have \ +an existing lotus binary in your PATH. This may cause problems if you don't run 'sudo make install'" + .PHONY: build install: From 0b81ba118ffb30281d8d39294a089ee255944d65 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Wed, 11 Dec 2019 14:59:15 +0100 Subject: [PATCH 15/35] slightly improve retrieval errors --- cli/client.go | 2 +- retrieval/client.go | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cli/client.go b/cli/client.go index 0f1fdc991..61848951a 100644 --- a/cli/client.go +++ b/cli/client.go @@ -236,7 +236,7 @@ var clientRetrieveCmd = &cli.Command{ } if err := api.ClientRetrieve(ctx, offers[0].Order(payer), cctx.Args().Get(1)); err != nil { - return err + return xerrors.Errorf("Retrieval Failed: %w", err) } fmt.Println("Success") diff --git a/retrieval/client.go b/retrieval/client.go index 405320a46..cfbfdfb05 100644 --- a/retrieval/client.go +++ b/retrieval/client.go @@ -100,7 +100,7 @@ type clientStream struct { func (c *Client) RetrieveUnixfs(ctx context.Context, root cid.Cid, size uint64, total types.BigInt, miner peer.ID, client, minerAddr address.Address, out io.Writer) error { s, err := c.h.NewStream(ctx, miner, ProtocolID) if err != nil { - return err + return xerrors.Errorf("failed to open stream to miner for retrieval query: %w", err) } defer s.Close() @@ -149,7 +149,6 @@ func (c *Client) RetrieveUnixfs(ctx context.Context, root cid.Cid, size uint64, cst.offset += toFetch } - log.Info("RETRIEVE SUCCESSFUL") return nil } @@ -173,13 +172,12 @@ func (cst *clientStream) doOneExchange(ctx context.Context, toFetch uint64, out } if err := cborutil.WriteCborRPC(cst.stream, deal); err != nil { - return err + return xerrors.Errorf("sending incremental retrieval request: %w", err) } var resp DealResponse if err := cborutil.ReadCborRPC(cst.peeker, &resp); err != nil { - log.Error(err) - return err + return xerrors.Errorf("reading retrieval response: %w", err) } if resp.Status != Accepted { From 613bb252973b654f53ef18103cf7ee748003d16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 11 Dec 2019 15:17:38 +0100 Subject: [PATCH 16/35] sectors: Handle sector state reload errors more gracefully --- build/version.go | 2 +- lib/statestore/store.go | 6 ++++- storage/sectors.go | 2 +- storage/sectors_test.go | 56 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 storage/sectors_test.go diff --git a/build/version.go b/build/version.go index 5b2079a61..10832a76a 100644 --- a/build/version.go +++ b/build/version.go @@ -22,7 +22,7 @@ const ( MajorOnlyMask = 0xff0000 MinorOnlyMask = 0x00ff00 PatchOnlyMask = 0x0000ff -c) +) // VersionInts returns (major, minor, patch) versions func VersionInts(version uint32) (uint32, uint32, uint32) { diff --git a/lib/statestore/store.go b/lib/statestore/store.go index 994938223..a334b60b8 100644 --- a/lib/statestore/store.go +++ b/lib/statestore/store.go @@ -8,6 +8,7 @@ import ( "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/query" cbg "github.com/whyrusleeping/cbor-gen" + "go.uber.org/multierr" "golang.org/x/xerrors" "github.com/filecoin-project/lotus/lib/cborutil" @@ -139,6 +140,8 @@ func (st *StateStore) List(out interface{}) error { outT := reflect.TypeOf(out).Elem().Elem() rout := reflect.ValueOf(out) + var errs error + for { res, ok := res.NextSync() if !ok { @@ -151,7 +154,8 @@ func (st *StateStore) List(out interface{}) error { elem := reflect.New(outT) err := cborutil.ReadCborRPC(bytes.NewReader(res.Value), elem.Interface()) if err != nil { - return err + errs = multierr.Append(errs, xerrors.Errorf("decoding state for key '%s': %w", res.Key, err)) + continue } rout.Elem().Set(reflect.Append(rout.Elem(), elem.Elem())) diff --git a/storage/sectors.go b/storage/sectors.go index 8dad777cc..d52dc70b6 100644 --- a/storage/sectors.go +++ b/storage/sectors.go @@ -65,7 +65,7 @@ func (m *Miner) UpdateSectorState(ctx context.Context, sector uint64, snonce uin func (m *Miner) sectorStateLoop(ctx context.Context) error { trackedSectors, err := m.ListSectors() if err != nil { - return xerrors.Errorf("loading sector list: %w", err) + log.Errorf("loading sector list: %+v", err) } go func() { diff --git a/storage/sectors_test.go b/storage/sectors_test.go new file mode 100644 index 000000000..858e3876e --- /dev/null +++ b/storage/sectors_test.go @@ -0,0 +1,56 @@ +package storage + +import ( + "bytes" + "testing" + + "gotest.tools/assert" + + "github.com/filecoin-project/lotus/lib/cborutil" +) + +func TestSectorInfoSelialization(t *testing.T) { + si := &SectorInfo{ + State: 123, + SectorID: 234, + Nonce: 345, + Pieces: []Piece{{ + DealID: 1234, + Size: 5, + CommP: []byte{3}, + }}, + CommD: []byte{32, 4}, + CommR: nil, + Proof: nil, + Ticket: SealTicket{ + BlockHeight: 345, + TicketBytes: []byte{87, 78, 7, 87}, + }, + PreCommitMessage: nil, + Seed: SealSeed{}, + CommitMessage: nil, + FaultReportMsg: nil, + LastErr: "hi", + } + + b, err := cborutil.Dump(si) + if err != nil { + t.Fatal(err) + } + + var si2 SectorInfo + if err := cborutil.ReadCborRPC(bytes.NewReader(b), &si); err != nil { + return + } + + assert.Equal(t, si.State, si2.State) + assert.Equal(t, si.Nonce, si2.Nonce) + assert.Equal(t, si.SectorID, si2.SectorID) + + assert.Equal(t, si.Pieces, si2.Pieces) + assert.Equal(t, si.CommD, si2.CommD) + assert.Equal(t, si.Ticket, si2.Ticket) + + assert.Equal(t, si, si2) + +} From ff65d061993871a24c414233a9b486aaa1081661 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 15:30:56 +0100 Subject: [PATCH 17/35] Update dashboard License: MIT Signed-off-by: Jakub Sztandera --- Makefile | 2 +- tools/stats/chain.dashboard.json | 114 +++++++++++++++++++------------ 2 files changed, 73 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index 797a71192..2edf1b91f 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ ccbold=$(shell tput bold) ccend=$(shell tput sgr0) build: lotus lotus-storage-miner lotus-seal-worker - @[[ $$(type -P "cat") ]] && echo "$(ccred)$(ccbold)Caution$(ccend): you have \ + @[[ $$(type -P "lotus") ]] && echo "$(ccred)$(ccbold)Caution$(ccend): you have \ an existing lotus binary in your PATH. This may cause problems if you don't run 'sudo make install'" .PHONY: build diff --git a/tools/stats/chain.dashboard.json b/tools/stats/chain.dashboard.json index 0592d77c5..be923cc33 100644 --- a/tools/stats/chain.dashboard.json +++ b/tools/stats/chain.dashboard.json @@ -70,7 +70,7 @@ "fill": 3, "fillGradient": 0, "gridPos": { - "h": 14, + "h": 16, "w": 24, "x": 0, "y": 0 @@ -131,7 +131,7 @@ "measurement": "chain.election", "orderByTime": "ASC", "policy": "default", - "query": "SELECT moving_average(count(\"value\"), 20) FROM \"chain.election\" WHERE $timeFilter -10m GROUP BY time($__interval), \"miner\" fill(null)", + "query": "SELECT moving_average(count(\"value\"), 10) FROM \"chain.election\" WHERE $timeFilter -10m GROUP BY time($__interval), \"miner\" fill(null)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -214,7 +214,7 @@ "h": 4, "w": 8, "x": 0, - "y": 14 + "y": 16 }, "id": 22, "legend": { @@ -237,7 +237,12 @@ "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/.*/", + "color": "rgb(31, 120, 193)" + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -282,8 +287,9 @@ }, "yaxes": [ { + "decimals": 2, "format": "bytes", - "label": null, + "label": "", "logBase": 1, "max": null, "min": null, @@ -325,7 +331,7 @@ "h": 4, "w": 8, "x": 8, - "y": 14 + "y": 16 }, "id": 12, "interval": null, @@ -429,7 +435,7 @@ "h": 4, "w": 8, "x": 16, - "y": 14 + "y": 16 }, "id": 6, "interval": null, @@ -528,7 +534,7 @@ "h": 3, "w": 4, "x": 0, - "y": 18 + "y": 20 }, "id": 4, "interval": null, @@ -626,7 +632,7 @@ "h": 3, "w": 4, "x": 4, - "y": 18 + "y": 20 }, "id": 14, "interval": null, @@ -728,7 +734,7 @@ "h": 3, "w": 4, "x": 8, - "y": 18 + "y": 20 }, "id": 32, "interval": null, @@ -843,7 +849,7 @@ "h": 3, "w": 4, "x": 12, - "y": 18 + "y": 20 }, "id": 20, "interval": null, @@ -958,7 +964,7 @@ "h": 3, "w": 4, "x": 16, - "y": 18 + "y": 20 }, "id": 8, "interval": null, @@ -1073,7 +1079,7 @@ "h": 3, "w": 4, "x": 20, - "y": 18 + "y": 20 }, "id": 10, "interval": null, @@ -1192,7 +1198,7 @@ "h": 3, "w": 4, "x": 0, - "y": 21 + "y": 23 }, "id": 16, "interval": "", @@ -1287,16 +1293,16 @@ "h": 3, "w": 16, "x": 4, - "y": 21 + "y": 23 }, "id": 2, "legend": { "alignAsTable": true, "avg": true, - "current": true, + "current": false, "hideEmpty": false, "hideZero": false, - "max": true, + "max": false, "min": false, "rightSide": true, "show": true, @@ -1322,6 +1328,10 @@ { "alias": "Null Blocks", "yaxis": 2 + }, + { + "alias": "Block Time", + "color": "rgb(31, 120, 193)" } ], "spaceLength": 10, @@ -1389,7 +1399,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Tipsets", + "title": "", "tooltip": { "shared": true, "sort": 0, @@ -1406,7 +1416,7 @@ "yaxes": [ { "format": "s", - "label": "Time between tipsets", + "label": "Time delta", "logBase": 1, "max": null, "min": null, @@ -1415,7 +1425,7 @@ { "decimals": 0, "format": "short", - "label": "Number of Null blocks", + "label": "# null blocks", "logBase": 1, "max": null, "min": "0", @@ -1449,7 +1459,7 @@ "h": 3, "w": 4, "x": 20, - "y": 21 + "y": 23 }, "id": 30, "interval": null, @@ -1533,7 +1543,7 @@ "h": 16, "w": 4, "x": 0, - "y": 24 + "y": 26 }, "id": 28, "options": {}, @@ -1617,13 +1627,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_INFLUXDB}", - "fill": 5, + "fill": 4, "fillGradient": 0, "gridPos": { "h": 8, "w": 12, "x": 4, - "y": 24 + "y": 26 }, "id": 40, "interval": "", @@ -1758,7 +1768,7 @@ "h": 16, "w": 8, "x": 16, - "y": 24 + "y": 26 }, "id": 18, "options": {}, @@ -1855,7 +1865,7 @@ "h": 8, "w": 12, "x": 4, - "y": 32 + "y": 34 }, "id": 24, "legend": { @@ -1880,7 +1890,12 @@ "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/.*/", + "color": "rgb(31, 120, 193)" + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -1975,7 +1990,7 @@ "h": 9, "w": 12, "x": 0, - "y": 40 + "y": 42 }, "id": 34, "legend": { @@ -2001,7 +2016,7 @@ "renderer": "flot", "seriesOverrides": [], "spaceLength": 10, - "stack": false, + "stack": true, "steppedLine": false, "targets": [ { @@ -2035,6 +2050,8 @@ "measurement": "chain.message_count", "orderByTime": "ASC", "policy": "default", + "query": "SELECT moving_average(count(\"value\"), 2) FROM \"chain.message_count\" WHERE $timeFilter -4m GROUP BY time($__interval), \"actor\", \"method\" fill(null)", + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2101,25 +2118,29 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_INFLUXDB}", + "decimals": 2, "fill": 1, "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 12, - "y": 40 + "y": 42 }, "id": 36, + "interval": "", "legend": { "alignAsTable": true, - "avg": false, + "avg": true, "current": false, - "max": false, + "max": true, "min": false, "rightSide": true, "show": true, + "sort": "avg", + "sortDesc": true, "total": false, - "values": false + "values": true }, "lines": true, "linewidth": 1, @@ -2133,7 +2154,7 @@ "renderer": "flot", "seriesOverrides": [], "spaceLength": 10, - "stack": false, + "stack": true, "steppedLine": false, "targets": [ { @@ -2145,12 +2166,6 @@ ], "type": "time" }, - { - "params": [ - "method" - ], - "type": "tag" - }, { "params": [ "exitcode" @@ -2163,6 +2178,12 @@ ], "type": "tag" }, + { + "params": [ + "method" + ], + "type": "tag" + }, { "params": [ "null" @@ -2173,6 +2194,8 @@ "measurement": "chain.message_count", "orderByTime": "ASC", "policy": "default", + "query": "SELECT moving_average(count(\"value\"), 10) FROM \"chain.message_count\" WHERE $timeFilter -10m GROUP BY time($__interval), \"exitcode\", \"actor\", \"method\" fill(null)", + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ @@ -2186,6 +2209,12 @@ { "params": [], "type": "count" + }, + { + "params": [ + 10 + ], + "type": "moving_average" } ] ], @@ -2212,6 +2241,7 @@ }, "yaxes": [ { + "decimals": null, "format": "short", "label": "", "logBase": 1, @@ -2262,5 +2292,5 @@ "timezone": "", "title": "Chain", "uid": "z6FtI92Zz", - "version": 5 -} + "version": 8 +} \ No newline at end of file From d6bfbe5a26dab84312f1c216ac0aa6a2dcdab60e Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Wed, 11 Dec 2019 15:36:39 +0100 Subject: [PATCH 18/35] allow setting genesis timestamp when initializing network --- cmd/lotus/daemon.go | 7 ++++++- node/modules/testing/genesis.go | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go index ce2cc64b9..b9a05e914 100644 --- a/cmd/lotus/daemon.go +++ b/cmd/lotus/daemon.go @@ -47,6 +47,11 @@ var DaemonCmd = &cli.Command{ Name: "genesis", Usage: "genesis file to use for first node run", }, + &cli.StringFlag{ + Name: "genesis-timestamp", + Hidden: true, + Usage: "set the timestamp for the genesis block that will be created", + }, &cli.BoolFlag{ Name: "bootstrap", Value: true, @@ -84,7 +89,7 @@ var DaemonCmd = &cli.Command{ if cctx.String(preSealedSectorsFlag) == "" { return xerrors.Errorf("must also pass file with miner preseal info to `--%s`", preSealedSectorsFlag) } - genesis = node.Override(new(modules.Genesis), testing.MakeGenesis(cctx.String(makeGenFlag), cctx.String(preSealedSectorsFlag))) + genesis = node.Override(new(modules.Genesis), testing.MakeGenesis(cctx.String(makeGenFlag), cctx.String(preSealedSectorsFlag), cctx.String("genesis-timestamp")) } var api api.FullNode diff --git a/node/modules/testing/genesis.go b/node/modules/testing/genesis.go index f0195b639..5efe22382 100644 --- a/node/modules/testing/genesis.go +++ b/node/modules/testing/genesis.go @@ -68,7 +68,7 @@ func MakeGenesisMem(out io.Writer, gmc *gen.GenMinerCfg) func(bs dtypes.ChainBlo } } -func MakeGenesis(outFile, presealInfo string) func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis { +func MakeGenesis(outFile, presealInfo, timestamp string) func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis { return func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis { return func() (*types.BlockHeader, error) { glog.Warn("Generating new random genesis block, note that this SHOULD NOT happen unless you are setting up new network") @@ -119,7 +119,18 @@ func MakeGenesis(outFile, presealInfo string) func(bs dtypes.ChainBlockstore, w addrs[miner.Worker] = types.FromFil(100000) } - b, err := gen.MakeGenesisBlock(bs, addrs, gmc, uint64(time.Now().Unix())) + ts := uint64(time.Now().Unix()) + if timestamp != "" { + t, err := time.Parse(time.RFC3339, timestamp) + if err != nil { + return nil, xerrors.Errorf("parsing input genesis timestamp: %w", err) + } + + glog.Infof("will use %s as the genesis timestamp", t) + ts = uint64(t.Unix()) + } + + b, err := gen.MakeGenesisBlock(bs, addrs, gmc, ts) if err != nil { return nil, err } From b655ba1ac1e6109d869eb2c2e083e9e15c63a6d3 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 15:44:42 +0100 Subject: [PATCH 19/35] Fix build License: MIT Signed-off-by: Jakub Sztandera --- cmd/lotus/daemon.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go index b9a05e914..c8d1b6b7e 100644 --- a/cmd/lotus/daemon.go +++ b/cmd/lotus/daemon.go @@ -89,7 +89,7 @@ var DaemonCmd = &cli.Command{ if cctx.String(preSealedSectorsFlag) == "" { return xerrors.Errorf("must also pass file with miner preseal info to `--%s`", preSealedSectorsFlag) } - genesis = node.Override(new(modules.Genesis), testing.MakeGenesis(cctx.String(makeGenFlag), cctx.String(preSealedSectorsFlag), cctx.String("genesis-timestamp")) + genesis = node.Override(new(modules.Genesis), testing.MakeGenesis(cctx.String(makeGenFlag), cctx.String(preSealedSectorsFlag), cctx.String("genesis-timestamp"))) } var api api.FullNode From 4c3d6912a59e87eaae7f58c3f42815170c1b5c07 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 15:48:54 +0100 Subject: [PATCH 20/35] Remove colors License: MIT Signed-off-by: Jakub Sztandera --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2edf1b91f..eba15d1c6 100644 --- a/Makefile +++ b/Makefile @@ -78,12 +78,8 @@ lotus-shed: $(BUILD_DEPS) .PHONY: lotus-seal-worker BINS+=lotus-seal-worker -ccred:=$(shell tput setaf 1) -ccbold=$(shell tput bold) -ccend=$(shell tput sgr0) - build: lotus lotus-storage-miner lotus-seal-worker - @[[ $$(type -P "lotus") ]] && echo "$(ccred)$(ccbold)Caution$(ccend): you have \ + @[[ $$(type -P "lotus") ]] && echo "Caution: you have \ an existing lotus binary in your PATH. This may cause problems if you don't run 'sudo make install'" .PHONY: build From 99f00bd5a7af37ff2ac379a93e80b2c6c1b00714 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 15:53:57 +0100 Subject: [PATCH 21/35] Fix build, fix circle cache License: MIT Signed-off-by: Jakub Sztandera --- .circleci/config.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c5bdeaa1b..0cff77eb2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,7 +68,7 @@ jobs: - run: sudo apt-get install npm - restore_cache: name: restore go mod cache - key: v1-go-deps-{{ arch }}-{{ checksum "/home/circleci/project/lotus/go.mod" }} + key: v1-go-deps-{{ arch }}-{{ checksum "/home/circleci/project/go.mod" }} - run: command: make buildall - store_artifacts: diff --git a/Makefile b/Makefile index eba15d1c6..e37dcf3e8 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ BINS+=lotus-seal-worker build: lotus lotus-storage-miner lotus-seal-worker @[[ $$(type -P "lotus") ]] && echo "Caution: you have \ -an existing lotus binary in your PATH. This may cause problems if you don't run 'sudo make install'" +an existing lotus binary in your PATH. This may cause problems if you don't run 'sudo make install'" || true .PHONY: build From 184d5d3541aa0f07ac1600c634461f2fa0252e42 Mon Sep 17 00:00:00 2001 From: Pooja <5668171+pooja@users.noreply.github.com> Date: Wed, 11 Dec 2019 16:00:55 +0100 Subject: [PATCH 22/35] Add simple changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..6ba83a258 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +# lotus changelog + +## 0.1.0 / 2019-12-11 + +We are very excited to release **lotus** 0.1.0. This is our testnet release. To install lotus and join the testnet, please visit [docs.lotu.sh](docs.lotu.sh). Please file bug reports as [issues](https://github.com/filecoin-project/lotus/issues). + +A huge thank you to all contributors for this testnet release! \ No newline at end of file From edd40895b8c1c0f8976dbfb9b85700ae2ff94d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 11 Dec 2019 16:08:50 +0100 Subject: [PATCH 23/35] disable head notifs by default --- node/builder.go | 5 +++-- node/config/def.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/node/builder.go b/node/builder.go index 4ab041eaf..96599df8c 100644 --- a/node/builder.go +++ b/node/builder.go @@ -217,7 +217,6 @@ func Online() Option { Override(RunBlockSyncKey, modules.RunBlockSync), Override(RunPeerMgrKey, modules.RunPeerMgr), Override(HandleIncomingBlocksKey, modules.HandleIncomingBlocks), - Override(HeadMetricsKey, metrics.SendHeadNotifs("")), Override(new(*discovery.Local), discovery.NewLocal), Override(new(discovery.PeerResolver), modules.RetrievalResolver), @@ -313,7 +312,9 @@ func ConfigFullNode(c interface{}) Option { return Options( ConfigCommon(&cfg.Common), - Override(HeadMetricsKey, metrics.SendHeadNotifs(cfg.Metrics.Nickname)), + If(cfg.Metrics.HeadNotifs, + Override(HeadMetricsKey, metrics.SendHeadNotifs(cfg.Metrics.Nickname)), + ), If(cfg.Metrics.PubsubTracing, Override(new(*pubsub.PubSub), lp2p.GossipSub(lp2p.PubsubTracer())), ), diff --git a/node/config/def.go b/node/config/def.go index 80b6f199f..5010b9e88 100644 --- a/node/config/def.go +++ b/node/config/def.go @@ -42,6 +42,7 @@ type Libp2p struct { type Metrics struct { Nickname string + HeadNotifs bool PubsubTracing bool } From 4d49473616ddfc3c228f93a4a27700e9b410be9a Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 16:23:11 +0100 Subject: [PATCH 24/35] Increase faucet limits License: MIT Signed-off-by: Jakub Sztandera --- cmd/lotus-fountain/main.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/lotus-fountain/main.go b/cmd/lotus-fountain/main.go index 014834664..8538a0af8 100644 --- a/cmd/lotus-fountain/main.go +++ b/cmd/lotus-fountain/main.go @@ -100,7 +100,7 @@ var runCmd = &cli.Command{ IPRate: time.Minute, IPBurst: 5, WalletRate: 15 * time.Minute, - WalletBurst: 1, + WalletBurst: 2, }), minerLimiter: NewLimiter(LimiterConfig{ TotalRate: time.Second, @@ -108,7 +108,7 @@ var runCmd = &cli.Command{ IPRate: 10 * time.Minute, IPBurst: 2, WalletRate: 1 * time.Hour, - WalletBurst: 1, + WalletBurst: 2, }), } @@ -150,7 +150,7 @@ func (h *handler) send(w http.ResponseWriter, r *http.Request) { // Limit based on wallet address limiter := h.limiter.GetWalletLimiter(to.String()) if !limiter.Allow() { - http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests) + http.Error(w, http.StatusText(http.StatusTooManyRequests)+": wallet limit", http.StatusTooManyRequests) return } @@ -170,13 +170,13 @@ func (h *handler) send(w http.ResponseWriter, r *http.Request) { limiter = h.limiter.GetIPLimiter(reqIP) if !limiter.Allow() { - http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests) + http.Error(w, http.StatusText(http.StatusTooManyRequests)+": IP limit", http.StatusTooManyRequests) return } // General limiter to allow throttling all messages that can make it into the mpool if !h.limiter.Allow() { - http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests) + http.Error(w, http.StatusText(http.StatusTooManyRequests)+": global limit", http.StatusTooManyRequests) return } @@ -221,20 +221,20 @@ func (h *handler) mkminer(w http.ResponseWriter, r *http.Request) { // Limit based on wallet address limiter := h.minerLimiter.GetWalletLimiter(owner.String()) if !limiter.Allow() { - http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests) + http.Error(w, http.StatusText(http.StatusTooManyRequests)+": wallet limit", http.StatusTooManyRequests) return } // Limit based on IP limiter = h.minerLimiter.GetIPLimiter(r.RemoteAddr) if !limiter.Allow() { - http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests) + http.Error(w, http.StatusText(http.StatusTooManyRequests)+": IP limit", http.StatusTooManyRequests) return } // General limiter owner allow throttling all messages that can make it into the mpool if !h.minerLimiter.Allow() { - http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests) + http.Error(w, http.StatusText(http.StatusTooManyRequests)+": global limit", http.StatusTooManyRequests) return } From 86feebc89900161b4151777c9e15a2d7bf68795f Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 16:36:08 +0100 Subject: [PATCH 25/35] Fix timeoffset hello calculation License: MIT Signed-off-by: Jakub Sztandera --- node/hello/hello.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/hello/hello.go b/node/hello/hello.go index a3294feae..d8f70691a 100644 --- a/node/hello/hello.go +++ b/node/hello/hello.go @@ -139,7 +139,7 @@ func (hs *Service) SayHello(ctx context.Context, pid peer.ID) error { hmsg = &Message{} s.SetReadDeadline(time.Now().Add(10 * time.Second)) err := cborutil.ReadCborRPC(s, hmsg) // ignore error - ok := err != nil + ok := err == nil t3 := time.Now() lat := t3.Sub(t0) From ead62f2cf802b8bd722e3bb9c4edcef0255a257f Mon Sep 17 00:00:00 2001 From: wwwjim Date: Wed, 11 Dec 2019 07:38:04 -0800 Subject: [PATCH 26/35] documentation: testnet update --- .../cn/{join-devnet.md => join-testnet.md} | 2 +- documentation/en/api.md | 2 +- documentation/en/dev-tools-pond-ui.md | 2 +- documentation/en/getting-started.md | 4 ++-- documentation/en/hardware-mining.md | 12 ++++++------ documentation/en/hardware.md | 2 +- documentation/en/install-lotus-arch.md | 4 ++-- documentation/en/install-lotus-macos.md | 10 +++------- documentation/en/install-lotus-ubuntu.md | 4 ++-- .../en/{join-devnet.md => join-testnet.md} | 18 ++++++++++-------- documentation/en/mining-troubleshooting.md | 8 ++++++-- documentation/en/mining.md | 2 +- documentation/en/setting-a-static-port.md | 2 +- documentation/en/setup-troubleshooting.md | 2 +- documentation/en/storing-data.md | 12 +++++++----- documentation/en/updating-lotus.md | 4 ++-- 16 files changed, 47 insertions(+), 43 deletions(-) rename documentation/cn/{join-devnet.md => join-testnet.md} (59%) rename documentation/en/{join-devnet.md => join-testnet.md} (71%) diff --git a/documentation/cn/join-devnet.md b/documentation/cn/join-testnet.md similarity index 59% rename from documentation/cn/join-devnet.md rename to documentation/cn/join-testnet.md index 67a526026..2867006a0 100644 --- a/documentation/cn/join-devnet.md +++ b/documentation/cn/join-testnet.md @@ -1,3 +1,3 @@ -# Join DevNet +# Join TestNet 工作正在进行中 \ No newline at end of file diff --git a/documentation/en/api.md b/documentation/en/api.md index cb1f9a1f7..2b80325f5 100644 --- a/documentation/en/api.md +++ b/documentation/en/api.md @@ -4,7 +4,7 @@ Here is an early overview of how to make API calls. Implementation details for the **JSON-RPC** package are [here](https://github.com/filecoin-project/lotus/tree/master/lib/jsonrpc). -## Overview +## Overview: How do you modify the config.toml to change the API endpoint? API requests are made against `127.0.0.1:1234` unless you modify `.lotus/config.toml`. diff --git a/documentation/en/dev-tools-pond-ui.md b/documentation/en/dev-tools-pond-ui.md index 1e68b929f..689dc1782 100644 --- a/documentation/en/dev-tools-pond-ui.md +++ b/documentation/en/dev-tools-pond-ui.md @@ -27,6 +27,6 @@ Don't leave Pond unattended for more than 10 hours, the web client will eventual ## Troubleshooting - Turn it off and on - Start at the top -- `rm -rf ~/.lotus ~/.lotusstorage/` +- `rm -rf ~/.lotus ~/.lotusstorage/`, this command will delete chain sync data, stored wallets, and other configurations so be careful. - Verify you have the correct versions of dependencies - If stuck on a bad fork, try `lotus chain sethead --genesis` \ No newline at end of file diff --git a/documentation/en/getting-started.md b/documentation/en/getting-started.md index f1715f3f2..a94d4eab0 100644 --- a/documentation/en/getting-started.md +++ b/documentation/en/getting-started.md @@ -7,7 +7,7 @@ For more details about Filecoin, check out the [Filecoin Spec](https://github.co ## What can I learn here? - How to install Lotus on [Arch Linux](https://docs.lotu.sh/en+install-lotus-arch), [Ubuntu](https://docs.lotu.sh/en+install-lotus-ubuntu), or [MacOS](https://docs.lotu.sh/en+install-lotus-macos). -- Joining the [Lotus DevNet](https://docs.lotu.sh/en+join-devnet). +- Joining the [Lotus TestNet](https://docs.lotu.sh/en+join-testnet). - [Storing](https://docs.lotu.sh/en+storing-data) or [retrieving](https://docs.lotu.sh/en+retrieving-data) data. - Mining Filecoin using the **Lotus Storage Miner** in your [CLI](https://docs.lotu.sh/en+mining). @@ -18,6 +18,6 @@ Lotus is architected modularly to keep clean API boundaries while using the same - The **Lotus Node** - The **Lotus Storage Miner** -The **Lotus Storage Miner** is intended to be run on the machine that manages a single storage miner instance, and is meant to communicate with the **Lotus Node** via the websockets **JSON-RPC** API for all of the chain interaction needs. +The **Lotus Storage Miner** is intended to be run on the machine that manages a single storage miner instance, and is meant to communicate with the **Lotus Node** via the websocket **JSON-RPC** API for all of the chain interaction needs. This way, a mining operation may easily run a **Lotus Storage Miner** or many of them, connected to one or many **Lotus Node** instances. diff --git a/documentation/en/hardware-mining.md b/documentation/en/hardware-mining.md index 208449af5..806dd065e 100644 --- a/documentation/en/hardware-mining.md +++ b/documentation/en/hardware-mining.md @@ -10,17 +10,17 @@ BECAUSE OF THIS, OUR STANDARD TESTING CONFIGURATION FOR FILECOIN MAINNET CAN AND The setup below is a minimal example for sealing 32 GiB sectors on Lotus: -* 3 TB of hard drive space. +* 2 TB of hard drive space. * 8 core CPU -* 128 GB of RAM +* 128 GiB of RAM ## TestNet discoveries -* 256GB **NVMe** Swap on an SSD for anyone that has 128GB RAM to avoid out of memory issues while mining. +* If you only have 128GiB of ram, enabling 256GB of **NVMe** swap on an SSD will help you avoid out-of-memory issues while mining. ## Benchmarked GPUs -GPUs are a must for getting **block rewards**. Here are a few that have been tried in the past: +GPUs are a must for getting **block rewards**. Here are a few that have been confirmed to generate **SNARKs** quickly enough to successfully mine blocks on the Lotus TestNet. * GeForce RTX 2080 Ti * GeForce RTX 2080 SUPER @@ -31,7 +31,7 @@ GPUs are a must for getting **block rewards**. Here are a few that have been tri ## Testing other GPUs -If you want to test other GPUs, such as the GeForce GTX 1660, you can use the following configuration flag: +If you want to test a GPU that is not explicitly supported, you can use the following configuration flag: ```sh BELLMAN_CUSTOM_GPU=":" @@ -43,7 +43,7 @@ Here is an example of trying a GeForce GTX 1660 ti with 1536 cores. BELLMAN_CUSTOM_GPU="GeForce GTX 1660 Ti:1536" ``` -To get the number of cores for your GPU, you will need to check your cards specifications. +To get the number of cores for your GPU, you will need to check your card’s specifications. ## Benchmarking diff --git a/documentation/en/hardware.md b/documentation/en/hardware.md index 6ea454852..f6250548a 100644 --- a/documentation/en/hardware.md +++ b/documentation/en/hardware.md @@ -2,6 +2,6 @@ > This page is a work in progress. Exact mining requirements are still in the works. -Lotus can build and run on most [Linux](https://ubuntu.com/) and [MacOS](https://www.apple.com/macos) systems with at least 8GB of RAM. +Lotus can build and run on most [Linux](https://ubuntu.com/) and [MacOS](https://www.apple.com/macos) systems with at least 8GiB of RAM. Windows is not yet supported. diff --git a/documentation/en/install-lotus-arch.md b/documentation/en/install-lotus-arch.md index 2029de6d7..7cddb611b 100644 --- a/documentation/en/install-lotus-arch.md +++ b/documentation/en/install-lotus-arch.md @@ -37,8 +37,8 @@ cd lotus/ Install ```sh -make clean all +make clean && make all sudo make install ``` -After installing Lotus, you can run the `lotus` command directly from your CLI to see usage documentation. Next, you can join the [Lotus DevNet](https://docs.lotu.sh/en+join-devnet). +After installing Lotus, you can run the `lotus` command directly from your CLI to see usage documentation. Next, you can join the [Lotus TestNet](https://docs.lotu.sh/en+join-testnet). diff --git a/documentation/en/install-lotus-macos.md b/documentation/en/install-lotus-macos.md index 2fac73022..e3e326274 100644 --- a/documentation/en/install-lotus-macos.md +++ b/documentation/en/install-lotus-macos.md @@ -42,11 +42,7 @@ In your terminal, enter this command to install Homebrew: Use the command `brew install` to install the following packages: ```sh -brew install go -brew install bzr -brew install jq -brew install pkg-config -brew install rustup +brew install go bzr jq pkg-config rustup ``` ## Clone @@ -59,8 +55,8 @@ cd lotus/ ## Build ```sh -make clean all +make clean && make all sudo make install ``` -After installing Lotus, you can run the `lotus` command directly from your CLI to see usage documentation. Next, you can join the [Lotus DevNet](https://docs.lotu.sh/en+join-devnet). \ No newline at end of file +After installing Lotus, you can run the `lotus` command directly from your CLI to see usage documentation. Next, you can join the [Lotus TestNet](https://docs.lotu.sh/en+join-testnet). \ No newline at end of file diff --git a/documentation/en/install-lotus-ubuntu.md b/documentation/en/install-lotus-ubuntu.md index 55a6be094..97af47597 100644 --- a/documentation/en/install-lotus-ubuntu.md +++ b/documentation/en/install-lotus-ubuntu.md @@ -40,8 +40,8 @@ cd lotus/ Install ```sh -make clean all +make clean && make all sudo make install ``` -After installing Lotus, you can run the `lotus` command directly from your CLI to see usage documentation. Next, you can join the [Lotus DevNet](https://docs.lotu.sh/en+join-devnet). +After installing Lotus, you can run the `lotus` command directly from your CLI to see usage documentation. Next, you can join the [Lotus TestNet](https://docs.lotu.sh/en+join-testnet). diff --git a/documentation/en/join-devnet.md b/documentation/en/join-testnet.md similarity index 71% rename from documentation/en/join-devnet.md rename to documentation/en/join-testnet.md index 8efba8e5e..37bd1e5e7 100644 --- a/documentation/en/join-devnet.md +++ b/documentation/en/join-testnet.md @@ -1,10 +1,10 @@ -# Join DevNet +# Join TestNet ## Introduction -Anyone can set up a **Lotus Node** and connect to the **Lotus DevNet**. This is the best way to explore the current CLI and the **Filecoin Decentralized Storage Market**. +Anyone can set up a **Lotus Node** and connect to the **Lotus TestNet**. This is the best way to explore the current CLI and the **Filecoin Decentralized Storage Market**. -If you have installed older versions, you may need to clear existing chain data and miners if you run into any errors. You can use this command: +If you have installed older versions, you may need to clear existing chain data, stored wallets and miners if you run into any errors. You can use this command: ```sh rm -rf ~/.lotus ~/.lotusstorage @@ -26,7 +26,7 @@ lotus net peers | wc -l In order to connect to the network, you need to be connected to at least 1 peer. If you’re seeing 0 peers, read our [troubleshooting notes](https://docs.lotu.sh/en+setup-troubleshooting). -## Synchronize +## Chain sync While the daemon is running, the next requirement is to sync the chain. Run the command below to start the chain sync progress. To see current chain height, visit the [network stats page](http://stats.testnet.filecoin.io/). @@ -35,15 +35,17 @@ lotus sync wait ``` * This step will take anywhere between 30 minutes to a few hours. -* You will be able to perform **Lotus DevNet** operations after it is finished. +* You will be able to perform **Lotus TestNet** operations after it is finished. ## Create your first address +Initialize a wallet using BLS signature formats: + ```sh lotus wallet new bls ``` -Here is an example of the response +Here is an example of the response: ```sh t3vhfme4qfvegqaz7m7q6o6afjcs67n6kpzv7t2eozio4chwpafwa2y4l7zhwd5eom7jmihzdg4s52dpvnclza @@ -55,7 +57,7 @@ t3vhfme4qfvegqaz7m7q6o6afjcs67n6kpzv7t2eozio4chwpafwa2y4l7zhwd5eom7jmihzdg4s52dp ## Check wallet address balance -Wallet balances in the Lotus DevNet are in **FIL**, the smallest denomination of FIL is an **attoFil**, where 1 attoFil = 10^-18 FIL. +Wallet balances in the Lotus TestNet are in **FIL**, the smallest denomination of FIL is an **attoFil**, where 1 attoFil = 10^-18 FIL. ```sh lotus wallet balance @@ -73,4 +75,4 @@ lotus send ## Monitor the dashboard -To see the latest network activity, including **chain block height**, **block height**, **blocktime**, **total network power**, largest **block producer miner**, check out the [monitoring dashboard](https://lotus-metrics.kittyhawk.wtf). +To see the latest network activity, including **chain block height**, **block height**, **blocktime**, **total network power**, largest **block producer miner**, check out the [monitoring dashboard](https://stats.testnet.filecoin.io). diff --git a/documentation/en/mining-troubleshooting.md b/documentation/en/mining-troubleshooting.md index e5fffc9b8..ad3751f68 100644 --- a/documentation/en/mining-troubleshooting.md +++ b/documentation/en/mining-troubleshooting.md @@ -1,10 +1,14 @@ # Mining Troubleshooting +## Bellman Lockfile + +The **Bellman** lockfile is created to lock a GPU for a process. This bug can occur when this file isn't properly cleaned up: + ```sh mining block failed: computing election proof: github.com/filecoin-project/lotus/miner.(*Miner).mineOne ``` -This bug occurs when the storage miner can't acquire the `bellman.lock`. To fix it you need to stop the `lotus-storage-miner` and remove `/tmp/bellman.lock` +This bug occurs when the storage miner can't acquire the `bellman.lock`. To fix it you need to stop the `lotus-storage-miner` and remove `/tmp/bellman.lock`. ## Your miner is not ready @@ -13,7 +17,7 @@ lotus-storage-miner info # WARN main lotus-storage-miner/main.go:73 failed to get api endpoint: (/Users/myrmidon/.lotusstorage) %!w(*errors.errorString=&{API not running (no endpoint)}): ``` -If you see this, that means your **Lotus Storage Miner** isn't ready yet. +If you see this, that means your **Lotus Storage Miner** isn't ready yet. You need to finish [syncing the chain](https://docs.lotu.sh/en+join-testnet). ## Your computer is too slow diff --git a/documentation/en/mining.md b/documentation/en/mining.md index 4c7b1cdfc..9bcd888e0 100644 --- a/documentation/en/mining.md +++ b/documentation/en/mining.md @@ -2,7 +2,7 @@ Here are instructions to learn how to perform storage mining. For hardware specifications please read [this](https://docs.lotu.sh/en+hardware-mining). -It is useful to [join the DevNet](https://docs.lotu.sh/en+join-devnet) prior to attempting storage mining for the first time. +It is useful to [join the TestNet](https://docs.lotu.sh/en+join-testnet) prior to attempting storage mining for the first time. NOTE: While a miner is running, there will be many `WARN` and `ERROR` logs. diff --git a/documentation/en/setting-a-static-port.md b/documentation/en/setting-a-static-port.md index 63dd0d188..f3d5cd0b4 100644 --- a/documentation/en/setting-a-static-port.md +++ b/documentation/en/setting-a-static-port.md @@ -1,6 +1,6 @@ # Static Ports -For a **storage deal**, you can set a static port for the **Lotus Storage Miner**. +Depending on how your network is set up, you may need to set a static port to successfully connect to peers to perform storage deals with your **Lotus Storage Miner**. ## Setup diff --git a/documentation/en/setup-troubleshooting.md b/documentation/en/setup-troubleshooting.md index c14d0a996..d6ab52594 100644 --- a/documentation/en/setup-troubleshooting.md +++ b/documentation/en/setup-troubleshooting.md @@ -1,6 +1,6 @@ # Setup Troubleshooting -Here is a command that will delete your chain data and any miners you have set up: +Here is a command that will delete your chain data, stored wallets, stored data and any miners you have set up: ```sh rm -rf ~/.lotus ~/.lotusstorage diff --git a/documentation/en/storing-data.md b/documentation/en/storing-data.md index 9bab322f8..394ee14d3 100644 --- a/documentation/en/storing-data.md +++ b/documentation/en/storing-data.md @@ -2,9 +2,11 @@ > There are recent bug reports with these instructions. If you happen to encounter any problems, please create a [GitHub issue](https://github.com/filecoin-project/lotus/issues/new) and a maintainer will address the problem as soon as they can. -Here are instructions for how to store data on the **Lotus DevNet**. +Here are instructions for how to store data on the **Lotus TestNet**. -## Adding a file +## Adding a file locally + +Adding a file locally allows you to make miner deals on the **Lotus TestNet**. ```sh lotus client import ./your-example-file.txt @@ -12,7 +14,7 @@ lotus client import ./your-example-file.txt Upon success, this command will return a **Data CID**. -## List local files +## List your local files The command to see a list of files by `CID`, `name`, `size` in bytes, and `status`: @@ -27,7 +29,7 @@ bafkreierupr5ioxn4obwly4i2a5cd2rwxqi6kwmcyyylifxjsmos7hrgpe Development/sample-1 bafkreieuk7h4zs5alzpdyhlph4lxkefowvwdho3a3pml6j7dam5mipzaii Development/sample-2.txt 30618 ok ``` -## Make a Miner Deal on DevNet +## Make a Miner Deal on Lotus TestNet Get a list of all miners that can store data: @@ -52,4 +54,4 @@ lotus client deal Upon success, this command will return a **Deal CID**. -To retrieve this file it must be sealed. If the **Lotus Storage Miner** is not running on a machine designed for sealing, the process will take a very long time. +The storage miner will need to **seal** the file before it can be retrieved. If the **Lotus Storage Miner** is not running on a machine designed for sealing, the process will take a very long time. diff --git a/documentation/en/updating-lotus.md b/documentation/en/updating-lotus.md index 0c721884c..ba402a363 100644 --- a/documentation/en/updating-lotus.md +++ b/documentation/en/updating-lotus.md @@ -7,12 +7,12 @@ If you installed Lotus on your machine, you can upgrade to the latest version by git pull origin master # clean and remake the binaries -make clean build +make clean && make build ``` Sometimes when you run Lotus after a pull, certain commands such as `lotus daemon` may break. -Here is a command that will delete your chain data and any miners you have set up: +Here is a command that will delete your chain data, stored wallets and any miners you have set up: ```sh rm -rf ~/.lotus ~/.lotusstorage From e8d61043bfad9815b252dbfeebc120e0c6f9d19d Mon Sep 17 00:00:00 2001 From: wwwjim Date: Wed, 11 Dec 2019 07:56:48 -0800 Subject: [PATCH 27/35] documentation: updates terms for hardware docs --- documentation/en/hardware-mining.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/en/hardware-mining.md b/documentation/en/hardware-mining.md index 806dd065e..4424ac403 100644 --- a/documentation/en/hardware-mining.md +++ b/documentation/en/hardware-mining.md @@ -1,6 +1,6 @@ -# Mining Hardware +# Protocol Labs Standard Testing Configuration -> This documentation page describes the standard testing configuration the Protocol Labs team has used to test **Lotus Storage Miner**s on Lotus. There is no guarantee this testing configuration will be suitable for Filecoin storage mining at MainNet launch. If you need to buy new hardware to join the Filecoin TestNet, we recommend to buy no more hardware than you require for testing. To learn more please read this [hardware blog post](https://filecoin.io/blog/filecoin-testnet-mining/) +> This documentation page describes the standard testing configuration the Protocol Labs team has used to test **Lotus Storage Miner**s on Lotus. There is no guarantee this testing configuration will be suitable for Filecoin storage mining at MainNet launch. If you need to buy new hardware to join the Filecoin TestNet, we recommend to buy no more hardware than you require for testing. To learn more please read this [Protocol Labs Standard Testing Configuration post](https://filecoin.io/blog/filecoin-testnet-mining/). **Sector sizes** and **minimum pledged storage** required to mine blocks are two very important Filecoin TestNet parameters that impact hardware decisions. We will continue to refine all parameters during TestNet. From 37113aeab194b4558f6a0b104a9a56e6ca089d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 11 Dec 2019 17:27:30 +0100 Subject: [PATCH 28/35] Final testnet params --- build/params_devnet.go | 2 +- build/params_shared.go | 4 ---- chain/vm/vm_test.go | 4 +++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/params_devnet.go b/build/params_devnet.go index c169d2638..aa75ebcd7 100644 --- a/build/params_devnet.go +++ b/build/params_devnet.go @@ -31,4 +31,4 @@ const InteractivePoRepDelay = 8 const InteractivePoRepConfidence = 6 // Bytes -var MinimumMinerPower uint64 = 20 << 30 // 20GB +var MinimumMinerPower uint64 = 512 << 30 // 512GB diff --git a/build/params_shared.go b/build/params_shared.go index 214a576b6..97fe788d3 100644 --- a/build/params_shared.go +++ b/build/params_shared.go @@ -83,10 +83,6 @@ var InitialReward *big.Int const FilecoinPrecision = 1_000_000_000_000_000_000 -// six years -// Epochs -const HalvingPeriodEpochs = 6 * 365 * 24 * 60 * 2 - // TODO: Move other important consts here func init() { diff --git a/chain/vm/vm_test.go b/chain/vm/vm_test.go index 862bb4acf..6ec007576 100644 --- a/chain/vm/vm_test.go +++ b/chain/vm/vm_test.go @@ -9,10 +9,12 @@ import ( "github.com/filecoin-project/lotus/chain/types" ) +const HalvingPeriodEpochs = 6 * 365 * 24 * 60 * 2 + func TestBlockReward(t *testing.T) { coffer := types.FromFil(build.MiningRewardTotal).Int sum := new(big.Int) - N := build.HalvingPeriodEpochs + N := HalvingPeriodEpochs for i := 0; i < N; i++ { a := MiningReward(types.BigInt{coffer}) sum = sum.Add(sum, a.Int) From ffc77c35c75140ef58d9c13180660e8b87c7557e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 11 Dec 2019 17:45:54 +0100 Subject: [PATCH 29/35] Use filecoin-ffi master --- extern/filecoin-ffi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi index 7ddde8e0f..e32f5efc8 160000 --- a/extern/filecoin-ffi +++ b/extern/filecoin-ffi @@ -1 +1 @@ -Subproject commit 7ddde8e0f553289c1bee3d861e559297b4d16044 +Subproject commit e32f5efc808b92560f9d7f92a5d312b5ac403b7d From 4ad24c407c3e62816abd387ebc4ff94eacc1d58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 11 Dec 2019 17:55:42 +0100 Subject: [PATCH 30/35] rename build/params_testnet.go --- build/{params_devnet.go => params_testnet.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build/{params_devnet.go => params_testnet.go} (100%) diff --git a/build/params_devnet.go b/build/params_testnet.go similarity index 100% rename from build/params_devnet.go rename to build/params_testnet.go From 4beb6a4d73b934e49856316e940b30cf6bf8461c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 11 Dec 2019 18:38:51 +0100 Subject: [PATCH 31/35] Testnet --- build/bootstrap/bootstrappers.pi | 8 ++++++-- build/genesis/devnet.car | Bin 3055 -> 36190 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/bootstrap/bootstrappers.pi b/build/bootstrap/bootstrappers.pi index 64a8787b7..9c619b1bb 100644 --- a/build/bootstrap/bootstrappers.pi +++ b/build/bootstrap/bootstrappers.pi @@ -1,2 +1,6 @@ -/ip4/147.75.80.29/tcp/1347/p2p/12D3KooWDzb12XyoKT4uJAqmRVsSYqY9EZczXeWJ7WqehugBTVAT -/ip4/147.75.80.17/tcp/1347/p2p/12D3KooWDsfpmaYPouFT2RxvSf8eCuUS63T4dAKvDPqzWKdv7Qc7 +/dns4/lotus-bootstrap-0.dfw.fil-test.net/tcp/1347/p2p/12D3KooWHwGBSiLR5ts7KW9MgH4BMzC2iXe18kwAQ8Ee3LUd1jeR +/dns4/lotus-bootstrap-1.dfw.fil-test.net/tcp/1347/p2p/12D3KooWCLFaawdhLGcSpiqg43DtZ9QzPQ6HcB8Vvyu2Cnta8UWc +/dns4/lotus-bootstrap-0.fra.fil-test.net/tcp/1347/p2p/12D3KooWMmaL7eaUCF6tVAghVmgozxz4uztbuFUQv6dyFpHRarHR +/dns4/lotus-bootstrap-1.fra.fil-test.net/tcp/1347/p2p/12D3KooWLLpNYoKdf9NgcWudBhXLdTcXncqAsTzozw1scMMu6nS5 +/dns4/lotus-bootstrap-0.sin.fil-test.net/tcp/1347/p2p/12D3KooWCNL9vXaXwNs3Bu8uRAJK4pxpCyPeM7jZLSDpJma1wrV8 +/dns4/lotus-bootstrap-1.sin.fil-test.net/tcp/1347/p2p/12D3KooWNGGxFda1eC5U2YKAgs4ypoFHn3Z3xHCsjmFdrCcytoxm diff --git a/build/genesis/devnet.car b/build/genesis/devnet.car index 2810d469f37577aae4fabaf206aaf6b045e237a5..d0aef24863cdef23849a46eb87279c1d1f1472ab 100644 GIT binary patch literal 36190 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 Ax&QzG literal 3055 zcmcCnlvW?;_ar3_PZ+_d$+GXvI zPxnlS=SnY2Eh^5;&tqK4M4W~mCkBSb2!*nuG=&17ZD|G&fX;6Y$jdKLNK`0FP0WEP zjF8DxNH0w-E>qU_AP6rhU4yp;Uhh6V=)BxhHCe`@P1XzBdTl(FE<- zi1qB57Wbged(9;E)zh|nBPnG(JE{K8*-DFFyNv9Np7XebNOv`Vy)#92LR)I;`>2mz zNJ@M2`8XfAnzim|%$RyMZ23F=a|sM;@08cL#8!MzIC#pzm#H{2Juk7Ov?vt_q+(wx z{|jbH%E?d8RzQ~6!3qf~LXK>TkaJ*QWPk!j0R{mF7#mEpbSz9XY-~zmU}?Fb<gdOis=(%|kZoa+aFpvLa76mWR??+)tkmGJN@Im+B$0iREukI_?cvn*%qBk#eJa z8Q99)eQa*Z>)mW%V1Rlx6=-e%$cfw#C+246r4}LiwOV-n37LSr9S6c9l~?XlcXVi) zbYaz#Vvg2bPdFqw8J;kDGcYE^&U@LWE&w-^8E9r8$V?unnTbW&smQ)&E7VuGzjNP| zS%;lYu%&NtZr=N-%5tH{!j3uPBDIAuwpcxEADFAU3IJs09GOtofJF)ZKtWPbfR{pyZte3sun7Z)ZwZOUD z@-FLSuD`k|eZkyH@bm9a`x4WZs4Q%3kVpaREM?O2eAO>DU3{Z!DDOgssEQX~D(-!f zNR`9L9FU-Z<`igf63QhDq|g#DG~I#H@;0c~2_@vN1xP`#jF3y385o-#nHn0KA`~w7wS8||7_WaXaiNOcX^R#)PSwd( zk@p&vsx6k4@O{mVP}slhRFtHCW!tq~en+nq952#x6I&pAr)u`=`?EG*4QXMT0}U%e z4sD4bJt2^xC9@zkwMfC!MZr)CShz6ApqD7nSO%9ab&%j9RI)T9#hk>ytTTy=7iaUB z+jv>^E%R>F{&Z?~P(#3kITcqpLc4g7l-3x$&TPKuoaFsohIQl8*^w8nGgP_8Jee86 zdvwLE6BRm)nh@&=8QJ8}a1Yu(AY>#sVi|!E+tfuk;-vT=00W4OAa-I%l~mRMA_s?v zM5e|aCsu|Bnw?X7w0z1}4W3%h4fnWzi)|~n&nmyXCH{-cU zD@E&>&61WLU>7yAV|}z~@`|1cU8f_bd*$Ztn$q^hCpa%}p6P;v>$g4R(RObtJbY#| z(250-mTq%?X|jJlz5ebIi&q_bY-hN3vCs6*xEj!Nuhf-2Fr`6PC}`68gW;>&?pV}* zV_R@>(XU_kR$uFvxEEr!wCZd|&&8o~W#hy*hhMFC#E>gVM1JB&`rKxhV*w z7!@?aYHh|yh#`dRgry=RXNo?U#9_koPGhq?&*O*3KFvM1;zDsnY}s*pzxD}#cRHPd pI**Vtyw3Zk3vnKyHf1vdL$gCeLoGx#p=Kp=rANqQBo7l(3IJ2=3nu^o From 48f67d26adf9f760b114b6a2c37aa706d4db2d30 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 21:19:47 +0100 Subject: [PATCH 32/35] Bump min peeers License: MIT Signed-off-by: Jakub Sztandera --- peermgr/peermgr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/peermgr/peermgr.go b/peermgr/peermgr.go index 22879141e..fe87e723f 100644 --- a/peermgr/peermgr.go +++ b/peermgr/peermgr.go @@ -20,7 +20,7 @@ var log = logging.Logger("peermgr") const ( MaxFilPeers = 32 - MinFilPeers = 8 + MinFilPeers = 12 ) type MaybePeerMgr struct { From f141849df5445262e1cc04f2b9a7b814c3b36a89 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Wed, 11 Dec 2019 21:41:24 +0100 Subject: [PATCH 33/35] fix incoming tipset bucketing --- chain/sub/incoming.go | 6 +++++- chain/sync.go | 1 + chain/sync_manager.go | 6 ++---- chain/sync_manager_test.go | 27 +++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/chain/sub/incoming.go b/chain/sub/incoming.go index c14aed2d9..eac22c820 100644 --- a/chain/sub/incoming.go +++ b/chain/sub/incoming.go @@ -33,6 +33,9 @@ func HandleIncomingBlocks(ctx context.Context, bsub *pubsub.Subscription, s *cha } go func() { + log.Infof("New block over pubsub: %s", blk.Cid()) + + start := time.Now() log.Debug("about to fetch messages for block from pubsub") bmsgs, err := s.Bsync.FetchMessagesByCids(context.TODO(), blk.BlsMessages) if err != nil { @@ -46,7 +49,8 @@ func HandleIncomingBlocks(ctx context.Context, bsub *pubsub.Subscription, s *cha return } - log.Debugw("new block over pubsub", "cid", blk.Header.Cid(), "source", msg.GetFrom()) + took := time.Since(start) + log.Infow("new block over pubsub", "cid", blk.Header.Cid(), "source", msg.GetFrom(), "msgfetch", took) if delay := time.Now().Unix() - int64(blk.Header.Timestamp); delay > 5 { log.Warnf("Received block with large delay %d from miner %s", delay, blk.Header.Miner) } diff --git a/chain/sync.go b/chain/sync.go index b65341825..e761167eb 100644 --- a/chain/sync.go +++ b/chain/sync.go @@ -362,6 +362,7 @@ func (syncer *Syncer) tryLoadFullTipSet(cids []cid.Cid) (*store.FullTipSet, erro } func (syncer *Syncer) Sync(ctx context.Context, maybeHead *types.TipSet) error { + log.Info("SYNC TIME: ", maybeHead.Cids()) ctx, span := trace.StartSpan(ctx, "chain.Sync") defer span.End() diff --git a/chain/sync_manager.go b/chain/sync_manager.go index 4226902c5..7e6e1bd80 100644 --- a/chain/sync_manager.go +++ b/chain/sync_manager.go @@ -203,9 +203,6 @@ func (stb *syncTargetBucket) sameChainAs(ts *types.TipSet) bool { if types.CidArrsEqual(ts.Parents(), t.Cids()) { return true } - if types.CidArrsEqual(ts.Parents(), t.Parents()) { - return true - } } return false } @@ -283,6 +280,7 @@ func (sm *SyncManager) syncScheduler() { } func (sm *SyncManager) scheduleIncoming(ts *types.TipSet) { + log.Info("scheduling incoming tipset sync: ", ts.Cids()) if sm.getBootstrapState() == BSStateSelected { sm.setBootstrapState(BSStateScheduled) sm.syncTargets <- ts @@ -295,7 +293,7 @@ func (sm *SyncManager) scheduleIncoming(ts *types.TipSet) { break } - if types.CidArrsEqual(ts.Parents(), acts.Cids()) || types.CidArrsEqual(ts.Parents(), acts.Parents()) { + if types.CidArrsEqual(ts.Parents(), acts.Cids()) { // sync this next, after that sync process finishes relatedToActiveSync = true } diff --git a/chain/sync_manager_test.go b/chain/sync_manager_test.go index 1eb85ec2c..ca2ced856 100644 --- a/chain/sync_manager_test.go +++ b/chain/sync_manager_test.go @@ -74,6 +74,7 @@ func TestSyncManager(t *testing.T) { b := mock.TipSet(mock.MkBlock(a, 1, 2)) c1 := mock.TipSet(mock.MkBlock(b, 1, 3)) c2 := mock.TipSet(mock.MkBlock(b, 2, 4)) + c3 := mock.TipSet(mock.MkBlock(b, 3, 5)) d := mock.TipSet(mock.MkBlock(c1, 4, 5)) runSyncMgrTest(t, "testBootstrap", 1, func(t *testing.T, sm *SyncManager, stc chan *syncOp) { @@ -120,4 +121,30 @@ func TestSyncManager(t *testing.T) { assertGetSyncOp(t, stc, d) }) + + runSyncMgrTest(t, "testSyncIncomingTipset", 1, func(t *testing.T, sm *SyncManager, stc chan *syncOp) { + sm.SetPeerHead(ctx, "peer1", a) + assertGetSyncOp(t, stc, a) + + sm.SetPeerHead(ctx, "peer2", b) + op := <-stc + op.done() + + sm.SetPeerHead(ctx, "peer2", c1) + op1 := <-stc + fmt.Println("op1: ", op1.ts.Cids()) + + sm.SetPeerHead(ctx, "peer2", c2) + sm.SetPeerHead(ctx, "peer2", c3) + + op1.done() + + op2 := <-stc + fmt.Println("op2: ", op2.ts.Cids()) + op2.done() + + op3 := <-stc + fmt.Println("op3: ", op3.ts.Cids()) + op3.done() + }) } From 9fa46dbac325262796d9e23f3013c28bf9731af6 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 21:45:19 +0100 Subject: [PATCH 34/35] Stable net peers output License: MIT Signed-off-by: Jakub Sztandera --- cli/net.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cli/net.go b/cli/net.go index 5fea84a4d..78354d563 100644 --- a/cli/net.go +++ b/cli/net.go @@ -2,6 +2,8 @@ package cli import ( "fmt" + "sort" + "strings" "gopkg.in/urfave/cli.v2" @@ -34,6 +36,10 @@ var netPeers = &cli.Command{ return err } + sort.Slice(peers, func(i, j int) bool { + return strings.Compare(string(peers[i].ID), string(peers[j].ID)) > 0 + }) + for _, peer := range peers { fmt.Println(peer) } From ae2a694dcb129c3c52c82acfee59e4407a945be8 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Dec 2019 22:03:53 +0100 Subject: [PATCH 35/35] Remove sync time License: MIT Signed-off-by: Jakub Sztandera --- chain/sync.go | 1 - 1 file changed, 1 deletion(-) diff --git a/chain/sync.go b/chain/sync.go index e761167eb..b65341825 100644 --- a/chain/sync.go +++ b/chain/sync.go @@ -362,7 +362,6 @@ func (syncer *Syncer) tryLoadFullTipSet(cids []cid.Cid) (*store.FullTipSet, erro } func (syncer *Syncer) Sync(ctx context.Context, maybeHead *types.TipSet) error { - log.Info("SYNC TIME: ", maybeHead.Cids()) ctx, span := trace.StartSpan(ctx, "chain.Sync") defer span.End()