TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

core: adjust System.Blockchain.GetContract interop

Browse source 
Part of #1055.

It should put on stack an array instead of interop interface.
This commit is contained in:
Anna Shaleva 2020-07-15 12:53:09 +03:00
parent 1a5fb01e61
commit d2ec0fed3d
4 changed files with 59 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pkg/core/interop_system.go
View file

@ -83,6 +83,20 @@ func bcGetBlock(ic *interop.Context, v *vm.VM) error {
return nil
}
// contractToStackItem converts state.Contract to stackitem.Item
func contractToStackItem(cs *state.Contract) (stackitem.Item, error) {
manifest, err := cs.Manifest.MarshalJSON()
if err != nil {
return nil, err
}
return stackitem.NewArray([]stackitem.Item{
stackitem.NewByteArray(cs.Script),
stackitem.NewByteArray(manifest),
stackitem.NewBool(cs.HasStorage()),
stackitem.NewBool(cs.IsPayable()),
}), nil
}
// bcGetContract returns contract.
func bcGetContract(ic *interop.Context, v *vm.VM) error {
hashbytes := v.Estack().Pop().Bytes()
@ -92,9 +106,13 @@ func bcGetContract(ic *interop.Context, v *vm.VM) error {
}
cs, err := ic.DAO.GetContractState(hash)
if err != nil {
v.Estack().PushVal([]byte{})
v.Estack().PushVal(stackitem.Null{})
} else {
v.Estack().PushVal(stackitem.NewInterop(cs))
item, err := contractToStackItem(cs)
if err != nil {
return err
}
v.Estack().PushVal(item)
}
return nil
}