reverse-mirage - npm Package Compare versions

Comparing version 1.0.0-next.0 to 1.0.0-next.1

dist/index.js

@@ -910,11 +910,13 @@ // src/amount/utils.ts
 import { readContract } from "viem/contract";
-var getERC20Decimals = (client, args, type) => type === void 0 ? readContract(client, {
+var getERC20Decimals = (client, { erc20, ...request }, type) => type === void 0 ? readContract(client, {
   abi: solmateErc20ABI,
-  address: args.erc20.address,
-  functionName: "decimals"
+  address: erc20.address,
+  functionName: "decimals",
+  ...request
 }) : {
   read: () => readContract(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
-    functionName: "decimals"
+    address: erc20.address,
+    functionName: "decimals",
+    ...request
   }),
@@ -926,11 +928,13 @@ parse: (data) => data
 import { readContract as readContract2 } from "viem/contract";
-var getERC20Name = (client, args, type) => type === void 0 ? readContract2(client, {
+var getERC20Name = (client, { erc20, ...request }, type) => type === void 0 ? readContract2(client, {
   abi: solmateErc20ABI,
-  address: args.erc20.address,
-  functionName: "name"
+  address: erc20.address,
+  functionName: "name",
+  ...request
 }) : {
   read: () => readContract2(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
-    functionName: "name"
+    address: erc20.address,
+    functionName: "name",
+    ...request
   }),
@@ -942,11 +946,13 @@ parse: (data) => data
 import { readContract as readContract3 } from "viem/contract";
-var getERC20Symbol = (client, args, type) => type === void 0 ? readContract3(client, {
+var getERC20Symbol = (client, { erc20, ...request }, type) => type === void 0 ? readContract3(client, {
   abi: solmateErc20ABI,
-  address: args.erc20.address,
-  functionName: "symbol"
+  address: erc20.address,
+  functionName: "symbol",
+  ...request
 }) : {
   read: () => readContract3(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
-    functionName: "symbol"
+    address: erc20.address,
+    functionName: "symbol",
+    ...request
   }),
@@ -957,28 +963,28 @@ parse: (data) => data
 // src/erc20/publicActions/getERC20.ts
-var getERC20 = (client, args, type) => type === void 0 ? Promise.all([
-  getERC20Name(client, args),
-  getERC20Symbol(client, args),
-  getERC20Decimals(client, args)
+var getERC20 = (client, { erc20, ...request }, type) => type === void 0 ? Promise.all([
+  getERC20Name(client, { erc20, ...request }),
+  getERC20Symbol(client, { erc20, ...request }),
+  getERC20Decimals(client, { erc20, ...request })
 ]).then(
   ([name, symbol, decimals]) => createERC20(
-    args.erc20.address,
+    erc20.address,
     name,
     symbol,
     decimals,
-    args.erc20.chainID,
-    args.erc20.blockCreated
+    erc20.chainID,
+    erc20.blockCreated
   )
 ) : {
   read: () => Promise.all([
-    getERC20Name(client, args, "select").read(),
-    getERC20Symbol(client, args, "select").read(),
-    getERC20Decimals(client, args, "select").read()
+    getERC20Name(client, { erc20, ...request }, "select").read(),
+    getERC20Symbol(client, { erc20, ...request }, "select").read(),
+    getERC20Decimals(client, { erc20, ...request }, "select").read()
   ]),
   parse: ([name, symbol, decimals]) => createERC20(
-    args.erc20.address,
+    erc20.address,
     name,
     symbol,
     decimals,
-    args.erc20.chainID,
-    args.erc20.blockCreated
+    erc20.chainID,
+    erc20.blockCreated
   )
@@ -989,15 +995,17 @@ };
 import { readContract as readContract4 } from "viem/contract";
-var getERC20Allowance = (client, args, type) => type === void 0 ? readContract4(client, {
+var getERC20Allowance = (client, { erc20, owner, spender, ...request }, type) => type === void 0 ? readContract4(client, {
   abi: solmateErc20ABI,
-  address: args.erc20.address,
+  address: erc20.address,
   functionName: "allowance",
-  args: [args.owner, args.spender]
-}).then((data) => createAmountFromRaw(args.erc20, data)) : {
+  args: [owner, spender],
+  ...request
+}).then((data) => createAmountFromRaw(erc20, data)) : {
   read: () => readContract4(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
+    address: erc20.address,
     functionName: "allowance",
-    args: [args.owner, args.spender]
+    args: [owner, spender],
+    ...request
   }),
-  parse: (data) => createAmountFromRaw(args.erc20, data)
+  parse: (data) => createAmountFromRaw(erc20, data)
 };
@@ -1007,15 +1015,17 @@
 import { readContract as readContract5 } from "viem/contract";
-var getERC20BalanceOf = (client, args, type) => type === void 0 ? readContract5(client, {
+var getERC20BalanceOf = (client, { erc20, address, ...request }, type) => type === void 0 ? readContract5(client, {
   abi: solmateErc20ABI,
-  address: args.erc20.address,
+  address: erc20.address,
   functionName: "balanceOf",
-  args: [args.address]
-}).then((data) => createAmountFromRaw(args.erc20, data)) : {
+  args: [address],
+  ...request
+}).then((data) => createAmountFromRaw(erc20, data)) : {
   read: () => readContract5(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
+    address: erc20.address,
     functionName: "balanceOf",
-    args: [args.address]
+    args: [address],
+    ...request
   }),
-  parse: (data) => createAmountFromRaw(args.erc20, data)
+  parse: (data) => createAmountFromRaw(erc20, data)
 };
@@ -1025,11 +1035,13 @@
 import { readContract as readContract6 } from "viem/contract";
-var getERC20DomainSeparator = (client, args, type) => type === void 0 ? readContract6(client, {
+var getERC20DomainSeparator = (client, { erc20, ...request }, type) => type === void 0 ? readContract6(client, {
   abi: solmateErc20ABI,
-  address: args.erc20.address,
-  functionName: "DOMAIN_SEPARATOR"
+  address: erc20.address,
+  functionName: "DOMAIN_SEPARATOR",
+  ...request
 }) : {
   read: () => readContract6(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
-    functionName: "DOMAIN_SEPARATOR"
+    address: erc20.address,
+    functionName: "DOMAIN_SEPARATOR",
+    ...request
   }),
@@ -1040,30 +1052,30 @@ parse: (data) => data
 // src/erc20/publicActions/getERC20Permit.ts
-var getERC20Permit = (client, args, type) => type === void 0 ? Promise.all([
-  getERC20Name(client, args),
-  getERC20Symbol(client, args),
-  getERC20Decimals(client, args)
+var getERC20Permit = (client, { erc20, ...request }, type) => type === void 0 ? Promise.all([
+  getERC20Name(client, { erc20, ...request }),
+  getERC20Symbol(client, { erc20, ...request }),
+  getERC20Decimals(client, { erc20, ...request })
 ]).then(
   ([name, symbol, decimals]) => createERC20Permit(
-    args.erc20.address,
+    erc20.address,
     name,
     symbol,
     decimals,
-    args.erc20.version ?? "1",
-    args.erc20.chainID,
-    args.erc20.blockCreated
+    erc20.version ?? "1",
+    erc20.chainID,
+    erc20.blockCreated
   )
 ) : {
   read: () => Promise.all([
-    getERC20Name(client, args, "select").read(),
-    getERC20Symbol(client, args, "select").read(),
-    getERC20Decimals(client, args, "select").read()
+    getERC20Name(client, { erc20, ...request }, "select").read(),
+    getERC20Symbol(client, { erc20, ...request }, "select").read(),
+    getERC20Decimals(client, { erc20, ...request }, "select").read()
   ]),
   parse: ([name, symbol, decimals]) => createERC20Permit(
-    args.erc20.address,
+    erc20.address,
     name,
     symbol,
     decimals,
-    args.erc20.version ?? "1",
-    args.erc20.chainID,
-    args.erc20.blockCreated
+    erc20.version ?? "1",
+    erc20.chainID,
+    erc20.blockCreated
   )
@@ -1074,17 +1086,19 @@ };
 import { readContract as readContract7 } from "viem/contract";
-var getERC20PermitData = (client, args, type) => type === void 0 ? Promise.all([
+var getERC20PermitData = (client, { erc20, address, ...request }, type) => type === void 0 ? Promise.all([
   readContract7(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
+    address: erc20.address,
     functionName: "balanceOf",
-    args: [args.address]
+    args: [address],
+    ...request
   }),
   readContract7(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
+    address: erc20.address,
     functionName: "nonces",
-    args: [args.address]
+    args: [address],
+    ...request
   })
 ]).then(
-  ([balance, nonce]) => createERC20PermitDataFromRaw(args.erc20, balance, nonce)
+  ([balance, nonce]) => createERC20PermitDataFromRaw(erc20, balance, nonce)
 ) : {
@@ -1094,14 +1108,16 @@ read: () => Promise.all([
       abi: solmateErc20ABI,
-      address: args.erc20.address,
+      address: erc20.address,
       functionName: "balanceOf",
-      args: [args.address]
+      args: [address],
+      ...request
     }),
     readContract7(client, {
       abi: solmateErc20ABI,
-      address: args.erc20.address,
+      address: erc20.address,
       functionName: "nonces",
-      args: [args.address]
+      args: [address],
+      ...request
     })
   ]),
-  parse: ([balance, nonce]) => createERC20PermitDataFromRaw(args.erc20, balance, nonce)
+  parse: ([balance, nonce]) => createERC20PermitDataFromRaw(erc20, balance, nonce)
 };
@@ -1111,13 +1127,15 @@
 import { readContract as readContract8 } from "viem/contract";
-var getERC20PermitNonce = (client, args, type) => type === void 0 ? readContract8(client, {
+var getERC20PermitNonce = (client, { erc20, address, ...request }, type) => type === void 0 ? readContract8(client, {
   abi: solmateErc20ABI,
-  address: args.erc20.address,
+  address: erc20.address,
   functionName: "nonces",
-  args: [args.address]
+  args: [address],
+  ...request
 }) : {
   read: () => readContract8(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
+    address: erc20.address,
     functionName: "nonces",
-    args: [args.address]
+    args: [address],
+    ...request
   }),
@@ -1129,45 +1147,53 @@ parse: (data) => data
 import { readContract as readContract9 } from "viem/contract";
-var getERC20TotalSupply = (client, args, type) => type === void 0 ? readContract9(client, {
+var getERC20TotalSupply = (client, { erc20, ...request }, type) => type === void 0 ? readContract9(client, {
   abi: solmateErc20ABI,
-  address: args.erc20.address,
-  functionName: "totalSupply"
-}).then((data) => createAmountFromRaw(args.erc20, data)) : {
+  address: erc20.address,
+  functionName: "totalSupply",
+  ...request
+}).then((data) => createAmountFromRaw(erc20, data)) : {
   read: () => readContract9(client, {
     abi: solmateErc20ABI,
-    address: args.erc20.address,
-    functionName: "totalSupply"
+    address: erc20.address,
+    functionName: "totalSupply",
+    ...request
   }),
-  parse: (data) => createAmountFromRaw(args.erc20, data)
+  parse: (data) => createAmountFromRaw(erc20, data)
 };
 
 // src/erc20/publicActions/getIsERC20Permit.ts
-var getIsERC20Permit = (client, args, type) => type === void 0 ? Promise.all([
-  getERC20Permit(client, args),
-  getERC20DomainSeparator(client, args)
-]).then(([erc20]) => erc20).catch(() => getERC20(client, args)) : {
+var getIsERC20Permit = (client, { erc20, ...request }, type) => type === void 0 ? Promise.all([
+  getERC20Permit(client, { erc20, ...request }),
+  getERC20DomainSeparator(client, { erc20, ...request })
+]).then(([erc202]) => erc202).catch(() => getERC20(client, { erc20, ...request })) : {
   read: async () => {
     try {
       return await Promise.all([
-        getERC20Permit(client, args, "select").read(),
-        getERC20DomainSeparator(client, args, "select").read()
+        getERC20Permit(client, { erc20, ...request }, "select").read(),
+        getERC20DomainSeparator(
+          client,
+          { erc20, ...request },
+          "select"
+        ).read()
       ]);
     } catch {
-      return await Promise.all([getERC20(client, args, "select").read()]);
+      return await Promise.all([
+        getERC20(client, { erc20, ...request }, "select").read()
+      ]);
     }
   },
   parse: (data) => data.length === 1 ? createERC20(
-    args.erc20.address,
+    erc20.address,
     data[0][0],
     data[0][1],
     data[0][2],
-    args.erc20.chainID,
-    args.erc20.blockCreated
+    erc20.chainID,
+    erc20.blockCreated
   ) : createERC20Permit(
-    args.erc20.address,
+    erc20.address,
     data[0][0],
     data[0][1],
     data[0][2],
-    args.erc20.version ?? "1",
-    args.erc20.chainID,
-    args.erc20.blockCreated
+    erc20.version ?? "1",
+    erc20.chainID,
+    erc20.blockCreated
   )
@@ -1185,3 +1211,4 @@ };
   deadline,
-  account = client.account
+  account = client.account,
+  ...request
 }) => {
@@ -1206,3 +1233,4 @@ const domain = {
     },
-    account
+    account,
+    ...request
   });
@@ -1270,3 +1298,3 @@ };
 import { getAddress as getAddress4 } from "viem";
-var createERC721 = (address, name, symbol, id, tokenURI, chainID, blockCreated = 0n) => ({
+var createERC721 = (address, name, symbol, chainID, blockCreated = 0n) => ({
   type: "erc721",
@@ -1276,12 +1304,5 @@ address: getAddress4(address),
   symbol,
-  id,
-  tokenURI,
   chainID,
   blockCreated
 });
-var createERC721IDData = (erc721, owned) => ({
-  type: `${erc721.type}IDData`,
-  token: erc721,
-  owned
-});
 var createERC721Data = (erc721, balance, ids) => ({
@@ -1296,11 +1317,13 @@ type: `${erc721.type}Data`,
 import { readContract as readContract10 } from "viem/contract";
-var getERC721Name = (client, args, type) => type === void 0 ? readContract10(client, {
+var getERC721Name = (client, { erc721, ...request }, type) => type === void 0 ? readContract10(client, {
   abi: solmateErc721ABI,
-  address: args.erc721.address,
-  functionName: "name"
+  address: erc721.address,
+  functionName: "name",
+  ...request
 }) : {
   read: () => readContract10(client, {
     abi: solmateErc721ABI,
-    address: args.erc721.address,
-    functionName: "name"
+    address: erc721.address,
+    functionName: "name",
+    ...request
   }),
@@ -1312,11 +1335,13 @@ parse: (data) => data
 import { readContract as readContract11 } from "viem/contract";
-var getERC721Symbol = (client, args, type) => type === void 0 ? readContract11(client, {
+var getERC721Symbol = (client, { erc721, ...request }, type) => type === void 0 ? readContract11(client, {
   abi: solmateErc721ABI,
-  address: args.erc721.address,
-  functionName: "symbol"
+  address: erc721.address,
+  functionName: "symbol",
+  ...request
 }) : {
   read: () => readContract11(client, {
     abi: solmateErc721ABI,
-    address: args.erc721.address,
-    functionName: "symbol"
+    address: erc721.address,
+    functionName: "symbol",
+    ...request
   }),
@@ -1326,48 +1351,25 @@ parse: (data) => data
 
-// src/erc721/publicActions/getERC721TokenURI.ts
-import { readContract as readContract12 } from "viem/contract";
-var getERC721TokenURI = (client, args, type) => type === void 0 ? readContract12(client, {
-  abi: solmateErc721ABI,
-  address: args.erc721.address,
-  functionName: "tokenURI",
-  args: [args.erc721.id]
-}) : {
-  read: () => readContract12(client, {
-    abi: solmateErc721ABI,
-    address: args.erc721.address,
-    functionName: "tokenURI",
-    args: [args.erc721.id]
-  }),
-  parse: (data) => data
-};
-
 // src/erc721/publicActions/getERC721.ts
-var getERC721 = (client, args, type) => type === void 0 ? Promise.all([
-  getERC721Name(client, args),
-  getERC721Symbol(client, args),
-  getERC721TokenURI(client, args)
+var getERC721 = (client, { erc721, ...request }, type) => type === void 0 ? Promise.all([
+  getERC721Name(client, { erc721, ...request }),
+  getERC721Symbol(client, { erc721, ...request })
 ]).then(
-  ([name, symbol, tokenURI]) => createERC721(
-    args.erc721.address,
+  ([name, symbol]) => createERC721(
+    erc721.address,
     name,
     symbol,
-    args.erc721.id,
-    tokenURI,
-    args.erc721.chainID,
-    args.blockNumber
+    erc721.chainID,
+    erc721.blockCreated
   )
 ) : {
   read: () => Promise.all([
-    getERC721Name(client, args, "select").read(),
-    getERC721Symbol(client, args, "select").read(),
-    getERC721TokenURI(client, args, "select").read()
+    getERC721Name(client, { erc721, ...request }, "select").read(),
+    getERC721Symbol(client, { erc721, ...request }, "select").read()
   ]),
-  parse: ([name, symbol, tokenURI]) => createERC721(
-    args.erc721.address,
+  parse: ([name, symbol]) => createERC721(
+    erc721.address,
     name,
     symbol,
-    args.erc721.id,
-    tokenURI,
-    args.erc721.chainID,
-    args.blockNumber
+    erc721.chainID,
+    erc721.blockCreated
   )
@@ -1377,14 +1379,16 @@ };
 // src/erc721/publicActions/getERC721Approved.ts
-import { readContract as readContract13 } from "viem/contract";
-var getERC721Approved = (client, args, type) => type === void 0 ? readContract13(client, {
+import { readContract as readContract12 } from "viem/contract";
+var getERC721Approved = (client, { erc721, id, ...request }, type) => type === void 0 ? readContract12(client, {
   abi: solmateErc721ABI,
-  address: args.erc721.address,
+  address: erc721.address,
   functionName: "getApproved",
-  args: [args.erc721.id]
+  args: [id],
+  ...request
 }) : {
-  read: () => readContract13(client, {
+  read: () => readContract12(client, {
     abi: solmateErc721ABI,
-    address: args.erc721.address,
+    address: erc721.address,
     functionName: "getApproved",
-    args: [args.erc721.id]
+    args: [id],
+    ...request
   }),
@@ -1395,14 +1399,16 @@ parse: (data) => data
 // src/erc721/publicActions/getERC721BalanceOf.ts
-import { readContract as readContract14 } from "viem/contract";
-var getERC721BalanceOf = (client, args, type) => type === void 0 ? readContract14(client, {
+import { readContract as readContract13 } from "viem/contract";
+var getERC721BalanceOf = (client, { erc721, address, ...request }, type) => type === void 0 ? readContract13(client, {
   abi: solmateErc721ABI,
-  address: args.erc721.address,
+  address: erc721.address,
   functionName: "balanceOf",
-  args: [args.address]
+  args: [address],
+  ...request
 }) : {
-  read: () => readContract14(client, {
+  read: () => readContract13(client, {
     abi: solmateErc721ABI,
-    address: args.erc721.address,
+    address: erc721.address,
     functionName: "balanceOf",
-    args: [args.address]
+    args: [address],
+    ...request
   }),
@@ -1413,45 +1419,36 @@ parse: (data) => data
 // src/erc721/publicActions/getERC721Data.ts
-var getERC721Data = (client, args, type) => type === void 0 ? getERC721BalanceOf(client, args).then((data) => {
-  if (data > Number.MAX_SAFE_INTEGER)
-    throw Error("balance exceeds maximum representable number");
-  return createERC721Data(args.erc721, Number(data));
-}) : {
-  read: () => getERC721BalanceOf(client, args, "select").read(),
+var getERC721Data = (client, { erc721, address, ...request }, type) => type === void 0 ? getERC721BalanceOf(client, { erc721, address, ...request }).then(
+  (data) => {
+    if (data > Number.MAX_SAFE_INTEGER)
+      throw Error("balance exceeds maximum representable number");
+    return createERC721Data(erc721, Number(data));
+  }
+) : {
+  read: () => getERC721BalanceOf(
+    client,
+    { erc721, address, ...request },
+    "select"
+  ).read(),
   parse: (data) => {
     if (data > Number.MAX_SAFE_INTEGER)
       throw Error("balance exceeds maximum representable number");
-    return createERC721Data(args.erc721, Number(data));
+    return createERC721Data(erc721, Number(data));
   }
 };
 
-// src/erc721/publicActions/getERC721IDData.ts
-import { readContract as readContract15 } from "viem/contract";
-var getERC721IDData = (client, args, type) => type === void 0 ? readContract15(client, {
-  abi: solmateErc721ABI,
-  address: args.erc721.address,
-  functionName: "ownerOf",
-  args: [args.erc721.id]
-}).then((data) => data === args.address) : {
-  read: () => readContract15(client, {
-    abi: solmateErc721ABI,
-    address: args.erc721.address,
-    functionName: "ownerOf",
-    args: [args.erc721.id]
-  }),
-  parse: (data) => data === args.address
-};
-
 // src/erc721/publicActions/getERC721IsApprovedForAll.ts
-import { readContract as readContract16 } from "viem/contract";
-var getERC721IsApprovedForAll = (client, args, type) => type === void 0 ? readContract16(client, {
+import { readContract as readContract14 } from "viem/contract";
+var getERC721IsApprovedForAll = (client, { erc721, owner, spender, ...request }, type) => type === void 0 ? readContract14(client, {
   abi: solmateErc721ABI,
-  address: args.erc721.address,
+  address: erc721.address,
   functionName: "isApprovedForAll",
-  args: [args.owner, args.spender]
+  args: [owner, spender],
+  ...request
 }) : {
-  read: () => readContract16(client, {
+  read: () => readContract14(client, {
     abi: solmateErc721ABI,
-    address: args.erc721.address,
+    address: erc721.address,
     functionName: "isApprovedForAll",
-    args: [args.owner, args.spender]
+    args: [owner, spender],
+    ...request
   }),
@@ -1462,14 +1459,16 @@ parse: (data) => data
 // src/erc721/publicActions/getERC721OwnerOf.ts
-import { readContract as readContract17 } from "viem/contract";
-var getERC721OwnerOf = (client, args, type) => type === void 0 ? readContract17(client, {
+import { readContract as readContract15 } from "viem/contract";
+var getERC721OwnerOf = (client, { erc721, id, ...request }, type) => type === void 0 ? readContract15(client, {
   abi: solmateErc721ABI,
-  address: args.erc721.address,
+  address: erc721.address,
   functionName: "ownerOf",
-  args: [args.erc721.id]
+  args: [id],
+  ...request
 }) : {
-  read: () => readContract17(client, {
+  read: () => readContract15(client, {
     abi: solmateErc721ABI,
-    address: args.erc721.address,
+    address: erc721.address,
     functionName: "ownerOf",
-    args: [args.erc721.id]
+    args: [id],
+    ...request
   }),
@@ -1480,14 +1479,16 @@ parse: (data) => data
 // src/erc721/publicActions/getERC721SupportsInterface.ts
-import { readContract as readContract18 } from "viem/contract";
-var getERC721SupportsInterface = (client, args, type) => type === void 0 ? readContract18(client, {
+import { readContract as readContract16 } from "viem/contract";
+var getERC721SupportsInterface = (client, { erc721, interfaceID, ...request }, type) => type === void 0 ? readContract16(client, {
   abi: solmateErc721ABI,
-  address: args.erc721.address,
+  address: erc721.address,
   functionName: "supportsInterface",
-  args: [args.interfaceID]
+  args: [interfaceID],
+  ...request
 }) : {
-  read: () => readContract18(client, {
+  read: () => readContract16(client, {
     abi: solmateErc721ABI,
-    address: args.erc721.address,
+    address: erc721.address,
     functionName: "supportsInterface",
-    args: [args.interfaceID]
+    args: [interfaceID],
+    ...request
   }),
@@ -1497,6 +1498,25 @@ parse: (data) => data
 
+// src/erc721/publicActions/getERC721TokenURI.ts
+import { readContract as readContract17 } from "viem/contract";
+var getERC721TokenURI = (client, { erc721, id, ...request }, type) => type === void 0 ? readContract17(client, {
+  abi: solmateErc721ABI,
+  address: erc721.address,
+  functionName: "tokenURI",
+  args: [id],
+  ...request
+}) : {
+  read: () => readContract17(client, {
+    abi: solmateErc721ABI,
+    address: erc721.address,
+    functionName: "tokenURI",
+    args: [id],
+    ...request
+  }),
+  parse: (data) => data
+};
+
 // src/erc721/walletActions/simulateERC721Transfer.ts
 import { simulateContract as simulateContract5 } from "viem/contract";
 var simulateERC721Transfer = (client, {
-  args: { erc721, from, to, data },
+  args: { erc721, from, to, data, id },
   ...request
@@ -1510,3 +1530,3 @@ }) => data === void 0 ? simulateContract5(client, {
     to,
-    erc721.id
+    id
   ],
@@ -1521,3 +1541,3 @@ ...request
     to,
-    erc721.id
+    id
   ],
@@ -1532,3 +1552,3 @@ ...request
     to,
-    erc721.id,
+    id,
     data
@@ -1542,3 +1562,3 @@ ],
 var simulateERC721Approve = (client, {
-  args: { erc721, spender },
+  args: { erc721, spender, id },
   ...request
@@ -1549,3 +1569,3 @@ }) => simulateContract6(client, {
   functionName: "approve",
-  args: [spender, erc721.id],
+  args: [spender, id],
   ...request
@@ -1584,29 +1604,31 @@ });
 // src/erc1155/publicActions/getERC1155.ts
-import { readContract as readContract19 } from "viem/contract";
-var getERC1155 = (client, args, type) => type === void 0 ? readContract19(client, {
+import { readContract as readContract18 } from "viem/contract";
+var getERC1155 = (client, { erc1155, ...request }, type) => type === void 0 ? readContract18(client, {
   abi: solmateErc1155ABI,
-  address: args.erc1155.address,
+  address: erc1155.address,
   functionName: "uri",
-  args: [args.erc1155.id]
+  args: [erc1155.id],
+  ...request
 }).then(
   (data) => createERC1155(
-    args.erc1155.address,
-    args.erc1155.id,
+    erc1155.address,
+    erc1155.id,
     data,
-    args.erc1155.chainID,
-    args.blockNumber
+    erc1155.chainID,
+    erc1155.blockCreated
   )
 ) : {
-  read: () => readContract19(client, {
+  read: () => readContract18(client, {
     abi: solmateErc1155ABI,
-    address: args.erc1155.address,
+    address: erc1155.address,
     functionName: "uri",
-    args: [args.erc1155.id]
+    args: [erc1155.id],
+    ...request
   }),
   parse: (data) => createERC1155(
-    args.erc1155.address,
-    args.erc1155.id,
+    erc1155.address,
+    erc1155.id,
     data,
-    args.erc1155.chainID,
-    args.blockNumber
+    erc1155.chainID,
+    erc1155.blockCreated
   )
@@ -1616,31 +1638,35 @@ };
 // src/erc1155/publicActions/getERC1155BalanceOf.ts
-import { readContract as readContract20 } from "viem/contract";
-var getERC1155BalanceOf = (client, args, type) => type === void 0 ? readContract20(client, {
+import { readContract as readContract19 } from "viem/contract";
+var getERC1155BalanceOf = (client, { erc1155, address, ...request }, type) => type === void 0 ? readContract19(client, {
   abi: solmateErc1155ABI,
-  address: args.erc1155.address,
+  address: erc1155.address,
   functionName: "balanceOf",
-  args: [args.address, args.erc1155.id]
-}).then((data) => createERC1155Data(args.erc1155, data)) : {
-  read: () => readContract20(client, {
+  args: [address, erc1155.id],
+  ...request
+}).then((data) => createERC1155Data(erc1155, data)) : {
+  read: () => readContract19(client, {
     abi: solmateErc1155ABI,
-    address: args.erc1155.address,
+    address: erc1155.address,
     functionName: "balanceOf",
-    args: [args.address, args.erc1155.id]
+    args: [address, erc1155.id],
+    ...request
   }),
-  parse: (data) => createERC1155Data(args.erc1155, data)
+  parse: (data) => createERC1155Data(erc1155, data)
 };
 
 // src/erc1155/publicActions/getERC1155IsApprovedForAll.ts
-import { readContract as readContract21 } from "viem/contract";
-var getERC1155IsApprovedForAll = (client, args, type) => type === void 0 ? readContract21(client, {
+import { readContract as readContract20 } from "viem/contract";
+var getERC1155IsApprovedForAll = (client, { erc1155, owner, spender, ...request }, type) => type === void 0 ? readContract20(client, {
   abi: solmateErc1155ABI,
-  address: args.erc1155.address,
+  address: erc1155.address,
   functionName: "isApprovedForAll",
-  args: [args.owner, args.spender]
+  args: [owner, spender],
+  ...request
 }) : {
-  read: () => readContract21(client, {
+  read: () => readContract20(client, {
     abi: solmateErc1155ABI,
-    address: args.erc1155.address,
+    address: erc1155.address,
     functionName: "isApprovedForAll",
-    args: [args.owner, args.spender]
+    args: [owner, spender],
+    ...request
   }),
@@ -1651,14 +1677,16 @@ parse: (data) => data
 // src/erc1155/publicActions/getERC1155URI.ts
-import { readContract as readContract22 } from "viem/contract";
-var getERC1155URI = (client, args, type) => type === void 0 ? readContract22(client, {
+import { readContract as readContract21 } from "viem/contract";
+var getERC1155URI = (client, { erc1155, ...request }, type) => type === void 0 ? readContract21(client, {
   abi: solmateErc1155ABI,
-  address: args.erc1155.address,
+  address: erc1155.address,
   functionName: "uri",
-  args: [args.erc1155.id]
+  args: [erc1155.id],
+  ...request
 }) : {
-  read: () => readContract22(client, {
+  read: () => readContract21(client, {
     abi: solmateErc1155ABI,
-    address: args.erc1155.address,
+    address: erc1155.address,
     functionName: "uri",
-    args: [args.erc1155.id]
+    args: [erc1155.id],
+    ...request
   }),
@@ -1795,7 +1823,11 @@ parse: (data) => data
 import { getBalance } from "viem/actions";
-var getNativeBalance = (client, args, type) => type === void 0 ? getBalance(client, { address: args.address }).then(
-  (data) => createAmountFromRaw(args.nativeCurrency, data)
+var getNativeBalance = (client, {
+  address,
+  nativeCurrency,
+  ...request
+}, type) => type === void 0 ? getBalance(client, { address, ...request }).then(
+  (data) => createAmountFromRaw(nativeCurrency, data)
 ) : {
-  read: () => getBalance(client, { address: args.address }),
-  parse: (data) => createAmountFromRaw(args.nativeCurrency, data)
+  read: () => getBalance(client, { address, ...request }),
+  parse: (data) => createAmountFromRaw(nativeCurrency, data)
 };
@@ -2004,3 +2036,2 @@
   createERC721Data,
-  createERC721IDData,
   createFraction,
@@ -2043,3 +2074,2 @@ createNativeCurrency,
   getERC721Data,
-  getERC721IDData,
   getERC721IsApprovedForAll,
@@ -2046,0 +2076,0 @@ getERC721Name,

package.json

 {
   "name": "reverse-mirage",
-  "version": "1.0.0-next.0",
+  "version": "1.0.0-next.1",
   "description": "Application level typescript utilities for Ethereum",
@@ -5,0 +5,0 @@ "type": "module",

src/erc1155/index.ts

 export type {
+  BaseERC1155,
   ERC1155,
@@ -3,0 +4,0 @@ ERC1155Data,

src/erc1155/publicActions/getERC1155.ts

@@ -5,3 +5,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC1155 } from "../types.js";
+import type { BaseERC1155 } from "../types.js";
 import { createERC1155 } from "../utils.js";
@@ -13,7 +13,7 @@
 > & {
-  erc1155: Pick<ERC1155, "address" | "id" | "chainID"> &
-    Partial<Pick<ERC1155, "blockCreated">>;
+  erc1155: Pick<BaseERC1155, "address" | "id" | "chainID"> &
+    Partial<Pick<BaseERC1155, "blockCreated">>;
 };
 
-export type GetERC1155ReturnType = ERC1155;
+export type GetERC1155ReturnType = BaseERC1155;
 
@@ -25,3 +25,3 @@ export const getERC1155 = <
   client: Client<Transport, TChain>,
-  args: GetERC1155Parameters,
+  { erc1155, ...request }: GetERC1155Parameters,
   type?: T,
@@ -32,12 +32,13 @@ ): ReverseMirage<string, GetERC1155ReturnType, T> =>
         abi: solmateERC1155ABI,
-        address: args.erc1155.address,
+        address: erc1155.address,
         functionName: "uri",
-        args: [args.erc1155.id],
+        args: [erc1155.id],
+        ...request,
       }).then((data) =>
         createERC1155(
-          args.erc1155.address,
-          args.erc1155.id,
+          erc1155.address,
+          erc1155.id,
           data,
-          args.erc1155.chainID,
-          args.blockNumber,
+          erc1155.chainID,
+          erc1155.blockCreated,
         ),
@@ -49,14 +50,15 @@ )
             abi: solmateERC1155ABI,
-            address: args.erc1155.address,
+            address: erc1155.address,
             functionName: "uri",
-            args: [args.erc1155.id],
+            args: [erc1155.id],
+            ...request,
           }),
         parse: (data) =>
           createERC1155(
-            args.erc1155.address,
-            args.erc1155.id,
+            erc1155.address,
+            erc1155.id,
             data,
-            args.erc1155.chainID,
-            args.blockNumber,
+            erc1155.chainID,
+            erc1155.blockCreated,
           ),
       }) as ReverseMirage<string, GetERC1155ReturnType, T>;

src/erc1155/publicActions/getERC1155BalanceOf.ts

@@ -11,6 +11,6 @@ import type {
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC1155, ERC1155Data } from "../types.js";
+import type { BaseERC1155, ERC1155Data } from "../types.js";
 import { createERC1155Data } from "../utils.js";
 
-export type GetERC1155BalanceOfParameters<TERC1155 extends ERC1155> = Omit<
+export type GetERC1155BalanceOfParameters<TERC1155 extends BaseERC1155> = Omit<
   ReadContractParameters<typeof solmateERC1155ABI, "balanceOf">,
@@ -20,3 +20,3 @@ "address" | "abi" | "functionName" | "args"
 
-export type GetERC1155BalanceOfReturnType<TERC1155 extends ERC1155> =
+export type GetERC1155BalanceOfReturnType<TERC1155 extends BaseERC1155> =
   ERC1155Data<TERC1155>;
@@ -26,7 +26,7 @@
   TChain extends Chain | undefined,
-  TERC1155 extends ERC1155,
+  TERC1155 extends BaseERC1155,
   T extends "select" | undefined,
 >(
   client: Client<Transport, TChain>,
-  args: GetERC1155BalanceOfParameters<TERC1155>,
+  { erc1155, address, ...request }: GetERC1155BalanceOfParameters<TERC1155>,
   type?: T,
@@ -37,6 +37,7 @@ ): ReverseMirage<bigint, GetERC1155BalanceOfReturnType<TERC1155>, T> =>
         abi: solmateERC1155ABI,
-        address: args.erc1155.address,
+        address: erc1155.address,
         functionName: "balanceOf",
-        args: [args.address, args.erc1155.id],
-      }).then((data) => createERC1155Data(args.erc1155, data))
+        args: [address, erc1155.id],
+        ...request,
+      }).then((data) => createERC1155Data(erc1155, data))
     : {
@@ -46,7 +47,8 @@ read: () =>
             abi: solmateERC1155ABI,
-            address: args.erc1155.address,
+            address: erc1155.address,
             functionName: "balanceOf",
-            args: [args.address, args.erc1155.id],
+            args: [address, erc1155.id],
+            ...request,
           }),
-        parse: (data) => createERC1155Data(args.erc1155, data),
+        parse: (data) => createERC1155Data(erc1155, data),
       }) as ReverseMirage<bigint, GetERC1155BalanceOfReturnType<TERC1155>, T>;

src/erc1155/publicActions/getERC1155IsApprovedForAll.ts

@@ -11,3 +11,3 @@ import type {
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC1155 } from "../types.js";
+import type { BaseERC1155 } from "../types.js";
 
@@ -17,3 +17,3 @@ export type GetERC1155IsApprovedForAllParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc1155: Pick<ERC1155, "address">; owner: Address; spender: Address };
+> & { erc1155: Pick<BaseERC1155, "address">; owner: Address; spender: Address };
 
@@ -27,3 +27,3 @@ export type GetERC1155IsApprovedForAllReturnType = boolean;
   client: Client<Transport, TChain>,
-  args: GetERC1155IsApprovedForAllParameters,
+  { erc1155, owner, spender, ...request }: GetERC1155IsApprovedForAllParameters,
   type?: T,
@@ -34,5 +34,6 @@ ): ReverseMirage<boolean, GetERC1155IsApprovedForAllReturnType, T> =>
         abi: solmateERC1155ABI,
-        address: args.erc1155.address,
+        address: erc1155.address,
         functionName: "isApprovedForAll",
-        args: [args.owner, args.spender],
+        args: [owner, spender],
+        ...request,
       })
@@ -43,7 +44,8 @@ : {
             abi: solmateERC1155ABI,
-            address: args.erc1155.address,
+            address: erc1155.address,
             functionName: "isApprovedForAll",
-            args: [args.owner, args.spender],
+            args: [owner, spender],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<boolean, GetERC1155IsApprovedForAllReturnType, T>;

src/erc1155/publicActions/getERC1155URI.ts

@@ -5,3 +5,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC1155 } from "../types.js";
+import type { BaseERC1155 } from "../types.js";
 
@@ -11,3 +11,3 @@ export type GetERC1155URIParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc1155: Pick<ERC1155, "address" | "id"> };
+> & { erc1155: Pick<BaseERC1155, "address" | "id"> };
 
@@ -21,3 +21,3 @@ export type GetERC1155URIReturnType = string;
   client: Client<Transport, TChain>,
-  args: GetERC1155URIParameters,
+  { erc1155, ...request }: GetERC1155URIParameters,
   type?: T,
@@ -28,5 +28,6 @@ ): ReverseMirage<string, GetERC1155URIReturnType, T> =>
         abi: solmateERC1155ABI,
-        address: args.erc1155.address,
+        address: erc1155.address,
         functionName: "uri",
-        args: [args.erc1155.id],
+        args: [erc1155.id],
+        ...request,
       })
@@ -37,7 +38,8 @@ : {
             abi: solmateERC1155ABI,
-            address: args.erc1155.address,
+            address: erc1155.address,
             functionName: "uri",
-            args: [args.erc1155.id],
+            args: [erc1155.id],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<string, GetERC1155URIReturnType, T>;

src/erc1155/types.ts

@@ -5,3 +5,3 @@ import type { Address } from "viem";
 
-export type ERC1155 = Token<"erc1155"> & {
+export type BaseERC1155<TType extends string = string> = Token<TType> & {
   address: Address;
@@ -13,5 +13,7 @@ id: bigint;
 
-export type ERC1155Data<TERC1155 extends ERC1155> = Amount<
+export type ERC1155 = BaseERC1155<"erc1155">;
+
+export type ERC1155Data<TERC1155 extends BaseERC1155> = Amount<
   TERC1155,
   `${TERC1155["type"]}Data`
 >;

src/erc1155/utils.ts

 import { type Address, getAddress } from "viem";
-import type { ERC1155, ERC1155Data } from "./types.js";
+import type { BaseERC1155, ERC1155, ERC1155Data } from "./types.js";
 
@@ -25,3 +25,3 @@ /**
  */
-export const createERC1155Data = <TERC1155 extends ERC1155>(
+export const createERC1155Data = <TERC1155 extends BaseERC1155>(
   erc1155: TERC1155,
@@ -28,0 +28,0 @@ amount: bigint,

src/erc1155/walletActions/simulateERC1155SetApprovalForAll.ts

@@ -11,6 +11,6 @@ import type {
 import { solmateErc1155ABI as solmateERC1155 } from "../../generated.js";
-import type { ERC1155 } from "../types.js";
+import type { BaseERC1155 } from "../types.js";
 
 export type ERC1155SetApprovalForAllParameters = {
-  erc1155: Pick<ERC1155, "address">;
+  erc1155: Pick<BaseERC1155, "address">;
   spender: Address;
@@ -17,0 +17,0 @@ approved: boolean;

src/erc1155/walletActions/simulateERC1155Transfer.ts

@@ -12,6 +12,6 @@ import type {
 import { solmateErc1155ABI as solmateERC1155 } from "../../generated.js";
-import type { ERC1155, ERC1155Data } from "../types.js";
+import type { BaseERC1155, ERC1155Data } from "../types.js";
 
 export type ERC1155TransferParameters = {
-  erc1155Data: ERC1155Data<ERC1155>;
+  erc1155Data: ERC1155Data<BaseERC1155>;
   from?: Address;
@@ -18,0 +18,0 @@ to: Address;

src/erc1155/walletActions/simulateERC1155TransferBatch.ts

@@ -13,6 +13,6 @@ import {
 import { solmateErc1155ABI as solmateERC1155 } from "../../generated.js";
-import type { ERC1155, ERC1155Data } from "../types.js";
+import type { BaseERC1155, ERC1155Data } from "../types.js";
 
 export type ERC1155TransferBatchParameters = {
-  erc1155Data: ERC1155Data<ERC1155>[];
+  erc1155Data: ERC1155Data<BaseERC1155>[];
   from?: Address;
@@ -19,0 +19,0 @@ to: Address;

src/erc20/publicActions/getERC20.ts

@@ -7,3 +7,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import { getERC20Decimals } from "./getERC20Decimals.js";
-import { type GetERC20NameReturnType, getERC20Name } from "./getERC20Name.js";
+import { getERC20Name } from "./getERC20Name.js";
 import { getERC20Symbol } from "./getERC20Symbol.js";
@@ -26,18 +26,18 @@
   client: Client<Transport, TChain>,
-  args: GetERC20Parameters,
+  { erc20, ...request }: GetERC20Parameters,
   type?: T,
-): ReverseMirage<[string, string, number], GetERC20NameReturnType, T> =>
+): ReverseMirage<[string, string, number], GetERC20ReturnType, T> =>
   (type === undefined
     ? Promise.all([
-        getERC20Name(client, args),
-        getERC20Symbol(client, args),
-        getERC20Decimals(client, args),
+        getERC20Name(client, { erc20, ...request }),
+        getERC20Symbol(client, { erc20, ...request }),
+        getERC20Decimals(client, { erc20, ...request }),
       ]).then(([name, symbol, decimals]) =>
         createERC20(
-          args.erc20.address,
+          erc20.address,
           name,
           symbol,
           decimals,
-          args.erc20.chainID,
-          args.erc20.blockCreated,
+          erc20.chainID,
+          erc20.blockCreated,
         ),
@@ -48,15 +48,15 @@ )
           Promise.all([
-            getERC20Name(client, args, "select").read(),
-            getERC20Symbol(client, args, "select").read(),
-            getERC20Decimals(client, args, "select").read(),
+            getERC20Name(client, { erc20, ...request }, "select").read(),
+            getERC20Symbol(client, { erc20, ...request }, "select").read(),
+            getERC20Decimals(client, { erc20, ...request }, "select").read(),
           ]),
         parse: ([name, symbol, decimals]) =>
           createERC20(
-            args.erc20.address,
+            erc20.address,
             name,
             symbol,
             decimals,
-            args.erc20.chainID,
-            args.erc20.blockCreated,
+            erc20.chainID,
+            erc20.blockCreated,
           ),
-      }) as ReverseMirage<[string, string, number], GetERC20NameReturnType, T>;
+      }) as ReverseMirage<[string, string, number], GetERC20ReturnType, T>;

src/erc20/publicActions/getERC20Allowance.ts

@@ -28,3 +28,3 @@ import type {
   client: Client<Transport, TChain>,
-  args: GetERC20AllowanceParameters<TERC20>,
+  { erc20, owner, spender, ...request }: GetERC20AllowanceParameters<TERC20>,
   type?: T,
@@ -35,6 +35,7 @@ ): ReverseMirage<bigint, GetERC20AllowanceReturnType<TERC20>, T> =>
         abi: solmateERC20ABI,
-        address: args.erc20.address,
+        address: erc20.address,
         functionName: "allowance",
-        args: [args.owner, args.spender],
-      }).then((data) => createAmountFromRaw(args.erc20, data))
+        args: [owner, spender],
+        ...request,
+      }).then((data) => createAmountFromRaw(erc20, data))
     : {
@@ -44,7 +45,8 @@ read: () =>
             abi: solmateERC20ABI,
-            address: args.erc20.address,
+            address: erc20.address,
             functionName: "allowance",
-            args: [args.owner, args.spender],
+            args: [owner, spender],
+            ...request,
           }),
-        parse: (data) => createAmountFromRaw(args.erc20, data),
+        parse: (data) => createAmountFromRaw(erc20, data),
       }) as ReverseMirage<bigint, GetERC20AllowanceReturnType<TERC20>, T>;

src/erc20/publicActions/getERC20BalanceOf.ts

@@ -28,3 +28,3 @@ import type {
   client: Client<Transport, TChain>,
-  args: GetERC20BalanceOfParameters<TERC20>,
+  { erc20, address, ...request }: GetERC20BalanceOfParameters<TERC20>,
   type?: T,
@@ -35,6 +35,7 @@ ): ReverseMirage<bigint, GetERC20BalanceOfReturnType<TERC20>, T> =>
         abi: solmateERC20ABI,
-        address: args.erc20.address,
+        address: erc20.address,
         functionName: "balanceOf",
-        args: [args.address],
-      }).then((data) => createAmountFromRaw(args.erc20, data))
+        args: [address],
+        ...request,
+      }).then((data) => createAmountFromRaw(erc20, data))
     : {
@@ -44,7 +45,8 @@ read: () =>
             abi: solmateERC20ABI,
-            address: args.erc20.address,
+            address: erc20.address,
             functionName: "balanceOf",
-            args: [args.address],
+            args: [address],
+            ...request,
           }),
-        parse: (data) => createAmountFromRaw(args.erc20, data),
+        parse: (data) => createAmountFromRaw(erc20, data),
       }) as ReverseMirage<bigint, GetERC20BalanceOfReturnType<TERC20>, T>;

src/erc20/publicActions/getERC20Decimals.ts

@@ -19,3 +19,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
   client: Client<Transport, TChain>,
-  args: GetERC20DecimalsParameters,
+  { erc20, ...request }: GetERC20DecimalsParameters,
   type?: T,
@@ -26,4 +26,5 @@ ): ReverseMirage<number, GetERC20DecimalsReturnType, T> =>
         abi: solmateERC20ABI,
-        address: args.erc20.address,
+        address: erc20.address,
         functionName: "decimals",
+        ...request,
       })
@@ -34,6 +35,7 @@ : {
             abi: solmateERC20ABI,
-            address: args.erc20.address,
+            address: erc20.address,
             functionName: "decimals",
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<number, GetERC20DecimalsReturnType, T>;

src/erc20/publicActions/getERC20DomainSeparator.ts

@@ -25,3 +25,3 @@ import type {
   client: Client<Transport, TChain>,
-  args: GetERC20DomainSeparatorParameters,
+  { erc20, ...request }: GetERC20DomainSeparatorParameters,
   type?: T,
@@ -32,4 +32,5 @@ ): ReverseMirage<Hex, GetERC20DomainSeparatorReturnType, T> =>
         abi: solmateERC20ABI,
-        address: args.erc20.address,
+        address: erc20.address,
         functionName: "DOMAIN_SEPARATOR",
+        ...request,
       })
@@ -40,6 +41,7 @@ : {
             abi: solmateERC20ABI,
-            address: args.erc20.address,
+            address: erc20.address,
             functionName: "DOMAIN_SEPARATOR",
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<Hex, GetERC20DomainSeparatorReturnType, T>;

src/erc20/publicActions/getERC20Name.ts

@@ -19,3 +19,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
   client: Client<Transport, TChain>,
-  args: GetERC20NameParameters,
+  { erc20, ...request }: GetERC20NameParameters,
   type?: T,
@@ -26,4 +26,5 @@ ): ReverseMirage<string, GetERC20NameReturnType, T> =>
         abi: solmateERC20ABI,
-        address: args.erc20.address,
+        address: erc20.address,
         functionName: "name",
+        ...request,
       })
@@ -34,6 +35,7 @@ : {
             abi: solmateERC20ABI,
-            address: args.erc20.address,
+            address: erc20.address,
             functionName: "name",
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<string, GetERC20NameReturnType, T>;

src/erc20/publicActions/getERC20Permit.ts

@@ -25,3 +25,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
   client: Client<Transport, TChain>,
-  args: GetERC20PermitParameters,
+  { erc20, ...request }: GetERC20PermitParameters,
   type?: T,
@@ -31,14 +31,14 @@ ): ReverseMirage<[string, string, number], GetERC20PermitReturnType, T> =>
     ? Promise.all([
-        getERC20Name(client, args),
-        getERC20Symbol(client, args),
-        getERC20Decimals(client, args),
+        getERC20Name(client, { erc20, ...request }),
+        getERC20Symbol(client, { erc20, ...request }),
+        getERC20Decimals(client, { erc20, ...request }),
       ]).then(([name, symbol, decimals]) =>
         createERC20Permit(
-          args.erc20.address,
+          erc20.address,
           name,
           symbol,
           decimals,
-          args.erc20.version ?? "1",
-          args.erc20.chainID,
-          args.erc20.blockCreated,
+          erc20.version ?? "1",
+          erc20.chainID,
+          erc20.blockCreated,
         ),
@@ -49,15 +49,15 @@ )
           Promise.all([
-            getERC20Name(client, args, "select").read(),
-            getERC20Symbol(client, args, "select").read(),
-            getERC20Decimals(client, args, "select").read(),
+            getERC20Name(client, { erc20, ...request }, "select").read(),
+            getERC20Symbol(client, { erc20, ...request }, "select").read(),
+            getERC20Decimals(client, { erc20, ...request }, "select").read(),
           ]),
         parse: ([name, symbol, decimals]) =>
           createERC20Permit(
-            args.erc20.address,
+            erc20.address,
             name,
             symbol,
             decimals,
-            args.erc20.version ?? "1",
-            args.erc20.chainID,
-            args.erc20.blockCreated,
+            erc20.version ?? "1",
+            erc20.chainID,
+            erc20.blockCreated,
           ),
@@ -64,0 +64,0 @@ }) as ReverseMirage<

src/erc20/publicActions/getERC20PermitData.ts

@@ -28,3 +28,3 @@ import type {
   client: Client<Transport, TChain>,
-  args: GetERC20PermitDataParameters<TERC20>,
+  { erc20, address, ...request }: GetERC20PermitDataParameters<TERC20>,
   type?: T,
@@ -36,14 +36,16 @@ ): ReverseMirage<[bigint, bigint], GetERC20PermitDataReturnType<TERC20>, T> =>
           abi: solmateERC20ABI,
-          address: args.erc20.address,
+          address: erc20.address,
           functionName: "balanceOf",
-          args: [args.address],
+          args: [address],
+          ...request,
         }),
         readContract(client, {
           abi: solmateERC20ABI,
-          address: args.erc20.address,
+          address: erc20.address,
           functionName: "nonces",
-          args: [args.address],
+          args: [address],
+          ...request,
         }),
       ]).then(([balance, nonce]) =>
-        createERC20PermitDataFromRaw(args.erc20, balance, nonce),
+        createERC20PermitDataFromRaw(erc20, balance, nonce),
       )
@@ -55,15 +57,17 @@ : {
               abi: solmateERC20ABI,
-              address: args.erc20.address,
+              address: erc20.address,
               functionName: "balanceOf",
-              args: [args.address],
+              args: [address],
+              ...request,
             }),
             readContract(client, {
               abi: solmateERC20ABI,
-              address: args.erc20.address,
+              address: erc20.address,
               functionName: "nonces",
-              args: [args.address],
+              args: [address],
+              ...request,
             }),
           ]),
         parse: ([balance, nonce]) =>
-          createERC20PermitDataFromRaw(args.erc20, balance, nonce),
+          createERC20PermitDataFromRaw(erc20, balance, nonce),
       }) as ReverseMirage<
@@ -70,0 +74,0 @@ [bigint, bigint],

src/erc20/publicActions/getERC20PermitNonce.ts

@@ -25,3 +25,3 @@ import type {
   client: Client<Transport, TChain>,
-  args: GetERC20PermitNonceParameters,
+  { erc20, address, ...request }: GetERC20PermitNonceParameters,
   type?: T,
@@ -32,5 +32,6 @@ ): ReverseMirage<bigint, GetERC20PermitNonceReturnType, T> =>
         abi: solmateERC20ABI,
-        address: args.erc20.address,
+        address: erc20.address,
         functionName: "nonces",
-        args: [args.address],
+        args: [address],
+        ...request,
       })
@@ -41,7 +42,8 @@ : {
             abi: solmateERC20ABI,
-            address: args.erc20.address,
+            address: erc20.address,
             functionName: "nonces",
-            args: [args.address],
+            args: [address],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<bigint, GetERC20PermitNonceReturnType, T>;

src/erc20/publicActions/getERC20Symbol.ts

@@ -19,3 +19,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
   client: Client<Transport, TChain>,
-  args: GetERC20SymbolParameters,
+  { erc20, ...request }: GetERC20SymbolParameters,
   type?: T,
@@ -26,4 +26,5 @@ ): ReverseMirage<string, GetERC20SymbolReturnType, T> =>
         abi: solmateERC20ABI,
-        address: args.erc20.address,
+        address: erc20.address,
         functionName: "symbol",
+        ...request,
       })
@@ -34,6 +35,7 @@ : {
             abi: solmateERC20ABI,
-            address: args.erc20.address,
+            address: erc20.address,
             functionName: "symbol",
+            ...request,
           }),
         parse: (data: string) => data,
       }) as ReverseMirage<string, GetERC20SymbolReturnType, T>;

src/erc20/publicActions/getERC20TotalSupply.ts

@@ -22,3 +22,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
   client: Client<Transport, TChain>,
-  args: GetERC20TotalSupplyParameters<TERC20>,
+  { erc20, ...request }: GetERC20TotalSupplyParameters<TERC20>,
   type?: T,
@@ -29,5 +29,6 @@ ): ReverseMirage<bigint, GetERC20TotalSupplyReturnType<TERC20>, T> =>
         abi: solmateERC20ABI,
-        address: args.erc20.address,
+        address: erc20.address,
         functionName: "totalSupply",
-      }).then((data) => createAmountFromRaw(args.erc20, data))
+        ...request,
+      }).then((data) => createAmountFromRaw(erc20, data))
     : {
@@ -37,6 +38,7 @@ read: () =>
             abi: solmateERC20ABI,
-            address: args.erc20.address,
+            address: erc20.address,
             functionName: "totalSupply",
+            ...request,
           }),
-        parse: (data) => createAmountFromRaw(args.erc20, data),
+        parse: (data) => createAmountFromRaw(erc20, data),
       }) as ReverseMirage<bigint, GetERC20TotalSupplyReturnType<TERC20>, T>;

src/erc20/publicActions/getIsERC20Permit.ts

@@ -37,3 +37,3 @@ import type {
   client: Client<Transport, TChain>,
-  args: GetIsERC20PermitParameters,
+  { erc20, ...request }: GetIsERC20PermitParameters,
   type?: T,
@@ -47,7 +47,7 @@ ): ReverseMirage<
     ? Promise.all([
-        getERC20Permit(client, args),
-        getERC20DomainSeparator(client, args),
+        getERC20Permit(client, { erc20, ...request }),
+        getERC20DomainSeparator(client, { erc20, ...request }),
       ])
         .then(([erc20]) => erc20)
-        .catch(() => getERC20(client, args))
+        .catch(() => getERC20(client, { erc20, ...request }))
     : {
@@ -57,7 +57,13 @@ read: async () => {
             return await Promise.all([
-              getERC20Permit(client, args, "select").read(),
-              getERC20DomainSeparator(client, args, "select").read(),
+              getERC20Permit(client, { erc20, ...request }, "select").read(),
+              getERC20DomainSeparator(
+                client,
+                { erc20, ...request },
+                "select",
+              ).read(),
             ]);
           } catch {
-            return await Promise.all([getERC20(client, args, "select").read()]);
+            return await Promise.all([
+              getERC20(client, { erc20, ...request }, "select").read(),
+            ]);
           }
@@ -68,17 +74,17 @@ },
             ? createERC20(
-                args.erc20.address,
+                erc20.address,
                 data[0][0],
                 data[0][1],
                 data[0][2],
-                args.erc20.chainID,
-                args.erc20.blockCreated,
+                erc20.chainID,
+                erc20.blockCreated,
               )
             : createERC20Permit(
-                args.erc20.address,
+                erc20.address,
                 data[0][0],
                 data[0][1],
                 data[0][2],
-                args.erc20.version ?? "1",
-                args.erc20.chainID,
-                args.erc20.blockCreated,
+                erc20.version ?? "1",
+                erc20.chainID,
+                erc20.blockCreated,
               ),
@@ -85,0 +91,0 @@ }) as ReverseMirage<

src/erc20/walletActions/signERC20Permit.ts

@@ -34,2 +34,3 @@ import {
     account = client.account,
+    ...request
   }: SignERC20PermitParameters<TAccount>,
@@ -60,3 +61,4 @@ ) => {
     account: account!,
+    ...request,
   });
 };

src/erc721/index.ts

 export type {
+  BaseERC721,
   ERC721,
-  ERC721IDData,
   ERC721Data,
 } from "./types.js";
 
-export { createERC721, createERC721Data, createERC721IDData } from "./utils.js";
+export { createERC721, createERC721Data } from "./utils.js";
 
@@ -15,3 +15,2 @@ export { solmateErc721ABI as solmateERC721ABI } from "../generated.js";
 export { getERC721Data } from "./publicActions/getERC721Data.js";
-export { getERC721IDData } from "./publicActions/getERC721IDData.js";
 export { getERC721IsApprovedForAll } from "./publicActions/getERC721IsApprovedForAll.js";
@@ -18,0 +17,0 @@ export { getERC721Name } from "./publicActions/getERC721Name.js";

src/erc721/publicActions/getERC721.ts

 import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import { solmateErc721ABI as solmateERC721ABI } from "../../generated.js";
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 import { createERC721 } from "../utils.js";
 import { getERC721Name } from "./getERC721Name.js";
 import { getERC721Symbol } from "./getERC721Symbol.js";
-import { getERC721TokenURI } from "./getERC721TokenURI.js";
 
@@ -14,7 +13,7 @@ export type GetERC721Parameters = Omit<
 > & {
-  erc721: Pick<ERC721, "address" | "id" | "chainID"> &
-    Partial<Pick<ERC721, "blockCreated">>;
+  erc721: Pick<BaseERC721, "address" | "chainID"> &
+    Partial<Pick<BaseERC721, "blockCreated">>;
 };
 
-export type GetERC721ReturnType = ERC721;
+export type GetERC721ReturnType = BaseERC721;
 
@@ -26,19 +25,16 @@ export const getERC721 = <
   client: Client<Transport, TChain>,
-  args: GetERC721Parameters,
+  { erc721, ...request }: GetERC721Parameters,
   type?: T,
-): ReverseMirage<[string, string, string], GetERC721ReturnType, T> =>
+): ReverseMirage<[string, string], GetERC721ReturnType, T> =>
   (type === undefined
     ? Promise.all([
-        getERC721Name(client, args),
-        getERC721Symbol(client, args),
-        getERC721TokenURI(client, args),
-      ]).then(([name, symbol, tokenURI]) =>
+        getERC721Name(client, { erc721, ...request }),
+        getERC721Symbol(client, { erc721, ...request }),
+      ]).then(([name, symbol]) =>
         createERC721(
-          args.erc721.address,
+          erc721.address,
           name,
           symbol,
-          args.erc721.id,
-          tokenURI,
-          args.erc721.chainID,
-          args.blockNumber,
+          erc721.chainID,
+          erc721.blockCreated,
         ),
@@ -49,16 +45,13 @@ )
           Promise.all([
-            getERC721Name(client, args, "select").read(),
-            getERC721Symbol(client, args, "select").read(),
-            getERC721TokenURI(client, args, "select").read(),
+            getERC721Name(client, { erc721, ...request }, "select").read(),
+            getERC721Symbol(client, { erc721, ...request }, "select").read(),
           ]),
