viem 2.57.2 → 2.57.3

package/tempo/internal/relay/preflight.ts

@@ -8,7 +8,7 @@ import { encodeAbiParameters } from '../../../utils/abi/encodeAbiParameters.js'
 import { concat } from '../../../utils/data/concat.js'
 import * as Addresses from '../../Addresses.js'
 
-/** Reads fee preferences, balances, and virtual masters without dependent RPC requests. */
+/** Reads fee preferences, liquid fee-token balances, and virtual masters in one RPC request. */
 export async function read(
   client: Client,
   options: {
@@ -76,6 +76,6 @@ export async function read(
   }
 }
 
-// forge inspect contracts/src/deployless/RelayPreflight.sol:RelayPreflight bytecode --optimize --evm-version paris
+// forge inspect --root contracts src/deployless/RelayPreflight.sol:RelayPreflight bytecode --optimize --evm-version paris
 const bytecode =
-  '0x608060405234801561001057600080fd5b5060405161067438038061067483398101604081905261002f916104a3565b6040516001600160a01b038616602482015260009061008090869060440160408051601f198184030181529190526020810180516001600160e01b03908116631da931f560e31b1790915261036b16565b9150600090506001600160a01b0382111561009c57600061009e565b815b9050600085516001600160401b038111156100bb576100bb6103b7565b6040519080825280602002602001820160405280156100e4578160200160208202803683370190505b506040516001600160a01b038a1660248201529091506000908190819060440160408051601f198184030181529190526020810180516001600160e01b03166370a0823160e01b179052905060005b89518110156101e0576101658a82815181106101515761015161059f565b60200260200101518361036b60201b60201c565b90508582815181106101795761017961059f565b602002602001018181525050856001600160a01b03168a82815181106101a1576101a161059f565b60200260200101516001600160a01b0316036101d857600192508481815181106101cd576101cd61059f565b602002602001015193505b600101610133565b50811580156101f757506001600160a01b03851615155b1561020a57610206858261036b565b9350505b600087516001600160401b03811115610225576102256103b7565b60405190808252806020026020018201604052801561024e578160200160208202803683370190505b509050600160005b8951811015610336576000806102d38d8d85815181106102785761027861059f565b60200260200101516040516024016102a091906001600160e01b031991909116815260200190565b60408051601f198184030181529190526020810180516001600160e01b03908116636c2558b360e11b1790915261036b16565b915091508115806102ea57506001600160a01b0381115b156102f8576000935061032c565b8085848151811061030b5761030b61059f565b60200260200101906001600160a01b031690816001600160a01b0316815250505b5050600101610256565b50600087868884866040516020016103529594939291906105fa565b6040516020818303038152906040529050805160208201f35b60008060405160208185516020870188620186a0fa60203d1015169250821561039357805191505b509250929050565b80516001600160a01b03811681146103b257600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156103f5576103f56103b7565b604052919050565b60006001600160401b03821115610416576104166103b7565b5060051b60200190565b600082601f83011261043157600080fd5b815161044461043f826103fd565b6103cd565b8082825260208201915060208360051b86010192508583111561046657600080fd5b602085015b838110156104995780516001600160e01b03198116811461048b57600080fd5b83526020928301920161046b565b5095945050505050565b600080600080600060a086880312156104bb57600080fd5b6104c48661039b565b94506104d26020870161039b565b60408701519094506001600160401b038111156104ee57600080fd5b8601601f810188136104ff57600080fd5b805161050d61043f826103fd565b8082825260208201915060208360051b85010192508a83111561052f57600080fd5b6020840193505b82841015610558576105478461039b565b825260209384019390910190610536565b955061056a925050506060870161039b565b60808701519092506001600160401b0381111561058657600080fd5b61059288828901610420565b9150509295509295909350565b634e487b7160e01b600052603260045260246000fd5b600081518084526020840193506020830160005b828110156105f05781516001600160a01b03168652602095860195909101906001016105c9565b5093949350505050565b6001600160a01b0386168152602080820186905260a060408301819052855190830181905260009186019060c0840190835b8181101561064a57835183526020938401939092019160010161062c565b50508515156060850152838103608085015261066681866105b5565b999850505050505050505056fe'
+  '0x608060405234801561001057600080fd5b506040516108be3803806108be83398101604081905261002f916106ed565b6040516001600160a01b038616602482015260009061008090869060440160408051601f198184030181529190526020810180516001600160e01b03908116631da931f560e31b179091526103fc16565b9150600090506001600160a01b0382111561009c57600061009e565b815b905060006001600160a01b038816156101305760405141602482015260009081906100fb908a9060440160408051601f198184030181529190526020810180516001600160e01b039081166336e2a53d60e11b179091526103fc16565b9150915081801561011357506001600160a01b038111155b1561012d578015610124578061012a565b608360961b5b92505b50505b600086516001600160401b0381111561014b5761014b610601565b604051908082528060200260200182016040528015610174578160200160208202803683370190505b506040516001600160a01b038b1660248201529091506000908190819060440160408051601f198184030181529190526020810180516001600160e01b03166370a0823160e01b179052905060005b8a51811015610270576101f78b82815181106101e1576101e16107e9565b6020026020010151838e8961042c60201b60201c565b858281518110610209576102096107e9565b602002602001018181525050866001600160a01b03168b8281518110610231576102316107e9565b60200260200101516001600160a01b031603610268576001925084818151811061025d5761025d6107e9565b602002602001015193505b6001016101c3565b508115801561028757506001600160a01b03861615155b1561029b5761029886828d8861042c565b92505b600088516001600160401b038111156102b6576102b6610601565b6040519080825280602002602001820160405280156102df578160200160208202803683370190505b509050600160005b8a518110156103c7576000806103648e8e8581518110610309576103096107e9565b602002602001015160405160240161033191906001600160e01b031991909116815260200190565b60408051601f198184030181529190526020810180516001600160e01b03908116636c2558b360e11b179091526103fc16565b9150915081158061037b57506001600160a01b0381115b1561038957600093506103bd565b8085848151811061039c5761039c6107e9565b60200260200101906001600160a01b031690816001600160a01b0316815250505b50506001016102e7565b50600088868884866040516020016103e3959493929190610844565b6040516020818303038152906040529050805160208201f35b60008060405160208185516020870188620186a0fa60203d1015169250821561042457805191505b509250929050565b60008061043986866103fc565b91505080158061045057506001600160a01b038316155b1561045f576000915050610565565b826001600160a01b0316866001600160a01b03161480610485575061048584878561056d565b15610491579050610565565b6040805160048152602481019091526020810180516001600160e01b03908116630217a4b760e41b179091526000916104cd918991906103fc16565b9150508015806104e357506001600160a01b0381115b156104f357600092505050610565565b806001600160a01b03808216908916148061051f5750846001600160a01b0316816001600160a01b0316145b156105305760009350505050610565565b61053b86898361056d565b801561054d575061054d86828761056d565b1561055d57829350505050610565565b600093505050505b949350505050565b6040516001600160a01b03808416602483015282166044820152600090819060640160408051601f198184030181529181526020820180516001600160e01b031663298d501f60e11b1781528151835193945092839189620186a0fa600060208301511160403d101582161693505050509392505050565b80516001600160a01b03811681146105fc57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561063f5761063f610601565b604052919050565b60006001600160401b0382111561066057610660610601565b5060051b60200190565b600082601f83011261067b57600080fd5b815161068e61068982610647565b610617565b8082825260208201915060208360051b8601019250858311156106b057600080fd5b602085015b838110156106e35780516001600160e01b0319811681146106d557600080fd5b8352602092830192016106b5565b5095945050505050565b600080600080600060a0868803121561070557600080fd5b61070e866105e5565b945061071c602087016105e5565b60408701519094506001600160401b0381111561073857600080fd5b8601601f8101881361074957600080fd5b805161075761068982610647565b8082825260208201915060208360051b85010192508a83111561077957600080fd5b6020840193505b828410156107a257610791846105e5565b825260209384019390910190610780565b95506107b492505050606087016105e5565b60808701519092506001600160401b038111156107d057600080fd5b6107dc8882890161066a565b9150509295509295909350565b634e487b7160e01b600052603260045260246000fd5b600081518084526020840193506020830160005b8281101561083a5781516001600160a01b0316865260209586019590910190600101610813565b5093949350505050565b6001600160a01b0386168152602080820186905260a060408301819052855190830181905260009186019060c0840190835b81811015610894578351835260209384019390920191600101610876565b5050851515606085015283810360808501526108b081866107ff565b999850505050505050505056fe'

package/utils/errors/getContractError.ts

@@ -49,7 +49,9 @@ export function getContractError<err extends ErrorType<string>>(
     err instanceof RawContractError
       ? err
       : err instanceof BaseError
-        ? err.walk((err) => 'data' in (err as Error)) || err.walk()
+        ? err.walk(
+            (err) => typeof err === 'object' && err !== null && 'data' in err,
+          ) || err.walk()
         : {}
   ) as BaseError
   const { code, data, details, message, shortMessage } =

package/utils/rpc/ipc.ts

@@ -14,6 +14,8 @@ export type GetIpcRpcClientOptions = Pick<
 
 const openingBrace = '{'.charCodeAt(0)
 const closingBrace = '}'.charCodeAt(0)
+const quote = '"'.charCodeAt(0)
+const backslash = '\\'.charCodeAt(0)
 
 /** @internal */
 export function extractMessages(buffer: Buffer): [Buffer[], Buffer] {
@@ -21,9 +23,22 @@ export function extractMessages(buffer: Buffer): [Buffer[], Buffer] {
 
   let cursor = 0
   let level = 0
+  let inString = false
+  let escaped = false
   for (let i = 0; i < buffer.length; i++) {
-    if (buffer[i] === openingBrace) level++
-    if (buffer[i] === closingBrace) level--
+    const byte = buffer[i]
+    if (inString) {
+      if (escaped) escaped = false
+      else if (byte === backslash) escaped = true
+      else if (byte === quote) inString = false
+      continue
+    }
+    if (byte === quote) {
+      inString = true
+      continue
+    }
+    if (byte === openingBrace) level++
+    if (byte === closingBrace) level--
     if (level === 0) {
       const message = buffer.subarray(cursor, i + 1)
       if (

package/utils/rpc/socket.ts

@@ -288,11 +288,12 @@ export async function getSocketRpcClient<socket extends {}>(
           }
         },
         requestAsync({ body, timeout = 10_000 }) {
+          const id = body.id ?? idCache.take()
           return withTimeout(
             () =>
               new Promise<RpcResponse>((onResponse, onError) =>
                 this.request({
-                  body,
+                  body: { ...body, id },
                   onError,
                   onResponse,
                 }),
@@ -301,7 +302,7 @@ export async function getSocketRpcClient<socket extends {}>(
               errorInstance: new TimeoutError({ body, url }),
               timeout,
             },
-          )
+          ).finally(() => requests.delete(id))
         },
         requests,
         subscriptions,