migrate wrapper to ts(-proto) and new version of cosmjs

* several code generation improvements made.

scripts/data/gen-nodetime/package.json

@@ -9,6 +9,9 @@
     "build": "./node_modules/pkg/lib-es5/bin.js --debug -t node14-linux-x64,node14-macos-x64 -o nodetime ."
   },
   "dependencies": {
+    "@cosmjs/launchpad": "^0.23.2",
+    "@cosmjs/proto-signing": "^0.24.0-alpha.26",
+    "@cosmjs/stargate": "^0.24.0-alpha.26",
     "@types/node": "^13.13.45",
     "long": "^4.0.0",
     "pkg": "^4.4.9",
@@ -22,7 +25,8 @@
       "./node_modules/typescript/lib/**/*.ts",
       "./node_modules/protobufjs/**/*",
       "./node_modules/long/**/*",
-      "./node_modules/@types/**/*"
+      "./node_modules/@types/**/*",
+      "./node_modules/@cosmjs/**/*"
     ]
   }
 }

scripts/install-light

@@ -0,0 +1,2 @@
+#!/bin/bash
+go install ./...

starport/pkg/cosmosanalysis/module/module.go

@@ -150,12 +150,16 @@ func DiscoverModule(modulePath string) (msgs []string, err error) {
 				fname := fdecl.Name.Name
 
 				// find the struct name that method belongs to.
-				sexp, ok := fdecl.Recv.List[0].Type.(*ast.StarExpr)
+				t := fdecl.Recv.List[0].Type
+				sident, ok := t.(*ast.Ident)
 				if !ok {
-					return true
+					sexp, ok := t.(*ast.StarExpr)
+					if !ok {
+						return true
+					}
+					sident = sexp.X.(*ast.Ident)
 				}
-
-				sname := sexp.X.(*ast.Ident).Name
+				sname := sident.Name
 
 				// mark the requirement that this struct satisfies.
 				if _, ok := structs[sname]; !ok {

starport/pkg/cosmosgen/generate.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 	"text/template"
 
 	"github.com/iancoleman/strcase"
@@ -47,13 +48,20 @@ var templates embed.FS
 
 // tpl holds the js client template which is for wrapping the generated protobufjs types and rest client,
 // utilizing cosmjs' type registry, tx signing & broadcasting through exported, high level txClient() and queryClient() funcs.
-var tpl = template.Must(
-	template.New("client.js.tpl").
-		Funcs(template.FuncMap{
-			"camelCase": strcase.ToLowerCamel,
-		}).
-		ParseFS(templates, "templates/client.js.tpl"),
-)
+func tpl(protoPath string) *template.Template {
+	return template.Must(
+		template.New("client.ts.tpl").
+			Funcs(template.FuncMap{
+				"camelCase": strcase.ToLowerCamel,
+				"resolveFile": func(fullPath string) string {
+					rel, _ := filepath.Rel(protoPath, fullPath)
+					rel = strings.TrimSuffix(rel, ".proto")
+					return rel
+				},
+			}).
+			ParseFS(templates, "templates/client.ts.tpl"),
+	)
+}
 
 type generateOptions struct {
 	gomodPath string
@@ -257,32 +265,25 @@ func (g *generator) generateJS() error {
 			outREST = filepath.Join(out, "rest.ts")
 		)
 
-		if err := sta.Generate(g.ctx, outREST, srcspec, "2"); err != nil { // 2 points to sdk module name.
+		if err := sta.Generate(g.ctx, outREST, srcspec, "-1"); err != nil { // -1 removes the route namespace.
 			return err
 		}
 
 		// generate the client, the js wrapper.
-		outclient := filepath.Join(out, "index.js")
+		outclient := filepath.Join(out, "index.ts")
 		f, err := os.OpenFile(outclient, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
 		if err != nil {
 			return err
 		}
 		defer f.Close()
 
-		err = tpl.Execute(f, struct {
-			Module    module.Module
-			TypesPath string
-			RESTPath  string
-		}{
-			m,
-			"./types",
-			"./rest",
-		})
+		// generate the js client wrapper.
+		err = tpl(g.protoPath).Execute(f, struct{ Module module.Module }{m})
 		if err != nil {
 			return err
 		}
 
-		// generate .js and .d.ts files for ts files.
+		// generate .js and .d.ts files for all ts files.
 		if err := tsc.Generate(g.ctx, tsc.Config{
 			Include: []string{out + "/**/*.ts"},
 			CompilerOptions: tsc.CompilerOptions{

starport/pkg/cosmosgen/templates/client.ts.tpl

@@ -0,0 +1,47 @@
+import { coins } from "@cosmjs/launchpad";
+import { SigningStargateClient } from "@cosmjs/stargate";
+import { Registry, OfflineSigner, EncodeObject, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
+import { Api } from "./rest";
+{{ range .Module.Msgs }}import { {{ .Name }} } from "./types/{{ resolveFile .FilePath }}";
+{{ end }}
+
+const types = [
+  {{ range .Module.Msgs }}["/{{ .URI }}", {{ .Name }}],
+  {{ end }}
+];
+
+const registry = new Registry(<any>types);
+
+interface TxClientOptions {
+  addr: string
+}
+
+const txClient = async (wallet: OfflineSigner, { addr: addr }: TxClientOptions = { addr: "http://localhost:26657" }) => {
+  if (!wallet) throw new Error("wallet is required");
+
+  const client = await SigningStargateClient.connectWithSigner(addr, wallet, { registry });
+  const { address } = (await wallet.getAccounts())[0];
+  const fee = {
+    amount: coins(0, "token"),
+    gas: "200000",
+  };
+
+  return {
+    signAndBroadcast: (msgs: EncodeObject[]) => client.signAndBroadcast(address, msgs, fee),
+    {{ range .Module.Msgs }}{{ camelCase .Name }}: (data: {{ .Name }}): EncodeObject => ({ typeUrl: "/{{ .URI }}", value: data }),
+    {{ end }}
+  };
+};
+
+interface QueryClientOptions {
+  addr: string
+}
+
+const queryClient = async ({ addr: addr }: QueryClientOptions = { addr: "http://localhost:1317" }) => {
+  return new Api({ baseUrl: addr });
+};
+
+export {
+  txClient,
+  queryClient,
+};

starport/pkg/nodetime/sta/sta.go

@@ -31,6 +31,7 @@ func Generate(ctx context.Context, outPath, specPath, moduleNameIndex string) er
 		nodetime.BinaryPath,
 		nodetime.CommandSTA,
 		"--module-name-index",
+		moduleNameIndex,
 		"-p",
 		specPath,
 		"-o",

starport/pkg/nodetime/tsc/tsc.go

@@ -12,18 +12,18 @@ import (
 	"github.com/tendermint/starport/starport/pkg/nodetime"
 )
 
+const nodeModulesPath = "/snapshot/gen-nodetime/node_modules"
+
 var (
 	defaultConfig = func() Config {
 		return Config{
 			CompilerOptions: CompilerOptions{
-				Target:    "es2020",
-				Module:    "es6",
-				TypeRoots: []string{"/snapshot/gen-nodetime/node_modules/@types"},
-				Types:     []string{"node"},
-				Paths: map[string][]string{
-					"*":    {"/snapshot/gen-nodetime/node_modules/*"},
-					"long": {"/snapshot/gen-nodetime/node_modules/long/index.js"},
-				},
+				BaseURL:          nodeModulesPath,
+				ModuleResolution: "node",
+				Target:           "es2020",
+				Module:           "es2020",
+				TypeRoots:        []string{filepath.Join(nodeModulesPath, "@types")},
+				SkipLibCheck:     true,
 			},
 		}
 	}
@@ -38,12 +38,13 @@ type Config struct {
 
 // CompilerOptions section of tsconfig.json.
 type CompilerOptions struct {
-	Declaration bool                `json:"declaration"`
-	Paths       map[string][]string `json:"paths"`
-	Target      string              `json:"target"`
-	Module      string              `json:"module"`
-	TypeRoots   []string            `json:"typeRoots"`
-	Types       []string            `json:"types"`
+	BaseURL          string   `json:"baseUrl"`
+	ModuleResolution string   `json:"moduleResolution"`
+	Target           string   `json:"target"`
+	Module           string   `json:"module"`
+	TypeRoots        []string `json:"typeRoots"`
+	Declaration      bool     `json:"declaration"`
+	SkipLibCheck     bool     `json:"skipLibCheck"`
 }
 
 var placeOnce sync.Once

starport/templates/app/stargate/vue/package.json

@@ -8,6 +8,9 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
+    "@cosmjs/launchpad": "0.23.2",
+    "@cosmjs/proto-signing": "0.24.0-alpha.26",
+    "@cosmjs/stargate": "0.24.0-alpha.26",
     "@tendermint/vue": "0.1.12",
     "core-js": "^3.6.5",
     "vue": "^2.6.11",