-        parse: ([name, symbol, tokenURI]) =>
+        parse: ([name, symbol]) =>
           createERC721(
-            args.erc721.address,
+            erc721.address,
             name,
             symbol,
-            args.erc721.id,
-            tokenURI,
-            args.erc721.chainID,
-            args.blockNumber,
+            erc721.chainID,
+            erc721.blockCreated,
           ),
-      }) as ReverseMirage<[string, string, string], GetERC721ReturnType, T>;
+      }) as ReverseMirage<[string, string], GetERC721ReturnType, T>;

src/erc721/publicActions/getERC721Approved.ts

@@ -11,3 +11,3 @@ import type {
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
@@ -17,3 +17,3 @@ export type GetERC721ApprovedParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc721: Pick<ERC721, "address" | "id"> };
+> & { erc721: Pick<BaseERC721, "address">; id: bigint };
 
@@ -27,3 +27,3 @@ export type GetERC721ApprovedReturnType = Address;
   client: Client<Transport, TChain>,
-  args: GetERC721ApprovedParameters,
+  { erc721, id, ...request }: GetERC721ApprovedParameters,
   type?: T,
@@ -34,5 +34,6 @@ ): ReverseMirage<Address, GetERC721ApprovedReturnType, T> =>
         abi: solmateERC721ABI,
