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

chore: ffi: the latest fvm release
filecoin-project · Mar 27, 2022 · b8b33c4 · b8b33c4
2 parents 001de1a + f2fa2f5
commit b8b33c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/chain/vm/fvm.go b/chain/vm/fvm.go
@@ -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
 	}

diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi