feat: restrict sending gnot by default

gno.land/cmd/gnoland/dylan/send.txtar

@@ -0,0 +1,4 @@
+gnoland start --ugnot-locked
+
+! gnokey maketx send -send "9999999ugnot" -to g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5 -gas-fee 1ugnot -gas-wanted 10000000 -broadcast -chainid=tendermint_test test1
+stderr 'account is locked'

gno.land/cmd/gnoland/genesis_generate.go

@@ -20,6 +20,7 @@
 	blockMaxDataBytes int64
 	blockMaxGas       int64
 	blockTimeIota     int64
+	ugnotUnrestricted bool
 }
 
 // newGenerateCmd creates the genesis generate subcommand
@@ -89,6 +90,13 @@
 		types.BlockTimeIotaMS,
 		"the block time iota (in ms)",
 	)
+
+	fs.BoolVar(
+		&c.ugnotUnrestricted,
+		"ugnot-unrestricted",
+		false,
+		"allow sending of ugnot from locked accounts",
+	)
 }
 
 func execGenerate(cfg *generateCfg, io commands.IO) error {
@@ -125,6 +133,10 @@
 		genesis.ConsensusParams.Block.TimeIotaMS = cfg.blockTimeIota
 	}
 
+	if cfg.ugnotUnrestricted {
+		genesis.ConsensusParams.Account.RestrictedDenoms = []string{}
+	}
+
 	// Validate the genesis
 	if validateErr := genesis.ValidateAndComplete(); validateErr != nil {
 		return fmt.Errorf("unable to validate genesis, %w", validateErr)
@@ -145,9 +157,12 @@
 
 // getDefaultGenesis returns the default genesis config
 func getDefaultGenesis() *types.GenesisDoc {
-	return &types.GenesisDoc{
+	genDoc := &types.GenesisDoc{
 		GenesisTime:     time.Now(),
 		ChainID:         defaultChainID,
 		ConsensusParams: types.DefaultConsensusParams(),
 	}
+
+	genDoc.ConsensusParams.Account.RestrictedDenoms = []string{"ugnot"}
+	return genDoc
 }

gno.land/cmd/gnoland/start.go

@@ -43,17 +43,18 @@
 `, "'", "`")
 
 type startCfg struct {
-	gnoRootDir            string // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
-	skipFailingGenesisTxs bool   // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
-	genesisBalancesFile   string // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
-	genesisTxsFile        string // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
-	genesisRemote         string // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
-	genesisFile           string
-	chainID               string
-	dataDir               string
-	genesisMaxVMCycles    int64
-	config                string
-	lazyInit              bool
+	gnoRootDir               string // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
+	skipFailingGenesisTxs    bool   // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
+	genesisBalancesFile      string // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
+	genesisTxsFile           string // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
+	genesisRemote            string // TODO: remove as part of https://github.com/gnolang/gno/issues/1952
+	genesisFile              string
+	chainID                  string
+	dataDir                  string
+	genesisMaxVMCycles       int64
+	config                   string
+	lazyInit                 bool
+	disableUGNOTRestrictions bool
 
 	logLevel  string
 	logFormat string
@@ -171,6 +172,13 @@
 		false,
 		"flag indicating if lazy init is enabled. Generates the node secrets, configuration, and genesis.json",
 	)
+
+	fs.BoolVar(
+		&c.disableUGNOTRestrictions,
+		"disable-ugnot-restrictions",
+		false,
+		"if true and genesis file is not provided, disables ugnot sending restrictions",
+	)
 }
 
 func execStart(ctx context.Context, c *startCfg, io commands.IO) error {
@@ -228,6 +236,10 @@
 		if err := lazyInitGenesis(io, c, genesisPath, privateKey.GetPubKey()); err != nil {
 			return fmt.Errorf("unable to initialize genesis.json, %w", err)
 		}
+	} else if c.disableUGNOTRestrictions {
+		// Clearly return an error in this case so the user isn't left wondering why
+		// the restrictions weren't disabled.
+		return errors.New("cannot disable ugnot restrictions when genesis file is provided")
 	}
 
 	// Initialize telemetry
@@ -385,6 +397,13 @@
 			MaxGas:       100_000_000, // 100M gas
 			TimeIotaMS:   100,         // 100ms
 		},
