Skip to content

Commit 0ef362c

Browse files
beer-1beer-1
authored
Merge pull request #15 from initia-labs/feat/rollback
Feat/rollback
2 parents e02fc92 + f941875 commit 0ef362c

File tree

6 files changed

+45
-131
lines changed

6 files changed

+45
-131
lines changed

‎app/app.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,16 @@ func NewMinitiaApp(
376376
apphook.NewWasmBridgeHook(ac, app.WasmKeeper).Hook,
377377
app.MsgServiceRouter(),
378378
authorityAddr,
379+
ac,
379380
vc,
380381
cc,
381382
)
382383

384+
err = app.RegisterExecutorChangePlans()
385+
if err != nil {
386+
panic(err)
387+
}
388+
383389
// get skipUpgradeHeights from the app options
384390
skipUpgradeHeights := map[int64]bool{}
385391
for _, h := range cast.ToIntSlice(appOpts.Get(server.FlagUnsafeSkipUpgrades)) {

‎app/executor_change.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package app
2+
3+
// Executor change plans
4+
5+
func (app *MinitiaApp) RegisterExecutorChangePlans() error {
6+
// err := app.OPChildKeeper.RegisterExecutorChangePlan(
7+
// 1,
8+
// 361,
9+
// "initvaloper158x0dpu5f4x703fhtseg5kpytsj02hw04qyw0t",
10+
// "init158x0dpu5f4x703fhtseg5kpytsj02hw0p9ahpm",
11+
// "op2",
12+
// "{\"@type\":\"/cosmos.crypto.ed25519.PubKey\",\"key\":\"GTJEksmVK7gkzPXdj+YIJxipfJ+yYUlc6jzIuh9s2t0=\"}",
13+
// "testestestestsetsetestsetest",
14+
// )
15+
16+
// if err != nil {
17+
// return err
18+
// }
19+
20+
return nil
21+
}

‎cmd/minitiad/genvalidators.go

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎cmd/minitiad/root.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ import (
4343

4444
"github.com/initia-labs/initia/app/params"
4545
minitiaapp "github.com/initia-labs/miniwasm/app"
46+
47+
opchildcli "github.com/initia-labs/OPinit/x/opchild/client/cli"
4648
)
4749

4850
// NewRootCmd creates a new root command for initiad. It is called once in the
@@ -183,7 +185,7 @@ func genesisCommand(encodingConfig params.EncodingConfig, basicManager module.Ba
183185

184186
cmd.AddCommand(
185187
genutilcli.AddGenesisAccountCmd(minitiaapp.DefaultNodeHome, ac),
186-
AddGenesisValidatorCmd(basicManager, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, minitiaapp.DefaultNodeHome),
188+
opchildcli.AddGenesisValidatorCmd(basicManager, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, minitiaapp.DefaultNodeHome),
187189
genutilcli.ValidateGenesisCmd(basicManager),
188190
genutilcli.GenTxCmd(basicManager, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, minitiaapp.DefaultNodeHome, ac),
189191
)

‎go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ require (
3232
github.com/golang/protobuf v1.5.4
3333
github.com/gorilla/mux v1.8.1
3434
github.com/grpc-ecosystem/grpc-gateway v1.16.0
35-
github.com/initia-labs/OPinit v0.2.2
36-
github.com/initia-labs/initia v0.2.3
35+
github.com/initia-labs/OPinit v0.2.3-0.20240404023002-8608273959a8
36+
github.com/initia-labs/initia v0.2.2
3737
github.com/pkg/errors v0.9.1
3838
github.com/prometheus/client_golang v1.18.0
3939
github.com/rakyll/statik v0.1.7
@@ -69,6 +69,7 @@ require (
6969
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
7070
github.com/bits-and-blooms/bitset v1.13.0 // indirect
7171
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
72+
github.com/celestiaorg/go-square v1.0.1 // indirect
7273
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
7374
github.com/cespare/xxhash v1.1.0 // indirect
7475
github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -141,6 +142,7 @@ require (
141142
github.com/iancoleman/strcase v0.3.0 // indirect
142143
github.com/improbable-eng/grpc-web v0.15.0 // indirect
143144
github.com/inconshreveable/mousetrap v1.1.0 // indirect
145+
github.com/initia-labs/OPinit/api v0.0.0-20240404023002-8608273959a8 // indirect
144146
github.com/jmespath/go-jmespath v0.4.0 // indirect
145147
github.com/jmhodges/levigo v1.0.0 // indirect
146148
github.com/klauspost/compress v1.17.7 // indirect
@@ -217,8 +219,8 @@ require (
217219
replace (
218220
// use cosmos fork of keyring
219221
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
222+
github.com/cometbft/cometbft => github.com/initia-labs/cometbft v0.0.0-20240404091408-238cddd887d3
220223

221-
github.com/cometbft/cometbft => github.com/initia-labs/cometbft v0.0.0-20240104081544-34081fc84daf
222224
github.com/cosmos/cosmos-sdk => github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21
223225

224226
github.com/cosmos/iavl => github.com/initia-labs/iavl v0.0.0-20240208034922-5d81c449d4c0
@@ -233,7 +235,6 @@ replace (
233235
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1
234236

235237
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
236-
237238
// Downgraded to avoid bugs in following commits which caused simulations to fail.
238239
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
239240
)

‎go.sum

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,8 @@ github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1
296296
github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
297297
github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
298298
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
299+
github.com/celestiaorg/go-square v1.0.1 h1:LEG1zrw4i03VBMElQF8GAbKYgh1bT1uGzWxasU2ePuo=
300+
github.com/celestiaorg/go-square v1.0.1/go.mod h1:XMv5SGCeGSkynW2OOsedugaW/rQlvzxGzWGxTKsyYOU=
299301
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
300302
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
301303
github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
@@ -728,16 +730,18 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
728730
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
729731
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
730732
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
731-
github.com/initia-labs/OPinit v0.2.2 h1:lcBQCQcn7zgkpQaKqIfNLaj15Dy6qSDYv62/XJ1iISE=
732-
github.com/initia-labs/OPinit v0.2.2/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
733-
github.com/initia-labs/cometbft v0.0.0-20240104081544-34081fc84daf h1:7k3u0huB7OpiDfQKnfcwKUvByl7HyYs3itgROO/YpFg=
734-
github.com/initia-labs/cometbft v0.0.0-20240104081544-34081fc84daf/go.mod h1:PIi48BpzwlHqtV3mzwPyQgOyOnU94BNBimLS2ebBHOg=
733+
github.com/initia-labs/OPinit v0.2.3-0.20240404023002-8608273959a8 h1:d4Wz4h9q/Kc+tmwP+S6Ra1aCTJKUDb0g2w2V5Z5uFuM=
734+
github.com/initia-labs/OPinit v0.2.3-0.20240404023002-8608273959a8/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
735+
github.com/initia-labs/OPinit/api v0.0.0-20240404023002-8608273959a8 h1:Wk/SJ6RCGA34Sr0i0t+pXL+cVreaptuuHFuWDO9KVu4=
736+
github.com/initia-labs/OPinit/api v0.0.0-20240404023002-8608273959a8/go.mod h1:ASCaZChzhQenOxDLIBicEgi5drhMV3YjPxzV29nGvwM=
737+
github.com/initia-labs/cometbft v0.0.0-20240404091408-238cddd887d3 h1:IX3182+BZ8ksVtAdIlU9ub01dmSAM9lvjHuUz9GWzjc=
738+
github.com/initia-labs/cometbft v0.0.0-20240404091408-238cddd887d3/go.mod h1:qv+nhSohSXLgU45IxHDGM5x4+bG4khsqqyn+e0iEbfo=
735739
github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21 h1:AwqnO5IR+3LWzjqR33MzOkce38ExWLtQwlqrLZVrMyw=
736740
github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21/go.mod h1:oV/k6GJgXV9QPoM2fsYDPPsyPBgQbdotv532O6Mz1OQ=
737741
github.com/initia-labs/iavl v0.0.0-20240208034922-5d81c449d4c0 h1:GQ7/UD5mB6q104roqZK5jxb6ff9sBk0/uwFxgERQIaU=
738742
github.com/initia-labs/iavl v0.0.0-20240208034922-5d81c449d4c0/go.mod h1:CmTGqMnRnucjxbjduneZXT+0vPgNElYvdefjX2q9tYc=
739-
github.com/initia-labs/initia v0.2.3 h1:btg3UoX6oy7LOcsy03rZaYmxDk5RvOyBY+hQ4EtuxUg=
740-
github.com/initia-labs/initia v0.2.3/go.mod h1:xLkPASIv+6EuE7BHCxB3ag2K9+rUwJ/6AC5fkYmSejw=
743+
github.com/initia-labs/initia v0.2.2 h1:qbHs7TO9coC2iEMBKbmF5JoosbiGvs/TIve6nWOCQyE=
744+
github.com/initia-labs/initia v0.2.2/go.mod h1:oSWtBjAI9hA8umlp1patsSzqlUL4aSymwRnC+WxHhQA=
741745
github.com/initia-labs/movevm v0.2.2 h1:T0FwprEEDWhNfPREthNDvRr+IGg9N7eQg+zXvT8V/U4=
742746
github.com/initia-labs/movevm v0.2.2/go.mod h1:1EyJ06+Hn43MfaXZ+30a2gmhS5zjqiFF8oSF5CHai28=
743747
github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFonzls=

0 commit comments

Comments
 (0)