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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/.prettierignore +12 -0
  2. package/dist/advanced.d.ts.map +1 -1
  3. package/dist/signer.js +6 -6
  4. package/dist/signersManager.d.ts.map +1 -1
  5. package/package.json +6 -4
  6. package/src/advanced.ts +2 -8
  7. package/src/signer.ts +12 -12
  8. package/src/signersManager.ts +1 -3
package/.prettierignore ADDED
@@ -0,0 +1,12 @@
1
+ node_modules/
2
+
3
+ dist/
4
+
5
+ .npmignore
6
+ .prettierrc
7
+ tsconfig.json
8
+ eslint.config.mjs
9
+ .prettierrc
10
+
11
+ tsconfig.tsbuildinfo
12
+ .github/
package/dist/advanced.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"advanced.d.ts","sourceRoot":"","sources":["../src/advanced.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,qBAAqB,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,EAAE,EAAE,eAAe,CAAC;IACpB,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GACxC,eAAe,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,CAAC,OAAO,EAAE;QACR,MAAM,EAAE,eAAe,CAAC;QACxB,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACvB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC,OAAO,EAAE;QACR,MAAM,EAAE,qBAAqB,CAAC;QAC9B,MAAM,CAAC,EAAE,SAAS,CAAC;KACpB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnB,CAAC,OAAO,EAAE;QACR,MAAM,EAAE,cAAc,CAAC;QACvB,MAAM,CAAC,EAAE,SAAS,CAAC;KACpB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnB,CAAC,OAAO,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACnD,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,CACE,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GACxC,eAAe,CAAC;CACpB"}
1
+ {"version":3,"file":"advanced.d.ts","sourceRoot":"","sources":["../src/advanced.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,qBAAqB,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,EAAE,EAAE,eAAe,CAAC;IACpB,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GACxC,eAAe,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,eAAe,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5E,CAAC,OAAO,EAAE;QACR,MAAM,EAAE,qBAAqB,CAAC;QAC9B,MAAM,CAAC,EAAE,SAAS,CAAC;KACpB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnB,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,cAAc,CAAC;QAAC,MAAM,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC1E,CAAC,OAAO,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACnD,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,CACE,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GACxC,eAAe,CAAC;CACpB"}
package/dist/signer.js CHANGED
@@ -15,13 +15,13 @@ class EIP6963Signer extends core_1.ccc.Signer {
15
15
  }
16
16
  async getAddressObjs() {
17
17
  const accounts = await this.getEVMAccounts();
18
- return Promise.all(accounts.map((account) => core_1.ccc.Address.fromKnownScript(core_1.ccc.KnownScript.OmniLock, core_1.ccc.toHex([0x12, ...core_1.ccc.toBytes(account), 0x00]), this.client)));
18
+ return Promise.all(accounts.map((account) => core_1.ccc.Address.fromKnownScript(core_1.ccc.KnownScript.OmniLock, core_1.ccc.hexFrom([0x12, ...core_1.ccc.bytesFrom(account), 0x00]), this.client)));
19
19
  }
20
20
  async connect() {
21
21
  await this.detail.provider.request({ method: "eth_requestAccounts" });
22
22
  }
23
23
  async signMessage(message) {
24
- const challenge = typeof message === "string" ? message : core_1.ccc.toHex(message);
24
+ const challenge = typeof message === "string" ? message : core_1.ccc.hexFrom(message);
25
25
  const [address] = await this.getEVMAccounts();
26
26
  return this.detail.provider.request({
27
27
  method: "personal_sign",
@@ -34,13 +34,13 @@ class EIP6963Signer extends core_1.ccc.Signer {
34
34
  if (!info) {
35
35
  return tx;
36
36
  }
37
- const signature = core_1.ccc.toBytes(await this.signMessage(`CKB transaction: ${info.message}`));
37
+ const signature = core_1.ccc.bytesFrom(await this.signMessage(`CKB transaction: ${info.message}`));
38
38
  if (signature[signature.length - 1] >= 27) {
39
39
  signature[signature.length - 1] -= 27;
40
40
  }
41
- const witness = core_1.ccc.WitnessArgs.decode(tx.witnesses[info.position]);
42
- witness.lock = core_1.ccc.toHex(core_1.ccc.concatBytes(core_1.ccc.toBytesFromNumber(5 * 4 + signature.length, 4), core_1.ccc.toBytesFromNumber(4 * 4, 4), core_1.ccc.toBytesFromNumber(5 * 4 + signature.length, 4), core_1.ccc.toBytesFromNumber(5 * 4 + signature.length, 4), core_1.ccc.toBytesFromNumber(signature.length, 4), signature));
43
- tx.witnesses[info.position] = core_1.ccc.toHex(core_1.ccc.WitnessArgs.encode(witness));
41
+ const witness = core_1.ccc.WitnessArgs.fromBytes(tx.witnesses[info.position]);
42
+ witness.lock = core_1.ccc.hexFrom(core_1.ccc.bytesConcat(core_1.ccc.numToBytes(5 * 4 + signature.length, 4), core_1.ccc.numToBytes(4 * 4, 4), core_1.ccc.numToBytes(5 * 4 + signature.length, 4), core_1.ccc.numToBytes(5 * 4 + signature.length, 4), core_1.ccc.numToBytes(signature.length, 4), signature));
43
+ tx.witnesses[info.position] = core_1.ccc.hexFrom(witness.toBytes());
44
44
  return tx;
45
45
  }
46
46
  }
package/dist/signersManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"signersManager.d.ts","sourceRoot":"","sources":["../src/signersManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,qBAAa,cAAc;IAGb,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,OAAO,CAAuB;gBAET,MAAM,EAAE,GAAG,CAAC,MAAM;IAE/C,UAAU;IAIV,uBAAuB,CACrB,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,WAAW,EAAE,aAAa,KAAK,OAAO;CAuB9E"}
1
+ {"version":3,"file":"signersManager.d.ts","sourceRoot":"","sources":["../src/signersManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,qBAAa,cAAc;IAGb,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,OAAO,CAAuB;gBAET,MAAM,EAAE,GAAG,CAAC,MAAM;IAE/C,UAAU;IAIV,uBAAuB,CACrB,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,WAAW,EAAE,aAAa,KAAK,OAAO;CAqB9E"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ckb-ccc/eip6963",
3
- "version": "0.0.2-alpha.2",
3
+ "version": "0.0.2-alpha.3",
4
4
  "description": "Common Chains Connector's support for EIP6963",
5
5
  "author": "Hanssen0 <hanssen0@hanssen0.com>",
6
6
  "license": "MIT",
@@ -12,7 +12,8 @@
12
12
  },
13
13
  "scripts": {
14
14
  "build": "rimraf ./dist && tsc",
15
- "lint": "eslint ."
15
+ "lint": "eslint",
16
+ "format": "prettier --write . && eslint --fix"
16
17
  },
17
18
  "devDependencies": {
18
19
  "@eslint/js": "^9.1.1",
@@ -20,6 +21,7 @@
20
21
  "eslint-config-prettier": "^9.1.0",
21
22
  "eslint-plugin-prettier": "^5.1.3",
22
23
  "prettier": "^3.2.5",
24
+ "prettier-plugin-organize-imports": "^3.2.4",
23
25
  "rimraf": "^5.0.5",
24
26
  "typescript": "^5.4.5",
25
27
  "typescript-eslint": "^7.7.0"
@@ -28,7 +30,7 @@
28
30
  "access": "public"
29
31
  },
30
32
  "dependencies": {
31
- "@ckb-ccc/core": "0.0.2-alpha.2"
33
+ "@ckb-ccc/core": "0.0.2-alpha.3"
32
34
  },
33
- "gitHead": "dae8f0bcf3554125cebee4b9497c0045d7195a63"
35
+ "gitHead": "32c720f568bc39ba31e0ef00e86fe9173f76e4bf"
34
36
  }
package/src/advanced.ts CHANGED
@@ -26,18 +26,12 @@ export interface EIP1193Provider {
26
26
  }
27
27
 
28
28
  export interface EIP1193RequestMethod {
29
- (request: {
30
- method: "personal_sign";
31
- params: [string, Hex];
32
- }): Promise<Hex>;
29
+ (request: { method: "personal_sign"; params: [string, Hex] }): Promise<Hex>;
33
30
  (request: {
34
31
  method: "eth_requestAccounts";
35
32
  params?: undefined;
36
33
  }): Promise<Hex[]>;
37
- (request: {
38
- method: "eth_accounts";
39
- params?: undefined;
40
- }): Promise<Hex[]>;
34
+ (request: { method: "eth_accounts"; params?: undefined }): Promise<Hex[]>;
41
35
  (request: {
42
36
  method: string;
43
37
  params?: Array<unknown> | Record<string, unknown>;
package/src/signer.ts CHANGED
@@ -23,7 +23,7 @@ export class EIP6963Signer extends ccc.Signer {
23
23
  accounts.map((account) =>
24
24
  ccc.Address.fromKnownScript(
25
25
  ccc.KnownScript.OmniLock,
26
- ccc.toHex([0x12, ...ccc.toBytes(account), 0x00]),
26
+ ccc.hexFrom([0x12, ...ccc.bytesFrom(account), 0x00]),
27
27
  this.client,
28
28
  ),
29
29
  ),
@@ -36,7 +36,7 @@ export class EIP6963Signer extends ccc.Signer {
36
36
 
37
37
  async signMessage(message: string | ccc.BytesLike): Promise<ccc.Hex> {
38
38
  const challenge =
39
- typeof message === "string" ? message : ccc.toHex(message);
39
+ typeof message === "string" ? message : ccc.hexFrom(message);
40
40
  const [address] = await this.getEVMAccounts();
41
41
 
42
42
  return this.detail.provider.request({
@@ -52,26 +52,26 @@ export class EIP6963Signer extends ccc.Signer {
52
52
  return tx;
53
53
  }
54
54
 
55
- const signature = ccc.toBytes(
55
+ const signature = ccc.bytesFrom(
56
56
  await this.signMessage(`CKB transaction: ${info.message}`),
57
57
  );
58
58
  if (signature[signature.length - 1] >= 27) {
59
59
  signature[signature.length - 1] -= 27;
60
60
  }
61
61
 
62
- const witness = ccc.WitnessArgs.decode(tx.witnesses[info.position]);
63
- witness.lock = ccc.toHex(
64
- ccc.concatBytes(
65
- ccc.toBytesFromNumber(5 * 4 + signature.length, 4),
66
- ccc.toBytesFromNumber(4 * 4, 4),
67
- ccc.toBytesFromNumber(5 * 4 + signature.length, 4),
68
- ccc.toBytesFromNumber(5 * 4 + signature.length, 4),
69
- ccc.toBytesFromNumber(signature.length, 4),
62
+ const witness = ccc.WitnessArgs.fromBytes(tx.witnesses[info.position]);
63
+ witness.lock = ccc.hexFrom(
64
+ ccc.bytesConcat(
65
+ ccc.numToBytes(5 * 4 + signature.length, 4),
66
+ ccc.numToBytes(4 * 4, 4),
67
+ ccc.numToBytes(5 * 4 + signature.length, 4),
68
+ ccc.numToBytes(5 * 4 + signature.length, 4),
69
+ ccc.numToBytes(signature.length, 4),
70
70
  signature,
71
71
  ),
72
72
  );
73
73
 
74
- tx.witnesses[info.position] = ccc.toHex(ccc.WitnessArgs.encode(witness));
74
+ tx.witnesses[info.position] = ccc.hexFrom(witness.toBytes());
75
75
 
76
76
  return tx;
77
77
  }
package/src/signersManager.ts CHANGED
@@ -20,9 +20,7 @@ export class EIP6963Manager {
20
20
  (event as unknown as EIP6963AnnounceProviderEvent).detail,
21
21
  );
22
22
  if (
23
- this.signers.some(
24
- (p) => p.detail.info.uuid === signer.detail.info.uuid,
25
- )
23
+ this.signers.some((p) => p.detail.info.uuid === signer.detail.info.uuid)
26
24
  ) {
27
25
  return;
28
26
  }