wip

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>

Author: carpawell

pkg/innerring/internal/metachain/contracts.go

@@ -49,7 +49,7 @@ func NewCustomNatives(cfg neogoconfig.ProtocolConfiguration) []interop.Contract
 			neoContract = contract.(native.INEO)
 			newContracts = append(newContracts, neoContract)
 		case *native.GAS:
-			newContracts = append(newContracts, gas.NewGAS(int64(cfg.InitialGASSupply)))
+			newContracts = append(newContracts, gas.NewGAS())
 		case *native.Management, *native.Ledger, *native.Policy, *native.Designate, *native.Notary:
 			newContracts = append(newContracts, contract)
 		case *native.Std, *native.Crypto, *native.Oracle, *native.Treasury:

pkg/innerring/internal/metachain/gas/gas.go

@@ -1,7 +1,6 @@
 package gas
 
 import (
-	"errors"
 	"math/big"
 
 	"github.com/nspcc-dev/neo-go/pkg/config"
@@ -10,28 +9,24 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/core/native"
 	"github.com/nspcc-dev/neo-go/pkg/core/native/nativeids"
 	"github.com/nspcc-dev/neo-go/pkg/core/native/nativenames"
-	"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/util"
 )
 
 // DefaultBalance is a balance of every account in redefined [GAS] native
 // contract.
 const DefaultBalance = 100
 
+var _ = (native.IGAS)(&GAS{})
+
 // GAS represents GAS custom native contract. It always returns [DefaultBalance] as a
 // balance, has no-op `Burn`, `Mint`, `Transfer` operations.
 type GAS struct {
 	nep17TokenNative
-	initialSupply int64
 }
 
 // NewGAS returns [GAS] custom native contract.
