tempo.ts 0.0.6 → 0.1.0

package/src/viem/{actions → Actions}/fee.test.ts

@@ -1,13 +1,11 @@
 import { setTimeout } from 'node:timers/promises'
-import * as actions from 'tempo.ts/viem/actions'
+import { Abis, Addresses, createTempoClient } from 'tempo.ts/viem'
 import { parseEther, publicActions } from 'viem'
 import { mnemonicToAccount } from 'viem/accounts'
 import { writeContractSync } from 'viem/actions'
 import { describe, expect, test } from 'vitest'
 import { tempoTest } from '../../../test/viem/config.js'
-import { tip20Abi } from '../abis.js'
-import { usdAddress } from '../addresses.js'
-import { createTempoClient } from '../client.js'
+import * as actions from './index.js'
 
 const account = mnemonicToAccount(
   'test test test test test test test test test test test junk',
@@ -31,14 +29,14 @@ describe('getUserToken', () => {
   test('default', async () => {
     // Fund accounts
     await writeContractSync(client, {
-      abi: tip20Abi,
-      address: usdAddress,
+      abi: Abis.tip20,
+      address: Addresses.defaultFeeToken,
       functionName: 'transfer',
       args: [account2.address, parseEther('100')],
     })
     await writeContractSync(client, {
-      abi: tip20Abi,
-      address: usdAddress,
+      abi: Abis.tip20,
+      address: Addresses.defaultFeeToken,
       functionName: 'transfer',
       args: [account3.address, parseEther('100')],
     })
@@ -60,8 +58,8 @@ describe('getUserToken', () => {
       await actions.fee.getUserToken(client, { account }),
     ).toMatchInlineSnapshot(`
       {
-        "address": "0x20C0000000000000000000000000000000000000",
-        "id": 0n,
+        "address": "0x20C0000000000000000000000000000000000001",
+        "id": 1n,
       }
     `)
     expect(
@@ -87,21 +85,21 @@ describe('setUserToken', () => {
   test('default', async () => {
     expect(await actions.fee.getUserToken(client)).toMatchInlineSnapshot(
       `
-        {
-          "address": "0x20C0000000000000000000000000000000000000",
-          "id": 0n,
-        }
-      `,
+      {
+        "address": "0x20C0000000000000000000000000000000000001",
+        "id": 1n,
+      }
+    `,
     )
 
     const { receipt: setReceipt, ...setResult } =
       await actions.fee.setUserTokenSync(client, {
-        token: '0x20c0000000000000000000000000000000000001',
+        token: 2n,
       })
     expect(setReceipt).toBeDefined()
     expect(setResult).toMatchInlineSnapshot(`
       {
-        "token": "0x20C0000000000000000000000000000000000001",
+        "token": "0x20C0000000000000000000000000000000000002",
         "user": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
       }
     `)
@@ -109,32 +107,32 @@ describe('setUserToken', () => {
     expect(await actions.fee.getUserToken(client, {})).toMatchInlineSnapshot(
       `
         {
-          "address": "0x20C0000000000000000000000000000000000001",
-          "id": 1n,
+          "address": "0x20C0000000000000000000000000000000000002",
+          "id": 2n,
         }
       `,
     )
 
     const { receipt: resetReceipt, ...resetResult } =
       await actions.fee.setUserTokenSync(client, {
-        feeToken: 0n,
-        token: 0n,
+        feeToken: 1n,
+        token: 1n,
       })
     expect(resetReceipt).toBeDefined()
     expect(resetResult).toMatchInlineSnapshot(`
       {
-        "token": "0x20C0000000000000000000000000000000000000",
+        "token": "0x20C0000000000000000000000000000000000001",
         "user": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
       }
     `)
 
     expect(await actions.fee.getUserToken(client, {})).toMatchInlineSnapshot(
       `
-        {
-          "address": "0x20C0000000000000000000000000000000000000",
-          "id": 0n,
-        }
-      `,
+      {
+        "address": "0x20C0000000000000000000000000000000000001",
+        "id": 1n,
+      }
+    `,
     )
   })
 })
@@ -156,8 +154,8 @@ describe('watchSetUserToken', () => {
     try {
       // Set token for account2
       await writeContractSync(client, {
-        abi: tip20Abi,
-        address: usdAddress,
+        abi: Abis.tip20,
+        address: Addresses.defaultFeeToken,
         functionName: 'transfer',
         args: [account2.address, parseEther('1')],
       })
@@ -169,8 +167,8 @@ describe('watchSetUserToken', () => {
 
       // Set token for account3
       await writeContractSync(client, {
-        abi: tip20Abi,
-        address: usdAddress,
+        abi: Abis.tip20,
+        address: Addresses.defaultFeeToken,
         functionName: 'transfer',
         args: [account3.address, parseEther('1')],
       })
@@ -220,15 +218,15 @@ describe('watchSetUserToken', () => {
     try {
       // Transfer gas to accounts
       await writeContractSync(client, {
-        abi: tip20Abi,
-        address: usdAddress,
+        abi: Abis.tip20,
+        address: Addresses.defaultFeeToken,
         functionName: 'transfer',
         args: [account2.address, parseEther('1')],
       })
 
       await writeContractSync(client, {
-        abi: tip20Abi,
-        address: usdAddress,
+        abi: Abis.tip20,
+        address: Addresses.defaultFeeToken,
         functionName: 'transfer',
         args: [account3.address, parseEther('1')],
       })
@@ -248,7 +246,7 @@ describe('watchSetUserToken', () => {
       // Set token for account2 again (should be captured)
       await actions.fee.setUserTokenSync(client, {
         account: account2,
-        feeToken: 0n,
+        feeToken: 1n,
         token: 2n,
       })
 

package/src/viem/{actions → Actions}/fee.ts

@@ -22,14 +22,14 @@ import {
 } from 'viem/actions'
 import type { Compute, UnionOmit } from '../../internal/types.js'
 import * as TokenId from '../../ox/TokenId.js'
-import { feeManagerAbi } from '../abis.js'
-import { feeManagerAddress } from '../addresses.js'
+import * as Abis from '../Abis.js'
+import * as Addresses from '../Addresses.js'
 import type {
   GetAccountParameter,
   ReadParameters,
   WriteParameters,
-} from '../types.js'
-import { defineCall } from '../utils.js'
+} from '../internal/types.js'
+import { defineCall } from '../internal/utils.js'
 
 /**
  * Gets the user's default fee token.
@@ -100,8 +100,8 @@ export namespace getUserToken {
   export function call(args: Args) {
     const { account } = args
     return defineCall({
-      address: feeManagerAddress,
-      abi: feeManagerAbi,
+      address: Addresses.feeManager,
+      abi: Abis.feeManager,
       args: [account],
       functionName: 'userTokens',
     })
@@ -166,9 +166,10 @@ export namespace setUserToken {
     client: Client<Transport, chain, account>,
     parameters: setUserToken.Parameters<chain, account>,
   ): Promise<ReturnType<action>> {
-    const call = setUserToken.call(parameters)
+    const { token, ...rest } = parameters
+    const call = setUserToken.call({ token })
     return (await action(client, {
-      ...parameters,
+      ...rest,
       ...call,
     } as never)) as never
   }
@@ -210,8 +211,8 @@ export namespace setUserToken {
   export function call(args: Args) {
     const { token } = args
     return defineCall({
-      address: feeManagerAddress,
-      abi: feeManagerAbi,
+      address: Addresses.feeManager,
+      abi: Abis.feeManager,
       functionName: 'setUserToken',
       args: [TokenId.toAddress(token)],
     })
@@ -219,7 +220,7 @@ export namespace setUserToken {
 
   export function extractEvent(logs: Log[]) {
     const [log] = parseEventLogs({
-      abi: feeManagerAbi,
+      abi: Abis.feeManager,
       logs,
       eventName: 'UserTokenSet',
       strict: true,
@@ -283,7 +284,7 @@ export namespace setUserTokenSync {
 
   export type ReturnValue = Compute<
     GetEventArgs<
-      typeof feeManagerAbi,
+      typeof Abis.feeManager,
       'UserTokenSet',
       { IndexedOnly: false; Required: true }
     > & {
@@ -327,8 +328,8 @@ export function watchSetUserToken<
   const { onUserTokenSet, ...rest } = parameters
   return watchContractEvent(client, {
     ...rest,
-    address: feeManagerAddress,
-    abi: feeManagerAbi,
+    address: Addresses.feeManager,
+    abi: Abis.feeManager,
     eventName: 'UserTokenSet',
     onLogs: (logs) => {
       for (const log of logs) onUserTokenSet(log.args, log)
@@ -339,7 +340,7 @@ export function watchSetUserToken<
 
 export declare namespace watchSetUserToken {
   export type Args = GetEventArgs<
-    typeof feeManagerAbi,
+    typeof Abis.feeManager,
     'UserTokenSet',
     { IndexedOnly: false; Required: true }
   >
@@ -348,12 +349,12 @@ export declare namespace watchSetUserToken {
     bigint,
     number,
     false,
-    ExtractAbiItem<typeof feeManagerAbi, 'UserTokenSet'>,
+    ExtractAbiItem<typeof Abis.feeManager, 'UserTokenSet'>,
     true
   >
 
   export type Parameters = UnionOmit<
-    WatchContractEventParameters<typeof feeManagerAbi, 'UserTokenSet', true>,
+    WatchContractEventParameters<typeof Abis.feeManager, 'UserTokenSet', true>,
     'abi' | 'address' | 'batch' | 'eventName' | 'onLogs' | 'strict'
   > & {
     /** Callback to invoke when a user token is set. */

package/src/viem/{actions → Actions}/index.ts

@@ -1,4 +1,5 @@
 export * as amm from './amm.js'
+export * as dex from './dex.js'
 export * as fee from './fee.js'
 export * as policy from './policy.js'
 export * as token from './token.js'

package/src/viem/{actions → Actions}/policy.test.ts

@@ -1,10 +1,10 @@
 import { setTimeout } from 'node:timers/promises'
-import * as actions from 'tempo.ts/viem/actions'
 import { publicActions } from 'viem'
 import { mnemonicToAccount } from 'viem/accounts'
 import { describe, expect, test } from 'vitest'
 import { tempoTest } from '../../../test/viem/config.js'
-import { createTempoClient } from '../client.js'
+import { createTempoClient } from '../Client.js'
+import * as actions from './index.js'
 
 const account = mnemonicToAccount(
   'test test test test test test test test test test test junk',

package/src/viem/{actions → Actions}/policy.ts

@@ -22,10 +22,10 @@ import {
   writeContractSync,
 } from 'viem/actions'
 import type { Compute, UnionOmit } from '../../internal/types.js'
-import { tip403RegistryAbi } from '../abis.js'
-import { tip403RegistryAddress } from '../addresses.js'
-import type { ReadParameters, WriteParameters } from '../types.js'
-import { defineCall } from '../utils.js'
+import * as Abis from '../Abis.js'
+import * as Addresses from '../Addresses.js'
+import type { ReadParameters, WriteParameters } from '../internal/types.js'
+import { defineCall } from '../internal/utils.js'
 
 export type PolicyType = 'whitelist' | 'blacklist'
 
@@ -161,19 +161,21 @@ export namespace create {
    */
   export function call(args: Args) {
     const { admin, type, addresses } = args
-    const callArgs = addresses
-      ? ({
+    const config = (() => {
+      if (addresses)
+        return {
           functionName: 'createPolicyWithAccounts',
           args: [admin, policyTypeMap[type], addresses],
-        } as const)
-      : ({
-          functionName: 'createPolicy',
-          args: [admin, policyTypeMap[type]],
-        } as const)
+        } as const
+      return {
+        functionName: 'createPolicy',
+        args: [admin, policyTypeMap[type]],
+      } as const
+    })()
     return defineCall({
-      address: tip403RegistryAddress,
-      abi: tip403RegistryAbi,
-      ...callArgs,
+      address: Addresses.tip403Registry,
+      abi: Abis.tip403Registry,
+      ...config,
     })
   }
 
@@ -185,7 +187,7 @@ export namespace create {
    */
   export function extractEvent(logs: Log[]) {
     const [log] = parseEventLogs({
-      abi: tip403RegistryAbi,
+      abi: Abis.tip403Registry,
       logs,
       eventName: 'PolicyCreated',
       strict: true,
@@ -250,7 +252,7 @@ export namespace createSync {
 
   export type ReturnValue = Compute<
     GetEventArgs<
-      typeof tip403RegistryAbi,
+      typeof Abis.tip403Registry,
       'PolicyCreated',
       { IndexedOnly: false; Required: true }
     > & {
@@ -320,9 +322,10 @@ export namespace setAdmin {
     client: Client<Transport, chain, account>,
     parameters: setAdmin.Parameters<chain, account>,
   ): Promise<ReturnType<action>> {
-    const call = setAdmin.call(parameters)
+    const { policyId, admin, ...rest } = parameters
+    const call = setAdmin.call({ policyId, admin })
     return (await action(client, {
-      ...parameters,
+      ...rest,
       ...call,
     } as never)) as never
   }
@@ -366,8 +369,8 @@ export namespace setAdmin {
   export function call(args: Args) {
     const { policyId, admin } = args
     return defineCall({
-      address: tip403RegistryAddress,
-      abi: tip403RegistryAbi,
+      address: Addresses.tip403Registry,
+      abi: Abis.tip403Registry,
       functionName: 'setPolicyAdmin',
       args: [policyId, admin],
     })
@@ -381,7 +384,7 @@ export namespace setAdmin {
    */
   export function extractEvent(logs: Log[]) {
     const [log] = parseEventLogs({
-      abi: tip403RegistryAbi,
+      abi: Abis.tip403Registry,
       logs,
       eventName: 'PolicyAdminUpdated',
       strict: true,
@@ -446,7 +449,7 @@ export namespace setAdminSync {
 
   export type ReturnValue = Compute<
     GetEventArgs<
-      typeof tip403RegistryAbi,
+      typeof Abis.tip403Registry,
       'PolicyAdminUpdated',
       { IndexedOnly: false; Required: true }
     > & {
@@ -519,10 +522,14 @@ export namespace modifyWhitelist {
     client: Client<Transport, chain, account>,
     parameters: modifyWhitelist.Parameters<chain, account>,
   ): Promise<ReturnType<action>> {
-    const { address: targetAccount, ...rest } = parameters
-    const call = modifyWhitelist.call({ ...rest, address: targetAccount })
+    const { address: targetAccount, allowed, policyId, ...rest } = parameters
+    const call = modifyWhitelist.call({
+      address: targetAccount,
+      allowed,
+      policyId,
+    })
     return (await action(client, {
-      ...parameters,
+      ...rest,
       ...call,
     } as never)) as never
   }
@@ -568,8 +575,8 @@ export namespace modifyWhitelist {
   export function call(args: Args) {
     const { policyId, address, allowed } = args
     return defineCall({
-      address: tip403RegistryAddress,
-      abi: tip403RegistryAbi,
+      address: Addresses.tip403Registry,
+      abi: Abis.tip403Registry,
       functionName: 'modifyPolicyWhitelist',
       args: [policyId, address, allowed],
     })
@@ -583,7 +590,7 @@ export namespace modifyWhitelist {
    */
   export function extractEvent(logs: Log[]) {
     const [log] = parseEventLogs({
-      abi: tip403RegistryAbi,
+      abi: Abis.tip403Registry,
       logs,
       eventName: 'WhitelistUpdated',
       strict: true,
@@ -649,7 +656,7 @@ export namespace modifyWhitelistSync {
 
   export type ReturnValue = Compute<
     GetEventArgs<
-      typeof tip403RegistryAbi,
+      typeof Abis.tip403Registry,
       'WhitelistUpdated',
       { IndexedOnly: false; Required: true }
     > & {
@@ -722,10 +729,14 @@ export namespace modifyBlacklist {
     client: Client<Transport, chain, account>,
     parameters: modifyBlacklist.Parameters<chain, account>,
   ): Promise<ReturnType<action>> {
-    const { address: targetAccount, ...rest } = parameters
-    const call = modifyBlacklist.call({ ...rest, address: targetAccount })
+    const { address: targetAccount, policyId, restricted, ...rest } = parameters
+    const call = modifyBlacklist.call({
+      address: targetAccount,
+      policyId,
+      restricted,
+    })
     return (await action(client, {
-      ...parameters,
+      ...rest,
       ...call,
     } as never)) as never
   }
@@ -771,8 +782,8 @@ export namespace modifyBlacklist {
   export function call(args: Args) {
     const { policyId, address, restricted } = args
     return defineCall({
-      address: tip403RegistryAddress,
-      abi: tip403RegistryAbi,
+      address: Addresses.tip403Registry,
+      abi: Abis.tip403Registry,
       functionName: 'modifyPolicyBlacklist',
       args: [policyId, address, restricted],
     })
@@ -786,7 +797,7 @@ export namespace modifyBlacklist {
    */
   export function extractEvent(logs: Log[]) {
     const [log] = parseEventLogs({
-      abi: tip403RegistryAbi,
+      abi: Abis.tip403Registry,
       logs,
       eventName: 'BlacklistUpdated',
       strict: true,
@@ -852,7 +863,7 @@ export namespace modifyBlacklistSync {
 
   export type ReturnValue = Compute<
     GetEventArgs<
-      typeof tip403RegistryAbi,
+      typeof Abis.tip403Registry,
       'BlacklistUpdated',
       { IndexedOnly: false; Required: true }
     > & {
@@ -888,9 +899,10 @@ export async function getData<chain extends Chain | undefined>(
   client: Client<Transport, chain>,
   parameters: getData.Parameters,
 ): Promise<getData.ReturnValue> {
+  const { policyId, ...rest } = parameters
   const result = await readContract(client, {
-    ...parameters,
-    ...getData.call(parameters),
+    ...rest,
+    ...getData.call({ policyId }),
   })
   return {
     admin: result[1],
@@ -922,8 +934,8 @@ export namespace getData {
   export function call(args: Args) {
     const { policyId } = args
     return defineCall({
-      address: tip403RegistryAddress,
-      abi: tip403RegistryAbi,
+      address: Addresses.tip403Registry,
+      abi: Abis.tip403Registry,
       args: [policyId],
       functionName: 'policyData',
     })
@@ -958,9 +970,10 @@ export async function isAuthorized<chain extends Chain | undefined>(
   client: Client<Transport, chain>,
   parameters: isAuthorized.Parameters,
 ): Promise<isAuthorized.ReturnValue> {
+  const { policyId, user, ...rest } = parameters
   return readContract(client, {
-    ...parameters,
-    ...isAuthorized.call(parameters),
+    ...rest,
+    ...isAuthorized.call({ policyId, user }),
   })
 }
 
@@ -975,7 +988,7 @@ export namespace isAuthorized {
   }
 
   export type ReturnValue = ReadContractReturnType<
-    typeof tip403RegistryAbi,
+    typeof Abis.tip403Registry,
     'isAuthorized',
     never
   >
@@ -989,8 +1002,8 @@ export namespace isAuthorized {
   export function call(args: Args) {
     const { policyId, user } = args
     return defineCall({
-      address: tip403RegistryAddress,
-      abi: tip403RegistryAbi,
+      address: Addresses.tip403Registry,
+      abi: Abis.tip403Registry,
       args: [policyId, user],
       functionName: 'isAuthorized',
     })
@@ -1032,8 +1045,8 @@ export function watchCreate<
   const { onPolicyCreated, ...rest } = parameters
   return watchContractEvent(client, {
     ...rest,
-    address: tip403RegistryAddress,
-    abi: tip403RegistryAbi,
+    address: Addresses.tip403Registry,
+    abi: Abis.tip403Registry,
     eventName: 'PolicyCreated',
     onLogs: (logs) => {
       for (const log of logs)
@@ -1060,13 +1073,13 @@ export declare namespace watchCreate {
     bigint,
     number,
     false,
-    ExtractAbiItem<typeof tip403RegistryAbi, 'PolicyCreated'>,
+    ExtractAbiItem<typeof Abis.tip403Registry, 'PolicyCreated'>,
     true
   >
 
   export type Parameters = UnionOmit<
     WatchContractEventParameters<
-      typeof tip403RegistryAbi,
+      typeof Abis.tip403Registry,
       'PolicyCreated',
       true
     >,
@@ -1112,8 +1125,8 @@ export function watchAdminUpdated<
   const { onAdminUpdated, ...rest } = parameters
   return watchContractEvent(client, {
     ...rest,
-    address: tip403RegistryAddress,
-    abi: tip403RegistryAbi,
+    address: Addresses.tip403Registry,
+    abi: Abis.tip403Registry,
     eventName: 'PolicyAdminUpdated',
     onLogs: (logs) => {
       for (const log of logs) onAdminUpdated(log.args, log)
@@ -1124,7 +1137,7 @@ export function watchAdminUpdated<
 
 export declare namespace watchAdminUpdated {
   export type Args = GetEventArgs<
-    typeof tip403RegistryAbi,
+    typeof Abis.tip403Registry,
     'PolicyAdminUpdated',
     { IndexedOnly: false; Required: true }
   >
@@ -1133,13 +1146,13 @@ export declare namespace watchAdminUpdated {
     bigint,
     number,
     false,
-    ExtractAbiItem<typeof tip403RegistryAbi, 'PolicyAdminUpdated'>,
+    ExtractAbiItem<typeof Abis.tip403Registry, 'PolicyAdminUpdated'>,
     true
   >
 
   export type Parameters = UnionOmit<
     WatchContractEventParameters<
-      typeof tip403RegistryAbi,
+      typeof Abis.tip403Registry,
       'PolicyAdminUpdated',
       true
     >,
@@ -1185,8 +1198,8 @@ export function watchWhitelistUpdated<
   const { onWhitelistUpdated, ...rest } = parameters
   return watchContractEvent(client, {
     ...rest,
-    address: tip403RegistryAddress,
-    abi: tip403RegistryAbi,
+    address: Addresses.tip403Registry,
+    abi: Abis.tip403Registry,
     eventName: 'WhitelistUpdated',
     onLogs: (logs) => {
       for (const log of logs) onWhitelistUpdated(log.args, log)
@@ -1197,7 +1210,7 @@ export function watchWhitelistUpdated<
 
 export declare namespace watchWhitelistUpdated {
   export type Args = GetEventArgs<
-    typeof tip403RegistryAbi,
+    typeof Abis.tip403Registry,
     'WhitelistUpdated',
     { IndexedOnly: false; Required: true }
   >
@@ -1206,13 +1219,13 @@ export declare namespace watchWhitelistUpdated {
     bigint,
     number,
     false,
-    ExtractAbiItem<typeof tip403RegistryAbi, 'WhitelistUpdated'>,
+    ExtractAbiItem<typeof Abis.tip403Registry, 'WhitelistUpdated'>,
     true
   >
 
   export type Parameters = UnionOmit<
     WatchContractEventParameters<
-      typeof tip403RegistryAbi,
+      typeof Abis.tip403Registry,
       'WhitelistUpdated',
       true
     >,
@@ -1258,8 +1271,8 @@ export function watchBlacklistUpdated<
   const { onBlacklistUpdated, ...rest } = parameters
   return watchContractEvent(client, {
     ...rest,
-    address: tip403RegistryAddress,
-    abi: tip403RegistryAbi,
+    address: Addresses.tip403Registry,
+    abi: Abis.tip403Registry,
     eventName: 'BlacklistUpdated',
     onLogs: (logs) => {
       for (const log of logs) onBlacklistUpdated(log.args, log)
@@ -1270,7 +1283,7 @@ export function watchBlacklistUpdated<
 
 export declare namespace watchBlacklistUpdated {
   export type Args = GetEventArgs<
-    typeof tip403RegistryAbi,
+    typeof Abis.tip403Registry,
     'BlacklistUpdated',
     { IndexedOnly: false; Required: true }
   >
@@ -1279,13 +1292,13 @@ export declare namespace watchBlacklistUpdated {
     bigint,
     number,
     false,
-    ExtractAbiItem<typeof tip403RegistryAbi, 'BlacklistUpdated'>,
+    ExtractAbiItem<typeof Abis.tip403Registry, 'BlacklistUpdated'>,
     true
   >
 
   export type Parameters = UnionOmit<
     WatchContractEventParameters<
-      typeof tip403RegistryAbi,
+      typeof Abis.tip403Registry,
       'BlacklistUpdated',
       true
     >,