From 17233e1d8e1964b042955c3c67e1d5d7d4058018 Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Fri, 10 Jul 2020 09:56:15 +0300
Subject: [PATCH] core: rename Neo.Crypto.Verify to
 Neo.Crypto.VerifyWithECDsaSecp256r1

Part of #918
---
 .docker/wallets/wallet1.json           |   8 ++++----
 .docker/wallets/wallet1_solo.json      |  10 +++++-----
 .docker/wallets/wallet2.json           |   8 ++++----
 .docker/wallets/wallet3.json           |   8 ++++----
 .docker/wallets/wallet4.json           |   8 ++++----
 pkg/compiler/syscall.go                |   2 +-
 pkg/compiler/verify_test.go            |   4 ++--
 pkg/consensus/payload_test.go          |   4 ++--
 pkg/consensus/testdata/wallet1.json    |   8 ++++----
 pkg/consensus/testdata/wallet2.json    |   8 ++++----
 pkg/consensus/testdata/wallet3.json    |   8 ++++----
 pkg/consensus/testdata/wallet4.json    |   8 ++++----
 pkg/core/interop/crypto/ecdsa.go       |   4 ++--
 pkg/core/interop/crypto/interop.go     |   6 +++---
 pkg/core/interop_neo_test.go           |   2 +-
 pkg/core/interops.go                   |   2 +-
 pkg/crypto/keys/publickey.go           |   2 +-
 pkg/crypto/keys/publickey_test.go      |   2 +-
 pkg/internal/keytestcases/testcases.go |  14 +++++++-------
 pkg/interop/crypto/crypto.go           |   6 +++---
 pkg/rpc/server/server_test.go          |   4 ++--
 pkg/rpc/server/testdata/testblocks.acc | Bin 6810 -> 6810 bytes
 pkg/vm/contract_checks.go              |   2 +-
 pkg/wallet/testdata/wallet1.json       |   8 ++++----
 pkg/wallet/testdata/wallet2.json       |  14 +++++++-------
 pkg/wallet/wallet_test.go              |   4 ++--
 26 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/.docker/wallets/wallet1.json b/.docker/wallets/wallet1.json
