Devop/trezor conditional #699
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,4 +1,4 @@ | ||||||||||||||||||||||||||
| import type { TrezorConnect } from "@trezor/connect-web"; | ||||||||||||||||||||||||||
| import { HWwalletCapabilities, NetworkNames } from "@enkryptcom/types"; | ||||||||||||||||||||||||||
| import HDKey from "hdkey"; | ||||||||||||||||||||||||||
| import base58 from "bs58"; | ||||||||||||||||||||||||||
|
|
@@ -12,10 +12,11 @@ import { | |||||||||||||||||||||||||
| SolSignTransaction, | ||||||||||||||||||||||||||
| } from "../../types"; | ||||||||||||||||||||||||||
| import { supportedPaths } from "./configs"; | ||||||||||||||||||||||||||
| import getTrezorConnect from "../trezorConnect"; | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| class TrezorSolana implements HWWalletProvider { | ||||||||||||||||||||||||||
| network: NetworkNames; | ||||||||||||||||||||||||||
| TrezorConnect: TrezorConnect; | ||||||||||||||||||||||||||
| HDNodes: Record<string, HDKey>; | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| constructor(network: NetworkNames) { | ||||||||||||||||||||||||||
|
|
@@ -24,28 +25,20 @@ class TrezorSolana implements HWWalletProvider { | |||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| async init(): Promise<boolean> { | ||||||||||||||||||||||||||
| this.TrezorConnect = await getTrezorConnect(); | ||||||||||||||||||||||||||
| return true; | ||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
|
Comment on lines
+28
to
30
There was a problem hiding this comment. 🛠️ Refactor suggestion Add error handling to init() method The async init(): Promise<boolean> {
- this.TrezorConnect = await getTrezorConnect();
- return true;
+ try {
+ this.TrezorConnect = await getTrezorConnect();
+ return true;
+ } catch (error) {
+ console.error('Failed to initialize TrezorConnect:', error);
+ return false;
+ }
}📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| async getAddress(options: getAddressRequest): Promise<AddressResponse> { | ||||||||||||||||||||||||||
| if (!supportedPaths[this.network]) | ||||||||||||||||||||||||||
| return Promise.reject(new Error("trezor-bitcoin: Invalid network name")); | ||||||||||||||||||||||||||
| const res = await this.TrezorConnect.solanaGetAddress({ | ||||||||||||||||||||||||||
| path: options.pathType.path.replace(`{index}`, options.pathIndex), | ||||||||||||||||||||||||||
| showOnTrezor: options.confirmAddress, | ||||||||||||||||||||||||||
| }); | ||||||||||||||||||||||||||
| return { | ||||||||||||||||||||||||||
| address: bufferToHex(base58.decode((res.payload as any).address)), | ||||||||||||||||||||||||||
| publicKey: bufferToHex(base58.decode((res.payload as any).address)), | ||||||||||||||||||||||||||
|
Comment on lines
+40
to
+41
There was a problem hiding this comment. 🛠️ Refactor suggestion Avoid type casting to Type casting to - address: bufferToHex(base58.decode((res.payload as any).address)),
- publicKey: bufferToHex(base58.decode((res.payload as any).address)),
+ address: bufferToHex(base58.decode((res.payload as SolanaGetAddressResponse).address)),
+ publicKey: bufferToHex(base58.decode((res.payload as SolanaGetAddressResponse).address)),And similarly for the transaction signature: - }).then((result) => (result.payload as any).signature);
+ }).then((result) => (result.payload as SolanaSignTransactionResponse).signature);You'll need to define these interfaces (if they don't already exist in the TrezorConnect types): interface SolanaGetAddressResponse {
address: string;
// other properties...
}
interface SolanaSignTransactionResponse {
signature: string;
// other properties...
}Also applies to: 67-67 🤖 Prompt for AI Agents |
||||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
|
|
@@ -66,12 +59,12 @@ class TrezorSolana implements HWWalletProvider { | |||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| async signTransaction(options: SignTransactionRequest): Promise<string> { | ||||||||||||||||||||||||||
| return this.TrezorConnect.solanaSignTransaction({ | ||||||||||||||||||||||||||
| path: options.pathType.path.replace(`{index}`, options.pathIndex), | ||||||||||||||||||||||||||
| serializedTx: (options.transaction as SolSignTransaction).solTx.toString( | ||||||||||||||||||||||||||
| "hex", | ||||||||||||||||||||||||||
| ), | ||||||||||||||||||||||||||
| }).then((result) => (result.payload as any).signature); | ||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| static getSupportedNetworks(): NetworkNames[] { | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import type { TrezorConnect as TrezorConnectType } from "@trezor/connect-web"; | ||
|
|
||
| const getTrezorConnect = async () => { | ||
| if (chrome && chrome.runtime && chrome.runtime.getPlatformInfo) { | ||
| const TrezorConnect = await import("@trezor/connect-webextension"); | ||
| await TrezorConnect.default.init({ | ||
| manifest: { | ||
| email: "info@enkrypt.com", | ||
| appUrl: "https://www.enkrypt.com", | ||
| }, | ||
| transports: ["BridgeTransport", "WebUsbTransport"], | ||
| connectSrc: "https://connect.trezor.io/9/", | ||
| _extendWebextensionLifetime: true, | ||
| }); | ||
| return TrezorConnect.default as TrezorConnectType; | ||
| } else { | ||
| const TrezorConnect = await import("@trezor/connect-web"); | ||
| await TrezorConnect.default.init({ | ||
| lazyLoad: true, | ||
| manifest: { | ||
| email: "info@enkrypt.com", | ||
| appUrl: "http://www.myetherwallet.com", | ||
| }, | ||
| }); | ||
| return TrezorConnect.default as TrezorConnectType; | ||
| } | ||
| }; | ||
|
|
||
| export default getTrezorConnect; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Updated init method for dynamic loading
The init method now properly uses the getTrezorConnect helper to dynamically load and initialize TrezorConnect.
Consider adding error handling to gracefully handle initialization failures:
async init(): Promise<boolean> { - this.TrezorConnect = await getTrezorConnect(); - return true; + try { + this.TrezorConnect = await getTrezorConnect(); + return true; + } catch (error) { + console.error("Failed to initialize Trezor Connect:", error); + return false; + } }📝 Committable suggestion
🤖 Prompt for AI Agents