aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

core: update System.Blockchain.GetTransactionHeight interop

Browse source 
Update System.Blockchain.GetTransactionHeight and removed
Neo.Blockchain.GetTransactionHeight interop as we don't need it.
This commit is contained in:
Anna Shaleva 2020-06-08 18:40:01 +03:00
parent 53655c5ac2
commit 1e63ae4b3f
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/compiler/syscall.go
View file

@ -41,7 +41,7 @@ var syscalls = map[string]map[string]string{
"GetHeader": "Neo.Blockchain.GetHeader", "GetHeader": "Neo.Blockchain.GetHeader",
"GetHeight": "Neo.Blockchain.GetHeight", "GetHeight": "Neo.Blockchain.GetHeight",
"GetTransaction": "System.Blockchain.GetTransaction", "GetTransaction": "System.Blockchain.GetTransaction",
"GetTransactionHeight": "Neo.Blockchain.GetTransactionHeight", "GetTransactionHeight": "System.Blockchain.GetTransactionHeight",
"GetValidators": "Neo.Blockchain.GetValidators", "GetValidators": "Neo.Blockchain.GetValidators",
}, },
"header": { "header": {

5
pkg/core/interop_system.go
View file

@ -151,8 +151,9 @@ func bcGetTransaction(ic *interop.Context, v *vm.VM) error {
// bcGetTransactionHeight returns transaction height. // bcGetTransactionHeight returns transaction height.
func bcGetTransactionHeight(ic *interop.Context, v *vm.VM) error { func bcGetTransactionHeight(ic *interop.Context, v *vm.VM) error {
_, h, err := getTransactionAndHeight(ic.DAO, v) _, h, err := getTransactionAndHeight(ic.DAO, v)
if err != nil { if err != nil || !isTraceableBlock(ic, h) {
return err v.Estack().PushVal(-1)
return nil
} }
v.Estack().PushVal(h) v.Estack().PushVal(h)
return nil return nil

1
pkg/core/interops.go
View file

@ -112,7 +112,6 @@ var neoInterops = []interop.Function{
{Name: "Neo.Blockchain.GetContract", Func: bcGetContract, Price: 100}, {Name: "Neo.Blockchain.GetContract", Func: bcGetContract, Price: 100},
{Name: "Neo.Blockchain.GetHeader", Func: bcGetHeader, Price: 100}, {Name: "Neo.Blockchain.GetHeader", Func: bcGetHeader, Price: 100},
{Name: "Neo.Blockchain.GetHeight", Func: bcGetHeight, Price: 1}, {Name: "Neo.Blockchain.GetHeight", Func: bcGetHeight, Price: 1},
{Name: "Neo.Blockchain.GetTransactionHeight", Func: bcGetTransactionHeight, Price: 100},
{Name: "Neo.Contract.Create", Func: contractCreate, Price: 0}, {Name: "Neo.Contract.Create", Func: contractCreate, Price: 0},
{Name: "Neo.Contract.Destroy", Func: contractDestroy, Price: 1}, {Name: "Neo.Contract.Destroy", Func: contractDestroy, Price: 1},
{Name: "Neo.Contract.GetScript", Func: contractGetScript, Price: 1}, {Name: "Neo.Contract.GetScript", Func: contractGetScript, Price: 1},

2
pkg/interop/blockchain/blockchain.go
View file

@ -67,7 +67,7 @@ func GetTransaction(hash []byte) Transaction {
// GetTransactionHeight returns transaction's height (index of the block that // GetTransactionHeight returns transaction's height (index of the block that
// includes it) by the given ID (256 bit in BE format represented as a slice of // includes it) by the given ID (256 bit in BE format represented as a slice of
// 32 bytes). This function uses `Neo.Blockchain.GetTransactionHeight` syscall. // 32 bytes). This function uses `System.Blockchain.GetTransactionHeight` syscall.
func GetTransactionHeight(hash []byte) int { func GetTransactionHeight(hash []byte) int {
return 0 return 0
} }