+		Account: &abci.AccountParams{
+			RestrictedDenoms: []string{"ugnot"},
+		},
+	}
+
+	if c.disableUGNOTRestrictions {
+		gen.ConsensusParams.Account.RestrictedDenoms = nil
 	}
 
 	gen.Validators = []bft.GenesisValidator{

gno.land/pkg/gnoland/app.go

@@ -5,6 +5,7 @@
 	"log/slog"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	"github.com/gnolang/gno/gnovm/pkg/gnoenv"
@@ -28,6 +29,8 @@
 	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 )
 
+var restrictedDenomsKey = []byte("restricted_denoms")
+
 type AppOptions struct {
 	DB dbm.DB
 	// `gnoRootDir` should point to the local location of the gno repository.
@@ -89,12 +92,18 @@
 	acctKpr := auth.NewAccountKeeper(mainKey, ProtoGnoAccount)
 	bankKpr := bank.NewBankKeeper(acctKpr)
 
+	// If this isn't genesis, then there might be restricted denominations in the database.
+	if rawDenoms := cfg.DB.Get(restrictedDenomsKey); len(rawDenoms) != 0 {
+		denomList := strings.Split(string(rawDenoms), ",")
+		bankKpr.SetRestrictedDenoms(denomList...)
+	}
+
 	// XXX: Embed this ?
 	stdlibsDir := filepath.Join(cfg.GnoRootDir, "gnovm", "stdlibs")
 	vmk := vm.NewVMKeeper(baseKey, mainKey, acctKpr, bankKpr, stdlibsDir, cfg.MaxCycles)
 
 	// Set InitChainer
-	baseApp.SetInitChainer(InitChainer(baseApp, acctKpr, bankKpr, cfg.GenesisTxHandler))
+	baseApp.SetInitChainer(InitChainer(baseApp, acctKpr, bankKpr, cfg.GenesisTxHandler, cfg.DB))
 
 	// Set AnteHandler
 	authOptions := auth.AnteOptions{
@@ -191,6 +200,7 @@
 	acctKpr auth.AccountKeeperI,
 	bankKpr bank.BankKeeperI,
 	resHandler GenesisTxHandler,
+	db dbm.DB,
 ) func(sdk.Context, abci.RequestInitChain) abci.ResponseInitChain {
 	return func(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
 		txResponses := []abci.ResponseDeliverTx{}
@@ -229,6 +239,14 @@
 
 				resHandler(ctx, tx, res)
 			}
+
+			if denoms := req.ConsensusParams.Account.RestrictedDenoms; len(denoms) != 0 {
+				// Set the bank's restricted denominations AFTER executing any genesis transactions.
+				bankKpr.SetRestrictedDenoms(denoms...)
+
+				// Put the restricted denominations in the database so they are available on restart.
+				db.SetSync(restrictedDenomsKey, []byte(strings.Join(denoms, ",")))
+			}
 		}
 
 		// Done!

gno.land/pkg/integration/testing_integration.go

@@ -8,6 +8,7 @@
 	"log/slog"
 	"os"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"testing"
@@ -183,6 +184,10 @@
 
 					// Generate config and node
 					cfg := TestingMinimalNodeConfig(t, gnoRootDir)
+					if slices.Contains[[]string, string](args, "--ugnot-locked") {
+						cfg.Genesis.ConsensusParams.Account.RestrictedDenoms = []string{"ugnot"}
+					}
+
 					genesis := ts.Value(envKeyGenesis).(*gnoland.GnoGenesisState)
 					genesis.Txs = append(pkgsTxs, genesis.Txs...)
 

gno.land/pkg/integration/testing_node.go

@@ -89,6 +89,7 @@ func DefaultTestingGenesisConfig(t TestingTS, gnoroot string, self crypto.PubKey
 				MaxGas:       100_000_000, // 100M gas
 				TimeIotaMS:   100,         // 100ms
 			},
+			Account: new(abci.AccountParams),
 		},
 		Validators: []bft.GenesisValidator{
 			{

tm2/pkg/bft/abci/types/abci.proto

@@ -157,6 +157,7 @@ message StringError {
 message ConsensusParams {
 	BlockParams block = 1 [json_name = "Block"];
 	ValidatorParams validator = 2 [json_name = "Validator"];
+	AccountParams account = 3 [json_name = "Account"];
 }
 
 message BlockParams {
@@ -177,6 +178,10 @@ message ValidatorUpdate {
 	sint64 power = 3 [json_name = "Power"];
 }
 
+message AccountParams {
+	repeated string restricted_denoms = 1 [json_name = "RestrictedDenoms"];
+}
+
 message LastCommitInfo {
 	sint32 round = 1 [json_name = "Round"];
 	repeated VoteInfo votes = 2 [json_name = "Votes"];

tm2/pkg/bft/abci/types/params.go

@@ -29,9 +29,14 @@ func (params ConsensusParams) Update(params2 ConsensusParams) ConsensusParams {
 	if params2.Block != nil {
 		res.Block = amino.DeepCopy(params2.Block).(*BlockParams)
 	}
+
 	if params2.Validator != nil {
 		res.Validator = amino.DeepCopy(params2.Validator).(*ValidatorParams)
 	}
 
+	if params2.Account != nil {
+		res.Account = amino.DeepCopy(params2.Account).(*AccountParams)
+	}
+
 	return res
 }

tm2/pkg/bft/abci/types/types.go

@@ -245,6 +245,7 @@ func (err EventString) Event() string {
 type ConsensusParams struct {
 	Block     *BlockParams
 	Validator *ValidatorParams
+	Account   *AccountParams
 }
 
 type BlockParams struct {
@@ -265,6 +266,10 @@ type ValidatorUpdate struct {
 	Power   int64
 }
 
+type AccountParams struct {
+	RestrictedDenoms []string
+}
+
 type LastCommitInfo struct {
 	Round int32
 	Votes []VoteInfo

tm2/pkg/bft/types/params.go

@@ -36,8 +36,9 @@ var validatorPubKeyTypeURLs = map[string]struct{}{
 
 func DefaultConsensusParams() abci.ConsensusParams {
 	return abci.ConsensusParams{
-		DefaultBlockParams(),
-		DefaultValidatorParams(),
+		Block:     DefaultBlockParams(),
+		Validator: DefaultValidatorParams(),
+		Account:   &abci.AccountParams{},
 	}
 }
 
@@ -51,9 +52,9 @@ func DefaultBlockParams() *abci.BlockParams {
 }
 
 func DefaultValidatorParams() *abci.ValidatorParams {
-	return &abci.ValidatorParams{[]string{
-		amino.GetTypeURL(ed25519.PubKeyEd25519{}),
-	}}
+	return &abci.ValidatorParams{
+		PubKeyTypeURLs: []string{amino.GetTypeURL(ed25519.PubKeyEd25519{})},
+	}
 }
 
 func ValidateConsensusParams(params abci.ConsensusParams) error {

tm2/pkg/sdk/auth/ante.go

@@ -363,7 +363,9 @@ func DeductFees(bank BankKeeperI, ctx sdk.Context, acc std.Account, fees std.Coi
 		))
 	}
 
-	err := bank.SendCoins(ctx, acc.GetAddress(), FeeCollectorAddress(), fees)
+	// Sending coins is unrestricted to pay for gas fees, meaning locked accounts can only
+	// send restricted coins to pay for gas.
+	err := bank.SendCoinsUnrestricted(ctx, acc.GetAddress(), FeeCollectorAddress(), fees)
 	if err != nil {
 		return abciResult(err)
 	}

tm2/pkg/sdk/auth/test_common.go

@@ -84,3 +84,7 @@ func (bank DummyBankKeeper) SendCoins(ctx sdk.Context, fromAddr crypto.Address,
 
 	return nil
 }
+
+func (bank DummyBankKeeper) SendCoinsUnrestricted(ctx sdk.Context, fromAddr crypto.Address, toAddr crypto.Address, amt std.Coins) error {
+	return bank.SendCoins(ctx, fromAddr, toAddr, amt)
+}

tm2/pkg/sdk/auth/types.go

@@ -20,4 +20,5 @@ var _ AccountKeeperI = AccountKeeper{}
 // Limited interface only needed for auth.
 type BankKeeperI interface {
 	SendCoins(ctx sdk.Context, fromAddr crypto.Address, toAddr crypto.Address, amt std.Coins) error
+	SendCoinsUnrestricted(ctx sdk.Context, fromAddr crypto.Address, toAddr crypto.Address, amt std.Coins) error
 }