-        address: args.erc721.address,
+        address: erc721.address,
         functionName: "getApproved",
-        args: [args.erc721.id],
+        args: [id],
+        ...request,
       })
@@ -43,7 +44,8 @@ : {
             abi: solmateERC721ABI,
-            address: args.erc721.address,
+            address: erc721.address,
             functionName: "getApproved",
-            args: [args.erc721.id],
+            args: [id],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<Address, GetERC721ApprovedReturnType, T>;

src/erc721/publicActions/getERC721BalanceOf.ts

@@ -11,3 +11,3 @@ import type {
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
@@ -17,3 +17,3 @@ export type GetERC721BalanceOfParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc721: Pick<ERC721, "address">; address: Address };
+> & { erc721: Pick<BaseERC721, "address">; address: Address };
 
@@ -27,3 +27,3 @@ export type GetERC721BalanceOfReturnType = bigint;
   client: Client<Transport, TChain>,
-  args: GetERC721BalanceOfParameters,
+  { erc721, address, ...request }: GetERC721BalanceOfParameters,
   type?: T,
@@ -34,5 +34,6 @@ ): ReverseMirage<bigint, GetERC721BalanceOfReturnType, T> =>
         abi: solmateERC721ABI,
-        address: args.erc721.address,
+        address: erc721.address,
         functionName: "balanceOf",
