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

Merge pull request #8381 from filecoin-project/jen/ffi

Browse Source 
chore: ffi: the latest fvm release
This commit is contained in:
Jiaying Wang 2022-03-26 22:57:02 -04:00 committed by GitHub
commit b8b33c4f06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
chain/vm/fvm.go
View File

@ -234,10 +234,17 @@ func NewFVM(ctx context.Context, opts *VMOpts) (*FVM, error) {
}
}
fvm, err := ffi.CreateFVM(0,
&FvmExtern{Rand: opts.Rand, Blockstore: opts.Bstore, lbState: opts.LookbackState, base: opts.StateBase, epoch: opts.Epoch, nv: opts.NetworkVersion},
opts.Epoch, opts.BaseFee, circToReport, opts.NetworkVersion, opts.StateBase,
)
fvmOpts := ffi.FVMOpts{
FVMVersion: 0,
Externs: &FvmExtern{Rand: opts.Rand, Blockstore: opts.Bstore, lbState: opts.LookbackState, base: opts.StateBase, epoch: opts.Epoch, nv: opts.NetworkVersion},
Epoch: opts.Epoch,
BaseFee: opts.BaseFee,
BaseCircSupply: circToReport,
NetworkVersion: opts.NetworkVersion,
StateBase: opts.StateBase,
}
fvm, err := ffi.CreateFVM(&fvmOpts)
if err != nil {
return nil, err
}

2
extern/filecoin-ffi vendored

@ -1 +1 @@
Subproject commit c2668aa67ec589a773153022348b9c0ed6ed4d5d
Subproject commit 7f93fe5cf63aee1c6c21986903e870b02e337a16