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

Merge pull request #727 from nspcc-dev/fix-wrong-endian-in-interop-hashes

Browse source 
core: fix wrong endian used in interop functions
This commit is contained in:
Roman Khimov 2020-03-06 19:07:28 +03:00 committed by GitHub
commit 0e8ff558d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/core/interop_neo.go
View file

@ -60,7 +60,7 @@ func (ic *interopContext) headerGetMerkleRoot(v *vm.VM) error {
if err != nil { if err != nil {
return err return err
} }
v.Estack().PushVal(header.MerkleRoot.BytesLE()) v.Estack().PushVal(header.MerkleRoot.BytesBE())
return nil return nil
} }
@ -70,7 +70,7 @@ func (ic *interopContext) headerGetNextConsensus(v *vm.VM) error {
if err != nil { if err != nil {
return err return err
} }
v.Estack().PushVal(header.NextConsensus.BytesLE()) v.Estack().PushVal(header.NextConsensus.BytesBE())
return nil return nil
} }

4
pkg/core/interop_neo_test.go
View file

@ -147,7 +147,7 @@ func TestHeaderGetMerkleRoot(t *testing.T) {
err := context.headerGetMerkleRoot(v) err := context.headerGetMerkleRoot(v)
require.NoError(t, err) require.NoError(t, err)
value := v.Estack().Pop().Value() value := v.Estack().Pop().Value()
require.Equal(t, block.MerkleRoot.BytesLE(), value) require.Equal(t, block.MerkleRoot.BytesBE(), value)
} }
func TestHeaderGetNextConsensus(t *testing.T) { func TestHeaderGetNextConsensus(t *testing.T) {
@ -157,7 +157,7 @@ func TestHeaderGetNextConsensus(t *testing.T) {
err := context.headerGetNextConsensus(v) err := context.headerGetNextConsensus(v)
require.NoError(t, err) require.NoError(t, err)
value := v.Estack().Pop().Value() value := v.Estack().Pop().Value()
require.Equal(t, block.NextConsensus.BytesLE(), value) require.Equal(t, block.NextConsensus.BytesBE(), value)
} }
func TestTxGetAttributes(t *testing.T) { func TestTxGetAttributes(t *testing.T) {

10
pkg/core/interop_system.go
View file

@ -41,7 +41,7 @@ func getBlockHashFromElement(bc Blockchainer, element *vm.Element) (util.Uint256
} }
hash = bc.GetHeaderHash(int(hashint)) hash = bc.GetHeaderHash(int(hashint))
} else { } else {
return util.Uint256DecodeBytesLE(hashbytes) return util.Uint256DecodeBytesBE(hashbytes)
} }
return hash, nil return hash, nil
} }
@ -102,7 +102,7 @@ func (ic *interopContext) bcGetHeight(v *vm.VM) error {
// returns transaction and its height if it's present in the blockchain. // returns transaction and its height if it's present in the blockchain.
func getTransactionAndHeight(cd *cachedDao, v *vm.VM) (*transaction.Transaction, uint32, error) { func getTransactionAndHeight(cd *cachedDao, v *vm.VM) (*transaction.Transaction, uint32, error) {
hashbytes := v.Estack().Pop().Bytes() hashbytes := v.Estack().Pop().Bytes()
hash, err := util.Uint256DecodeBytesLE(hashbytes) hash, err := util.Uint256DecodeBytesBE(hashbytes)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
@ -161,7 +161,7 @@ func (ic *interopContext) headerGetHash(v *vm.VM) error {
if err != nil { if err != nil {
return err return err
} }
v.Estack().PushVal(header.Hash().BytesLE()) v.Estack().PushVal(header.Hash().BytesBE())
return nil return nil
} }
@ -171,7 +171,7 @@ func (ic *interopContext) headerGetPrevHash(v *vm.VM) error {
if err != nil { if err != nil {
return err return err
} }
v.Estack().PushVal(header.PrevHash.BytesLE()) v.Estack().PushVal(header.PrevHash.BytesBE())
return nil return nil
} }
@ -238,7 +238,7 @@ func (ic *interopContext) txGetHash(v *vm.VM) error {
if !ok { if !ok {
return errors.New("value is not a transaction") return errors.New("value is not a transaction")
} }
v.Estack().PushVal(tx.Hash().BytesLE()) v.Estack().PushVal(tx.Hash().BytesBE())
return nil return nil
} }