@raac/rpc 1.2.0-beta.1 → 1.2.0-beta.2

package/dist/RPCLibrary.js

@@ -215,6 +215,9 @@ const distributeRewards_1 = require("./contracts/tokens/veRAAC/distributeRewards
 const getUserPointHistory_1 = require("./contracts/tokens/veRAAC/getUserPointHistory");
 const getCheckpoint_1 = require("./contracts/tokens/veRAAC/getCheckpoint");
 const getRagequitRequest_1 = require("./contracts/tokens/veRAAC/getRagequitRequest");
+const getRagequitEpochs_1 = require("./contracts/tokens/veRAAC/getRagequitEpochs");
+const lockWithApproval_1 = require("./contracts/tokens/veRAAC/lockWithApproval");
+const increaseWithApproval_1 = require("./contracts/tokens/veRAAC/increaseWithApproval");
 const getRawBalanceOf_2 = require("./contracts/tokens/veRAAC/getRawBalanceOf");
 const getRawTotalSupply_2 = require("./contracts/tokens/veRAAC/getRawTotalSupply");
 const getEffectiveLockEnd_1 = require("./contracts/tokens/veRAAC/getEffectiveLockEnd");
@@ -386,6 +389,9 @@ class RPCLibrary {
                 getUserPointHistory: getUserPointHistory_1.getUserPointHistory,
                 getCheckpoint: getCheckpoint_1.getCheckpoint,
                 getRagequitRequest: getRagequitRequest_1.getRagequitRequest,
+                getRagequitEpochs: getRagequitEpochs_1.getRagequitEpochs,
+                lockWithApproval: lockWithApproval_1.lockWithApproval,
+                increaseWithApproval: increaseWithApproval_1.increaseWithApproval,
                 getRawBalanceOf: getRawBalanceOf_2.getRawBalanceOf,
                 getRawTotalSupply: getRawTotalSupply_2.getRawTotalSupply,
                 getEffectiveLockEnd: getEffectiveLockEnd_1.getEffectiveLockEnd,

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

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRagequitEpochs = void 0;
+const ethers_1 = require("ethers");
+const chains_1 = __importDefault(require("../../../configs/chains"));
+const getContractAddress_1 = require("../../getContractAddress");
+const artifacts_1 = require("../../../utils/artifacts");
+/**
+ * Gets the ragequit cooldown duration (in epochs) from the veRAAC contract.
+ * The actual cooldown in seconds is `ragequitEpochs * epochDuration`.
+ *
+ * @param chainId - The chain/network to use.
+ * @param provider - Optional ethers.js Provider instance.
+ * @returns Number of epochs the user must wait between ragequit initiation and finalization.
+ */
+const getRagequitEpochs = 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.getContractAddress)(chainId, "veraac");
+    const abi = (0, artifacts_1.getABI)("veraac");
+    const contract = new ethers_1.ethers.Contract(contractAddress, abi, provider);
+    const epochs = await contract.ragequitEpochs();
+    return Number(epochs);
+};
+exports.getRagequitEpochs = getRagequitEpochs;

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

@@ -0,0 +1,37 @@
+"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");
+/**
+ * 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 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.
+ */
+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);
+};
+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.increase = exports.lock = exports.getMaxUnclaimedDistributions = 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.getEffectiveLockEnd = 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");
@@ -41,12 +41,18 @@ var getCheckpoint_1 = require("./getCheckpoint");
 Object.defineProperty(exports, "getCheckpoint", { enumerable: true, get: function () { return getCheckpoint_1.getCheckpoint; } });
 var getRagequitRequest_1 = require("./getRagequitRequest");
 Object.defineProperty(exports, "getRagequitRequest", { enumerable: true, get: function () { return getRagequitRequest_1.getRagequitRequest; } });
+var getRagequitEpochs_1 = require("./getRagequitEpochs");
+Object.defineProperty(exports, "getRagequitEpochs", { enumerable: true, get: function () { return getRagequitEpochs_1.getRagequitEpochs; } });
 var getMaxUnclaimedDistributions_1 = require("./getMaxUnclaimedDistributions");
 Object.defineProperty(exports, "getMaxUnclaimedDistributions", { enumerable: true, get: function () { return getMaxUnclaimedDistributions_1.getMaxUnclaimedDistributions; } });
 var lock_1 = require("./lock");
 Object.defineProperty(exports, "lock", { enumerable: true, get: function () { return lock_1.lock; } });
+var lockWithApproval_1 = require("./lockWithApproval");
+Object.defineProperty(exports, "lockWithApproval", { enumerable: true, get: function () { return lockWithApproval_1.lockWithApproval; } });
 var increase_1 = require("./increase");
 Object.defineProperty(exports, "increase", { enumerable: true, get: function () { return increase_1.increase; } });
+var increaseWithApproval_1 = require("./increaseWithApproval");
+Object.defineProperty(exports, "increaseWithApproval", { enumerable: true, get: function () { return increaseWithApproval_1.increaseWithApproval; } });
 var extend_1 = require("./extend");
 Object.defineProperty(exports, "extend", { enumerable: true, get: function () { return extend_1.extend; } });
 var withdraw_1 = require("./withdraw");

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