-func NewGAS(init int64) *GAS {
-	g := &GAS{
-		initialSupply: init,
-	}
+func NewGAS() *GAS {
+	g := &GAS{}
 	defer g.BuildHFSpecificMD(g.ActiveIn())
 
 	nep17 := newNEP17Native(nativenames.Gas, nativeids.GasToken, nil)
@@ -46,22 +41,6 @@ func NewGAS(init int64) *GAS {
 
 // Initialize initializes a GAS contract.
 func (g *GAS) Initialize(ic *interop.Context, hf *config.Hardfork, newMD *interop.HFSpecificContractMD) error {
-	if hf != g.ActiveIn() {
-		return nil
-	}
-
-	if err := g.nep17TokenNative.Initialize(ic); err != nil {
-		return err
-	}
-	_, totalSupply := g.getTotalSupply(ic.DAO)
-	if totalSupply.Sign() != 0 {
-		return errors.New("already initialized")
-	}
-	h, err := getStandbyValidatorsHash(ic)
-	if err != nil {
-		return err
-	}
-	g.Mint(ic, h, big.NewInt(g.initialSupply), false)
 	return nil
 }
 
@@ -89,16 +68,3 @@ func (g *GAS) ActiveIn() *config.Hardfork {
 func (g *GAS) BalanceOf(d *dao.Simple, acc util.Uint160) *big.Int {
 	return g.balanceOfInternal(d, acc)
 }
-
-func getStandbyValidatorsHash(ic *interop.Context) (util.Uint160, error) {
-	cfg := ic.Chain.GetConfig()
-	committee, err := keys.NewPublicKeysFromStrings(cfg.StandbyCommittee)
-	if err != nil {
-		return util.Uint160{}, err
-	}
-	s, err := smartcontract.CreateDefaultMultiSigRedeemScript(committee[:cfg.GetNumOfCNs(0)])
-	if err != nil {
-		return util.Uint160{}, err
-	}
-	return hash.Hash160(s), nil
-}

pkg/innerring/internal/metachain/gas/nep17.go

@@ -7,8 +7,6 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/core/dao"
 	"github.com/nspcc-dev/neo-go/pkg/core/interop"
 	"github.com/nspcc-dev/neo-go/pkg/core/native"
-	"github.com/nspcc-dev/neo-go/pkg/core/state"
-	"github.com/nspcc-dev/neo-go/pkg/encoding/bigint"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract/callflag"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract/manifest"
@@ -24,9 +22,6 @@ type nep17TokenNative struct {
 	factor   int64
 }
 
-// totalSupplyKey is the key used to store totalSupply value.
-var totalSupplyKey = []byte{11}
-
 func (c *nep17TokenNative) Metadata() *interop.ContractMD {
 	return &c.ContractMD
 }
@@ -39,37 +34,37 @@ func newNEP17Native(name string, id int32, onManifestConstruction func(m *manife
 		}
 	})}
 
-	desc := NewDescriptor("symbol", smartcontract.StringType)
-	md := NewMethodAndPrice(n.Symbol, 0, callflag.NoneFlag)
+	desc := native.NewDescriptor("symbol", smartcontract.StringType)
+	md := native.NewMethodAndPrice(n.Symbol, 0, callflag.NoneFlag)
 	n.AddMethod(md, desc)
 
-	desc = NewDescriptor("decimals", smartcontract.IntegerType)
-	md = NewMethodAndPrice(n.Decimals, 0, callflag.NoneFlag)
+	desc = native.NewDescriptor("decimals", smartcontract.IntegerType)
+	md = native.NewMethodAndPrice(n.Decimals, 0, callflag.NoneFlag)
 	n.AddMethod(md, desc)
 
-	desc = NewDescriptor("totalSupply", smartcontract.IntegerType)
-	md = NewMethodAndPrice(n.TotalSupply, 1<<15, callflag.ReadStates)
+	desc = native.NewDescriptor("totalSupply", smartcontract.IntegerType)
+	md = native.NewMethodAndPrice(n.TotalSupply, 1<<15, callflag.ReadStates)
 	n.AddMethod(md, desc)
 
-	desc = NewDescriptor("balanceOf", smartcontract.IntegerType,
+	desc = native.NewDescriptor("balanceOf", smartcontract.IntegerType,
 		manifest.NewParameter("account", smartcontract.Hash160Type))
-	md = NewMethodAndPrice(n.balanceOf, 1<<15, callflag.ReadStates)
+	md = native.NewMethodAndPrice(n.balanceOf, 1<<15, callflag.ReadStates)
 	n.AddMethod(md, desc)
 
 	transferParams := []manifest.Parameter{
 		manifest.NewParameter("from", smartcontract.Hash160Type),
 		manifest.NewParameter("to", smartcontract.Hash160Type),
 		manifest.NewParameter("amount", smartcontract.IntegerType),
 	}
-	desc = NewDescriptor("transfer", smartcontract.BoolType,
+	desc = native.NewDescriptor("transfer", smartcontract.BoolType,
 		append(transferParams, manifest.NewParameter("data", smartcontract.AnyType))...,
 	)
-	md = NewMethodAndPrice(n.Transfer, 1<<17, callflag.States|callflag.AllowCall|callflag.AllowNotify)
+	md = native.NewMethodAndPrice(n.Transfer, 1<<17, callflag.States|callflag.AllowCall|callflag.AllowNotify)
 	md.StorageFee = 50
 	n.AddMethod(md, desc)
 
-	eDesc := NewEventDescriptor("Transfer", transferParams...)
-	eMD := NewEvent(eDesc)
+	eDesc := native.NewEventDescriptor("Transfer", transferParams...)
+	eMD := native.NewEvent(eDesc)
 	n.AddEvent(eMD)
 
 	return n
@@ -88,16 +83,7 @@ func (c *nep17TokenNative) Decimals(_ *interop.Context, _ []stackitem.Item) stac
 }
 
 func (c *nep17TokenNative) TotalSupply(ic *interop.Context, _ []stackitem.Item) stackitem.Item {
-	_, supply := c.getTotalSupply(ic.DAO)
-	return stackitem.NewBigInteger(supply)
-}
-
-func (c *nep17TokenNative) getTotalSupply(d *dao.Simple) (state.StorageItem, *big.Int) {
-	si := d.GetStorageItem(c.ID, totalSupplyKey)
-	if si == nil {
-		si = []byte{}
-	}
-	return si, bigint.FromBytes(si)
+	return stackitem.NewBigInteger(big.NewInt(DefaultBalance * native.GASFactor))
 }
 
 func (c *nep17TokenNative) Transfer(ic *interop.Context, args []stackitem.Item) stackitem.Item {
@@ -119,63 +105,3 @@ func (c *nep17TokenNative) Mint(ic *interop.Context, h util.Uint160, amount *big
 
 func (c *nep17TokenNative) Burn(ic *interop.Context, h util.Uint160, amount *big.Int) {
 }
-
-func NewDescriptor(name string, ret smartcontract.ParamType, ps ...manifest.Parameter) *manifest.Method {
-	if len(ps) == 0 {
-		ps = []manifest.Parameter{}
-	}
-	return &manifest.Method{
-		Name:       name,
-		Parameters: ps,
-		ReturnType: ret,
-	}
-}
-
-// NewMethodAndPrice builds method with the provided descriptor and ActiveFrom/ActiveTill hardfork
-// values consequently specified via activations. [config.HFDefault] specified as ActiveFrom is treated
-// as active starting from the genesis block.
-func NewMethodAndPrice(f interop.Method, cpuFee int64, flags callflag.CallFlag, activations ...config.Hardfork) *interop.MethodAndPrice {
-	md := &interop.MethodAndPrice{
-		HFSpecificMethodAndPrice: interop.HFSpecificMethodAndPrice{
-			Func:          f,
-			CPUFee:        cpuFee,
-			RequiredFlags: flags,
-		},
-	}
-	if len(activations) > 0 {
-		if activations[0] != config.HFDefault {
-			md.ActiveFrom = &activations[0]
-		}
-	}
-	if len(activations) > 1 {
-		md.ActiveTill = &activations[1]
-	}
-	return md
-}
-
-func NewEventDescriptor(name string, ps ...manifest.Parameter) *manifest.Event {
-	if len(ps) == 0 {
-		ps = []manifest.Parameter{}
-	}
-	return &manifest.Event{
-		Name:       name,
-		Parameters: ps,
-	}
-}
-
-// NewEvent builds event with the provided descriptor and ActiveFrom/ActiveTill hardfork
-// values consequently specified via activations.
-func NewEvent(desc *manifest.Event, activations ...config.Hardfork) interop.Event {
-	md := interop.Event{
-		HFSpecificEvent: interop.HFSpecificEvent{
-			MD: desc,
-		},
-	}
-	if len(activations) > 0 {
-		md.ActiveFrom = &activations[0]
-	}
-	if len(activations) > 1 {
-		md.ActiveTill = &activations[1]
-	}
-	return md
-}

pkg/innerring/internal/metachain/meta/meta.go

@@ -75,6 +75,12 @@ func NewMetadata(neo native.INEO) *MetaData {
 	md = native.NewMethodAndPrice(m.updateContainerList, 1<<15, callflag.WriteStates)
 	m.AddMethod(md, desc)
 
+	desc = native.NewDescriptor("verifyPlacementSignatures", smartcontract.BoolType,
+		manifest.NewParameter("container", smartcontract.Hash256Type),
+		manifest.NewParameter("signatures", smartcontract.ArrayType))
+	md = native.NewMethodAndPrice(m.verifyPlacementSignatures, 1<<15, callflag.ReadOnly)
+	m.AddMethod(md, desc)
+
 	eDesc := native.NewEventDescriptor(putObjectEvent,
 		manifest.NewParameter("container", smartcontract.Hash256Type),
 		manifest.NewParameter("object", smartcontract.Hash256Type),