-        args: [args.address],
+        args: [address],
+        ...request,
       })
@@ -43,7 +44,8 @@ : {
             abi: solmateERC721ABI,
-            address: args.erc721.address,
+            address: erc721.address,
             functionName: "balanceOf",
-            args: [args.address],
+            args: [address],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<bigint, GetERC721BalanceOfReturnType, T>;

src/erc721/publicActions/getERC721Data.ts

@@ -10,7 +10,7 @@ import type {
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721, ERC721Data } from "../types.js";
+import type { BaseERC721, ERC721Data } from "../types.js";
 import { createERC721Data } from "../utils.js";
 import { getERC721BalanceOf } from "./getERC721BalanceOf.js";
 
-export type GetERC721DataParameters<TERC721 extends ERC721> = Omit<
+export type GetERC721DataParameters<TERC721 extends BaseERC721> = Omit<
   ReadContractParameters<typeof solmateERC721ABI, "balanceOf">,
@@ -20,3 +20,3 @@ "address" | "abi" | "functionName" | "args"
 
-export type GetERC721DataReturnType<TERC721 extends ERC721> =
+export type GetERC721DataReturnType<TERC721 extends BaseERC721> =
   ERC721Data<TERC721>;
@@ -26,22 +26,29 @@
   TChain extends Chain | undefined,
-  TERC721 extends ERC721,
+  TERC721 extends BaseERC721,
   T extends "select" | undefined,
 >(
   client: Client<Transport, TChain>,
-  args: GetERC721DataParameters<TERC721>,
+  { erc721, address, ...request }: GetERC721DataParameters<TERC721>,
   type?: T,
 ): ReverseMirage<bigint, GetERC721DataReturnType<TERC721>, T> =>
   (type === undefined
-    ? getERC721BalanceOf(client, args).then((data) => {
-        if (data > Number.MAX_SAFE_INTEGER)
-          throw Error("balance exceeds maximum representable number");
-        return createERC721Data(args.erc721, Number(data));
-      })
+    ? getERC721BalanceOf(client, { erc721, address, ...request }).then(
+        (data) => {
+          if (data > Number.MAX_SAFE_INTEGER)
+            throw Error("balance exceeds maximum representable number");
+          return createERC721Data(erc721, Number(data));
+        },
+      )
     : {
-        read: () => getERC721BalanceOf(client, args, "select").read(),
+        read: () =>
+          getERC721BalanceOf(
+            client,
+            { erc721, address, ...request },
+            "select",
+          ).read(),
         parse: (data) => {
           if (data > Number.MAX_SAFE_INTEGER)
             throw Error("balance exceeds maximum representable number");
-          return createERC721Data(args.erc721, Number(data));
+          return createERC721Data(erc721, Number(data));
         },
       }) as ReverseMirage<bigint, GetERC721DataReturnType<TERC721>, T>;

src/erc721/publicActions/getERC721IsApprovedForAll.ts

@@ -11,3 +11,3 @@ import type {
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
@@ -17,3 +17,3 @@ export type GetERC721IsApprovedForAllParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc721: Pick<ERC721, "address">; owner: Address; spender: Address };
+> & { erc721: Pick<BaseERC721, "address">; owner: Address; spender: Address };
 
@@ -27,3 +27,3 @@ export type GetERC721IsApprovedForAllReturnType = boolean;
   client: Client<Transport, TChain>,
-  args: GetERC721IsApprovedForAllParameters,
+  { erc721, owner, spender, ...request }: GetERC721IsApprovedForAllParameters,
   type?: T,
@@ -34,5 +34,6 @@ ): ReverseMirage<boolean, GetERC721IsApprovedForAllReturnType, T> =>
         abi: solmateERC721ABI,
