@ckb-ccc/uni-sat 0.0.3 → 0.0.4-alpha.0

package/dist/signer.d.ts

@@ -1,14 +1,11 @@
 import { ccc } from "@ckb-ccc/core";
 import { Provider } from "./uni-sat.advanced";
-export declare class Signer extends ccc.Signer {
+export declare class Signer extends ccc.SignerBtc {
     readonly provider: Provider;
     constructor(client: ccc.Client, provider: Provider);
-    getBTCAccount(): Promise<string>;
-    getBTCPublicKey(): Promise<ccc.Hex>;
-    getInternalAddress(): Promise<string>;
-    getAddressObjs(): Promise<ccc.Address[]>;
+    getBtcAccount(): Promise<string>;
+    getBtcPublicKey(): Promise<ccc.Hex>;
     connect(): Promise<void>;
     signMessage(message: string | ccc.BytesLike): Promise<string>;
-    signOnlyTransaction(tx: ccc.Transaction): Promise<ccc.Transaction>;
 }
 //# sourceMappingURL=signer.d.ts.map

package/dist/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,qBAAa,MAAO,SAAQ,GAAG,CAAC,MAAM;aAGlB,QAAQ,EAAE,QAAQ;gBADlC,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,QAAQ;IAK9B,aAAa;IAIb,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAInC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAaxC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAO7D,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;CAiCzE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAGrB,QAAQ,EAAE,QAAQ;gBADlC,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,QAAQ;IAK9B,aAAa;IAIb,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAInC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMpE"}

package/dist/signer.js

@@ -1,27 +1,15 @@
 import { ccc } from "@ckb-ccc/core";
-import { ripemd160 } from "@noble/hashes/ripemd160";
-import { sha256 } from "@noble/hashes/sha256";
-export class Signer extends ccc.Signer {
+export class Signer extends ccc.SignerBtc {
     constructor(client, provider) {
         super(client);
         this.provider = provider;
     }
-    async getBTCAccount() {
+    async getBtcAccount() {
         return (await this.provider.getAccounts())[0];
     }
-    async getBTCPublicKey() {
+    async getBtcPublicKey() {
         return ccc.hexFrom(await this.provider.getPublicKey());
     }
-    async getInternalAddress() {
-        return this.getBTCAccount();
-    }
-    async getAddressObjs() {
-        const publicKey = await this.getBTCPublicKey();
-        const hash = ripemd160(sha256(ccc.bytesFrom(publicKey)));
-        return [
-            await ccc.Address.fromKnownScript(ccc.KnownScript.OmniLock, ccc.hexFrom([0x04, ...hash, 0x00]), this.client),
-        ];
-    }
     async connect() {
         await this.provider.requestAccounts();
     }
@@ -29,18 +17,4 @@ export class Signer extends ccc.Signer {
         const challenge = typeof message === "string" ? message : ccc.hexFrom(message).slice(2);
         return this.provider.signMessage(challenge, "ecdsa");
     }
-    async signOnlyTransaction(tx) {
-        const { script } = await this.getRecommendedAddressObj();
-        const info = await ccc.getSignHashInfo(tx, script);
-        if (!info) {
-            return tx;
-        }
-        const signature = ccc.bytesFrom(await this.signMessage(`CKB (Bitcoin Layer) transaction: ${info.message}`), "base64");
-        signature[0] = 31 + ((signature[0] - 27) % 4);
-        console.log(ccc.hexFrom(signature));
-        const witness = ccc.WitnessArgs.fromBytes(tx.witnesses[info.position]);
-        witness.lock = ccc.hexFrom(ccc.bytesConcat(ccc.numToBytes(5 * 4 + signature.length, 4), ccc.numToBytes(4 * 4, 4), ccc.numToBytes(5 * 4 + signature.length, 4), ccc.numToBytes(5 * 4 + signature.length, 4), ccc.numToBytes(signature.length, 4), signature));
-        tx.witnesses[info.position] = ccc.hexFrom(witness.toBytes());
-        return tx;
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/uni-sat",
-  "version": "0.0.3",
+  "version": "0.0.4-alpha.0",
   "description": "Common Chains Connector's support for UniSat",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -35,8 +35,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@ckb-ccc/core": "0.0.3",
-    "@noble/hashes": "^1.4.0"
+    "@ckb-ccc/core": "0.0.4-alpha.0"
   },
-  "gitHead": "9df1bbe0007136568914d8a73fe39f898d636a12"
+  "gitHead": "e49045ed4b2778c92d6f49b79c17125245141a21"
 }

package/src/signer.ts

@@ -1,9 +1,7 @@
 import { ccc } from "@ckb-ccc/core";
-import { ripemd160 } from "@noble/hashes/ripemd160";
-import { sha256 } from "@noble/hashes/sha256";
 import { Provider } from "./uni-sat.advanced";
 
-export class Signer extends ccc.Signer {
+export class Signer extends ccc.SignerBtc {
   constructor(
     client: ccc.Client,
     public readonly provider: Provider,
@@ -11,31 +9,14 @@ export class Signer extends ccc.Signer {
     super(client);
   }
 
-  async getBTCAccount() {
+  async getBtcAccount() {
     return (await this.provider.getAccounts())[0];
   }
 
-  async getBTCPublicKey(): Promise<ccc.Hex> {
+  async getBtcPublicKey(): Promise<ccc.Hex> {
     return ccc.hexFrom(await this.provider.getPublicKey());
   }
 
-  async getInternalAddress(): Promise<string> {
-    return this.getBTCAccount();
-  }
-
-  async getAddressObjs(): Promise<ccc.Address[]> {
-    const publicKey = await this.getBTCPublicKey();
-    const hash = ripemd160(sha256(ccc.bytesFrom(publicKey)));
-
-    return [
-      await ccc.Address.fromKnownScript(
-        ccc.KnownScript.OmniLock,
-        ccc.hexFrom([0x04, ...hash, 0x00]),
-        this.client,
-      ),
-    ];
-  }
-
   async connect(): Promise<void> {
     await this.provider.requestAccounts();
   }
@@ -46,38 +27,4 @@ export class Signer extends ccc.Signer {
 
     return this.provider.signMessage(challenge, "ecdsa");
   }
-
-  async signOnlyTransaction(tx: ccc.Transaction): Promise<ccc.Transaction> {
-    const { script } = await this.getRecommendedAddressObj();
-    const info = await ccc.getSignHashInfo(tx, script);
-    if (!info) {
-      return tx;
-    }
-
-    const signature = ccc.bytesFrom(
-      await this.signMessage(
-        `CKB (Bitcoin Layer) transaction: ${info.message}`,
-      ),
-      "base64",
-    );
-    signature[0] = 31 + ((signature[0] - 27) % 4);
-
-    console.log(ccc.hexFrom(signature));
-
-    const witness = ccc.WitnessArgs.fromBytes(tx.witnesses[info.position]);
-    witness.lock = ccc.hexFrom(
-      ccc.bytesConcat(
-        ccc.numToBytes(5 * 4 + signature.length, 4),
-        ccc.numToBytes(4 * 4, 4),
-        ccc.numToBytes(5 * 4 + signature.length, 4),
-        ccc.numToBytes(5 * 4 + signature.length, 4),
-        ccc.numToBytes(signature.length, 4),
-        signature,
-      ),
-    );
-
-    tx.witnesses[info.position] = ccc.hexFrom(witness.toBytes());
-
-    return tx;
-  }
 }