Problem: rollback don't work without enable fast node

CHANGELOG.md

@@ -16,6 +16,7 @@
 ### Bug Fixes
 
 - [#814](https://github.com/crypto-org-chain/cronos/pull/814) Fix prometheus metrics.
+- [#833](https://github.com/crypto-org-chain/cronos/pull/833) Fix rollback command.
 
 ### Improvements
 

go.mod

@@ -46,8 +46,8 @@ require (
  github.com/aws/aws-sdk-go v1.40.45 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
- github.com/bgentry/speakeasy v0.1.0 // indirect
- github.com/btcsuite/btcd v0.22.1 // indirect
+ github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
+ github.com/btcsuite/btcd v0.22.2 // indirect
  github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
  github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
  github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
@@ -61,8 +61,8 @@ require (
  github.com/cosmos/btcutil v1.0.5 // indirect
  github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect
  github.com/cosmos/go-bip39 v1.0.0 // indirect
- github.com/cosmos/iavl v0.19.4 // indirect
- github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
+ github.com/cosmos/iavl v0.19.5-rc.1 // indirect
+ github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
  github.com/creachadair/taskgroup v0.3.2 // indirect
  github.com/danieljoos/wincred v1.1.2 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
@@ -159,15 +159,14 @@ require (
  github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969 // indirect
  github.com/subosito/gotenv v1.4.1 // indirect
  github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
- github.com/tendermint/btcd v0.1.1 // indirect
- github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
  github.com/tendermint/go-amino v0.16.0 // indirect
+ github.com/tidwall/btree v1.5.0 // indirect
  github.com/tklauser/go-sysconf v0.3.10 // indirect
  github.com/tklauser/numcpus v0.4.0 // indirect
  github.com/tyler-smith/go-bip39 v1.1.0 // indirect
  github.com/ulikunitz/xz v0.5.8 // indirect
  github.com/zondax/hid v0.9.1 // indirect
- github.com/zondax/ledger-go v0.14.0 // indirect
+ github.com/zondax/ledger-go v0.14.1 // indirect
  go.etcd.io/bbolt v1.3.6 // indirect
  go.opencensus.io v0.23.0 // indirect
  golang.org/x/crypto v0.3.0 // indirect
@@ -191,7 +190,7 @@ require (
 replace (
  // Ref: https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702
  github.com/confio/ics23/go => github.com/confio/ics23/go v0.9.0
- github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.7
+ github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.9-0.20230130122755-5e7dcbcce1e9
  github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable
  github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.2-cronos
 

go.sum

@@ -136,15 +136,17 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
-github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s=
+github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv4JPQ3/M+teHz9Bo5jBpkNcP0x6r7rdihlNL/7tTAs=
-github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
 github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
+github.com/btcsuite/btcd v0.22.2 h1:vBZ+lGGd1XubpOWO67ITJpAEsICWhA0YzqkcpkgNBfo=
+github.com/btcsuite/btcd v0.22.2/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
 github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
@@ -218,17 +220,17 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk=
 github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis=
 github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0=
 github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE=
-github.com/cosmos/cosmos-sdk v0.46.7 h1:dkGy9y2ewgqvawrUOuWb2oz3MdotVduokyreXC4bS0s=
-github.com/cosmos/cosmos-sdk v0.46.7/go.mod h1:fqKqz39U5IlEFb4nbQ72951myztsDzFKKDtffYJ63nk=
+github.com/cosmos/cosmos-sdk v0.46.9-0.20230130122755-5e7dcbcce1e9 h1:hXrnTzoNjZzZpbymFimFwVuxwA83VkBmcmwsgjJ7p+w=
+github.com/cosmos/cosmos-sdk v0.46.9-0.20230130122755-5e7dcbcce1e9/go.mod h1:yjK6RtOTUm/bRJdRGka73Hh0Arl+4vwhsK6miJjvoX8=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
-github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok=
-github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
+github.com/cosmos/iavl v0.19.5-rc.1 h1:4PjF2PdScyPbN1WbXpiQU21YtyonnrMU31xN74g8Rkg=
+github.com/cosmos/iavl v0.19.5-rc.1/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
 github.com/cosmos/ibc-go/v5 v5.2.0 h1:LxwttRQqdUJpQ3/Gc3XPg5lkRo3pcbzx65dxFIY6ONE=
 github.com/cosmos/ibc-go/v5 v5.2.0/go.mod h1:MhDUMDVSboK5JW2pEWHNcw0wJHaHqKV/vwwP7awGhzI=
-github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w=
-github.com/cosmos/ledger-cosmos-go v0.12.1/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g=
+github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA=
+github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -940,14 +942,12 @@ github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNG
 github.com/supranational/blst v0.3.8-0.20220526154634-513d2456b344/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
-github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s=
-github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U=
-github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI=
-github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk=
 github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E=
 github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME=
 github.com/tendermint/tendermint v0.34.24-0.20221110131553-ec471ba27efd h1:ZW2cpDGoeOufAu1lrF+OwQaYBLoCqB7YpmZvdkrrepk=
 github.com/tendermint/tendermint v0.34.24-0.20221110131553-ec471ba27efd/go.mod h1:rXVrl4OYzmIa1I91av3iLv2HS0fGSiucyW9J4aMTpKI=
+github.com/tidwall/btree v1.5.0 h1:iV0yVY/frd7r6qGBXfEYs7DH0gTDgrKTrDjS7xt/IyQ=
+github.com/tidwall/btree v1.5.0/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE=
 github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
@@ -998,8 +998,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8=
 github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
-github.com/zondax/ledger-go v0.14.0 h1:dlMC7aO8Wss1CxBq2I96kZ69Nh1ligzbs8UWOtq/AsA=
-github.com/zondax/ledger-go v0.14.0/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320=
+github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c=
+github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=

gomod2nix.toml

@@ -59,11 +59,11 @@ schema = 3
  version = "v0.0.0-20140422174119-9fd32a8b3d3d"
  hash = "sha256-NDxQzO5C5M/aDz5/pjUHfZUh4VwIXovbb3irtxWCwjY="
  [mod."github.com/bgentry/speakeasy"]
- version = "v0.1.0"
- hash = "sha256-Gt1vj6CFovLnO6wX5u2O4UfecY9V2J9WGw1ez4HMrgk="
+ version = "v0.1.1-0.20220910012023-760eaf8b6816"
+ hash = "sha256-Tx3sPuhsoVwrCfJdIwf4ipn7pD92OQNYvpCxl1Z9Wt0="
  [mod."github.com/btcsuite/btcd"]
- version = "v0.22.1"
- hash = "sha256-hBU+roIELcmbW2Gz7eGZzL9qNA1bakq5wNxqCgs4TKc="
+ version = "v0.22.2"
+ hash = "sha256-TPX7GIArd+bwOdwgPnkHyptpEVGhpkqiAydsO4srOCQ="
  [mod."github.com/btcsuite/btcd/btcec/v2"]
  version = "v2.3.2"
  hash = "sha256-natWs+yIAuD1UI07iZtjPilroQLfXizFn3lNOiOT83U="
@@ -102,21 +102,21 @@ schema = 3
  version = "v1.0.0-beta.1"
  hash = "sha256-oATkuj+fM5eBn+ywO+w/tL0AFSIEkx0J3Yz+VhVe0QA="
  [mod."github.com/cosmos/cosmos-sdk"]
- version = "v0.46.7"
- hash = "sha256-54DCF8lrnA1oUmBJlbUlWXOP5UbenRInUROn5P5I9qI="
+ version = "v0.46.9-0.20230130122755-5e7dcbcce1e9"
+ hash = "sha256-Mh9MYorO+CoqBfEFPbNdPfz9Lebkdwg2KuSFJZOIFCE="
  replaced = "github.com/cosmos/cosmos-sdk"
  [mod."github.com/cosmos/go-bip39"]
  version = "v1.0.0"
  hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA="
  [mod."github.com/cosmos/iavl"]
- version = "v0.19.4"
- hash = "sha256-EmpRZ48pjPFq/fIHneut9Vyo5QJATfb3ZO7KzWnqs9g="
+ version = "v0.19.5-rc.1"
+ hash = "sha256-ArjdhXTJPT4RsOfZ/voQ+XWvMQou3IGTQ14QyHpNm4c="
  [mod."github.com/cosmos/ibc-go/v5"]
  version = "v5.2.0"
  hash = "sha256-Gfqhdz9ZKEgb7LCkHiXCwYZYUYluQ+vMew/GkssfVj8="
  [mod."github.com/cosmos/ledger-cosmos-go"]
- version = "v0.12.1"
- hash = "sha256-9+nr+/r4MyiogddS0JcXOuriPqXP4nxln8ts+mYQRcg="
+ version = "v0.12.2"
+ hash = "sha256-fLkveUWxn0nZzvgsY0KTU/T1TUUQ8Ap6XTYSnJs6XXo="
  [mod."github.com/creachadair/taskgroup"]
  version = "v0.3.2"
  hash = "sha256-Y261IO/d9xjV0UScqHvo31broxvnKn4IQQC9Mu6jNkE="
@@ -449,12 +449,6 @@ schema = 3
  [mod."github.com/syndtr/goleveldb"]
  version = "v1.0.1-0.20210819022825-2ae1ddf74ef7"
  hash = "sha256-36a4hgVQfwtS2zhylKpQuFhrjdc/Y8pF0dxc26jcZIU="
- [mod."github.com/tendermint/btcd"]
- version = "v0.1.1"
- hash = "sha256-QQl2GWZaKQtd+LQrgx2unkTLI1qye57fCWwJcmCXT/0="
- [mod."github.com/tendermint/crypto"]
- version = "v0.0.0-20191022145703-50d29ede1e15"
- hash = "sha256-NkoZ3hKWZt5Hca49I+1g81x1m6aQGELZ/QGLdb3uHm4="
  [mod."github.com/tendermint/go-amino"]
  version = "v0.16.0"
  hash = "sha256-JW4zO/0vMzf1dXLePOqaMtiLUZgNbuIseh9GV+jQlf0="
@@ -466,6 +460,9 @@ schema = 3
  version = "v0.6.8-0.20230118040049-14dc6b00a5b3"
  hash = "sha256-kCe9nqzVgG+7ynuvYAGAOTCPESBnV28dDvRuAtsssbw="
  replaced = "github.com/crypto-org-chain/tm-db"
+ [mod."github.com/tidwall/btree"]
+ version = "v1.5.0"
+ hash = "sha256-iWll4/+ADLVse3VAHxXYLprILugX/+3u0ZIk0YlLv/Q="
  [mod."github.com/tklauser/go-sysconf"]
  version = "v0.3.10"
  hash = "sha256-Zf2NsgM9+HeM949vCce4HQtSbfUiFpeiQ716yKcFyx4="
@@ -483,8 +480,8 @@ schema = 3
  hash = "sha256-PvXtxXo/3C+DS9ZeGBlr4zXbIpaYNtMqLzxYhusFXNY="
  replaced = "github.com/zondax/hid"
  [mod."github.com/zondax/ledger-go"]
- version = "v0.14.0"
- hash = "sha256-RozTPSNs4RerZ4DQMBcGmvREjoRtH1G69xjhccYjIOk="
+ version = "v0.14.1"
+ hash = "sha256-iQmShSaty50yYTbYPNd4fnOyrcEG7P2fWmj+fLJQW4s="
  [mod."go.etcd.io/bbolt"]
  version = "v1.3.6"
  hash = "sha256-DenVAmyN22xUiivk6fdJp4C9ZnUJXCMDUf8E0goRRV4="

integration_tests/configs/broken-cronosd.nix

@@ -0,0 +1,8 @@
+{ pkgs ? import ../../nix { } }:
+let cronosd = (pkgs.callPackage ../../. { });
+in
+cronosd.overrideAttrs (oldAttrs: {
+ patches = oldAttrs.patches or [ ] ++ [
+ ./broken-cronosd.patch
+ ];
+})

integration_tests/configs/broken-cronosd.patch

@@ -0,0 +1,15 @@
+diff --git a/app/app.go b/app/app.go
+index 21eab4d..156fad7 100644
+--- a/app/app.go
++++ b/app/app.go
+@@ -773,6 +773,10 @@ func (app *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.R
+
+ // EndBlocker application updates every end block
+ func (app *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
++ if ctx.BlockHeight() % 10 == 0 {
++ store := ctx.KVStore(app.keys["cronos"])
++ store.Set([]byte("hello"), []byte("world"))
++ }
+ return app.mm.EndBlock(ctx, req)
+ }
+

integration_tests/configs/rollback.jsonnet

@@ -0,0 +1,12 @@
+local config = import 'default.jsonnet';
+
+config {
+ 'cronos_777-1'+: {
+ 'app-config'+: {
+ 'iavl-disable-fastnode': true,
+ },
+ validators: super.validators + [{
+ name: 'fullnode',
+ }],
+ },
+}

integration_tests/cosmoscli.py

@@ -1455,3 +1455,6 @@ def evm_params(self, **kwargs):
  **(default_kwargs | kwargs),
  )
  )
+
+ def rollback(self):
+ self.raw("rollback", home=self.data_dir)

integration_tests/network.py

@@ -152,7 +152,9 @@ def __init__(self, cronos, geth, contract):
  self.contract = contract
 
 
-def setup_custom_cronos(path, base_port, config, post_init=None, chain_binary=None):
+def setup_custom_cronos(
+ path, base_port, config, post_init=None, chain_binary=None, wait_port=True
+):
  cmd = [
  "pystarport",
  "init",
@@ -175,8 +177,9 @@ def setup_custom_cronos(path, base_port, config, post_init=None, chain_binary=No
  preexec_fn=os.setsid,
  )
  try:
- wait_for_port(ports.evmrpc_port(base_port))
- wait_for_port(ports.evmrpc_ws_port(base_port))
+ if wait_port:
+ wait_for_port(ports.evmrpc_port(base_port))
+ wait_for_port(ports.evmrpc_ws_port(base_port))
  yield Cronos(path / "cronos_777-1", chain_binary=chain_binary or "cronosd")
  finally:
  os.killpg(os.getpgid(proc.pid), signal.SIGTERM)

integration_tests/test_rollback.py

@@ -0,0 +1,94 @@
+import configparser
+import subprocess
+from pathlib import Path
+
+import pytest
+from pystarport import ports
+from pystarport.cluster import SUPERVISOR_CONFIG_FILE
+
+from .network import setup_custom_cronos
+from .utils import supervisorctl, wait_for_block, wait_for_port
+
+
+def update_node2_cmd(path, cmd, i):
+ ini_path = path / SUPERVISOR_CONFIG_FILE
+ ini = configparser.RawConfigParser()
+ ini.read(ini_path)
+ for section in ini.sections():
+ if section == f"program:cronos_777-1-node{i}":
+ ini[section].update(
+ {
+ "command": f"{cmd} start --home %(here)s/node{i}",
+ "autorestart": "false", # don't restart when stopped
+ }
+ )
+ with ini_path.open("w") as fp:
+ ini.write(fp)
+
+
+def post_init(broken_binary):
+ def inner(path, base_port, config):
+ chain_id = "cronos_777-1"
+ update_node2_cmd(path / chain_id, broken_binary, 2)
+
+ return inner
+
+
+@pytest.fixture(scope="module")
+def custom_cronos(tmp_path_factory):
+ path = tmp_path_factory.mktemp("rollback")
+
+ cmd = [
+ "nix-build",
+ "--no-out-link",
+ Path(__file__).parent / "configs/broken-cronosd.nix",
+ ]
+ print(*cmd)
+ broken_binary = Path(subprocess.check_output(cmd).strip().decode()) / "bin/cronosd"
+ print(broken_binary)
+
+ # init with genesis binary
+ yield from setup_custom_cronos(
+ path,
+ 26400,
+ Path(__file__).parent / "configs/rollback.jsonnet",
+ post_init=post_init(broken_binary),
+ wait_port=False,
+ )
+
+
+def test_rollback(custom_cronos):
+ """
+ test using rollback command to fix app-hash mismatch situation.
+ - the broken node will sync up to block 10 then crash.
+ - use rollback command to rollback the db.
+ - switch to correct binary should make the node syncing again.
+ """
+ wait_for_port(ports.rpc_port(custom_cronos.base_port(2)))
+
+ print("wait for node2 to sync the first 10 blocks")
+ cli2 = custom_cronos.cosmos_cli(2)
+ wait_for_block(cli2, 10)
+
+ print("wait for a few more blocks on the healthy nodes")
+ cli = custom_cronos.cosmos_cli(0)
+ wait_for_block(cli, 13)
+
+ # (app hash mismatch happens after the 10th block, detected in the 11th block)
+ print("check node2 get stuck at block 10")
+ assert cli2.block_height() == 10
+
+ print("stop node2")
+ supervisorctl(custom_cronos.base_dir / "../tasks.ini", "stop", "cronos_777-1-node2")
+
+ print("do rollback on node2")
+ cli2.rollback()
+
+ print("switch to normal binary")
+ update_node2_cmd(custom_cronos.base_dir, "cronosd", 2)
+ supervisorctl(custom_cronos.base_dir / "../tasks.ini", "update")
+ wait_for_port(ports.rpc_port(custom_cronos.base_port(2)))
+
+ print("check node2 sync again")
+ cli2 = custom_cronos.cosmos_cli(2)
+ wait_for_block(cli2, 15)