@shapeshiftoss/hdwallet-ledger 1.26.0 → 1.29.0
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/dist/ethereum.d.ts.map +1 -1
- package/dist/ethereum.js +9 -2
- package/dist/ethereum.js.map +1 -1
- package/package.json +3 -3
package/dist/ethereum.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../src/ethereum.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../src/ethereum.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAKrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE3E;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAMxG;AAGD,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,eAAe,EAC1B,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAgDvC;AAED,wBAAsB,SAAS,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAuC1G;AAED,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,OAAO,CAAC,CAElE;AAED,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAiB1F;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,eAAe,EAC1B,GAAG,EAAE,IAAI,CAAC,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAqBhC;AAGD,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAanF"}
|
package/dist/ethereum.js
CHANGED
|
@@ -37,6 +37,7 @@ const tx_1 = require("@ethereumjs/tx");
|
|
|
37
37
|
const core = __importStar(require("@shapeshiftoss/hdwallet-core"));
|
|
38
38
|
const ethereumjs_tx_1 = __importDefault(require("ethereumjs-tx"));
|
|
39
39
|
const ethereumUtil = __importStar(require("ethereumjs-util"));
|
|
40
|
+
const ethers = __importStar(require("ethers"));
|
|
40
41
|
const utils_1 = require("./utils");
|
|
41
42
|
function ethSupportsNetwork(chain_id) {
|
|
42
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -159,7 +160,10 @@ exports.ethGetAccountPaths = ethGetAccountPaths;
|
|
|
159
160
|
function ethSignMessage(transport, msg) {
|
|
160
161
|
return __awaiter(this, void 0, void 0, function* () {
|
|
161
162
|
const bip32path = core.addressNListToBIP32(msg.addressNList);
|
|
162
|
-
const
|
|
163
|
+
const buffer = ethers.utils.isBytes(msg.message)
|
|
164
|
+
? Buffer.from(ethers.utils.arrayify(msg.message))
|
|
165
|
+
: Buffer.from(msg.message);
|
|
166
|
+
const res = yield transport.call("Eth", "signPersonalMessage", bip32path, buffer.toString("hex"));
|
|
163
167
|
utils_1.handleError(res, transport, "Could not sign ETH message with Ledger");
|
|
164
168
|
let { v } = res.payload;
|
|
165
169
|
const { r, s } = res.payload;
|
|
@@ -182,7 +186,10 @@ function ethVerifyMessage(msg) {
|
|
|
182
186
|
return false;
|
|
183
187
|
}
|
|
184
188
|
sigb[64] = sigb[64] === 0 || sigb[64] === 1 ? sigb[64] + 27 : sigb[64];
|
|
185
|
-
const
|
|
189
|
+
const buffer = ethers.utils.isBytes(msg.message)
|
|
190
|
+
? Buffer.from(ethers.utils.arrayify(msg.message))
|
|
191
|
+
: Buffer.from(msg.message);
|
|
192
|
+
const hash = ethereumUtil.hashPersonalMessage(buffer);
|
|
186
193
|
const pubKey = ethereumUtil.ecrecover(hash, sigb[64], sigb.slice(0, 32), sigb.slice(32, 64));
|
|
187
194
|
return core.stripHexPrefixAndLower(msg.address) === ethereumUtil.pubToAddress(pubKey).toString("hex");
|
|
188
195
|
});
|
package/dist/ethereum.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../src/ethereum.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAwC;AACxC,uCAA6C;AAC7C,mEAAqD;AACrD,kEAAuC;AACvC,8DAAgD;
|
|
1
|
+
{"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../src/ethereum.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapeshiftoss/hdwallet-ledger",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.29.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@ethereumjs/common": "^2.4.0",
|
|
19
19
|
"@ethereumjs/tx": "^3.3.0",
|
|
20
|
-
"@shapeshiftoss/hdwallet-core": "1.
|
|
20
|
+
"@shapeshiftoss/hdwallet-core": "1.29.0",
|
|
21
21
|
"base64-js": "^1.5.1",
|
|
22
22
|
"bchaddrjs": "^0.4.4",
|
|
23
23
|
"bitcoinjs-lib": "^5.1.6",
|
|
@@ -39,5 +39,5 @@
|
|
|
39
39
|
"typedoc": "^0.20.36",
|
|
40
40
|
"typescript": "^4.3.2"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "bf50e79d0b217640d60800481d59d57e173794ac"
|
|
43
43
|
}
|