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

feat: supply: drop genesis market locked funds

Browse Source
This commit is contained in:
Aayush 2023-03-23 15:56:59 -04:00
parent 06294351fa
commit 24381411f2
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chain/stmgr/stmgr.go
View File

@ -130,8 +130,7 @@ type StateManager struct {
postIgnitionVesting []msig0.State postIgnitionVesting []msig0.State
postCalicoVesting []msig0.State postCalicoVesting []msig0.State
genesisPledge abi.TokenAmount genesisPledge abi.TokenAmount
genesisMarketFunds abi.TokenAmount
tsExec Executor tsExec Executor
tsExecMonitor ExecMonitor tsExecMonitor ExecMonitor

10
chain/stmgr/supply.go
View File

@ -51,17 +51,11 @@ func (sm *StateManager) setupGenesisVestingSchedule(ctx context.Context) error {
return xerrors.Errorf("loading state tree: %w", err) return xerrors.Errorf("loading state tree: %w", err)
} }
gmf, err := getFilMarketLocked(ctx, sTree)
if err != nil {
return xerrors.Errorf("setting up genesis market funds: %w", err)
}
gp, err := getFilPowerLocked(ctx, sTree) gp, err := getFilPowerLocked(ctx, sTree)
if err != nil { if err != nil {
return xerrors.Errorf("setting up genesis pledge: %w", err) return xerrors.Errorf("setting up genesis pledge: %w", err)
} }
sm.genesisMarketFunds = gmf
sm.genesisPledge = gp sm.genesisPledge = gp
totalsByEpoch := make(map[abi.ChainEpoch]abi.TokenAmount) totalsByEpoch := make(map[abi.ChainEpoch]abi.TokenAmount)
@ -202,7 +196,7 @@ func (sm *StateManager) GetFilVested(ctx context.Context, height abi.ChainEpoch)
defer sm.genesisMsigLk.Unlock() defer sm.genesisMsigLk.Unlock()
// TODO: combine all this? // TODO: combine all this?
if sm.preIgnitionVesting == nil || sm.genesisPledge.IsZero() || sm.genesisMarketFunds.IsZero() { if sm.preIgnitionVesting == nil || sm.genesisPledge.IsZero() {
err := sm.setupGenesisVestingSchedule(ctx) err := sm.setupGenesisVestingSchedule(ctx)
if err != nil { if err != nil {
return vf, xerrors.Errorf("failed to setup pre-ignition vesting schedule: %w", err) return vf, xerrors.Errorf("failed to setup pre-ignition vesting schedule: %w", err)
@ -246,8 +240,6 @@ func (sm *StateManager) GetFilVested(ctx context.Context, height abi.ChainEpoch)
if height <= build.UpgradeAssemblyHeight { if height <= build.UpgradeAssemblyHeight {
// continue to use preIgnitionGenInfos, nothing changed at the Ignition epoch // continue to use preIgnitionGenInfos, nothing changed at the Ignition epoch
vf = big.Add(vf, sm.genesisPledge) vf = big.Add(vf, sm.genesisPledge)
// continue to use preIgnitionGenInfos, nothing changed at the Ignition epoch
vf = big.Add(vf, sm.genesisMarketFunds)
} }
return vf, nil return vf, nil