fix vm bug: network version check (#4482)

Co-authored-by: 一页素书 <2931107265@qq.com> Co-authored-by: Mike <41407352+hunjixin@users.noreply.github.com>
filecoin-project · Jul 1, 2021 · d5ea97d · d5ea97d
1 parent 3d0675f
commit d5ea97d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/consensus/call_invoke.go b/pkg/consensus/call_invoke.go
@@ -85,7 +85,7 @@ func (c *Expected) CallWithGas(ctx context.Context, msg *types.UnsignedMessage,
 		NtwkVersionGetter: c.fork.GetNtwkVersion,
 		Rnd:               &rnd,
 		BaseFee:           ts.At(0).ParentBaseFee,
-		Epoch:             ts.Height() + 1,
+		Epoch:             ts.Height(),
 		GasPriceSchedule:  c.gasPirceSchedule,
 		PRoot:             stateRoot,
 		Bsstore:           c.bstore,

diff --git a/pkg/vm/vmcontext/runtime_adapter.go b/pkg/vm/vmcontext/runtime_adapter.go
@@ -153,7 +153,8 @@ func (a *runtimeAdapter) NetworkVersion() network.Version {
 func (a *runtimeAdapter) GetRandomnessFromBeacon(personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte) abi.Randomness {
 	var err error
 	var res []byte
-	if randEpoch > a.ctx.vm.vmOption.Fork.GetForkUpgrade().UpgradeHyperdriveHeight {
+
+	if a.ctx.vm.vmOption.NtwkVersionGetter(a.ctx.vm.context, randEpoch) >= network.Version13 {
 		res, err = a.ctx.randSource.GetBeaconRandomnessLookingForward(a.Context(), personalization, randEpoch, entropy)
 	} else {
 		res, err = a.ctx.randSource.GetBeaconRandomnessLookingBack(a.Context(), personalization, randEpoch, entropy)