Merge pull request #36 from cometh-hq/develop

v2.0.6

Author: yoanslvy

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cometh/connect-sdk-viem",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Viem SDK Cometh Connect",
@@ -60,7 +60,7 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.23.4",
-    "@cometh/connect-sdk": "^1.2.21",
+    "@cometh/connect-sdk": "^1.2.25",
     "@rainbow-me/rainbowkit": "^2",
     "@types/babel__core": "^7.20.0",
     "viem": "^2",

src/client/getConnectViemClient.ts

@@ -1,12 +1,5 @@
 import { ComethWallet } from '@cometh/connect-sdk'
-import {
-  Account,
-  Chain,
-  Client,
-  createPublicClient,
-  http,
-  Transport
-} from 'viem'
+import { Account, Chain, Client, createClient, http, Transport } from 'viem'
 import { Prettify } from 'viem/_types/types/utils'
 import {
   arbitrum,
@@ -72,17 +65,25 @@ export type ConnectClientParams = {
   rpc?: string
 }
 
-export const getConnectViemClient = ({
+export const getConnectViemClient = <
+  transport extends Transport = Transport,
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined
+>({
   wallet,
   apiKey,
   rpc
-}: ConnectClientParams): any => {
+}: ConnectClientParams): ConnectClient<transport, chain, account> => {
   const chain = supportedChains.find(
     (chain) => chain.id === wallet.chainId
   ) as Chain
 
-  return createPublicClient({
+  return createClient({
     chain,
     transport: http(rpc)
-  }).extend(connectWalletActions(wallet, apiKey))
+  }).extend(connectWalletActions(wallet, apiKey)) as unknown as ConnectClient<
+    transport,
+    chain,
+    account
+  >
 }

src/customActions/connectWalletActions.ts

@@ -299,15 +299,15 @@ export const connectWalletActions =
       writeContract: (args) => 
         writeContract(client, {...args, wallet } as any),
       signMessage: (args) =>
-        signMessage(client, {
+        signMessage( {
           ...args,
           wallet
         } as SignMessageWithConnectParameters),
-      simulateContract: (args) =>
-        simulateContract(client, {
-          ...args,
-          wallet
-        } as SimulateContractWithConnectParameters),
+     simulateContract: (args) =>
+            simulateContract(client, {
+              ...args,
+              wallet
+            } as SimulateContractWithConnectParameters),
       verifyMessage: (args) =>
         verifyMessage(client, {
           ...args,
@@ -316,4 +316,6 @@ export const connectWalletActions =
         } as VerifyMessageWithConnectParameters)
     })
 
-export { getTransaction, sendBatchTransactions, sendTransaction, simulateContract, verifyMessage,writeContract }
+
+
+export { getTransaction, sendBatchTransactions, sendTransaction, simulateContract, verifyMessage, writeContract }

src/customActions/getTransaction.ts

@@ -1,9 +1,16 @@
 import { ComethWallet } from '@cometh/connect-sdk'
 import {
+  Account,
   Address,
   Chain,
+  Client,
+  createClient,
+  createPublicClient,
   GetBlockNumberReturnType,
   Hash,
+  Hex,
+  http,
+  Log,
   parseAbiItem,
   PublicClient,
   TransactionReceipt,
@@ -13,11 +20,11 @@ import {
 import { sleep } from '../utils/utils'
 
 const _catchSuccessEvent = async (
-  client: PublicClient<Transport, Chain>,
+  client: PublicClient,
   address: Address,
   safeTxHash: Hash,
   currentBlockNumber: GetBlockNumberReturnType
-): Promise<any> => {
+): Promise<Log> => {
   const successTransactionLogs = await client.getLogs({
     address,
     event: parseAbiItem(
@@ -30,15 +37,15 @@ const _catchSuccessEvent = async (
     (e) => e.args.txHash == safeTxHash
   )
 
-  return filteredTransactionEvent
+  return filteredTransactionEvent as Log
 }
 
 const _catchFailureEvent = async (
-  client: PublicClient<Transport, Chain>,
+  client: PublicClient,
   address: Address,
   safeTxHash: Hash,
   currentBlockNumber: GetBlockNumberReturnType
-): Promise<any> => {
+): Promise<Log> => {
   const successTransactionLogs = await client.getLogs({
     address,
     event: parseAbiItem(
@@ -51,17 +58,20 @@ const _catchFailureEvent = async (
     (e) => e.args.txHash == safeTxHash
   )
 
-  return filteredTransactionEvent
+  return filteredTransactionEvent as Log
 }
 
-export const getTransaction = async ({
+export const getTransaction = async <
+  TChain extends Chain | undefined,
+  TAccount extends Account | undefined
+>({
   client,
   wallet,
   safeTxHash,
   relayId,
   timeout = 60 * 1000
 }: {
-  client: any
+  client: Client<Transport, TChain, TAccount>
   wallet: ComethWallet
   safeTxHash: Hash
   relayId?: string
@@ -70,7 +80,12 @@ export const getTransaction = async ({
   const startDate = Date.now()
   const timeoutLimit = new Date(startDate + timeout).getTime()
 
-  const currentBlockNumber = await client.getBlockNumber()
+  const publicClient = createPublicClient({
+    chain: client.chain,
+    transport: http(client.transport.rpcUrl)
+  }) as PublicClient
+
+  const currentBlockNumber = await publicClient.getBlockNumber()
   const from = wallet.getAddress() as Address
 
   let txSuccessEvent
@@ -79,13 +94,13 @@ export const getTransaction = async ({
   while (!txSuccessEvent && !txFailureEvent && Date.now() < timeoutLimit) {
     await sleep(3000)
     txSuccessEvent = await _catchSuccessEvent(
-      client,
+      publicClient,
       from,
       safeTxHash,
       currentBlockNumber
     )
     txFailureEvent = await _catchFailureEvent(
-      client,
+      publicClient,
       from,
       safeTxHash,
       currentBlockNumber
@@ -99,8 +114,8 @@ export const getTransaction = async ({
 
     while (txResponse === null) {
       try {
-        txResponse = await client.getTransactionReceipt({
-          hash: transactionHash
+        txResponse = await publicClient.getTransactionReceipt({
+          hash: transactionHash as Hex
         })
       } catch {
         // Do nothing

src/customActions/sendTransaction.ts

@@ -33,8 +33,8 @@ export async function sendTransaction<
   const result = await wallet.sendTransaction(
     deepHexlify({
       to: to,
-      value: value || "0x00",
-      data: data || "0x00",
+      value: value || '0x00',
+      data: data || '0x00'
     })
   )
 

src/customActions/signMessage.ts

@@ -1,5 +1,5 @@
 import { ComethWallet } from '@cometh/connect-sdk'
-import { Account, Chain, Client, Hex, SignableMessage, Transport } from 'viem'
+import { Account, Hex, SignableMessage } from 'viem'
 import { ErrorType } from 'viem/_types/errors/utils'
 import { GetAccountParameter } from 'viem/_types/types/account'
 import {
@@ -24,11 +24,7 @@ export type SignMessageErrorType =
   | ToHexErrorType
   | ErrorType
 
-export async function signMessage<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined
->(
-  client: Client<Transport, TChain, TAccount>,
+export async function signMessage<TAccount extends Account | undefined>(
   args: SignMessageWithConnectParameters<TAccount>
 ): Promise<SignMessageReturnType> {
   const { message, wallet } = args

src/wagmi/connector.ts

@@ -29,6 +29,7 @@ export interface WagmiConfigConnectorParams {
   webAuthnOptions?: webAuthnOptions
   passKeyName?: string
   uiConfig?: UIConfig
+  gasToken?: string
   baseUrl?: string
   rpcUrl?: string
 }
@@ -116,6 +117,7 @@ export function comethConnectConnector(
           passKeyName,
           baseUrl,
           uiConfig,
+          gasToken,
           rpcUrl
         } = parameters
 
@@ -135,6 +137,7 @@ export function comethConnectConnector(
             }),
             apiKey,
             uiConfig,
+            gasToken,
             rpcUrl,
             baseUrl
           })

yarn.lock

@@ -415,10 +415,10 @@
     preact "^10.16.0"
     sha.js "^2.4.11"
 
-"@cometh/connect-sdk@^1.2.21":
-  version "1.2.21"
-  resolved "https://registry.yarnpkg.com/@cometh/connect-sdk/-/connect-sdk-1.2.21.tgz#86e1c119b14b08cf576a08004be4fdd5ebaa5d22"
-  integrity sha512-abw8wEy7MjXIZ2Mcwv84wSeHajQe0aODI2Ir0J6haRp5/8IqFbU67AhKrB9rnwhhtfvYmWxgX/gRHKMXILJpwA==
+"@cometh/connect-sdk@^1.2.25":
+  version "1.2.25"
+  resolved "https://registry.yarnpkg.com/@cometh/connect-sdk/-/connect-sdk-1.2.25.tgz#9cbd07006fb77ff7126f436d5beeb160a3d9d287"
+  integrity sha512-OsRtfMCyFksP0Di1ZfgnIT2pVKfyvR/e5WUfqqLNTQfB9S8yDIMN1OggqmZKTVXUAaZ7tEfkrKdWdZ1ltth3qw==
   dependencies:
     "@alembic/ui" "^1.5.4"
     "@babel/traverse" "^7.23.4"