-        address: args.erc721.address,
+        address: erc721.address,
         functionName: "isApprovedForAll",
-        args: [args.owner, args.spender],
+        args: [owner, spender],
+        ...request,
       })
@@ -43,7 +44,8 @@ : {
             abi: solmateERC721ABI,
-            address: args.erc721.address,
+            address: erc721.address,
             functionName: "isApprovedForAll",
-            args: [args.owner, args.spender],
+            args: [owner, spender],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<boolean, GetERC721IsApprovedForAllReturnType, T>;

src/erc721/publicActions/getERC721Name.ts

@@ -5,3 +5,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
@@ -11,3 +11,3 @@ export type GetERC721NameParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc721: Pick<ERC721, "address"> };
+> & { erc721: Pick<BaseERC721, "address"> };
 
@@ -21,3 +21,3 @@ export type GetERC721NameReturnType = string;
   client: Client<Transport, TChain>,
-  args: GetERC721NameParameters,
+  { erc721, ...request }: GetERC721NameParameters,
   type?: T,
@@ -28,4 +28,5 @@ ): ReverseMirage<string, GetERC721NameReturnType, T> =>
         abi: solmateERC721ABI,
-        address: args.erc721.address,
+        address: erc721.address,
         functionName: "name",
+        ...request,
       })
