NPMify!

.github/workflows/deploy.yml

@@ -9,8 +9,6 @@ on:
 jobs:
   build-api:
     runs-on: ubuntu-latest
-
-
     steps:
       - uses: actions/checkout@main
       - run: |

apps/bot/src/commands/Send.ts

@@ -1,14 +1,15 @@
 import { Message } from 'discord.js';
 import { Command } from '../Command';
 import { BotClient } from '../types';
-import { formatNativeTokenAmountToIndivisibleUnit } from '@baf-wallet/multi-chain';
 import { createApproveRedirectURL } from '@baf-wallet/redirect-generator';
 import { environment } from '../environments/environment';
+import { getTokenInfo } from '@baf-wallet/chain-info';
 import {
   Chain,
   GenericTxParams,
   GenericTxSupportedActions,
 } from '@baf-wallet/interfaces';
+import { tokenAmountToIndivisible } from '@baf-wallet/utils';
 
 export default class SendMoney extends Command {
   constructor(protected client: BotClient) {
@@ -72,16 +73,14 @@ export default class SendMoney extends Command {
     const recipientUserReadable = `${recipientUser.username}#${recipientUser.discriminator}`;
 
     try {
+      const nearInfo = await getTokenInfo(Chain.NEAR);
       const tx: GenericTxParams = {
         recipientUserId: recipientParsed,
         recipientUserIdReadable: recipientUserReadable,
         actions: [
           {
             type: GenericTxSupportedActions.TRANSFER,
-            amount: formatNativeTokenAmountToIndivisibleUnit(
-              amount,
-              Chain.NEAR
-            ),
+            amount: tokenAmountToIndivisible(amount, nearInfo.decimals),
           },
         ],
         oauthProvider: 'discord',

jest.config.js

@@ -15,5 +15,7 @@ module.exports = {
     '<rootDir>/libs/crypto',
     '<rootDir>/libs/base-components',
     '<rootDir>/libs/errors',
+    '<rootDir>/libs/t',
+    '<rootDir>/libs/core-publishable',
   ],
 };

libs/chain-info/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@baf-wallet/chain-info",
+  "version": "0.0.9"
+}

libs/chain-info/src/lib/index.ts

@@ -2,7 +2,7 @@ import axios from 'axios';
 import { BafError } from '@baf-wallet/errors';
 import 'reflect-metadata';
 import { jsonObject, jsonMember, TypedJSON, jsonArrayMember } from 'typedjson';
-import { Chain } from '@baf-wallet/interfaces';
+import { Chain, ChainAsType } from '@baf-wallet/interfaces';
 
 const baseRawUrl = 'https://raw.githubusercontent.com/bafnetwork/assets/master';
 const contentsApiUrl =
@@ -49,7 +49,7 @@ class _TokenInfo {
 }
 
 export interface TokenInfo extends _TokenInfo {
-  chain: Chain;
+  chain: Chain | ChainAsType;
 }
 
 // TODO: have some intelligent way to get the rest
@@ -87,16 +87,16 @@ export type DappUrl =
   | 'uniswap.exchange'
   | 'yearn.finance';
 
-export const getChainFolderPrefix = (chain: Chain): string =>
+export const getChainFolderPrefix = (chain: Chain | ChainAsType): string =>
   `${baseRawUrl}/blockchains/${chain}`;
 
 const getNonNativeTokenInfoUrl = (
-  chain: Chain,
+  chain: Chain | ChainAsType,
   contractAddress: string
 ): string =>
   `${getChainFolderPrefix(chain)}/assets/${contractAddress}/info.json`;
 
-const getChainInfoUrl = (chain: Chain): string =>
+const getChainInfoUrl = (chain: Chain | ChainAsType): string =>
   `${getChainFolderPrefix(chain)}/info/info.json`;
 
 const getNonNativeTokenLogoUrl = (
@@ -137,7 +137,7 @@ export async function getContractAddresses(
 }
 
 export async function getTokenInfo(
-  chain: Chain,
+  chain: Chain | ChainAsType,
   contractAddress?: string
 ): Promise<TokenInfo> {
   const tokenIsChain = chain === contractAddress || !contractAddress;

libs/core-publishable/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["@nrwl/web/babel"]
+}

libs/core-publishable/.eslintrc.json

@@ -0,0 +1,21 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "parserOptions": {
+        "project": ["libs/core-publishable/tsconfig.*?.json"]
+      },
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

libs/core-publishable/README.md

@@ -0,0 +1,7 @@
+# core-publishable
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test core-publishable` to execute the unit tests via [Jest](https://jestjs.io).

libs/core-publishable/jest.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+  displayName: 'core-publishable',
+  preset: '../../jest.preset.js',
+  globals: {
+    'ts-jest': {
+      tsConfig: '<rootDir>/tsconfig.spec.json',
+    },
+  },
+  transform: {
+    '^.+\\.[tj]sx?$': 'ts-jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../coverage/libs/core-publishable',
+};

libs/core-publishable/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@baf-wallet/core",
+  "version": "0.0.16"
+}

libs/core-publishable/src/errors/index.ts

@@ -0,0 +1 @@
+export * from '@baf-wallet/errors';

libs/core-publishable/src/index.ts

@@ -0,0 +1,2 @@
+export * from '@baf-wallet/crypto';
+export * from '@baf-wallet/chain-info';

libs/core-publishable/src/interfaces/index.ts

@@ -0,0 +1 @@
+export * from '@baf-wallet/interfaces';

libs/core-publishable/src/utils/index.ts

@@ -0,0 +1 @@
+export * from '@baf-wallet/utils';

libs/core-publishable/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "compilerOptions": {},
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}

libs/core-publishable/tsconfig.lib.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "exclude": ["**/*.spec.ts"],
+  "include": ["**/*.ts"]
+}

libs/core-publishable/tsconfig.spec.json

@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "**/*.spec.ts",
+    "**/*.spec.tsx",
+    "**/*.spec.js",
+    "**/*.spec.jsx",
+    "**/*.d.ts"
+  ]
+}

libs/crypto/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@baf-wallet/crypto",
+  "version": "0.0.12"
+}

libs/crypto/src/lib/hash.ts

@@ -9,4 +9,4 @@ export function sha256(msg: Buffer): Buffer {
   return Buffer.from(js_sha256(msg), 'hex');
 }
 
-// add more wrappers here as needed
+// add more wrappers here as we need

libs/crypto/tsconfig.lib.json

@@ -1,8 +1,10 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "module": "commonjs",
     "outDir": "../../dist/out-tsc",
-    "types": []
+    "declaration": true,
+    "types": ["node"]
   },
   "include": ["**/*.ts"],
   "exclude": ["**/*.spec.ts"]

libs/dist/libs/interfaces/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@baf-wallet/interfaces",
+  "version": "0.0.12",
+  "main": "src/index.js",
+  "typings": "src/index.d.ts",
+  "dependencies": {
+    "near-api-js": "^0.39.0",
+    "buffer": "^5.7.1",
+    "@toruslabs/torus-direct-web-sdk": "^4.11.1"
+  },
+  "peerDependencies": {}
+}

libs/errors/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@baf-wallet/errors",
+  "version": "0.0.7"
+}

libs/interfaces/dist/libs/interfaces/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "@baf-wallet/interfaces",
+  "version": "0.0.3",
+  "license": "MIT",
+  "main": "src/index.js",
+  "typings": "src/index.d.ts",
+  "dependencies": {
+    "near-api-js": "^0.39.0",
+    "buffer": "^5.7.1",
+    "@toruslabs/torus-direct-web-sdk": "^4.11.1"
+  },
+  "peerDependencies": {}
+}

libs/interfaces/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@baf-wallet/interfaces",
+  "version": "0.0.13"
+}

libs/interfaces/src/index.ts

@@ -5,3 +5,4 @@ export * from './lib/keysource';
 export * from './lib/crypto';
 export * from './lib/frontend';
 export * from './lib/tx';
+export * from './lib/misc';

libs/interfaces/src/lib/chains.ts

@@ -1,11 +1,13 @@
 import { PublicKey, SecretKey, KeyPair, secp256k1, ed25519 } from './crypto';
-import { Pair } from '@baf-wallet/utils';
 import { Account as NearAccount } from 'near-api-js';
 import { GenericTxAction, GenericTxParams } from './tx';
 import { Env } from './configs';
+import { Pair } from './misc';
 
+export type ChainAsType = 'near' | 'ethereum';
 export enum Chain {
   NEAR = 'near',
+  ETHEREUM = 'ethereum',
 }
 
 // Or the type with all the supported chain account types

libs/interfaces/src/lib/misc.ts

@@ -0,0 +1,4 @@
+export type Pair<T, U> = {
+  fst: T;
+  snd: U;
+};

libs/multi-chain/src/lib/index.ts

@@ -1,3 +1,2 @@
 export * from './types';
 export * from './switches';
-export * from './utils';

libs/near/src/lib/tx.ts

@@ -11,8 +11,8 @@ import {
   GenericTxActionTransfer,
   GenericTxActionTransferContractToken,
   Chain,
+  Pair,
 } from '@baf-wallet/interfaces';
-import { Pair, getEnumValues } from '@baf-wallet/utils';
 import { sha256 } from '@baf-wallet/crypto';
 import { Buffer } from 'buffer';
 import BN from 'bn.js';