Improve memoizing

packages/protocol-kit/src/utils/memoized.ts

@@ -1,8 +1,10 @@
+import SafeProvider from '../SafeProvider'
+
 export function createMemoizedFunction<T extends (...args: Parameters<T>) => ReturnType<T>>(
   callback: T,
   cache: Record<string, ReturnType<T>> = {}
 ) {
-  const replacer = createBigIntSerializerReplacer()
+  const replacer = createSafeContractSerializerReplacer()
   return (...args: Parameters<T>): ReturnType<T> => {
     const key = JSON.stringify(args, replacer)
 
@@ -13,19 +15,27 @@ export function createMemoizedFunction<T extends (...args: Parameters<T>) => Ret
 }
 
 // EIP1193 providers from web3.currentProvider and hre.network.provider fail to serialize BigInts
-function createBigIntSerializerReplacer() {
+function createSafeContractSerializerReplacer() {
   const seen = new Set()
 
   return (_: string, value: unknown) => {
-    if (typeof value === 'object' && value !== null) {
+    // Serialize Bigints as strings
+    if (typeof value === 'bigint') {
+      return value.toString()
+    }
+
+    // Avoid circular references
+    if (value instanceof SafeProvider && value !== null) {
       if (seen.has(value)) {
         return undefined
       }
       seen.add(value)
-    }
-
-    if (typeof value === 'bigint') {
-      return value.toString()
+      return {
+        $safeProvider: {
+          provider: typeof value.provider === 'object' ? 'EIP1193Provider' : value.provider,
+          signer: value.signer
+        }
+      }
     }
 
     return value