@@ -36,6 +37,7 @@ : {
             abi: solmateERC721ABI,
-            address: args.erc721.address,
+            address: erc721.address,
             functionName: "name",
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<string, GetERC721NameReturnType, T>;

src/erc721/publicActions/getERC721OwnerOf.ts

@@ -11,3 +11,3 @@ import type {
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
@@ -17,3 +17,3 @@ export type GetERC721OwnerOfParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc721: Pick<ERC721, "address" | "id"> };
+> & { erc721: Pick<BaseERC721, "address">; id: bigint };
 
@@ -27,3 +27,3 @@ export type GetERC721OwnerOfReturnType = Address;
   client: Client<Transport, TChain>,
-  args: GetERC721OwnerOfParameters,
+  { erc721, id, ...request }: GetERC721OwnerOfParameters,
   type?: T,
@@ -34,5 +34,6 @@ ): ReverseMirage<Address, GetERC721OwnerOfReturnType, T> =>
         abi: solmateERC721ABI,
-        address: args.erc721.address,
+        address: erc721.address,
         functionName: "ownerOf",
-        args: [args.erc721.id],
+        args: [id],
+        ...request,
       })
@@ -43,7 +44,8 @@ : {
             abi: solmateERC721ABI,
-            address: args.erc721.address,
+            address: erc721.address,
             functionName: "ownerOf",
-            args: [args.erc721.id],
+            args: [id],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<Address, GetERC721OwnerOfReturnType, T>;

src/erc721/publicActions/getERC721SupportsInterface.ts

@@ -11,3 +11,3 @@ import type {
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
@@ -17,3 +17,3 @@ export type GetERC721SupportsInterfaceParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc721: Pick<ERC721, "address">; interfaceID: Hex };
+> & { erc721: Pick<BaseERC721, "address">; interfaceID: Hex };
 
@@ -27,3 +27,3 @@ export type GetERC721SupportsInterfaceReturnType = boolean;
   client: Client<Transport, TChain>,
-  args: GetERC721SupportsInterfaceParameters,
+  { erc721, interfaceID, ...request }: GetERC721SupportsInterfaceParameters,
   type?: T,
@@ -34,5 +34,6 @@ ): ReverseMirage<boolean, GetERC721SupportsInterfaceReturnType, T> =>
         abi: solmateERC721ABI,
