From 0c7e727859f3c77c15068a91cbfaf6223d0fe77a Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Thu, 26 Nov 2020 21:31:24 +0300
Subject: [PATCH] nef: drop scripthash

It's no longer a part of the file.
---
 cli/testdata/verify.nef                | Bin 86 -> 66 bytes
 pkg/rpc/server/server_test.go          |   4 ++--
 pkg/rpc/server/testdata/testblocks.acc | Bin 7530 -> 7490 bytes
 pkg/smartcontract/nef/nef.go           |  20 +++++---------------
 pkg/smartcontract/nef/nef_test.go      |  14 --------------
 5 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/cli/testdata/verify.nef b/cli/testdata/verify.nef
index 309796612c518d21dc13587970bab29636f5642b..2d3a78cabc30f15fa95ff4cb0ebc05abf2b6cdb1 100755
GIT binary patch
delta 31
ecmWG@nxG*S!+-z@UK4I{hBGn<I)pPYI{*Mu<OL@H

delta 51
zcmZ<?o1mc=&A`CG2*e=p{^0yrBS~>}*7w}|@_C;ImU=1f*GqnIn=_n|LC_(bf!P57
DN>vTE

diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go
index 20db7ca7e..ff55d6b83 100644
--- a/pkg/rpc/server/server_test.go
+++ b/pkg/rpc/server/server_test.go
@@ -57,7 +57,7 @@ type rpcTestCase struct {
 }
 
 const testContractHash = "743ed26f78e29ecd595535b74a943b1f9ccbc444"
-const deploymentTxHash = "8e848d367d6194c0ddc12310e0509c0bb3bf716b0bcd9c10508b4bc9c954408d"
+const deploymentTxHash = "f4abbf6a5af7b79819378cce1576dd72663a95961010383d67d8c4e1f00fac02"
 const genesisBlockHash = "a496577895eb8c227bb866dc44f99f21c0cf06417ca8f2a877cc5d761a50dac0"
 
 const verifyContractHash = "a2eb22340979804cb10cc1add0b8822c201f4d8a"
@@ -1345,7 +1345,7 @@ func checkNep17Balances(t *testing.T, e *executor, acc interface{}) {
 			},
 			{
 				Asset:       e.chain.UtilityTokenHash(),
-				Amount:      "80009690770",
+				Amount:      "80009730770",
 				LastUpdated: 7,
 			}},
 		Address: testchain.PrivateKeyByID(0).GetScriptHash().StringLE(),
diff --git a/pkg/rpc/server/testdata/testblocks.acc b/pkg/rpc/server/testdata/testblocks.acc
index 4023d6e32da3940d2fd7013f4f0535a78d608a16..167c4ab35b358e46cdf0ecacb10f12b01f6af994 100644
GIT binary patch
delta 2068
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

delta 2148
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
akv;Gx%n%v&1x$qv?qvON_gi$6F%T+gZuD#b

diff --git a/pkg/smartcontract/nef/nef.go b/pkg/smartcontract/nef/nef.go
index effb07ab6..c65e061be 100644
--- a/pkg/smartcontract/nef/nef.go
+++ b/pkg/smartcontract/nef/nef.go
@@ -11,7 +11,6 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/config"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/hash"
 	"github.com/nspcc-dev/neo-go/pkg/io"
-	"github.com/nspcc-dev/neo-go/pkg/util"
 )
 
 // NEO Executable Format 3 (NEF3)
@@ -23,7 +22,6 @@ import (
 // | Magic      | 4 bytes   | Magic header                                               |
 // | Compiler   | 32 bytes  | Compiler used                                              |
 // | Version    | 16 bytes  | Compiler version (Major, Minor, Build, Version)            |
-// | ScriptHash | 20 bytes  | ScriptHash for the script (BE)                             |
 // +------------+-----------+------------------------------------------------------------+
 // | Checksum   | 4 bytes   | First four bytes of double SHA256 hash of the header       |
 // +------------+-----------+------------------------------------------------------------+
@@ -48,10 +46,9 @@ type File struct {
 
 // Header represents File header.
 type Header struct {
-	Magic      uint32
-	Compiler   string
-	Version    Version
-	ScriptHash util.Uint160
+	Magic    uint32
+	Compiler string
+	Version  Version
 }
 
 // Version represents compiler version.
@@ -66,9 +63,8 @@ type Version struct {
 func NewFile(script []byte) (File, error) {
 	file := File{
 		Header: Header{
-			Magic:      Magic,
-			Compiler:   "neo-go",
-			ScriptHash: hash.Hash160(script),
+			Magic:    Magic,
+			Compiler: "neo-go",
 		},
 		Script: script,
 	}
@@ -156,7 +152,6 @@ func (h *Header) EncodeBinary(w *io.BinWriter) {
 		w.WriteBytes(make([]byte, compilerFieldSize-len(bytes)))
 	}
 	h.Version.EncodeBinary(w)
-	h.ScriptHash.EncodeBinary(w)
 }
 
 // DecodeBinary implements io.Serializable interface.
@@ -173,7 +168,6 @@ func (h *Header) DecodeBinary(r *io.BinReader) {
 	})
 	h.Compiler = string(buf)
 	h.Version.DecodeBinary(r)
-	h.ScriptHash.DecodeBinary(r)
 }
 
 // CalculateChecksum returns first 4 bytes of double-SHA256(Header) converted to uint32.
@@ -207,10 +201,6 @@ func (n *File) DecodeBinary(r *io.BinReader) {
 		r.Err = errors.New("empty script")
 		return
 	}
-	if !hash.Hash160(n.Script).Equals(n.Header.ScriptHash) {
-		r.Err = errors.New("script hashes mismatch")
-		return
-	}
 }
 
 // Bytes returns byte array with serialized NEF File.
diff --git a/pkg/smartcontract/nef/nef_test.go b/pkg/smartcontract/nef/nef_test.go
index 229d786a2..1ed9575a3 100644
--- a/pkg/smartcontract/nef/nef_test.go
+++ b/pkg/smartcontract/nef/nef_test.go
@@ -4,8 +4,6 @@ import (
 	"testing"
 
 	"github.com/nspcc-dev/neo-go/internal/testserdes"
-	"github.com/nspcc-dev/neo-go/pkg/crypto/hash"
-	"github.com/nspcc-dev/neo-go/pkg/util"
 	"github.com/stretchr/testify/require"
 )
 
@@ -21,7 +19,6 @@ func TestEncodeDecodeBinary(t *testing.T) {
 				Build:    3,
 				Revision: 4,
 			},
-			ScriptHash: hash.Hash160(script),
 		},
 		Script: script,
 	}
@@ -39,7 +36,6 @@ func TestEncodeDecodeBinary(t *testing.T) {
 
 	t.Run("zero-length script", func(t *testing.T) {
 		expected.Script = make([]byte, 0)
-		expected.Header.ScriptHash = hash.Hash160(expected.Script)
 		expected.Checksum = expected.Header.CalculateChecksum()
 		checkDecodeError(t, expected)
 	})
@@ -47,21 +43,12 @@ func TestEncodeDecodeBinary(t *testing.T) {
 	t.Run("invalid script length", func(t *testing.T) {
 		newScript := make([]byte, MaxScriptLength+1)
 		expected.Script = newScript
-		expected.Header.ScriptHash = hash.Hash160(newScript)
-		expected.Checksum = expected.Header.CalculateChecksum()
-		checkDecodeError(t, expected)
-	})
-
-	t.Run("invalid scripthash", func(t *testing.T) {
-		expected.Script = script
-		expected.Header.ScriptHash = util.Uint160{1, 2, 3}
 		expected.Checksum = expected.Header.CalculateChecksum()
 		checkDecodeError(t, expected)
 	})
 
 	t.Run("positive", func(t *testing.T) {
 		expected.Script = script
-		expected.Header.ScriptHash = hash.Hash160(script)
 		expected.Checksum = expected.Header.CalculateChecksum()
 		expected.Header.Magic = Magic
 		testserdes.EncodeDecodeBinary(t, expected, &File{})
@@ -86,7 +73,6 @@ func TestBytesFromBytes(t *testing.T) {
 				Build:    3,
 				Revision: 4,
 			},
-			ScriptHash: hash.Hash160(script),
 		},
 		Script: script,
 	}