@keplr-wallet/background 0.12.178 → 0.12.180-rc.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.
Files changed (4) hide show
  1. package/build/keyring-ethereum/service.js +4 -2
  2. package/build/keyring-ethereum/service.js.map +1 -1
  3. package/package.json +13 -13
  4. package/src/keyring-ethereum/service.ts +4 -2
package/build/keyring-ethereum/service.js CHANGED
@@ -126,7 +126,7 @@ class KeyRingEthereumService {
126
126
  signature.s,
127
127
  // The metamask doesn't seem to consider the chain id in this case... (maybe bug on metamask?)
128
128
  signature.v
129
- ? buffer_1.Buffer.from("1c", "hex")
129
+ ? buffer_1.Buffer.from(signature.v.toString(16), "hex")
130
130
  : buffer_1.Buffer.from("1b", "hex"),
131
131
  ]),
132
132
  };
@@ -373,7 +373,9 @@ class KeyRingEthereumService {
373
373
  if (!signer || (signer && !signer.match(/^0x[0-9A-Fa-f]*$/))) {
374
374
  throw new Error("Invalid parameters: must provide an Ethereum address.");
375
375
  }
376
- const { signature } = yield this.signEthereumSelected(env, origin, currentChainId, signer, buffer_1.Buffer.from(message), types_1.EthSignType.MESSAGE);
376
+ const { signature } = yield this.signEthereumSelected(env, origin, currentChainId, signer, message.startsWith("0x")
377
+ ? buffer_1.Buffer.from(message.slice(2), "hex")
378
+ : buffer_1.Buffer.from(message, "utf8"), types_1.EthSignType.MESSAGE);
377
379
  return `0x${buffer_1.Buffer.from(signature).toString("hex")}`;
378
380
  }
379
381
  case "eth_signTypedData_v3":
package/build/keyring-ethereum/service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/keyring-ethereum/service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/keyring-ethereum/service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@keplr-wallet/background",
3
- "version": "0.12.178",
3
+ "version": "0.12.180-rc.0",
4
4
  "main": "build/index.js",
5
5
  "author": "chainapsis",
6
6
  "license": "Apache-2.0",
@@ -28,17 +28,17 @@
28
28
  "@ethersproject/hash": "^5.7.0",
29
29
  "@ethersproject/transactions": "^5.7.0",
30
30
  "@ethersproject/wallet": "^5.7.0",
31
- "@keplr-wallet/chain-validator": "0.12.178",
32
- "@keplr-wallet/common": "0.12.178",
33
- "@keplr-wallet/cosmos": "0.12.178",
34
- "@keplr-wallet/crypto": "0.12.178",
35
- "@keplr-wallet/ledger-cosmos": "0.12.178",
36
- "@keplr-wallet/popup": "0.12.178",
37
- "@keplr-wallet/proto-types": "0.12.178",
38
- "@keplr-wallet/router": "0.12.178",
39
- "@keplr-wallet/simple-fetch": "0.12.178",
40
- "@keplr-wallet/types": "0.12.178",
41
- "@keplr-wallet/unit": "0.12.178",
31
+ "@keplr-wallet/chain-validator": "0.12.180-rc.0",
32
+ "@keplr-wallet/common": "0.12.180-rc.0",
33
+ "@keplr-wallet/cosmos": "0.12.180-rc.0",
34
+ "@keplr-wallet/crypto": "0.12.180-rc.0",
35
+ "@keplr-wallet/ledger-cosmos": "0.12.180-rc.0",
36
+ "@keplr-wallet/popup": "0.12.180-rc.0",
37
+ "@keplr-wallet/proto-types": "0.12.180-rc.0",
38
+ "@keplr-wallet/router": "0.12.180-rc.0",
39
+ "@keplr-wallet/simple-fetch": "0.12.180-rc.0",
40
+ "@keplr-wallet/types": "0.12.180-rc.0",
41
+ "@keplr-wallet/unit": "0.12.180-rc.0",
42
42
  "@ledgerhq/hw-app-eth": "^6.40.3",
43
43
  "@ledgerhq/hw-app-starknet": "^2.4.0",
44
44
  "@ledgerhq/hw-transport": "^6.31.4",
@@ -62,5 +62,5 @@
62
62
  "mobx-utils": "^6",
63
63
  "starknet": "^6"
64
64
  },
65
- "gitHead": "72dc080143d106abbbd82779742a03e26b764fa9"
65
+ "gitHead": "4e4f641c281d3de3d5d96df0f26babba9baaf537"
66
66
  }
package/src/keyring-ethereum/service.ts CHANGED
@@ -170,7 +170,7 @@ export class KeyRingEthereumService {
170
170
  signature.s,
171
171
  // The metamask doesn't seem to consider the chain id in this case... (maybe bug on metamask?)
172
172
  signature.v
173
- ? Buffer.from("1c", "hex")
173
+ ? Buffer.from(signature.v.toString(16), "hex")
174
174
  : Buffer.from("1b", "hex"),
175
175
  ]),
176
176
  };
@@ -600,7 +600,9 @@ export class KeyRingEthereumService {
600
600
  origin,
601
601
  currentChainId,
602
602
  signer,
603
- Buffer.from(message),
603
+ message.startsWith("0x")
604
+ ? Buffer.from(message.slice(2), "hex")
605
+ : Buffer.from(message, "utf8"),
604
606
  EthSignType.MESSAGE
605
607
  );
606
608