cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge branch 'master' into raulk/itests-refactor-kit

Browse Source
This commit is contained in:
Raúl Kripalani 2021-06-23 17:55:06 +01:00
commit ef8f35510d
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/config.yml
View File

@ -440,7 +440,6 @@ jobs:
paths: paths:
- appimage - appimage
gofmt: gofmt:
executor: golang executor: golang
steps: steps:

4
build/params_mainnet.go
View File

@ -62,8 +62,8 @@ const UpgradeNorwegianHeight = 665280
// 2021-04-29T06:00:00Z // 2021-04-29T06:00:00Z
const UpgradeTurboHeight = 712320 const UpgradeTurboHeight = 712320
// ??? // 2021-06-30T22:00:00Z
var UpgradeHyperdriveHeight = abi.ChainEpoch(9999999) var UpgradeHyperdriveHeight = abi.ChainEpoch(892800)
func init() { func init() {
if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" { if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" {

4
cli/client.go
View File

@ -308,8 +308,8 @@ var clientDealCmd = &cli.Command{
Description: `Make a deal with a miner. Description: `Make a deal with a miner.
dataCid comes from running 'lotus client import'. dataCid comes from running 'lotus client import'.
miner is the address of the miner you wish to make a deal with. miner is the address of the miner you wish to make a deal with.
price is measured in FIL/GB/Epoch. Miners usually don't accept a bid price is measured in FIL/Epoch. Miners usually don't accept a bid
lower than their advertised ask. You can check a miners listed price lower than their advertised ask (which is in FIL/GiB/Epoch). You can check a miners listed price
with 'lotus client query-ask <miner address>'. with 'lotus client query-ask <miner address>'.
duration is how long the miner should store the data for, in blocks. duration is how long the miner should store the data for, in blocks.
The minimum value is 518400 (6 months).`, The minimum value is 518400 (6 months).`,

4
documentation/en/cli-lotus.md
View File

@ -558,8 +558,8 @@ DESCRIPTION:
Make a deal with a miner. Make a deal with a miner.
dataCid comes from running 'lotus client import'. dataCid comes from running 'lotus client import'.
miner is the address of the miner you wish to make a deal with. miner is the address of the miner you wish to make a deal with.
price is measured in FIL/GB/Epoch. Miners usually don't accept a bid price is measured in FIL/Epoch. Miners usually don't accept a bid
lower than their advertised ask. You can check a miners listed price lower than their advertised ask (which is in FIL/GiB/Epoch). You can check a miners listed price
with 'lotus client query-ask <miner address>'. with 'lotus client query-ask <miner address>'.
duration is how long the miner should store the data for, in blocks. duration is how long the miner should store the data for, in blocks.
The minimum value is 518400 (6 months). The minimum value is 518400 (6 months).

8
node/config/def.go
View File

@ -377,12 +377,12 @@ func DefaultStorageMiner() *StorageMiner {
MaxCommitGasFee: types.MustParseFIL("0.05"), MaxCommitGasFee: types.MustParseFIL("0.05"),
MaxPreCommitBatchGasFee: BatchFeeConfig{ MaxPreCommitBatchGasFee: BatchFeeConfig{
Base: types.MustParseFIL("0.025"), // TODO: update before v1.10.0 Base: types.MustParseFIL("0"),
PerSector: types.MustParseFIL("0.025"), // TODO: update before v1.10.0 PerSector: types.MustParseFIL("0.02"),
}, },
MaxCommitBatchGasFee: BatchFeeConfig{ MaxCommitBatchGasFee: BatchFeeConfig{
Base: types.MustParseFIL("0.05"), // TODO: update before v1.10.0 Base: types.MustParseFIL("0"),
PerSector: types.MustParseFIL("0.05"), // TODO: update before v1.10.0 PerSector: types.MustParseFIL("0.03"), // enough for 6 agg and 1nFIL base fee
}, },
MaxTerminateGasFee: types.MustParseFIL("0.5"), MaxTerminateGasFee: types.MustParseFIL("0.5"),