smartcontract: remove contract features

We're featureless now, all contracts have access to storage and payable status
is to be determined via new NEP. Follow neo-project/neo#2060.

cli/smartcontract/smart_contract.go

@@ -404,7 +404,6 @@ func contractCompile(ctx *cli.Context) error {
 		if err != nil {
 			return err
 		}
-		o.ContractFeatures = conf.GetFeatures()
 		o.ContractEvents = conf.Events
 		o.ContractSupportedStandards = conf.SupportedStandards
 	}
@@ -632,24 +631,10 @@ func testInvokeScript(ctx *cli.Context) error {
 
 // ProjectConfig contains project metadata.
 type ProjectConfig struct {
-	HasStorage         bool
-	IsPayable          bool
 	SupportedStandards []string
 	Events             []manifest.Event
 }
 
-// GetFeatures returns smartcontract features from the config.
-func (p *ProjectConfig) GetFeatures() smartcontract.PropertyState {
-	var fs smartcontract.PropertyState
-	if p.IsPayable {
-		fs |= smartcontract.IsPayable
-	}
-	if p.HasStorage {
-		fs |= smartcontract.HasStorage
-	}
-	return fs
-}
-
 func inspect(ctx *cli.Context) error {
 	in := ctx.String("in")
 	compile := ctx.Bool("compile")

cli/smartcontract/smart_contract_test.go

@@ -58,9 +58,7 @@ func RuntimeNotify(args []interface{}) {
 	manifest, err := ioutil.ReadFile(contractName + "/" + files[1].Name())
 	require.NoError(t, err)
 	require.Equal(t,
-		`hasstorage: false
-ispayable: false
-supportedstandards: []
+		`supportedstandards: []
 events:
 - name: Hello world!
   parameters:
@@ -69,15 +67,6 @@ events:
 `, string(manifest))
 }
 
-func TestGetFeatures(t *testing.T) {
-	cfg := ProjectConfig{
-		IsPayable:  true,
-		HasStorage: true,
-	}
-	f := cfg.GetFeatures()
-	require.Equal(t, smartcontract.IsPayable|smartcontract.HasStorage, f)
-}
-
 func TestParseCosigner(t *testing.T) {
 	acc := util.Uint160{1, 3, 5, 7}
 	testCases := map[string]transaction.Signer{

cli/testdata/deploy/neo-go.yml

@@ -1 +0,0 @@
-hasstorage: true

cli/testdata/verify.manifest.json

@@ -1 +1 @@
-{"abi":{"hash":"0x8dff9f223e4622961f410c015dd37052a59892bb","methods":[{"name":"verify","offset":0,"parameters":[],"returntype":"Boolean"}],"events":[]},"groups":[],"features":{"payable":true,"storage":false},"permissions":[{"contract":"*","methods":"*"}],"supportedstandards":[],"trusts":[],"safemethods":[],"extra":null}
+{"abi":{"hash":"0x8dff9f223e4622961f410c015dd37052a59892bb","methods":[{"name":"verify","offset":0,"parameters":[],"returntype":"Boolean"}],"events":[]},"groups":[],"permissions":[{"contract":"*","methods":"*"}],"supportedstandards":[],"trusts":[],"safemethods":[],"extra":null}

docs/compiler.md

@@ -151,9 +151,7 @@ project:
   version: 1.0
   name: 'Smart contract'
   description: 'Even smarter than Jack himself'
-  hasstorage: true
   hasdynamicinvocation: false
-  ispayable: false
   returntype: ByteArray
   parameters: ['String', 'Array']
 ```

examples/engine/engine.yml

@@ -1,5 +1,3 @@
-hasstorage: false
-ispayable: false
 supportedstandards: []
 events:
   - name: Tx

examples/iterator/iterator.yml

@@ -1,5 +1,3 @@
-hasstorage: true
-ispayable: false
 supportedstandards: []
 events:
   - name: found storage values

examples/runtime/runtime.yml

@@ -1,5 +1,3 @@
-hasstorage: false
-ispayable: false
 supportedstandards: []
 events:
   - name: Event

examples/storage/storage.yml

@@ -1,4 +1,2 @@
-hasstorage: true
-ispayable: false
 supportedstandards: []
 events: []

examples/timer/timer.yml

@@ -1,4 +1,2 @@
-hasstorage: true
-ispayable: false
 supportedstandards: []
 events: []

examples/token-sale/token_sale.yml

@@ -1,4 +1,2 @@
-hasstorage: true
-ispayable: false
 supportedstandards: ["NEP-5"]
 events: []

examples/token/token.yml

@@ -1,5 +1,3 @@
-hasstorage: true
-ispayable: false
 supportedstandards: ["NEP-5"]
 events:
   - name: transfer

pkg/compiler/compiler.go

@@ -13,7 +13,6 @@ import (
 	"path"
 	"strings"
 
-	"github.com/nspcc-dev/neo-go/pkg/smartcontract"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract/manifest"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract/nef"
 	"golang.org/x/tools/go/loader"
@@ -35,9 +34,6 @@ type Options struct {
 	// The name of the output for contract manifest file.
 	ManifestFile string
 
-	// Contract features.
-	ContractFeatures smartcontract.PropertyState
-
 	// Runtime notifications.
 	ContractEvents []manifest.Event
 
@@ -211,7 +207,7 @@ func CompileAndSave(src string, o *Options) ([]byte, error) {
 	}
 
 	if o.ManifestFile != "" {
-		m, err := di.ConvertToManifest(o.ContractFeatures, o.ContractEvents, o.ContractSupportedStandards...)
+		m, err := di.ConvertToManifest(o.ContractEvents, o.ContractSupportedStandards...)
 		if err != nil {
 			return b, fmt.Errorf("failed to convert debug info to manifest: %w", err)
 		}

pkg/compiler/debug.go

@@ -409,7 +409,7 @@ func parsePairJSON(data []byte, sep string) (string, string, error) {
 
 // ConvertToManifest converts contract to the manifest.Manifest struct for debugger.
 // Note: manifest is taken from the external source, however it can be generated ad-hoc. See #1038.
-func (di *DebugInfo) ConvertToManifest(fs smartcontract.PropertyState, events []manifest.Event, supportedStandards ...string) (*manifest.Manifest, error) {
+func (di *DebugInfo) ConvertToManifest(events []manifest.Event, supportedStandards ...string) (*manifest.Manifest, error) {
 	if di.MainPkg == "" {
 		return nil, errors.New("no Main method was found")
 	}
@@ -425,7 +425,6 @@ func (di *DebugInfo) ConvertToManifest(fs smartcontract.PropertyState, events []
 	}
 
 	result := manifest.NewManifest(di.Hash)
-	result.Features = fs
 	if supportedStandards != nil {
 		result.SupportedStandards = supportedStandards
 	}

pkg/compiler/debug_test.go

@@ -149,7 +149,7 @@ func _deploy(isUpdate bool) {}
 	}
 
 	t.Run("convert to Manifest", func(t *testing.T) {
-		actual, err := d.ConvertToManifest(smartcontract.HasStorage, nil)
+		actual, err := d.ConvertToManifest(nil)
 		require.NoError(t, err)
 		// note: offsets are hard to predict, so we just take them from the output
 		expected := &manifest.Manifest{
@@ -244,8 +244,7 @@ func _deploy(isUpdate bool) {}
 				},
 				Events: []manifest.Event{},
 			},
-			Groups:   []manifest.Group{},
-			Features: smartcontract.HasStorage,
+			Groups: []manifest.Group{},
 			Permissions: []manifest.Permission{
 				{
 					Contract: manifest.PermissionDesc{
@@ -266,7 +265,6 @@ func _deploy(isUpdate bool) {}
 		require.ElementsMatch(t, expected.ABI.Methods, actual.ABI.Methods)
 		require.Equal(t, expected.ABI.Events, actual.ABI.Events)
 		require.Equal(t, expected.Groups, actual.Groups)
-		require.Equal(t, expected.Features, actual.Features)
 		require.Equal(t, expected.Permissions, actual.Permissions)
 		require.Equal(t, expected.Trusts, actual.Trusts)
 		require.Equal(t, expected.SafeMethods, actual.SafeMethods)

pkg/compiler/interop_test.go

@@ -101,7 +101,7 @@ func TestAppCall(t *testing.T) {
 
 	inner, di, err := compiler.CompileWithDebugInfo("foo.go", strings.NewReader(srcInner))
 	require.NoError(t, err)
-	m, err := di.ConvertToManifest(smartcontract.NoProperties, nil)
+	m, err := di.ConvertToManifest(nil)
 	require.NoError(t, err)
 
 	ih := hash.Hash160(inner)

pkg/core/helper_test.go

@@ -377,7 +377,7 @@ func newDeployTx(t *testing.T, name string) (*transaction.Transaction, []byte) {
 	t.Logf("contractScript: %x", avm)
 
 	script := io.NewBufBinWriter()
-	m, err := di.ConvertToManifest(smartcontract.HasStorage, nil)
+	m, err := di.ConvertToManifest(nil)
 	require.NoError(t, err)
 	bs, err := m.MarshalJSON()
 	require.NoError(t, err)

pkg/core/interop_neo.go

@@ -182,15 +182,6 @@ func contractUpdate(ic *interop.Context) error {
 		if !contract.Manifest.IsValid(contract.ScriptHash()) {
 			return errors.New("failed to check contract script hash against new manifest")
 		}
-		if !contract.HasStorage() {
-			siMap, err := ic.DAO.GetStorageItems(contract.ID)
-			if err != nil {
-				return fmt.Errorf("failed to update manifest: %w", err)
-			}
-			if len(siMap) != 0 {
-				return errors.New("old contract shouldn't have storage")
-			}
-		}
 		if err := ic.DAO.PutContractState(contract); err != nil {
 			return fmt.Errorf("failed to update manifest: %w", err)
 		}

pkg/core/interop_neo_test.go

@@ -18,7 +18,6 @@ import (
 	"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/smartcontract"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract/manifest"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger"
 	"github.com/nspcc-dev/neo-go/pkg/util"
@@ -295,7 +294,6 @@ func createVMAndPushTX(t *testing.T) (*vm.VM, *transaction.Transaction, *interop
 func createVMAndContractState(t *testing.T) (*vm.VM, *state.Contract, *interop.Context, *Blockchain) {
 	script := []byte("testscript")
 	m := manifest.NewManifest(hash.Hash160(script))
-	m.Features = smartcontract.HasStorage
 	contractState := &state.Contract{
 		Script:   script,
 		Manifest: *m,

pkg/core/interop_system.go

@@ -106,8 +106,6 @@ func contractToStackItem(cs *state.Contract) (stackitem.Item, error) {
 	return stackitem.NewArray([]stackitem.Item{
 		stackitem.NewByteArray(cs.Script),
 		stackitem.NewByteArray(manifest),
-		stackitem.NewBool(cs.HasStorage()),
-		stackitem.NewBool(cs.IsPayable()),
 	}), nil
 }
 
@@ -365,9 +363,6 @@ func storageGetContextInternal(ic *interop.Context, isReadOnly bool) error {
 	if err != nil {
 		return err
 	}
-	if !contract.HasStorage() {
-		return errors.New("contract is not allowed to use storage")
-	}
 	sc := &StorageContext{
 		ID:       contract.ID,
 		ReadOnly: isReadOnly,
@@ -464,14 +459,12 @@ func contractDestroy(ic *interop.Context) error {
 	if err != nil {
 		return err
 	}
-	if cs.HasStorage() {
-		siMap, err := ic.DAO.GetStorageItems(cs.ID)
-		if err != nil {
-			return err
-		}
-		for k := range siMap {
-			_ = ic.DAO.DeleteStorageItem(cs.ID, []byte(k))
-		}
+	siMap, err := ic.DAO.GetStorageItems(cs.ID)
+	if err != nil {
+		return err
+	}
+	for k := range siMap {
+		_ = ic.DAO.DeleteStorageItem(cs.ID, []byte(k))
 	}
 	return nil
 }

pkg/core/interop_system_test.go

@@ -411,7 +411,6 @@ func getTestContractState() (*state.Contract, *state.Contract) {
 	script := w.Bytes()
 	h := hash.Hash160(script)
 	m := manifest.NewManifest(h)
-	m.Features = smartcontract.HasStorage
 	m.ABI.Methods = []manifest.Method{
 		{
 			Name:   "add",
@@ -675,15 +674,9 @@ func compareContractStates(t *testing.T, expected *state.Contract, actual stacki
 	expectedManifest, err := expected.Manifest.MarshalJSON()
 	require.NoError(t, err)
 
-	require.Equal(t, 4, len(act))
+	require.Equal(t, 2, len(act))
 	require.Equal(t, expected.Script, act[0].Value().([]byte))
 	require.Equal(t, expectedManifest, act[1].Value().([]byte))
-	hasstorage, err := act[2].TryBool()
-	require.NoError(t, err)
-	ispayable, err := act[3].TryBool()
-	require.NoError(t, err)
-	require.Equal(t, expected.HasStorage(), hasstorage)
-	require.Equal(t, expected.IsPayable(), ispayable)
 }
 
 func TestContractUpdate(t *testing.T) {
@@ -813,34 +806,12 @@ func TestContractUpdate(t *testing.T) {
 		require.Error(t, contractUpdate(ic))
 	})
 
-	t.Run("update manifest, old contract shouldn't have storage", func(t *testing.T) {
-		cs.Manifest.Features |= smartcontract.HasStorage
-		require.NoError(t, ic.DAO.PutContractState(cs))
-		require.NoError(t, ic.DAO.PutStorageItem(cs.ID, []byte("my_item"), &state.StorageItem{
-			Value:   []byte{1, 2, 3},
-			IsConst: false,
-		}))
-		v.LoadScriptWithHash([]byte{byte(opcode.RET)}, cs.ScriptHash(), smartcontract.All)
-		manifest := &manifest.Manifest{
-			ABI: manifest.ABI{
-				Hash: cs.ScriptHash(),
-			},
-		}
-		manifestBytes, err := manifest.MarshalJSON()
-		require.NoError(t, err)
-		putArgsOnStack(stackitem.Null{}, manifestBytes)
-
-		require.Error(t, contractUpdate(ic))
-	})
-
 	t.Run("update manifest, positive", func(t *testing.T) {
-		cs.Manifest.Features = smartcontract.NoProperties
 		require.NoError(t, ic.DAO.PutContractState(cs))
 		manifest := &manifest.Manifest{
 			ABI: manifest.ABI{
 				Hash: cs.ScriptHash(),
 			},
-			Features: smartcontract.HasStorage,
 		}
 		manifestBytes, err := manifest.MarshalJSON()
 		require.NoError(t, err)
@@ -875,7 +846,6 @@ func TestContractUpdate(t *testing.T) {
 			ABI: manifest.ABI{
 				Hash: hash.Hash160(newScript),
 			},
-			Features: smartcontract.HasStorage,
 		}
 		newManifestBytes, err := newManifest.MarshalJSON()
 		require.NoError(t, err)

pkg/core/native/designate.go

@@ -69,7 +69,6 @@ func isValidRole(r Role) bool {
 func newDesignate() *Designate {
 	s := &Designate{ContractMD: *interop.NewContractMD(designateName)}
 	s.ContractID = designateContractID
-	s.Manifest.Features = smartcontract.HasStorage
 
 	desc := newDescriptor("getDesignatedByRole", smartcontract.ArrayType,
 		manifest.NewParameter("role", smartcontract.IntegerType),

pkg/core/native/oracle.go

@@ -104,7 +104,6 @@ func GetOracleResponseScript() []byte {
 func newOracle() *Oracle {
 	o := &Oracle{ContractMD: *interop.NewContractMD(oracleName)}
 	o.ContractID = oracleContractID
-	o.Manifest.Features = smartcontract.HasStorage
 
 	desc := newDescriptor("request", smartcontract.VoidType,
 		manifest.NewParameter("url", smartcontract.StringType),

pkg/core/native/policy.go

@@ -74,7 +74,6 @@ func newPolicy() *Policy {
 	p := &Policy{ContractMD: *interop.NewContractMD(policyName)}
 
 	p.ContractID = policyContractID
-	p.Manifest.Features |= smartcontract.HasStorage
 
 	desc := newDescriptor("getMaxTransactionsPerBlock", smartcontract.IntegerType)
 	md := newMethodAndPrice(p.getMaxTransactionsPerBlock, 1000000, smartcontract.AllowStates)

pkg/core/native_oracle_test.go

@@ -50,7 +50,6 @@ func getOracleContractState(h util.Uint160) *state.Contract {
 	emit.Opcodes(w.BinWriter, opcode.RET)
 
 	m := manifest.NewManifest(h)
-	m.Features = smartcontract.HasStorage
 	m.ABI.Methods = []manifest.Method{
 		{
 			Name:   "requestURL",