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

Merge pull request #6571 from filecoin-project/chore/merge-1.10

Browse Source 
Merge 1.10 branch into master
This commit is contained in:
Aayush Rajasekaran 2021-06-23 10:10:11 -04:00 committed by GitHub
commit f1ed13d1ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/config.yml
View File

@ -468,7 +468,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" {

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"),