isDigest Removal

planetarium · Oct 30, 2023 · a3e4579 · a3e4579 · github-actions · Oct 30, 2023
1 parent 83612b1
commit a3e4579
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 28 deletions.
diff --git a/@planetarium/account-aws-kms/package.json b/@planetarium/account-aws-kms/package.json
@@ -4,11 +4,21 @@
   "description": "Libplanet account implementation using AWS KMS",
   "type": "module",
   "main": "./dist/index.js",
+  "imports": {
+    "#crypto": {
+      "node": "./src/crypto/node.ts",
+      "default": "./src/crypto/browser.ts"
+    }
+  },
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "node": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.js",
+        "require": "./dist/index.cjs"
+      },
+      "browser": "./dist/index.browser.mjs",
+      "default": "./dist/index.js"
     }
   },
   "files": [

diff --git a/@planetarium/account-aws-kms/src/AwsKmsAccount.ts b/@planetarium/account-aws-kms/src/AwsKmsAccount.ts
@@ -1,6 +1,7 @@
 import { AwsKmsKeyId } from "./AwsKmsKeyId.js";
 import { KMSClient, SignCommand } from "@aws-sdk/client-kms";
 import { Signature as NobleSignature } from "@noble/secp256k1";
+import { crypto } from "#crypto";
 import {
   Address,
   type Account,
@@ -36,9 +37,20 @@ export class AwsKmsAccount implements Account {
   }
 
   async sign(message: Message, isDigest: boolean = false): Promise<Signature> {
+    let finalMessage = message;
+
+    if (isDigest) {
+      const digest = await crypto.subtle.digest(
+        "SHA-256",
+        crypto.encode(message)
+      );
+      const digestArray = new Uint8Array(digest);
+      finalMessage = digestArray;
+    }
+
     const cmd = new SignCommand({
       KeyId: this.keyId,
-      Message: message,
+      Message: finalMessage,
       MessageType: isDigest ? "DIGEST" : "RAW",
       SigningAlgorithm: "ECDSA_SHA_256",
     });

diff --git a/@planetarium/tx/src/crypto/browser.ts → ...ium/account-aws-kms/src/crypto/browser.ts b/@planetarium/tx/src/crypto/browser.ts → ...ium/account-aws-kms/src/crypto/browser.ts
diff --git a/@planetarium/tx/src/crypto/node.ts → ...tarium/account-aws-kms/src/crypto/node.ts b/@planetarium/tx/src/crypto/node.ts → ...tarium/account-aws-kms/src/crypto/node.ts
diff --git a/@planetarium/account/src/Account.ts b/@planetarium/account/src/Account.ts
@@ -7,7 +7,7 @@ import Signature from "./Signature.js";
 export interface Account {
   getAddress(): Promise<Address>;
   getPublicKey(): Promise<PublicKey>;
-  sign(message: Message, isDigest?: boolean): Promise<Signature>;
+  sign(message: Message): Promise<Signature>;
 }
 
 export function isAccount(account: unknown): account is Account {

diff --git a/@planetarium/tx/package.json b/@planetarium/tx/package.json
@@ -4,21 +4,11 @@
   "description": "Creating Libplanet transactions from JavaScript/TypeScript",
   "type": "module",
   "main": "./dist/index.js",
-  "imports": {
-    "#crypto": {
-      "node": "./src/crypto/node.ts",
-      "default": "./src/crypto/browser.ts"
-    }
-  },
   "exports": {
     ".": {
-      "node": {
-        "types": "./dist/index.d.ts",
-        "import": "./dist/index.js",
-        "require": "./dist/index.cjs"
-      },
-      "browser": "./dist/index.browser.mjs",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
     }
   },
   "types": "./dist/index.d.ts",

diff --git a/@planetarium/tx/src/assets.ts b/@planetarium/tx/src/assets.ts
@@ -1,6 +1,5 @@
 import { encode, RecordValue, RecordView, Value } from "@planetarium/bencodex";
 import { Address, encodeAddressSet } from "./address.js";
-import { crypto } from "#crypto";
 
 export interface Currency {
   ticker: string;

diff --git a/@planetarium/tx/src/tx/signed.ts b/@planetarium/tx/src/tx/signed.ts
@@ -1,6 +1,5 @@
 import { BencodexDictionary, Dictionary, encode } from "@planetarium/bencodex";
 import { Account, Address, Signature } from "@planetarium/account";
-import { crypto } from "#crypto";
 import { type UnsignedTx, encodeUnsignedTx } from "./unsigned.js";
 import { bytesEqual } from "../bytes.js";
 
@@ -10,8 +9,7 @@ export type SignedTx<T extends UnsignedTx> = T & { signature: Signature };
 
 export async function signTx(
   tx: UnsignedTx,
-  signAccount: Account,
-  isDigest: boolean = false
+  signAccount: Account
 ): Promise<SignedTx<typeof tx>> {
   if (
     !bytesEqual(
@@ -29,12 +27,6 @@ export async function signTx(
     throw new Error("The transaction signer does not match to the signAccount");
   }
   const payload = encodeUnsignedTx(tx);
-  if (isDigest) {
-    const digest = await crypto.subtle.digest("SHA-256", encode(payload));
-    const array = new Uint8Array(digest);
-    const signature = await signAccount.sign(array, true);
-    return { ...tx, signature };
-  }
   const signature = await signAccount.sign(encode(payload));
   return {
     ...tx,