Merge pull request cosmos#312 from CosmWasm/single_binary_308

Integrate wasmcli into wasmd
notional-labs · Nov 17, 2020 · 06cd063 · 06cd063
2 parents 93761ea + ca040da
commit 06cd063
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 237 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,6 @@ docs/node_modules
 # Data - ideally these don't exist
 baseapp/data/*
 client/lcd/keys/*
-cmd/wasmcli/statik/statik.go
 mytestnet
 
 # Testing

diff --git a/Dockerfile b/Dockerfile
@@ -39,12 +39,9 @@ RUN LEDGER_ENABLED=false BUILD_TAGS=muslc make build-gaiaflex
 FROM alpine:3.12
 
 COPY --from=go-builder /code/build/wasmd /usr/bin/wasmd
-COPY --from=go-builder /code/build/wasmcli /usr/bin/wasmcli
 
 # testnet
-COPY --from=go-builder /code/build/coral /usr/bin/coral
 COPY --from=go-builder /code/build/corald /usr/bin/corald
-COPY --from=go-builder /code/build/gaiaflex /usr/bin/gaiaflex
 COPY --from=go-builder /code/build/gaiaflexd /usr/bin/gaiaflexd
 
 COPY docker/* /opt/

diff --git a/Makefile b/Makefile
@@ -54,7 +54,6 @@ build_tags_comma_sep := $(subst $(empty),$(comma),$(build_tags))
 
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=wasm \
 		  -X github.com/cosmos/cosmos-sdk/version.AppName=wasmd \
-		  -X github.com/CosmWasm/wasmd/cmd/wasmcli/version.ClientName=wasmcli \
 		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 		  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
 		  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
@@ -67,10 +66,8 @@ ldflags := $(strip $(ldflags))
 
 coral_ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=coral \
 				  -X github.com/cosmos/cosmos-sdk/version.AppName=corald \
-				  -X github.com/CosmWasm/wasmd/cmd/wasmcli/version.ClientName=coral \
 				  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 				  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-				  -X github.com/CosmWasm/wasmd/app.CLIDir=.coral \
 				  -X github.com/CosmWasm/wasmd/app.NodeDir=.corald \
 				  -X github.com/CosmWasm/wasmd/app.Bech32Prefix=coral \
 				  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
@@ -82,11 +79,9 @@ coral_ldflags := $(strip $(coral_ldflags))
 
 flex_ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=gaiaflex \
 				  -X github.com/cosmos/cosmos-sdk/version.AppName=gaiaflexd \
-				  -X github.com/CosmWasm/wasmd/cmd/wasmcli/version.ClientName=gaiaflex \
 				  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 				  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
 				  -X github.com/CosmWasm/wasmd/app.ProposalsEnabled=true \
-				  -X github.com/CosmWasm/wasmd/app.CLIDir=.gaiaflex \
 				  -X github.com/CosmWasm/wasmd/app.NodeDir=.gaiaflexd \
 				  -X github.com/CosmWasm/wasmd/app.Bech32Prefix=cosmos \
 				  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
@@ -102,29 +97,23 @@ all: install lint test
 
 build: go.sum
 ifeq ($(OS),Windows_NT)
-	# wasmd nodes not supported on windows, maybe the cli?
-	go build -mod=readonly $(BUILD_FLAGS) -o build/wasmcli.exe ./cmd/wasmcli
+	exit 1
 else
 	go build -mod=readonly $(BUILD_FLAGS) -o build/wasmd ./cmd/wasmd
-	go build -mod=readonly $(BUILD_FLAGS) -o build/wasmcli ./cmd/wasmcli
 endif
 
 build-coral: go.sum
 ifeq ($(OS),Windows_NT)
-	# wasmd nodes not supported on windows, maybe the cli?
-	go build -mod=readonly $(CORAL_BUILD_FLAGS) -o build/coral.exe ./cmd/wasmcli
+	exit 1
 else
 	go build -mod=readonly $(CORAL_BUILD_FLAGS) -o build/corald ./cmd/wasmd
-	go build -mod=readonly $(CORAL_BUILD_FLAGS) -o build/coral ./cmd/wasmcli
 endif
 
 build-gaiaflex: go.sum
 ifeq ($(OS),Windows_NT)
-	# wasmd nodes not supported on windows, maybe the cli?
-	go build -mod=readonly $(FLEX_BUILD_FLAGS) -o build/gaiaflex.exe ./cmd/wasmcli
+	exit 1
 else
 	go build -mod=readonly $(FLEX_BUILD_FLAGS) -o build/gaiaflexd ./cmd/wasmd
-	go build -mod=readonly $(FLEX_BUILD_FLAGS) -o build/gaiaflex ./cmd/wasmcli
 endif
 
 build-linux: go.sum
@@ -139,7 +128,6 @@ endif
 
 install: go.sum
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/wasmd
-	go install -mod=readonly $(BUILD_FLAGS) ./cmd/wasmcli
 
 ########################################
 ### Tools & dependencies

diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ docker run --rm -it \
     --mount type=volume,source=wasmd_data,target=/root \
     cosmwasm/wasmd:latest ./setup_wasmd.sh cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6
 
-# This will start both wasmd and wasmcli rest-server, only wasmcli output is shown on the screen
+# This will start both wasmd and rest-server, only rest-serve output is shown on the screen
 docker run --rm -it -p 26657:26657 -p 26656:26656 -p 1317:1317 \
     --mount type=volume,source=wasmd_data,target=/root \
     cosmwasm/wasmd:latest ./run_all.sh
@@ -126,7 +126,7 @@ sudo chown -R $(id -u):$(id -g) ./template
 # bind to non-/root and pass an argument to run.sh to copy the template into /root
 # we need wasmd_data volume mount not just for restart, but also to view logs
 docker volume rm -f wasmd_data
-docker run --rm -it -p 26657:26657 -p 26656:26656 -p 1317:1317 \
+docker run --rm -it -p 26657:26657 -p 26656:26656 -p 9090:9090 \
     --mount type=bind,source=$(pwd)/template,target=/template \
     --mount type=volume,source=wasmd_data,target=/root \
     cosmwasm/wasmd:latest ./run_all.sh /template
@@ -150,7 +150,7 @@ to the configuration.
 
 Available flags:
 
-* `-X github.com/CosmWasm/wasmd/app.CLIDir=.coral` - set the config directory for the cli (default `~/.wasmcli`) 
+
 * `-X github.com/CosmWasm/wasmd/app.NodeDir=.corald` - set the config/data directory for the node (default `~/.wasmd`)
 * `-X github.com/CosmWasm/wasmd/app.Bech32Prefix=coral` - set the bech32 prefix for all accounts (default `cosmos`)
 * `-X github.com/CosmWasm/wasmd/app.ProposalsEnabled=true` - enable all x/wasm governance proposals (default `false`)

diff --git a/api_migration.md b/api_migration.md
@@ -17,9 +17,9 @@ A list of ContractCodeHistoryEntries with following fields:
 * 404 - for an unknown contract
 
 ### CLI
-`wasmcli query wasm contract-history [bech32_address] to print all the code changes.`
+`wasmd query wasm contract-history [bech32_address] to print all the code changes.`
 Example:
-`wasmcli query wasm contract-history cosmos18r5szma8hm93pvx6lwpjwyxruw27e0k5uw835c` 
+`wasmd query wasm contract-history cosmos18r5szma8hm93pvx6lwpjwyxruw27e0k5uw835c` 
 ```json
 [
   {

diff --git a/app/app.go b/app/app.go
@@ -95,7 +95,6 @@ const appName = "WasmApp"
 
 // We pull these out so we can set them with LDFLAGS in the Makefile
 var (
-	CLIDir       = ".wasmcli"
 	NodeDir      = ".wasmd"
 	Bech32Prefix = sdk.Bech32MainPrefix
 
@@ -129,8 +128,6 @@ func GetEnabledProposals() []wasm.ProposalType {
 // These are the ones we will want to use in the code, based on
 // any overrides above
 var (
-	// DefaultCLIHome default home directories for wasmcli
-	DefaultCLIHome = os.ExpandEnv("$HOME/") + CLIDir
 	// DefaultNodeHome default home directories for wasmd
 	DefaultNodeHome = os.ExpandEnv("$HOME/") + NodeDir
 

diff --git a/cmd/wasmcli/main.go b/cmd/wasmcli/main.go