Remove old SecretNetwork API support

packages/background/src/secret-wasm/enigma-utils.ts

@@ -2,18 +2,13 @@ import { generateKeyPair, sharedKey as x25519 } from "curve25519-js";
 import { hkdf } from "@noble/hashes/hkdf";
 import { sha256 } from "@noble/hashes/sha256";
 import * as miscreant from "miscreant";
-import {
-  simpleFetch,
-  isSimpleFetchError,
-  SimpleFetchError,
-} from "@keplr-wallet/simple-fetch";
+import { simpleFetch } from "@keplr-wallet/simple-fetch";
 import { Buffer } from "buffer/";
 import { ChainIdHelper } from "@keplr-wallet/cosmos";
 
 const cryptoProvider = new miscreant.PolyfillCryptoProvider();
 
 export interface EncryptionUtils {
-  isNewApi: boolean;
   getPubkey: () => Promise<Uint8Array>;
   decrypt: (ciphertext: Uint8Array, nonce: Uint8Array) => Promise<Uint8Array>;
   encrypt: (contractCodeHash: string, msg: object) => Promise<Uint8Array>;
@@ -34,7 +29,6 @@ const secretConsensusIoPubKey = new Uint8Array(
 export class EnigmaUtils implements EncryptionUtils {
   private readonly privkey: Uint8Array;
   public readonly pubkey: Uint8Array;
-  public isNewApi: boolean;
   private consensusIoPubKey: Uint8Array = new Uint8Array(); // cache
 
   public constructor(
@@ -55,7 +49,6 @@ export class EnigmaUtils implements EncryptionUtils {
     if (ChainIdHelper.parse(chainId).identifier === "secret") {
       this.consensusIoPubKey = secretConsensusIoPubKey;
     }
-    this.isNewApi = false;
   }
 
   private static secureRandom(count: number): Uint8Array {
@@ -78,36 +71,14 @@ export class EnigmaUtils implements EncryptionUtils {
       return this.consensusIoPubKey;
     }
 
-    // try to fetch from the old API
-    try {
-      const response = await simpleFetch<{ result: { TxKey: string } }>(
-        this.url,
-        "/reg/tx-key"
-      );
-
-      this.consensusIoPubKey = new Uint8Array(
-        Buffer.from(response.data.result.TxKey, "base64")
-      );
-    } catch (e: any) {
-      if (
-        !isSimpleFetchError(e) ||
-        !(e as SimpleFetchError).response ||
-        (e as SimpleFetchError).response?.status != 501
-      ) {
-        throw e;
-      }
-
-      // if old API is not implemented, use the new one
-      const response = await simpleFetch<{ key: string }>(
-        this.url,
-        "/registration/v1beta1/tx-key"
-      );
-
-      this.consensusIoPubKey = new Uint8Array(
-        Buffer.from(response.data.key, "base64")
-      );
-      this.isNewApi = true;
-    }
+    const response = await simpleFetch<{ key: string }>(
+      this.url,
+      "/registration/v1beta1/tx-key"
+    );
+
+    this.consensusIoPubKey = new Uint8Array(
+      Buffer.from(response.data.key, "base64")
+    );
 
     return this.consensusIoPubKey;
   }

packages/background/src/secret-wasm/handler.ts

@@ -10,7 +10,6 @@ import {
   GetTxEncryptionKeyMsg,
   ReqeustEncryptMsg,
   RequestDecryptMsg,
-  IsNewApiMsg,
 } from "./messages";
 import { SecretWasmService } from "./service";
 import { PermissionInteractiveService } from "../permission-interactive";
@@ -41,11 +40,6 @@ export const getHandler: (
           service,
           permissionInteractionService
         )(env, msg as GetTxEncryptionKeyMsg);
-      case IsNewApiMsg:
-        return handleIsNewApiMsg(service, permissionInteractionService)(
-          env,
-          msg as IsNewApiMsg
-        );
       default:
         throw new KeplrError("secret-wasm", 120, "Unknown msg type");
     }
@@ -70,21 +64,6 @@ const handleGetPubkeyMsg: (
   };
 };
 
-const handleIsNewApiMsg: (
-  service: SecretWasmService,
-  permissionInteractionService: PermissionInteractiveService
-) => InternalHandler<IsNewApiMsg> = (service, permissionInteractionService) => {
-  return async (env, msg) => {
-    await permissionInteractionService.ensureEnabled(
-      env,
-      [msg.chainId],
-      msg.origin
-    );
-
-    return await service.isNewApi(msg.chainId);
-  };
-};
-
 const handleReqeustEncryptMsg: (
   service: SecretWasmService,
   permissionInteractionService: PermissionInteractiveService

packages/background/src/secret-wasm/init.ts

@@ -4,7 +4,6 @@ import {
   GetTxEncryptionKeyMsg,
   ReqeustEncryptMsg,
   RequestDecryptMsg,
-  IsNewApiMsg,
 } from "./messages";
 import { SecretWasmService } from "./service";
 import { ROUTE } from "./constants";
@@ -20,7 +19,6 @@ export function init(
   router.registerMessage(ReqeustEncryptMsg);
   router.registerMessage(RequestDecryptMsg);
   router.registerMessage(GetTxEncryptionKeyMsg);
-  router.registerMessage(IsNewApiMsg);
 
   router.addHandler(ROUTE, getHandler(service, permissionInteractionService));
 }

packages/background/src/secret-wasm/messages.ts

@@ -145,31 +145,3 @@ export class GetTxEncryptionKeyMsg extends Message<Uint8Array> {
     return GetTxEncryptionKeyMsg.type();
   }
 }
-
-export class IsNewApiMsg extends Message<boolean> {
-  public static type() {
-    return "is-new-api-msg";
-  }
-
-  constructor(public readonly chainId: string) {
-    super();
-  }
-
-  validateBasic(): void {
-    if (!this.chainId) {
-      throw new KeplrError("secret-wasm", 100, "chain id not set");
-    }
-  }
-
-  override approveExternal(): boolean {
-    return true;
-  }
-
-  route(): string {
-    return ROUTE;
-  }
-
-  type(): string {
-    return IsNewApiMsg.type();
-  }
-}

packages/background/src/secret-wasm/service.ts

@@ -75,19 +75,6 @@ export class SecretWasmService {
     return utils.getTxEncryptionKey(nonce);
   }
 
-  async isNewApi(chainId: string): Promise<boolean> {
-    const chainInfo = await this.chainsService.getChainInfoOrThrow(chainId);
-
-    // XXX: Keplr should generate the seed deterministically according to the account.
-    // Otherwise, it will lost the encryption/decryption key if Keplr is uninstalled or local storage is cleared.
-    // For now, use the signature of some string to generate the seed.
-    // It need to more research.
-    const seed = await this.getSeed(chainInfo);
-
-    const utils = this.getEnigmaUtils(chainInfo, seed);
-    return utils.isNewApi;
-  }
-
   async encrypt(
     chainId: string,
     contractCodeHash: string,

packages/proto-types/outputHash

@@ -1 +1 @@
-47xVj6yH8GxPnu1BOIH1MiJVtlE6POLMYvtUZYTBu/5MPH+/VZKmDSx8zscGTLTJpxn9rxdR/+cPKXJdeaqXzulJEYlXTSU7x80PSUD7rlp2mWT0RYGFDIN+Fik5sFOv7Um1WRmAnzsEu+hDNatREyB47p1Gxms6JX0klLRyAyxUnUJRvDIjqQiAHvjtBGK0z5Fgtw08ei6MwIGQTf1GQHMO/FAQfd3uq8plIG5KNxinIvHEhmHGgaIg4xI/FZ/rWiyM34f1rcsIV73pCYbInRh3jcatX/QI80oBDMXBo9DCv5IaZQQs1G7JPcfzThPmjPz23bqwLBrP7svv9Bpxo/uu41Y=
+47xVj6yH8GxPnu1BOIH1MiJVtlE6POLMYvtUZYTBu/5MPH+/VZKmDSx8zscGTLTJpxn9rxdR/+cPKXJdeaqXzulJEYlXTSU7x80PSUD7rlp2mWT0RYGFDIN+Fik5sFOv7Um1WRmAnzsEu+hDNatREyB47p1Gxms6JX0klLRyAyxUnUJRvDIjqQiAHvjtBGK0z5Fgtw08ei6MwIGQTf1GQHMO/FAQfd3uq8plIG5KNxinIvHEJBjkhyq92cibi/d/z27lUxEPyuoIV73pCYbInRh3jcatX/QI80oBDMXBo9DCv5IaZQQs1G7JPcfzThPmjPz23bqwLBrP7svv9Bpxo/uu41Y=