forked from TrueCloudLab/neoneo-go
Merge pull request #3052 from nspcc-dev/remove-script-check
core: remove contract script check on deploy/update
This commit is contained in:
commit
f611a793a7
2 changed files with 1 additions and 16 deletions
|
@ -23,8 +23,6 @@ import (
|
|||
"github.com/nspcc-dev/neo-go/pkg/smartcontract/manifest"
|
||||
"github.com/nspcc-dev/neo-go/pkg/smartcontract/nef"
|
||||
"github.com/nspcc-dev/neo-go/pkg/util"
|
||||
"github.com/nspcc-dev/neo-go/pkg/util/bitfield"
|
||||
"github.com/nspcc-dev/neo-go/pkg/vm"
|
||||
"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
|
||||
)
|
||||
|
||||
|
@ -717,12 +715,10 @@ func (m *Management) emitNotification(ic *interop.Context, name string, hash uti
|
|||
|
||||
func checkScriptAndMethods(script []byte, methods []manifest.Method) error {
|
||||
l := len(script)
|
||||
offsets := bitfield.New(l)
|
||||
for i := range methods {
|
||||
if methods[i].Offset >= l {
|
||||
return fmt.Errorf("method %s/%d: offset is out of the script range", methods[i].Name, len(methods[i].Parameters))
|
||||
}
|
||||
offsets.Set(methods[i].Offset)
|
||||
}
|
||||
return vm.IsScriptCorrect(script, offsets)
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -143,17 +143,6 @@ func TestManagement_ContractDeploy(t *testing.T) {
|
|||
|
||||
managementInvoker.InvokeFail(t, "method add/2: offset is out of the script range", "deploy", nefBytes, manifB)
|
||||
})
|
||||
t.Run("bad methods in manifest 2", func(t *testing.T) {
|
||||
var badManifest = cs1.Manifest
|
||||
badManifest.ABI.Methods = make([]manifest.Method, len(cs1.Manifest.ABI.Methods))
|
||||
copy(badManifest.ABI.Methods, cs1.Manifest.ABI.Methods)
|
||||
badManifest.ABI.Methods[0].Offset = len(cs1.NEF.Script) - 2 // Ends with `CALLT(X,X);RET`.
|
||||
|
||||
manifB, err := json.Marshal(badManifest)
|
||||
require.NoError(t, err)
|
||||
|
||||
managementInvoker.InvokeFail(t, "some methods point to wrong offsets (not to instruction boundary)", "deploy", nefBytes, manifB)
|
||||
})
|
||||
t.Run("duplicated methods in manifest 1", func(t *testing.T) {
|
||||
badManifest := cs1.Manifest
|
||||
badManifest.ABI.Methods = make([]manifest.Method, len(cs1.Manifest.ABI.Methods))
|
||||
|
|
Loading…
Reference in a new issue