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

pass only fil-vested into FVM

Browse Source
This commit is contained in:
Steven Allen 2022-02-08 15:26:20 -08:00
parent 32b3618c74
commit e8d771fcac
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chain/consensus/filcns/compute_state.go
View File

@ -102,7 +102,6 @@ func (t *TipSetExecutor) ApplyBlocks(ctx context.Context, sm *stmgr.StateManager
if err != nil { if err != nil {
return nil, err return nil, err
} }
circulating := big.Add(supply.FilMined, supply.FilVested)
vmopt := &vm.VMOpts{ vmopt := &vm.VMOpts{
StateBase: base, StateBase: base,
@ -112,7 +111,7 @@ func (t *TipSetExecutor) ApplyBlocks(ctx context.Context, sm *stmgr.StateManager
Actors: NewActorRegistry(), Actors: NewActorRegistry(),
Syscalls: sm.Syscalls, Syscalls: sm.Syscalls,
CircSupplyCalc: sm.GetVMCirculatingSupply, CircSupplyCalc: sm.GetVMCirculatingSupply,
BaseCircSupply: circulating, FilVested: supply.FilVested,
NetworkVersion: sm.GetNetworkVersion(ctx, e), NetworkVersion: sm.GetNetworkVersion(ctx, e),
BaseFee: baseFee, BaseFee: baseFee,
LookbackState: stmgr.LookbackStateGetterForTipset(sm, ts), LookbackState: stmgr.LookbackStateGetterForTipset(sm, ts),

2
chain/vm/fvm.go
View File

@ -36,7 +36,7 @@ type FVM struct {
func NewFVM(ctx context.Context, opts *VMOpts) (*FVM, error) { func NewFVM(ctx context.Context, opts *VMOpts) (*FVM, error) {
fvm, err := ffi.CreateFVM(0, fvm, err := ffi.CreateFVM(0,
&FvmExtern{Rand: opts.Rand, Blockstore: opts.Bstore}, &FvmExtern{Rand: opts.Rand, Blockstore: opts.Bstore},
opts.Epoch, opts.BaseFee, opts.BaseCircSupply, opts.NetworkVersion, opts.StateBase, opts.Epoch, opts.BaseFee, opts.FilVested, opts.NetworkVersion, opts.StateBase,
) )
if err != nil { if err != nil {
return nil, err return nil, err

4
chain/vm/vm.go
View File

@ -227,8 +227,8 @@ type VMOpts struct {
Actors *ActorRegistry Actors *ActorRegistry
Syscalls SyscallBuilder Syscalls SyscallBuilder
CircSupplyCalc CircSupplyCalculator CircSupplyCalc CircSupplyCalculator
// Amount of FIL vested & mined. // Amount of FIL vested from genesis actors.
BaseCircSupply abi.TokenAmount FilVested abi.TokenAmount
NetworkVersion network.Version NetworkVersion network.Version
BaseFee abi.TokenAmount BaseFee abi.TokenAmount
LookbackState LookbackStateGetter LookbackState LookbackStateGetter