viem 2.53.1 → 2.54.0

package/_cjs/tempo/actions/token.js

@@ -13,6 +13,7 @@ exports.createSync = createSync;
 exports.getAllowance = getAllowance;
 exports.getBalance = getBalance;
 exports.getMetadata = getMetadata;
+exports.getTotalSupply = getTotalSupply;
 exports.getRoleAdmin = getRoleAdmin;
 exports.hasRole = hasRole;
 exports.grantRoles = grantRoles;
@@ -48,41 +49,59 @@ exports.watchUpdateQuoteToken = watchUpdateQuoteToken;
 const Hex = require("ox/Hex");
 const tempo_1 = require("ox/tempo");
 const parseAccount_js_1 = require("../../accounts/utils/parseAccount.js");
+const estimateContractGas_js_1 = require("../../actions/public/estimateContractGas.js");
 const multicall_js_1 = require("../../actions/public/multicall.js");
 const readContract_js_1 = require("../../actions/public/readContract.js");
+const simulateContract_js_1 = require("../../actions/public/simulateContract.js");
 const watchContractEvent_js_1 = require("../../actions/public/watchContractEvent.js");
+const internal_Token = require("../../actions/token/internal.js");
 const sendTransaction_js_1 = require("../../actions/wallet/sendTransaction.js");
 const sendTransactionSync_js_1 = require("../../actions/wallet/sendTransactionSync.js");
 const writeContract_js_1 = require("../../actions/wallet/writeContract.js");
 const writeContractSync_js_1 = require("../../actions/wallet/writeContractSync.js");
+const account_js_1 = require("../../errors/account.js");
 const encodeFunctionData_js_1 = require("../../utils/abi/encodeFunctionData.js");
 const parseEventLogs_js_1 = require("../../utils/abi/parseEventLogs.js");
