feat: network upgrade v0.36.0 (#1952)

initialize feegrant keeper reference for feegrant decorator

Signed-off-by: Artur Troian <troian.ap@gmail.com>

Author: troian

app/ante.go

@@ -53,6 +53,10 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "custom akash governance keeper is required for ante builder")
 	}
 
+	if options.FeegrantKeeper == nil {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "akash feegrant keeper is required for ante builder")
+	}
+
 	anteDecorators := []sdk.AnteDecorator{
 		ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
 		ante.NewRejectExtensionOptionsDecorator(),

app/app.go

@@ -452,6 +452,7 @@ func NewApp(
 		HandlerOptions: ante.HandlerOptions{
 			AccountKeeper:   app.Keepers.Cosmos.Acct,
 			BankKeeper:      app.Keepers.Cosmos.Bank,
+			FeegrantKeeper:  app.Keepers.Cosmos.FeeGrant,
 			SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
 			SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
 		},

make/test-upgrade.mk

@@ -37,7 +37,7 @@ test: $(COSMOVISOR) init
 		-config=test-config.json \
 		-upgrade-name=$(UPGRADE_TO) \
 		-upgrade-version="$(UPGRADE_BINARY_VERSION)" \
-		-test-cases=upgrade-$(UPGRADE_TO).json
+		-test-cases=test-cases.json
 
 .PHONY: test-reset
 test-reset:

meta.json

@@ -29,6 +29,11 @@
             "skipped": false,
             "from_binary": "v0.32.3",
             "from_version": "v0.32.0"
+        },
+        "v0.36.0": {
+            "skipped": false,
+            "from_binary": "v0.34.1",
+            "from_version": "v0.34.0"
         }
     }
 }

tests/upgrade/test-cases.json

@@ -0,0 +1,58 @@
+{
+    "v0.36.0": {
+    },
+    "v0.34.0": {
+        "migrations": {
+        }
+    },
+    "v0.32.0": {
+        "migrations": {
+            "market": {
+                "from": "4",
+                "to": "5"
+            }
+        }
+    },
+    "v0.30.0": {
+    },
+    "v0.28.0": {
+        "migrations": {
+            "market": {
+                "from": "3",
+                "to": "4"
+            }
+        }
+    },
+    "v0.26.0": {
+        "modules": {
+            "added": [
+            ]
+        },
+        "migrations": {
+        }
+    },
+    "v0.24.0": {
+        "modules": {
+            "added": [
+                "agov",
+                "astaking",
+                "feegrant",
+                "take"
+            ]
+        },
+        "migrations": {
+            "deployment": {
+                "from": "2",
+                "to": "3"
+            },
+            "market": {
+                "from": "2",
+                "to": "3"
+            },
+            "transfer": {
+                "from": "1",
+                "to": "2"
+            }
+        }
+    }
+}