From 017da4c0d59188ba848a1b021a14ad8226d080a4 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 19 Mar 2023 00:24:16 +0700 Subject: [PATCH 1/4] scripts should run equally well on mac and linux --- scripts/statesync.bash | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/statesync.bash b/scripts/statesync.bash index 719340aa..b0c163f9 100755 --- a/scripts/statesync.bash +++ b/scripts/statesync.bash @@ -32,9 +32,6 @@ else fi -# Set minimum gas price. -# ADD SPACE IF RUN ON MAC -sed -i'' 's/minimum-gas-prices = ""/minimum-gas-prices = "0.0025uwhale"/' "$HOME/.migalood/config/app.toml" # Get "trust_hash" and "trust_height". INTERVAL=1000 @@ -60,4 +57,4 @@ export MIGALOOD_P2P_SEEDS # Start chain. -migalood start --x-crisis-skip-assert-invariants --minimum-gas-prices 0.00001uwhale \ No newline at end of file +migalood start --x-crisis-skip-assert-invariants --minimum-gas-prices 0.00001uwhale From 90e3dab7d5d72af98a5a2b86523e8057250718a1 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 19 Mar 2023 00:28:36 +0700 Subject: [PATCH 2/4] add ports to bash script --- scripts/statesync.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/statesync.bash b/scripts/statesync.bash index b0c163f9..a98e8a96 100755 --- a/scripts/statesync.bash +++ b/scripts/statesync.bash @@ -47,7 +47,7 @@ echo "trust_hash: $TRUST_HASH" export MIGALOOD_STATESYNC_ENABLE=true export MIGALOOD_P2P_MAX_NUM_OUTBOUND_PEERS=200 # replace the url below with a working one, get it from chain registry -export MIGALOOD_STATESYNC_RPC_SERVERS="https://whitewhale-mainnet-rpc.autostake.net:443,https://rpc-whitewhale.goldenratiostaking.net,https://whitewhale-rpc.lavenderfive.com,https://rpc-whitewhale.carbonzero.zone:443,https://rpc-whitewhale.whispernode.com:443,https://migaloo-rpc.kleomedes.network:443" +export MIGALOOD_STATESYNC_RPC_SERVERS="https://whitewhale-mainnet-rpc.autostake.net:443,https://rpc-whitewhale.goldenratiostaking.net:443,https://whitewhale-rpc.lavenderfive.com:443,https://rpc-whitewhale.carbonzero.zone:443,https://rpc-whitewhale.whispernode.com:443,https://migaloo-rpc.kleomedes.network:443" export MIGALOOD_STATESYNC_TRUST_HEIGHT=$BLOCK_HEIGHT export MIGALOOD_STATESYNC_TRUST_HASH=$TRUST_HASH From 8dff9b54b75c1cfb4f4f62f501822808b42383a2 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 19 Mar 2023 00:38:40 +0700 Subject: [PATCH 3/4] fix lints discovered by golangci-lint 1.52.0 --- app/app_test.go | 2 +- app/test_helpers.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/app_test.go b/app/app_test.go index 936a6163..162de7bb 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -119,7 +119,7 @@ func TestGetEnabledProposals(t *testing.T) { } } -func SetupGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, opts []wasm.Option, app *MigalooApp, balances ...banktypes.Balance) GenesisState { +func SetupGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, _ []wasm.Option, app *MigalooApp, balances ...banktypes.Balance) GenesisState { genesisState := NewDefaultGenesisState() // set genesis accounts authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs) diff --git a/app/test_helpers.go b/app/test_helpers.go index a8e77f93..ad0f4347 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -489,7 +489,7 @@ func NewPubKeyFromHex(pk string) (res cryptotypes.PubKey) { type EmptyBaseAppOptions struct{} // Get implements AppOptions -func (ao EmptyBaseAppOptions) Get(o string) interface{} { +func (ao EmptyBaseAppOptions) Get(_ string) interface{} { return nil } From b48910476e396cfdb249db3ceb9c63a5eb768e88 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 19 Mar 2023 00:44:17 +0700 Subject: [PATCH 4/4] bump mev-tendermint --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3cad3803..c0d5bf33 100644 --- a/go.mod +++ b/go.mod @@ -175,8 +175,8 @@ replace ( // the following version across all dependencies. github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - // use mev-tendermint v0.34.25 - github.com/tendermint/tendermint => github.com/skip-mev/mev-tendermint v0.34.25-mev.15 + // use mev-tendermint v0.34.26 + github.com/tendermint/tendermint => github.com/skip-mev/mev-tendermint v0.34.26-mev.16 // tmdb enforcement github.com/tendermint/tm-db => github.com/tendermint/tm-db v0.6.8-0.20221109095132-774cdfe7e6b0 ) diff --git a/go.sum b/go.sum index 28b42baf..08837ef3 100644 --- a/go.sum +++ b/go.sum @@ -1043,8 +1043,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/skip-mev/mev-tendermint v0.34.25-mev.15 h1:zIsAQjX4SjiOaAOUVJ8D5lAepp0SQ9sZJfUmiT9tOK8= -github.com/skip-mev/mev-tendermint v0.34.25-mev.15/go.mod h1:GJ5BRPwN8iO7m4F06CScEwyYas2L5hIU1273T0GURKo= +github.com/skip-mev/mev-tendermint v0.34.26-mev.16 h1:ziFoF6MA8vbxLWNnitUSLzBjtNY1VOuXZIkyFqZLhSE= +github.com/skip-mev/mev-tendermint v0.34.26-mev.16/go.mod h1:AtuyIGbqSSYFBJc2GsZ6wO537bJVtyWUj/oGT2f1Kd8= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=