+const formatUnits_js_1 = require("../../utils/unit/formatUnits.js");
 const Abis = require("../Abis.js");
 const Addresses = require("../Addresses.js");
 const utils_js_1 = require("../internal/utils.js");
 async function approve(client, parameters) {
-    const { token, ...rest } = parameters;
-    return approve.inner(writeContract_js_1.writeContract, client, parameters, { ...rest, token });
+    return approve.inner(writeContract_js_1.writeContract, client, parameters);
 }
 (function (approve) {
-    async function inner(action, client, parameters, args) {
-        const call = approve.call(args);
+    async function inner(action, client, parameters) {
         return (await action(client, {
             ...parameters,
-            ...call,
+            ...approve.call(client, parameters),
         }));
     }
     approve.inner = inner;
-    function call(args) {
-        const { spender, amount, token } = args;
+    function call(client, parameters) {
+        const { amount, spender, token } = parameters;
+        const { address, decimals } = (0, utils_js_1.resolveToken)(client, { token });
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address,
             abi: Abis.tip20,
             functionName: 'approve',
-            args: [spender, amount],
+            args: [spender, internal_Token.toBaseUnits(amount, decimals)],
         });
     }
     approve.call = call;
+    async function estimateGas(client, parameters) {
+        return (0, estimateContractGas_js_1.estimateContractGas)(client, {
+            ...(0, utils_js_1.pickWriteParameters)(parameters),
+            ...approve.call(client, parameters),
+        });
+    }
+    approve.estimateGas = estimateGas;
+    async function simulate(client, parameters) {
+        return (0, simulateContract_js_1.simulateContract)(client, {
+            ...(0, utils_js_1.pickWriteParameters)(parameters),
+            ...approve.call(client, parameters),
+        });
+    }
+    approve.simulate = simulate;
     function extractEvent(logs) {
         const [log] = (0, parseEventLogs_js_1.parseEventLogs)({
             abi: Abis.tip20,
@@ -96,11 +115,19 @@ async function approve(client, parameters) {
     approve.extractEvent = extractEvent;
 })(approve || (exports.approve = approve = {}));
 async function approveSync(client, parameters) {
-    const { throwOnReceiptRevert = true, ...rest } = parameters;
-    const receipt = await approve.inner(writeContractSync_js_1.writeContractSync, client, { ...parameters, throwOnReceiptRevert }, rest);
+    const { amount, token, throwOnReceiptRevert = true } = parameters;
+    const { decimals } = (0, utils_js_1.resolveToken)(client, { token });
+    const resolved = internal_Token.resolveAmountDecimals(amount, decimals);
+    const receipt = await approve.inner(writeContractSync_js_1.writeContractSync, client, {
+        ...parameters,
+        throwOnReceiptRevert,
+    });
     const { args } = approve.extractEvent(receipt.logs);
     return {
         ...args,
+        ...(resolved === undefined
+            ? {}
+            : { decimals: resolved, formatted: (0, formatUnits_js_1.formatUnits)(args.amount, resolved) }),
         receipt,
     };
 }
@@ -110,20 +137,21 @@ async function burnBlocked(client, parameters) {
 (function (burnBlocked) {
     async function inner(action, client, parameters) {
         const { amount, from, token, ...rest } = parameters;
-        const call = burnBlocked.call({ amount, from, token });
+        const call = burnBlocked.call(client, { amount, from, token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     burnBlocked.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { from, amount, token } = args;
+        const { address, decimals } = (0, utils_js_1.resolveToken)(client, { token });
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address,
             abi: Abis.tip20,
             functionName: 'burnBlocked',
-            args: [from, amount],
+            args: [from, internal_Token.toBaseUnits(amount, decimals)],
         });
     }
     burnBlocked.call = call;
@@ -157,26 +185,28 @@ async function burn(client, parameters) {
 (function (burn) {
     async function inner(action, client, parameters) {
         const { amount, memo, token, ...rest } = parameters;
-        const call = burn.call({ amount, memo, token });
+        const call = burn.call(client, { amount, memo, token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     burn.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { amount, memo, token } = args;
+        const { address, decimals } = (0, utils_js_1.resolveToken)(client, { token });
+        const value = internal_Token.toBaseUnits(amount, decimals);
         const callArgs = memo
             ? {
                 functionName: 'burnWithMemo',
-                args: [amount, Hex.padLeft(memo, 32)],
+                args: [value, Hex.padLeft(memo, 32)],
             }
             : {
                 functionName: 'burn',
-                args: [amount],
+                args: [value],
             };
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address,
             abi: Abis.tip20,
             ...callArgs,
         });
@@ -212,17 +242,17 @@ async function changeTransferPolicy(client, parameters) {
 (function (changeTransferPolicy) {
     async function inner(action, client, parameters) {
         const { policyId, token, ...rest } = parameters;
-        const call = changeTransferPolicy.call({ policyId, token });
+        const call = changeTransferPolicy.call(client, { policyId, token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     changeTransferPolicy.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token, policyId } = args;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'changeTransferPolicyId',
             args: [policyId],
@@ -262,7 +292,7 @@ async function create(client, parameters) {
         const admin = admin_ ? (0, parseAccount_js_1.parseAccount)(admin_) : undefined;
         if (!admin)
             throw new Error('admin is required.');
-        const call = create.call({ ...rest, admin: admin.address });
+        const call = create.call(client, { ...rest, admin: admin.address });
         return (await action(client, {
             ...parameters,
             account,
@@ -271,7 +301,7 @@ async function create(client, parameters) {
         }));
     }
     create.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { name, symbol, currency, logoURI, quoteToken = Addresses.pathUsd, admin, salt = Hex.random(32), } = args;
         return (0, utils_js_1.defineCall)({
             address: Addresses.tip20Factory,
@@ -281,7 +311,7 @@ async function create(client, parameters) {
                     name,
                     symbol,
                     currency,
-                    tempo_1.TokenId.toAddress(quoteToken),
+                    (0, utils_js_1.resolveToken)(client, { token: quoteToken }).address,
                     admin,
                     salt,
                     logoURI,
@@ -290,7 +320,7 @@ async function create(client, parameters) {
                     name,
                     symbol,
                     currency,
-                    tempo_1.TokenId.toAddress(quoteToken),
+                    (0, utils_js_1.resolveToken)(client, { token: quoteToken }).address,
                     admin,
                     salt,
                 ],
@@ -326,42 +356,55 @@ async function createSync(client, parameters) {
     };
 }
 async function getAllowance(client, parameters) {
-    const { account = client.account } = parameters;
-    const address = account ? (0, parseAccount_js_1.parseAccount)(account).address : undefined;
-    if (!address)
-        throw new Error('account is required.');
-    return (0, readContract_js_1.readContract)(client, {
-        ...parameters,
-        ...getAllowance.call({ ...parameters, account: address }),
-    });
+    const { account, decimals, spender, token, ...rest } = parameters;
+    const [amount, { decimals: resolved }] = await Promise.all([
+        (0, readContract_js_1.readContract)(client, {
+            ...rest,
+            ...getAllowance.call(client, { account, spender, token }),
+        }),
+        (0, utils_js_1.resolveTokenWithDecimals)(client, {
+            decimals,
+            token,
+        }),
+    ]);
+    return internal_Token.toAmount(amount, resolved);
 }
 (function (getAllowance) {
-    function call(args) {
-        const { account, spender, token } = args;
+    function call(client, args) {
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, args).address,
             abi: Abis.tip20,
             functionName: 'allowance',
-            args: [account, spender],
+            args: [args.account, args.spender],
         });
     }
     getAllowance.call = call;
 })(getAllowance || (exports.getAllowance = getAllowance = {}));
 async function getBalance(client, parameters) {
-    const { account = client.account, ...rest } = parameters;
-    const address = account ? (0, parseAccount_js_1.parseAccount)(account).address : undefined;
-    if (!address)
-        throw new Error('account is required.');
-    return (0, readContract_js_1.readContract)(client, {
-        ...rest,
-        ...getBalance.call({ account: address, ...rest }),
-    });
+    const { account: account_ = client.account, decimals, token, ...rest } = parameters;
+    if (!account_)
+        throw new account_js_1.AccountNotFoundError();
+    const account = (0, parseAccount_js_1.parseAccount)(account_).address;
+    const [amount, { decimals: resolved }] = await Promise.all([
+        (0, readContract_js_1.readContract)(client, {
+            ...rest,
+            ...getBalance.call(client, { account, token }),
+        }),
+        (0, utils_js_1.resolveTokenWithDecimals)(client, {
+            decimals,
+            token,
+        }),
+    ]);
+    return internal_Token.toAmount(amount, resolved);
 }
 (function (getBalance) {
-    function call(args) {
-        const { account, token } = args;
+    function call(client, args) {
+        const account_ = args.account ?? client.account;
+        if (!account_)
+            throw new account_js_1.AccountNotFoundError();
+        const account = (0, parseAccount_js_1.parseAccount)(account_).address;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, args).address,
             abi: Abis.tip20,
             functionName: 'balanceOf',
             args: [account],
@@ -371,9 +414,15 @@ async function getBalance(client, parameters) {
 })(getBalance || (exports.getBalance = getBalance = {}));
 async function getMetadata(client, parameters) {
     const { token, ...rest } = parameters;
-    const address = tempo_1.TokenId.toAddress(token);
+    const { address } = (0, utils_js_1.resolveToken)(client, { token });
     const abi = Abis.tip20;
-    if (tempo_1.TokenId.from(token) === tempo_1.TokenId.fromAddress(Addresses.pathUsd))
+    const declared = (0, utils_js_1.findDeclaredToken)(client, token);
+    const overrides = {
+        ...(declared?.decimals != null ? { decimals: declared.decimals } : {}),
+        ...(declared?.name != null ? { name: declared.name } : {}),
+        ...(declared?.symbol != null ? { symbol: declared.symbol } : {}),
+    };
+    if (tempo_1.TokenId.fromAddress(address) === tempo_1.TokenId.fromAddress(Addresses.pathUsd))
         return (0, multicall_js_1.multicall)(client, {
             ...rest,
             contracts: [
@@ -417,6 +466,7 @@ async function getMetadata(client, parameters) {
             decimals: unwrapMulticallResult(decimals),
             logoURI: unwrapMulticallResult(logoURI, ''),
             totalSupply: unwrapMulticallResult(totalSupply),
+            ...overrides,
         }));
     return (0, multicall_js_1.multicall)(client, {
         ...rest,
@@ -485,6 +535,7 @@ async function getMetadata(client, parameters) {
         paused: unwrapMulticallResult(paused),
         supplyCap: unwrapMulticallResult(supplyCap),
         transferPolicyId: unwrapMulticallResult(transferPolicyId),
+        ...overrides,
     }));
 }
 function unwrapMulticallResult(response, ...fallback) {
@@ -495,17 +546,42 @@ function unwrapMulticallResult(response, ...fallback) {
     }
     return response.result;
 }
+async function getTotalSupply(client, parameters) {
+    const { decimals, token, ...rest } = parameters;
+    const [amount, { decimals: resolved }] = await Promise.all([
+        (0, readContract_js_1.readContract)(client, {
+            ...rest,
+            ...getTotalSupply.call(client, { token }),
+        }),
+        (0, utils_js_1.resolveTokenWithDecimals)(client, {
+            decimals,
+            token,
+        }),
+    ]);
+    return internal_Token.toAmount(amount, resolved);
+}
+(function (getTotalSupply) {
+    function call(client, args) {
+        return (0, utils_js_1.defineCall)({
+            address: (0, utils_js_1.resolveToken)(client, args).address,
+            abi: Abis.tip20,
+            args: [],
+            functionName: 'totalSupply',
+        });
+    }
+    getTotalSupply.call = call;
+})(getTotalSupply || (exports.getTotalSupply = getTotalSupply = {}));
 async function getRoleAdmin(client, parameters) {
     return (0, readContract_js_1.readContract)(client, {
         ...parameters,
-        ...getRoleAdmin.call(parameters),
+        ...getRoleAdmin.call(client, parameters),
     });
 }
 (function (getRoleAdmin) {
-    function call(args) {
+    function call(client, args) {
         const { role, token } = args;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'getRoleAdmin',
             args: [tempo_1.TokenRole.serialize(role)],
@@ -520,14 +596,14 @@ async function hasRole(client, parameters) {
         throw new Error('account is required.');
     return (0, readContract_js_1.readContract)(client, {
         ...parameters,
-        ...hasRole.call({ ...parameters, account: address }),
+        ...hasRole.call(client, { ...parameters, account: address }),
     });
 }
 (function (hasRole) {
-    function call(args) {
+    function call(client, args) {
         const { account, role, token } = args;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'hasRole',
             args: [account, tempo_1.TokenRole.serialize(role)],
@@ -543,7 +619,7 @@ async function grantRoles(client, parameters) {
         return (await action(client, {
             ...parameters,
             calls: parameters.roles.map((role) => {
-                const call = grantRoles.call({ ...parameters, role });
+                const call = grantRoles.call(client, { ...parameters, role });
                 return {
                     ...call,
                     data: (0, encodeFunctionData_js_1.encodeFunctionData)(call),
@@ -552,11 +628,11 @@ async function grantRoles(client, parameters) {
         }));
     }
     grantRoles.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token, to, role } = args;
         const roleHash = tempo_1.TokenRole.serialize(role);
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'grantRole',
             args: [roleHash, to],
@@ -593,26 +669,29 @@ async function mint(client, parameters) {
 }
 (function (mint) {
     async function inner(action, client, parameters) {
-        const call = mint.call(parameters);
+        const { amount, memo, to, token, ...rest } = parameters;
+        const call = mint.call(client, { amount, memo, to, token });
         return (await action(client, {
-            ...parameters,
+            ...rest,
             ...call,
         }));
     }
     mint.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { to, amount, memo, token } = args;
+        const { address, decimals } = (0, utils_js_1.resolveToken)(client, { token });
+        const value = internal_Token.toBaseUnits(amount, decimals);
         const callArgs = memo
             ? {
                 functionName: 'mintWithMemo',
-                args: [to, amount, Hex.padLeft(memo, 32)],
+                args: [to, value, Hex.padLeft(memo, 32)],
             }
             : {
                 functionName: 'mint',
-                args: [to, amount],
+                args: [to, value],
             };
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address,
             abi: Abis.tip20,
             ...callArgs,
         });
@@ -648,17 +727,17 @@ async function pause(client, parameters) {
 (function (pause) {
     async function inner(action, client, parameters) {
         const { token, ...rest } = parameters;
-        const call = pause.call({ token });
+        const call = pause.call(client, { token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     pause.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token } = args;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'pause',
             args: [],
@@ -697,7 +776,7 @@ async function renounceRoles(client, parameters) {
         return (await action(client, {
             ...parameters,
             calls: parameters.roles.map((role) => {
-                const call = renounceRoles.call({ ...parameters, role });
+                const call = renounceRoles.call(client, { ...parameters, role });
                 return {
                     ...call,
                     data: (0, encodeFunctionData_js_1.encodeFunctionData)(call),
@@ -706,11 +785,11 @@ async function renounceRoles(client, parameters) {
         }));
     }
     renounceRoles.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token, role } = args;
         const roleHash = tempo_1.TokenRole.serialize(role);
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'renounceRole',
             args: [roleHash],
@@ -751,7 +830,7 @@ async function revokeRoles(client, parameters) {
         return (await action(client, {
             ...rest,
             calls: parameters.roles.map((role) => {
-                const call = revokeRoles.call({ ...parameters, role });
+                const call = revokeRoles.call(client, { ...parameters, role });
                 return {
                     ...call,
                     data: (0, encodeFunctionData_js_1.encodeFunctionData)(call),
@@ -760,11 +839,11 @@ async function revokeRoles(client, parameters) {
         }));
     }
     revokeRoles.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token, from, role } = args;
         const roleHash = tempo_1.TokenRole.serialize(role);
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'revokeRole',
             args: [roleHash, from],
@@ -802,17 +881,17 @@ async function setSupplyCap(client, parameters) {
 (function (setSupplyCap) {
     async function inner(action, client, parameters) {
         const { supplyCap, token, ...rest } = parameters;
-        const call = setSupplyCap.call({ supplyCap, token });
+        const call = setSupplyCap.call(client, { supplyCap, token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     setSupplyCap.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token, supplyCap } = args;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'setSupplyCap',
             args: [supplyCap],
@@ -849,19 +928,19 @@ async function setRoleAdmin(client, parameters) {
 (function (setRoleAdmin) {
     async function inner(action, client, parameters) {
         const { adminRole, role, token, ...rest } = parameters;
-        const call = setRoleAdmin.call({ adminRole, role, token });
+        const call = setRoleAdmin.call(client, { adminRole, role, token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     setRoleAdmin.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token, role, adminRole } = args;
         const roleHash = tempo_1.TokenRole.serialize(role);
         const adminRoleHash = tempo_1.TokenRole.serialize(adminRole);
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'setRoleAdmin',
             args: [roleHash, adminRoleHash],
@@ -897,44 +976,58 @@ async function transfer(client, parameters) {
 }
 (function (transfer) {
     async function inner(action, client, parameters) {
-        const { amount, from, memo, token, to, ...rest } = parameters;
-        const call = transfer.call({ amount, from, memo, token, to });
         return (await action(client, {
-            ...rest,
-            ...call,
+            ...parameters,
+            ...transfer.call(client, parameters),
         }));
     }
     transfer.inner = inner;
-    function call(args) {
-        const { amount, from, memo, token, to } = args;
+    function call(client, parameters) {
+        const { from, memo, to, token } = parameters;
+        const { address, decimals } = (0, utils_js_1.resolveToken)(client, { token });
+        const value = internal_Token.toBaseUnits(parameters.amount, decimals);
         const callArgs = (() => {
             if (memo && from)
                 return {
                     functionName: 'transferFromWithMemo',
-                    args: [from, to, amount, Hex.padLeft(memo, 32)],
+                    args: [from, to, value, Hex.padLeft(memo, 32)],
                 };
             if (memo)
                 return {
                     functionName: 'transferWithMemo',
-                    args: [to, amount, Hex.padLeft(memo, 32)],
+                    args: [to, value, Hex.padLeft(memo, 32)],
                 };
             if (from)
                 return {
                     functionName: 'transferFrom',
-                    args: [from, to, amount],
+                    args: [from, to, value],
                 };
             return {
                 functionName: 'transfer',
-                args: [to, amount],
+                args: [to, value],
             };
         })();
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address,
             abi: Abis.tip20,
             ...callArgs,
         });
     }
     transfer.call = call;
+    async function estimateGas(client, parameters) {
+        return (0, estimateContractGas_js_1.estimateContractGas)(client, {
+            ...(0, utils_js_1.pickWriteParameters)(parameters),
+            ...transfer.call(client, parameters),
+        });
+    }
+    transfer.estimateGas = estimateGas;
+    async function simulate(client, parameters) {
+        return (0, simulateContract_js_1.simulateContract)(client, {
+            ...(0, utils_js_1.pickWriteParameters)(parameters),
+            ...transfer.call(client, parameters),
+        });
+    }
+    transfer.simulate = simulate;
     function extractEvent(logs) {
         const [log] = (0, parseEventLogs_js_1.parseEventLogs)({
             abi: Abis.tip20,
@@ -948,14 +1041,19 @@ async function transfer(client, parameters) {
     transfer.extractEvent = extractEvent;
 })(transfer || (exports.transfer = transfer = {}));
 async function transferSync(client, parameters) {
-    const { throwOnReceiptRevert = true, ...rest } = parameters;
+    const { amount, token, throwOnReceiptRevert = true } = parameters;
+    const { decimals } = (0, utils_js_1.resolveToken)(client, { token });
+    const resolved = internal_Token.resolveAmountDecimals(amount, decimals);
     const receipt = await transfer.inner(writeContractSync_js_1.writeContractSync, client, {
-        ...rest,
+        ...parameters,
         throwOnReceiptRevert,
     });
     const { args } = transfer.extractEvent(receipt.logs);
     return {
         ...args,
+        ...(resolved === undefined
+            ? {}
+            : { decimals: resolved, formatted: (0, formatUnits_js_1.formatUnits)(args.amount, resolved) }),
         receipt,
     };
 }
@@ -965,17 +1063,17 @@ async function unpause(client, parameters) {
 (function (unpause) {
     async function inner(action, client, parameters) {
         const { token, ...rest } = parameters;
-        const call = unpause.call({ token });
+        const call = unpause.call(client, { token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     unpause.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token } = args;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'unpause',
             args: [],
@@ -1012,20 +1110,20 @@ async function prepareUpdateQuoteToken(client, parameters) {
 (function (prepareUpdateQuoteToken) {
     async function inner(action, client, parameters) {
         const { quoteToken, token, ...rest } = parameters;
-        const call = prepareUpdateQuoteToken.call({ quoteToken, token });
+        const call = prepareUpdateQuoteToken.call(client, { quoteToken, token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     prepareUpdateQuoteToken.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token, quoteToken } = args;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'setNextQuoteToken',
-            args: [tempo_1.TokenId.toAddress(quoteToken)],
+            args: [(0, utils_js_1.resolveToken)(client, { token: quoteToken }).address],
         });
     }
     prepareUpdateQuoteToken.call = call;
@@ -1055,17 +1153,17 @@ async function updateQuoteToken(client, parameters) {
 (function (updateQuoteToken) {
     async function inner(action, client, parameters) {
         const { token, ...rest } = parameters;
-        const call = updateQuoteToken.call({ token });
+        const call = updateQuoteToken.call(client, { token });
         return (await action(client, {
             ...rest,
             ...call,
         }));
     }
     updateQuoteToken.inner = inner;
-    function call(args) {
+    function call(client, args) {
         const { token } = args;
         return (0, utils_js_1.defineCall)({
-            address: tempo_1.TokenId.toAddress(token),
+            address: (0, utils_js_1.resolveToken)(client, { token }).address,
             abi: Abis.tip20,
             functionName: 'completeQuoteTokenUpdate',
             args: [],
@@ -1096,7 +1194,7 @@ function watchApprove(client, parameters) {
     const { onApproval, token, ...rest } = parameters;
     return (0, watchContractEvent_js_1.watchContractEvent)(client, {
         ...rest,
-        address: tempo_1.TokenId.toAddress(token),
+        address: (0, utils_js_1.resolveToken)(client, { token }).address,
         abi: Abis.tip20,
         eventName: 'Approval',
         onLogs: (logs) => {
@@ -1110,7 +1208,7 @@ function watchBurn(client, parameters) {
     const { onBurn, token, ...rest } = parameters;
     return (0, watchContractEvent_js_1.watchContractEvent)(client, {
         ...rest,
-        address: tempo_1.TokenId.toAddress(token),
+        address: (0, utils_js_1.resolveToken)(client, { token }).address,
         abi: Abis.tip20,
         eventName: 'Burn',
         onLogs: (logs) => {
@@ -1138,7 +1236,7 @@ function watchMint(client, parameters) {
     const { onMint, token, ...rest } = parameters;
     return (0, watchContractEvent_js_1.watchContractEvent)(client, {
         ...rest,
-        address: tempo_1.TokenId.toAddress(token),
+        address: (0, utils_js_1.resolveToken)(client, { token }).address,
         abi: Abis.tip20,
         eventName: 'Mint',
         onLogs: (logs) => {
@@ -1152,7 +1250,7 @@ function watchAdminRole(client, parameters) {
     const { onRoleAdminUpdated, token, ...rest } = parameters;
     return (0, watchContractEvent_js_1.watchContractEvent)(client, {
         ...rest,
-        address: tempo_1.TokenId.toAddress(token),
+        address: (0, utils_js_1.resolveToken)(client, { token }).address,
         abi: Abis.tip20,
         eventName: 'RoleAdminUpdated',
         onLogs: (logs) => {
@@ -1166,7 +1264,7 @@ function watchRole(client, parameters) {
     const { onRoleUpdated, token, ...rest } = parameters;
     return (0, watchContractEvent_js_1.watchContractEvent)(client, {
         ...rest,
-        address: tempo_1.TokenId.toAddress(token),
+        address: (0, utils_js_1.resolveToken)(client, { token }).address,
         abi: Abis.tip20,
         eventName: 'RoleMembershipUpdated',
         onLogs: (logs) => {
@@ -1182,7 +1280,7 @@ function watchTransfer(client, parameters) {
     const { onTransfer, token, ...rest } = parameters;
     return (0, watchContractEvent_js_1.watchContractEvent)(client, {
         ...rest,
-        address: tempo_1.TokenId.toAddress(token),
+        address: (0, utils_js_1.resolveToken)(client, { token }).address,
         abi: Abis.tip20,
         eventName: 'Transfer',
         onLogs: (logs) => {
@@ -1194,7 +1292,7 @@ function watchTransfer(client, parameters) {
 }
 function watchUpdateQuoteToken(client, parameters) {
     const { onUpdateQuoteToken, token, ...rest } = parameters;
-    const address = tempo_1.TokenId.toAddress(token);
+    const address = (0, utils_js_1.resolveToken)(client, { token }).address;
     return (0, watchContractEvent_js_1.watchContractEvent)(client, {
         ...rest,
         address,