update recent comet & panic error when RegisterExecutorChangePlans in…

…correctly set
initia-labs · Apr 3, 2024 · 2ad9a7e · 2ad9a7e
1 parent c588c63
commit 2ad9a7e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/app/app.go b/app/app.go
@@ -381,7 +381,10 @@ func NewMinitiaApp(
 		cc,
 	)
 
-	app.RegisterExecutorChangePlans()
+	err = app.RegisterExecutorChangePlans()
+	if err != nil {
+		panic(err)
+	}
 
 	// get skipUpgradeHeights from the app options
 	skipUpgradeHeights := map[int64]bool{}

diff --git a/app/executor_change.go b/app/executor_change.go
@@ -3,18 +3,19 @@ package app
 // Executor change plans
 
 func (app *MinitiaApp) RegisterExecutorChangePlans() error {
-	// err := app.OPChildKeeper.RegisterExecutorChangePlan(
-	// 	1,
-	// 	153,
-	// 	"init158x0dpu5f4x703fhtseg5kpytsj02hw0p9ahpm",
-	// 	"op2",
-	// 	"GTJEksmVK7gkzPXdj+YIJxipfJ+yYUlc6jzIuh9s2t0=",
-	// 	"testestestestsetsetestsetest",
-	// )
+	err := app.OPChildKeeper.RegisterExecutorChangePlan(
+		1,
+		361,
+		"initvaloper158x0dpu5f4x703fhtseg5kpytsj02hw04qyw0t",
+		"init158x0dpu5f4x703fhtseg5kpytsj02hw0p9ahpm",
+		"op2",
+		"{\"@type\":\"/cosmos.crypto.ed25519.PubKey\",\"key\":\"GTJEksmVK7gkzPXdj+YIJxipfJ+yYUlc6jzIuh9s2t0=\"}",
+		"testestestestsetsetestsetest",
+	)
 
-	// if err != nil {
-	// 	return err
-	// }
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/golang/protobuf v1.5.4
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/initia-labs/OPinit v0.2.2-0.20240326110012-c9784a2d7baa
+	github.com/initia-labs/OPinit v0.2.2-0.20240403083804-4822c74aaf44
 	github.com/initia-labs/initia v0.2.2
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.18.0
@@ -142,7 +142,7 @@ require (
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/initia-labs/OPinit/api v0.0.0-20240326110012-c9784a2d7baa // indirect
+	github.com/initia-labs/OPinit/api v0.0.0-20240403083804-4822c74aaf44 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.7 // indirect
@@ -219,7 +219,7 @@ require (
 replace (
 	// use cosmos fork of keyring
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
-	github.com/cometbft/cometbft => github.com/initia-labs/cometbft v0.0.0-20240329070743-a3d01c08e362
+	github.com/cometbft/cometbft => github.com/initia-labs/cometbft v0.0.0-20240403092330-f3837726ba40
 
 	github.com/cosmos/cosmos-sdk => github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21
 

diff --git a/go.sum b/go.sum
@@ -730,12 +730,12 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/initia-labs/OPinit v0.2.2-0.20240326110012-c9784a2d7baa h1:G9Kv6aPj1OL7TslFxuA0jm6KN0D3amXvyUMYdJIJiSA=
-github.com/initia-labs/OPinit v0.2.2-0.20240326110012-c9784a2d7baa/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
-github.com/initia-labs/OPinit/api v0.0.0-20240326110012-c9784a2d7baa h1:KX1T38Rtxda2OHgeMTNxvlEr3zEpOMkJKhIoS8EZL/0=
-github.com/initia-labs/OPinit/api v0.0.0-20240326110012-c9784a2d7baa/go.mod h1:ASCaZChzhQenOxDLIBicEgi5drhMV3YjPxzV29nGvwM=
-github.com/initia-labs/cometbft v0.0.0-20240329070743-a3d01c08e362 h1:Q4I+AsOW0W2HvCRkQm146N2/vUXAr0DBflTb5mKcYsQ=
-github.com/initia-labs/cometbft v0.0.0-20240329070743-a3d01c08e362/go.mod h1:ZMli4+rR21WUDz8NKoULmJttTi76s5Jg7LS0AJPenlc=
+github.com/initia-labs/OPinit v0.2.2-0.20240403083804-4822c74aaf44 h1:yCWTpgZ6OBkFsnGRV46mGCAd3lPpLAKgdcg4r+mayEg=
+github.com/initia-labs/OPinit v0.2.2-0.20240403083804-4822c74aaf44/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
+github.com/initia-labs/OPinit/api v0.0.0-20240403083804-4822c74aaf44 h1:F3ZfAGt1Wa+PIUD5p039eY90eiAWBzk6lHQoy8iqz+4=
+github.com/initia-labs/OPinit/api v0.0.0-20240403083804-4822c74aaf44/go.mod h1:ASCaZChzhQenOxDLIBicEgi5drhMV3YjPxzV29nGvwM=
+github.com/initia-labs/cometbft v0.0.0-20240403092330-f3837726ba40 h1:qZP7RKmIdO/cRtorFxaIob5h/0NP3sfm8UVTGN0JSQw=
+github.com/initia-labs/cometbft v0.0.0-20240403092330-f3837726ba40/go.mod h1:U88FpkeAJiOV0IL+8ZtBhfvWXUcV31dHgMEKKwVEHos=
 github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21 h1:AwqnO5IR+3LWzjqR33MzOkce38ExWLtQwlqrLZVrMyw=
 github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21/go.mod h1:oV/k6GJgXV9QPoM2fsYDPPsyPBgQbdotv532O6Mz1OQ=
 github.com/initia-labs/iavl v0.0.0-20240208034922-5d81c449d4c0 h1:GQ7/UD5mB6q104roqZK5jxb6ff9sBk0/uwFxgERQIaU=