From 2c8349a10c52945c3338eda4d51367c63aa37b78 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 2 Jun 2020 13:57:28 +0200
Subject: [PATCH] Migrate cli to @cosmwasm/cosmwasm and @cosmwasm/sdk38

---
 packages/cli/package.json |  3 ++-
 packages/cli/src/cli.ts   | 31 ++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 74e028f4..41231aa9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -38,7 +38,8 @@
     "!**/testdata/"
   ],
   "dependencies": {
-    "@cosmwasm/sdk": "^0.8.0",
+    "@cosmwasm/cosmwasm": "^0.8.0",
+    "@cosmwasm/sdk38": "^0.8.0",
     "@iov/crypto": "^2.1.0",
     "@iov/encoding": "^2.1.0",
     "@iov/utils": "^2.0.2",
diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
index d31b0eac..83932e1f 100644
--- a/packages/cli/src/cli.ts
+++ b/packages/cli/src/cli.ts
@@ -30,19 +30,8 @@ export function main(originalArgs: readonly string[]): void {
 
   const imports = new Map<string, readonly string[]>([
     [
-      "@cosmwasm/sdk",
+      "@cosmwasm/cosmwasm",
       [
-        "encodeSecp256k1Pubkey",
-        "encodeSecp256k1Signature",
-        "logs",
-        "makeCosmoshubPath",
-        "makeSignBytes",
-        "marshalTx",
-        "Pen",
-        "pubkeyToAddress",
-        "RestClient",
-        "Secp256k1Pen",
-        "types",
         // cosmwasmclient
         "Account",
         "Block",
@@ -53,7 +42,6 @@ export function main(originalArgs: readonly string[]): void {
         "ContractDetails",
         "CosmWasmClient",
         "GetNonceResult",
-        "IndexedTx",
         "PostTxResult",
         "SearchByHeightQuery",
         "SearchByIdQuery",
@@ -71,6 +59,23 @@ export function main(originalArgs: readonly string[]): void {
         "UploadResult",
       ],
     ],
+    [
+      "@cosmwasm/sdk38",
+      [
+        "encodeSecp256k1Pubkey",
+        "encodeSecp256k1Signature",
+        "logs",
+        "makeCosmoshubPath",
+        "makeSignBytes",
+        "marshalTx",
+        "Pen",
+        "pubkeyToAddress",
+        "RestClient",
+        "Secp256k1Pen",
+        "types",
+        "IndexedTx",
+      ],
+    ],
     [
       "@iov/crypto",
       [