Revert "Hsm 432/hardcode pub gpg keys"

BitGo · Nov 7, 2024 · 0feaed5 · 0feaed5
1 parent 4fd3138
commit 0feaed5
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 365 deletions.
diff --git a/modules/bitgo/test/v2/unit/internal/tssUtils/bitgoMpcGpgPubKeys.ts b/modules/bitgo/test/v2/unit/internal/tssUtils/bitgoMpcGpgPubKeys.ts
diff --git a/modules/express/test/unit/clientRoutes/externalSign.ts b/modules/express/test/unit/clientRoutes/externalSign.ts
@@ -367,7 +367,6 @@ describe('External signer', () => {
     const reqCommitment = {
       bitgo: bgTest,
       body: {
-        bitgoGpgPubKey: bitgoGpgKey.public,
         txRequest: {
           apiVersion: 'full',
           walletId: walletID,

diff --git a/modules/sdk-core/src/bitgo/keychain/iKeychains.ts b/modules/sdk-core/src/bitgo/keychain/iKeychains.ts
@@ -1,6 +1,5 @@
 import { IRequestTracer } from '../../api';
 import { KeychainsTriplet, KeyPair } from '../baseCoin';
-import { BitgoPubKeyType } from '../utils/tss/baseTypes';
 import { BackupProvider, IWallet } from '../wallet';
 import { BitGoKeyFromOvcShares, OvcToBitGoJSON } from './ovcJsonCodec';
 
@@ -40,7 +39,6 @@ export interface Keychain {
   commonKeychain?: string;
   keyShares?: ApiKeyShare[];
   walletHSMGPGPublicKeySigs?: string;
-  hsmType?: BitgoPubKeyType;
   type: KeyType;
   source?: SourceType;
   coinSpecific?: { [coinName: string]: unknown };

diff --git a/modules/sdk-core/src/bitgo/tss/bitgoPubKeys.ts b/modules/sdk-core/src/bitgo/tss/bitgoPubKeys.ts
diff --git a/modules/sdk-core/src/bitgo/tss/index.ts b/modules/sdk-core/src/bitgo/tss/index.ts
@@ -3,7 +3,6 @@ import ECDSAMethods, { ECDSAMethodTypes, DKLSMethods } from './ecdsa';
 
 export { EDDSAMethods, EDDSAMethodTypes, ECDSAMethods, ECDSAMethodTypes, DKLSMethods };
 export { ShareKeyPosition } from './types';
-export * as BitgoMpcGpgPubKeys from './bitgoPubKeys';
 
 // exporting this types for backward compatibility.
 /** @deprecated Use EDDSAMethods */

diff --git a/modules/sdk-core/src/bitgo/utils/mpcUtils.ts b/modules/sdk-core/src/bitgo/utils/mpcUtils.ts
@@ -9,7 +9,6 @@ import { AddKeychainOptions, Keychain, KeyType } from '../keychain';
 import { BackupProvider } from '../wallet';
 import { encryptText, getBitgoGpgPubKey } from './opengpgUtils';
 import { IntentRecipient, PopulatedIntent, PrebuildTransactionWithIntentOptions } from './tss/baseTypes';
-import { envRequiresBitgoPubGpgKeyConfig, isBitgoMpcPubKey } from '../tss/bitgoPubKeys';
 
 export interface MpcKeyShare {
   publicShare: string;
@@ -53,10 +52,6 @@ export abstract class MpcUtils {
     enterprise?: string
   ): Promise<Keychain> {
     const bitgoKey = (await getBitgoGpgPubKey(this.bitgo)).mpcV1;
-    if (envRequiresBitgoPubGpgKeyConfig(this.bitgo.getEnv())) {
-      // Ensure the public key is one of the expected BitGo public keys when in test or prod.
-      assert(isBitgoMpcPubKey(bitgoKey.armor(), 'mpcv1'), 'Invalid BitGo GPG public key');
-    }
     const encUserToBitGoMessage = await encryptText(userKeyShare.privateShare, bitgoKey);
     const encBackupToBitGoMessage = await encryptText(backupKeyShare.privateShare, bitgoKey);