chore: ffi: the latest fvm release

filecoin-project · Mar 27, 2022 · 7a5fd4e · 7a5fd4e
1 parent c070f25
commit 7a5fd4e
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
@@ -232,10 +232,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},
-		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},
+		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
+8 −8		cgo/extern.go
+43 −79		fvm.go
+111 −111		rust/Cargo.lock
+6 −3		rust/Cargo.toml
+11 −1		rust/src/fvm/blockstore/cgo.rs
+10 −9		rust/src/fvm/blockstore/fake.rs
+7 −0		rust/src/fvm/blockstore/overlay.rs
+6 −0		rust/src/fvm/externs.rs