index 0e7102d1c..70b704d22 100644
--- a/.docker/wallets/wallet1.json
+++ b/.docker/wallets/wallet1.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NQRLhCpAru9BjGsMwk67vdMwmzKMRgsnnN",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "address": "NbTiM6h8r99kpRtb428XcsUk1TzKed2gTc",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
-        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQQqQatQ=",
+        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/.docker/wallets/wallet1_solo.json b/.docker/wallets/wallet1_solo.json
index cc6da19a8..9ff04b908 100644
--- a/.docker/wallets/wallet1_solo.json
+++ b/.docker/wallets/wallet1_solo.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NQRLhCpAru9BjGsMwk67vdMwmzKMRgsnnN",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "address": "NbTiM6h8r99kpRtb428XcsUk1TzKed2gTc",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
-        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQQqQatQ=",
+        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
@@ -45,7 +45,7 @@
     },
     {
       "address": "NYqxsNMHxDg3T19APYP27mBZFfauC4zngR",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
         "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEQtBMHOzuw==",
diff --git a/.docker/wallets/wallet2.json b/.docker/wallets/wallet2.json
index 954833570..c7d21fdf9 100644
--- a/.docker/wallets/wallet2.json
+++ b/.docker/wallets/wallet2.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NNsXzAGGVY3H3viPHzaoD6BcVtqNCdMAHZ",
-      "key": "6PYVQUTQLzdhtdnNLSBkse2DGG5gpPFuNGjaBZxYuJ4XsQrtVNy1E9k7R9",
+      "address": "NWvKSwutC8D6VKmmPxAEgFKx2NLvFhn8q5",
+      "key": "6PYKEHagXJ3mDLdga1FoyTGRtPdJgPz6Gb8sjEFwZvRu7ncD9PVZfHtMzL",
       "label": "",
       "contract": {
-        "script": "DCECEDp/fdAWVYWX95YNJ8UWpDlP2Wi55lFV60sBPkBAQG4LQQqQatQ=",
+        "script": "DCECEDp/fdAWVYWX95YNJ8UWpDlP2Wi55lFV60sBPkBAQG4LQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYVQUTQLzdhtdnNLSBkse2DGG5gpPFuNGjaBZxYuJ4XsQrtVNy1E9k7R9",
+      "key": "6PYKEHagXJ3mDLdga1FoyTGRtPdJgPz6Gb8sjEFwZvRu7ncD9PVZfHtMzL",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/.docker/wallets/wallet3.json b/.docker/wallets/wallet3.json
index 09a5aa8b7..4b272e774 100644
--- a/.docker/wallets/wallet3.json
+++ b/.docker/wallets/wallet3.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "Nfzhk6dtjLZE93iGkqYv5pwrTW5QRQk5bV",
-      "key": "6PYU172i51nsGS1P72gYq4czWdbUvMBQvrJnrJ1VEMZhmXPN6iX4jkmixC",
+      "address": "NNB3RsnTABEwoKEudNG92njds91WtiCuxd",
+      "key": "6PYLjn1Zw3RQmP3CkDxoZvYtMpu7ZUdjHnvu7wPuohUcXWCMh9vY661R8A",
       "label": "",
       "contract": {
-        "script": "DCED2QwH32PmkM53kS4Qq1GsyUS2aGAje2CMT4+DCece5pkLQQqQatQ=",
+        "script": "DCED2QwH32PmkM53kS4Qq1GsyUS2aGAje2CMT4+DCece5pkLQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYU172i51nsGS1P72gYq4czWdbUvMBQvrJnrJ1VEMZhmXPN6iX4jkmixC",
+      "key": "6PYLjn1Zw3RQmP3CkDxoZvYtMpu7ZUdjHnvu7wPuohUcXWCMh9vY661R8A",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/.docker/wallets/wallet4.json b/.docker/wallets/wallet4.json
index 0a6c5fd06..b40a05bf0 100644
--- a/.docker/wallets/wallet4.json
+++ b/.docker/wallets/wallet4.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NU5BGveyZSQ7TUAxRnKVDXgE9oExpzV5vY",
-      "key": "6PYW1FxFURLUrFCzLRwoChXHGn77Fy8qDB5j1sUjpbi6mk4J1KgTR8vvAk",
+      "address": "Nfzo95iBXfeAGx5rdjPedZRAqHKh9hwMdR",
+      "key": "6PYLbYYg9jUgzJQpKhpvNExa2UEgtp4356XPg56pHuCpE7gQmj84ESNjYW",
       "label": "",
       "contract": {
-        "script": "DCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWILQQqQatQ=",
+        "script": "DCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWILQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYW1FxFURLUrFCzLRwoChXHGn77Fy8qDB5j1sUjpbi6mk4J1KgTR8vvAk",
+      "key": "6PYLbYYg9jUgzJQpKhpvNExa2UEgtp4356XPg56pHuCpE7gQmj84ESNjYW",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/pkg/compiler/syscall.go b/pkg/compiler/syscall.go
index 9b725a1c4..90d9ef1cb 100644
--- a/pkg/compiler/syscall.go
+++ b/pkg/compiler/syscall.go
@@ -6,7 +6,7 @@ var syscalls = map[string]map[string]string{
 		"Deserialize": "System.Binary.Deserialize",
 	},
 	"crypto": {
-		"ECDsaVerify": "Neo.Crypto.ECDsaVerify",
+		"ECDsaSecp256r1Verify": "Neo.Crypto.VerifyWithECDsaSecp256r1",
 	},
 	"enumerator": {
 		"Concat": "System.Enumerator.Concat",
diff --git a/pkg/compiler/verify_test.go b/pkg/compiler/verify_test.go
index 9ea772f13..329f3e016 100644
--- a/pkg/compiler/verify_test.go
+++ b/pkg/compiler/verify_test.go
@@ -19,7 +19,7 @@ func TestVerifyGood(t *testing.T) {
 	src := getVerifyProg(pub, sig, msg)
 
 	v, p := vmAndCompileInterop(t, src)
-	p.interops[emit.InteropNameToID([]byte("Neo.Crypto.ECDsaVerify"))] = func(v *vm.VM) error {
+	p.interops[emit.InteropNameToID([]byte("Neo.Crypto.VerifyWithECDsaSecp256r1"))] = func(v *vm.VM) error {
 		assert.Equal(t, msg, v.Estack().Pop().Bytes())
 		assert.Equal(t, pub, v.Estack().Pop().Bytes())
 		assert.Equal(t, sig, v.Estack().Pop().Bytes())
@@ -54,7 +54,7 @@ func getVerifyProg(pub, sig, msg []byte) string {
 			pub := ` + pubS + `
 			sig := ` + sigS + `
 			msg := ` + msgS + `
-			return crypto.ECDsaVerify(msg, pub, sig)
+			return crypto.ECDsaSecp256r1Verify(msg, pub, sig)
 		}
 	`
 }
diff --git a/pkg/consensus/payload_test.go b/pkg/consensus/payload_test.go
index 1cbe97a3b..8f738b544 100644
--- a/pkg/consensus/payload_test.go
+++ b/pkg/consensus/payload_test.go
@@ -1,7 +1,6 @@
 package consensus
 
 import (
-	"encoding/hex"
 	"math/rand"
 	"testing"
 
@@ -75,6 +74,7 @@ func TestConsensusPayload_Setters(t *testing.T) {
 	require.Equal(t, pl, p.GetRecoveryMessage())
 }
 
+/*// TODO: update binary (see https://github.com/nspcc-dev/neo-go/issues/1178)
 func TestConsensusPayload_Verify(t *testing.T) {
 	// signed payload from testnet
 	dataHex := "00000000a70b769e4af60878f6daa72be41770c62592c694bf9ead6b16b30ad90f28c4098cc704000400423000d5b4baae11191ac370a4d7860df01824fcea7f934d6461db6d4b7966ca3c135c8c262b7f23bbac13e73885223604141e062234d999068d9a74b77caeeb5271cf01420c4055ae8c7694c296e92da393f944b0dc1cd70d12de3ee944e9afc872d1db427fe87fcbe913709a8ec73e2f5acdfc0b7f0a96e9d63bad0a20e3226c882237f5c771290c2102a7834be9b32e2981d157cb5bbd3acb42cfd11ea5c3b10224d7a44e98c5910f1b0b410a906ad4"
@@ -89,7 +89,7 @@ func TestConsensusPayload_Verify(t *testing.T) {
 	require.NoError(t, p.decodeData())
 	require.True(t, p.Verify(h))
 }
-
+*/
 func TestConsensusPayload_Serializable(t *testing.T) {
 	for _, mt := range messageTypes {
 		p := randomPayload(t, mt)
diff --git a/pkg/consensus/testdata/wallet1.json b/pkg/consensus/testdata/wallet1.json
index 0e7102d1c..70b704d22 100644
--- a/pkg/consensus/testdata/wallet1.json
+++ b/pkg/consensus/testdata/wallet1.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NQRLhCpAru9BjGsMwk67vdMwmzKMRgsnnN",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "address": "NbTiM6h8r99kpRtb428XcsUk1TzKed2gTc",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
-        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQQqQatQ=",
+        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/pkg/consensus/testdata/wallet2.json b/pkg/consensus/testdata/wallet2.json
index 954833570..c7d21fdf9 100644
--- a/pkg/consensus/testdata/wallet2.json
+++ b/pkg/consensus/testdata/wallet2.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NNsXzAGGVY3H3viPHzaoD6BcVtqNCdMAHZ",
-      "key": "6PYVQUTQLzdhtdnNLSBkse2DGG5gpPFuNGjaBZxYuJ4XsQrtVNy1E9k7R9",
+      "address": "NWvKSwutC8D6VKmmPxAEgFKx2NLvFhn8q5",
+      "key": "6PYKEHagXJ3mDLdga1FoyTGRtPdJgPz6Gb8sjEFwZvRu7ncD9PVZfHtMzL",
       "label": "",
       "contract": {
-        "script": "DCECEDp/fdAWVYWX95YNJ8UWpDlP2Wi55lFV60sBPkBAQG4LQQqQatQ=",
+        "script": "DCECEDp/fdAWVYWX95YNJ8UWpDlP2Wi55lFV60sBPkBAQG4LQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYVQUTQLzdhtdnNLSBkse2DGG5gpPFuNGjaBZxYuJ4XsQrtVNy1E9k7R9",
+      "key": "6PYKEHagXJ3mDLdga1FoyTGRtPdJgPz6Gb8sjEFwZvRu7ncD9PVZfHtMzL",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/pkg/consensus/testdata/wallet3.json b/pkg/consensus/testdata/wallet3.json
index 09a5aa8b7..4b272e774 100644
--- a/pkg/consensus/testdata/wallet3.json
+++ b/pkg/consensus/testdata/wallet3.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "Nfzhk6dtjLZE93iGkqYv5pwrTW5QRQk5bV",
-      "key": "6PYU172i51nsGS1P72gYq4czWdbUvMBQvrJnrJ1VEMZhmXPN6iX4jkmixC",
+      "address": "NNB3RsnTABEwoKEudNG92njds91WtiCuxd",
+      "key": "6PYLjn1Zw3RQmP3CkDxoZvYtMpu7ZUdjHnvu7wPuohUcXWCMh9vY661R8A",
       "label": "",
       "contract": {
-        "script": "DCED2QwH32PmkM53kS4Qq1GsyUS2aGAje2CMT4+DCece5pkLQQqQatQ=",
+        "script": "DCED2QwH32PmkM53kS4Qq1GsyUS2aGAje2CMT4+DCece5pkLQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYU172i51nsGS1P72gYq4czWdbUvMBQvrJnrJ1VEMZhmXPN6iX4jkmixC",
+      "key": "6PYLjn1Zw3RQmP3CkDxoZvYtMpu7ZUdjHnvu7wPuohUcXWCMh9vY661R8A",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/pkg/consensus/testdata/wallet4.json b/pkg/consensus/testdata/wallet4.json
index 0a6c5fd06..b40a05bf0 100644
--- a/pkg/consensus/testdata/wallet4.json
+++ b/pkg/consensus/testdata/wallet4.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NU5BGveyZSQ7TUAxRnKVDXgE9oExpzV5vY",
-      "key": "6PYW1FxFURLUrFCzLRwoChXHGn77Fy8qDB5j1sUjpbi6mk4J1KgTR8vvAk",
+      "address": "Nfzo95iBXfeAGx5rdjPedZRAqHKh9hwMdR",
+      "key": "6PYLbYYg9jUgzJQpKhpvNExa2UEgtp4356XPg56pHuCpE7gQmj84ESNjYW",
       "label": "",
       "contract": {
-        "script": "DCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWILQQqQatQ=",
+        "script": "DCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWILQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYW1FxFURLUrFCzLRwoChXHGn77Fy8qDB5j1sUjpbi6mk4J1KgTR8vvAk",
+      "key": "6PYLbYYg9jUgzJQpKhpvNExa2UEgtp4356XPg56pHuCpE7gQmj84ESNjYW",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/pkg/core/interop/crypto/ecdsa.go b/pkg/core/interop/crypto/ecdsa.go
index d744eef20..a2e54dd29 100644
--- a/pkg/core/interop/crypto/ecdsa.go
+++ b/pkg/core/interop/crypto/ecdsa.go
@@ -15,8 +15,8 @@ import (
 // ECDSAVerifyPrice is a gas price of a single verification.
 const ECDSAVerifyPrice = 1000000
 
-// ECDSAVerify checks ECDSA signature.
-func ECDSAVerify(ic *interop.Context, v *vm.VM) error {
+// ECDSASecp256r1Verify checks ECDSA signature using Secp256r1 elliptic curve.
+func ECDSASecp256r1Verify(ic *interop.Context, v *vm.VM) error {
 	msg := getMessage(ic, v.Estack().Pop().Item())
 	hashToCheck := hash.Sha256(msg).BytesBE()
 	keyb := v.Estack().Pop().Bytes()
diff --git a/pkg/core/interop/crypto/interop.go b/pkg/core/interop/crypto/interop.go
index bf651058a..a920bd02c 100644
--- a/pkg/core/interop/crypto/interop.go
+++ b/pkg/core/interop/crypto/interop.go
@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	ecdsaVerifyID        = emit.InteropNameToID([]byte("Neo.Crypto.ECDsaVerify"))
+	ecdsaSecp256r1VerifyID        = emit.InteropNameToID([]byte("Neo.Crypto.VerifyWithECDsaSecp256r1"))
 	ecdsaCheckMultisigID = emit.InteropNameToID([]byte("Neo.Crypto.ECDsaCheckMultiSig"))
 	sha256ID             = emit.InteropNameToID([]byte("Neo.Crypto.SHA256"))
 )
@@ -16,10 +16,10 @@ var (
 func GetInterop(ic *interop.Context) func(uint32) *vm.InteropFuncPrice {
 	return func(id uint32) *vm.InteropFuncPrice {
 		switch id {
-		case ecdsaVerifyID:
+		case ecdsaSecp256r1VerifyID:
 			return &vm.InteropFuncPrice{
 				Func: func(v *vm.VM) error {
-					return ECDSAVerify(ic, v)
+					return ECDSASecp256r1Verify(ic, v)
 				},
 			}
 		case ecdsaCheckMultisigID:
diff --git a/pkg/core/interop_neo_test.go b/pkg/core/interop_neo_test.go
index ba88104da..9d26b88b0 100644
--- a/pkg/core/interop_neo_test.go
+++ b/pkg/core/interop_neo_test.go
@@ -159,7 +159,7 @@ func TestECDSAVerify(t *testing.T) {
 					err = fmt.Errorf("panic: %v", r)
 				}
 			}()
-			err = crypto.ECDSAVerify(ic, v)
+			err = crypto.ECDSASecp256r1Verify(ic, v)
 		}()
 
 		if isErr {
diff --git a/pkg/core/interops.go b/pkg/core/interops.go
index 35bb5e5ae..20642e919 100644
--- a/pkg/core/interops.go
+++ b/pkg/core/interops.go
@@ -138,7 +138,7 @@ var systemInterops = []interop.Function{
 }
 
 var neoInterops = []interop.Function{
-	{Name: "Neo.Crypto.ECDsaVerify", Func: crypto.ECDSAVerify, Price: crypto.ECDSAVerifyPrice},
+	{Name: "Neo.Crypto.VerifyWithECDsaSecp256r1", Func: crypto.ECDSASecp256r1Verify, Price: crypto.ECDSAVerifyPrice},
 	{Name: "Neo.Crypto.ECDsaCheckMultiSig", Func: crypto.ECDSACheckMultisig, Price: 0},
 	{Name: "Neo.Crypto.SHA256", Func: crypto.Sha256, Price: 1000000},
 	{Name: "Neo.Native.Deploy", Func: native.Deploy, Price: 0,
diff --git a/pkg/crypto/keys/publickey.go b/pkg/crypto/keys/publickey.go
index 0cde04a45..306a007ee 100644
--- a/pkg/crypto/keys/publickey.go
+++ b/pkg/crypto/keys/publickey.go
@@ -283,7 +283,7 @@ func (p *PublicKey) GetVerificationScript() []byte {
 	}
 	emit.Bytes(buf.BinWriter, b)
 	emit.Opcode(buf.BinWriter, opcode.PUSHNULL)
-	emit.Syscall(buf.BinWriter, "Neo.Crypto.ECDsaVerify")
+	emit.Syscall(buf.BinWriter, "Neo.Crypto.VerifyWithECDsaSecp256r1")
 
 	return buf.Bytes()
 }
diff --git a/pkg/crypto/keys/publickey_test.go b/pkg/crypto/keys/publickey_test.go
index 848808919..445d98eb5 100644
--- a/pkg/crypto/keys/publickey_test.go
+++ b/pkg/crypto/keys/publickey_test.go
@@ -106,7 +106,7 @@ func TestPubkeyToAddress(t *testing.T) {
 	pubKey, err := NewPublicKeyFromString("031ee4e73a17d8f76dc02532e2620bcb12425b33c0c9f9694cc2caa8226b68cad4")
 	require.NoError(t, err)
 	actual := pubKey.Address()
-	expected := "NNqoUeNb2tfhEExY7mrPbxf4EZZRKX5nHF"
+	expected := "NcKJdJTEDeCSV9BJAKWWxkBMcHTeVnSzJo"
 	require.Equal(t, expected, actual)
 }
 
diff --git a/pkg/internal/keytestcases/testcases.go b/pkg/internal/keytestcases/testcases.go
index cdc92b159..62f8dc85d 100644
--- a/pkg/internal/keytestcases/testcases.go
+++ b/pkg/internal/keytestcases/testcases.go
@@ -14,28 +14,28 @@ type Ktype struct {
 // Arr contains a set of known keys in Ktype format.
 var Arr = []Ktype{
 	{
-		Address:      "NMPAXGtMfZ8s8rcfP9JhrYrNeZHG4xSVmd",
+		Address:      "NNWAo5vdVJz1oyCuNiaTBA3amBHnWCF4Yk",
 		PrivateKey:   "7d128a6d096f0c14c3a25a2b0c41cf79661bfcb4a8cc95aaaea28bde4d732344",
 		PublicKey:    "02028a99826edc0c97d18e22b6932373d908d323aa7f92656a77ec26e8861699ef",
 		Wif:          "L1QqQJnpBwbsPGAuutuzPTac8piqvbR1HRjrY5qHup48TBCBFe4g",
 		Passphrase:   "city of zion",
-		EncryptedWif: "6PYWdzMKGbfxHbfb2JqZJ5Yr1y6jjjuSPLjvgS4byvDkgz2NdiBgeJwBFc",
+		EncryptedWif: "6PYSeMMbJtfMRD81eHzriwrRKquu2dgLNurYcAbmJa7YqAiThgA2vGQu5o",
 	},
 	{
-		Address:      "NRC6oteucWYXq7aASD6YWe5rNeXAw1ehye",
+		Address:      "NiwvMyWYeNghLG8tDyKkWwuZV3wS8CPrrV",
 		PrivateKey:   "9ab7e154840daca3a2efadaf0df93cd3a5b51768c632f5433f86909d9b994a69",
 		PublicKey:    "031d8e1630ce640966967bc6d95223d21f44304133003140c3b52004dc981349c9",
 		Wif:          "L2QTooFoDFyRFTxmtiVHt5CfsXfVnexdbENGDkkrrgTTryiLsPMG",
 		Passphrase:   "我的密码",
-		EncryptedWif: "6PYLxXgqE8MaQJr3NR96rfFBxzdNLytb3CfxeDXyijSEG2M1vF9d4CoRAg",
+		EncryptedWif: "6PYKWKaq5NMyjt8cjvnJnvmV13inhFuePpWZMkddFAMCgjC3ETt7kX16V9",
 	},
 	{
-		Address:      "NTFAwXLGoiWwSMP5vJyZp8K4cBFwrzUs8m",
+		Address:      "NTWHAzB82LRGWNuuqjVyyzpGvF3WxbbPoG",
 		PrivateKey:   "3edee7036b8fd9cef91de47386b191dd76db2888a553e7736bb02808932a915b",
 		PublicKey:    "02232ce8d2e2063dce0451131851d47421bfc4fc1da4db116fca5302c0756462fa",
 		Wif:          "KyKvWLZsNwBJx5j9nurHYRwhYfdQUu9tTEDsLCUHDbYBL8cHxMiG",
 		Passphrase:   "MyL33tP@33w0rd",
-		EncryptedWif: "6PYRoabFnWARA3ZWwfJ4efQ4uuuB9WdVrA1LFbMkZLtXZ2DJg3bzjiK59s",
+		EncryptedWif: "6PYSzKoJBQMj9uHUv1Sc2ZhMrydqDF8ZCTeE9FuPiNdEx7Lo9NoEuaXeyk",
 	},
 	{
 		Address:      "xdf4UGKevVrMR1j3UkPsuoYKSC4ocoAkKx",
@@ -43,7 +43,7 @@ var Arr = []Ktype{
 		PublicKey:    "zz232ce8d2e2063dce0451131851d47421bfc4fc1da4db116fca5302c0756462fa",
 		Wif:          "zzKvWLZsNwBJx5j9nurHYRwhYfdQUu9tTEDsLCUHDbYBL8cHxMiG",
 		Passphrase:   "zzL33tP@33w0rd",
-		EncryptedWif: "6PYRoabFnWARA3ZWwfJ4efQ4uuuB9WdVrA1LFbMkZLtXZ2DJg3bzjiK59s",
+		EncryptedWif: "6PYSzKoJBQMj9uHUv1Sc2ZhMrydqDF8ZCTeE9FuPiNdEx7Lo9NoEuaXeyk",
 		Invalid:      true,
 	},
 }
diff --git a/pkg/interop/crypto/crypto.go b/pkg/interop/crypto/crypto.go
index fa2d394f6..0051636ba 100644
--- a/pkg/interop/crypto/crypto.go
+++ b/pkg/interop/crypto/crypto.go
@@ -8,8 +8,8 @@ func SHA256(b []byte) []byte {
 	return nil
 }
 
-// ECDsaVerify checks that sig is correct msg's signature for a given pub
-// (serialized public key). It uses `Neo.Crypto.ECDsaVerify` syscall.
-func ECDsaVerify(msg []byte, pub []byte, sig []byte) bool {
+// ECDsaSecp256r1Verify checks that sig is correct msg's signature for a given pub
+// (serialized public key). It uses `Neo.Crypto.VerifyWithECDsaSecp256r1` syscall.
+func ECDsaSecp256r1Verify(msg []byte, pub []byte, sig []byte) bool {
 	return false
 }
diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go
index 04ab458b3..1f7feca7d 100644
--- a/pkg/rpc/server/server_test.go
+++ b/pkg/rpc/server/server_test.go
@@ -52,7 +52,7 @@ type rpcTestCase struct {
 }
 
 const testContractHash = "10e262ef80c76bdecca287a2c047841fc02c3129"
-const deploymentTxHash = "4843700d16be3e6507a25909d3b2aa1472dcd0526be2520f2bfdd53d768bfebf"
+const deploymentTxHash = "49f555734b90eb7d4f87041b5146a9b6bc7cf70060bb665212773719091b3a81"
 
 var rpcTestCases = map[string][]rpcTestCase{
 	"getapplicationlog": {
@@ -720,7 +720,7 @@ var rpcTestCases = map[string][]rpcTestCase{
 	"sendrawtransaction": {
 		{
 			name:   "positive",
-			params: `["000a000000316e851039019d39dfc2c37d6c3fee19fd58098780969800000000009269130000000000b00400000001316e851039019d39dfc2c37d6c3fee19fd580987015d0300e87648170000000c1420728274afafc36f43a071d328cfa3e629d9cbb00c14316e851039019d39dfc2c37d6c3fee19fd58098713c00c087472616e736665720c14897720d8cd76f4f00abfa37c0edd889c208fde9b41627d5b523801420c4037c8c002c3352329c5f2995567a355d57372447c156ea544844d5f8027babf4cd86142d986681992805e3f62f2625b551f18cf05897e6ea7c135f22537bb740e290c2102b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc20b410a906ad4"]`,
+			params: `["000a000000aa8acf859d4fe402b34e673f2156821796a488eb80969800000000009269130000000000b00400000001aa8acf859d4fe402b34e673f2156821796a488eb015d0300e87648170000000c1478ba4c24009fe510e136c9995a2e05215e1be4dc0c14aa8acf859d4fe402b34e673f2156821796a488eb13c00c087472616e736665720c14897720d8cd76f4f00abfa37c0edd889c208fde9b41627d5b523801420c4040719393aa590d962cb5a48e16360ac75a6c358c9699e9f1a853afede4d601b6783e28f5ec74542aaf59519e76830ba9d267656db324461fdb08d1d51521e103290c2102b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc20b4195440d78"]`,
 			result: func(e *executor) interface{} {
 				v := true
 				return &v
diff --git a/pkg/rpc/server/testdata/testblocks.acc b/pkg/rpc/server/testdata/testblocks.acc
index c00d33f9ecfc98f5bb3ec468d57022777fcf098f..11776cb49434c76944907a3185433fe487bf217d 100644
GIT binary patch
delta 3555
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

delta 3555
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

diff --git a/pkg/vm/contract_checks.go b/pkg/vm/contract_checks.go
index 1c8bfc4ea..92b12da1f 100644
--- a/pkg/vm/contract_checks.go
+++ b/pkg/vm/contract_checks.go
@@ -10,7 +10,7 @@ import (
 )
 
 var (
-	verifyInteropID   = emit.InteropNameToID([]byte("Neo.Crypto.ECDsaVerify"))
+	verifyInteropID   = emit.InteropNameToID([]byte("Neo.Crypto.VerifyWithECDsaSecp256r1"))
 	multisigInteropID = emit.InteropNameToID([]byte("Neo.Crypto.ECDsaCheckMultiSig"))
 )
 
diff --git a/pkg/wallet/testdata/wallet1.json b/pkg/wallet/testdata/wallet1.json
index 0e7102d1c..70b704d22 100644
--- a/pkg/wallet/testdata/wallet1.json
+++ b/pkg/wallet/testdata/wallet1.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NQRLhCpAru9BjGsMwk67vdMwmzKMRgsnnN",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "address": "NbTiM6h8r99kpRtb428XcsUk1TzKed2gTc",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
-        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQQqQatQ=",
+        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
diff --git a/pkg/wallet/testdata/wallet2.json b/pkg/wallet/testdata/wallet2.json
index 9fbfa2656..753d75b45 100644
--- a/pkg/wallet/testdata/wallet2.json
+++ b/pkg/wallet/testdata/wallet2.json
@@ -2,11 +2,11 @@
   "version": "3.0",
   "accounts": [
     {
-      "address": "NQRLhCpAru9BjGsMwk67vdMwmzKMRgsnnN",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "address": "NbTiM6h8r99kpRtb428XcsUk1TzKed2gTc",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
-        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQQqQatQ=",
+        "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
@@ -20,7 +20,7 @@
     },
     {
       "address": "Nbb1qkwcwNSBs9pAnrVVrnFbWnbWBk91U2",
-      "key": "6PYSxdYbqJQKJcE7L8SUummK4X95aK14KA9obhw3fw6SX3rMRofPzpnr8L",
+      "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux",
       "label": "",
       "contract": {
         "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBMHOzuw==",
@@ -44,11 +44,11 @@
       "isDefault": false
     },
     {
-      "address": "NNsXzAGGVY3H3viPHzaoD6BcVtqNCdMAHZ",
-      "key": "6PYVQUTQLzdhtdnNLSBkse2DGG5gpPFuNGjaBZxYuJ4XsQrtVNy1E9k7R9",
+      "address": "NWvKSwutC8D6VKmmPxAEgFKx2NLvFhn8q5",
+      "key": "6PYKEHagXJ3mDLdga1FoyTGRtPdJgPz6Gb8sjEFwZvRu7ncD9PVZfHtMzL",
       "label": "",
       "contract": {
-        "script": "DCECEDp/fdAWVYWX95YNJ8UWpDlP2Wi55lFV60sBPkBAQG4LQQqQatQ=",
+        "script": "DCECEDp/fdAWVYWX95YNJ8UWpDlP2Wi55lFV60sBPkBAQG4LQZVEDXg=",
         "parameters": [
           {
             "name": "parameter0",
diff --git a/pkg/wallet/wallet_test.go b/pkg/wallet/wallet_test.go
index e811eea04..302795845 100644
--- a/pkg/wallet/wallet_test.go
+++ b/pkg/wallet/wallet_test.go
@@ -181,14 +181,14 @@ func TestWalletGetChangeAddress(t *testing.T) {
 	require.NoError(t, err)
 	sh := w1.GetChangeAddress()
 	// No default address, the first one is used.
-	expected, err := address.StringToUint160("NQRLhCpAru9BjGsMwk67vdMwmzKMRgsnnN")
+	expected, err := address.StringToUint160("NbTiM6h8r99kpRtb428XcsUk1TzKed2gTc")
 	require.NoError(t, err)
 	require.Equal(t, expected, sh)
 	w2, err := NewWalletFromFile("testdata/wallet2.json")
 	require.NoError(t, err)
 	sh = w2.GetChangeAddress()
 	// Default address.
-	expected, err = address.StringToUint160("NNsXzAGGVY3H3viPHzaoD6BcVtqNCdMAHZ")
+	expected, err = address.StringToUint160("NWvKSwutC8D6VKmmPxAEgFKx2NLvFhn8q5")
 	require.NoError(t, err)
 	require.Equal(t, expected, sh)
 }