Merge branch 'feat/sdk-50' into feat/slinky-bindings

Makefile

@@ -50,7 +50,7 @@ endif
 ifeq ($(WITH_CLEVELDB),yes)
   build_tags += gcc
 endif
-build_tags += $(BUILD_TAGS),muslc
+build_tags += $(BUILD_TAGS)
 build_tags := $(strip $(build_tags))
 
 build_tags_test_binary = $(build_tags)
@@ -111,7 +111,8 @@ build-static-linux-amd64: go.sum $(BUILDDIR)/
 		--build-arg GO_VERSION=$(GO_VERSION) \
 		--build-arg GIT_VERSION=$(VERSION) \
 		--build-arg GIT_COMMIT=$(COMMIT) \
-		--build-arg BUILD_TAGS=$(build_tags_comma_sep) \
+		--build-arg BUILD_TAGS=$(build_tags_comma_sep),muslc \
+		--platform linux/amd64 \
 		-t neutron-amd64 \
 		--load \
 		-f Dockerfile.builder .

network/init.sh

@@ -83,16 +83,11 @@ sed -i -e 's#"tcp://localhost:1317"#"tcp://0.0.0.0:'"$RESTPORT"'"#g' "$CHAIN_DIR
 sed -i -e 's#"tcp://0.0.0.0:1317"#"tcp://0.0.0.0:'"$RESTPORT"'"#g' "$CHAIN_DIR/config/app.toml"
 sed -i -e 's#":8080"#":'"$ROSETTA_1"'"#g' "$CHAIN_DIR/config/app.toml"
 
-# NOTE: we provide prometheus_server_address but it does not matter, since we don't use it, just need non-empty value
-cat <<EOF >> "$CHAIN_DIR/config/app.toml"
-
-[oracle]
-enabled = true
-oracle_address = "$ORACLE_ADDRESS"
-client_timeout = "$ORACLE_CLIENT_TIMEOUT"
-metrics_enabled = $ORACLE_METRICS_ENABLED
-prometheus_server_address = "localhost:12912"
-EOF
+
+sed -i -e 's/oracle_address = "localhost:8080"/oracle_address = '\""$ORACLE_ADDRESS"\"'/g' "$CHAIN_DIR/config/app.toml"
+sed -i -e 's/client_timeout = "2s"/client_timeout = '\""$ORACLE_CLIENT_TIMEOUT"\"'/g' "$CHAIN_DIR/config/app.toml"
+sed -i -e 's/metrics_enabled = true/metrics_enabled = '\""$ORACLE_METRICS_ENABLED"\"'/g' "$CHAIN_DIR/config/app.toml"
+
 
 GENESIS_FILE="$CHAIN_DIR/config/genesis.json"