@ckb-ccc/core 0.0.2-alpha.2 → 0.0.2-alpha.3

package/dist/{ckb/viewerCkbScript.js → signer/signerReadonlyCkbScript.js}

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ViewerCkbScript = void 0;
-const viewer_1 = require("../viewer");
+exports.SignerReadonlyCkbScript = void 0;
 const address_1 = require("../address");
-class ViewerCkbScript extends viewer_1.Viewer {
+const signerReadonly_1 = require("./signerReadonly");
+class SignerReadonlyCkbScript extends signerReadonly_1.SignerReadonly {
     constructor(script, client) {
         super(client);
         this.script = script;
     }
+    async connect() {
+        return;
+    }
     async getInternalAddress() {
         return this.getRecommendedAddress();
     }
@@ -15,4 +18,4 @@ class ViewerCkbScript extends viewer_1.Viewer {
         return [await address_1.Address.fromScript(this.script, this.client)];
     }
 }
-exports.ViewerCkbScript = ViewerCkbScript;
+exports.SignerReadonlyCkbScript = SignerReadonlyCkbScript;

package/dist/utils/index.d.ts

@@ -0,0 +1,7 @@
+export declare function apply<T, R>(transformer: (val: T) => R, value: undefined): undefined;
+export declare function apply<T, R>(transformer: (val: T) => R, value: null): null;
+export declare function apply<T, R>(transformer: (val: T) => R, value: T): R;
+export declare function apply<T, R>(transformer: (val: T) => R, value: T | undefined): R | undefined;
+export declare function apply<T, R>(transformer: (val: T) => R, value: T | null): R | null;
+export declare function apply<T, R>(transformer: (val: T) => R, value: undefined | null): undefined | null;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,SAAS,GACf,SAAS,CAAC;AACb,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,GAAG,IAAI,CAAC;AAC3E,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;AACrE,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,CAAC,GAAG,SAAS,GACnB,CAAC,GAAG,SAAS,CAAC;AACjB,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,CAAC,GAAG,IAAI,GACd,CAAC,GAAG,IAAI,CAAC;AACZ,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,SAAS,GAAG,IAAI,CAAC"}

package/dist/utils/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apply = void 0;
+function apply(transformer, value) {
+    if (value == null) {
+        return value;
+    }
+    return transformer(value);
+}
+exports.apply = apply;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.2-alpha.2",
+  "version": "0.0.2-alpha.3",
   "description": "Common Chains Connector Core",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -14,7 +14,8 @@
   },
   "scripts": {
     "build": "rimraf ./dist && tsc",
-    "lint": "eslint ."
+    "lint": "eslint",
+    "format": "prettier --write . && eslint --fix"
   },
   "devDependencies": {
     "@ckb-lumos/helpers": "^0.22.2",
@@ -24,6 +25,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
+    "prettier-plugin-organize-imports": "^3.2.4",
     "rimraf": "^5.0.5",
     "ts-essentials": "^9.4.2",
     "typescript": "^5.4.5",
@@ -39,5 +41,5 @@
     "buffer": "^6.0.3",
     "cross-fetch": "^4.0.0"
   },
-  "gitHead": "dae8f0bcf3554125cebee4b9497c0045d7195a63"
+  "gitHead": "32c720f568bc39ba31e0ef00e86fe9173f76e4bf"
 }

package/src/address/address.advanced.ts

@@ -1,27 +1,60 @@
+import { bech32, bech32m } from "bech32";
+import { hashTypeFromBytes } from "../ckb";
 import { Client, KnownScript } from "../client";
-import { toHex } from "../bytes";
-import { AddressFormat } from "./advanced";
-import { type Address as AddressType } from "./index";
-import { decodeHashType } from "../ckb";
+import { hexFrom } from "../hex";
+import { type AddressLike } from "./index";
 
