@raac/rpc 1.2.0-beta.8 → 2.0.0-beta.0

package/dist/contracts/tokens/veRAAC/getTotalSupplyAtTime.js

@@ -8,13 +8,14 @@ const ethers_1 = require("ethers");
 const chains_1 = __importDefault(require("../../../configs/chains"));
 const getContractAddress_1 = require("../../getContractAddress");
 const artifacts_1 = require("../../../utils/artifacts");
+const amount_1 = require("../../../utils/amount");
 /**
  * Gets the total voting power across all accounts at a specific timestamp.
  *
  * @param chainId - The chain/network to use.
  * @param timestamp - The timestamp to check the total supply at (in seconds).
  * @param provider - Optional ethers.js Provider instance.
- * @returns The total voting power at the specified timestamp formatted in ether units.
+ * @returns The total voting power at the specified timestamp in veRAAC base units, with the `veraac` asset decimals from the chain config.
  */
 const getTotalSupplyAtTime = async (chainId, timestamp, provider) => {
     if (!provider) {
@@ -25,6 +26,6 @@ const getTotalSupplyAtTime = async (chainId, timestamp, provider) => {
     const abi = (0, artifacts_1.getABI)("veraac");
     const contract = new ethers_1.ethers.Contract(contractAddress, abi, provider);
     const totalSupply = await contract.totalSupplyAtTime(timestamp);
-    return ethers_1.ethers.formatEther(totalSupply);
+    return (0, amount_1.toTokenAmount)(chainId, "veraac", totalSupply);
 };
 exports.getTotalSupplyAtTime = getTotalSupplyAtTime;

package/dist/contracts/tokens/veRAAC/getUserPointHistory.js

@@ -8,6 +8,7 @@ const ethers_1 = require("ethers");
 const chains_1 = __importDefault(require("../../../configs/chains"));
 const getContractAddress_1 = require("../../getContractAddress");
 const artifacts_1 = require("../../../utils/artifacts");
+const amount_1 = require("../../../utils/amount");
 /**
  * Gets the user's point history from the veRAAC contract.
  * Each point records the bias (voting power), totalLocked, timestamp, and block
@@ -16,7 +17,7 @@ const artifacts_1 = require("../../../utils/artifacts");
  * @param chainId - The chain/network to use.
  * @param address - The address to query.
  * @param provider - Optional ethers.js Provider instance.
- * @returns Array of user point history entries.
+ * @returns Array of user point history entries; `bias` uses the `veraac` asset decimals, `totalLocked` and `accExpiredLocks` the `raactoken` asset decimals, from the chain config.
  */
 const getUserPointHistory = async (chainId, address, provider) => {
     if (!provider) {
@@ -28,11 +29,11 @@ const getUserPointHistory = async (chainId, address, provider) => {
     const contract = new ethers_1.ethers.Contract(contractAddress, abi, provider);
     const points = await contract.getUserPointHistory(address);
     return points.map((p) => ({
-        bias: ethers_1.ethers.formatEther(p.bias),
-        totalLocked: ethers_1.ethers.formatEther(p.totalLocked),
+        bias: (0, amount_1.toTokenAmount)(chainId, "veraac", p.bias),
+        totalLocked: (0, amount_1.toTokenAmount)(chainId, "raactoken", p.totalLocked),
         ts: Number(p.ts),
         blk: Number(p.blk),
-        accExpiredLocks: ethers_1.ethers.formatEther(p.accExpiredLocks),
+        accExpiredLocks: (0, amount_1.toTokenAmount)(chainId, "raactoken", p.accExpiredLocks),
     }));
 };
 exports.getUserPointHistory = getUserPointHistory;

package/dist/contracts/tokens/veRAAC/increase.js

@@ -9,7 +9,7 @@ const artifacts_1 = require("../../../utils/artifacts");
  * Adds more RAAC tokens to an existing lock position without changing the unlock time.
  *
  * @param chainId - The chain/network to use.
- * @param amountToAdd - Amount of additional RAAC tokens to add to the lock.
+ * @param amountToAdd - Additional RAAC to add to the lock, in RAAC base units (18 decimals).
  * @param epochEnd - The epoch end time of the existing lock to increase.
  * @param signer - An ethers.js Signer instance (must be connected to wallet).
  * @returns Transaction receipt after the increase is made.

package/dist/contracts/tokens/veRAAC/increaseWithApproval.js

@@ -1,20 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.increaseWithApproval = void 0;
-const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../../getContractAddress");
-const getAllowance_1 = __importDefault(require("../../../wallet/assets/getAllowance"));
-const approveAsset_1 = __importDefault(require("../../../wallet/assets/approveAsset"));
 const increase_1 = require("./increase");
+const _helpers_1 = require("./_helpers");
 /**
  * Increases the amount of tokens in an existing lock, auto-approving the veRAAC
  * contract first if the current allowance is insufficient.
  *
  * @param chainId - The chain/network to use.
- * @param amountToAdd - Additional RAAC amount to add to the existing lock (decimal string).
+ * @param amountToAdd - Additional RAAC to add to the existing lock, in RAAC base units (18 decimals).
  * @param epochEnd - The epoch end time of the existing lock to increase.
  * @param signer - An ethers.js Signer (must be connected to wallet).
  * @returns Transaction receipt of the increase tx.
@@ -23,15 +18,7 @@ const increaseWithApproval = async (chainId, amountToAdd, epochEnd, signer) => {
     if (!signer) {
         throw new Error("Signer is required");
     }
-    const userAddress = await signer.getAddress();
-    const veRaacAddress = (0, getContractAddress_1.getContractAddress)(chainId, "veraac");
-    const amountWei = ethers_1.ethers.parseEther(amountToAdd);
-    const allowance = await (0, getAllowance_1.default)(chainId, "raactoken", userAddress, veRaacAddress, signer.provider ?? undefined);
-    if (allowance < amountWei) {
-        console.log("[increaseWithApproval] Approving RAAC for veRAAC contract…");
-        await (0, approveAsset_1.default)(chainId, "raactoken", veRaacAddress, amountToAdd, signer);
-        console.log("[increaseWithApproval] Approval successful");
-    }
-    return (0, increase_1.increase)(chainId, amountWei, epochEnd, signer);
+    await (0, _helpers_1.ensureRAACAllowance)(chainId, (0, getContractAddress_1.getContractAddress)(chainId, "veraac"), amountToAdd, signer, "increaseWithApproval");
+    return (0, increase_1.increase)(chainId, amountToAdd, epochEnd, signer);
 };
 exports.increaseWithApproval = increaseWithApproval;

package/dist/contracts/tokens/veRAAC/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.distributeRewards = exports.finalizeRagequit = exports.ragequitLock = exports.ragequitAll = exports.claimReward = exports.withdraw = exports.extend = exports.increaseWithApproval = exports.increase = exports.lockWithApproval = exports.lock = exports.getMaxUnclaimedDistributions = exports.getRagequitEpochs = exports.getRagequitRequest = exports.getCheckpoint = exports.getUserPointHistory = exports.getEarned = exports.getClaimable = exports.getClaimed = exports.getRawTotalSupply = exports.getRawBalanceOf = exports.getTotalSupplyAtTime = exports.getTotalSupplyAt = exports.getBalanceAtTime = exports.getBalanceAt = exports.getEffectiveLockEnd = exports.getMinLockEnd = exports.getMaxLockEnd = exports.getGlobalLockInfo = exports.getLocks = exports.getLockedBalance = exports.getTotalSupply = exports.getBalance = void 0;
+exports.distributeRewards = exports.finalizeRagequit = exports.ragequitLock = exports.ragequitAll = exports.claimReward = exports.withdraw = exports.extend = exports.increaseWithApproval = exports.increase = exports.lockWithApproval = exports.lock = exports.getMaxUnclaimedDistributions = exports.getRagequitEpochs = exports.getRagequitRequest = exports.getCheckpoint = exports.getUserPointHistory = exports.getEarned = exports.getClaimable = exports.getClaimed = exports.getRawTotalSupply = exports.getRawBalanceOf = exports.getTotalSupplyAtTime = exports.getTotalSupplyAt = exports.getBalanceAtTime = exports.getBalanceAt = exports.getMinLockAmount = exports.getMinLockEnd = exports.getMaxLockEnd = exports.getGlobalLockInfo = exports.getLocks = exports.getLockedBalance = exports.getTotalSupply = exports.getBalance = void 0;
 var getBalance_1 = require("./getBalance");
 Object.defineProperty(exports, "getBalance", { enumerable: true, get: function () { return getBalance_1.getBalance; } });
 var getTotalSupply_1 = require("./getTotalSupply");
@@ -15,8 +15,8 @@ var getMaxLockEnd_1 = require("./getMaxLockEnd");
 Object.defineProperty(exports, "getMaxLockEnd", { enumerable: true, get: function () { return getMaxLockEnd_1.getMaxLockEnd; } });
 var getMinLockEnd_1 = require("./getMinLockEnd");
 Object.defineProperty(exports, "getMinLockEnd", { enumerable: true, get: function () { return getMinLockEnd_1.getMinLockEnd; } });
-var getEffectiveLockEnd_1 = require("./getEffectiveLockEnd");
-Object.defineProperty(exports, "getEffectiveLockEnd", { enumerable: true, get: function () { return getEffectiveLockEnd_1.getEffectiveLockEnd; } });
+var getMinLockAmount_1 = require("./getMinLockAmount");
+Object.defineProperty(exports, "getMinLockAmount", { enumerable: true, get: function () { return getMinLockAmount_1.getMinLockAmount; } });
 var getBalanceAt_1 = require("./getBalanceAt");
 Object.defineProperty(exports, "getBalanceAt", { enumerable: true, get: function () { return getBalanceAt_1.getBalanceAt; } });
 var getBalanceAtTime_1 = require("./getBalanceAtTime");

package/dist/contracts/tokens/veRAAC/lock.js

@@ -8,7 +8,7 @@ const artifacts_1 = require("../../../utils/artifacts");
  * Locks RAAC tokens for a specified duration to receive veRAAC voting power.
  *
  * @param chainId - The chain/network to use.
- * @param amount - The amount of RAAC tokens to lock.
+ * @param amount - The amount of RAAC to lock, in RAAC base units (18 decimals).
  * @param epochs - Number of epochs to lock tokens for (1 epoch = 7 days).
  * @param signer - An ethers.js Signer instance (must be connected to wallet).
  * @returns Transaction receipt after the lock is made.

package/dist/contracts/tokens/veRAAC/lockWithApproval.js

@@ -1,21 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lockWithApproval = void 0;
-const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../../getContractAddress");
-const getAllowance_1 = __importDefault(require("../../../wallet/assets/getAllowance"));
-const approveAsset_1 = __importDefault(require("../../../wallet/assets/approveAsset"));
 const lock_1 = require("./lock");
+const _helpers_1 = require("./_helpers");
 /**
  * Locks RAAC tokens, auto-approving the veRAAC contract first if the current
  * allowance is insufficient. Convenience wrapper so callers don't have to
  * orchestrate the approve+lock dance themselves.
  *
  * @param chainId - The chain/network to use.
- * @param amount - The amount of RAAC tokens to lock (decimal string).
+ * @param amount - The amount of RAAC to lock, in RAAC base units (18 decimals).
  * @param epochs - Number of epochs to lock tokens for.
  * @param signer - An ethers.js Signer (must be connected to wallet).
  * @returns Transaction receipt of the lock tx.
@@ -24,17 +19,7 @@ const lockWithApproval = async (chainId, amount, epochs, signer) => {
     if (!signer) {
         throw new Error("Signer is required");
     }
-    const userAddress = await signer.getAddress();
-    const veRaacAddress = (0, getContractAddress_1.getContractAddress)(chainId, "veraac");
-    const amountWei = ethers_1.ethers.parseEther(amount);
-    // Check allowance via read-only provider to avoid needing a connected provider
-    // on the signer itself — some wrapped signers (e.g. thirdweb) don't expose one.
-    const allowance = await (0, getAllowance_1.default)(chainId, "raactoken", userAddress, veRaacAddress, signer.provider ?? undefined);
-    if (allowance < amountWei) {
-        console.log("[lockWithApproval] Approving RAAC for veRAAC contract…");
-        await (0, approveAsset_1.default)(chainId, "raactoken", veRaacAddress, amount, signer);
-        console.log("[lockWithApproval] Approval successful");
-    }
-    return (0, lock_1.lock)(chainId, amountWei, epochs, signer);
+    await (0, _helpers_1.ensureRAACAllowance)(chainId, (0, getContractAddress_1.getContractAddress)(chainId, "veraac"), amount, signer, "lockWithApproval");
+    return (0, lock_1.lock)(chainId, amount, epochs, signer);
 };
 exports.lockWithApproval = lockWithApproval;

package/dist/contracts/tokens/xPM/getBalance.js

@@ -5,15 +5,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBalance = void 0;
 const ethers_1 = require("ethers");
-const chains_1 = require("../../../configs/chains");
+const chains_1 = __importDefault(require("../../../configs/chains"));
 const getContractAddress_1 = __importDefault(require("../../getContractAddress"));
+const amount_1 = require("../../../utils/amount");
 const BALANCE_OF_ABI = "function balanceOf(address account) view returns (uint256)";
-const getBalance = async (chainId, address) => {
-    const rpc = chains_1.configs[chainId].rpcs[0];
-    const provider = new ethers_1.ethers.JsonRpcProvider(rpc);
+/**
+ * Gets the xPM balance of an account.
+ *
+ * @param chainId - The chain/network to use.
+ * @param address - The account to query.
+ * @param provider - Optional ethers.js Provider instance.
+ * @returns The balance in xPM base units, with the `xpm` asset decimals from the chain config.
+ */
+const getBalance = async (chainId, address, provider) => {
+    if (!provider) {
+        const rpc = chains_1.default[chainId].rpcs[0];
+        provider = new ethers_1.ethers.JsonRpcProvider(rpc);
+    }
     const contractAddress = (0, getContractAddress_1.default)(chainId, "xpm");
     const contract = new ethers_1.ethers.Contract(contractAddress, [BALANCE_OF_ABI], provider);
     const balance = await contract.balanceOf(address);
-    return ethers_1.ethers.formatEther(balance);
+    return (0, amount_1.toTokenAmount)(chainId, "xpm", balance);
 };
 exports.getBalance = getBalance;

package/dist/contracts/tokens/xPM/getTotalSupply.js

@@ -7,18 +7,23 @@ exports.getTotalSupply = void 0;
 const ethers_1 = require("ethers");
 const chains_1 = __importDefault(require("../../../configs/chains"));
 const getContractAddress_1 = __importDefault(require("../../getContractAddress"));
+const amount_1 = require("../../../utils/amount");
 const TOTAL_SUPPLY_ABI = "function totalSupply() view returns (uint256)";
 /**
+ * Gets the xPM total supply.
  *
- * @param {number} chainId
- * @returns {Promise<string>}
+ * @param chainId - The chain/network to use.
+ * @param provider - Optional ethers.js Provider instance.
+ * @returns The total supply in xPM base units, with the `xpm` asset decimals from the chain config.
  */
-const getTotalSupply = async (chainId) => {
-    const rpc = chains_1.default[chainId].rpcs[0];
-    const provider = new ethers_1.ethers.JsonRpcProvider(rpc);
+const getTotalSupply = async (chainId, provider) => {
+    if (!provider) {
+        const rpc = chains_1.default[chainId].rpcs[0];
+        provider = new ethers_1.ethers.JsonRpcProvider(rpc);
+    }
     const contractAddress = (0, getContractAddress_1.default)(chainId, "xpm");
     const contract = new ethers_1.ethers.Contract(contractAddress, [TOTAL_SUPPLY_ABI], provider);
     const totalSupply = await contract.totalSupply();
-    return ethers_1.ethers.formatEther(totalSupply);
+    return (0, amount_1.toTokenAmount)(chainId, "xpm", totalSupply);
 };
 exports.getTotalSupply = getTotalSupply;

package/dist/contracts/zap/aladdin/zap.js

@@ -6,8 +6,16 @@ const _helpers_1 = require("./_helpers");
  * Run the configured route for `fromToken → toToken`, assuming `fromToken` is already
  * sitting in the zap contract (or msg.value covers ETH). Use `zapFrom` if the caller
  * is the holder of the input token instead.
+ * @param chainId The chain id.
+ * @param fromToken The input token address.
+ * @param amountIn The input amount in `fromToken` base units.
+ * @param toToken The output token address.
+ * @param minOut The minimum output in `toToken` base units.
+ * @param signer The caller.
+ * @param value ETH to send, in wei.
+ * @returns The sent transaction, after it is mined.
  */
-const zap = async (chainId, fromToken, amountIn, toToken, minOut, signer, value = 0) => {
+const zap = async (chainId, fromToken, amountIn, toToken, minOut, signer, value = 0n) => {
     if (!signer)
         throw new Error("Signer is required");
     const contract = await (0, _helpers_1.getAladdinZapContract)(chainId, signer);

package/dist/contracts/zap/aladdin/zapFrom.js

@@ -6,8 +6,16 @@ const _helpers_1 = require("./_helpers");
  * Pull `amountIn` of `fromToken` from the caller into the zap, then run the configured
  * route to `toToken`. Caller must approve the zap on `fromToken` for ERC20 inputs,
  * or pass `value` for ETH input.
+ * @param chainId The chain id.
+ * @param fromToken The input token address.
+ * @param amountIn The input amount in `fromToken` base units.
+ * @param toToken The output token address.
+ * @param minOut The minimum output in `toToken` base units.
+ * @param signer The caller.
+ * @param value ETH to send, in wei.
+ * @returns The sent transaction, after it is mined.
  */
-const zapFrom = async (chainId, fromToken, amountIn, toToken, minOut, signer, value = 0) => {
+const zapFrom = async (chainId, fromToken, amountIn, toToken, minOut, signer, value = 0n) => {
     if (!signer)
         throw new Error("Signer is required");
     const contract = await (0, _helpers_1.getAladdinZapContract)(chainId, signer);

package/dist/contracts/zap/aladdin/zapWithRoutes.js

@@ -7,6 +7,15 @@ const validateRoute_1 = require("./validateRoute");
  * Run an explicit list of packed-uint256 routes from `fromToken` to `toToken`.
  * Routes are validated client-side first; pass `skipValidation: true` only if you
  * really know what you're doing.
+ * @param chainId The chain id.
+ * @param fromToken The input token address.
+ * @param amountIn The input amount in `fromToken` base units.
+ * @param toToken The output token address.
+ * @param routes The packed uint256 routes.
+ * @param minOut The minimum output in `toToken` base units.
+ * @param signer The caller.
+ * @param options `value` is the ETH to send, in wei; `skipValidation` skips client-side route checks.
+ * @returns The sent transaction, after it is mined.
  */
 const zapWithRoutes = async (chainId, fromToken, amountIn, toToken, routes, minOut, signer, options = {}) => {
     if (!signer)
@@ -17,11 +26,11 @@ const zapWithRoutes = async (chainId, fromToken, amountIn, toToken, routes, minO
             const issues = validation.results
                 .flatMap((r, i) => (r.valid ? [] : [`route[${i}]: ${r.errors.join("; ")}`]))
                 .join(" | ");
-            throw new Error(`zapWithRoutes: invalid routes — ${issues}`);
+            throw new Error(`zapWithRoutes: invalid routes: ${issues}`);
         }
     }
     const contract = await (0, _helpers_1.getAladdinZapContract)(chainId, signer);
-    const tx = await contract.zapWithRoutes(fromToken, amountIn, toToken, routes.map((r) => (typeof r === "bigint" ? r : BigInt(r))), minOut, { value: options.value ?? 0 });
+    const tx = await contract.zapWithRoutes(fromToken, amountIn, toToken, routes.map((r) => (typeof r === "bigint" ? r : BigInt(r))), minOut, { value: options.value ?? 0n });
     await tx.wait();
     return tx;
 };

package/dist/contracts/zeno/createAuction.js

@@ -3,6 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../../utils/contracts");
 const artifacts_1 = require("../../utils/artifacts");
+/**
+ * Creates a ZENO auction through the AuctionFactory.
+ * @param chainId The chain id.
+ * @param zenoAddress The ZENO bond token sold.
+ * @param usdcAddress The payment token bidders pay with.
+ * @param businessAddress The issuer receiving the proceeds.
+ * @param auctionStartTime UNIX timestamp (seconds) the auction starts.
+ * @param auctionEndTime UNIX timestamp (seconds) the auction ends.
+ * @param startingPrice The Dutch auction starting price, in payment token base units per whole ZENO.
+ * @param reservePrice The Dutch auction reserve price, in payment token base units per whole ZENO.
+ * @param totalZenoAllocated The ZENO offered, in ZENO base units.
+ * @param signer The signer sending the transaction.
+ */
 async function createAuction(chainId, zenoAddress, usdcAddress, businessAddress, auctionStartTime, auctionEndTime, startingPrice, reservePrice, totalZenoAllocated, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");

package/dist/contracts/zeno/getAuctions.js

@@ -3,6 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../../utils/contracts");
 const artifacts_1 = require("../../utils/artifacts");
+const amount_1 = require("../../utils/amount");
+/**
+ * Lists every auction created by the AuctionFactory.
+ * @param chainId The chain id.
+ * @param signer The signer to read with.
+ * @returns One record per auction. Price and bid amounts use the auction's payment token, ZENO amounts the ZENO
+ * token; decimals and symbols come from the chain config registry and fall back to 18 when the token is not listed.
+ */
 async function getAuctions(chainId, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -15,9 +23,24 @@ async function getAuctions(chainId, signer) {
         const auctions = [];
         for (let i = 0; i < auctionsCount; i++) {
             const auction = await auctionFactoryContract.getAuctionDetails(i);
-            auctions.push(auction);
+            const auctionContract = new ethers_1.ethers.Contract(auction.auctionAddress, (0, artifacts_1.getABI)("auction"), signer);
+            const paymentToken = await auctionContract.token();
+            auctions.push({
+                auctionAddress: auction.auctionAddress,
+                zenoAddress: auction.zenoAddress,
+                businessAddress: auction.businessAddress,
+                auctionStartTime: auction.auctionStartTime,
+                auctionEndTime: auction.auctionEndTime,
+                startingPrice: (0, amount_1.toTokenAmount)(chainId, paymentToken, auction.startingPrice),
+                reservePrice: (0, amount_1.toTokenAmount)(chainId, paymentToken, auction.reservePrice),
+                price: (0, amount_1.toTokenAmount)(chainId, paymentToken, auction.price),
+                totalZENOAllocated: (0, amount_1.toTokenAmount)(chainId, auction.zenoAddress, auction.totalZENOAllocated),
+                totalZENORemaining: (0, amount_1.toTokenAmount)(chainId, auction.zenoAddress, auction.totalZENORemaining),
+                lastBidTime: auction.lastBidTime,
+                lastBidder: auction.lastBidder,
+                lastBidAmount: (0, amount_1.toTokenAmount)(chainId, paymentToken, auction.lastBidAmount),
+            });
         }
-        console.log(`Auctions: ${auctions}`);
         return auctions;
     }
     catch (error) {