@rango-dev/provider-trezor 0.2.2-next.0 → 0.2.2-next.1
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/helpers.d.ts +2 -2
- package/dist/helpers.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +4 -4
- package/dist/provider-trezor.build.json +1 -1
- package/dist/signers/ethereum.d.ts.map +1 -1
- package/dist/state.d.ts +3 -0
- package/dist/state.d.ts.map +1 -0
- package/package.json +2 -2
- package/src/helpers.ts +7 -3
- package/src/index.ts +45 -11
- package/src/signers/ethereum.ts +4 -8
- package/src/state.ts +10 -0
package/dist/helpers.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { TrezorConnect } from '@trezor/connect-web';
|
|
2
|
-
export declare const ETHEREUM_BIP32_PATH = "m/44'/60'/0'/0/0";
|
|
3
2
|
export declare function getTrezorModule(): Promise<TrezorConnect>;
|
|
4
3
|
export declare function getTrezorErrorMessage(error: any): Error;
|
|
5
4
|
export declare function getTrezorInstance(): Map<any, any>;
|
|
6
|
-
export declare function getEthereumAccounts(
|
|
5
|
+
export declare function getEthereumAccounts(): Promise<{
|
|
7
6
|
accounts: string[];
|
|
8
7
|
chainId: string;
|
|
9
8
|
}>;
|
|
10
9
|
export declare const valueToHex: (value: string) => string;
|
|
10
|
+
export declare const getTrezorNormalizedDerivationPath: (path: string) => string;
|
|
11
11
|
//# sourceMappingURL=helpers.d.ts.map
|
package/dist/helpers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQzD,wBAAsB,eAAe,2BAWpC;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,SAS/C;AAED,wBAAgB,iBAAiB,kBAUhC;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC;IACnD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAcD;AAMD,eAAO,MAAM,UAAU,UAAW,MAAM,WAMvC,CAAC;AAEF,eAAO,MAAM,iCAAiC,SACtC,MAAM,WAC4C,CAAC"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EACV,OAAO,EAEP,UAAU,EACX,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAuB,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7E,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAEtE,OAAO,EAEL,iBAAiB,EAGlB,MAAM,WAAW,CAAC;AAQnB,eAAO,MAAM,MAAM;;CAElB,CAAC;AAEF,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,eAAO,MAAM,IAAI,iBAAkB,YAAY,SAE9C,CAAC;AAEF,eAAO,MAAM,WAAW,0BAAoB,CAAC;AAG7C,eAAO,MAAM,OAAO,EAAE,OAsCrB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,aAAsB,CAAC;AAEnE,eAAO,MAAM,aAAa,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,KAAK,UAwBjE,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
var
|
|
1
|
+
var k=Object.defineProperty;var r=(e,t)=>k(e,"name",{value:t,configurable:!0});import{Namespace as M,Networks as O,WalletTypes as X}from"@rango-dev/wallets-shared";import{cleanEvmError as G}from"@rango-dev/signer-evm";import{ETHEREUM_CHAIN_ID as T,Networks as A}from"@rango-dev/wallets-shared";var y="";function w(e){y=e}r(w,"setDerivationPath");function m(){return y}r(m,"getDerivationPath");async function i(){let e=await import("@trezor/connect-web");return e.default.default?e.default.default:e.default}r(i,"getTrezorModule");function v(e){return e?.shortMessage?new Error(e.shortMessage,{cause:e}):G(e)}r(v,"getTrezorErrorMessage");function P(){let e=new Map;return e.set(A.ETHEREUM,{chainId:T}),e}r(P,"getTrezorInstance");async function z(){let t=await(await i()).ethereumGetAddress({path:m()});if(!t.success)throw new Error(t.payload.error);return{accounts:[t.payload.address],chainId:T}}r(z,"getEthereumAccounts");var s=r(e=>{let t=BigInt(0);return BigInt(e)>t?`0x${BigInt(e).toString(16)}`:"0x0"},"valueToHex"),x=r(e=>e&&!e.startsWith("m/")?"m/"+e:e,"getTrezorNormalizedDerivationPath");import{DefaultSignerFactory as L,TransactionType as W}from"rango-types";import{DEFAULT_ETHEREUM_RPC_URL as H}from"@rango-dev/wallets-shared";import{JsonRpcProvider as U,Transaction as _}from"ethers";var p=class{static{r(this,"EthereumSigner")}async signMessage(t){let o=await i(),{success:a,payload:n}=await o.signMessage({message:t,path:m()});if(!a)throw new Error(n.error);return n.signature}async signAndSendTx(t,o,a){try{let n=await i(),{gasPrice:h,maxFeePerGas:g,maxPriorityFeePerGas:u}=t,c=g&&u;if(c&&!g)throw new Error("Missing maxFeePerGas");if(c&&!u)throw new Error("Missing maxPriorityFeePerGas");if(!c&&!h)throw new Error("Missing gasPrice");let d=new U(H),C=await d.getTransactionCount(o),F=c?{maxFeePerGas:s(g||"0"),maxPriorityFeePerGas:s(u||"0")}:{gasPrice:s(h||"0")},l={to:t.to,data:t.data||"0x",value:s(t.value?.toString()||"0"),gasLimit:s(t.gasLimit?.toString()||"0"),chainId:Number.parseInt(a),nonce:s(C.toString()),...F},{success:R,payload:E}=await n.ethereumSignTransaction({path:m(),transaction:l});if(!R)throw new Error(E.error);let{r:D,s:b,v:B}=E,N=_.from({...l,nonce:Number.parseInt(l.nonce),type:c?2:0,signature:{r:D,s:b,v:parseInt(B)}}).serialized;return{hash:(await d.broadcastTransaction(N)).hash}}catch(n){throw v(n)}}};function f(){let e=new L;return e.registerSigner(W.EVM,new p),e}r(f,"getSigners");var S={appUrl:"",email:""},fe={type:X.TREZOR},he=r(e=>{S=e.manifest},"init"),de=P,I=!1,Ee=r(async({namespaces:e})=>{let t=[],o=await i(),a=e?.find(n=>n.namespace===M.Evm);if(a)if(a.derivationPath){w(x(a.derivationPath)),I||(await o.init({lazyLoad:!0,manifest:S}),I=!0);let n=await z();t.push(n)}else throw new Error("Derivation Path can not be empty.");else throw new Error(`It appears that you have selected a namespace that is not yet supported by our system. Your namespaces: ${e?.map(n=>n.namespace)}`);return t},"connect"),ye=f,we=r(e=>{let t=[],o=e.find(a=>a.name===O.ETHEREUM);return o&&t.push(o),{name:"Trezor",img:"https://raw.githubusercontent.com/rango-exchange/assets/main/wallets/trezor/icon.svg",installLink:{DEFAULT:"https://trezor.io/learn/a/download-verify-trezor-suite"},color:"black",supportedChains:t,namespaces:[M.Evm],singleNamespace:!0,showOnMobile:!1,needsDerivationPath:!0}},"getWalletInfo");export{fe as config,Ee as connect,de as getInstance,ye as getSigners,we as getWalletInfo,he as init};
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
|
-
"sources": ["../src/index.ts", "../src/helpers.ts", "../src/signer.ts", "../src/signers/ethereum.ts"],
|
|
4
|
-
"sourcesContent": ["import type { Environments } from './types';\nimport type {
|
|
5
|
-
"mappings": "+
|
|
6
|
-
"names": ["Networks", "WalletTypes", "cleanEvmError", "ETHEREUM_CHAIN_ID", "Networks", "
|
|
3
|
+
"sources": ["../src/index.ts", "../src/helpers.ts", "../src/state.ts", "../src/signer.ts", "../src/signers/ethereum.ts"],
|
|
4
|
+
"sourcesContent": ["import type { Environments } from './types';\nimport type {\n Connect,\n ProviderConnectResult,\n WalletInfo,\n} from '@rango-dev/wallets-shared';\n\nimport { Namespace, Networks, WalletTypes } from '@rango-dev/wallets-shared';\nimport { type BlockchainMeta, type SignerFactory } from 'rango-types';\n\nimport {\n getEthereumAccounts,\n getTrezorInstance,\n getTrezorModule,\n getTrezorNormalizedDerivationPath,\n} from './helpers';\nimport signer from './signer';\nimport { setDerivationPath } from './state';\n\nlet trezorManifest: Environments['manifest'] = {\n appUrl: '',\n email: '',\n};\nexport const config = {\n type: WalletTypes.TREZOR,\n};\n\nexport type { Environments };\n\nexport const init = (environments: Environments) => {\n trezorManifest = environments.manifest;\n};\n\nexport const getInstance = getTrezorInstance;\n\nlet isTrezorInitialized = false;\nexport const connect: Connect = async ({ namespaces }) => {\n const results: ProviderConnectResult[] = [];\n\n const TrezorConnect = await getTrezorModule();\n\n const evmNamespace = namespaces?.find(\n (namespaceItem) => namespaceItem.namespace === Namespace.Evm\n );\n\n if (evmNamespace) {\n if (evmNamespace.derivationPath) {\n setDerivationPath(\n getTrezorNormalizedDerivationPath(evmNamespace.derivationPath)\n );\n\n if (!isTrezorInitialized) {\n await TrezorConnect.init({\n lazyLoad: true, // this param will prevent iframe injection until TrezorConnect.method will be called\n manifest: trezorManifest,\n });\n\n isTrezorInitialized = true;\n }\n\n const accounts = await getEthereumAccounts();\n results.push(accounts);\n } else {\n throw new Error('Derivation Path can not be empty.');\n }\n } else {\n throw new Error(\n `It appears that you have selected a namespace that is not yet supported by our system. Your namespaces: ${namespaces?.map(\n (namespaceItem) => namespaceItem.namespace\n )}`\n );\n }\n\n return results;\n};\n\nexport const getSigners: (provider: any) => SignerFactory = signer;\n\nexport const getWalletInfo: (allBlockChains: BlockchainMeta[]) => WalletInfo = (\n allBlockChains\n) => {\n const supportedChains: BlockchainMeta[] = [];\n\n const ethereumBlockchain = allBlockChains.find(\n (chain) => chain.name === Networks.ETHEREUM\n );\n if (ethereumBlockchain) {\n supportedChains.push(ethereumBlockchain);\n }\n return {\n name: 'Trezor',\n img: 'https://raw.githubusercontent.com/rango-exchange/assets/main/wallets/trezor/icon.svg',\n installLink: {\n DEFAULT: 'https://trezor.io/learn/a/download-verify-trezor-suite',\n },\n color: 'black',\n supportedChains,\n namespaces: [Namespace.Evm],\n singleNamespace: true,\n showOnMobile: false,\n needsDerivationPath: true,\n };\n};\n", "import type { TrezorConnect } from '@trezor/connect-web';\n\nimport { cleanEvmError } from '@rango-dev/signer-evm';\nimport { ETHEREUM_CHAIN_ID, Networks } from '@rango-dev/wallets-shared';\n\nimport { getDerivationPath } from './state';\n\n// `@trezor/connect-web` is commonjs, when we are importing it dynamically, it has some differences in different tooling. for example vite (you can check widget-examples), goes throw error. this is a workaround for solving this interop issue.\nexport async function getTrezorModule() {\n const mod = await import('@trezor/connect-web');\n // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n // @ts-ignore\n if (mod.default.default) {\n // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n // @ts-ignore\n return mod.default.default as unknown as TrezorConnect;\n }\n\n return mod.default;\n}\n\nexport function getTrezorErrorMessage(error: any) {\n if (error?.shortMessage) {\n /*\n * Some error signs have lengthy, challenging-to-read messages.\n * shortMessage is used because it is shorter and easier to understand.\n */\n return new Error(error.shortMessage, { cause: error });\n }\n return cleanEvmError(error);\n}\n\nexport function getTrezorInstance() {\n /*\n * Instances have a required property which is `chainId` and is using in swap execution.\n * Here we are setting it as Ethereum always since we are supporting only eth for now.\n */\n const instances = new Map();\n\n instances.set(Networks.ETHEREUM, { chainId: ETHEREUM_CHAIN_ID });\n\n return instances;\n}\n\nexport async function getEthereumAccounts(): Promise<{\n accounts: string[];\n chainId: string;\n}> {\n const TrezorConnect = await getTrezorModule();\n const result = await TrezorConnect.ethereumGetAddress({\n path: getDerivationPath(),\n });\n\n if (!result.success) {\n throw new Error(result.payload.error);\n }\n\n return {\n accounts: [result.payload.address],\n chainId: ETHEREUM_CHAIN_ID,\n };\n}\n\n/*\n * Using BigInt in the valueToHex function ensures that the function\n * can handle very large integer values that exceed the range of standard JavaScript number types.\n */\nexport const valueToHex = (value: string) => {\n const ZERO_BIGINT = BigInt(0);\n const HEX_BASE = 16;\n return BigInt(value) > ZERO_BIGINT\n ? `0x${BigInt(value).toString(HEX_BASE)}`\n : '0x0';\n};\n\nexport const getTrezorNormalizedDerivationPath = (\n path: string // TrezorConnect needs master node to be added to derivation path\n) => (path && !path.startsWith('m/') ? 'm/' + path : path);\n", "// We keep derivationPath here because we need to maintain it for signing transactions after it is set in connect method\nlet derivationPath = '';\n\nexport function setDerivationPath(path: string) {\n derivationPath = path;\n}\n\nexport function getDerivationPath() {\n return derivationPath;\n}\n", "import type { SignerFactory } from 'rango-types';\n\nimport { DefaultSignerFactory, TransactionType as TxType } from 'rango-types';\n\nimport { EthereumSigner } from './signers/ethereum';\n\nexport default function getSigners(): SignerFactory {\n const signers = new DefaultSignerFactory();\n signers.registerSigner(TxType.EVM, new EthereumSigner());\n return signers;\n}\n", "import type { EvmTransaction } from 'rango-types/lib/api/main';\n\nimport { DEFAULT_ETHEREUM_RPC_URL } from '@rango-dev/wallets-shared';\nimport { JsonRpcProvider, Transaction } from 'ethers';\nimport { type GenericSigner } from 'rango-types';\n\nimport { getTrezorErrorMessage, getTrezorModule, valueToHex } from '../helpers';\nimport { getDerivationPath } from '../state';\n\nexport class EthereumSigner implements GenericSigner<EvmTransaction> {\n async signMessage(msg: string): Promise<string> {\n const TrezorConnect = await getTrezorModule();\n\n const { success, payload } = await TrezorConnect.signMessage({\n message: msg,\n path: getDerivationPath(),\n });\n if (!success) {\n throw new Error(payload.error);\n }\n return payload.signature;\n }\n\n async signAndSendTx(\n tx: EvmTransaction,\n fromAddress: string,\n chainId: string\n ): Promise<{ hash: string }> {\n try {\n const TrezorConnect = await getTrezorModule();\n const { gasPrice, maxFeePerGas, maxPriorityFeePerGas } = tx;\n const isEIP1559 = maxFeePerGas && maxPriorityFeePerGas;\n\n if (isEIP1559 && !maxFeePerGas) {\n throw new Error('Missing maxFeePerGas');\n }\n if (isEIP1559 && !maxPriorityFeePerGas) {\n throw new Error('Missing maxPriorityFeePerGas');\n }\n if (!isEIP1559 && !gasPrice) {\n throw new Error('Missing gasPrice');\n }\n const provider = new JsonRpcProvider(DEFAULT_ETHEREUM_RPC_URL); // Provider to broadcast transaction\n const transactionCount = await provider.getTransactionCount(fromAddress); // Get nonce\n const additionalFields = isEIP1559\n ? {\n maxFeePerGas: valueToHex(maxFeePerGas || '0'),\n maxPriorityFeePerGas: valueToHex(maxPriorityFeePerGas || '0'),\n }\n : {\n gasPrice: valueToHex(gasPrice || '0'),\n };\n\n const transaction = {\n to: tx.to,\n data: tx.data || '0x',\n value: valueToHex(tx.value?.toString() || '0'),\n gasLimit: valueToHex(tx.gasLimit?.toString() || '0'),\n chainId: Number.parseInt(chainId),\n nonce: valueToHex(transactionCount.toString()),\n ...additionalFields,\n };\n\n const { success, payload } = await TrezorConnect.ethereumSignTransaction({\n path: getDerivationPath(),\n transaction,\n });\n if (!success) {\n throw new Error(payload.error);\n }\n const { r, s, v } = payload;\n\n const serializedTx = Transaction.from({\n ...transaction,\n nonce: Number.parseInt(transaction.nonce),\n /*\n * Type 0: This refers to the legacy transaction type that has been used since Ethereum's inception.\n * Type 2: This refers to the new transaction type introduced with the EIP-1559 (Ethereum Improvement Proposal 1559) update,\n * which was part of the London hard fork.\n */\n type: isEIP1559 ? 2 : 0,\n signature: { r, s, v: parseInt(v) },\n }).serialized;\n const broadcastResult = await provider.broadcastTransaction(serializedTx);\n\n return { hash: broadcastResult.hash };\n } catch (error) {\n throw getTrezorErrorMessage(error);\n }\n }\n}\n"],
|
|
5
|
+
"mappings": "+EAOA,OAAS,aAAAA,EAAW,YAAAC,EAAU,eAAAC,MAAmB,4BCLjD,OAAS,iBAAAC,MAAqB,wBAC9B,OAAS,qBAAAC,EAAmB,YAAAC,MAAgB,4BCF5C,IAAIC,EAAiB,GAEd,SAASC,EAAkBC,EAAc,CAC9CF,EAAiBE,CACnB,CAFgBC,EAAAF,EAAA,qBAIT,SAASG,GAAoB,CAClC,OAAOJ,CACT,CAFgBG,EAAAC,EAAA,qBDChB,eAAsBC,GAAkB,CACtC,IAAMC,EAAM,KAAM,QAAO,qBAAqB,EAG9C,OAAIA,EAAI,QAAQ,QAGPA,EAAI,QAAQ,QAGdA,EAAI,OACb,CAXsBC,EAAAF,EAAA,mBAaf,SAASG,EAAsBC,EAAY,CAChD,OAAIA,GAAO,aAKF,IAAI,MAAMA,EAAM,aAAc,CAAE,MAAOA,CAAM,CAAC,EAEhDC,EAAcD,CAAK,CAC5B,CATgBF,EAAAC,EAAA,yBAWT,SAASG,GAAoB,CAKlC,IAAMC,EAAY,IAAI,IAEtB,OAAAA,EAAU,IAAIC,EAAS,SAAU,CAAE,QAASC,CAAkB,CAAC,EAExDF,CACT,CAVgBL,EAAAI,EAAA,qBAYhB,eAAsBI,GAGnB,CAED,IAAMC,EAAS,MADO,MAAMX,EAAgB,GACT,mBAAmB,CACpD,KAAMY,EAAkB,CAC1B,CAAC,EAED,GAAI,CAACD,EAAO,QACV,MAAM,IAAI,MAAMA,EAAO,QAAQ,KAAK,EAGtC,MAAO,CACL,SAAU,CAACA,EAAO,QAAQ,OAAO,EACjC,QAASF,CACX,CACF,CAjBsBP,EAAAQ,EAAA,uBAuBf,IAAMG,EAAaX,EAACY,GAAkB,CAC3C,IAAMC,EAAc,OAAO,CAAC,EAE5B,OAAO,OAAOD,CAAK,EAAIC,EACnB,KAAK,OAAOD,CAAK,EAAE,SAFN,EAEuB,CAAC,GACrC,KACN,EAN0B,cAQbE,EAAoCd,EAC/Ce,GACIA,GAAQ,CAACA,EAAK,WAAW,IAAI,EAAI,KAAOA,EAAOA,EAFJ,qCEzEjD,OAAS,wBAAAC,EAAsB,mBAAmBC,MAAc,cCAhE,OAAS,4BAAAC,MAAgC,4BACzC,OAAS,mBAAAC,EAAiB,eAAAC,MAAmB,SAMtC,IAAMC,EAAN,KAA8D,CATrE,MASqE,CAAAC,EAAA,uBACnE,MAAM,YAAYC,EAA8B,CAC9C,IAAMC,EAAgB,MAAMC,EAAgB,EAEtC,CAAE,QAAAC,EAAS,QAAAC,CAAQ,EAAI,MAAMH,EAAc,YAAY,CAC3D,QAASD,EACT,KAAMK,EAAkB,CAC1B,CAAC,EACD,GAAI,CAACF,EACH,MAAM,IAAI,MAAMC,EAAQ,KAAK,EAE/B,OAAOA,EAAQ,SACjB,CAEA,MAAM,cACJE,EACAC,EACAC,EAC2B,CAC3B,GAAI,CACF,IAAMP,EAAgB,MAAMC,EAAgB,EACtC,CAAE,SAAAO,EAAU,aAAAC,EAAc,qBAAAC,CAAqB,EAAIL,EACnDM,EAAYF,GAAgBC,EAElC,GAAIC,GAAa,CAACF,EAChB,MAAM,IAAI,MAAM,sBAAsB,EAExC,GAAIE,GAAa,CAACD,EAChB,MAAM,IAAI,MAAM,8BAA8B,EAEhD,GAAI,CAACC,GAAa,CAACH,EACjB,MAAM,IAAI,MAAM,kBAAkB,EAEpC,IAAMI,EAAW,IAAIC,EAAgBC,CAAwB,EACvDC,EAAmB,MAAMH,EAAS,oBAAoBN,CAAW,EACjEU,EAAmBL,EACrB,CACE,aAAcM,EAAWR,GAAgB,GAAG,EAC5C,qBAAsBQ,EAAWP,GAAwB,GAAG,CAC9D,EACA,CACE,SAAUO,EAAWT,GAAY,GAAG,CACtC,EAEEU,EAAc,CAClB,GAAIb,EAAG,GACP,KAAMA,EAAG,MAAQ,KACjB,MAAOY,EAAWZ,EAAG,OAAO,SAAS,GAAK,GAAG,EAC7C,SAAUY,EAAWZ,EAAG,UAAU,SAAS,GAAK,GAAG,EACnD,QAAS,OAAO,SAASE,CAAO,EAChC,MAAOU,EAAWF,EAAiB,SAAS,CAAC,EAC7C,GAAGC,CACL,EAEM,CAAE,QAAAd,EAAS,QAAAC,CAAQ,EAAI,MAAMH,EAAc,wBAAwB,CACvE,KAAMI,EAAkB,EACxB,YAAAc,CACF,CAAC,EACD,GAAI,CAAChB,EACH,MAAM,IAAI,MAAMC,EAAQ,KAAK,EAE/B,GAAM,CAAE,EAAAgB,EAAG,EAAAC,EAAG,EAAAC,CAAE,EAAIlB,EAEdmB,EAAeC,EAAY,KAAK,CACpC,GAAGL,EACH,MAAO,OAAO,SAASA,EAAY,KAAK,EAMxC,KAAMP,EAAY,EAAI,EACtB,UAAW,CAAE,EAAAQ,EAAG,EAAAC,EAAG,EAAG,SAASC,CAAC,CAAE,CACpC,CAAC,EAAE,WAGH,MAAO,CAAE,MAFe,MAAMT,EAAS,qBAAqBU,CAAY,GAEzC,IAAK,CACtC,OAASE,EAAO,CACd,MAAMC,EAAsBD,CAAK,CACnC,CACF,CACF,EDpFe,SAARE,GAA6C,CAClD,IAAMC,EAAU,IAAIC,EACpB,OAAAD,EAAQ,eAAeE,EAAO,IAAK,IAAIC,CAAgB,EAChDH,CACT,CAJwBI,EAAAL,EAAA,cHaxB,IAAIM,EAA2C,CAC7C,OAAQ,GACR,MAAO,EACT,EACaC,GAAS,CACpB,KAAMC,EAAY,MACpB,EAIaC,GAAOC,EAACC,GAA+B,CAClDL,EAAiBK,EAAa,QAChC,EAFoB,QAIPC,GAAcC,EAEvBC,EAAsB,GACbC,GAAmBL,EAAA,MAAO,CAAE,WAAAM,CAAW,IAAM,CACxD,IAAMC,EAAmC,CAAC,EAEpCC,EAAgB,MAAMC,EAAgB,EAEtCC,EAAeJ,GAAY,KAC9BK,GAAkBA,EAAc,YAAcC,EAAU,GAC3D,EAEA,GAAIF,EACF,GAAIA,EAAa,eAAgB,CAC/BG,EACEC,EAAkCJ,EAAa,cAAc,CAC/D,EAEKN,IACH,MAAMI,EAAc,KAAK,CACvB,SAAU,GACV,SAAUZ,CACZ,CAAC,EAEDQ,EAAsB,IAGxB,IAAMW,EAAW,MAAMC,EAAoB,EAC3CT,EAAQ,KAAKQ,CAAQ,CACvB,KACE,OAAM,IAAI,MAAM,mCAAmC,MAGrD,OAAM,IAAI,MACR,2GAA2GT,GAAY,IACpHK,GAAkBA,EAAc,SACnC,CAAC,EACH,EAGF,OAAOJ,CACT,EAtCgC,WAwCnBU,GAA+CA,EAE/CC,GAAkElB,EAC7EmB,GACG,CACH,IAAMC,EAAoC,CAAC,EAErCC,EAAqBF,EAAe,KACvCG,GAAUA,EAAM,OAASC,EAAS,QACrC,EACA,OAAIF,GACFD,EAAgB,KAAKC,CAAkB,EAElC,CACL,KAAM,SACN,IAAK,uFACL,YAAa,CACX,QAAS,wDACX,EACA,MAAO,QACP,gBAAAD,EACA,WAAY,CAACR,EAAU,GAAG,EAC1B,gBAAiB,GACjB,aAAc,GACd,oBAAqB,EACvB,CACF,EAxB+E",
|
|
6
|
+
"names": ["Namespace", "Networks", "WalletTypes", "cleanEvmError", "ETHEREUM_CHAIN_ID", "Networks", "derivationPath", "setDerivationPath", "path", "__name", "getDerivationPath", "getTrezorModule", "mod", "__name", "getTrezorErrorMessage", "error", "cleanEvmError", "getTrezorInstance", "instances", "Networks", "ETHEREUM_CHAIN_ID", "getEthereumAccounts", "result", "getDerivationPath", "valueToHex", "value", "ZERO_BIGINT", "getTrezorNormalizedDerivationPath", "path", "DefaultSignerFactory", "TxType", "DEFAULT_ETHEREUM_RPC_URL", "JsonRpcProvider", "Transaction", "EthereumSigner", "__name", "msg", "TrezorConnect", "getTrezorModule", "success", "payload", "getDerivationPath", "tx", "fromAddress", "chainId", "gasPrice", "maxFeePerGas", "maxPriorityFeePerGas", "isEIP1559", "provider", "JsonRpcProvider", "DEFAULT_ETHEREUM_RPC_URL", "transactionCount", "additionalFields", "valueToHex", "transaction", "r", "s", "v", "serializedTx", "Transaction", "error", "getTrezorErrorMessage", "getSigners", "signers", "DefaultSignerFactory", "TxType", "EthereumSigner", "__name", "trezorManifest", "config", "WalletTypes", "init", "__name", "environments", "getInstance", "getTrezorInstance", "isTrezorInitialized", "connect", "namespaces", "results", "TrezorConnect", "getTrezorModule", "evmNamespace", "namespaceItem", "Namespace", "setDerivationPath", "getTrezorNormalizedDerivationPath", "accounts", "getEthereumAccounts", "getSigners", "getWalletInfo", "allBlockChains", "supportedChains", "ethereumBlockchain", "chain", "Networks"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"src/helpers.ts":{"bytes":
|
|
1
|
+
{"inputs":{"src/state.ts":{"bytes":290,"imports":[{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/helpers.ts":{"bytes":2524,"imports":[{"path":"@rango-dev/signer-evm","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"src/state.ts","kind":"import-statement","original":"./state"},{"path":"@trezor/connect-web","kind":"dynamic-import","external":true},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/ethereum.ts":{"bytes":3191,"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"ethers","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/helpers.ts","kind":"import-statement","original":"../helpers"},{"path":"src/state.ts","kind":"import-statement","original":"../state"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signer.ts":{"bytes":365,"imports":[{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/signers/ethereum.ts","kind":"import-statement","original":"./signers/ethereum"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":2774,"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/helpers.ts","kind":"import-statement","original":"./helpers"},{"path":"src/signer.ts","kind":"import-statement","original":"./signer"},{"path":"src/state.ts","kind":"import-statement","original":"./state"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"}},"outputs":{"dist/index.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":14843},"dist/index.js":{"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@rango-dev/signer-evm","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@trezor/connect-web","kind":"dynamic-import","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"ethers","kind":"import-statement","external":true}],"exports":["config","connect","getInstance","getSigners","getWalletInfo","init"],"entryPoint":"src/index.ts","inputs":{"src/index.ts":{"bytesInOutput":1002},"src/helpers.ts":{"bytesInOutput":833},"src/state.ts":{"bytesInOutput":99},"src/signer.ts":{"bytesInOutput":154},"src/signers/ethereum.ts":{"bytesInOutput":1177}},"bytes":3480}}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../../src/signers/ethereum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI/D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../../src/signers/ethereum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI/D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,qBAAa,cAAe,YAAW,aAAa,CAAC,cAAc,CAAC;IAC5D,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAazC,aAAa,CACjB,EAAE,EAAE,cAAc,EAClB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CA+D7B"}
|
package/dist/state.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../src/state.ts"],"names":[],"mappings":"AAGA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,QAE7C;AAED,wBAAgB,iBAAiB,WAEhC"}
|
package/package.json
CHANGED
package/src/helpers.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { TrezorConnect } from '@trezor/connect-web';
|
|
|
3
3
|
import { cleanEvmError } from '@rango-dev/signer-evm';
|
|
4
4
|
import { ETHEREUM_CHAIN_ID, Networks } from '@rango-dev/wallets-shared';
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
import { getDerivationPath } from './state';
|
|
7
7
|
|
|
8
8
|
// `@trezor/connect-web` is commonjs, when we are importing it dynamically, it has some differences in different tooling. for example vite (you can check widget-examples), goes throw error. this is a workaround for solving this interop issue.
|
|
9
9
|
export async function getTrezorModule() {
|
|
@@ -42,13 +42,13 @@ export function getTrezorInstance() {
|
|
|
42
42
|
return instances;
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
export async function getEthereumAccounts(
|
|
45
|
+
export async function getEthereumAccounts(): Promise<{
|
|
46
46
|
accounts: string[];
|
|
47
47
|
chainId: string;
|
|
48
48
|
}> {
|
|
49
49
|
const TrezorConnect = await getTrezorModule();
|
|
50
50
|
const result = await TrezorConnect.ethereumGetAddress({
|
|
51
|
-
path,
|
|
51
|
+
path: getDerivationPath(),
|
|
52
52
|
});
|
|
53
53
|
|
|
54
54
|
if (!result.success) {
|
|
@@ -72,3 +72,7 @@ export const valueToHex = (value: string) => {
|
|
|
72
72
|
? `0x${BigInt(value).toString(HEX_BASE)}`
|
|
73
73
|
: '0x0';
|
|
74
74
|
};
|
|
75
|
+
|
|
76
|
+
export const getTrezorNormalizedDerivationPath = (
|
|
77
|
+
path: string // TrezorConnect needs master node to be added to derivation path
|
|
78
|
+
) => (path && !path.startsWith('m/') ? 'm/' + path : path);
|
package/src/index.ts
CHANGED
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
import type { Environments } from './types';
|
|
2
|
-
import type {
|
|
2
|
+
import type {
|
|
3
|
+
Connect,
|
|
4
|
+
ProviderConnectResult,
|
|
5
|
+
WalletInfo,
|
|
6
|
+
} from '@rango-dev/wallets-shared';
|
|
3
7
|
|
|
4
|
-
import { Networks, WalletTypes } from '@rango-dev/wallets-shared';
|
|
8
|
+
import { Namespace, Networks, WalletTypes } from '@rango-dev/wallets-shared';
|
|
5
9
|
import { type BlockchainMeta, type SignerFactory } from 'rango-types';
|
|
6
10
|
|
|
7
11
|
import {
|
|
8
|
-
ETHEREUM_BIP32_PATH,
|
|
9
12
|
getEthereumAccounts,
|
|
10
13
|
getTrezorInstance,
|
|
11
14
|
getTrezorModule,
|
|
15
|
+
getTrezorNormalizedDerivationPath,
|
|
12
16
|
} from './helpers';
|
|
13
17
|
import signer from './signer';
|
|
18
|
+
import { setDerivationPath } from './state';
|
|
14
19
|
|
|
15
20
|
let trezorManifest: Environments['manifest'] = {
|
|
16
21
|
appUrl: '',
|
|
@@ -29,18 +34,44 @@ export const init = (environments: Environments) => {
|
|
|
29
34
|
export const getInstance = getTrezorInstance;
|
|
30
35
|
|
|
31
36
|
let isTrezorInitialized = false;
|
|
32
|
-
export const connect: Connect = async () => {
|
|
37
|
+
export const connect: Connect = async ({ namespaces }) => {
|
|
38
|
+
const results: ProviderConnectResult[] = [];
|
|
39
|
+
|
|
33
40
|
const TrezorConnect = await getTrezorModule();
|
|
34
41
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
42
|
+
const evmNamespace = namespaces?.find(
|
|
43
|
+
(namespaceItem) => namespaceItem.namespace === Namespace.Evm
|
|
44
|
+
);
|
|
45
|
+
|
|
46
|
+
if (evmNamespace) {
|
|
47
|
+
if (evmNamespace.derivationPath) {
|
|
48
|
+
setDerivationPath(
|
|
49
|
+
getTrezorNormalizedDerivationPath(evmNamespace.derivationPath)
|
|
50
|
+
);
|
|
40
51
|
|
|
41
|
-
|
|
52
|
+
if (!isTrezorInitialized) {
|
|
53
|
+
await TrezorConnect.init({
|
|
54
|
+
lazyLoad: true, // this param will prevent iframe injection until TrezorConnect.method will be called
|
|
55
|
+
manifest: trezorManifest,
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
isTrezorInitialized = true;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const accounts = await getEthereumAccounts();
|
|
62
|
+
results.push(accounts);
|
|
63
|
+
} else {
|
|
64
|
+
throw new Error('Derivation Path can not be empty.');
|
|
65
|
+
}
|
|
66
|
+
} else {
|
|
67
|
+
throw new Error(
|
|
68
|
+
`It appears that you have selected a namespace that is not yet supported by our system. Your namespaces: ${namespaces?.map(
|
|
69
|
+
(namespaceItem) => namespaceItem.namespace
|
|
70
|
+
)}`
|
|
71
|
+
);
|
|
42
72
|
}
|
|
43
|
-
|
|
73
|
+
|
|
74
|
+
return results;
|
|
44
75
|
};
|
|
45
76
|
|
|
46
77
|
export const getSigners: (provider: any) => SignerFactory = signer;
|
|
@@ -64,6 +95,9 @@ export const getWalletInfo: (allBlockChains: BlockchainMeta[]) => WalletInfo = (
|
|
|
64
95
|
},
|
|
65
96
|
color: 'black',
|
|
66
97
|
supportedChains,
|
|
98
|
+
namespaces: [Namespace.Evm],
|
|
99
|
+
singleNamespace: true,
|
|
67
100
|
showOnMobile: false,
|
|
101
|
+
needsDerivationPath: true,
|
|
68
102
|
};
|
|
69
103
|
};
|
package/src/signers/ethereum.ts
CHANGED
|
@@ -4,12 +4,8 @@ import { DEFAULT_ETHEREUM_RPC_URL } from '@rango-dev/wallets-shared';
|
|
|
4
4
|
import { JsonRpcProvider, Transaction } from 'ethers';
|
|
5
5
|
import { type GenericSigner } from 'rango-types';
|
|
6
6
|
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
getTrezorErrorMessage,
|
|
10
|
-
getTrezorModule,
|
|
11
|
-
valueToHex,
|
|
12
|
-
} from '../helpers';
|
|
7
|
+
import { getTrezorErrorMessage, getTrezorModule, valueToHex } from '../helpers';
|
|
8
|
+
import { getDerivationPath } from '../state';
|
|
13
9
|
|
|
14
10
|
export class EthereumSigner implements GenericSigner<EvmTransaction> {
|
|
15
11
|
async signMessage(msg: string): Promise<string> {
|
|
@@ -17,7 +13,7 @@ export class EthereumSigner implements GenericSigner<EvmTransaction> {
|
|
|
17
13
|
|
|
18
14
|
const { success, payload } = await TrezorConnect.signMessage({
|
|
19
15
|
message: msg,
|
|
20
|
-
path:
|
|
16
|
+
path: getDerivationPath(),
|
|
21
17
|
});
|
|
22
18
|
if (!success) {
|
|
23
19
|
throw new Error(payload.error);
|
|
@@ -66,7 +62,7 @@ export class EthereumSigner implements GenericSigner<EvmTransaction> {
|
|
|
66
62
|
};
|
|
67
63
|
|
|
68
64
|
const { success, payload } = await TrezorConnect.ethereumSignTransaction({
|
|
69
|
-
path:
|
|
65
|
+
path: getDerivationPath(),
|
|
70
66
|
transaction,
|
|
71
67
|
});
|
|
72
68
|
if (!success) {
|
package/src/state.ts
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
// We keep derivationPath here because we need to maintain it for signing transactions after it is set in connect method
|
|
2
|
+
let derivationPath = '';
|
|
3
|
+
|
|
4
|
+
export function setDerivationPath(path: string) {
|
|
5
|
+
derivationPath = path;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export function getDerivationPath() {
|
|
9
|
+
return derivationPath;
|
|
10
|
+
}
|