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

vm: Fix getActorCode

Browse Source
This commit is contained in:
Łukasz Magiera 2020-02-17 22:11:03 +01:00
parent d0c158b019
commit 038582ba44
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chain/types/vmcontext.go
View File

@ -39,6 +39,7 @@ type VMContext interface {
GasUsed() BigInt GasUsed() BigInt
Storage() Storage Storage() Storage
StateTree() (StateTree, aerrors.ActorError) StateTree() (StateTree, aerrors.ActorError)
ActorCodeCID(address.Address) (cid.Cid, error)
VerifySignature(sig *crypto.Signature, from address.Address, data []byte) aerrors.ActorError VerifySignature(sig *crypto.Signature, from address.Address, data []byte) aerrors.ActorError
ChargeGas(uint64) aerrors.ActorError ChargeGas(uint64) aerrors.ActorError
GetRandomness(height abi.ChainEpoch) ([]byte, aerrors.ActorError) GetRandomness(height abi.ChainEpoch) ([]byte, aerrors.ActorError)

11
chain/vm/spec_shim.go
View File

@ -91,18 +91,13 @@ func (rs *runtimeShim) CurrentBalance() abi.TokenAmount {
} }
func (rs *runtimeShim) GetActorCodeCID(addr address.Address) (ret cid.Cid, ok bool) { func (rs *runtimeShim) GetActorCodeCID(addr address.Address) (ret cid.Cid, ok bool) {
var err error ret, err := rs.vmctx.ActorCodeCID(addr)
st, err := rs.vmctx.StateTree()
if err != nil {
rs.Abortf(exitcode.ErrPlaceholder, "%v", err)
}
act, err := st.GetActor(addr)
if err != nil { if err != nil {
// todo: notfound // todo: notfound
rs.Abortf(exitcode.ErrPlaceholder, "%v", err) rs.Abortf(exitcode.ErrPlaceholder, "%v", err)
} }
return act.Code, true
return ret, true
} }
func (rs *runtimeShim) GetRandomness(personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte) abi.Randomness { func (rs *runtimeShim) GetRandomness(personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte) abi.Randomness {

9
chain/vm/vm.go
View File

@ -20,6 +20,7 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/aerrors" "github.com/filecoin-project/lotus/chain/actors/aerrors"
@ -186,6 +187,14 @@ func (vmc *VMContext) StateTree() (types.StateTree, aerrors.ActorError) {
return vmc.state, nil return vmc.state, nil
} }
func (vmc *VMContext) ActorCodeCID(addr address.Address) (ret cid.Cid, err error) {
act, err := vmc.state.GetActor(addr)
if err != nil {
return cid.Undef, err
}
return act.Code, nil
}
const GasVerifySignature = 50 const GasVerifySignature = 50
func (vmctx *VMContext) VerifySignature(sig *crypto.Signature, act address.Address, data []byte) aerrors.ActorError { func (vmctx *VMContext) VerifySignature(sig *crypto.Signature, act address.Address, data []byte) aerrors.ActorError {