From 167288712335e555c3dfc1f59f561250047e3888 Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Mon, 30 Nov 2020 11:26:29 +0300
Subject: [PATCH] nef: increase version field to 32 bytes

Follow recent C# changes.
---
 cli/testdata/verify.nef                | Bin 66 -> 82 bytes
 pkg/rpc/server/server_test.go          |   4 ++--
 pkg/rpc/server/testdata/testblocks.acc | Bin 7490 -> 7522 bytes
 pkg/smartcontract/nef/nef.go           |  11 ++++-------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/cli/testdata/verify.nef b/cli/testdata/verify.nef
index f8bf2ff484af657cb2466fb260319611cd3feac5..5bb3c8bbe40518db36efb14d911e84b0a574ee9e 100755
GIT binary patch
delta 51
zcmZ<?nxLX*pl4~MXP{e@Y^ZB!Y^j@WVs4OXXliN100o@kj0}Pf;S9_UGm`er1^^d(
B3ZDP~

delta 34
hcmWG?nxHaKfki5Y0RcF}85sl}!Wozy9Aq}E0{~i61$qDg

diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go
index 1c203176a..42bd9a93c 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 = "3f81bc99525ed4b1cbb4a3535feadf73176db646a2879aaf975737348a425edc"
+const deploymentTxHash = "9ecf1273fe0d8868cc024c8270b569a12edd7ea9d675c88554b937134efb03f8"
 const genesisBlockHash = "a496577895eb8c227bb866dc44f99f21c0cf06417ca8f2a877cc5d761a50dac0"
 
 const verifyContractHash = "a2eb22340979804cb10cc1add0b8822c201f4d8a"
@@ -1345,7 +1345,7 @@ func checkNep17Balances(t *testing.T, e *executor, acc interface{}) {
 			},
 			{
 				Asset:       e.chain.UtilityTokenHash(),
-				Amount:      "80009730770",
+				Amount:      "80009698770",
 				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 999cb641fef7cc683c425d11b10ee86486fc93ae..444446512145627acecfbd90cb2d7782fe79d6bf 100644
GIT binary patch
delta 2157
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
ZG|Z{u+Wp^*1J}rT_cDosFosi`{|6Fy-wyx)

delta 2140
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
Pq(gGiU6!lY4ix?mFnjw-

diff --git a/pkg/smartcontract/nef/nef.go b/pkg/smartcontract/nef/nef.go
index e0a172b0d..af2a42024 100644
--- a/pkg/smartcontract/nef/nef.go
+++ b/pkg/smartcontract/nef/nef.go
@@ -18,7 +18,7 @@ import (
 // +------------+-----------+------------------------------------------------------------+
 // | Magic      | 4 bytes   | Magic header                                               |
 // | Compiler   | 32 bytes  | Compiler used                                              |
-// | Version    | 16 bytes  | Compiler version                                           |
+// | Version    | 32 bytes  | Compiler version                                           |
 // +------------+-----------+------------------------------------------------------------+
 // | Script     | Var bytes | Var bytes for the payload                                  |
 // +------------+-----------+------------------------------------------------------------+
@@ -30,10 +30,8 @@ const (
 	Magic uint32 = 0x3346454E
 	// MaxScriptLength is the maximum allowed contract script length.
 	MaxScriptLength = 1024 * 1024
-	// compilerFieldSize is the length of `Compiler` File header field in bytes.
+	// compilerFieldSize is the length of `Compiler` and `Version` File header fields in bytes.
 	compilerFieldSize = 32
-	// versionFieldSize is the length of `Version` File header field in bytes.
-	versionFieldSize = 16
 )
 
 // File represents compiled contract file structure according to the NEF3 standard.
@@ -60,7 +58,7 @@ func NewFile(script []byte) (*File, error) {
 		},
 		Script: script,
 	}
-	if len(config.Version) > versionFieldSize {
+	if len(config.Version) > compilerFieldSize {
 		return nil, errors.New("too long version")
 	}
 	file.Checksum = file.CalculateChecksum()
@@ -77,7 +75,6 @@ func (h *Header) EncodeBinary(w *io.BinWriter) {
 	var b = make([]byte, compilerFieldSize)
 	copy(b, []byte(h.Compiler))
 	w.WriteBytes(b)
-	b = b[:versionFieldSize]
 	for i := range b {
 		b[i] = 0
 	}
@@ -98,7 +95,7 @@ func (h *Header) DecodeBinary(r *io.BinReader) {
 		return r == 0
 	})
 	h.Compiler = string(buf)
-	buf = buf[:versionFieldSize]
+	buf = buf[:compilerFieldSize]
 	r.ReadBytes(buf)
 	buf = bytes.TrimRightFunc(buf, func(r rune) bool {
 		return r == 0