feat(cosmos)!: compile agd binary to supercede ag-chain-cosmos

Author: michaelfig

golang/cosmos/Makefile

@@ -23,7 +23,7 @@ VersionName := $(shell echo "$(NAME)" | sed -e 's/[^A-Za-z0-9]//g')
 
 # process linker flags
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=$(VersionName) \
-		-X github.com/cosmos/cosmos-sdk/version.AppName=agoricd \
+		-X github.com/cosmos/cosmos-sdk/version.AppName=agd \
 		-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)"
@@ -42,8 +42,8 @@ BUILD_FLAGS_HELPER :=  -buildmode=exe -tags "$(build_tags)" -gcflags '$(gcflags)
 
 all: compile-chain
 
-compile-chain: compile-agoricd compile-helper compile-daemon
-compile-go: compile-agoricd compile-helper compile-libdaemon
+compile-chain: compile-agd compile-helper compile-daemon
+compile-go: compile-agd compile-helper compile-libdaemon
 compile-node: node-compile-gyp
 
 compile-daemon: compile-libdaemon node-compile-gyp
@@ -56,11 +56,11 @@ node-compile-gyp:
 		npm run build:gyp; \
 	fi
 
-compile-agoricd: go-mod-cache
-	go build -v $(MOD_READONLY) $(BUILD_FLAGS_HELPER) -o build/agoricd ./cmd/agoricd
+compile-agd: go-mod-cache
+	go build -v $(MOD_READONLY) $(BUILD_FLAGS_HELPER) -o build/agd ./cmd/agd
 
-install-agoricd: go-mod-cache
-	go install -v $(MOD_READONLY) $(BUILD_FLAGS_HELPER) ./cmd/agoricd
+install-agd: go-mod-cache
+	go install -v $(MOD_READONLY) $(BUILD_FLAGS_HELPER) ./cmd/agd
 
 # Only run from the package.json build:gyp script.
 compile-gyp:

golang/cosmos/app/app.go

@@ -225,7 +225,7 @@ func init() {
 		stdlog.Println("Failed to get home dir %2", err)
 	}
 
-	DefaultNodeHome = filepath.Join(userHomeDir, ".ag-chain-cosmos")
+	DefaultNodeHome = filepath.Join(userHomeDir, ".agoric")
 }
 
 // NewGaiaApp returns a reference to an initialized Gaia.

golang/cosmos/cmd/agd/main.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"os"
+	"os/exec"
+	"syscall"
+
+	"github.com/tendermint/tendermint/libs/log"
+
+	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/daemon"
+	daemoncmd "github.com/Agoric/agoric-sdk/golang/cosmos/daemon/cmd"
+)
+
+func main() {
+	// We need to delegate to our default app for running the actual chain.
+	daemoncmd.OnStartHook = func(logger log.Logger) {
+		logger.Info("Start chain delegating to ag-chain-cosmos executable")
+
+		binary, lookErr := exec.LookPath("ag-chain-cosmos")
+		if lookErr != nil {
+			panic(lookErr)
+		}
+
+		args := []string{"ag-chain-cosmos", "--home", gaia.DefaultNodeHome}
+		args = append(args, os.Args[1:]...)
+
+		execErr := syscall.Exec(binary, args, os.Environ())
+		if execErr != nil {
+			panic(execErr)
+		}
+	}
+
+	daemon.RunWithController(nil)
+}

golang/cosmos/cmd/agoricd/main.go

@@ -6,6 +6,7 @@ import (
 
 	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/daemon"
+	daemoncmd "github.com/Agoric/agoric-sdk/golang/cosmos/daemon/cmd"
 )
 
 func main() {
@@ -15,5 +16,6 @@ func main() {
 	}
 
 	gaia.DefaultNodeHome = filepath.Join(userHomeDir, ".ag-cosmos-helper")
+	daemoncmd.AppName = "ag-cosmos-helper"
 	daemon.Run()
 }

golang/cosmos/cmd/helper/main.go

@@ -13,8 +13,11 @@ import (
 	"encoding/json"
 	"errors"
 	"os"
+	"path/filepath"
 
+	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/daemon"
+	daemoncmd "github.com/Agoric/agoric-sdk/golang/cosmos/daemon/cmd"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 )
 
@@ -30,6 +33,14 @@ var lastReply = 0
 
 //export RunAgCosmosDaemon
 func RunAgCosmosDaemon(nodePort C.int, toNode C.sendFunc, cosmosArgs []*C.char) C.int {
+	userHomeDir, err := os.UserHomeDir()
+	if err != nil {
+		panic(err)
+	}
+
+	gaia.DefaultNodeHome = filepath.Join(userHomeDir, ".ag-chain-cosmos")
+	daemoncmd.AppName = "ag-chain-cosmos"
+
 	// FIXME: Decouple the sending logic from the Cosmos app.
 	sendToNode := func(needReply bool, str string) (string, error) {
 		var rPort int

golang/cosmos/cmd/libdaemon/main.go

@@ -39,7 +39,7 @@ import (
 // Sender is a function that sends a request to the controller.
 type Sender func(needReply bool, str string) (string, error)
 
-var AppName = "ag-chain-cosmos"
+var AppName = "agd"
 var OnStartHook func(log.Logger)
 
 // NewRootCmd creates a new root command for simd. It is called once in the

golang/cosmos/daemon/cmd/root.go

@@ -56,7 +56,7 @@ not be bank purses by default.
 To use Cosmos governance to change the `fee_epoch_duration_blocks` value:
 
 ```sh
-$ ag-cosmos-helper query vbank params
+$ agd query vbank params
 {"fee_epoch_duration_blocks":"720"}
 $ cat <<EOF > epoch-duration-proposal.json
 {
@@ -72,11 +72,11 @@ $ cat <<EOF > epoch-duration-proposal.json
   "deposit": "1000000ubld"
 }
 EOF
-$ ag-cosmos-helper tx gov submit-proposal param-change epochdur.json --from=mykey --chain-id=agoric
+$ agd tx gov submit-proposal param-change epochdur.json --from=mykey --chain-id=agoric
 # Then vote on the proposal.
-$ ag-cosmos-helper tx vote ...
+$ agd tx vote ...
 # After passing,
-$ ag-cosmos-helper query vbank params
+$ agd query vbank params
 {"fee_epoch_duration_blocks":"30"}
 $
 ```