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

fvm: fix implicit messages and message inclusion gas charging

Browse Source
This commit is contained in:
Steven Allen 2022-02-07 10:33:57 -08:00
parent 04092f3e6b
commit 279cdd0760
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chain/vm/fvm.go
View File

@ -67,7 +67,7 @@ func (vm *FVM) ApplyMessage(ctx context.Context, cmsg types.ChainMsg) (*ApplyRet
return nil, xerrors.Errorf("serializing msg: %w", err) return nil, xerrors.Errorf("serializing msg: %w", err)
} }
ret, err := vm.fvm.ApplyMessage(msgBytes) ret, err := vm.fvm.ApplyMessage(msgBytes, uint(cmsg.ChainLength()))
if err != nil { if err != nil {
return nil, xerrors.Errorf("applying msg: %w", err) return nil, xerrors.Errorf("applying msg: %w", err)
} }
@ -101,7 +101,7 @@ func (vm *FVM) ApplyImplicitMessage(ctx context.Context, cmsg *types.Message) (*
return nil, xerrors.Errorf("serializing msg: %w", err) return nil, xerrors.Errorf("serializing msg: %w", err)
} }
ret, err := vm.fvm.ApplyMessage(msgBytes) ret, err := vm.fvm.ApplyImplicitMessage(msgBytes)
if err != nil { if err != nil {
return nil, xerrors.Errorf("applying msg: %w", err) return nil, xerrors.Errorf("applying msg: %w", err)
} }

2
extern/filecoin-ffi vendored

@ -1 +1 @@
Subproject commit b71619c2afa2487f2f4c5aceb4ba8f1fcb05ba52 Subproject commit 1e18dc4148d5f8aedc91e173b87b632635ad01ee