Merge pull request #508 from InjectiveLabs/chore/refactor-wallet-stra…

…tegies

chore: refactor wallet strategies

.vscode/settings.json

@@ -1,9 +1,15 @@
 {
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": true,
-  "files.trimTrailingWhitespace": true,
-  "editor.renderFinalNewline": "on",
-  "cSpell.words": [
-    "chronos"
-  ]
-}
+	"files.insertFinalNewline": true,
+	"files.trimFinalNewlines": true,
+	"files.trimTrailingWhitespace": true,
+	"editor.renderFinalNewline": "on",
+	"cSpell.words": ["chronos"],
+	"[json][jsonc][javascript][javascriptreact][typescript][typescriptreact][vue]": {
+	  "editor.defaultFormatter": "esbenp.prettier-vscode",
+	  "editor.formatOnSave": true,
+	  "editor.codeActionsOnSave": [
+		"source.formatDocument",
+		"source.fixAll.eslint"
+	  ]
+	}
+  }

etc/bootstrapEnv.js

@@ -10,6 +10,10 @@ const main = () => {
   const packages = getDirectories()
 
   packages.forEach((packageName) => {
+    if (packageName === 'wallets') {
+      return
+    }
+
     const path = `packages/${packageName}/dist`
     const esmPath = `packages/${packageName}/dist/esm`
     const cjsPath = `packages/${packageName}/dist/cjs`

etc/replacements-ledger.js

@@ -0,0 +1,47 @@
+const { readFile, writeFile } = require('fs')
+
+const isCJS = process.env.BUILD_MODE.includes('cjs')
+const isESM = process.env.BUILD_MODE.includes('esm')
+
+const REPLACEMENT_PAIRS = [
+  {
+    path: './src/strategy/Ledger/Base.ts',
+    cjs: '@ledgerhq/hw-app-eth/lib/services/ledger',
+    esm: '@ledgerhq/hw-app-eth/lib-es/services/ledger',
+  },
+]
+
+for (const pair of REPLACEMENT_PAIRS) {
+  readFile(pair.path, 'utf8', (err, data) => {
+    if (err) {
+      console.error('Error reading file:', err)
+      return
+    }
+
+    if (isCJS) {
+      const updatedData = data.replace(new RegExp(pair.esm, 'g'), pair.cjs)
+
+      writeFile(pair.path, updatedData, 'utf8', (err) => {
+        if (err) {
+          console.error('Error writing file:', err)
+          return
+        }
+
+        console.log(`Replaced in ${pair.path} for CJS`)
+      })
+    }
+
+    if (isESM) {
+      const updatedData = data.replace(new RegExp(pair.cjs, 'g'), pair.esm)
+
+      writeFile(pair.path, updatedData, 'utf8', (err) => {
+        if (err) {
+          console.error('Error writing file:', err)
+          return
+        }
+
+        console.log(`Replaced in ${pair.path} for ESM`)
+      })
+    }
+  })
+}

lerna.json

@@ -1,12 +1,12 @@
 {
   "npmClient": "yarn",
   "name": "injective-ts",
-  "packages": ["packages/*"],
+  "packages": ["packages/*", "packages/wallets/*"],
   "version": "independent",
   "useWorkspaces": true,
   "command": {
     "version": {
-      "message": "chore(release): publish"
+      "message": "chore: release"
     },
     "publish": {
       "conventionalCommits": true

package.json

@@ -8,7 +8,8 @@
   "repository": "https://github.com/InjectiveLabs/injective-ts",
   "workspaces": {
     "packages": [
-      "packages/*"
+      "packages/*",
+      "packages/wallets/*"
     ]
   },
   "scripts": {
@@ -34,9 +35,6 @@
     "test:sdk-ts:core:modules": "jest ./packages/sdk-ts/src/core/modules",
     "test:sdk-ts:core": "jest ./packages/sdk-ts/src/core",
     "test:sdk-ts:client": "jest ./packages/sdk-ts/src/client",
-    "test:bridge-ts": "jest ./packages/bridge-ts/src",
-    "test:sdk-ui-ts": "jest ./packages/sdk-ui-ts/src",
-    "test:token-metadata": "jest ./packages/token-metadata/test",
     "test:ci": "jest --coverage --ci --reporters='jest-junit'",
     "coverage": "jest --coverage",
     "coverage:unit": "yarn test:unit --coverage",

packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcPortfolioApi.spec.ts

@@ -1,5 +1,5 @@
 import { getNetworkEndpoints, Network } from '@injectivelabs/networks'
-import { INJ_DENOM } from '@injectivelabs/utils'
+// import { INJ_DENOM } from '@injectivelabs/utils'
 import { mockFactory } from '@injectivelabs/test-utils'
 import { IndexerGrpcAccountPortfolioTransformer } from '../transformers'
 import { IndexerGrpcAccountPortfolioApi } from './IndexerGrpcPortfolioApi'
@@ -34,25 +34,25 @@ describe('IndexerGrpcAccountPortfolioApi', () => {
   })
 })
 
-test('fetchAccountPortfolioTokenHolders', async () => {
-  try {
-    const response =
-      await indexerGrpcPortfolioApi.fetchAccountPortfolioTokenHolders({
-        denom: INJ_DENOM,
-      })
+// test('fetchAccountPortfolioTokenHolders', async () => {
+//   try {
+//     const response =
+//       await indexerGrpcPortfolioApi.fetchAccountPortfolioTokenHolders({
+//         denom: INJ_DENOM,
+//       })
 
-    expect(response).toBeDefined()
-    expect(response).toEqual(
-      expect.objectContaining<
-        ReturnType<
-          typeof IndexerGrpcAccountPortfolioTransformer.tokenHoldersResponseToTokenHolders
-        >
-      >(response),
-    )
-  } catch (e) {
-    console.error(
-      'IndexerGrpcAccountPortfolioApi.fetchAccountPortfolioTokenHolders => ' +
-        (e as any).message,
-    )
-  }
-})
+//     expect(response).toBeDefined()
+//     expect(response).toEqual(
+//       expect.objectContaining<
+//         ReturnType<
+//           typeof IndexerGrpcAccountPortfolioTransformer.tokenHoldersResponseToTokenHolders
+//         >
+//       >(response),
+//     )
+//   } catch (e) {
+//     console.error(
+//       'IndexerGrpcAccountPortfolioApi.fetchAccountPortfolioTokenHolders => ' +
+//         (e as any).message,
+//     )
+//   }
+// })

packages/sdk-ts/src/core/accounts/PrivateKey.spec.ts

@@ -1,4 +1,4 @@
-import { generateArbitrarySignDoc } from '../modules'
+import { generateArbitrarySignDoc } from '../tx'
 import { PrivateKey } from './PrivateKey'
 
 const pk = 'f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3'

packages/sdk-ts/src/core/tx/broadcaster/MsgBroadcasterWithPk.ts

@@ -142,6 +142,7 @@ export class MsgBroadcasterWithPk {
     const tx = {
       ...transaction,
       msgs: msgs,
+      ethereumAddress: ethereumWallet
     } as MsgBroadcasterTxOptions & { ethereumAddress: string }
 
     const web3Msgs = msgs.map((msg) => msg.toWeb3())

packages/sdk-ts/src/types/index.ts

@@ -1,4 +1,5 @@
 import { DirectSignResponse } from '@cosmjs/proto-signing'
+import { AminoSignResponse } from '@cosmjs/amino'
 import {
   CosmosTxV1Beta1Tx,
   CosmosBaseV1Beta1Coin,
@@ -23,5 +24,6 @@ export enum StreamOperation {
 
 export type GrpcCoin = CosmosBaseV1Beta1Coin.Coin
 export type TxRaw = CosmosTxV1Beta1Tx.TxRaw
+export type SignDoc = CosmosTxV1Beta1Tx.SignDoc
 
-export { DirectSignResponse }
+export { DirectSignResponse, AminoSignResponse }

packages/test-utils/package.json

@@ -32,6 +32,7 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
+    "@injectivelabs/exceptions": "^1.14.13",
     "@injectivelabs/networks": "^1.14.13",
     "@injectivelabs/ts-types": "^1.14.15-beta.0",
     "@injectivelabs/utils": "^1.14.15-beta.0",

packages/test-utils/tsconfig.build.esm.json

@@ -17,6 +17,9 @@
     {
       "path": "../exceptions/tsconfig.build.esm.json"
     },
+    {
+      "path": "../utils/tsconfig.build.esm.json"
+    },
     {
       "path": "../networks/tsconfig.build.esm.json"
     }

packages/test-utils/tsconfig.build.json

@@ -19,6 +19,9 @@
     {
       "path": "../exceptions/tsconfig.build.json"
     },
+    {
+      "path": "../utils/tsconfig.build.json"
+    },
     {
       "path": "../networks/tsconfig.build.json"
     }

packages/ts-types/src/index.ts

@@ -30,3 +30,5 @@ export interface PaginationOption {
 export interface Constructable<T> {
   new (...args: never): T
 }
+
+export type UnwrappedPromise<T> = T extends Promise<infer Return> ? Return : T

packages/wallet-ts/README.md

@@ -6,6 +6,8 @@
 
 _A convenient way to use different types of wallets on Injective._
 
+**DEPRECATED: PLEASE USE `@injectivelabs/wallet-strategy`**
+
 ---
 
 ## 📚 Installation

packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Leap.ts

@@ -10,12 +10,12 @@ import {
   TxRaw,
   TxResponse,
   waitTxBroadcasted,
+  AminoSignResponse,
+  DirectSignResponse,
   createTxRawFromSigResponse,
   createSignDocFromTransaction,
 } from '@injectivelabs/sdk-ts'
-import type { DirectSignResponse } from '@cosmjs/proto-signing'
 import { StdSignDoc } from '@keplr-wallet/types'
-import { AminoSignResponse } from '@cosmjs/launchpad'
 import { LeapWallet } from '../../../utils/wallets/leap'
 import { WalletAction, WalletDeviceType } from '../../../types/enums'
 import { ConcreteCosmosWalletStrategy } from '../../types/strategy'

packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Ninji.ts

@@ -10,12 +10,12 @@ import {
   TxRaw,
   TxResponse,
   waitTxBroadcasted,
+  AminoSignResponse,
+  DirectSignResponse,
   createTxRawFromSigResponse,
   createSignDocFromTransaction,
 } from '@injectivelabs/sdk-ts'
-import type { DirectSignResponse } from '@cosmjs/proto-signing'
 import { StdSignDoc } from '@keplr-wallet/types'
-import { AminoSignResponse } from '@cosmjs/launchpad'
 import { NinjiWallet } from '../../../utils/wallets/ninji'
 import { WalletAction, WalletDeviceType } from '../../../types/enums'
 import { ConcreteCosmosWalletStrategy } from '../../types/strategy'

packages/wallets/wallet-base/README.md

@@ -0,0 +1,60 @@
+# 🌟 Injective Protocol - Wallet Base
+
+<!-- TODO -->
+
+[![downloads](https://img.shields.io/npm/dm/@injectivelabs/wallet-base.svg)](https://www.npmjs.com/package/@injectivelabs/wallet-base)
+[![npm-version](https://img.shields.io/npm/v/@injectivelabs/wallet-base.svg)](https://www.npmjs.com/package/@injectivelabs/wallet-base)
+[![license](https://img.shields.io/npm/l/express.svg)]()
+
+_Base Package for the Wallet Strategy._
+
+---
+
+## 📚 Installation
+
+```bash
+yarn add @injectivelabs/wallet-base
+```
+
+---
+
+## 📖 Documentation
+
+<!-- TODO -->
+
+Read more and find example usages on our [WalletStrategy Docs](https://docs.ts.injective.network/wallet/wallet-wallet-strategy)
+
+---
+
+## 📜 Contribution
+
+**Contribution guides and practices will be available once there is a stable foundation of the whole package set within the `injective-ts` repo.**
+
+---
+
+## ⛑ Support
+
+Reach out to us at one of the following places!
+
+- Website at <a href="https://injective.com" target="_blank">`injective.com`</a>
+- Twitter at <a href="https://twitter.com/Injective_" target="_blank">`@Injective`</a>
+- Discord at <a href="https://discord.com/invite/NK4qdbv" target="_blank">`Discord`</a>
+- Telegram at <a href="https://t.me/joininjective" target="_blank">`Telegram`</a>
+
+---
+
+## 🔓 License
+
+Copyright © 2021 - 2022 Injective Labs Inc. (https://injectivelabs.org/)
+
+<a href="https://iili.io/mNneZN.md.png"><img src="https://iili.io/mNneZN.md.png" style="width: 300px; max-width: 100%; height: auto" />
+
+Originally released by Injective Labs Inc. under: <br />
+Apache License <br />
+Version 2.0, January 2004 <br />
+http://www.apache.org/licenses/
+
+<p>&nbsp;</p>
+<div align="center">
+  <sub><em>Powering the future of decentralized finance.</em></sub>
+</div>

packages/wallets/wallet-base/package.json

@@ -0,0 +1,63 @@
+{
+  "name": "@injectivelabs/wallet-base",
+  "description": "Base wallet strategy for use with @injectivelabs/wallet-core.",
+  "version": "0.0.1",
+  "sideEffects": false,
+  "author": {
+    "name": "InjectiveLabs",
+    "email": "admin@injectivelabs.org"
+  },
+  "license": "Apache-2.0",
+  "types": "dist/cjs/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "files": [
+    "dist"
+  ],
+  "_moduleAliases": {
+    "~wallet-base": "dist"
+  },
+  "scripts": {
+    "postinstall": "link-module-alias",
+    "build:cjs": "BUILD_MODE=cjs tsc --build tsconfig.build.json",
+    "build:esm": "BUILD_MODE=esm tsc --build tsconfig.build.esm.json",
+    "build": "yarn build:esm && yarn build:cjs && yarn build:post && link-module-alias",
+    "build:watch": "tsc --build -w tsconfig.build.json && tsc -w --build tsconfig.build.esm.json && yarn build:post && link-module-alias",
+    "build:post": "shx cp ../../../etc/stub/package.json.stub dist/cjs/package.json && shx cp ../../../etc/stub/package.esm.json.stub dist/esm/package.json",
+    "clean": "tsc --build tsconfig.build.json --clean && tsc --build tsconfig.build.esm.json --clean && shx rm -rf coverage *.log junit.xml dist && jest --clearCache && shx mkdir -p dist",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:ci": "jest --coverage --ci --reporters='jest-junit'",
+    "coverage": "jest --coverage",
+    "coverage:show": "live-server coverage",
+    "dev": "ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "node dist/index.js"
+  },
+  "dependencies": {
+    "@ethereumjs/common": "^3.1.1",
+    "@ethereumjs/tx": "^4.1.1",
+    "@injectivelabs/exceptions": "^1.14.14",
+    "@injectivelabs/networks": "^1.14.15-beta.0",
+    "@injectivelabs/sdk-ts": "^1.14.15-beta.9",
+    "@injectivelabs/ts-types": "^1.14.14",
+    "@injectivelabs/utils": "^1.14.14",
+    "alchemy-sdk": "^2.6.3",
+    "eip1193-provider": "^1.0.1",
+    "eth-sig-util": "^3.0.1",
+    "ethereumjs-util": "^7.1.0",
+    "ethers": "^6.5.1",
+    "hdkey": "^2.0.1",
+    "link-module-alias": "^1.2.0",
+    "long": "^5.2.1",
+    "shx": "^0.3.3"
+  },
+  "devDependencies": {
+    "@types/eth-sig-util": "^2.1.1",
+    "@types/ethereumjs-util": "^6.1.0",
+    "@types/hdkey": "^2.0.1"
+  },
+  "resolutions": {
+    "**/libsodium": "npm:@bangjelkoski/noop",
+    "**/libsodium-wrappers": "npm:@bangjelkoski/noop"
+  }
+}