@ckb-ccc/core 0.0.3-alpha.0 → 0.0.3

package/dist/bytes/advanced.d.ts

@@ -0,0 +1,2 @@
+export type BytesFromEncoding = "utf8" | "utf16le" | "latin1" | "base64" | "base64url" | "hex" | "ascii" | "binary" | "ucs2";
+//# sourceMappingURL=advanced.d.ts.map

package/dist/bytes/advanced.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"advanced.d.ts","sourceRoot":"","sources":["../../src/bytes/advanced.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,iBAAiB,GACzB,MAAM,GACN,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,WAAW,GACX,KAAK,GACL,OAAO,GACP,QAAQ,GACR,MAAM,CAAC"}

package/dist/bytes/advanced.js

@@ -0,0 +1 @@
+export {};

package/dist/bytes/index.d.ts

@@ -1,7 +1,7 @@
+import { BytesFromEncoding } from "./advanced";
 export type Bytes = Uint8Array;
 export type BytesLike = string | Uint8Array | ArrayBuffer | number[];
 export declare function bytesConcat(...args: BytesLike[]): Bytes;
-export declare function bytesFromUtf8(val: string): Bytes;
-export declare function bytesToUtf8(val: BytesLike): string;
-export declare function bytesFrom(bytes: BytesLike): Bytes;
+export declare function bytesTo(val: BytesLike, encoding: BytesFromEncoding): string;
+export declare function bytesFrom(bytes: BytesLike, encoding?: BytesFromEncoding): Bytes;
 //# sourceMappingURL=index.d.ts.map

package/dist/bytes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bytes/index.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC;AAC/B,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,EAAE,CAAC;AAErE,wBAAgB,WAAW,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAOvD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAEhD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAElD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,CAuBjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bytes/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC;AAC/B,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,EAAE,CAAC;AAErE,wBAAgB,WAAW,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAOvD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CAE3E;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,SAAS,EAChB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,KAAK,CA2BP"}

package/dist/bytes/index.js

@@ -5,13 +5,10 @@ export function bytesConcat(...args) {
         return acc;
     }, []));
 }