-        address: args.erc721.address,
+        address: erc721.address,
         functionName: "supportsInterface",
-        args: [args.interfaceID],
+        args: [interfaceID],
+        ...request,
       })
@@ -43,7 +44,8 @@ : {
             abi: solmateERC721ABI,
-            address: args.erc721.address,
+            address: erc721.address,
             functionName: "supportsInterface",
-            args: [args.interfaceID],
+            args: [interfaceID],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<boolean, GetERC721SupportsInterfaceReturnType, T>;

src/erc721/publicActions/getERC721Symbol.ts

@@ -5,3 +5,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
@@ -11,3 +11,3 @@ export type GetERC721SymbolParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc721: Pick<ERC721, "address"> };
+> & { erc721: Pick<BaseERC721, "address"> };
 
@@ -21,3 +21,3 @@ export type GetERC721SymbolReturnType = string;
   client: Client<Transport, TChain>,
-  args: GetERC721SymbolParameters,
+  { erc721, ...request }: GetERC721SymbolParameters,
   type?: T,
@@ -28,4 +28,5 @@ ): ReverseMirage<string, GetERC721SymbolReturnType, T> =>
         abi: solmateERC721ABI,
-        address: args.erc721.address,
+        address: erc721.address,
         functionName: "symbol",
+        ...request,
       })
