Merge pull request #1902 from cosmos/non-async

Remove unnecessary async for Secp256k1 functions (Simon's version)

Author: webmaster128

CHANGELOG.md

@@ -81,6 +81,10 @@ and this project adheres to
 
   in case you want to support multiple versions. ([#1866])
 
+- @cosmjs/crypto: Make
+  `Secp256k1.verifySignature`/`.createSignature`/`.makeKeypair` synchonous and
+  let them not return a Promise.
+
 [#1883]: https://github.com/cosmos/cosmjs/issues/1883
 [#1866]: https://github.com/cosmos/cosmjs/issues/1866
 

packages/amino/src/secp256k1hdwallet.spec.ts

@@ -255,7 +255,7 @@ describe("Secp256k1HdWallet", () => {
       };
       const { signed, signature } = await wallet.signAmino(defaultAddress, signDoc);
       expect(signed).toEqual(signDoc);
-      const valid = await Secp256k1.verifySignature(
+      const valid = Secp256k1.verifySignature(
         Secp256k1Signature.fromFixedLength(fromBase64(signature.signature)),
         sha256(serializeSignDoc(signed)),
         defaultPubkey,

packages/amino/src/secp256k1hdwallet.ts

@@ -269,7 +269,7 @@ export class Secp256k1HdWallet implements OfflineAminoSigner {
   }
 
   public async getAccounts(): Promise<readonly AccountData[]> {
-    const accountsWithPrivkeys = await this.getAccountsWithPrivkeys();
+    const accountsWithPrivkeys = this.getAccountsWithPrivkeys();
     return accountsWithPrivkeys.map(({ algo, pubkey, address }) => ({
       algo: algo,
       pubkey: pubkey,
@@ -278,14 +278,14 @@ export class Secp256k1HdWallet implements OfflineAminoSigner {
   }
 
   public async signAmino(signerAddress: string, signDoc: StdSignDoc): Promise<AminoSignResponse> {
-    const accounts = await this.getAccountsWithPrivkeys();
+    const accounts = this.getAccountsWithPrivkeys();
     const account = accounts.find(({ address }) => address === signerAddress);
     if (account === undefined) {
       throw new Error(`Address ${signerAddress} not found in wallet`);
     }
     const { privkey, pubkey } = account;
     const message = sha256(serializeSignDoc(signDoc));
-    const signature = await Secp256k1.createSignature(message, privkey);
+    const signature = Secp256k1.createSignature(message, privkey);
     const signatureBytes = new Uint8Array([...signature.r(32), ...signature.s(32)]);
     return {
       signed: signDoc,
@@ -347,27 +347,25 @@ export class Secp256k1HdWallet implements OfflineAminoSigner {
     return JSON.stringify(out);
   }
 
-  private async getKeyPair(hdPath: HdPath): Promise<Secp256k1Keypair> {
+  private getKeyPair(hdPath: HdPath): Secp256k1Keypair {
     const { privkey } = Slip10.derivePath(Slip10Curve.Secp256k1, this.seed, hdPath);
-    const { pubkey } = await Secp256k1.makeKeypair(privkey);
+    const { pubkey } = Secp256k1.makeKeypair(privkey);
     return {
       privkey: privkey,
       pubkey: Secp256k1.compressPubkey(pubkey),
     };
   }
 
-  private async getAccountsWithPrivkeys(): Promise<readonly AccountDataWithPrivkey[]> {
-    return Promise.all(
-      this.accounts.map(async ({ hdPath, prefix }) => {
-        const { privkey, pubkey } = await this.getKeyPair(hdPath);
-        const address = toBech32(prefix, rawSecp256k1PubkeyToRawAddress(pubkey));
-        return {
-          algo: "secp256k1" as const,
-          privkey: privkey,
-          pubkey: pubkey,
-          address: address,
-        };
-      }),
-    );
+  private getAccountsWithPrivkeys(): readonly AccountDataWithPrivkey[] {
+    return this.accounts.map(({ hdPath, prefix }) => {
+      const { privkey, pubkey } = this.getKeyPair(hdPath);
+      const address = toBech32(prefix, rawSecp256k1PubkeyToRawAddress(pubkey));
+      return {
+        algo: "secp256k1" as const,
+        privkey: privkey,
+        pubkey: pubkey,
+        address: address,
+      };
+    });
   }
 }

packages/amino/src/secp256k1wallet.spec.ts

@@ -42,7 +42,7 @@ describe("Secp256k1Wallet", () => {
       };
       const { signed, signature } = await signer.signAmino(defaultAddress, signDoc);
       expect(signed).toEqual(signDoc);
-      const valid = await Secp256k1.verifySignature(
+      const valid = Secp256k1.verifySignature(
         Secp256k1Signature.fromFixedLength(fromBase64(signature.signature)),
         new Sha256(serializeSignDoc(signed)).digest(),
         defaultPubkey,

packages/amino/src/secp256k1wallet.ts

@@ -19,7 +19,7 @@ export class Secp256k1Wallet implements OfflineAminoSigner {
    * @param prefix The bech32 address prefix (human readable part). Defaults to "cosmos".
    */
   public static async fromKey(privkey: Uint8Array, prefix = "cosmos"): Promise<Secp256k1Wallet> {
-    const uncompressed = (await Secp256k1.makeKeypair(privkey)).pubkey;
+    const uncompressed = Secp256k1.makeKeypair(privkey).pubkey;
     return new Secp256k1Wallet(privkey, Secp256k1.compressPubkey(uncompressed), prefix);
   }
 
@@ -52,7 +52,7 @@ export class Secp256k1Wallet implements OfflineAminoSigner {
       throw new Error(`Address ${signerAddress} not found in wallet`);
     }
     const message = new Sha256(serializeSignDoc(signDoc)).digest();
-    const signature = await Secp256k1.createSignature(message, this.privkey);
+    const signature = Secp256k1.createSignature(message, this.privkey);
     const signatureBytes = new Uint8Array([...signature.r(32), ...signature.s(32)]);
     return {
       signed: signDoc,