@ckb-ccc/core 1.11.1 → 1.11.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.
- package/CHANGELOG.md +14 -0
- package/dist/client/clientPublicMainnet.advanced.js +10 -10
- package/dist/client/clientPublicTestnet.advanced.js +5 -5
- package/dist/molecule/entity.d.ts.map +1 -1
- package/dist/signer/btc/verify.d.ts.map +1 -1
- package/dist/signer/btc/verify.js +3 -3
- package/dist/signer/ckb/verifyCkbSecp256k1.d.ts.map +1 -1
- package/dist/signer/ckb/verifyCkbSecp256k1.js +3 -1
- package/dist.commonjs/client/clientPublicMainnet.advanced.js +10 -10
- package/dist.commonjs/client/clientPublicTestnet.advanced.js +5 -5
- package/dist.commonjs/molecule/entity.d.ts.map +1 -1
- package/dist.commonjs/signer/btc/verify.d.ts.map +1 -1
- package/dist.commonjs/signer/btc/verify.js +4 -4
- package/dist.commonjs/signer/ckb/verifyCkbSecp256k1.d.ts.map +1 -1
- package/dist.commonjs/signer/ckb/verifyCkbSecp256k1.js +3 -1
- package/package.json +17 -21
- package/src/client/clientPublicMainnet.advanced.ts +10 -10
- package/src/client/clientPublicTestnet.advanced.ts +5 -5
- package/src/signer/btc/verify.ts +7 -3
- package/src/signer/ckb/verifyCkbSecp256k1.ts +3 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @ckb-ccc/core
|
|
2
2
|
|
|
3
|
+
## 1.11.3
|
|
4
|
+
### Patch Changes
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
- [#282](https://github.com/ckb-devrel/ccc/pull/282) [`d4fb021`](https://github.com/ckb-devrel/ccc/commit/d4fb021472a83b7871fd44824e9bb786cc412252) Thanks [@dependabot](https://github.com/apps/dependabot)! - chore(deps): bump dependency version
|
|
9
|
+
|
|
10
|
+
## 1.11.2
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
- [#287](https://github.com/ckb-devrel/ccc/pull/287) [`00e6d56`](https://github.com/ckb-devrel/ccc/commit/00e6d56fa027cbe0cfeea20aa72abba7b14dc606) Thanks [@Hanssen0](https://github.com/Hanssen0)! - fix(core): update joy id info
|
|
16
|
+
|
|
3
17
|
## 1.11.1
|
|
4
18
|
### Patch Changes
|
|
5
19
|
|
|
@@ -102,7 +102,7 @@ export const MAINNET_SCRIPTS = Object.freeze({
|
|
|
102
102
|
{
|
|
103
103
|
cellDep: {
|
|
104
104
|
outPoint: {
|
|
105
|
-
txHash: "
|
|
105
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
106
106
|
index: 0,
|
|
107
107
|
},
|
|
108
108
|
depType: "code",
|
|
@@ -110,13 +110,13 @@ export const MAINNET_SCRIPTS = Object.freeze({
|
|
|
110
110
|
type: {
|
|
111
111
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
112
112
|
hashType: "type",
|
|
113
|
-
args: "
|
|
113
|
+
args: "0x2d1f2d4d1514ccc3bb4f04f5437a5ae30d00636ee57cedd2c70ab3ea75b62adc",
|
|
114
114
|
},
|
|
115
115
|
},
|
|
116
116
|
{
|
|
117
117
|
cellDep: {
|
|
118
118
|
outPoint: {
|
|
119
|
-
txHash: "
|
|
119
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
120
120
|
index: 1,
|
|
121
121
|
},
|
|
122
122
|
depType: "code",
|
|
@@ -124,13 +124,13 @@ export const MAINNET_SCRIPTS = Object.freeze({
|
|
|
124
124
|
type: {
|
|
125
125
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
126
126
|
hashType: "type",
|
|
127
|
-
args: "
|
|
127
|
+
args: "0xc086090432098835ec542a1b94bdd1b842c5aa1ccd1616873fe77f4a04044417",
|
|
128
128
|
},
|
|
129
129
|
},
|
|
130
130
|
{
|
|
131
131
|
cellDep: {
|
|
132
132
|
outPoint: {
|
|
133
|
-
txHash: "
|
|
133
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
134
134
|
index: 2,
|
|
135
135
|
},
|
|
136
136
|
depType: "code",
|
|
@@ -138,13 +138,13 @@ export const MAINNET_SCRIPTS = Object.freeze({
|
|
|
138
138
|
type: {
|
|
139
139
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
140
140
|
hashType: "type",
|
|
141
|
-
args: "
|
|
141
|
+
args: "0x165b225c6fbed7e655b024384d9083de3243375f9893706f4452858ecd694e96",
|
|
142
142
|
},
|
|
143
143
|
},
|
|
144
144
|
{
|
|
145
145
|
cellDep: {
|
|
146
146
|
outPoint: {
|
|
147
|
-
txHash: "
|
|
147
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
148
148
|
index: 3,
|
|
149
149
|
},
|
|
150
150
|
depType: "code",
|
|
@@ -152,13 +152,13 @@ export const MAINNET_SCRIPTS = Object.freeze({
|
|
|
152
152
|
type: {
|
|
153
153
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
154
154
|
hashType: "type",
|
|
155
|
-
args: "
|
|
155
|
+
args: "0xafb8408d0094ab944e6286aac750b9bb854ac0bcb66dfe5c60559744a700e70c",
|
|
156
156
|
},
|
|
157
157
|
},
|
|
158
158
|
{
|
|
159
159
|
cellDep: {
|
|
160
160
|
outPoint: {
|
|
161
|
-
txHash: "
|
|
161
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
162
162
|
index: 4,
|
|
163
163
|
},
|
|
164
164
|
depType: "code",
|
|
@@ -166,7 +166,7 @@ export const MAINNET_SCRIPTS = Object.freeze({
|
|
|
166
166
|
type: {
|
|
167
167
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
168
168
|
hashType: "type",
|
|
169
|
-
args: "
|
|
169
|
+
args: "0x773bf0647be24b4e18ef44068fd069b9de5549c4b86be227779ceb9179598ec4",
|
|
170
170
|
},
|
|
171
171
|
},
|
|
172
172
|
],
|
|
@@ -115,7 +115,7 @@ export const TESTNET_SCRIPTS = Object.freeze({
|
|
|
115
115
|
type: {
|
|
116
116
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
117
117
|
hashType: "type",
|
|
118
|
-
args: "
|
|
118
|
+
args: "0x1c9fc299ba0570d077b4d7fb9acff1ccc0de69d369942d82678bae937c44ec30",
|
|
119
119
|
},
|
|
120
120
|
},
|
|
121
121
|
{
|
|
@@ -129,7 +129,7 @@ export const TESTNET_SCRIPTS = Object.freeze({
|
|
|
129
129
|
type: {
|
|
130
130
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
131
131
|
hashType: "type",
|
|
132
|
-
args: "
|
|
132
|
+
args: "0x27f0d3ccdc2fcd52ae31fbacad5f86b97bc147d7093e4807cd6e3d21c1fe6841",
|
|
133
133
|
},
|
|
134
134
|
},
|
|
135
135
|
{
|
|
@@ -143,7 +143,7 @@ export const TESTNET_SCRIPTS = Object.freeze({
|
|
|
143
143
|
type: {
|
|
144
144
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
145
145
|
hashType: "type",
|
|
146
|
-
args: "
|
|
146
|
+
args: "0x0ac15fe5b2d059ec39de03f2d3159d5463abb918a1a07a9fa00d2b9c61d89ef3",
|
|
147
147
|
},
|
|
148
148
|
},
|
|
149
149
|
{
|
|
@@ -157,7 +157,7 @@ export const TESTNET_SCRIPTS = Object.freeze({
|
|
|
157
157
|
type: {
|
|
158
158
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
159
159
|
hashType: "type",
|
|
160
|
-
args: "
|
|
160
|
+
args: "0xc7bafc5550ccad7cea32c27764f5df6aca4de547da65e3e67fa08477a1af7f5e",
|
|
161
161
|
},
|
|
162
162
|
},
|
|
163
163
|
{
|
|
@@ -171,7 +171,7 @@ export const TESTNET_SCRIPTS = Object.freeze({
|
|
|
171
171
|
type: {
|
|
172
172
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
173
173
|
hashType: "type",
|
|
174
|
-
args: "
|
|
174
|
+
args: "0x71decef9ca8725e64ec99a5521790d16b8d5daadb4989b45dd6ab51806a8c0e4",
|
|
175
175
|
},
|
|
176
176
|
},
|
|
177
177
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,IAAI,SAAS,MAAM,GAAG,QAAQ,EAC9B,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;IACvC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,IAAI,SAAS,MAAM,GAAG,QAAQ,EAC9B,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;IACvC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,IACf,aAAa,eAAe,qBAc9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/signer/btc/verify.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAE,SAAS,EAA0B,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,GAAG,EAAW,MAAM,oBAAoB,CAAC;AAElD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,KAAK,CAEjE;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,MAAM,GACd,MAAM,CAIR;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAEjE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,
|
|
1
|
+
{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/signer/btc/verify.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAE,SAAS,EAA0B,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,GAAG,EAAW,MAAM,oBAAoB,CAAC;AAElD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,KAAK,CAEjE;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,MAAM,GACd,MAAM,CAIR;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAEjE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAWT"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { secp256k1 } from "@noble/curves/secp256k1";
|
|
2
|
-
import { ripemd160 } from "@noble/hashes/
|
|
3
|
-
import { sha256 } from "@noble/hashes/
|
|
2
|
+
import { ripemd160 } from "@noble/hashes/legacy.js";
|
|
3
|
+
import { sha256 } from "@noble/hashes/sha2.js";
|
|
4
4
|
import { magicHash } from "bitcoinjs-message";
|
|
5
5
|
import bs58check from "bs58check";
|
|
6
6
|
import { bytesConcat, bytesFrom } from "../../bytes/index.js";
|
|
@@ -29,5 +29,5 @@ export function btcPublicKeyFromP2pkhAddress(address) {
|
|
|
29
29
|
export function verifyMessageBtcEcdsa(message, signature, publicKey) {
|
|
30
30
|
const challenge = typeof message === "string" ? message : hexFrom(message).slice(2);
|
|
31
31
|
const rawSign = bytesFrom(signature, "base64").slice(1);
|
|
32
|
-
return secp256k1.verify(bytesFrom(rawSign), magicHash(challenge), publicKey);
|
|
32
|
+
return secp256k1.verify(bytesFrom(rawSign), magicHash(challenge), bytesFrom(publicKey));
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyCkbSecp256k1.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/verifyCkbSecp256k1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAW,MAAM,oBAAoB,CAAC;AAGlD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,CAIxE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,
|
|
1
|
+
{"version":3,"file":"verifyCkbSecp256k1.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/verifyCkbSecp256k1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAW,MAAM,oBAAoB,CAAC;AAGlD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,CAIxE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAYT"}
|
|
@@ -16,5 +16,7 @@ export function messageHashCkbSecp256k1(message) {
|
|
|
16
16
|
*/
|
|
17
17
|
export function verifyMessageCkbSecp256k1(message, signature, publicKey) {
|
|
18
18
|
const signatureBytes = bytesFrom(signature);
|
|
19
|
-
return secp256k1.verify(new secp256k1.Signature(numFrom(signatureBytes.slice(0, 32)), numFrom(signatureBytes.slice(32, 64)))
|
|
19
|
+
return secp256k1.verify(new secp256k1.Signature(numFrom(signatureBytes.slice(0, 32)), numFrom(signatureBytes.slice(32, 64)))
|
|
20
|
+
.addRecoveryBit(Number(numFrom(signatureBytes.slice(64, 65))))
|
|
21
|
+
.toBytes(), bytesFrom(messageHashCkbSecp256k1(message)), bytesFrom(publicKey));
|
|
20
22
|
}
|
|
@@ -105,7 +105,7 @@ exports.MAINNET_SCRIPTS = Object.freeze({
|
|
|
105
105
|
{
|
|
106
106
|
cellDep: {
|
|
107
107
|
outPoint: {
|
|
108
|
-
txHash: "
|
|
108
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
109
109
|
index: 0,
|
|
110
110
|
},
|
|
111
111
|
depType: "code",
|
|
@@ -113,13 +113,13 @@ exports.MAINNET_SCRIPTS = Object.freeze({
|
|
|
113
113
|
type: {
|
|
114
114
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
115
115
|
hashType: "type",
|
|
116
|
-
args: "
|
|
116
|
+
args: "0x2d1f2d4d1514ccc3bb4f04f5437a5ae30d00636ee57cedd2c70ab3ea75b62adc",
|
|
117
117
|
},
|
|
118
118
|
},
|
|
119
119
|
{
|
|
120
120
|
cellDep: {
|
|
121
121
|
outPoint: {
|
|
122
|
-
txHash: "
|
|
122
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
123
123
|
index: 1,
|
|
124
124
|
},
|
|
125
125
|
depType: "code",
|
|
@@ -127,13 +127,13 @@ exports.MAINNET_SCRIPTS = Object.freeze({
|
|
|
127
127
|
type: {
|
|
128
128
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
129
129
|
hashType: "type",
|
|
130
|
-
args: "
|
|
130
|
+
args: "0xc086090432098835ec542a1b94bdd1b842c5aa1ccd1616873fe77f4a04044417",
|
|
131
131
|
},
|
|
132
132
|
},
|
|
133
133
|
{
|
|
134
134
|
cellDep: {
|
|
135
135
|
outPoint: {
|
|
136
|
-
txHash: "
|
|
136
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
137
137
|
index: 2,
|
|
138
138
|
},
|
|
139
139
|
depType: "code",
|
|
@@ -141,13 +141,13 @@ exports.MAINNET_SCRIPTS = Object.freeze({
|
|
|
141
141
|
type: {
|
|
142
142
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
143
143
|
hashType: "type",
|
|
144
|
-
args: "
|
|
144
|
+
args: "0x165b225c6fbed7e655b024384d9083de3243375f9893706f4452858ecd694e96",
|
|
145
145
|
},
|
|
146
146
|
},
|
|
147
147
|
{
|
|
148
148
|
cellDep: {
|
|
149
149
|
outPoint: {
|
|
150
|
-
txHash: "
|
|
150
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
151
151
|
index: 3,
|
|
152
152
|
},
|
|
153
153
|
depType: "code",
|
|
@@ -155,13 +155,13 @@ exports.MAINNET_SCRIPTS = Object.freeze({
|
|
|
155
155
|
type: {
|
|
156
156
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
157
157
|
hashType: "type",
|
|
158
|
-
args: "
|
|
158
|
+
args: "0xafb8408d0094ab944e6286aac750b9bb854ac0bcb66dfe5c60559744a700e70c",
|
|
159
159
|
},
|
|
160
160
|
},
|
|
161
161
|
{
|
|
162
162
|
cellDep: {
|
|
163
163
|
outPoint: {
|
|
164
|
-
txHash: "
|
|
164
|
+
txHash: "0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
165
165
|
index: 4,
|
|
166
166
|
},
|
|
167
167
|
depType: "code",
|
|
@@ -169,7 +169,7 @@ exports.MAINNET_SCRIPTS = Object.freeze({
|
|
|
169
169
|
type: {
|
|
170
170
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
171
171
|
hashType: "type",
|
|
172
|
-
args: "
|
|
172
|
+
args: "0x773bf0647be24b4e18ef44068fd069b9de5549c4b86be227779ceb9179598ec4",
|
|
173
173
|
},
|
|
174
174
|
},
|
|
175
175
|
],
|
|
@@ -118,7 +118,7 @@ exports.TESTNET_SCRIPTS = Object.freeze({
|
|
|
118
118
|
type: {
|
|
119
119
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
120
120
|
hashType: "type",
|
|
121
|
-
args: "
|
|
121
|
+
args: "0x1c9fc299ba0570d077b4d7fb9acff1ccc0de69d369942d82678bae937c44ec30",
|
|
122
122
|
},
|
|
123
123
|
},
|
|
124
124
|
{
|
|
@@ -132,7 +132,7 @@ exports.TESTNET_SCRIPTS = Object.freeze({
|
|
|
132
132
|
type: {
|
|
133
133
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
134
134
|
hashType: "type",
|
|
135
|
-
args: "
|
|
135
|
+
args: "0x27f0d3ccdc2fcd52ae31fbacad5f86b97bc147d7093e4807cd6e3d21c1fe6841",
|
|
136
136
|
},
|
|
137
137
|
},
|
|
138
138
|
{
|
|
@@ -146,7 +146,7 @@ exports.TESTNET_SCRIPTS = Object.freeze({
|
|
|
146
146
|
type: {
|
|
147
147
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
148
148
|
hashType: "type",
|
|
149
|
-
args: "
|
|
149
|
+
args: "0x0ac15fe5b2d059ec39de03f2d3159d5463abb918a1a07a9fa00d2b9c61d89ef3",
|
|
150
150
|
},
|
|
151
151
|
},
|
|
152
152
|
{
|
|
@@ -160,7 +160,7 @@ exports.TESTNET_SCRIPTS = Object.freeze({
|
|
|
160
160
|
type: {
|
|
161
161
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
162
162
|
hashType: "type",
|
|
163
|
-
args: "
|
|
163
|
+
args: "0xc7bafc5550ccad7cea32c27764f5df6aca4de547da65e3e67fa08477a1af7f5e",
|
|
164
164
|
},
|
|
165
165
|
},
|
|
166
166
|
{
|
|
@@ -174,7 +174,7 @@ exports.TESTNET_SCRIPTS = Object.freeze({
|
|
|
174
174
|
type: {
|
|
175
175
|
codeHash: "0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
176
176
|
hashType: "type",
|
|
177
|
-
args: "
|
|
177
|
+
args: "0x71decef9ca8725e64ec99a5521790d16b8d5daadb4989b45dd6ab51806a8c0e4",
|
|
178
178
|
},
|
|
179
179
|
},
|
|
180
180
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,IAAI,SAAS,MAAM,GAAG,QAAQ,EAC9B,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;IACvC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,IAAI,SAAS,MAAM,GAAG,QAAQ,EAC9B,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;IACvC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,IACf,aAAa,eAAe,qBAc9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/signer/btc/verify.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAE,SAAS,EAA0B,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,GAAG,EAAW,MAAM,oBAAoB,CAAC;AAElD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,KAAK,CAEjE;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,MAAM,GACd,MAAM,CAIR;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAEjE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,
|
|
1
|
+
{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/signer/btc/verify.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAE,SAAS,EAA0B,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,GAAG,EAAW,MAAM,oBAAoB,CAAC;AAElD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,KAAK,CAEjE;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,MAAM,GACd,MAAM,CAIR;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAEjE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAWT"}
|
|
@@ -8,8 +8,8 @@ exports.btcP2pkhAddressFromPublicKey = btcP2pkhAddressFromPublicKey;
|
|
|
8
8
|
exports.btcPublicKeyFromP2pkhAddress = btcPublicKeyFromP2pkhAddress;
|
|
9
9
|
exports.verifyMessageBtcEcdsa = verifyMessageBtcEcdsa;
|
|
10
10
|
const secp256k1_1 = require("@noble/curves/secp256k1");
|
|
11
|
-
const
|
|
12
|
-
const
|
|
11
|
+
const legacy_js_1 = require("@noble/hashes/legacy.js");
|
|
12
|
+
const sha2_js_1 = require("@noble/hashes/sha2.js");
|
|
13
13
|
const bitcoinjs_message_1 = require("bitcoinjs-message");
|
|
14
14
|
const bs58check_1 = __importDefault(require("bs58check"));
|
|
15
15
|
const index_js_1 = require("../../bytes/index.js");
|
|
@@ -18,7 +18,7 @@ const index_js_2 = require("../../hex/index.js");
|
|
|
18
18
|
* @public
|
|
19
19
|
*/
|
|
20
20
|
function btcEcdsaPublicKeyHash(publicKey) {
|
|
21
|
-
return (0,
|
|
21
|
+
return (0, legacy_js_1.ripemd160)((0, sha2_js_1.sha256)((0, index_js_1.bytesFrom)(publicKey)));
|
|
22
22
|
}
|
|
23
23
|
/**
|
|
24
24
|
* @public
|
|
@@ -38,5 +38,5 @@ function btcPublicKeyFromP2pkhAddress(address) {
|
|
|
38
38
|
function verifyMessageBtcEcdsa(message, signature, publicKey) {
|
|
39
39
|
const challenge = typeof message === "string" ? message : (0, index_js_2.hexFrom)(message).slice(2);
|
|
40
40
|
const rawSign = (0, index_js_1.bytesFrom)(signature, "base64").slice(1);
|
|
41
|
-
return secp256k1_1.secp256k1.verify((0, index_js_1.bytesFrom)(rawSign), (0, bitcoinjs_message_1.magicHash)(challenge), publicKey);
|
|
41
|
+
return secp256k1_1.secp256k1.verify((0, index_js_1.bytesFrom)(rawSign), (0, bitcoinjs_message_1.magicHash)(challenge), (0, index_js_1.bytesFrom)(publicKey));
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyCkbSecp256k1.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/verifyCkbSecp256k1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAW,MAAM,oBAAoB,CAAC;AAGlD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,CAIxE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,
|
|
1
|
+
{"version":3,"file":"verifyCkbSecp256k1.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/verifyCkbSecp256k1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAW,MAAM,oBAAoB,CAAC;AAGlD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,CAIxE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAYT"}
|
|
@@ -20,5 +20,7 @@ function messageHashCkbSecp256k1(message) {
|
|
|
20
20
|
*/
|
|
21
21
|
function verifyMessageCkbSecp256k1(message, signature, publicKey) {
|
|
22
22
|
const signatureBytes = (0, index_js_1.bytesFrom)(signature);
|
|
23
|
-
return secp256k1_1.secp256k1.verify(new secp256k1_1.secp256k1.Signature((0, index_js_4.numFrom)(signatureBytes.slice(0, 32)), (0, index_js_4.numFrom)(signatureBytes.slice(32, 64)))
|
|
23
|
+
return secp256k1_1.secp256k1.verify(new secp256k1_1.secp256k1.Signature((0, index_js_4.numFrom)(signatureBytes.slice(0, 32)), (0, index_js_4.numFrom)(signatureBytes.slice(32, 64)))
|
|
24
|
+
.addRecoveryBit(Number((0, index_js_4.numFrom)(signatureBytes.slice(64, 65))))
|
|
25
|
+
.toBytes(), (0, index_js_1.bytesFrom)(messageHashCkbSecp256k1(message)), (0, index_js_1.bytesFrom)(publicKey));
|
|
24
26
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ckb-ccc/core",
|
|
3
|
-
"version": "1.11.
|
|
3
|
+
"version": "1.11.3",
|
|
4
4
|
"description": "Core of CCC - CKBer's Codebase",
|
|
5
5
|
"author": "Hanssen0 <hanssen0@hanssen0.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -36,38 +36,34 @@
|
|
|
36
36
|
}
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@eslint/js": "^9.
|
|
40
|
-
"@types/
|
|
41
|
-
"@types/ws": "^8.5.12",
|
|
39
|
+
"@eslint/js": "^9.34.0",
|
|
40
|
+
"@types/ws": "^8.18.1",
|
|
42
41
|
"copyfiles": "^2.4.1",
|
|
43
|
-
"eslint": "^9.
|
|
44
|
-
"eslint-config-prettier": "^10.1.
|
|
45
|
-
"eslint-plugin-prettier": "^5.4
|
|
46
|
-
"prettier": "^3.
|
|
47
|
-
"prettier-plugin-organize-imports": "^4.
|
|
48
|
-
"rimraf": "^5.0.
|
|
49
|
-
"
|
|
50
|
-
"typescript": "^
|
|
51
|
-
"
|
|
52
|
-
"vitest": "^3.2.2"
|
|
42
|
+
"eslint": "^9.34.0",
|
|
43
|
+
"eslint-config-prettier": "^10.1.8",
|
|
44
|
+
"eslint-plugin-prettier": "^5.5.4",
|
|
45
|
+
"prettier": "^3.6.2",
|
|
46
|
+
"prettier-plugin-organize-imports": "^4.2.0",
|
|
47
|
+
"rimraf": "^5.0.10",
|
|
48
|
+
"typescript": "^5.9.2",
|
|
49
|
+
"typescript-eslint": "^7.18.0",
|
|
50
|
+
"vitest": "^3.2.4"
|
|
53
51
|
},
|
|
54
52
|
"publishConfig": {
|
|
55
53
|
"access": "public"
|
|
56
54
|
},
|
|
57
55
|
"dependencies": {
|
|
58
|
-
"@joyid/ckb": "^1.1.
|
|
56
|
+
"@joyid/ckb": "^1.1.2",
|
|
59
57
|
"@noble/ciphers": "^0.5.3",
|
|
60
|
-
"@noble/curves": "^1.
|
|
61
|
-
"@noble/hashes": "^1.
|
|
62
|
-
"abort-controller": "^3.0.0",
|
|
58
|
+
"@noble/curves": "^1.9.7",
|
|
59
|
+
"@noble/hashes": "^1.8.0",
|
|
63
60
|
"bech32": "^2.0.0",
|
|
64
61
|
"bitcoinjs-message": "^2.2.0",
|
|
65
62
|
"bs58check": "^4.0.0",
|
|
66
63
|
"buffer": "^6.0.3",
|
|
67
|
-
"
|
|
68
|
-
"ethers": "^6.13.1",
|
|
64
|
+
"ethers": "^6.15.0",
|
|
69
65
|
"isomorphic-ws": "^5.0.0",
|
|
70
|
-
"ws": "^8.18.
|
|
66
|
+
"ws": "^8.18.3"
|
|
71
67
|
},
|
|
72
68
|
"scripts": {
|
|
73
69
|
"test": "vitest",
|
|
@@ -120,7 +120,7 @@ export const MAINNET_SCRIPTS: Record<KnownScript, ScriptInfoLike | undefined> =
|
|
|
120
120
|
cellDep: {
|
|
121
121
|
outPoint: {
|
|
122
122
|
txHash:
|
|
123
|
-
"
|
|
123
|
+
"0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
124
124
|
index: 0,
|
|
125
125
|
},
|
|
126
126
|
depType: "code",
|
|
@@ -129,14 +129,14 @@ export const MAINNET_SCRIPTS: Record<KnownScript, ScriptInfoLike | undefined> =
|
|
|
129
129
|
codeHash:
|
|
130
130
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
131
131
|
hashType: "type",
|
|
132
|
-
args: "
|
|
132
|
+
args: "0x2d1f2d4d1514ccc3bb4f04f5437a5ae30d00636ee57cedd2c70ab3ea75b62adc",
|
|
133
133
|
},
|
|
134
134
|
},
|
|
135
135
|
{
|
|
136
136
|
cellDep: {
|
|
137
137
|
outPoint: {
|
|
138
138
|
txHash:
|
|
139
|
-
"
|
|
139
|
+
"0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
140
140
|
index: 1,
|
|
141
141
|
},
|
|
142
142
|
depType: "code",
|
|
@@ -145,14 +145,14 @@ export const MAINNET_SCRIPTS: Record<KnownScript, ScriptInfoLike | undefined> =
|
|
|
145
145
|
codeHash:
|
|
146
146
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
147
147
|
hashType: "type",
|
|
148
|
-
args: "
|
|
148
|
+
args: "0xc086090432098835ec542a1b94bdd1b842c5aa1ccd1616873fe77f4a04044417",
|
|
149
149
|
},
|
|
150
150
|
},
|
|
151
151
|
{
|
|
152
152
|
cellDep: {
|
|
153
153
|
outPoint: {
|
|
154
154
|
txHash:
|
|
155
|
-
"
|
|
155
|
+
"0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
156
156
|
index: 2,
|
|
157
157
|
},
|
|
158
158
|
depType: "code",
|
|
@@ -161,14 +161,14 @@ export const MAINNET_SCRIPTS: Record<KnownScript, ScriptInfoLike | undefined> =
|
|
|
161
161
|
codeHash:
|
|
162
162
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
163
163
|
hashType: "type",
|
|
164
|
-
args: "
|
|
164
|
+
args: "0x165b225c6fbed7e655b024384d9083de3243375f9893706f4452858ecd694e96",
|
|
165
165
|
},
|
|
166
166
|
},
|
|
167
167
|
{
|
|
168
168
|
cellDep: {
|
|
169
169
|
outPoint: {
|
|
170
170
|
txHash:
|
|
171
|
-
"
|
|
171
|
+
"0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
172
172
|
index: 3,
|
|
173
173
|
},
|
|
174
174
|
depType: "code",
|
|
@@ -177,14 +177,14 @@ export const MAINNET_SCRIPTS: Record<KnownScript, ScriptInfoLike | undefined> =
|
|
|
177
177
|
codeHash:
|
|
178
178
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
179
179
|
hashType: "type",
|
|
180
|
-
args: "
|
|
180
|
+
args: "0xafb8408d0094ab944e6286aac750b9bb854ac0bcb66dfe5c60559744a700e70c",
|
|
181
181
|
},
|
|
182
182
|
},
|
|
183
183
|
{
|
|
184
184
|
cellDep: {
|
|
185
185
|
outPoint: {
|
|
186
186
|
txHash:
|
|
187
|
-
"
|
|
187
|
+
"0x8a605a4402cadda69fa64fd25cbbd74058e3eb86a7a72aee3d25df278564d31b",
|
|
188
188
|
index: 4,
|
|
189
189
|
},
|
|
190
190
|
depType: "code",
|
|
@@ -193,7 +193,7 @@ export const MAINNET_SCRIPTS: Record<KnownScript, ScriptInfoLike | undefined> =
|
|
|
193
193
|
codeHash:
|
|
194
194
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
195
195
|
hashType: "type",
|
|
196
|
-
args: "
|
|
196
|
+
args: "0x773bf0647be24b4e18ef44068fd069b9de5549c4b86be227779ceb9179598ec4",
|
|
197
197
|
},
|
|
198
198
|
},
|
|
199
199
|
],
|
|
@@ -135,7 +135,7 @@ export const TESTNET_SCRIPTS: Record<KnownScript, ScriptInfoLike> =
|
|
|
135
135
|
codeHash:
|
|
136
136
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
137
137
|
hashType: "type",
|
|
138
|
-
args: "
|
|
138
|
+
args: "0x1c9fc299ba0570d077b4d7fb9acff1ccc0de69d369942d82678bae937c44ec30",
|
|
139
139
|
},
|
|
140
140
|
},
|
|
141
141
|
{
|
|
@@ -151,7 +151,7 @@ export const TESTNET_SCRIPTS: Record<KnownScript, ScriptInfoLike> =
|
|
|
151
151
|
codeHash:
|
|
152
152
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
153
153
|
hashType: "type",
|
|
154
|
-
args: "
|
|
154
|
+
args: "0x27f0d3ccdc2fcd52ae31fbacad5f86b97bc147d7093e4807cd6e3d21c1fe6841",
|
|
155
155
|
},
|
|
156
156
|
},
|
|
157
157
|
{
|
|
@@ -167,7 +167,7 @@ export const TESTNET_SCRIPTS: Record<KnownScript, ScriptInfoLike> =
|
|
|
167
167
|
codeHash:
|
|
168
168
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
169
169
|
hashType: "type",
|
|
170
|
-
args: "
|
|
170
|
+
args: "0x0ac15fe5b2d059ec39de03f2d3159d5463abb918a1a07a9fa00d2b9c61d89ef3",
|
|
171
171
|
},
|
|
172
172
|
},
|
|
173
173
|
{
|
|
@@ -183,7 +183,7 @@ export const TESTNET_SCRIPTS: Record<KnownScript, ScriptInfoLike> =
|
|
|
183
183
|
codeHash:
|
|
184
184
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
185
185
|
hashType: "type",
|
|
186
|
-
args: "
|
|
186
|
+
args: "0xc7bafc5550ccad7cea32c27764f5df6aca4de547da65e3e67fa08477a1af7f5e",
|
|
187
187
|
},
|
|
188
188
|
},
|
|
189
189
|
{
|
|
@@ -199,7 +199,7 @@ export const TESTNET_SCRIPTS: Record<KnownScript, ScriptInfoLike> =
|
|
|
199
199
|
codeHash:
|
|
200
200
|
"0x00000000000000000000000000000000000000000000000000545950455f4944",
|
|
201
201
|
hashType: "type",
|
|
202
|
-
args: "
|
|
202
|
+
args: "0x71decef9ca8725e64ec99a5521790d16b8d5daadb4989b45dd6ab51806a8c0e4",
|
|
203
203
|
},
|
|
204
204
|
},
|
|
205
205
|
],
|
package/src/signer/btc/verify.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { secp256k1 } from "@noble/curves/secp256k1";
|
|
2
|
-
import { ripemd160 } from "@noble/hashes/
|
|
3
|
-
import { sha256 } from "@noble/hashes/
|
|
2
|
+
import { ripemd160 } from "@noble/hashes/legacy.js";
|
|
3
|
+
import { sha256 } from "@noble/hashes/sha2.js";
|
|
4
4
|
import { magicHash } from "bitcoinjs-message";
|
|
5
5
|
import bs58check from "bs58check";
|
|
6
6
|
import { Bytes, BytesLike, bytesConcat, bytesFrom } from "../../bytes/index.js";
|
|
@@ -45,5 +45,9 @@ export function verifyMessageBtcEcdsa(
|
|
|
45
45
|
|
|
46
46
|
const rawSign = bytesFrom(signature, "base64").slice(1);
|
|
47
47
|
|
|
48
|
-
return secp256k1.verify(
|
|
48
|
+
return secp256k1.verify(
|
|
49
|
+
bytesFrom(rawSign),
|
|
50
|
+
magicHash(challenge),
|
|
51
|
+
bytesFrom(publicKey),
|
|
52
|
+
);
|
|
49
53
|
}
|
|
@@ -26,7 +26,9 @@ export function verifyMessageCkbSecp256k1(
|
|
|
26
26
|
new secp256k1.Signature(
|
|
27
27
|
numFrom(signatureBytes.slice(0, 32)),
|
|
28
28
|
numFrom(signatureBytes.slice(32, 64)),
|
|
29
|
-
)
|
|
29
|
+
)
|
|
30
|
+
.addRecoveryBit(Number(numFrom(signatureBytes.slice(64, 65))))
|
|
31
|
+
.toBytes(),
|
|
30
32
|
bytesFrom(messageHashCkbSecp256k1(message)),
|
|
31
33
|
bytesFrom(publicKey),
|
|
32
34
|
);
|