refactor: really remove globalfee

cmd/spawn/new_chain.go

@@ -25,7 +25,6 @@ var (
 
 	SupportedFeatures = append(ConsensusFeatures, items{
 		{ID: "tokenfactory", IsSelected: true, Details: "Native token minting, sending, and burning on the chain"},
-		{ID: "globalfee", IsSelected: true, Details: "Static minimum fee(s) for all transactions, controlled by governance"},
 		{ID: "ibc-packetforward", IsSelected: true, Details: "Packet forwarding"},
 		{ID: "ibc-ratelimit", IsSelected: false, Details: "Thresholds for outflow as a percent of total channel value"},
 		{ID: "cosmwasm", IsSelected: false, Details: "Cosmos smart contracts"},
@@ -81,7 +80,7 @@ var newChain = &cobra.Command{
 	Short: "Create a new project",
 	Example: fmt.Sprintf(
 		`  - spawn new rollchain --consensus=proof-of-stake --%s=cosmos --%s=simd --%s=token --org=abcde
-  - spawn new rollchain --consensus=proof-of-authority --%s=tokenfactory,globalfee
+  - spawn new rollchain --consensus=proof-of-authority --%s=tokenfactory
   - spawn new rollchain --consensus=interchain-security --%s=cosmwasm --%s
   - spawn new rollchain --%s`,
 		FlagWalletPrefix, FlagBinDaemon, FlagTokenDenom, FlagDisabled, FlagDisabled, FlagNoGit, FlagBypassPrompt,

cmd/spawn/new_chain_test.go

@@ -41,8 +41,8 @@ func TestDisabledGeneration(t *testing.T) {
 		},
 		{
 			Name:          "stdmix1",
-			Disabled:      []string{spawn.GlobalFee, spawn.Ignite, spawn.TokenFactory},
-			NotContainAny: []string{"TokenFactoryKeeper", "GlobalFeeKeeper"},
+			Disabled:      []string{spawn.Ignite, spawn.TokenFactory},
+			NotContainAny: []string{"TokenFactoryKeeper"},
 		},
 		{
 			Name:          "nocw",

docs/versioned_docs/version-v0.50.x/03-demos/01-demo.md

@@ -30,7 +30,7 @@ spawn new rollchain \
 --bech32=roll \
 --denom=uroll \
 --bin=rolld \
---disabled=cosmwasm,globalfee,block-explorer \
+--disabled=cosmwasm,block-explorer \
 --org=${GITHUB_USERNAME}
 ```
 

scripts/matrix_generator.py

@@ -11,7 +11,6 @@
 
 SupportedFeatures = [
     "tokenfactory",
-    "globalfee",
     "ibc-packetforward",
     "ibc-ratelimit",
     "cosmwasm",
@@ -84,7 +83,7 @@ def main():
         CmdCreator(
             "randmixone",
             POS,
-            "globalfee,wasmlc,ignite".split(","),
+            "wasmlc,ignite".split(","),
             random_string(5, True),
             f"{random_string(6, True)}",
             f"u{random_string(5, True)}",
@@ -130,7 +129,7 @@ def main():
         CmdCreator(
             "randmixfive",
             POS,
-            "globalfee,ibc-ratelimit".split(","),
+            "ibc-ratelimit".split(","),
             random_string(5, True),
             f"{random_string(6, True)}",
             f"u{random_string(5, True)}",
@@ -141,7 +140,7 @@ def main():
         CmdCreator(
             "mywlcnocw",
             POS,
-            "tokenfactory,globalfee,ibc-packetforward,cosmwasm".split(","),
+            "tokenfactory,ibc-packetforward,cosmwasm".split(","),
             random_string(5, True),
             f"{random_string(6, True)}",
             f"u{random_string(5, True)}",

spawn/cfg_test.go

@@ -19,18 +19,18 @@ func TestDisabled(t *testing.T) {
 	testCases := []tcase{
 		{
 			name:     "same",
-			disabled: []string{"poa", "globalfee", "cosmwasm"},
-			expected: []string{"poa", "globalfee", "cosmwasm"},
+			disabled: []string{"poa", "cosmwasm"},
+			expected: []string{"poa", "cosmwasm"},
 		},
 		{
 			name:     "remove poa duplicate",
-			disabled: []string{"poa", "globalfee", "cosmwasm", "poa"},
-			expected: []string{"poa", "globalfee", "cosmwasm"},
+			disabled: []string{"poa", "cosmwasm", "poa"},
+			expected: []string{"poa", "cosmwasm"},
 		},
 		{
-			name:     "remove poa and globalfee duplicate",
-			disabled: []string{"poa", "globalfee", "cosmwasm", "poa", "globalfee"},
-			expected: []string{"poa", "globalfee", "cosmwasm"},
+			name:     "remove poa duplicate",
+			disabled: []string{"poa", "cosmwasm", "poa"},
+			expected: []string{"poa", "cosmwasm"},
 		},
 		{
 			name:     "panic due to invalid disabled feature",
@@ -87,13 +87,13 @@ func TestNormalizedNames(t *testing.T) {
 	testCases := []tcase{
 		{
 			name:     "normal for both",
-			disabled: []string{spawn.POA, spawn.GlobalFee, spawn.CosmWasm},
-			expected: []string{spawn.POA, spawn.GlobalFee, spawn.CosmWasm},
+			disabled: []string{spawn.POA, spawn.CosmWasm},
+			expected: []string{spawn.POA, spawn.CosmWasm},
 		},
 		{
 			name:     "fix-all",
-			disabled: []string{"proof-of-authority", "global-fee", "cw"},
-			expected: []string{spawn.POA, spawn.GlobalFee, spawn.CosmWasm},
+			disabled: []string{"proof-of-authority", "cw"},
+			expected: []string{spawn.POA, spawn.CosmWasm},
 		},
 		{
 			name:     "remove duplicate",

spawn/remove_features.go

@@ -14,7 +14,6 @@ var (
 	TokenFactory        = "tokenfactory"
 	POA                 = "poa"
 	POS                 = "staking" // if ICS is used, we remove staking
-	GlobalFee           = "globalfee"
 	CosmWasm            = "cosmwasm"
 	WasmLC              = "wasmlc"
 	PacketForward       = "packetforward"
@@ -30,7 +29,7 @@ var (
 
 // used for fuzz testing
 var AllFeatures = []string{
-	TokenFactory, POA, GlobalFee, CosmWasm, WasmLC,
+	TokenFactory, POA, CosmWasm, WasmLC,
 	PacketForward, IBCRateLimit, Ignite, InterchainSecurity, POS,
 }
 
@@ -44,8 +43,6 @@ func AliasName(name string) string {
 		return POA
 	case POS, "proof-of-stake", "staking", "pos":
 		return POS
-	case GlobalFee, "global-fee":
-		return GlobalFee
 	case CosmWasm, "wasm", "cw":
 		return CosmWasm
 	case WasmLC, "wasm-lc", "cwlc", "cosmwasm-lc", "wasm-light-client",
@@ -85,8 +82,6 @@ func (fc *FileContent) RemoveDisabledFeatures(cfg *NewChainConfig) {
 		// modules
 		case TokenFactory:
 			fc.RemoveTokenFactory()
-		case GlobalFee:
-			fc.RemoveGlobalFee()
 		case CosmWasm:
 			fc.RemoveCosmWasm(!cfg.IsFeatureEnabled(WasmLC))
 		case WasmLC:
@@ -156,23 +151,6 @@ func (fc *FileContent) RemovePOA() {
 	fc.DeleteFile(path.Join("interchaintest", "poa.go")) // helpers
 }
 
-func (fc *FileContent) RemoveGlobalFee() {
-	text := "globalfee"
-	fc.RemoveGoModImport("github.com/strangelove-ventures/globalfee")
-
-	fc.HandleAllTagged(text)
-
-	fc.RemoveModuleFromText(text,
-		appGo,
-		appAnte,
-		path.Join("scripts", "test_node.sh"),
-		path.Join("scripts", "test_ics_node.sh"),
-		path.Join("interchaintest", "setup.go"),
-	)
-
-	fc.RemoveModuleFromText("GlobalFee", appGo)
-}
-
 func (fc *FileContent) RemoveCosmWasm(isWasmClientDisabled bool) {
 	text := "wasm"
 	fc.RemoveGoModImport("github.com/CosmWasm/wasmd")