From bc85f00cc7fe3ec12c704ccabb6fd92e73b7b6e6 Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Mon, 6 Jun 2022 12:07:10 +0300 Subject: [PATCH 1/2] Partially revert "core: fix native NEO ABI" This partially reverts commit ca127f161596c2d7b26f9fe20b526ae648333986. --- pkg/core/interop/context.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/core/interop/context.go b/pkg/core/interop/context.go index 0c7419284..4a734ad42 100644 --- a/pkg/core/interop/context.go +++ b/pkg/core/interop/context.go @@ -207,7 +207,7 @@ func (c *ContractMD) AddMethod(md *MethodAndPrice, desc *manifest.Method) { index := sort.Search(len(c.Manifest.ABI.Methods), func(i int) bool { md := c.Manifest.ABI.Methods[i] if md.Name != desc.Name { - return strings.ToLower(md.Name) >= strings.ToLower(desc.Name) + return md.Name >= desc.Name } return len(md.Parameters) > len(desc.Parameters) }) @@ -236,7 +236,7 @@ func (c *ContractMD) GetMethodByOffset(offset int) (MethodAndPrice, bool) { func (c *ContractMD) GetMethod(name string, paramCount int) (MethodAndPrice, bool) { index := sort.Search(len(c.Methods), func(i int) bool { md := c.Methods[i] - res := strings.Compare(strings.ToLower(name), strings.ToLower(md.MD.Name)) + res := strings.Compare(name, md.MD.Name) switch res { case -1, 1: return res == -1 From 7612ad119547905a8f61c304bce39b80e45061b5 Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Mon, 6 Jun 2022 13:02:29 +0300 Subject: [PATCH 2/2] rpc: adjust test data --- pkg/rpc/server/server_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go index 1c15f9ddf..4ea259de8 100644 --- a/pkg/rpc/server/server_test.go +++ b/pkg/rpc/server/server_test.go @@ -75,7 +75,7 @@ const ( nfsoContractHash = "c7ec8e0fb4d669913e4ffdd4ba4fa3502e5d2d10" nfsoToken1ID = "7e244ffd6aa85fb1579d2ed22e9b761ab62e3486" invokescriptContractAVM = "VwIADBQBDAMOBQYMDQIODw0DDgcJAAAAAErZMCQE2zBwaEH4J+yMqiYEEUAMFA0PAwIJAAIBAwcDBAUCAQAOBgwJStkwJATbMHFpQfgn7IyqJgQSQBNA" - block20StateRootLE = "3cba730383c4c2c34475939a4efe9de9ac377bffaf0abdb6f8a1a8fe145d8f69" + block20StateRootLE = "af7fad57fc622305b162c4440295964168a07967d07244964e4ed0121b247dee" ) var (