@@ -36,6 +37,7 @@ : {
             abi: solmateERC721ABI,
-            address: args.erc721.address,
+            address: erc721.address,
             functionName: "symbol",
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<string, GetERC721SymbolReturnType, T>;

src/erc721/publicActions/getERC721TokenURI.ts

@@ -5,3 +5,3 @@ import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import type { ReverseMirage } from "../../types/rm.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
@@ -11,3 +11,3 @@ export type GetERC721TokenURIParameters = Omit<
   "address" | "abi" | "functionName" | "args"
-> & { erc721: Pick<ERC721, "address" | "id"> };
+> & { erc721: Pick<BaseERC721, "address">; id: bigint };
 
@@ -21,3 +21,3 @@ export type GetERC721TokenURIReturnType = string;
   client: Client<Transport, TChain>,
-  args: GetERC721TokenURIParameters,
+  { erc721, id, ...request }: GetERC721TokenURIParameters,
   type?: T,
@@ -28,5 +28,6 @@ ): ReverseMirage<string, GetERC721TokenURIReturnType, T> =>
         abi: solmateERC721ABI,
-        address: args.erc721.address,
+        address: erc721.address,
         functionName: "tokenURI",
-        args: [args.erc721.id],
+        args: [id],
+        ...request,
       })
@@ -37,7 +38,8 @@ : {
             abi: solmateERC721ABI,
-            address: args.erc721.address,
+            address: erc721.address,
             functionName: "tokenURI",
-            args: [args.erc721.id],
+            args: [id],
+            ...request,
           }),
         parse: (data) => data,
       }) as ReverseMirage<string, GetERC721TokenURIReturnType, T>;

src/erc721/types.ts

@@ -5,21 +5,13 @@ import type { Address } from "viem";
 
-export type ERC721 = Token<"erc721"> & {
+export type BaseERC721<TType extends string = string> = Token<TType> & {
   address: Address;
   name: string;
   symbol: string;
-  id: bigint;
-  tokenURI: string;
   blockCreated: bigint;
 };
 
-export type ERC721IDData<TERC721 extends ERC721> = TokenData<
-  TERC721,
-  `${TERC721["type"]}IDData`,
-  {
-    owned: boolean;
-  }
->;
+export type ERC721 = BaseERC721<"erc721">;
 
 export type ERC721Data<
-  TERC721 extends ERC721,
+  TERC721 extends BaseERC721,
   TBalance extends number = number,
@@ -26,0 +18,0 @@ > = TokenData<

src/erc721/utils.ts

 import { type Address, getAddress } from "viem";
 import type { Tuple } from "../types/tuple.js";
-import type { ERC721, ERC721Data, ERC721IDData } from "./types.js";
+import type { BaseERC721, ERC721, ERC721Data } from "./types.js";
 
@@ -12,4 +12,2 @@ /**
   symbol: string,
-  id: bigint,
-  tokenURI: string,
   chainID: number,
@@ -22,4 +20,2 @@ blockCreated = 0n,
   symbol,
-  id,
-  tokenURI,
   chainID,
@@ -30,18 +26,6 @@ blockCreated,
 /**
- * Creates an {@link ERC721IDData}
- */
-export const createERC721IDData = <TERC721 extends ERC721>(
-  erc721: TERC721,
-  owned: boolean,
-): ERC721IDData<TERC721> => ({
-  type: `${erc721.type as TERC721["type"]}IDData`,
-  token: erc721,
-  owned,
-});
-
-/**
  * Creates an {@link ERC721Data}
  */
 export const createERC721Data = <
-  TERC721 extends ERC721,
+  TERC721 extends BaseERC721,
   TBalance extends number,
@@ -48,0 +32,0 @@ >(

src/erc721/walletActions/simulateERC721Approve.ts

@@ -11,6 +11,7 @@ import type {
 import { solmateErc721ABI as solmateERC721 } from "../../generated.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
 export type ERC721ApproveParameters = {
-  erc721: Pick<ERC721, "address" | "id">;
+  erc721: Pick<BaseERC721, "address">;
+  id: bigint;
   spender: Address;
@@ -48,3 +49,3 @@ };
   {
-    args: { erc721, spender },
+    args: { erc721, spender, id },
     ...request
@@ -57,3 +58,3 @@ }: SimulateERC721ApproveParameters<TChain, TChainOverride>,
     functionName: "approve",
-    args: [spender, erc721.id],
+    args: [spender, id],
     ...request,
@@ -60,0 +61,0 @@ } as unknown as SimulateContractParameters<

src/erc721/walletActions/simulateERC721SetApprovalForAll.ts

@@ -11,6 +11,6 @@ import type {
 import { solmateErc721ABI as solmateERC721 } from "../../generated.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
 export type ERC721SetApprovalForAllParameters = {
-  erc721: Pick<ERC721, "address">;
+  erc721: Pick<BaseERC721, "address">;
   spender: Address;
@@ -17,0 +17,0 @@ approved: boolean;

src/erc721/walletActions/simulateERC721Transfer.ts

@@ -12,6 +12,7 @@ import type {
 import { solmateErc721ABI as solmateERC721 } from "../../generated.js";
-import type { ERC721 } from "../types.js";
+import type { BaseERC721 } from "../types.js";
 
 export type ERC721TransferParameters = {
-  erc721: Pick<ERC721, "address" | "id">;
+  erc721: Pick<BaseERC721, "address">;
+  id: bigint;
   from?: Address;
@@ -51,3 +52,3 @@ to: Address;
   {
-    args: { erc721, from, to, data },
+    args: { erc721, from, to, data, id },
     ...request
@@ -68,3 +69,3 @@ }: SimulateERC721TransferParameters<TChain, TChainOverride>,
           to,
-          erc721.id,
+          id,
         ],
@@ -90,3 +91,3 @@ ...request,
           to,
-          erc721.id,
+          id,
         ],
@@ -111,3 +112,3 @@ ...request,
           to,
-          erc721.id,
+          id,
           data,
@@ -114,0 +115,0 @@ ],

src/index.ts

@@ -67,8 +67,7 @@ export {
 export {
+  type BaseERC721,
   type ERC721,
-  type ERC721IDData,
   type ERC721Data,
   createERC721,
   createERC721Data,
-  createERC721IDData,
   solmateERC721ABI,
@@ -79,3 +78,2 @@ getERC721,
   getERC721Data,
-  getERC721IDData,
   getERC721IsApprovedForAll,
@@ -93,2 +91,3 @@ getERC721Name,
 export {
+  type BaseERC1155,
   type ERC1155,
@@ -95,0 +94,0 @@ type ERC1155Data,

src/native/publicActions/getNativeBalance.ts

@@ -21,12 +21,16 @@ import type { Chain, Client, GetBalanceParameters, Transport } from "viem";
   client: Client<Transport, TChain>,
-  args: GetNativeBalanceParameters<TNativeCurrency>,
+  {
+    address,
+    nativeCurrency,
+    ...request
+  }: GetNativeBalanceParameters<TNativeCurrency>,
   type?: T,
 ): ReverseMirage<bigint, GetNativeBalanceReturnType<TNativeCurrency>, T> =>
   (type === undefined
-    ? getBalance(client, { address: args.address }).then((data) =>
-        createAmountFromRaw(args.nativeCurrency, data),
+    ? getBalance(client, { address: address, ...request }).then((data) =>
+        createAmountFromRaw(nativeCurrency, data),
       )
     : {
-        read: () => getBalance(client, { address: args.address }),
-        parse: (data: bigint) => createAmountFromRaw(args.nativeCurrency, data),
+        read: () => getBalance(client, { address: address, ...request }),
+        parse: (data: bigint) => createAmountFromRaw(nativeCurrency, data),
       }) as ReverseMirage<
@@ -33,0 +37,0 @@ bigint,

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

932963

increased by0.01%

Lines of code

13884

increased by0.54%

Worsened metrics

Number of package files

96

decreased by-1.03%

No dependency changes