native: add hasMethod, fix #2588

Yet another state change.
2022-07-13 17:29:08 +03:00 · 2022-07-13 17:29:08 +03:00 · ab3330564a
commit ab3330564a
parent 71b721c72a
4 changed files with 51 additions and 16 deletions
--- a/pkg/core/native/management.go
+++ b/pkg/core/native/management.go
@ -141,6 +141,13 @@ func newManagement() *Management {
 	md = newMethodAndPrice(m.setMinimumDeploymentFee, 1<<15, callflag.States)
 	m.AddMethod(md, desc)

+	desc = newDescriptor("hasMethod", smartcontract.IntegerType,
+		manifest.NewParameter("hash", smartcontract.Hash160Type),
+		manifest.NewParameter("method", smartcontract.StringType),
+		manifest.NewParameter("pcount", smartcontract.IntegerType))
+	md = newMethodAndPrice(m.hasMethod, 1<<15, callflag.ReadStates)
+	m.AddMethod(md, desc)
+
 	hashParam := manifest.NewParameter("Hash", smartcontract.Hash160Type)
 	m.AddEvent(contractDeployNotificationName, hashParam)
 	m.AddEvent(contractUpdateNotificationName, hashParam)
@ -148,10 +155,8 @@ func newManagement() *Management {
 	return m
 }

-// getContract is an implementation of public getContract method, it's run under
-// VM protections, so it's OK for it to panic instead of returning errors.
-func (m *Management) getContract(ic *interop.Context, args []stackitem.Item) stackitem.Item {
-	hashBytes, err := args[0].TryBytes()
+func toHash160(si stackitem.Item) util.Uint160 {
+	hashBytes, err := si.TryBytes()
 	if err != nil {
 		panic(err)
 	}
@ -159,6 +164,13 @@ func (m *Management) getContract(ic *interop.Context, args []stackitem.Item) sta
 	if err != nil {
 		panic(err)
 	}
+	return hash
+}
+
+// getContract is an implementation of public getContract method, it's run under
+// VM protections, so it's OK for it to panic instead of returning errors.
+func (m *Management) getContract(ic *interop.Context, args []stackitem.Item) stackitem.Item {
+	hash := toHash160(args[0])
 	ctr, err := m.GetContract(ic.DAO, hash)
 	if err != nil {
 		if err == storage.ErrKeyNotFound {
@ -456,6 +468,20 @@ func contractToStack(cs *state.Contract) stackitem.Item {
 	return si
 }

+func (m *Management) hasMethod(ic *interop.Context, args []stackitem.Item) stackitem.Item {
+	cHash := toHash160(args[0])
+	method, err := stackitem.ToString(args[1])
+	if err != nil {
+		panic(err)
+	}
+	pcount := int(toInt64((args[2])))
+	cs, err := m.GetContract(ic.DAO, cHash)
+	if err != nil {
+		return stackitem.NewBool(false)
+	}
+	return stackitem.NewBool(cs.Manifest.ABI.GetMethod(method, pcount) != nil)
+}
+
 // Metadata implements the Contract interface.
 func (m *Management) Metadata() *interop.ContractMD {
 	return &m.ContractMD
--- a/pkg/core/native/native_test/management_test.go
+++ b/pkg/core/native/native_test/management_test.go
@ -205,6 +205,11 @@ func TestManagement_ContractDeploy(t *testing.T) {
 		t.Run("get after deploy", func(t *testing.T) {
 			managementInvoker.Invoke(t, si, "getContract", cs1.Hash.BytesBE())
 		})
+		t.Run("hasMethod after deploy", func(t *testing.T) {
+			managementInvoker.Invoke(t, stackitem.NewBool(true), "hasMethod", cs1.Hash.BytesBE(), "add", 2)
+			managementInvoker.Invoke(t, stackitem.NewBool(false), "hasMethod", cs1.Hash.BytesBE(), "add", 1)
+			managementInvoker.Invoke(t, stackitem.NewBool(false), "hasMethod", cs1.Hash.BytesLE(), "add", 2)
+		})
 		t.Run("get after restore", func(t *testing.T) {
 			w := io.NewBufBinWriter()
 			require.NoError(t, chaindump.Dump(c.Executor.Chain, w.BinWriter, 0, c.Executor.Chain.BlockHeight()+1))
--- a/pkg/rpc/server/server_test.go
+++ b/pkg/rpc/server/server_test.go
@ -73,12 +73,12 @@ const (
 	verifyContractHash         = "06ed5314c2e4cb103029a60b86d46afa2fb8f67c"
 	verifyContractAVM          = "VwIAQS1RCDBwDBTunqIsJ+NL0BSPxBCOCPdOj1BIskrZMCQE2zBxaBPOStkoJATbKGlK2SgkBNsol0A="
 	verifyWithArgsContractHash = "0dce75f52adb1a4c5c6eaa6a34eb26db2e5b3781"
-	nnsContractHash            = "ee92563903e4efd53565784080b2dbdc5c37e21f"
+	nnsContractHash            = "bdbfe1a280a0e23ca5b569c8f5845169bd93cb06"
 	nnsToken1ID                = "6e656f2e636f6d"
-	nfsoContractHash           = "c7ec8e0fb4d669913e4ffdd4ba4fa3502e5d2d10"
+	nfsoContractHash           = "0e15ca0df00669a2cd5dcb03bfd3e2b3849c2969"
 	nfsoToken1ID               = "7e244ffd6aa85fb1579d2ed22e9b761ab62e3486"
 	invokescriptContractAVM    = "VwIADBQBDAMOBQYMDQIODw0DDgcJAAAAAErZMCQE2zBwaEH4J+yMqiYEEUAMFA0PAwIJAAIBAwcDBAUCAQAOBgwJStkwJATbMHFpQfgn7IyqJgQSQBNA"
-	block20StateRootLE         = "af7fad57fc622305b162c4440295964168a07967d07244964e4ed0121b247dee"
+	block20StateRootLE         = "c0abd1e544338e2da6bb8ea7c1915fc44ff4226150b053ca8ff8ca75d50faf49"
 	storageContractHash        = "ebc0c16a76c808cd4dde6bcc063f09e45e331ec7"
 )

@ -896,10 +896,11 @@ var rpcTestCases = map[string][]rpcTestCase{
 			name:   "positive, with notifications",
 			params: `["` + nnsContractHash + `", "transfer", [{"type":"Hash160", "value":"0x0bcd2978634d961c24f5aea0802297ff128724d6"},{"type":"String", "value":"neo.com"},{"type":"Any", "value":null}],["0xb248508f4ef7088e10c48f14d04be3272ca29eee"]]`,
 			result: func(e *executor) interface{} {
-				script := []byte{0x0b, 0x0c, 0x07, 0x6e, 0x65, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x0c, 0x14, 0xd6, 0x24, 0x87, 0x12, 0xff, 0x97, 0x22, 0x80, 0xa0, 0xae, 0xf5, 0x24, 0x1c, 0x96, 0x4d, 0x63, 0x78, 0x29, 0xcd, 0xb, 0x13, 0xc0, 0x1f, 0xc, 0x8, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0xc, 0x14, 0x1f, 0xe2, 0x37, 0x5c, 0xdc, 0xdb, 0xb2, 0x80, 0x40, 0x78, 0x65, 0x35, 0xd5, 0xef, 0xe4, 0x3, 0x39, 0x56, 0x92, 0xee, 0x41, 0x62, 0x7d, 0x5b, 0x52}
+				script := append([]byte{0x0b, 0x0c, 0x07, 0x6e, 0x65, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x0c, 0x14, 0xd6, 0x24, 0x87, 0x12, 0xff, 0x97, 0x22, 0x80, 0xa0, 0xae, 0xf5, 0x24, 0x1c, 0x96, 0x4d, 0x63, 0x78, 0x29, 0xcd, 0xb, 0x13, 0xc0, 0x1f, 0xc, 0x8, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0xc, 0x14}, nnsHash.BytesBE()...)
+				script = append(script, 0x41, 0x62, 0x7d, 0x5b, 0x52)
 				return &result.Invoke{
 					State:       "HALT",
-					GasConsumed: 32167260,
+					GasConsumed: 32414250,
 					Script:      script,
 					Stack:       []stackitem.Item{stackitem.Make(true)},
 					Notifications: []state.NotificationEvent{{
@ -929,7 +930,7 @@ var rpcTestCases = map[string][]rpcTestCase{
 				chg := []dboper.Operation{{
 					State: "Changed",
 					Key:   []byte{0xfa, 0xff, 0xff, 0xff, 0xb},
-					Value: []byte{0x70, 0xd9, 0x59, 0x9d, 0x51, 0x79, 0x12},
+					Value: []byte{0xf6, 0x8b, 0x4e, 0x9d, 0x51, 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},
@ -941,7 +942,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, 0x88, 0x3e, 0xfa, 0xdb, 0x08},
+					Value: []byte{0x41, 0x01, 0x21, 0x05, 0xe4, 0x74, 0xef, 0xdb, 0x08},
 				}}
 				// Can be returned in any order.
 				assert.ElementsMatch(t, chg, res.Diagnostics.Changes)
@ -951,7 +952,8 @@ var rpcTestCases = map[string][]rpcTestCase{
 			name:   "positive, verbose",
 			params: `["` + nnsContractHash + `", "resolve", [{"type":"String", "value":"neo.com"},{"type":"Integer","value":1}], [], true]`,
 			result: func(e *executor) interface{} {
-				script := []byte{0x11, 0xc, 0x7, 0x6e, 0x65, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x12, 0xc0, 0x1f, 0xc, 0x7, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0xc, 0x14, 0x1f, 0xe2, 0x37, 0x5c, 0xdc, 0xdb, 0xb2, 0x80, 0x40, 0x78, 0x65, 0x35, 0xd5, 0xef, 0xe4, 0x3, 0x39, 0x56, 0x92, 0xee, 0x41, 0x62, 0x7d, 0x5b, 0x52}
+				script := append([]byte{0x11, 0xc, 0x7, 0x6e, 0x65, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x12, 0xc0, 0x1f, 0xc, 0x7, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0xc, 0x14}, nnsHash.BytesBE()...)
+				script = append(script, 0x41, 0x62, 0x7d, 0x5b, 0x52)
 				stdHash, _ := e.chain.GetNativeContractScriptHash(nativenames.StdLib)
 				cryptoHash, _ := e.chain.GetNativeContractScriptHash(nativenames.CryptoLib)
 				return &result.Invoke{
@ -1041,10 +1043,11 @@ var rpcTestCases = map[string][]rpcTestCase{
 			name:   "positive, with notifications",
 			params: `[20, "` + nnsContractHash + `", "transfer", [{"type":"Hash160", "value":"0x0bcd2978634d961c24f5aea0802297ff128724d6"},{"type":"String", "value":"neo.com"},{"type":"Any", "value":null}],["0xb248508f4ef7088e10c48f14d04be3272ca29eee"]]`,
 			result: func(e *executor) interface{} {
-				script := []byte{0x0b, 0x0c, 0x07, 0x6e, 0x65, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x0c, 0x14, 0xd6, 0x24, 0x87, 0x12, 0xff, 0x97, 0x22, 0x80, 0xa0, 0xae, 0xf5, 0x24, 0x1c, 0x96, 0x4d, 0x63, 0x78, 0x29, 0xcd, 0xb, 0x13, 0xc0, 0x1f, 0xc, 0x8, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0xc, 0x14, 0x1f, 0xe2, 0x37, 0x5c, 0xdc, 0xdb, 0xb2, 0x80, 0x40, 0x78, 0x65, 0x35, 0xd5, 0xef, 0xe4, 0x3, 0x39, 0x56, 0x92, 0xee, 0x41, 0x62, 0x7d, 0x5b, 0x52}
+				script := append([]byte{0x0b, 0x0c, 0x07, 0x6e, 0x65, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x0c, 0x14, 0xd6, 0x24, 0x87, 0x12, 0xff, 0x97, 0x22, 0x80, 0xa0, 0xae, 0xf5, 0x24, 0x1c, 0x96, 0x4d, 0x63, 0x78, 0x29, 0xcd, 0xb, 0x13, 0xc0, 0x1f, 0xc, 0x8, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0xc, 0x14}, nnsHash.BytesBE()...)
+				script = append(script, 0x41, 0x62, 0x7d, 0x5b, 0x52)
 				return &result.Invoke{
 					State:       "HALT",
-					GasConsumed: 32167260,
+					GasConsumed: 32414250,
 					Script:      script,
 					Stack:       []stackitem.Item{stackitem.Make(true)},
 					Notifications: []state.NotificationEvent{{
@ -1064,7 +1067,8 @@ var rpcTestCases = map[string][]rpcTestCase{
 			name:   "positive, verbose",
 			params: `[20, "` + nnsContractHash + `", "resolve", [{"type":"String", "value":"neo.com"},{"type":"Integer","value":1}], [], true]`,
 			result: func(e *executor) interface{} {
-				script := []byte{0x11, 0xc, 0x7, 0x6e, 0x65, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x12, 0xc0, 0x1f, 0xc, 0x7, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0xc, 0x14, 0x1f, 0xe2, 0x37, 0x5c, 0xdc, 0xdb, 0xb2, 0x80, 0x40, 0x78, 0x65, 0x35, 0xd5, 0xef, 0xe4, 0x3, 0x39, 0x56, 0x92, 0xee, 0x41, 0x62, 0x7d, 0x5b, 0x52}
+				script := append([]byte{0x11, 0xc, 0x7, 0x6e, 0x65, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x12, 0xc0, 0x1f, 0xc, 0x7, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0xc, 0x14}, nnsHash.BytesBE()...)
+				script = append(script, 0x41, 0x62, 0x7d, 0x5b, 0x52)
 				stdHash, _ := e.chain.GetNativeContractScriptHash(nativenames.StdLib)
 				cryptoHash, _ := e.chain.GetNativeContractScriptHash(nativenames.CryptoLib)
 				return &result.Invoke{
@ -2592,7 +2596,7 @@ func checkNep17Balances(t *testing.T, e *executor, acc interface{}) {
 			},
 			{
 				Asset:       e.chain.UtilityTokenHash(),
-				Amount:      "37100367680",
+				Amount:      "37099660700",
 				LastUpdated: 22,
 				Decimals:    8,
 				Name:        "GasToken",
--- a/pkg/rpc/server/testdata/testblocks.acc
+++ b/pkg/rpc/server/testdata/testblocks.acc