diff --git a/package.json b/package.json index 6ae07352831..e97a6a00400 100644 --- a/package.json +++ b/package.json @@ -56,9 +56,9 @@ "@rabby-wallet/eth-coinbase-keyring": "0.0.0-beta.8", "@rabby-wallet/eth-gnosis-keyring": "0.0.1", "@rabby-wallet/eth-hd-keyring": "4.3.2", - "@rabby-wallet/eth-lattice-keyring": "1.2.3-alpha-1", + "@rabby-wallet/eth-lattice-keyring": "1.2.4", "@rabby-wallet/eth-simple-keyring": "5.0.1", - "@rabby-wallet/eth-trezor-keyring": "2.6.2-alpha-2", + "@rabby-wallet/eth-trezor-keyring": "2.6.3", "@rabby-wallet/eth-walletconnect-keyring": "2.1.5", "@rabby-wallet/eth-watch-keyring": "1.0.0", "@rabby-wallet/gnosis-sdk": "1.3.10", diff --git a/src/background/controller/provider/rpcFlow.ts b/src/background/controller/provider/rpcFlow.ts index f4c579c6f01..0ddeebcbe86 100644 --- a/src/background/controller/provider/rpcFlow.ts +++ b/src/background/controller/provider/rpcFlow.ts @@ -264,7 +264,6 @@ const flowContext = flow }) .then(resolve) .catch((e: any) => { - console.error(e); const payload = { method: EVENTS.SIGN_FINISHED, params: { diff --git a/src/background/service/keyring/eth-bitbox02-keyring/eth-bitbox02-keyring.ts b/src/background/service/keyring/eth-bitbox02-keyring/eth-bitbox02-keyring.ts index 6bc1a9023a3..9e0a63cd1fc 100644 --- a/src/background/service/keyring/eth-bitbox02-keyring/eth-bitbox02-keyring.ts +++ b/src/background/service/keyring/eth-bitbox02-keyring/eth-bitbox02-keyring.ts @@ -202,9 +202,9 @@ class BitBox02Keyring extends EventEmitter { txData.gasPrice = `0x${tx.gasPrice.toString(16)}`; } txData.chainId = `0x${tx.common.chainId().toString(16)}`; - txData.r = result.r; - txData.s = result.s; - txData.v = result.v; + txData.r = bufferToHex(result.r); + txData.s = bufferToHex(result.s); + txData.v = bufferToHex(result.v); const signedTx = TransactionFactory.fromTxData(txData); const addressSignedWith = toChecksumAddress( signedTx.getSenderAddress().toString() diff --git a/src/background/service/keyring/eth-onekey-keyring/eth-onekey-keyring.ts b/src/background/service/keyring/eth-onekey-keyring/eth-onekey-keyring.ts index c02e6bce0a4..484a97ebba9 100644 --- a/src/background/service/keyring/eth-onekey-keyring/eth-onekey-keyring.ts +++ b/src/background/service/keyring/eth-onekey-keyring/eth-onekey-keyring.ts @@ -618,7 +618,7 @@ class OneKeyKeyring extends EventEmitter { _addressFromIndex(pathBase: string, i: number): string { const dkey = this.hdk.derive(`${pathBase}/${i}`); const address = bufferToHex(publicToAddress(dkey.publicKey, true)); - return toChecksumAddress(`0x${address}`); + return toChecksumAddress(address); } _pathFromAddress(address: string): string { diff --git a/yarn.lock b/yarn.lock index 909504601f6..8ecea3a3aa5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4817,10 +4817,10 @@ ethereum-cryptography "^2.1.2" slip39 "^0.1.9" -"@rabby-wallet/eth-lattice-keyring@1.2.3-alpha-1": - version "1.2.3-alpha-1" - resolved "https://registry.yarnpkg.com/@rabby-wallet/eth-lattice-keyring/-/eth-lattice-keyring-1.2.3-alpha-1.tgz#e3cf1e5cf13fbe79a41375dc6fda6354e8e9eeb4" - integrity sha512-6ZcA+LlCQLEQ13WB6TfKOgh/UBjlRs4B44VoOpFXkWvFLZKriOH7sDBHTeI2beZN5Euk6qK5eRKXn6NlM60A3g== +"@rabby-wallet/eth-lattice-keyring@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@rabby-wallet/eth-lattice-keyring/-/eth-lattice-keyring-1.2.4.tgz#92085eded9e4cc8b9a47e51ffbc973c2d55b0f0a" + integrity sha512-fMPahQJ8hiDiHOhFKHrHbIm34LBLQIlNHS9MOkfEUkqkEt4JBYbdQoUF85AG49Yn+Xfo08E32V+ivQgyTdzq5Q== dependencies: "@ethereumjs/tx" "4.1.1" "@ethereumjs/util" "8.0.5" @@ -4845,10 +4845,10 @@ ethereumjs-wallet "^1.0.2" randombytes "^2.1.0" -"@rabby-wallet/eth-trezor-keyring@2.6.2-alpha-2": - version "2.6.2-alpha-2" - resolved "https://registry.yarnpkg.com/@rabby-wallet/eth-trezor-keyring/-/eth-trezor-keyring-2.6.2-alpha-2.tgz#1c13679570567ee8438548e123543f385a8f7036" - integrity sha512-9jRNxM72x9Fhpsh/Xmu8w0pxT//HLDKqeHMlJKdihBwD5GaHeuJcyX0MC65DFxi9QbWyxRoxL1wS/p7lcCWDug== +"@rabby-wallet/eth-trezor-keyring@2.6.3": + version "2.6.3" + resolved "https://registry.yarnpkg.com/@rabby-wallet/eth-trezor-keyring/-/eth-trezor-keyring-2.6.3.tgz#adee5aac9aa9a3004186f8954eca0754a9dc94d3" + integrity sha512-WkjaydKljDKG1ssz6Izo1ZEGYHLSksMZW8EVCLK9+r0uPas2DWq1DcnUPE6j4zMoCAqJbUf3t56UC/+H46+JSQ== dependencies: "@ethereumjs/tx" "4.1.1" "@ethereumjs/util" "8.0.5"