@rango-dev/signer-evm 0.41.2-next.2 → 0.42.1-next.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/CHANGELOG.md +4 -0
- package/dist/index.js +1 -1
- package/dist/index.js.map +3 -3
- package/dist/signer-evm.build.json +1 -1
- package/dist/signer.d.ts +2 -0
- package/dist/signer.d.ts.map +1 -1
- package/dist/types.d.ts +7 -0
- package/dist/types.d.ts.map +1 -0
- package/package.json +1 -1
- package/src/signer.ts +17 -0
- package/src/types.ts +7 -0
package/CHANGELOG.md
CHANGED
package/dist/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
var P=Object.defineProperty;var c=(e,r)=>P(e,"name",{value:r,configurable:!0});import{BrowserProvider as S,isError as y}from"ethers";import{RPCErrorCode as _,SignerError as
|
|
1
|
+
var P=Object.defineProperty;var c=(e,r)=>P(e,"name",{value:r,configurable:!0});import{BrowserProvider as S,isError as y}from"ethers";import{RPCErrorCode as _,SignerError as d,SignerErrorCode as u}from"rango-types";import{isError as l}from"ethers";import{RPCErrorCode as p,SignerError as g,SignerErrorCode as E}from"rango-types";var h=c(e=>{if(!e)return new g(E.SEND_TX_ERROR);if(g.isSignerError(e))return e;if(e.code){if(l(e,"UNKNOWN_ERROR")){let t=e.error?.message||e.message;return new g(E.SEND_TX_ERROR,void 0,t,p.UNKNOWN_ERROR,e)}if(l(e,"ACTION_REJECTED")){let t=e.shortMessage.replace("action",`'${e.action}'`);return new g(E.SEND_TX_ERROR,void 0,t,p.REJECTION,e)}let r=e.shortMessage||e.message;return new g(E.SEND_TX_ERROR,void 0,r,p.UNKNOWN_ERROR,e)}return new g(E.SEND_TX_ERROR,void 0,e,p.UNKNOWN_ERROR,e)},"cleanEvmError");async function T(e,r){if(!e||!r)return;let t=parseInt(e);try{let s=`https://api.tenderly.co/api/v1/public-contract/${t}/tx/${r}`,n=await fetch(s,{method:"GET"});return n.ok?(await n.json())?.error_message:void 0}catch{return}}c(T,"getTenderlyError");var m=c(async e=>new Promise(r=>setTimeout(r,e)),"waitMs");var C=c(async(e,r,t,s)=>{let i=!1;return await Promise.race([(async()=>{await r.wait(s),i=!0})(),(async()=>{for(;!i;){if(await m(3e3),i)return null;try{if(!await e.getTransaction(t))return null}catch(o){return console.log({error:o}),null}}return null})()])},"waitWithMempoolCheck"),w=class e{static{c(this,"DefaultEvmSigner")}provider;constructor(r){this.provider=new S(r)}static buildTx(r,t=!1){let n={};return n={data:r.data||"0x"},r.from&&(n={...n,from:r.from}),r.to&&(n={...n,to:r.to}),r.value&&(n={...n,value:r.value}),r.nonce&&(n={...n,nonce:parseInt(r.nonce)}),r.gasLimit&&(n={...n,gasLimit:r.gasLimit}),!t&&r.maxFeePerGas&&r.maxPriorityFeePerGas?n={...n,maxFeePerGas:r.maxFeePerGas,maxPriorityFeePerGas:r.maxPriorityFeePerGas}:r.gasPrice&&(n={...n,gasPrice:"0x"+parseInt(r.gasPrice).toString(16)}),n}async signTypedData(r){try{return await(await this.provider.getSigner()).signTypedData(r.domain,r.types,r.value)}catch(t){throw new d(u.SIGN_TX_ERROR,void 0,t)}}async signMessage(r){try{return await(await this.provider.getSigner()).signMessage(r)}catch(t){throw new d(u.SIGN_TX_ERROR,void 0,t)}}async signAndSendTx(r,t,s){try{let n=await this.provider.getSigner(r.from??void 0),i=e.buildTx(r),o=(await this.provider.getNetwork()).chainId,f=await n.getAddress();if(s&&o&&o.toString()!==Number(s).toString())throw new d(u.UNEXPECTED_BEHAVIOUR,void 0,`Signer chainId: '${o}' doesn't match with required chainId: '${s}' for tx.`);if(f&&t&&f.toLowerCase()!==t.toLowerCase())throw new d(u.UNEXPECTED_BEHAVIOUR,void 0,`Signer address: '${f.toLowerCase()}' doesn't match with required address: '${t.toLowerCase()}' for tx.`);try{let a=await n.sendTransaction(i);return{hash:a.hash,response:a}}catch(a){if(a?.message&&typeof a.message=="string"&&a.message.indexOf("EIP-1559")!==-1){console.log("retrying EIP-1559 error without v2 fields ...");let N=e.buildTx(r,!0),R=await n.sendTransaction(N);return{hash:R.hash,response:R}}throw a}}catch(n){throw h(n)}}async wait(r,t,s,n){try{if(s)return await s?.wait(n),{hash:r};if(!this.provider)return{hash:r};if(!t)return{hash:r};let i=(await this.provider.getNetwork()).chainId;if(!i||Number(t).toString()!==i.toString())return{hash:r};let o=await this.provider.getTransaction(r);if(!o)throw Error(`Transaction hash '${r}' not found in blockchain.`);return await C(this.provider,o,r,n),{hash:r}}catch(i){if(y(i,"TRANSACTION_REPLACED")){if(i.reason==="cancelled")throw new d(u.SEND_TX_ERROR,void 0,"Transaction replaced and canceled by user",void 0,i);return{hash:i.replacement.hash,response:i.replacement}}else if(y(i,"CALL_EXCEPTION")){let o=await T(t,r);if(o)throw new d(u.TX_FAILED_IN_BLOCKCHAIN,"Trannsaction failed in blockchain",o,_.CALL_EXCEPTION,i);return{hash:r}}return{hash:r}}}};export{w as DefaultEvmSigner,h as cleanEvmError,m as waitMs};
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/signer.ts", "../src/helper.ts"],
|
|
4
|
-
"sourcesContent": ["import type {\n AbstractProvider,\n Eip1193Provider,\n TransactionRequest,\n TransactionResponse,\n} from 'ethers';\nimport type { GenericSigner } from 'rango-types';\nimport type { EvmTransaction } from 'rango-types/mainApi';\n\nimport { BrowserProvider, isError } from 'ethers';\nimport {\n RPCErrorCode as RangoRPCErrorCode,\n SignerError,\n SignerErrorCode,\n} from 'rango-types';\n\nimport { cleanEvmError, getTenderlyError, waitMs } from './helper.js';\n\nconst waitWithMempoolCheck = async (\n provider: AbstractProvider,\n tx: TransactionResponse,\n txHash: string,\n confirmations?: number\n) => {\n const TIMEOUT = 3_000;\n let finished = false;\n return await Promise.race([\n (async () => {\n await tx.wait(confirmations);\n finished = true;\n })(),\n (async () => {\n while (!finished) {\n await waitMs(TIMEOUT);\n if (finished) {\n return null;\n }\n try {\n const mempoolTx = await provider.getTransaction(txHash);\n if (!mempoolTx) {\n return null;\n }\n } catch (error) {\n console.log({ error });\n return null;\n }\n }\n return null;\n })(),\n ]);\n};\n\nexport class DefaultEvmSigner implements GenericSigner<EvmTransaction> {\n private provider: BrowserProvider;\n\n constructor(provider: Eip1193Provider) {\n this.provider = new BrowserProvider(provider); // provides read-only access to the provider\n }\n\n static buildTx(evmTx: EvmTransaction, disableV2 = false): TransactionRequest {\n const TO_STRING_BASE = 16;\n let tx: TransactionRequest = {};\n /*\n * it's better to pass 0x instead of undefined, otherwise some wallets could face issue\n * https://github.com/WalletConnect/web3modal/issues/1082#issuecomment-1637793242\n */\n tx = {\n data: evmTx.data || '0x',\n };\n if (evmTx.from) {\n tx = { ...tx, from: evmTx.from };\n }\n if (evmTx.to) {\n tx = { ...tx, to: evmTx.to };\n }\n if (evmTx.value) {\n tx = { ...tx, value: evmTx.value };\n }\n if (evmTx.nonce) {\n tx = { ...tx, nonce: parseInt(evmTx.nonce) };\n }\n if (evmTx.gasLimit) {\n tx = { ...tx, gasLimit: evmTx.gasLimit };\n }\n if (!disableV2 && evmTx.maxFeePerGas && evmTx.maxPriorityFeePerGas) {\n tx = {\n ...tx,\n maxFeePerGas: evmTx.maxFeePerGas,\n maxPriorityFeePerGas: evmTx.maxPriorityFeePerGas,\n };\n } else if (evmTx.gasPrice) {\n tx = {\n ...tx,\n gasPrice: '0x' + parseInt(evmTx.gasPrice).toString(TO_STRING_BASE),\n };\n }\n return tx;\n }\n\n async signMessage(msg: string): Promise<string> {\n try {\n const signer = await this.provider.getSigner(); // provides access to write operations\n return await signer.signMessage(msg);\n } catch (error) {\n throw new SignerError(SignerErrorCode.SIGN_TX_ERROR, undefined, error);\n }\n }\n\n async signAndSendTx(\n tx: EvmTransaction,\n address: string,\n chainId: string | null\n ): Promise<{ hash: string; response: TransactionResponse }> {\n try {\n const signer = await this.provider.getSigner(tx.from ?? undefined);\n\n const transaction = DefaultEvmSigner.buildTx(tx);\n\n const signerChainId = (await this.provider.getNetwork()).chainId;\n const signerAddress = await signer.getAddress();\n\n if (\n !!chainId &&\n !!signerChainId &&\n signerChainId.toString() !== Number(chainId).toString()\n ) {\n throw new SignerError(\n SignerErrorCode.UNEXPECTED_BEHAVIOUR,\n undefined,\n `Signer chainId: '${signerChainId}' doesn't match with required chainId: '${chainId}' for tx.`\n );\n }\n if (\n !!signerAddress &&\n !!address &&\n signerAddress.toLowerCase() !== address.toLowerCase()\n ) {\n throw new SignerError(\n SignerErrorCode.UNEXPECTED_BEHAVIOUR,\n undefined,\n `Signer address: '${signerAddress.toLowerCase()}' doesn't match with required address: '${address.toLowerCase()}' for tx.`\n );\n }\n try {\n const response = await signer.sendTransaction(transaction);\n return { hash: response.hash, response };\n } catch (error: any) {\n // retrying EIP-1559 without v2 related fields\n if (\n !!error?.message &&\n typeof error.message === 'string' &&\n error.message.indexOf('EIP-1559') !== -1\n ) {\n console.log('retrying EIP-1559 error without v2 fields ...');\n const transaction = DefaultEvmSigner.buildTx(tx, true);\n const response = await signer.sendTransaction(transaction);\n return { hash: response.hash, response };\n }\n throw error;\n }\n } catch (error) {\n throw cleanEvmError(error);\n }\n }\n\n async wait(\n txHash: string,\n chainId?: string,\n txResponse?: TransactionResponse,\n confirmations?: number\n ): Promise<{ hash: string; response?: TransactionResponse }> {\n try {\n /*\n * if we have transaction response, use that to wait\n * otherwise, try to get tx response from the wallet provider\n */\n if (txResponse) {\n // if we use waitWithMempoolCheck here, we can't detect replaced tx anymore\n await txResponse?.wait(confirmations);\n return { hash: txHash };\n }\n\n // ignore wait if wallet not connected yet\n if (!this.provider) {\n return { hash: txHash };\n }\n\n /*\n * don't proceed if signer chain changed or chain id is not specified\n * because if user change the wallet network, we receive null on getTransaction\n */\n if (!chainId) {\n return { hash: txHash };\n }\n const signerChainId = (await this.provider.getNetwork()).chainId;\n if (\n !signerChainId ||\n Number(chainId).toString() !== signerChainId.toString()\n ) {\n return { hash: txHash };\n }\n\n const tx = await this.provider.getTransaction(txHash);\n if (!tx) {\n throw Error(`Transaction hash '${txHash}' not found in blockchain.`);\n }\n\n await waitWithMempoolCheck(this.provider, tx, txHash, confirmations);\n return { hash: txHash };\n } catch (error) {\n if (isError(error, 'TRANSACTION_REPLACED')) {\n const reason = error.reason;\n if (reason === 'cancelled') {\n throw new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n 'Transaction replaced and canceled by user',\n undefined,\n error\n );\n }\n return { hash: error.replacement.hash, response: error.replacement };\n } else if (isError(error, 'CALL_EXCEPTION')) {\n const tError = await getTenderlyError(chainId, txHash);\n if (!!tError) {\n throw new SignerError(\n SignerErrorCode.TX_FAILED_IN_BLOCKCHAIN,\n 'Trannsaction failed in blockchain',\n tError,\n RangoRPCErrorCode.CALL_EXCEPTION,\n error\n );\n } else {\n /**\n * In cases where the is no error returen from tenderly, we could ignore\n * the error and proceed with check status flow.\n */\n return { hash: txHash };\n }\n }\n /**\n * Ignore other errors in confirming transaction and proceed with check status flow,\n * Some times rpc gives internal error or other type of errors even if the transaction succeeded\n */\n return { hash: txHash };\n }\n }\n}\n", "import type { SignerError as SignerErrorType } from 'rango-types';\n\nimport { isError } from 'ethers';\nimport {\n RPCErrorCode as RangoRPCErrorCode,\n SignerError,\n SignerErrorCode,\n} from 'rango-types';\n\nexport const cleanEvmError = (error: any): SignerErrorType => {\n if (!error) {\n return new SignerError(SignerErrorCode.SEND_TX_ERROR);\n }\n\n if (SignerError.isSignerError(error)) {\n return error;\n }\n\n if (error.code) {\n if (isError(error, 'UNKNOWN_ERROR')) {\n const msg = error.error?.message || error.message;\n return new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n msg,\n RangoRPCErrorCode.UNKNOWN_ERROR,\n error\n );\n }\n\n if (isError(error, 'ACTION_REJECTED')) {\n const msg = error.shortMessage.replace('action', `'${error.action}'`);\n return new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n msg,\n RangoRPCErrorCode.REJECTION,\n error\n );\n }\n\n const msg = error.shortMessage || error.message;\n return new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n msg,\n RangoRPCErrorCode.UNKNOWN_ERROR,\n error\n );\n }\n return new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n error,\n RangoRPCErrorCode.UNKNOWN_ERROR,\n error\n );\n};\n\ninterface TenderlyResponse {\n error_message: string;\n}\n\nexport async function getTenderlyError(\n chainId: string | undefined,\n txHash: string\n): Promise<string | undefined> {\n if (!chainId || !txHash) {\n return;\n }\n const chainIdInt = parseInt(chainId);\n try {\n const url = `https://api.tenderly.co/api/v1/public-contract/${chainIdInt}/tx/${txHash}`;\n const response = await fetch(url, {\n method: 'GET',\n });\n if (!response.ok) {\n return;\n }\n const data: TenderlyResponse = await response.json();\n return data?.error_message;\n } catch (error) {\n return;\n }\n}\n\nexport const waitMs = async (ms: number) =>\n new Promise((resolve) => setTimeout(resolve, ms));\n"],
|
|
5
|
-
"mappings": "+
|
|
6
|
-
"names": ["BrowserProvider", "isError", "RangoRPCErrorCode", "SignerError", "SignerErrorCode", "isError", "RangoRPCErrorCode", "SignerError", "SignerErrorCode", "cleanEvmError", "__name", "error", "SignerError", "SignerErrorCode", "isError", "msg", "RangoRPCErrorCode", "getTenderlyError", "chainId", "txHash", "chainIdInt", "url", "response", "waitMs", "ms", "resolve", "waitWithMempoolCheck", "__name", "provider", "tx", "txHash", "confirmations", "finished", "waitMs", "error", "DefaultEvmSigner", "_DefaultEvmSigner", "BrowserProvider", "evmTx", "disableV2", "
|
|
4
|
+
"sourcesContent": ["import type { TypedData } from './types.js';\nimport type {\n AbstractProvider,\n Eip1193Provider,\n TransactionRequest,\n TransactionResponse,\n} from 'ethers';\nimport type { GenericSigner } from 'rango-types';\nimport type { EvmTransaction } from 'rango-types/mainApi';\n\nimport { BrowserProvider, isError } from 'ethers';\nimport {\n RPCErrorCode as RangoRPCErrorCode,\n SignerError,\n SignerErrorCode,\n} from 'rango-types';\n\nimport { cleanEvmError, getTenderlyError, waitMs } from './helper.js';\n\nconst waitWithMempoolCheck = async (\n provider: AbstractProvider,\n tx: TransactionResponse,\n txHash: string,\n confirmations?: number\n) => {\n const TIMEOUT = 3_000;\n let finished = false;\n return await Promise.race([\n (async () => {\n await tx.wait(confirmations);\n finished = true;\n })(),\n (async () => {\n while (!finished) {\n await waitMs(TIMEOUT);\n if (finished) {\n return null;\n }\n try {\n const mempoolTx = await provider.getTransaction(txHash);\n if (!mempoolTx) {\n return null;\n }\n } catch (error) {\n console.log({ error });\n return null;\n }\n }\n return null;\n })(),\n ]);\n};\n\nexport class DefaultEvmSigner implements GenericSigner<EvmTransaction> {\n private provider: BrowserProvider;\n\n constructor(provider: Eip1193Provider) {\n this.provider = new BrowserProvider(provider); // provides read-only access to the provider\n }\n\n static buildTx(evmTx: EvmTransaction, disableV2 = false): TransactionRequest {\n const TO_STRING_BASE = 16;\n let tx: TransactionRequest = {};\n /*\n * it's better to pass 0x instead of undefined, otherwise some wallets could face issue\n * https://github.com/WalletConnect/web3modal/issues/1082#issuecomment-1637793242\n */\n tx = {\n data: evmTx.data || '0x',\n };\n if (evmTx.from) {\n tx = { ...tx, from: evmTx.from };\n }\n if (evmTx.to) {\n tx = { ...tx, to: evmTx.to };\n }\n if (evmTx.value) {\n tx = { ...tx, value: evmTx.value };\n }\n if (evmTx.nonce) {\n tx = { ...tx, nonce: parseInt(evmTx.nonce) };\n }\n if (evmTx.gasLimit) {\n tx = { ...tx, gasLimit: evmTx.gasLimit };\n }\n if (!disableV2 && evmTx.maxFeePerGas && evmTx.maxPriorityFeePerGas) {\n tx = {\n ...tx,\n maxFeePerGas: evmTx.maxFeePerGas,\n maxPriorityFeePerGas: evmTx.maxPriorityFeePerGas,\n };\n } else if (evmTx.gasPrice) {\n tx = {\n ...tx,\n gasPrice: '0x' + parseInt(evmTx.gasPrice).toString(TO_STRING_BASE),\n };\n }\n return tx;\n }\n\n async signTypedData(typedData: TypedData): Promise<string> {\n try {\n const signer = await this.provider.getSigner();\n const signature = await signer.signTypedData(\n typedData.domain,\n typedData.types,\n typedData.value\n );\n\n return signature;\n } catch (error) {\n throw new SignerError(SignerErrorCode.SIGN_TX_ERROR, undefined, error);\n }\n }\n\n async signMessage(msg: string): Promise<string> {\n try {\n const signer = await this.provider.getSigner(); // provides access to write operations\n return await signer.signMessage(msg);\n } catch (error) {\n throw new SignerError(SignerErrorCode.SIGN_TX_ERROR, undefined, error);\n }\n }\n\n async signAndSendTx(\n tx: EvmTransaction,\n address: string,\n chainId: string | null\n ): Promise<{ hash: string; response: TransactionResponse }> {\n try {\n const signer = await this.provider.getSigner(tx.from ?? undefined);\n\n const transaction = DefaultEvmSigner.buildTx(tx);\n\n const signerChainId = (await this.provider.getNetwork()).chainId;\n const signerAddress = await signer.getAddress();\n\n if (\n !!chainId &&\n !!signerChainId &&\n signerChainId.toString() !== Number(chainId).toString()\n ) {\n throw new SignerError(\n SignerErrorCode.UNEXPECTED_BEHAVIOUR,\n undefined,\n `Signer chainId: '${signerChainId}' doesn't match with required chainId: '${chainId}' for tx.`\n );\n }\n if (\n !!signerAddress &&\n !!address &&\n signerAddress.toLowerCase() !== address.toLowerCase()\n ) {\n throw new SignerError(\n SignerErrorCode.UNEXPECTED_BEHAVIOUR,\n undefined,\n `Signer address: '${signerAddress.toLowerCase()}' doesn't match with required address: '${address.toLowerCase()}' for tx.`\n );\n }\n try {\n const response = await signer.sendTransaction(transaction);\n return { hash: response.hash, response };\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n } catch (error: any) {\n // retrying EIP-1559 without v2 related fields\n if (\n !!error?.message &&\n typeof error.message === 'string' &&\n error.message.indexOf('EIP-1559') !== -1\n ) {\n console.log('retrying EIP-1559 error without v2 fields ...');\n const transaction = DefaultEvmSigner.buildTx(tx, true);\n const response = await signer.sendTransaction(transaction);\n return { hash: response.hash, response };\n }\n throw error;\n }\n } catch (error) {\n throw cleanEvmError(error);\n }\n }\n\n async wait(\n txHash: string,\n chainId?: string,\n txResponse?: TransactionResponse,\n confirmations?: number\n ): Promise<{ hash: string; response?: TransactionResponse }> {\n try {\n /*\n * if we have transaction response, use that to wait\n * otherwise, try to get tx response from the wallet provider\n */\n if (txResponse) {\n // if we use waitWithMempoolCheck here, we can't detect replaced tx anymore\n await txResponse?.wait(confirmations);\n return { hash: txHash };\n }\n\n // ignore wait if wallet not connected yet\n if (!this.provider) {\n return { hash: txHash };\n }\n\n /*\n * don't proceed if signer chain changed or chain id is not specified\n * because if user change the wallet network, we receive null on getTransaction\n */\n if (!chainId) {\n return { hash: txHash };\n }\n const signerChainId = (await this.provider.getNetwork()).chainId;\n if (\n !signerChainId ||\n Number(chainId).toString() !== signerChainId.toString()\n ) {\n return { hash: txHash };\n }\n\n const tx = await this.provider.getTransaction(txHash);\n if (!tx) {\n throw Error(`Transaction hash '${txHash}' not found in blockchain.`);\n }\n\n await waitWithMempoolCheck(this.provider, tx, txHash, confirmations);\n return { hash: txHash };\n } catch (error) {\n if (isError(error, 'TRANSACTION_REPLACED')) {\n const reason = error.reason;\n if (reason === 'cancelled') {\n throw new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n 'Transaction replaced and canceled by user',\n undefined,\n error\n );\n }\n return { hash: error.replacement.hash, response: error.replacement };\n } else if (isError(error, 'CALL_EXCEPTION')) {\n const tError = await getTenderlyError(chainId, txHash);\n if (!!tError) {\n throw new SignerError(\n SignerErrorCode.TX_FAILED_IN_BLOCKCHAIN,\n 'Trannsaction failed in blockchain',\n tError,\n RangoRPCErrorCode.CALL_EXCEPTION,\n error\n );\n } else {\n /**\n * In cases where the is no error returen from tenderly, we could ignore\n * the error and proceed with check status flow.\n */\n return { hash: txHash };\n }\n }\n /**\n * Ignore other errors in confirming transaction and proceed with check status flow,\n * Some times rpc gives internal error or other type of errors even if the transaction succeeded\n */\n return { hash: txHash };\n }\n }\n}\n", "import type { SignerError as SignerErrorType } from 'rango-types';\n\nimport { isError } from 'ethers';\nimport {\n RPCErrorCode as RangoRPCErrorCode,\n SignerError,\n SignerErrorCode,\n} from 'rango-types';\n\nexport const cleanEvmError = (error: any): SignerErrorType => {\n if (!error) {\n return new SignerError(SignerErrorCode.SEND_TX_ERROR);\n }\n\n if (SignerError.isSignerError(error)) {\n return error;\n }\n\n if (error.code) {\n if (isError(error, 'UNKNOWN_ERROR')) {\n const msg = error.error?.message || error.message;\n return new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n msg,\n RangoRPCErrorCode.UNKNOWN_ERROR,\n error\n );\n }\n\n if (isError(error, 'ACTION_REJECTED')) {\n const msg = error.shortMessage.replace('action', `'${error.action}'`);\n return new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n msg,\n RangoRPCErrorCode.REJECTION,\n error\n );\n }\n\n const msg = error.shortMessage || error.message;\n return new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n msg,\n RangoRPCErrorCode.UNKNOWN_ERROR,\n error\n );\n }\n return new SignerError(\n SignerErrorCode.SEND_TX_ERROR,\n undefined,\n error,\n RangoRPCErrorCode.UNKNOWN_ERROR,\n error\n );\n};\n\ninterface TenderlyResponse {\n error_message: string;\n}\n\nexport async function getTenderlyError(\n chainId: string | undefined,\n txHash: string\n): Promise<string | undefined> {\n if (!chainId || !txHash) {\n return;\n }\n const chainIdInt = parseInt(chainId);\n try {\n const url = `https://api.tenderly.co/api/v1/public-contract/${chainIdInt}/tx/${txHash}`;\n const response = await fetch(url, {\n method: 'GET',\n });\n if (!response.ok) {\n return;\n }\n const data: TenderlyResponse = await response.json();\n return data?.error_message;\n } catch (error) {\n return;\n }\n}\n\nexport const waitMs = async (ms: number) =>\n new Promise((resolve) => setTimeout(resolve, ms));\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["BrowserProvider", "isError", "RangoRPCErrorCode", "SignerError", "SignerErrorCode", "isError", "RangoRPCErrorCode", "SignerError", "SignerErrorCode", "cleanEvmError", "__name", "error", "SignerError", "SignerErrorCode", "isError", "msg", "RangoRPCErrorCode", "getTenderlyError", "chainId", "txHash", "chainIdInt", "url", "response", "waitMs", "ms", "resolve", "waitWithMempoolCheck", "__name", "provider", "tx", "txHash", "confirmations", "finished", "waitMs", "error", "DefaultEvmSigner", "_DefaultEvmSigner", "BrowserProvider", "evmTx", "disableV2", "typedData", "SignerError", "SignerErrorCode", "msg", "address", "chainId", "signer", "transaction", "signerChainId", "signerAddress", "response", "cleanEvmError", "txResponse", "isError", "tError", "getTenderlyError", "RangoRPCErrorCode"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"src/helper.ts":{"bytes":2050,"imports":[{"path":"ethers","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signer.ts":{"bytes":
|
|
1
|
+
{"inputs":{"src/helper.ts":{"bytes":2050,"imports":[{"path":"ethers","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signer.ts":{"bytes":8016,"imports":[{"path":"ethers","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/helper.ts","kind":"import-statement","original":"./helper.js"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":101,"imports":[{"path":"src/signer.ts","kind":"import-statement","original":"./signer.js"},{"path":"src/helper.ts","kind":"import-statement","original":"./helper.js"}],"format":"esm"}},"outputs":{"dist/index.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":15716},"dist/index.js":{"imports":[{"path":"ethers","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"ethers","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true}],"exports":["DefaultEvmSigner","cleanEvmError","waitMs"],"entryPoint":"src/index.ts","inputs":{"src/signer.ts":{"bytesInOutput":2866},"src/helper.ts":{"bytesInOutput":928},"src/index.ts":{"bytesInOutput":0}},"bytes":3969}}}
|
package/dist/signer.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { TypedData } from './types.js';
|
|
1
2
|
import type { Eip1193Provider, TransactionRequest, TransactionResponse } from 'ethers';
|
|
2
3
|
import type { GenericSigner } from 'rango-types';
|
|
3
4
|
import type { EvmTransaction } from 'rango-types/mainApi';
|
|
@@ -5,6 +6,7 @@ export declare class DefaultEvmSigner implements GenericSigner<EvmTransaction> {
|
|
|
5
6
|
private provider;
|
|
6
7
|
constructor(provider: Eip1193Provider);
|
|
7
8
|
static buildTx(evmTx: EvmTransaction, disableV2?: boolean): TransactionRequest;
|
|
9
|
+
signTypedData(typedData: TypedData): Promise<string>;
|
|
8
10
|
signMessage(msg: string): Promise<string>;
|
|
9
11
|
signAndSendTx(tx: EvmTransaction, address: string, chainId: string | null): Promise<{
|
|
10
12
|
hash: string;
|
package/dist/signer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA6C1D,qBAAa,gBAAiB,YAAW,aAAa,CAAC,cAAc,CAAC;IACpE,OAAO,CAAC,QAAQ,CAAkB;gBAEtB,QAAQ,EAAE,eAAe;IAIrC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,UAAQ,GAAG,kBAAkB;IAwCtE,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IASzC,aAAa,CACjB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,mBAAmB,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAEV,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA6C1D,qBAAa,gBAAiB,YAAW,aAAa,CAAC,cAAc,CAAC;IACpE,OAAO,CAAC,QAAQ,CAAkB;gBAEtB,QAAQ,EAAE,eAAe;IAIrC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,UAAQ,GAAG,kBAAkB;IAwCtE,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAepD,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IASzC,aAAa,CACjB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,mBAAmB,CAAA;KAAE,CAAC;IAsDrD,IAAI,CACR,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,mBAAmB,EAChC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,mBAAmB,CAAA;KAAE,CAAC;CA6E7D"}
|
package/dist/types.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAE9D,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,eAAe,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,CAAC"}
|
package/package.json
CHANGED
package/src/signer.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { TypedData } from './types.js';
|
|
1
2
|
import type {
|
|
2
3
|
AbstractProvider,
|
|
3
4
|
Eip1193Provider,
|
|
@@ -97,6 +98,21 @@ export class DefaultEvmSigner implements GenericSigner<EvmTransaction> {
|
|
|
97
98
|
return tx;
|
|
98
99
|
}
|
|
99
100
|
|
|
101
|
+
async signTypedData(typedData: TypedData): Promise<string> {
|
|
102
|
+
try {
|
|
103
|
+
const signer = await this.provider.getSigner();
|
|
104
|
+
const signature = await signer.signTypedData(
|
|
105
|
+
typedData.domain,
|
|
106
|
+
typedData.types,
|
|
107
|
+
typedData.value
|
|
108
|
+
);
|
|
109
|
+
|
|
110
|
+
return signature;
|
|
111
|
+
} catch (error) {
|
|
112
|
+
throw new SignerError(SignerErrorCode.SIGN_TX_ERROR, undefined, error);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
100
116
|
async signMessage(msg: string): Promise<string> {
|
|
101
117
|
try {
|
|
102
118
|
const signer = await this.provider.getSigner(); // provides access to write operations
|
|
@@ -144,6 +160,7 @@ export class DefaultEvmSigner implements GenericSigner<EvmTransaction> {
|
|
|
144
160
|
try {
|
|
145
161
|
const response = await signer.sendTransaction(transaction);
|
|
146
162
|
return { hash: response.hash, response };
|
|
163
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
147
164
|
} catch (error: any) {
|
|
148
165
|
// retrying EIP-1559 without v2 related fields
|
|
149
166
|
if (
|