-export async function fromAddressPayload(
+export function addressPayloadFromString(address: string): {
+  prefix: string;
+  format: AddressFormat;
+  payload: number[];
+} {
+  // Try parse full format address
+  {
+    const { words, prefix } = bech32m.decode(address, ADDRESS_BECH32_LIMIT);
+    const [formatType, ...payload] = bech32m.fromWords(words);
+
+    if (formatType === (AddressFormat.Full as number)) {
+      return { prefix, format: AddressFormat.Full, payload };
+    }
+  }
+
+  // Try parse legacy 2019 format address
+  {
+    const { prefix, words } = bech32.decode(address, ADDRESS_BECH32_LIMIT);
+    const [formatType, ...payload] = bech32.fromWords(words);
+    if (
+      [
+        AddressFormat.FullData,
+        AddressFormat.FullType,
+        AddressFormat.Short,
+      ].includes(formatType)
+    ) {
+      return { prefix, format: formatType, payload };
+    }
+  }
+
+  throw Error(`Unknown address format ${address}`);
+}
+
+export async function addressFromPayload(
   prefix: string,
   format: AddressFormat,
   payload: number[],
   client: Client,
-): Promise<AddressType> {
+): Promise<AddressLike> {
   if (format === AddressFormat.Full) {
     if (payload.length < 32 + 1) {
       throw new Error(
-        `Invalid full address without enough payload ${toHex(payload)}`,
+        `Invalid full address without enough payload ${hexFrom(payload)}`,
       );
     }
 
     return {
       script: {
-        codeHash: toHex(payload.slice(0, 32)),
-        hashType: decodeHashType(payload.slice(32, 33)),
-        args: toHex(payload.slice(33)),
+        codeHash: hexFrom(payload.slice(0, 32)),
+        hashType: hashTypeFromBytes(payload.slice(32, 33)),
+        args: hexFrom(payload.slice(33)),
       },
       prefix,
     };
@@ -30,15 +63,15 @@ export async function fromAddressPayload(
   if (format === AddressFormat.FullData) {
     if (payload.length < 32) {
       throw new Error(
-        `Invalid full data address without enough payload ${toHex(payload)}`,
+        `Invalid full data address without enough payload ${hexFrom(payload)}`,
       );
     }
 
     return {
       script: {
-        codeHash: toHex(payload.slice(0, 32)),
+        codeHash: hexFrom(payload.slice(0, 32)),
         hashType: "data",
-        args: toHex(payload.slice(32)),
+        args: hexFrom(payload.slice(32)),
       },
       prefix,
     };
@@ -47,15 +80,15 @@ export async function fromAddressPayload(
   if (format === AddressFormat.FullType) {
     if (payload.length < 32) {
       throw new Error(
-        `Invalid full type address without enough payload ${toHex(payload)}`,
+        `Invalid full type address without enough payload ${hexFrom(payload)}`,
       );
     }
 
     return {
       script: {
-        codeHash: toHex(payload.slice(0, 32)),
+        codeHash: hexFrom(payload.slice(0, 32)),
         hashType: "type",
-        args: toHex(payload.slice(32)),
+        args: hexFrom(payload.slice(32)),
       },
       prefix,
     };
@@ -64,7 +97,7 @@ export async function fromAddressPayload(
   // format === AddressFormat.Short
   if (payload.length !== 21) {
     throw new Error(
-      `Invalid short address without enough payload ${toHex(payload)}`,
+      `Invalid short address without enough payload ${hexFrom(payload)}`,
     );
   }
   const script = [
@@ -74,15 +107,39 @@ export async function fromAddressPayload(
   ][payload[0]];
   if (script === undefined) {
     throw new Error(
-      `Invalid short address with unknown script ${toHex(payload)}`,
+      `Invalid short address with unknown script ${hexFrom(payload)}`,
     );
   }
 
   return {
     script: {
       ...(await client.getKnownScript(script)),
-      args: toHex(payload.slice(1)),
+      args: hexFrom(payload.slice(1)),
     },
     prefix,
   };
 }
+
+export enum AddressFormat {
+  /**
+   * full version identifies the hashType
+   */
+  Full = 0x00,
+  /**
+   * @deprecated
+   * short version for locks with Known codeHash, deprecated
+   */
+  Short = 0x01,
+  /**
+   * @deprecated
+   * full version with hashType = "Data", deprecated
+   */
+  FullData = 0x02,
+  /**
+   * @deprecated
+   * full version with hashType = "Type", deprecated
+   */
+  FullType = 0x04,
+}
+
+export const ADDRESS_BECH32_LIMIT = 1023;

package/src/address/advanced.ts

@@ -1,59 +1 @@
-import { bech32, bech32m } from "bech32";
-export * as Address from "./address.advanced";
-
-export function parseAddressToPayload(address: string): {
-  prefix: string;
-  format: AddressFormat;
-  payload: number[];
-} {
-  // Try parse full format address
-  {
-    const { words, prefix } = bech32m.decode(address, BECH32_LIMIT);
-    const [formatType, ...payload] = bech32m.fromWords(words);
-
-    if (formatType === (AddressFormat.Full as number)) {
-      return { prefix, format: AddressFormat.Full, payload };
-    }
-  }
-
-  // Try parse legacy 2019 format address
-  {
-    const { prefix, words } = bech32.decode(address, BECH32_LIMIT);
-    const [formatType, ...payload] = bech32.fromWords(words);
-    if (
-      [
-        AddressFormat.FullData,
-        AddressFormat.FullType,
-        AddressFormat.Short,
-      ].includes(formatType)
-    ) {
-      return { prefix, format: formatType, payload };
-    }
-  }
-
-  throw Error(`Unknown address format ${address}`);
-}
-
-export enum AddressFormat {
-  /**
-   * full version identifies the hashType
-   */
-  Full = 0x00,
-  /**
-   * @deprecated
-   * short version for locks with Known codeHash, deprecated
-   */
-  Short = 0x01,
-  /**
-   * @deprecated
-   * full version with hashType = "Data", deprecated
-   */
-  FullData = 0x02,
-  /**
-   * @deprecated
-   * full version with hashType = "Type", deprecated
-   */
-  FullType = 0x04,
-}
-
-export const BECH32_LIMIT = 1023;
+export * from "./address.advanced";

package/src/address/index.ts

@@ -1,27 +1,38 @@
-import { DeepReadonly } from "ts-essentials";
+import { bech32m } from "bech32";
+import { bytesConcat, bytesFrom } from "../bytes";
+import { Script, ScriptLike, hashTypeToBytes } from "../ckb";
 import { Client, KnownScript } from "../client";
-import { Script, encodeHashType } from "../ckb";
+import { HexLike } from "../hex";
 import {
+  ADDRESS_BECH32_LIMIT,
   AddressFormat,
-  BECH32_LIMIT,
-  Address as AdvancedAddress,
-  parseAddressToPayload,
-} from "./advanced";
-import { bech32m } from "bech32";
-import { Hex } from "../primitive";
-import { concatBytes, toBytes } from "../bytes";
+  addressFromPayload,
+  addressPayloadFromString,
+} from "./address.advanced";
 
+export type AddressLike = {
+  script: ScriptLike;
+  prefix: string;
+};
 export class Address {
   constructor(
     public script: Script,
     public prefix: string,
   ) {}
 
+  static from(address: AddressLike): Address {
+    if (address instanceof Address) {
+      return address;
+    }
+
+    return new Address(Script.from(address.script), address.prefix);
+  }
+
   static async fromString(
     address: string,
     clients: Client | Record<string, Client>,
   ): Promise<Address> {
-    const { prefix, format, payload } = parseAddressToPayload(address);
+    const { prefix, format, payload } = addressPayloadFromString(address);
 
     const client = (clients as Record<string, Client>)[prefix] ?? clients;
     if (!client) {
@@ -34,37 +45,44 @@ export class Address {
       );
     }
 
-    return AdvancedAddress.fromAddressPayload(prefix, format, payload, client);
+    return Address.from(
+      await addressFromPayload(prefix, format, payload, client),
+    );
   }
 
   static async fromScript(
-    script: DeepReadonly<Script>,
+    script: ScriptLike,
     client: Client,
   ): Promise<Address> {
-    return {
-      script: { ...script },
-      prefix: await client.getAddressPrefix(),
-    };
+    return new Address(Script.from(script), await client.getAddressPrefix());
   }
 
-  static async fromKnownScript(script: KnownScript, args: Hex, client: Client) {
-    return {
-      script: {
+  static async fromKnownScript(
+    script: KnownScript,
+    args: HexLike,
+    client: Client,
+  ) {
+    return new Address(
+      Script.from({
         ...(await client.getKnownScript(script)),
         args,
-      },
-      prefix: await client.getAddressPrefix(),
-    };
+      }),
+      await client.getAddressPrefix(),
+    );
   }
 
-  static toString(address: DeepReadonly<Address>): string {
-    const data = concatBytes(
+  toString(): string {
+    const data = bytesConcat(
       [AddressFormat.Full],
-      toBytes(address.script.codeHash),
-      encodeHashType(address.script.hashType),
-      toBytes(address.script.args),
+      bytesFrom(this.script.codeHash),
+      hashTypeToBytes(this.script.hashType),
+      bytesFrom(this.script.args),
     );
 
-    return bech32m.encode(address.prefix, bech32m.toWords(data), BECH32_LIMIT);
+    return bech32m.encode(
+      this.prefix,
+      bech32m.toWords(data),
+      ADDRESS_BECH32_LIMIT,
+    );
   }
 }

package/src/advancedBarrel.ts

@@ -1,3 +1,4 @@
 export * from "./address/advanced";
 export * from "./ckb/advanced";
 export * from "./client/advanced";
+export * from "./hasher/advanced";

package/src/barrel.ts

@@ -3,6 +3,8 @@ export * from "./bytes";
 export * from "./ckb";
 export * from "./client";
 export * from "./fixedPoint";
-export * from "./primitive";
+export * from "./hasher";
+export * from "./hex";
+export * from "./num";
 export * from "./signer";
-export * from "./viewer";
+export * from "./utils";

package/src/bytes/index.ts

@@ -0,0 +1,46 @@
+import { Buffer } from "buffer/";
+
+export type Bytes = Uint8Array;
+export type BytesLike = string | Uint8Array | ArrayBuffer | number[];
+
+export function bytesConcat(...args: BytesLike[]): Bytes {
+  return new Uint8Array(
+    args.reduce((acc: number[], v) => {
+      acc.push(...bytesFrom(v));
+      return acc;
+    }, []),
+  );
+}
+
+export function bytesFromUtf8(val: string): Bytes {
+  return Buffer.from(val, "utf-8");
+}
+
+export function bytesToUtf8(val: BytesLike): string {
+  return Buffer.from(bytesFrom(val)).toString("utf-8");
+}
+
+export function bytesFrom(bytes: BytesLike): Bytes {
+  if (bytes instanceof Uint8Array) {
+    return bytes;
+  }
+
+  if (bytes instanceof ArrayBuffer) {
+    return new Uint8Array(bytes);
+  }
+
+  if (Array.isArray(bytes)) {
+    if (bytes.some((v) => v < 0 || 0xff < v)) {
+      throw new Error(`Invalid bytes ${JSON.stringify(bytes)}`);
+    }
+    return new Uint8Array(bytes);
+  }
+
+  const str = bytes.startsWith("0x") ? bytes.slice(2) : bytes;
+  const paddedStr = str.length % 2 === 0 ? str : `0${str}`;
+  const data = Buffer.from(paddedStr, "hex");
+  if (data.length * 2 !== paddedStr.length) {
+    throw new Error(`Invalid bytes ${bytes}`);
+  }
+  return data;
+}

package/src/ckb/advanced.ts

@@ -1,2 +1,3 @@
-export * from "./hasher.advanced";
-export * from "./types/advanced";
+export * as moleculeCodecCkb from "./molecule.advanced";
+export * from "./script.advanced";
+export * from "./transaction.advanced";

package/src/ckb/index.ts

@@ -1,3 +1,2 @@
-export * from "./hasher";
-export * from "./types";
-export * from "./viewerCkbScript";
+export * from "./script";
+export * from "./transaction";

package/src/ckb/{types/molecule.advanced → molecule.advanced}/generated.d.ts

@@ -237,7 +237,9 @@ export class ScriptOpt {
   hasValue(): boolean;
 }
 
-export function SerializeProposalShortId(value: CanCastToArrayBuffer): ArrayBuffer;
+export function SerializeProposalShortId(
+  value: CanCastToArrayBuffer,
+): ArrayBuffer;
 export class ProposalShortId {
   constructor(reader: CanCastToArrayBuffer, options?: CreateOptions);
   validate(compatible?: boolean): void;
@@ -246,7 +248,9 @@ export class ProposalShortId {
   static size(): Number;
 }
 
-export function SerializeUncleBlockVec(value: Array<UncleBlockType>): ArrayBuffer;
+export function SerializeUncleBlockVec(
+  value: Array<UncleBlockType>,
+): ArrayBuffer;
 export class UncleBlockVec {
   constructor(reader: CanCastToArrayBuffer, options?: CreateOptions);
   validate(compatible?: boolean): void;
@@ -254,7 +258,9 @@ export class UncleBlockVec {
   length(): number;
 }
 
-export function SerializeTransactionVec(value: Array<TransactionType>): ArrayBuffer;
+export function SerializeTransactionVec(
+  value: Array<TransactionType>,
+): ArrayBuffer;
 export class TransactionVec {
   constructor(reader: CanCastToArrayBuffer, options?: CreateOptions);
   validate(compatible?: boolean): void;
@@ -262,7 +268,9 @@ export class TransactionVec {
   length(): number;
 }
 
-export function SerializeProposalShortIdVec(value: Array<ProposalShortIdType>): ArrayBuffer;
+export function SerializeProposalShortIdVec(
+  value: Array<ProposalShortIdType>,
+): ArrayBuffer;
 export class ProposalShortIdVec {
   constructor(reader: CanCastToArrayBuffer, options?: CreateOptions);
   validate(compatible?: boolean): void;
@@ -286,7 +294,9 @@ export class CellInputVec {
   length(): number;
 }
 
-export function SerializeCellOutputVec(value: Array<CellOutputType>): ArrayBuffer;
+export function SerializeCellOutputVec(
+  value: Array<CellOutputType>,
+): ArrayBuffer;
 export class CellOutputVec {
   constructor(reader: CanCastToArrayBuffer, options?: CreateOptions);
   validate(compatible?: boolean): void;
@@ -414,7 +424,9 @@ export class BlockV1 {
   getExtension(): Bytes;
 }
 
-export function SerializeCellbaseWitness(value: CellbaseWitnessType): ArrayBuffer;
+export function SerializeCellbaseWitness(
+  value: CellbaseWitnessType,
+): ArrayBuffer;
 export class CellbaseWitness {
   constructor(reader: CanCastToArrayBuffer, options?: CreateOptions);
   validate(compatible?: boolean): void;
@@ -430,4 +442,3 @@ export class WitnessArgs {
   getInputType(): BytesOpt;
   getOutputType(): BytesOpt;
 }
-