- merge fixes

classic-terra · Dec 7, 2024 · 85514a5 · 85514a5
1 parent b5fbe60
commit 85514a5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 47 deletions.
diff --git a/app/app.go b/app/app.go
@@ -60,6 +60,7 @@ import (
 	v8_3 "github.com/classic-terra/core/v3/app/upgrades/v8_3"
 
 	// v9 had been used by tax2gas and has to be skipped
+	v10_1 "github.com/classic-terra/core/v3/app/upgrades/v10_1"
 
 	customante "github.com/classic-terra/core/v3/custom/auth/ante"
 	custompost "github.com/classic-terra/core/v3/custom/auth/post"
@@ -93,6 +94,7 @@ var (
 		v8_1.Upgrade,
 		v8_2.Upgrade,
 		v8_3.Upgrade,
+		v10_1.Upgrade,
 	}
 
 	// Forks defines forks to be applied to the network

diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go
diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go
diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go