From 9008cc500c603571ad44c240be2b40a4c20f8428 Mon Sep 17 00:00:00 2001
From: AnnaShaleva <shaleva.ann@gmail.com>
Date: Tue, 1 Mar 2022 16:03:21 +0300
Subject: [PATCH 01/11] core: adjust Notary contract ID

---
 pkg/core/native/contract.go | 3 ---
 pkg/core/native/notary.go   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/core/native/contract.go b/pkg/core/native/contract.go
index b457d9ba5..a763b925e 100644
--- a/pkg/core/native/contract.go
+++ b/pkg/core/native/contract.go
@@ -11,9 +11,6 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/vm/emit"
 )
 
-// reservedContractID represents the upper bound of the reserved IDs for native contracts.
-const reservedContractID = -100
-
 // Contracts is a set of registered native contracts.
 type Contracts struct {
 	Management *Management
diff --git a/pkg/core/native/notary.go b/pkg/core/native/notary.go
index f53bc7346..de3ea91fb 100644
--- a/pkg/core/native/notary.go
+++ b/pkg/core/native/notary.go
@@ -39,7 +39,7 @@ type NotaryCache struct {
 }
 
 const (
-	notaryContractID = reservedContractID - 1
+	notaryContractID = -10
 	// prefixDeposit is a prefix for storing Notary deposits.
 	prefixDeposit                 = 1
 	defaultDepositDeltaTill       = 5760

From d7afb7bb2f0b8b4dd19091755333ddd1309bd10c Mon Sep 17 00:00:00 2001
From: AnnaShaleva <shaleva.ann@gmail.com>
Date: Tue, 1 Mar 2022 16:11:47 +0300
Subject: [PATCH 02/11] core: adjust value of P2PNotary node role

---
 pkg/core/native/noderoles/roles.go | 2 +-
 pkg/interop/native/roles/roles.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/core/native/noderoles/roles.go b/pkg/core/native/noderoles/roles.go
index e9bf43404..26c5f9e1d 100644
--- a/pkg/core/native/noderoles/roles.go
+++ b/pkg/core/native/noderoles/roles.go
@@ -8,5 +8,5 @@ const (
 	StateValidator Role = 4
 	Oracle         Role = 8
 	NeoFSAlphabet  Role = 16
-	P2PNotary      Role = 128
+	P2PNotary      Role = 32
 )
diff --git a/pkg/interop/native/roles/roles.go b/pkg/interop/native/roles/roles.go
index e0727c4f7..3ab92b17f 100644
--- a/pkg/interop/native/roles/roles.go
+++ b/pkg/interop/native/roles/roles.go
@@ -23,7 +23,7 @@ const (
 	Oracle         Role = 8
 	NeoFSAlphabet  Role = 16
 	// P2PNotary is an extension of Neo protocol available on specifically configured NeoGo networks.
-	P2PNotary Role = 128
+	P2PNotary Role = 32
 )
 
 // GetDesignatedByRole represents `getDesignatedByRole` method of RoleManagement native contract.

From 50157b31cd3fa0d669d72c773b6fcabb9de42a6f Mon Sep 17 00:00:00 2001
From: AnnaShaleva <shaleva.ann@gmail.com>
Date: Tue, 1 Mar 2022 19:16:25 +0300
Subject: [PATCH 03/11] core: add maximum constraint to
 `setNotaryServiceFeePerKey`

---
 pkg/core/native/notary.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/core/native/notary.go b/pkg/core/native/notary.go
index de3ea91fb..d965f6310 100644
--- a/pkg/core/native/notary.go
+++ b/pkg/core/native/notary.go
@@ -43,8 +43,9 @@ const (
 	// prefixDeposit is a prefix for storing Notary deposits.
 	prefixDeposit                 = 1
 	defaultDepositDeltaTill       = 5760
-	defaultMaxNotValidBeforeDelta = 140       // 20 rounds for 7 validators, a little more than half an hour
-	defaultNotaryServiceFeePerKey = 1000_0000 // 0.1 GAS
+	defaultMaxNotValidBeforeDelta = 140         // 20 rounds for 7 validators, a little more than half an hour
+	defaultNotaryServiceFeePerKey = 1000_0000   // 0.1 GAS
+	maxNotaryServiceFeePerKey     = 1_0000_0000 // 1 GAS
 )
 
 var (
@@ -442,8 +443,8 @@ func (n *Notary) GetNotaryServiceFeePerKey(dao *dao.Simple) int64 {
 // setNotaryServiceFeePerKey is a Notary contract method and sets a reward per notary request key for notary nodes.
 func (n *Notary) setNotaryServiceFeePerKey(ic *interop.Context, args []stackitem.Item) stackitem.Item {
 	value := toInt64(args[0])
-	if value < 0 {
-		panic("NotaryServiceFeePerKey can't be negative")
+	if value < 0 || value > maxNotaryServiceFeePerKey {
+		panic("NotaryServiceFeePerKey value is out of range")
 	}
 	if !n.NEO.checkCommittee(ic) {
 		panic("invalid committee signature")

From 4291efc8f00c6249c3e538876de84a35b24a7445 Mon Sep 17 00:00:00 2001
From: AnnaShaleva <shaleva.ann@gmail.com>
Date: Wed, 2 Mar 2022 20:18:39 +0300
Subject: [PATCH 04/11] services: fix typo in method description

---
 pkg/services/notary/notary.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/notary/notary.go b/pkg/services/notary/notary.go
index 58488b037..cd50cecae 100644
--- a/pkg/services/notary/notary.go
+++ b/pkg/services/notary/notary.go
@@ -106,7 +106,7 @@ type (
 	}
 )
 
-// isMainCompleted denotes whether all signatures for the main transaction was collected.
+// isMainCompleted denotes whether all signatures for the main transaction were collected.
 func (r request) isMainCompleted() bool {
 	if r.witnessInfo == nil {
 		return false

From 56d5839a72f5c8f769b140b654dbd77d924fc62e Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Tue, 24 May 2022 12:43:09 +0300
Subject: [PATCH 05/11] core: log stateroot N20 hash inside
 TestCreateBasicChain

---
 pkg/core/basic_chain_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/core/basic_chain_test.go b/pkg/core/basic_chain_test.go
index d460685bb..5c45a9832 100644
--- a/pkg/core/basic_chain_test.go
+++ b/pkg/core/basic_chain_test.go
@@ -270,6 +270,10 @@ func initBasicChain(t *testing.T, e *neotest.Executor) {
 	bw.Reset()
 	txSendRaw.EncodeBinary(bw.BinWriter)
 	t.Logf("sendrawtransaction: \n\tbase64: %s\n\tHash LE: %s", base64.StdEncoding.EncodeToString(bw.Bytes()), txSendRaw.Hash().StringLE())
+
+	sr20, err := e.Chain.GetStateModule().GetStateRoot(20)
+	require.NoError(t, err)
+	t.Logf("Block #20 stateroot LE: %s", sr20.Root.StringLE())
 }
 
 func newDeployTx(t *testing.T, e *neotest.Executor, sender neotest.Signer, sourcePath, configPath string, deploy bool) (util.Uint256, util.Uint160) {

From d540f16e37398f5495aa8de4bce38def7e4250a1 Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Tue, 24 May 2022 12:45:34 +0300
Subject: [PATCH 06/11] core: adjust noderoles package usages

Don't use interop roles package for internal tests.
---
 pkg/core/basic_chain_test.go               | 4 ++--
 pkg/core/blockchain_neotest_test.go        | 6 +++---
 pkg/core/native/native_test/gas_test.go    | 4 ++--
 pkg/core/native/native_test/notary_test.go | 4 ++--
 pkg/core/notary_test.go                    | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/core/basic_chain_test.go b/pkg/core/basic_chain_test.go
index 5c45a9832..5984ef504 100644
--- a/pkg/core/basic_chain_test.go
+++ b/pkg/core/basic_chain_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/core/chaindump"
 	"github.com/nspcc-dev/neo-go/pkg/core/native"
 	"github.com/nspcc-dev/neo-go/pkg/core/native/nativenames"
+	"github.com/nspcc-dev/neo-go/pkg/core/native/noderoles"
 	"github.com/nspcc-dev/neo-go/pkg/encoding/fixedn"
-	"github.com/nspcc-dev/neo-go/pkg/interop/native/roles"
 	"github.com/nspcc-dev/neo-go/pkg/io"
 	"github.com/nspcc-dev/neo-go/pkg/neotest"
 	"github.com/nspcc-dev/neo-go/pkg/neotest/chain"
@@ -186,7 +186,7 @@ func initBasicChain(t *testing.T, e *neotest.Executor) {
 	require.NoError(t, err)
 	require.NoError(t, ntr.Accounts[0].Decrypt("one", ntr.Scrypt))
 	designateSuperInvoker.Invoke(t, stackitem.Null{}, "designateAsRole",
-		int64(roles.P2PNotary), []interface{}{ntr.Accounts[0].PrivateKey().PublicKey().Bytes()})
+		int64(noderoles.P2PNotary), []interface{}{ntr.Accounts[0].PrivateKey().PublicKey().Bytes()})
 	t.Logf("Designated Notary node: %s", hex.EncodeToString(ntr.Accounts[0].PrivateKey().PublicKey().Bytes()))
 
 	// Block #10: push verification contract with arguments into the chain.
diff --git a/pkg/core/blockchain_neotest_test.go b/pkg/core/blockchain_neotest_test.go
index 80b30068b..91a25d12f 100644
--- a/pkg/core/blockchain_neotest_test.go
+++ b/pkg/core/blockchain_neotest_test.go
@@ -25,13 +25,13 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/core/native"
 	"github.com/nspcc-dev/neo-go/pkg/core/native/nativenames"
 	"github.com/nspcc-dev/neo-go/pkg/core/native/nativeprices"
+	"github.com/nspcc-dev/neo-go/pkg/core/native/noderoles"
 	"github.com/nspcc-dev/neo-go/pkg/core/state"
 	"github.com/nspcc-dev/neo-go/pkg/core/storage"
 	"github.com/nspcc-dev/neo-go/pkg/core/transaction"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/hash"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/nspcc-dev/neo-go/pkg/encoding/address"
-	"github.com/nspcc-dev/neo-go/pkg/interop/native/roles"
 	"github.com/nspcc-dev/neo-go/pkg/io"
 	"github.com/nspcc-dev/neo-go/pkg/neotest"
 	"github.com/nspcc-dev/neo-go/pkg/neotest/chain"
@@ -1454,7 +1454,7 @@ func TestBlockchain_VerifyTx(t *testing.T) {
 				keys = append(keys, p.Bytes())
 			}
 			designateSuperInvoker.Invoke(t, stackitem.Null{}, "designateAsRole",
-				int64(roles.Oracle), keys)
+				int64(noderoles.Oracle), keys)
 
 			t.Run("Valid", func(t *testing.T) {
 				tx := getOracleTx(t)
@@ -1671,7 +1671,7 @@ func TestBlockchain_VerifyTx(t *testing.T) {
 			notary, err := wallet.NewAccount()
 			require.NoError(t, err)
 			designateSuperInvoker.Invoke(t, stackitem.Null{}, "designateAsRole",
-				int64(roles.P2PNotary), []interface{}{notary.PrivateKey().PublicKey().Bytes()})
+				int64(noderoles.P2PNotary), []interface{}{notary.PrivateKey().PublicKey().Bytes()})
 			txSetNotary := transaction.New([]byte{byte(opcode.RET)}, 0)
 			txSetNotary.Signers = []transaction.Signer{
 				{
diff --git a/pkg/core/native/native_test/gas_test.go b/pkg/core/native/native_test/gas_test.go
index 8e5b2b3d4..a478b13a9 100644
--- a/pkg/core/native/native_test/gas_test.go
+++ b/pkg/core/native/native_test/gas_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/nspcc-dev/neo-go/pkg/config"
 	"github.com/nspcc-dev/neo-go/pkg/core/native/nativenames"
+	"github.com/nspcc-dev/neo-go/pkg/core/native/noderoles"
 	"github.com/nspcc-dev/neo-go/pkg/core/transaction"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
-	"github.com/nspcc-dev/neo-go/pkg/interop/native/roles"
 	"github.com/nspcc-dev/neo-go/pkg/neotest"
 	"github.com/nspcc-dev/neo-go/pkg/neotest/chain"
 	"github.com/nspcc-dev/neo-go/pkg/util"
@@ -85,7 +85,7 @@ func TestGAS_RewardWithP2PSigExtensionsEnabled(t *testing.T) {
 		require.NoError(t, err)
 		notaryNodesPublicKeys[i] = notaryNodes[i].PublicKey().Bytes()
 	}
-	e.CommitteeInvoker(e.NativeHash(t, nativenames.Designation)).Invoke(t, stackitem.Null{}, "designateAsRole", int(roles.P2PNotary), notaryNodesPublicKeys)
+	e.CommitteeInvoker(e.NativeHash(t, nativenames.Designation)).Invoke(t, stackitem.Null{}, "designateAsRole", int(noderoles.P2PNotary), notaryNodesPublicKeys)
 	for _, notaryNode := range notaryNodes {
 		e.CheckGASBalance(t, notaryNode.GetScriptHash(), big.NewInt(0))
 	}
diff --git a/pkg/core/native/native_test/notary_test.go b/pkg/core/native/native_test/notary_test.go
index a827d0ed3..40339ebe5 100644
--- a/pkg/core/native/native_test/notary_test.go
+++ b/pkg/core/native/native_test/notary_test.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/nspcc-dev/neo-go/pkg/config"
 	"github.com/nspcc-dev/neo-go/pkg/core/native/nativenames"
+	"github.com/nspcc-dev/neo-go/pkg/core/native/noderoles"
 	"github.com/nspcc-dev/neo-go/pkg/core/transaction"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
-	"github.com/nspcc-dev/neo-go/pkg/interop/native/roles"
 	"github.com/nspcc-dev/neo-go/pkg/neotest"
 	"github.com/nspcc-dev/neo-go/pkg/neotest/chain"
 	"github.com/nspcc-dev/neo-go/pkg/util"
@@ -191,7 +191,7 @@ func TestNotary_NotaryNodesReward(t *testing.T) {
 			notaryNodesPublicKeys[i] = notaryNodes[i].PublicKey().Bytes()
 		}
 
-		designationCommitteeInvoker.Invoke(t, stackitem.Null{}, "designateAsRole", int(roles.P2PNotary), notaryNodesPublicKeys)
+		designationCommitteeInvoker.Invoke(t, stackitem.Null{}, "designateAsRole", int(noderoles.P2PNotary), notaryNodesPublicKeys)
 		for _, notaryNode := range notaryNodes {
 			e.CheckGASBalance(t, notaryNode.GetScriptHash(), big.NewInt(0))
 		}
diff --git a/pkg/core/notary_test.go b/pkg/core/notary_test.go
index 46f2e38db..6a9ae5422 100644
--- a/pkg/core/notary_test.go
+++ b/pkg/core/notary_test.go
@@ -17,10 +17,10 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/core/block"
 	"github.com/nspcc-dev/neo-go/pkg/core/mempool"
 	"github.com/nspcc-dev/neo-go/pkg/core/native/nativenames"
+	"github.com/nspcc-dev/neo-go/pkg/core/native/noderoles"
 	"github.com/nspcc-dev/neo-go/pkg/core/transaction"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/hash"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
-	"github.com/nspcc-dev/neo-go/pkg/interop/native/roles"
 	"github.com/nspcc-dev/neo-go/pkg/io"
 	"github.com/nspcc-dev/neo-go/pkg/neotest"
 	"github.com/nspcc-dev/neo-go/pkg/neotest/chain"
@@ -158,7 +158,7 @@ func TestNotary(t *testing.T) {
 
 	notaryNodes := []interface{}{acc1.PrivateKey().PublicKey().Bytes(), acc2.PrivateKey().PublicKey().Bytes()}
 	designationSuperInvoker.Invoke(t, stackitem.Null{}, "designateAsRole",
-		int64(roles.P2PNotary), notaryNodes)
+		int64(noderoles.P2PNotary), notaryNodes)
 
 	type requester struct {
 		accounts []*wallet.Account

From c4f3a92485d986ae7cf981860da84c9b738eaeb0 Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Tue, 24 May 2022 13:00:10 +0300
Subject: [PATCH 07/11] rpc: regenerate testchain

---
 pkg/rpc/server/server_test.go          |  10 +++++-----
 pkg/rpc/server/testdata/testblocks.acc | Bin 33482 -> 33557 bytes
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go
index 9f553cc09..8917c1e41 100644
--- a/pkg/rpc/server/server_test.go
+++ b/pkg/rpc/server/server_test.go
@@ -72,10 +72,10 @@ const (
 	verifyWithArgsContractHash = "0dce75f52adb1a4c5c6eaa6a34eb26db2e5b3781"
 	nnsContractHash            = "ee92563903e4efd53565784080b2dbdc5c37e21f"
 	nnsToken1ID                = "6e656f2e636f6d"
-	nfsoContractHash           = "5f9ebd6b001b54c7bc70f96e0412fcf415dfe09f"
+	nfsoContractHash           = "c7ec8e0fb4d669913e4ffdd4ba4fa3502e5d2d10"
 	nfsoToken1ID               = "7e244ffd6aa85fb1579d2ed22e9b761ab62e3486"
 	invokescriptContractAVM    = "VwIADBQBDAMOBQYMDQIODw0DDgcJAAAAAErZMCQE2zBwaEH4J+yMqiYEEUAMFA0PAwIJAAIBAwcDBAUCAQAOBgwJStkwJATbMHFpQfgn7IyqJgQSQBNA"
-	block20StateRootLE         = "cda0adf452c190700f792bcac29973b85532b7c27192e96172cfa0c8acaa4f9e"
+	block20StateRootLE         = "93ebfc8b030de02c5548ae08ac4a0ea39c12c82e62609ae07bdf3d803bcf9ffd"
 )
 
 var (
@@ -917,7 +917,7 @@ var rpcTestCases = map[string][]rpcTestCase{
 				chg := []storage.Operation{{
 					State: "Changed",
 					Key:   []byte{0xfa, 0xff, 0xff, 0xff, 0xb},
-					Value: []byte{0x1e, 0xb, 0xca, 0xeb, 0x53, 0x79, 0x12},
+					Value: []byte{0x58, 0xe0, 0x6f, 0xeb, 0x53, 0x79, 0x12},
 				}, {
 					State: "Added",
 					Key:   []byte{0xfb, 0xff, 0xff, 0xff, 0x14, 0xd6, 0x24, 0x87, 0x12, 0xff, 0x97, 0x22, 0x80, 0xa0, 0xae, 0xf5, 0x24, 0x1c, 0x96, 0x4d, 0x63, 0x78, 0x29, 0xcd, 0xb},
@@ -929,7 +929,7 @@ var rpcTestCases = map[string][]rpcTestCase{
 				}, {
 					State: "Changed",
 					Key:   []byte{0xfa, 0xff, 0xff, 0xff, 0x14, 0xee, 0x9e, 0xa2, 0x2c, 0x27, 0xe3, 0x4b, 0xd0, 0x14, 0x8f, 0xc4, 0x10, 0x8e, 0x8, 0xf7, 0x4e, 0x8f, 0x50, 0x48, 0xb2},
-					Value: []byte{0x41, 0x01, 0x21, 0x05, 0xf6, 0x99, 0x28, 0x2d, 0xb},
+					Value: []byte{0x41, 0x01, 0x21, 0x05, 0x50, 0x28, 0x27, 0x2d, 0x0b},
 				}}
 				// Can be returned in any order.
 				assert.ElementsMatch(t, chg, res.Diagnostics.Changes)
@@ -2465,7 +2465,7 @@ func checkNep17Balances(t *testing.T, e *executor, acc interface{}) {
 			},
 			{
 				Asset:       e.chain.UtilityTokenHash(),
-				Amount:      "47102293830",
+				Amount:      "47102199200",
 				LastUpdated: 19,
 			}},
 		Address: testchain.PrivateKeyByID(0).GetScriptHash().StringLE(),
diff --git a/pkg/rpc/server/testdata/testblocks.acc b/pkg/rpc/server/testdata/testblocks.acc
index 243844ae29b1d1866aa7cd89a61c83660f1ffa80..f4a0b9c6bfc457a9703cafc4abae47af5b2888eb 100644
GIT binary patch
delta 4855
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

delta 4815
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
Hj_5xCBO&IA


From 1b80215415ea6622ed5de9e2146a6966c0083f03 Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Tue, 24 May 2022 13:30:41 +0300
Subject: [PATCH 08/11] core: adjust types of NVB, Conflicts and NotaryAssisted
 attributes

---
 pkg/core/transaction/attrtype.go        |  8 ++++----
 pkg/core/transaction/attrtype_string.go | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/core/transaction/attrtype.go b/pkg/core/transaction/attrtype.go
index 7f339245f..c7a57f14c 100644
--- a/pkg/core/transaction/attrtype.go
+++ b/pkg/core/transaction/attrtype.go
@@ -15,10 +15,10 @@ const (
 // List of valid attribute types.
 const (
 	HighPriority    AttrType = 1
-	OracleResponseT AttrType = 0x11                   // OracleResponse
-	NotValidBeforeT AttrType = ReservedLowerBound     // NotValidBefore
-	ConflictsT      AttrType = ReservedLowerBound + 1 // Conflicts
-	NotaryAssistedT AttrType = ReservedLowerBound + 2 // NotaryAssisted
+	OracleResponseT AttrType = 0x11 // OracleResponse
+	NotValidBeforeT AttrType = 0x20 // NotValidBefore
+	ConflictsT      AttrType = 0x21 // Conflicts
+	NotaryAssistedT AttrType = 0x22 // NotaryAssisted
 )
 
 func (a AttrType) allowMultiple() bool {
diff --git a/pkg/core/transaction/attrtype_string.go b/pkg/core/transaction/attrtype_string.go
index 1f2eb06ba..d3564aa4c 100644
--- a/pkg/core/transaction/attrtype_string.go
+++ b/pkg/core/transaction/attrtype_string.go
@@ -10,9 +10,9 @@ func _() {
 	var x [1]struct{}
 	_ = x[HighPriority-1]
 	_ = x[OracleResponseT-17]
-	_ = x[NotValidBeforeT-224]
-	_ = x[ConflictsT-225]
-	_ = x[NotaryAssistedT-226]
+	_ = x[NotValidBeforeT-32]
+	_ = x[ConflictsT-33]
+	_ = x[NotaryAssistedT-34]
 }
 
 const (
@@ -31,8 +31,8 @@ func (i AttrType) String() string {
 		return _AttrType_name_0
 	case i == 17:
 		return _AttrType_name_1
-	case 224 <= i && i <= 226:
-		i -= 224
+	case 32 <= i && i <= 34:
+		i -= 32
 		return _AttrType_name_2[_AttrType_index_2[i]:_AttrType_index_2[i+1]]
 	default:
 		return "AttrType(" + strconv.FormatInt(int64(i), 10) + ")"

From 3bec6657f5c5b284e185f8e72659e9cab6953c37 Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Wed, 1 Jun 2022 14:25:30 +0300
Subject: [PATCH 09/11] core: adjust notary-related attributes encoding

---
 pkg/core/transaction/attribute_test.go   | 21 +++------------------
 pkg/core/transaction/conflicts.go        | 13 ++-----------
 pkg/core/transaction/not_valid_before.go | 17 ++---------------
 pkg/core/transaction/notary_assisted.go  | 14 ++------------
 4 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/pkg/core/transaction/attribute_test.go b/pkg/core/transaction/attribute_test.go
index b38c88181..f35a79732 100644
--- a/pkg/core/transaction/attribute_test.go
+++ b/pkg/core/transaction/attribute_test.go
@@ -52,14 +52,9 @@ func TestAttribute_EncodeBinary(t *testing.T) {
 			}
 			testserdes.EncodeDecodeBinary(t, attr, new(Attribute))
 		})
-		t.Run("bad format: too long", func(t *testing.T) {
-			bw := io.NewBufBinWriter()
-			bw.WriteVarBytes([]byte{1, 2, 3, 4, 5})
-			require.Error(t, testserdes.DecodeBinary(bw.Bytes(), new(NotValidBefore)))
-		})
 		t.Run("bad format: too short", func(t *testing.T) {
 			bw := io.NewBufBinWriter()
-			bw.WriteVarBytes([]byte{1, 2, 3})
+			bw.WriteBytes([]byte{1, 2, 3})
 			require.Error(t, testserdes.DecodeBinary(bw.Bytes(), new(NotValidBefore)))
 		})
 	})
@@ -96,14 +91,9 @@ func TestAttribute_EncodeBinary(t *testing.T) {
 			}
 			testserdes.EncodeDecodeBinary(t, attr, new(Attribute))
 		})
-		t.Run("negative: too long", func(t *testing.T) {
-			bw := io.NewBufBinWriter()
-			bw.WriteVarBytes(make([]byte, util.Uint256Size+1))
-			require.Error(t, testserdes.DecodeBinary(bw.Bytes(), new(Conflicts)))
-		})
 		t.Run("negative: bad uint256", func(t *testing.T) {
 			bw := io.NewBufBinWriter()
-			bw.WriteVarBytes(make([]byte, util.Uint256Size-1))
+			bw.WriteBytes(make([]byte, util.Uint256Size-1))
 			require.Error(t, testserdes.DecodeBinary(bw.Bytes(), new(Conflicts)))
 		})
 	})
@@ -117,14 +107,9 @@ func TestAttribute_EncodeBinary(t *testing.T) {
 			}
 			testserdes.EncodeDecodeBinary(t, attr, new(Attribute))
 		})
-		t.Run("bad format: too long", func(t *testing.T) {
-			bw := io.NewBufBinWriter()
-			bw.WriteVarBytes(make([]byte, 2))
-			require.Error(t, testserdes.DecodeBinary(bw.Bytes(), new(NotaryAssisted)))
-		})
 		t.Run("bad format: too short", func(t *testing.T) {
 			bw := io.NewBufBinWriter()
-			bw.WriteVarBytes([]byte{})
+			bw.WriteBytes([]byte{})
 			require.Error(t, testserdes.DecodeBinary(bw.Bytes(), new(NotaryAssisted)))
 		})
 	})
diff --git a/pkg/core/transaction/conflicts.go b/pkg/core/transaction/conflicts.go
index 77eff8c64..01b62e441 100644
--- a/pkg/core/transaction/conflicts.go
+++ b/pkg/core/transaction/conflicts.go
@@ -12,21 +12,12 @@ type Conflicts struct {
 
 // DecodeBinary implements the io.Serializable interface.
 func (c *Conflicts) DecodeBinary(br *io.BinReader) {
-	bytes := br.ReadVarBytes(util.Uint256Size)
-	if br.Err != nil {
-		return
-	}
-	hash, err := util.Uint256DecodeBytesBE(bytes)
-	if err != nil {
-		br.Err = err
-		return
-	}
-	c.Hash = hash
+	c.Hash.DecodeBinary(br)
 }
 
 // EncodeBinary implements the io.Serializable interface.
 func (c *Conflicts) EncodeBinary(w *io.BinWriter) {
-	w.WriteVarBytes(c.Hash.BytesBE())
+	c.Hash.EncodeBinary(w)
 }
 
 func (c *Conflicts) toJSONMap(m map[string]interface{}) {
diff --git a/pkg/core/transaction/not_valid_before.go b/pkg/core/transaction/not_valid_before.go
index 46868dc2b..232009f3d 100644
--- a/pkg/core/transaction/not_valid_before.go
+++ b/pkg/core/transaction/not_valid_before.go
@@ -1,9 +1,6 @@
 package transaction
 
 import (
-	"encoding/binary"
-	"fmt"
-
 	"github.com/nspcc-dev/neo-go/pkg/io"
 )
 
@@ -14,22 +11,12 @@ type NotValidBefore struct {
 
 // DecodeBinary implements the io.Serializable interface.
 func (n *NotValidBefore) DecodeBinary(br *io.BinReader) {
-	bytes := br.ReadVarBytes(4)
-	if br.Err != nil {
-		return
-	}
-	if len(bytes) != 4 {
-		br.Err = fmt.Errorf("expected 4 bytes, got %d", len(bytes))
-		return
-	}
-	n.Height = binary.LittleEndian.Uint32(bytes)
+	n.Height = br.ReadU32LE()
 }
 
 // EncodeBinary implements the io.Serializable interface.
 func (n *NotValidBefore) EncodeBinary(w *io.BinWriter) {
-	bytes := make([]byte, 4)
-	binary.LittleEndian.PutUint32(bytes, n.Height)
-	w.WriteVarBytes(bytes)
+	w.WriteU32LE(n.Height)
 }
 
 func (n *NotValidBefore) toJSONMap(m map[string]interface{}) {
diff --git a/pkg/core/transaction/notary_assisted.go b/pkg/core/transaction/notary_assisted.go
index 436c4f42c..5a7de29a4 100644
--- a/pkg/core/transaction/notary_assisted.go
+++ b/pkg/core/transaction/notary_assisted.go
@@ -1,8 +1,6 @@
 package transaction
 
 import (
-	"fmt"
-
 	"github.com/nspcc-dev/neo-go/pkg/io"
 )
 
@@ -13,20 +11,12 @@ type NotaryAssisted struct {
 
 // DecodeBinary implements the io.Serializable interface.
 func (n *NotaryAssisted) DecodeBinary(br *io.BinReader) {
-	bytes := br.ReadVarBytes(1)
-	if br.Err != nil {
-		return
-	}
-	if len(bytes) != 1 {
-		br.Err = fmt.Errorf("expected 1 byte, got %d", len(bytes))
-		return
-	}
-	n.NKeys = bytes[0]
+	n.NKeys = br.ReadB()
 }
 
 // EncodeBinary implements the io.Serializable interface.
 func (n *NotaryAssisted) EncodeBinary(w *io.BinWriter) {
-	w.WriteVarBytes([]byte{n.NKeys})
+	w.WriteB(n.NKeys)
 }
 
 func (n *NotaryAssisted) toJSONMap(m map[string]interface{}) {

From 3c2fc165b609396da657b209e183d55105598df4 Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Wed, 1 Jun 2022 15:10:43 +0300
Subject: [PATCH 10/11] gomod: update interop dependency

---
 examples/engine/go.mod     | 2 +-
 examples/engine/go.sum     | 4 ++--
 examples/events/go.mod     | 2 +-
 examples/events/go.sum     | 4 ++--
 examples/iterator/go.mod   | 2 +-
 examples/iterator/go.sum   | 4 ++--
 examples/nft-d/go.mod      | 2 +-
 examples/nft-d/go.sum      | 4 ++--
 examples/nft-nd-nns/go.mod | 2 +-
 examples/nft-nd-nns/go.sum | 3 ++-
 examples/nft-nd/go.mod     | 2 +-
 examples/nft-nd/go.sum     | 4 ++--
 examples/oracle/go.mod     | 2 +-
 examples/oracle/go.sum     | 4 ++--
 examples/runtime/go.mod    | 2 +-
 examples/runtime/go.sum    | 4 ++--
 examples/storage/go.mod    | 2 +-
 examples/storage/go.sum    | 4 ++--
 examples/timer/go.mod      | 2 +-
 examples/timer/go.sum      | 4 ++--
 examples/token/go.mod      | 2 +-
 examples/token/go.sum      | 4 ++--
 go.mod                     | 2 +-
 go.sum                     | 4 ++--
 24 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/examples/engine/go.mod b/examples/engine/go.mod
index 0b82df4b6..1c249ec6f 100644
--- a/examples/engine/go.mod
+++ b/examples/engine/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/engine
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/engine/go.sum b/examples/engine/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/engine/go.sum
+++ b/examples/engine/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/events/go.mod b/examples/events/go.mod
index 738903eb7..975ec46b4 100644
--- a/examples/events/go.mod
+++ b/examples/events/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/events
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/events/go.sum b/examples/events/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/events/go.sum
+++ b/examples/events/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/iterator/go.mod b/examples/iterator/go.mod
index 0239eadd4..37decdc6f 100644
--- a/examples/iterator/go.mod
+++ b/examples/iterator/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/iterator
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/iterator/go.sum b/examples/iterator/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/iterator/go.sum
+++ b/examples/iterator/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/nft-d/go.mod b/examples/nft-d/go.mod
index 0b6b9ff09..e83886e49 100644
--- a/examples/nft-d/go.mod
+++ b/examples/nft-d/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/nft
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/nft-d/go.sum b/examples/nft-d/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/nft-d/go.sum
+++ b/examples/nft-d/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/nft-nd-nns/go.mod b/examples/nft-nd-nns/go.mod
index 052cde98a..56c9b9bdf 100644
--- a/examples/nft-nd-nns/go.mod
+++ b/examples/nft-nd-nns/go.mod
@@ -4,6 +4,6 @@ go 1.16
 
 require (
 	github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220523110500-1cc107d4610e
-	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
 	github.com/stretchr/testify v1.7.0
 )
diff --git a/examples/nft-nd-nns/go.sum b/examples/nft-nd-nns/go.sum
index 88f14da9e..080caf30c 100644
--- a/examples/nft-nd-nns/go.sum
+++ b/examples/nft-nd-nns/go.sum
@@ -181,8 +181,9 @@ github.com/nspcc-dev/neo-go v0.73.1-pre.0.20200303142215-f5a1b928ce09/go.mod h1:
 github.com/nspcc-dev/neo-go v0.98.0/go.mod h1:E3cc1x6RXSXrJb2nDWXTXjnXk3rIqVN8YdFyWv+FrqM=
 github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220523110500-1cc107d4610e h1:KlCtKZvCzPysT1pnK4e2TSyXF/CFsfTA7AU8P9jbeLU=
 github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220523110500-1cc107d4610e/go.mod h1:IYV+4Zl0zKAcH7BP09lx3Q9UYFzk47WH2vTslZN3CRA=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
 github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
 github.com/nspcc-dev/neofs-api-go/v2 v2.11.0-pre.0.20211201134523-3604d96f3fe1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=
 github.com/nspcc-dev/neofs-api-go/v2 v2.11.1 h1:SVqc523pZsSaS9vnPS1mm3VV6b6xY0gvdA0uYJ/GWZQ=
 github.com/nspcc-dev/neofs-api-go/v2 v2.11.1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=
diff --git a/examples/nft-nd/go.mod b/examples/nft-nd/go.mod
index c1bad2f23..1dc2bd70a 100644
--- a/examples/nft-nd/go.mod
+++ b/examples/nft-nd/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/nft-nd
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/nft-nd/go.sum b/examples/nft-nd/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/nft-nd/go.sum
+++ b/examples/nft-nd/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/oracle/go.mod b/examples/oracle/go.mod
index 56d2b3f06..e79d519e8 100644
--- a/examples/oracle/go.mod
+++ b/examples/oracle/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/oracle
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/oracle/go.sum b/examples/oracle/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/oracle/go.sum
+++ b/examples/oracle/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/runtime/go.mod b/examples/runtime/go.mod
index a23083e43..2ef21e632 100644
--- a/examples/runtime/go.mod
+++ b/examples/runtime/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/runtime
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/runtime/go.sum b/examples/runtime/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/runtime/go.sum
+++ b/examples/runtime/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/storage/go.mod b/examples/storage/go.mod
index c216ca8b0..d6df71eeb 100644
--- a/examples/storage/go.mod
+++ b/examples/storage/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/storage
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/storage/go.sum b/examples/storage/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/storage/go.sum
+++ b/examples/storage/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/timer/go.mod b/examples/timer/go.mod
index c63442a8d..e457cd122 100644
--- a/examples/timer/go.mod
+++ b/examples/timer/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/timer
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/timer/go.sum b/examples/timer/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/timer/go.sum
+++ b/examples/timer/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/examples/token/go.mod b/examples/token/go.mod
index c45f6f573..3a764d19d 100644
--- a/examples/token/go.mod
+++ b/examples/token/go.mod
@@ -2,4 +2,4 @@ module github.com/nspcc-dev/neo-go/examples/token
 
 go 1.16
 
-require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+require github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
diff --git a/examples/token/go.sum b/examples/token/go.sum
index 940d70d25..419ab074c 100644
--- a/examples/token/go.sum
+++ b/examples/token/go.sum
@@ -1,2 +1,2 @@
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
diff --git a/go.mod b/go.mod
index 5a4c68dfe..a262d181f 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/mr-tron/base58 v1.2.0
 	github.com/nspcc-dev/dbft v0.0.0-20220523093034-c35adf004e6f
 	github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22
-	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c
+	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
 	github.com/nspcc-dev/neofs-sdk-go v0.0.0-20220113123743-7f3162110659
 	github.com/nspcc-dev/rfc6979 v0.2.0
 	github.com/pierrec/lz4 v2.6.1+incompatible
diff --git a/go.sum b/go.sum
index 5a843a007..69c670f90 100644
--- a/go.sum
+++ b/go.sum
@@ -185,8 +185,8 @@ github.com/nspcc-dev/hrw v1.0.9 h1:17VcAuTtrstmFppBjfRiia4K2wA/ukXZhLFS8Y8rz5Y=
 github.com/nspcc-dev/hrw v1.0.9/go.mod h1:l/W2vx83vMQo6aStyx2AuZrJ+07lGv2JQGlVkPG06MU=
 github.com/nspcc-dev/neo-go v0.73.1-pre.0.20200303142215-f5a1b928ce09/go.mod h1:pPYwPZ2ks+uMnlRLUyXOpLieaDQSEaf4NM3zHVbRjmg=
 github.com/nspcc-dev/neo-go v0.98.0/go.mod h1:E3cc1x6RXSXrJb2nDWXTXjnXk3rIqVN8YdFyWv+FrqM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c h1:3e7iTZ2/wssMdIkpGb6KMhLJiBiQVxEQDKM+6K1VCLM=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
+github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
 github.com/nspcc-dev/neofs-api-go/v2 v2.11.0-pre.0.20211201134523-3604d96f3fe1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=
 github.com/nspcc-dev/neofs-api-go/v2 v2.11.1 h1:SVqc523pZsSaS9vnPS1mm3VV6b6xY0gvdA0uYJ/GWZQ=
 github.com/nspcc-dev/neofs-api-go/v2 v2.11.1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=

From 808d8a281e37836fecbb1eecc768e802b6f6be04 Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Wed, 1 Jun 2022 15:12:30 +0300
Subject: [PATCH 11/11] examples: update neo-go dependency

---
 examples/nft-nd-nns/go.mod |  2 +-
 examples/nft-nd-nns/go.sum | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/nft-nd-nns/go.mod b/examples/nft-nd-nns/go.mod
index 56c9b9bdf..6204df464 100644
--- a/examples/nft-nd-nns/go.mod
+++ b/examples/nft-nd-nns/go.mod
@@ -3,7 +3,7 @@ module github.com/nspcc-dev/neo-go/examples/nft-nd-nns
 go 1.16
 
 require (
-	github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220523110500-1cc107d4610e
+	github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220601121043-3c2fc165b609
 	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5
 	github.com/stretchr/testify v1.7.0
 )
diff --git a/examples/nft-nd-nns/go.sum b/examples/nft-nd-nns/go.sum
index 080caf30c..e1309ec25 100644
--- a/examples/nft-nd-nns/go.sum
+++ b/examples/nft-nd-nns/go.sum
@@ -171,7 +171,7 @@ github.com/nspcc-dev/dbft v0.0.0-20191209120240-0d6b7568d9ae/go.mod h1:3FjXOoHmA
 github.com/nspcc-dev/dbft v0.0.0-20200117124306-478e5cfbf03a/go.mod h1:/YFK+XOxxg0Bfm6P92lY5eDSLYfp06XOdL8KAVgXjVk=
 github.com/nspcc-dev/dbft v0.0.0-20200219114139-199d286ed6c1/go.mod h1:O0qtn62prQSqizzoagHmuuKoz8QMkU3SzBoKdEvm3aQ=
 github.com/nspcc-dev/dbft v0.0.0-20210721160347-1b03241391ac/go.mod h1:U8MSnEShH+o5hexfWJdze6uMFJteP0ko7J2frO7Yu1Y=
-github.com/nspcc-dev/dbft v0.0.0-20220414131237-e497bbf7868e/go.mod h1:U8MSnEShH+o5hexfWJdze6uMFJteP0ko7J2frO7Yu1Y=
+github.com/nspcc-dev/dbft v0.0.0-20220523093034-c35adf004e6f/go.mod h1:U8MSnEShH+o5hexfWJdze6uMFJteP0ko7J2frO7Yu1Y=
 github.com/nspcc-dev/go-ordered-json v0.0.0-20210915112629-e1b6cce73d02/go.mod h1:79bEUDEviBHJMFV6Iq6in57FEOCMcRhfQnfaf0ETA5U=
 github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 h1:n4ZaFCKt1pQJd7PXoMJabZWK9ejjbLOVrkl/lOUmshg=
 github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22/go.mod h1:79bEUDEviBHJMFV6Iq6in57FEOCMcRhfQnfaf0ETA5U=
@@ -179,9 +179,8 @@ github.com/nspcc-dev/hrw v1.0.9 h1:17VcAuTtrstmFppBjfRiia4K2wA/ukXZhLFS8Y8rz5Y=
 github.com/nspcc-dev/hrw v1.0.9/go.mod h1:l/W2vx83vMQo6aStyx2AuZrJ+07lGv2JQGlVkPG06MU=
 github.com/nspcc-dev/neo-go v0.73.1-pre.0.20200303142215-f5a1b928ce09/go.mod h1:pPYwPZ2ks+uMnlRLUyXOpLieaDQSEaf4NM3zHVbRjmg=
 github.com/nspcc-dev/neo-go v0.98.0/go.mod h1:E3cc1x6RXSXrJb2nDWXTXjnXk3rIqVN8YdFyWv+FrqM=
-github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220523110500-1cc107d4610e h1:KlCtKZvCzPysT1pnK4e2TSyXF/CFsfTA7AU8P9jbeLU=
-github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220523110500-1cc107d4610e/go.mod h1:IYV+4Zl0zKAcH7BP09lx3Q9UYFzk47WH2vTslZN3CRA=
-github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220523110142-d8f7d5d5b67c/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
+github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220601121043-3c2fc165b609 h1:g6M49nGOWscRDjdOhc66pYK90gQZMiVQpiejF0fhOAg=
+github.com/nspcc-dev/neo-go v0.98.6-pre.0.20220601121043-3c2fc165b609/go.mod h1:Bb71wjxD9RMSXFhX3OCWlBm1eu/ma9YKm8Ytl5TXEl4=
 github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 h1:bWau94hHSkztNF7EDTkvQAc8xjsxGMnaFf1DrXguvX8=
 github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5/go.mod h1:QBE0I30F2kOAISNpT5oks82yF4wkkUq3SCfI3Hqgx/Y=
 github.com/nspcc-dev/neofs-api-go/v2 v2.11.0-pre.0.20211201134523-3604d96f3fe1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=
@@ -445,7 +444,8 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=