diff --git a/.circleci/config.yml b/.circleci/config.yml index d76be4bdc..6eeb59c85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -468,7 +468,6 @@ jobs: paths: - appimage - gofmt: executor: golang steps: diff --git a/build/params_mainnet.go b/build/params_mainnet.go index e9bf33f5a..1c9b69462 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -62,8 +62,8 @@ const UpgradeNorwegianHeight = 665280 // 2021-04-29T06:00:00Z const UpgradeTurboHeight = 712320 -// ??? -var UpgradeHyperdriveHeight = abi.ChainEpoch(9999999) +// 2021-06-30T22:00:00Z +var UpgradeHyperdriveHeight = abi.ChainEpoch(892800) func init() { if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" { diff --git a/node/config/def.go b/node/config/def.go index a00ea7307..5a672e109 100644 --- a/node/config/def.go +++ b/node/config/def.go @@ -377,12 +377,12 @@ func DefaultStorageMiner() *StorageMiner { MaxCommitGasFee: types.MustParseFIL("0.05"), MaxPreCommitBatchGasFee: BatchFeeConfig{ - Base: types.MustParseFIL("0.025"), // TODO: update before v1.10.0 - PerSector: types.MustParseFIL("0.025"), // TODO: update before v1.10.0 + Base: types.MustParseFIL("0"), + PerSector: types.MustParseFIL("0.02"), }, MaxCommitBatchGasFee: BatchFeeConfig{ - Base: types.MustParseFIL("0.05"), // TODO: update before v1.10.0 - PerSector: types.MustParseFIL("0.05"), // TODO: update before v1.10.0 + Base: types.MustParseFIL("0"), + PerSector: types.MustParseFIL("0.03"), // enough for 6 agg and 1nFIL base fee }, MaxTerminateGasFee: types.MustParseFIL("0.5"),