merge with main

Makefile

@@ -16,11 +16,10 @@ test:
 
 test-rosetta-ci:
 	sh ./scripts/simapp-start-node.sh
-	sleep 120
 	make build && make plugin
 	./rosetta --blockchain "cosmos" --network "cosmos" --tendermint "tcp://localhost:26657" --addr "localhost:8080" --grpc "localhost:9090" &
 	sleep 30
-	sh ./tests/rosetta-cli/rosetta-cli-test.sh
+	export SIMD_BIN=./cosmos-sdk/build/simd && sh ./tests/rosetta-cli/rosetta-cli-test.sh
 
 ###############################################################################
 ###                                Linting                                  ###

scripts/simapp-start-node.sh

@@ -3,10 +3,10 @@ git clone https://github.com/cosmos/cosmos-sdk.git
 cd cosmos-sdk
 make build
 export SIMD_BIN=./build/simd
-make init-simapp --dry-run
-echo "simapp started"
+chmod 777 ./scripts/init-simapp.sh
+sh ./scripts/init-simapp.sh --just-print
 $SIMD_BIN start &
-echo "start"
-until curl --silent --head --fail http://localhost:26657/health; do
+until curl --output /dev/null --silent --head --fail http://localhost:26657/health; do
+>>>>>>> 7db5729 (Ci fixed (?))
   sleep 1
 done