Add funds that have left FilReserve to circ supply #4160
Conversation
arajasek
requested review from
Kubuxu,
magik6k and
whyrusleeping
as code owners
arajasek
force-pushed
the
asr/reserve-funds-cric-supply
branch
from
8761e24
to
caf7c18
Compare
build/params_testground.go
Outdated
| @@ -55,6 +55,7 @@ var ( | |||
|
|
|||
| FilBase uint64 = 2_000_000_000 | |||
| FilAllocStorageMining uint64 = 1_400_000_000 | |||
| FilReserved uint64 = 1_400_000_000 | |||
| // continue to use preIgnitionGenInfos, nothing changed at the Ignition epoch | ||
| vf = big.Add(vf, sm.preIgnitionGenInfos.genesisMarketFunds) | ||
| if height <= build.UpgradeActorsV2Height { | ||
| // continue to use preIgnitionGenInfos, nothing changed at the Ignition epoch |
There was a problem hiding this comment.
Why do we not need to add genesisPledge after Ignition epoch?
There was a problem hiding this comment.
I might be wrong, but I assumed that these funds will now be accounted for in "what's missing from FilReserve", since that's where they came from originally? Is that not the case?
chain/stmgr/stmgr.go
Outdated
| } | ||
|
|
||
| // If money enters the reserve actor, this could lead to a negative term | ||
| vf = big.Add(vf, big.Sub(big.NewFromGo(build.InitialFilReserved), ract.Balance)) |
There was a problem hiding this comment.
Let's call this ReserveDisbursed as a separate term.
arajasek
force-pushed
the
asr/reserve-funds-cric-supply
branch
from
caf7c18
to
f55b18e
Compare
| } | ||
|
|
||
| // If money enters the reserve actor, this could lead to a negative term | ||
| return big.Sub(big.NewFromGo(build.InitialFilReserved), ract.Balance), nil |
There was a problem hiding this comment.
It is unclear which variable (there are two of the same name) InitialFilReserved refers to in build, lets make sure we are using the right precision.
There was a problem hiding this comment.
Yeah, it's using the right one (the other one will be used for testground).
|
Good to be merged into next after #3936 lands |
Yields the following numbers at height 130000 (after the v2 actors upgrade)
FilVested 13429543.811411839397160646 FIL
FilCirculating 5961737.242508608156582553