Merge pull request #751 from filecoin-project/devnet/11

Devnet 11
This commit is contained in:
Łukasz Magiera 2019-12-05 17:01:33 +01:00 committed by GitHub
commit f0ff7e7dda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 6 deletions

View File

@ -1,2 +1,2 @@
/ip4/147.75.80.29/tcp/1347/p2p/12D3KooWQYHfhaqRCEAcZKFEVZnK7kgPh1FHwYNwLgCZkoxmmARu
/ip4/147.75.80.17/tcp/1347/p2p/12D3KooWQg7XTDcU7ySChvLSMZ3L4cywXPsAcv1uyMNw8n5hv9KS
/ip4/147.75.80.29/tcp/1347/p2p/12D3KooWDzb12XyoKT4uJAqmRVsSYqY9EZczXeWJ7WqehugBTVAT
/ip4/147.75.80.17/tcp/1347/p2p/12D3KooWDsfpmaYPouFT2RxvSf8eCuUS63T4dAKvDPqzWKdv7Qc7

Binary file not shown.

View File

@ -6,6 +6,7 @@ var SectorSizes = []uint64{
16 << 20,
256 << 20,
1 << 30,
32 << 30,
}
// Seconds

View File

@ -1,7 +1,7 @@
package build
// Version is the local build version, set by build system
const Version = "0.10.0"
const Version = "0.11.0"
// APIVersion is a hex semver version of the rpc api exposed
//
@ -12,7 +12,7 @@ const Version = "0.10.0"
// R R H
// |\vv/|
// vv vv
const APIVersion = 0x000a01
const APIVersion = 0x000b01
const (
MajorMask = 0xff0000

View File

@ -418,10 +418,15 @@ func (sb *SectorBuilder) SealPreCommit(sectorID uint64, ticket SealTicket, piece
sb.checkRateLimit()
rl := sb.rateLimit
if !sb.sealLocal {
rl = make(chan struct{})
}
select { // use whichever is available
case sb.sealTasks <- call:
return sb.sealPreCommitRemote(call)
case sb.rateLimit <- struct{}{}:
case rl <- struct{}{}:
}
// local
@ -533,10 +538,15 @@ func (sb *SectorBuilder) SealCommit(sectorID uint64, ticket SealTicket, seed Sea
default:
sb.checkRateLimit()
rl := sb.rateLimit
if !sb.sealLocal {
rl = make(chan struct{})
}
select { // use whichever is available
case sb.sealTasks <- call:
proof, err = sb.sealCommitRemote(call)
case sb.rateLimit <- struct{}{}:
case rl <- struct{}{}:
proof, err = sb.sealCommitLocal(sectorID, ticket, seed, pieces, rspco)
}
}