@@ -0,0 +1,40 @@
+"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");
+/**
+ * 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 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.
+ */
+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);
+};
+exports.lockWithApproval = lockWithApproval;

package/dist/types/RPCLibrary.d.ts

@@ -177,6 +177,9 @@ import { distributeRewards as veRAACDistributeRewards } from "./contracts/tokens
 import { getUserPointHistory as getVeRAACUserPointHistory } from "./contracts/tokens/veRAAC/getUserPointHistory";
 import { getCheckpoint as getVeRAACCheckpoint } from "./contracts/tokens/veRAAC/getCheckpoint";
 import { getRagequitRequest as getVeRAACRagequitRequest } from "./contracts/tokens/veRAAC/getRagequitRequest";
+import { getRagequitEpochs as getVeRAACRagequitEpochs } from "./contracts/tokens/veRAAC/getRagequitEpochs";
+import { lockWithApproval as veRAACLockWithApproval } from "./contracts/tokens/veRAAC/lockWithApproval";
+import { increaseWithApproval as veRAACIncreaseWithApproval } from "./contracts/tokens/veRAAC/increaseWithApproval";
 import { getRawBalanceOf as getVeRAACRawBalanceOf } from "./contracts/tokens/veRAAC/getRawBalanceOf";
 import { getRawTotalSupply as getVeRAACRawTotalSupply } from "./contracts/tokens/veRAAC/getRawTotalSupply";
 import { getEffectiveLockEnd as getVeRAACEffectiveLockEnd } from "./contracts/tokens/veRAAC/getEffectiveLockEnd";
@@ -376,6 +379,9 @@ declare class RPCLibrary {
             getUserPointHistory: typeof getVeRAACUserPointHistory;
             getCheckpoint: typeof getVeRAACCheckpoint;
             getRagequitRequest: typeof getVeRAACRagequitRequest;
+            getRagequitEpochs: typeof getVeRAACRagequitEpochs;
+            lockWithApproval: typeof veRAACLockWithApproval;
+            increaseWithApproval: typeof veRAACIncreaseWithApproval;
             getRawBalanceOf: typeof getVeRAACRawBalanceOf;
             getRawTotalSupply: typeof getVeRAACRawTotalSupply;
             getEffectiveLockEnd: typeof getVeRAACEffectiveLockEnd;

package/dist/types/contracts/tokens/veRAAC/getRagequitEpochs.d.ts

@@ -0,0 +1,11 @@
+import { Provider } from "ethers";
+import { ChainId } from "../../../configs/chains";
+/**
+ * Gets the ragequit cooldown duration (in epochs) from the veRAAC contract.
+ * The actual cooldown in seconds is `ragequitEpochs * epochDuration`.
+ *
+ * @param chainId - The chain/network to use.
+ * @param provider - Optional ethers.js Provider instance.
+ * @returns Number of epochs the user must wait between ragequit initiation and finalization.
+ */
+export declare const getRagequitEpochs: (chainId: ChainId, provider?: Provider) => Promise<number>;

package/dist/types/contracts/tokens/veRAAC/increaseWithApproval.d.ts

@@ -0,0 +1,13 @@
+import { ethers, Signer } from "ethers";
+import { ChainId } from "../../../configs/chains";
+/**
+ * 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 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.
+ */
+export declare const increaseWithApproval: (chainId: ChainId, amountToAdd: string, epochEnd: number, signer: Signer) => Promise<ethers.ContractTransactionResponse>;

package/dist/types/contracts/tokens/veRAAC/index.d.ts

@@ -18,9 +18,12 @@ export { getEarned } from "./getEarned";
 export { getUserPointHistory, type UserPoint } from "./getUserPointHistory";
 export { getCheckpoint, type Checkpoint } from "./getCheckpoint";
 export { getRagequitRequest, type RagequitRequest } from "./getRagequitRequest";
+export { getRagequitEpochs } from "./getRagequitEpochs";
 export { getMaxUnclaimedDistributions } from "./getMaxUnclaimedDistributions";
 export { lock } from "./lock";
+export { lockWithApproval } from "./lockWithApproval";
 export { increase } from "./increase";
+export { increaseWithApproval } from "./increaseWithApproval";
 export { extend } from "./extend";
 export { withdraw } from "./withdraw";
 export { claimReward } from "./claimReward";

package/dist/types/contracts/tokens/veRAAC/lockWithApproval.d.ts

@@ -0,0 +1,14 @@
+import { ethers, Signer } from "ethers";
+import { ChainId } from "../../../configs/chains";
+/**
+ * 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 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.
+ */
+export declare const lockWithApproval: (chainId: ChainId, amount: string, epochs: number, signer: Signer) => Promise<ethers.ContractTransactionResponse>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@raac/rpc",
-	"version": "1.2.0-beta.1",
+	"version": "1.2.0-beta.2",
 	"description": "RPC Library for RAAC",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",