-export function bytesFromUtf8(val) {
-    return Buffer.from(val, "utf-8");
+export function bytesTo(val, encoding) {
+    return Buffer.from(bytesFrom(val)).toString(encoding);
 }
-export function bytesToUtf8(val) {
-    return Buffer.from(bytesFrom(val)).toString("utf-8");
-}
-export function bytesFrom(bytes) {
+export function bytesFrom(bytes, encoding) {
     if (bytes instanceof Uint8Array) {
         return bytes;
     }
@@ -24,6 +21,9 @@ export function bytesFrom(bytes) {
         }
         return new Uint8Array(bytes);
     }
+    if (encoding !== undefined) {
+        return Buffer.from(bytes, encoding);
+    }
     const str = bytes.startsWith("0x") ? bytes.slice(2) : bytes;
     const paddedStr = str.length % 2 === 0 ? str : `0${str}`;
     const data = Buffer.from(paddedStr, "hex");

package/dist/ckb/transaction.js

@@ -210,10 +210,10 @@ export class Transaction {
         return bytesFrom(mol.SerializeRawTransaction({
             version: numToBytes(this.version, 4),
             cellDeps: this.cellDeps.map((d) => d._toMolData()),
-            headerDeps: this.headerDeps.map(bytesFrom),
+            headerDeps: this.headerDeps.map((header) => bytesFrom(header)),
             inputs: this.inputs.map((i) => i._toMolData()),
             outputs: this.outputs.map((o) => o._toMolData()),
-            outputsData: this.outputsData.map(bytesFrom),
+            outputsData: this.outputsData.map((header) => bytesFrom(header)),
         }));
     }
     hash() {

package/dist/hasher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hasher/index.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,SAAS,EAA4B,MAAM,UAAU,CAAC;AAC/D,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAG7B,qBAAa,MAAM;IACjB,MAAM,EAAE,OAAO,CAAC;gBAEJ,SAAS,SAAK,EAAE,QAAQ,SAAuB;IAS3D,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAK/B,MAAM,IAAI,GAAG;CAGd;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,GAAG,CAE5C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hasher/index.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAa,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAG7B,qBAAa,MAAM;IACjB,MAAM,EAAE,OAAO,CAAC;gBAEJ,SAAS,SAAK,EAAE,QAAQ,SAAuB;IAS3D,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAK/B,MAAM,IAAI,GAAG;CAGd;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,GAAG,CAE5C"}

package/dist/hasher/index.js

@@ -1,9 +1,9 @@
 import blake2b from "blake2b";
-import { bytesFrom, bytesFromUtf8 } from "../bytes";
+import { bytesFrom } from "../bytes";
 import { CKB_BLAKE2B_PERSONAL } from "./advanced";
 export class Hasher {
     constructor(outLength = 32, personal = CKB_BLAKE2B_PERSONAL) {
-        this.hasher = blake2b(outLength, undefined, undefined, bytesFromUtf8(personal));
+        this.hasher = blake2b(outLength, undefined, undefined, bytesFrom(personal, "utf8"));
     }
     update(data) {
         this.hasher.update(bytesFrom(data));

package/dist/hex/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hex/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,SAAS,EAAE,MAAM,UAAU,CAAC;AAEhD,MAAM,MAAM,GAAG,GAAG,KAAK,MAAM,EAAE,CAAC;AAChC,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC;AAEhC,wBAAgB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAEzC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hex/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAW,MAAM,UAAU,CAAC;AAEzD,MAAM,MAAM,GAAG,GAAG,KAAK,MAAM,EAAE,CAAC;AAChC,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC;AAEhC,wBAAgB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAEzC"}

package/dist/hex/index.js

@@ -1,5 +1,4 @@
-import { Buffer } from "buffer/";
-import { bytesFrom } from "../bytes";
+import { bytesFrom, bytesTo } from "../bytes";
 export function hexFrom(hex) {
-    return `0x${Buffer.from(bytesFrom(hex)).toString("hex")}`;
+    return `0x${bytesTo(bytesFrom(hex), "hex")}`;
 }

package/dist/signer/signer.d.ts

@@ -12,7 +12,7 @@ export declare abstract class Signer {
     getRecommendedAddressObj(_preference?: unknown): Promise<Address>;
     getRecommendedAddress(preference?: unknown): Promise<string>;
     getAddresses(): Promise<string[]>;
-    abstract signMessage(message: string | BytesLike): Promise<Hex>;
+    abstract signMessage(message: string | BytesLike): Promise<string>;
     sendTransaction(tx: Transaction): Promise<Hex>;
     signTransaction(tx: Transaction): Promise<Transaction>;
     abstract signOnlyTransaction(tx: Transaction): Promise<Transaction>;

package/dist/signer/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,8BAAsB,MAAM;aACE,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAE1C,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAEjC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAE9C,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IACvC,wBAAwB,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAIjE,qBAAqB,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAG5D,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMvC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC;IAEzD,eAAe,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAI9C,eAAe,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAI5D,QAAQ,CAAC,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CACpE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,8BAAsB,MAAM;aACE,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAE1C,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAEjC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAE9C,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IACvC,wBAAwB,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAIjE,qBAAqB,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAG5D,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMvC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAE5D,eAAe,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAI9C,eAAe,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAI5D,QAAQ,CAAC,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CACpE"}

package/dist/signer/signerReadonly.d.ts

@@ -1,8 +1,7 @@
 import { Signer } from ".";
 import { Transaction } from "../ckb";
-import { Hex } from "../hex";
 export declare abstract class SignerReadonly extends Signer {
-    signMessage(): Promise<Hex>;
+    signMessage(): Promise<string>;
     signOnlyTransaction(): Promise<Transaction>;
 }
 //# sourceMappingURL=signerReadonly.d.ts.map

package/dist/signer/signerReadonly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerReadonly.d.ts","sourceRoot":"","sources":["../../src/signer/signerReadonly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,8BAAsB,cAAe,SAAQ,MAAM;IACjD,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC;IAI3B,mBAAmB,IAAI,OAAO,CAAC,WAAW,CAAC;CAG5C"}
+{"version":3,"file":"signerReadonly.d.ts","sourceRoot":"","sources":["../../src/signer/signerReadonly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,8BAAsB,cAAe,SAAQ,MAAM;IACjD,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9B,mBAAmB,IAAI,OAAO,CAAC,WAAW,CAAC;CAG5C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.3-alpha.0",
+  "version": "0.0.3",
   "description": "Common Chains Connector Core",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -46,5 +46,5 @@
     "buffer": "^6.0.3",
     "cross-fetch": "^4.0.0"
   },
-  "gitHead": "4a995208e5135d11e9f72b9a9fd73174a3056fc7"
+  "gitHead": "9df1bbe0007136568914d8a73fe39f898d636a12"
 }

package/src/bytes/advanced.ts

@@ -0,0 +1,10 @@
+export type BytesFromEncoding =
+  | "utf8"
+  | "utf16le"
+  | "latin1"
+  | "base64"
+  | "base64url"
+  | "hex"
+  | "ascii"
+  | "binary"
+  | "ucs2";

package/src/bytes/index.ts

@@ -1,4 +1,5 @@
 import { Buffer } from "buffer/";
+import { BytesFromEncoding } from "./advanced";
 
 export type Bytes = Uint8Array;
 export type BytesLike = string | Uint8Array | ArrayBuffer | number[];
@@ -12,15 +13,14 @@ export function bytesConcat(...args: BytesLike[]): Bytes {
   );
 }
 
-export function bytesFromUtf8(val: string): Bytes {
-  return Buffer.from(val, "utf-8");
+export function bytesTo(val: BytesLike, encoding: BytesFromEncoding): string {
+  return Buffer.from(bytesFrom(val)).toString(encoding);
 }
 
-export function bytesToUtf8(val: BytesLike): string {
-  return Buffer.from(bytesFrom(val)).toString("utf-8");
-}
-
-export function bytesFrom(bytes: BytesLike): Bytes {
+export function bytesFrom(
+  bytes: BytesLike,
+  encoding?: BytesFromEncoding,
+): Bytes {
   if (bytes instanceof Uint8Array) {
     return bytes;
   }
@@ -36,6 +36,10 @@ export function bytesFrom(bytes: BytesLike): Bytes {
     return new Uint8Array(bytes);
   }
 
+  if (encoding !== undefined) {
+    return Buffer.from(bytes, encoding);
+  }
+
   const str = bytes.startsWith("0x") ? bytes.slice(2) : bytes;
   const paddedStr = str.length % 2 === 0 ? str : `0${str}`;
   const data = Buffer.from(paddedStr, "hex");

package/src/ckb/transaction.ts

@@ -337,10 +337,10 @@ export class Transaction {
       mol.SerializeRawTransaction({
         version: numToBytes(this.version, 4),
         cellDeps: this.cellDeps.map((d) => d._toMolData()),
-        headerDeps: this.headerDeps.map(bytesFrom),
+        headerDeps: this.headerDeps.map((header) => bytesFrom(header)),
         inputs: this.inputs.map((i) => i._toMolData()),
         outputs: this.outputs.map((o) => o._toMolData()),
-        outputsData: this.outputsData.map(bytesFrom),
+        outputsData: this.outputsData.map((header) => bytesFrom(header)),
       }),
     );
   }

package/src/hasher/index.ts

@@ -1,5 +1,5 @@
 import blake2b, { Blake2b } from "blake2b";
-import { BytesLike, bytesFrom, bytesFromUtf8 } from "../bytes";
+import { BytesLike, bytesFrom } from "../bytes";
 import { Hex } from "../hex";
 import { CKB_BLAKE2B_PERSONAL } from "./advanced";
 
@@ -11,7 +11,7 @@ export class Hasher {
       outLength,
       undefined,
       undefined,
-      bytesFromUtf8(personal),
+      bytesFrom(personal, "utf8"),
     );
   }
 

package/src/hex/index.ts

@@ -1,9 +1,8 @@
-import { Buffer } from "buffer/";
-import { bytesFrom, BytesLike } from "../bytes";
+import { bytesFrom, BytesLike, bytesTo } from "../bytes";
 
 export type Hex = `0x${string}`;
 export type HexLike = BytesLike;
 
 export function hexFrom(hex: HexLike): Hex {
-  return `0x${Buffer.from(bytesFrom(hex)).toString("hex")}`;
+  return `0x${bytesTo(bytesFrom(hex), "hex")}`;
 }

package/src/signer/signer.ts

@@ -25,7 +25,7 @@ export abstract class Signer {
     );
   }
 
-  abstract signMessage(message: string | BytesLike): Promise<Hex>;
+  abstract signMessage(message: string | BytesLike): Promise<string>;
 
   async sendTransaction(tx: Transaction): Promise<Hex> {
     return this.client.sendTransaction(await this.signTransaction(tx));

package/src/signer/signerReadonly.ts

@@ -1,9 +1,8 @@
 import { Signer } from ".";
 import { Transaction } from "../ckb";
-import { Hex } from "../hex";
 
 export abstract class SignerReadonly extends Signer {
-  signMessage(): Promise<Hex> {
+  signMessage(): Promise<string> {
     throw new Error("Method not implemented.");
   }