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

Merge pull request #515 from steven004/weight

Browse Source 
minor weight function change
This commit is contained in:
Łukasz Magiera 2019-11-09 01:04:50 +01:00 committed by GitHub
commit 28367c5ba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/params.go
View File

@ -103,8 +103,10 @@ const FilecoinPrecision = 1_000_000_000_000_000_000
// Blocks // Blocks
const HalvingPeriodBlocks = 6 * 365 * 24 * 60 * 2 const HalvingPeriodBlocks = 6 * 365 * 24 * 60 * 2
// Blocks // constants for Weight calculation
const AdjustmentPeriod = 7 * 24 * 60 * 2 // The ratio of weight contributed by short-term vs long-term factors in a given round
const WRatioNum = int64(1)
const WRatioDen = 2
// TODO: Move other important consts here // TODO: Move other important consts here

12
chain/store/weight.go
View File

@ -37,17 +37,17 @@ func (cs *ChainStore) Weight(ctx context.Context, ts *types.TipSet) (types.BigIn
tpow := types.BigFromBytes(ret.Return) tpow := types.BigFromBytes(ret.Return)
if tpow.GreaterThan(zero) { if tpow.GreaterThan(zero) {
log2P = int64(tpow.BitLen() - 1) log2P = int64(tpow.BitLen() - 1)
} else {
// Not really expect to be here ...
return types.EmptyInt, xerrors.Errorf("All power in the net is gone. You network might be disconnected, or the net is dead!")
} }
out.Add(out, big.NewInt(log2P*256)) out.Add(out, big.NewInt(log2P << 8))
// (wFunction(totalPowerAtTipset(ts)) * len(ts.blocks) * wRatio_num * 2^8) / (e * wRatio_den) // (wFunction(totalPowerAtTipset(ts)) * len(ts.blocks) * wRatio_num * 2^8) / (e * wRatio_den)
wRatioNum := int64(1) eWeight := big.NewInt((log2P * int64(len(ts.Blocks())) * build.WRatioNum) << 8)
wRatioDen := 2 eWeight.Div(eWeight, big.NewInt(int64(build.BlocksPerEpoch * build.WRatioDen)))
eWeight := big.NewInt((log2P * int64(len(ts.Blocks())) * wRatioNum) << 8)
eWeight.Div(eWeight, big.NewInt(int64(build.BlocksPerEpoch*wRatioDen)))
out.Add(out, eWeight) out.Add(out, eWeight)
return types.BigInt{Int: out}, nil return types.BigInt{Int: out}, nil