refactor: moved codecs and changed generate.ts->generateWallet.ts

TICKET: WP-5415

Author: danielzhao122

modules/express/src/clientRoutes.ts

@@ -639,7 +639,7 @@ export async function handleV2OFCSignPayload(
  */
 export async function handleV2GenerateWallet(req: ExpressApiRouteRequest<'express.wallet.generate', 'post'>) {
   const bitgo = req.bitgo;
-  const coin = bitgo.coin(req.params.coin);
+  const coin = bitgo.coin(req.decoded.coin);
   const result = await coin.wallets().generateWallet(req.body);
   if (req.query.includeKeychains === 'false') {
     return result.wallet.toJSON();

modules/express/src/typedRoutes/api/index.ts

@@ -26,7 +26,7 @@ import { PostCreateAddress } from './v2/createAddress';
 import { PutFanoutUnspents } from './v1/fanoutUnspents';
 import { PostOfcSignPayload } from './v2/ofcSignPayload';
 import { PostWalletRecoverToken } from './v2/walletRecoverToken';
-import { PostGenerateWallet } from './v2/generate';
+import { PostGenerateWallet } from './v2/generateWallet';
 
 export const ExpressApi = apiSpec({
   'express.ping': {

modules/express/src/typedRoutes/api/v2/generate.ts renamed to modules/express/src/typedRoutes/api/v2/generateWallet.ts

@@ -1,7 +1,8 @@
 import * as t from 'io-ts';
 import { httpRoute, httpRequest, optional } from '@api-ts/io-ts-http';
 import { BitgoExpressError } from '../../schemas/error';
-import { UserKeychainCodec, BackupKeychainCodec, BitgoKeychainCodec } from '../../../wallet/codec';
+import { UserKeychainCodec, BackupKeychainCodec, BitgoKeychainCodec } from '../../schemas/keychain';
+import { multisigType, walletType } from '../../schemas/wallet';
 
 /**
  * Request body for wallet generation.
@@ -12,9 +13,9 @@ export const GenerateWalletBody = {
   /** Enterprise id. This is required for Ethereum wallets since they can only be created as part of an enterprise */
   enterprise: t.string,
   /** If absent, BitGo uses the default wallet type for the asset */
-  multisigType: optional(t.union([t.literal('onchain'), t.literal('tss'), t.literal('blsdkg')])),
+  multisigType: multisigType,
   /** The type of wallet, defined by key management and signing protocols. 'hot' and 'cold' are both self-managed wallets. If absent, defaults to 'hot' */
-  type: optional(t.union([t.literal('hot'), t.literal('cold'), t.literal('custodial')])),
+  type: walletType,
   /** Passphrase to be used to encrypt the user key on the wallet */
   passphrase: optional(t.string),
   /** User provided public key */

modules/express/src/wallet/codec.ts renamed to modules/express/src/typedRoutes/schemas/keychain.ts

@@ -0,0 +1,5 @@
+import * as t from 'io-ts';
+
+export const multisigType = t.union([t.literal('onchain'), t.literal('tss'), t.literal('blsdkg')]);
+
+export const walletType = t.union([t.literal('hot'), t.literal('cold'), t.literal('custodial')]);

modules/express/src/typedRoutes/schemas/wallet.ts

@@ -9,7 +9,7 @@ import '../../lib/asserts';
 
 import { ExpressApiRouteRequest } from '../../../src/typedRoutes/api';
 import { handleV2GenerateWallet } from '../../../src/clientRoutes';
-import { GenerateWalletResponse } from '../../../src/typedRoutes/api/v2/generate';
+import { GenerateWalletResponse } from '../../../src/typedRoutes/api/v2/generateWallet';
 
 describe('Generate Wallet', () => {
   let bitgo: TestBitGoAPI;
@@ -91,6 +91,7 @@ describe('Generate Wallet', () => {
       body: walletGenerateBody,
       decoded: {
         ...walletGenerateBody,
+        coin,
       },
     } as unknown as ExpressApiRouteRequest<'express.wallet.generate', 'post'>;
 
@@ -105,6 +106,7 @@ describe('Generate Wallet', () => {
       body: walletGenerateBody,
       decoded: {
         ...walletGenerateBody,
+        coin,
       },
     } as unknown as ExpressApiRouteRequest<'express.wallet.generate', 'post'>;
 
@@ -189,6 +191,7 @@ describe('Generate Wallet', () => {
       body: walletGenerateBody,
       decoded: {
         ...walletGenerateBody,
+        coin,
       },
     } as unknown as ExpressApiRouteRequest<'express.wallet.generate', 'post'>;