viem 2.55.7 → 2.55.10

package/tempo/chainConfig.ts

@@ -68,7 +68,11 @@ export const chainConfig = {
       // Actual tx has larger keychain/webAuthn sigs + real fee payer sig, costing more intrinsic gas.
       if (phase === 'afterFillParameters') {
         // Fee payer signature covers the gas limit, so the relay must set it before signing and Viem must not change it afterward.
-        if (request.feePayer && !request.feePayerSignature) {
+        if (
+          typeof request.gas !== 'undefined' &&
+          request.feePayer &&
+          !request.feePayerSignature
+        ) {
           if (request.keyAuthorization?.signature.type === 'webAuthn')
             request.gas = (request.gas ?? 0n) + 20_000n
           else if (request.account?.source === 'accessKey')

package/tempo/zones/Abis.ts

@@ -6,6 +6,8 @@ export const zoneFactory = [
       { name: 'zoneId', type: 'uint32', indexed: true },
       { name: 'portal', type: 'address', indexed: true },
       { name: 'initialToken', type: 'address', indexed: false },
+      { name: 'accessMode', type: 'bool', indexed: false },
+      { name: 'gatewayMode', type: 'bool', indexed: false },
       { name: 'admin', type: 'address', indexed: false },
       { name: 'sequencers', type: 'address[]', indexed: false },
       { name: 'threshold', type: 'uint8', indexed: false },
@@ -42,6 +44,10 @@ export const zoneFactory = [
         type: 'tuple',
         components: [
           { name: 'initialToken', type: 'address' },
+          { name: 'accessMode', type: 'bool' },
+          { name: 'gatewayMode', type: 'bool' },
+          { name: 'allowedAccounts', type: 'address[]' },
+          { name: 'zoneGateways', type: 'address[]' },
           { name: 'admin', type: 'address' },
           { name: 'sequencers', type: 'address[]' },
           { name: 'threshold', type: 'uint8' },

package/tempo/zones/Addresses.ts

@@ -0,0 +1,15 @@
+import { tempoModerato } from '../../chains/definitions/tempoModerato.js'
+
+export const messenger = {
+  [tempoModerato.id]: {
+    1: '0x254356112cCf6f32fAd84F16CC5E0A0cCA17Beb7',
+  },
+} as const satisfies Record<number, Record<number, `0x${string}`>>
+
+export const portal = {
+  [tempoModerato.id]: {
+    1: '0x59831A17340EE14FE136d751EfbeA8b630470fD2',
+    6: '0x7069DeC4E64Fd07334A0933eDe836C17259c9B23',
+    7: '0x3F5296303400B56271b476F5A0B9cBF74350D6Ac',
+  },
+} as const satisfies Record<number, Record<number, `0x${string}`>>

package/tempo/zones/index.ts

@@ -1,10 +1,10 @@
 // biome-ignore lint/performance/noBarrelFile: entrypoint module
 export * as Abis from './Abis.js'
+export * as Addresses from './Addresses.js'
 export { http, type ZoneHttpConfig } from './transport.js'
 export {
   from,
   getPortalAddress,
-  portalAddresses,
   zone,
   zoneModerato,
 } from './zone.js'

package/tempo/zones/zone.ts

@@ -3,20 +3,14 @@ import { tempo } from '../../chains/definitions/tempo.js'
 import { tempoModerato } from '../../chains/definitions/tempoModerato.js'
 import { defineChain } from '../../utils/chain/defineChain.js'
 import { chainConfig } from '../chainConfig.js'
-
-export const portalAddresses = {
-  [tempoModerato.id]: {
-    6: '0x7069DeC4E64Fd07334A0933eDe836C17259c9B23',
-    7: '0x3F5296303400B56271b476F5A0B9cBF74350D6Ac',
-  },
-} as const satisfies Record<number, Record<number, `0x${string}`>>
+import * as Addresses from './Addresses.js'
 
 export function getPortalAddress(
   chainId: number,
   zoneId: number,
 ): `0x${string}` {
   const address = (
-    portalAddresses as Record<number, Record<number, `0x${string}`>>
+    Addresses.portal as Record<number, Record<number, `0x${string}`>>
   )[chainId]?.[zoneId]
   if (!address)
     throw new Error(
@@ -25,21 +19,45 @@ export function getPortalAddress(
   return address
 }
 
+type ZoneContracts = {
+  messenger: Record<number, { address: `0x${string}` } | undefined>
+  portal: Record<number, { address: `0x${string}` } | undefined>
+}
+
 type Override = {
+  contracts?: ZoneContracts | undefined
   name: string
   rpcUrl: string
 }
 
 const overrides = {
-  6: {
-    name: 'Zone A',
-    rpcUrl: 'https://rpc-zone-a.testnet.tempo.xyz',
-  },
-  7: {
-    name: 'Zone B',
-    rpcUrl: 'https://rpc-zone-b.testnet.tempo.xyz',
+  [tempoModerato.id]: {
+    1: {
+      contracts: {
+        messenger: {
+          [tempoModerato.id]: {
+            address: Addresses.messenger[tempoModerato.id][1],
+          },
+        },
+        portal: {
+          [tempoModerato.id]: {
+            address: Addresses.portal[tempoModerato.id][1],
+          },
+        },
+      },
+      name: 'Zone E',
+      rpcUrl: 'https://rpc-zone-e.testnet.tempo.xyz',
+    },
+    6: {
+      name: 'Zone A',
+      rpcUrl: 'https://rpc-zone-a.testnet.tempo.xyz',
+    },
+    7: {
+      name: 'Zone B',
+      rpcUrl: 'https://rpc-zone-b.testnet.tempo.xyz',
+    },
   },
-} as const satisfies Record<number, Override>
+} as const satisfies Record<number, Record<number, Override>>
 
 export const zone = /*#__PURE__*/ from({
   sourceId: tempo.id,
@@ -57,10 +75,13 @@ export function from(options: from.Options) {
     const chainId = ZoneId.toChainId(id)
     const paddedId = String(id).padStart(3, '0')
 
-    const override = (overrides as Record<number, Override>)[id]
+    const override = (overrides as Record<number, Record<number, Override>>)[
+      options.sourceId
+    ]?.[id]
 
     return defineChain({
       ...chainConfig,
+      ...(override?.contracts ? { contracts: override.contracts } : {}),
       id: chainId,
       name: override?.name ?? `Tempo Zone ${paddedId}`,
       nativeCurrency: {