@raac/rpc 1.2.0-beta.6 → 1.2.0-beta.8

package/dist/configs/chains/11155111.json

@@ -17,7 +17,7 @@
         "raachouseprices": {
             "id": "raachouseprices",
             "name": "RAAC House Prices",
-            "contract": "0xF122d4Dcc791c6735d937E7118087A505c81b2b3"
+            "contract": "0x96EBC781867cF33F0Fac64e44388CBF065c78e92"
         },
         "auctionfactory": {
             "id": "auctionfactory",
@@ -37,12 +37,12 @@
         "feecollector": {
             "id": "feecollector",
             "name": "Fee Collector",
-            "contract": "0x297d74333c285d5F39820c268C9e9AAb788e3625"
+            "contract": "0xf460b2436753AEed5Df275CA33528f5C9abB579D"
         },
         "treasury": {
             "id": "treasury",
             "name": "Treasury",
-            "contract": "0x1bCE0e1C1aB90936C5975d9755FBAc4a00c3f145"
+            "contract": "0xDc1FCd959881533CCFBfB572881CdC6d8a2b35E7"
         },
         "pmtreasury": {
             "id": "pmtreasury",
@@ -72,17 +72,17 @@
         "rwavault": {
             "id": "rwavault",
             "name": "RWA Vault",
-            "contract": "0x7D819769ADDbBcc7D482E7e8FcC2812De0929875"
+            "contract": "0xEC9e67e9b6ceD5e48b5Dd39915414e7BbDf952f2"
         },
         "complianceregistry": {
             "id": "complianceregistry",
             "name": "Compliance Registry",
-            "contract": "0x0cFF98a49D62541eBb990C2B397297d477D3Ef34"
+            "contract": "0x95bc6FCfB69BDbF723De06bCa1a689ad68762CC5"
         },
         "rwaindextokencollector": {
             "id": "rwaindextokencollector",
             "name": "RWA Index Token Collector",
-            "contract": "0xc4999Db2fd4A58d870F9c8D18fBe4177308e2481"
+            "contract": "0xdbEd45218e5c040Cdf696C740937997162cFb720"
         },
         "raactokencollector": {
             "id": "raactokencollector",
@@ -92,17 +92,17 @@
         "raachousepriceoracle": {
             "id": "raachousepriceoracle",
             "name": "RAAC House Price Oracle",
-            "contract": "0x6e15A7037cB6EEA74F8a5fCD20EBaa77e331093D"
+            "contract": "0x8C881051D397014E6D4ea711764E6875506d88D1"
         },
         "raacprimerateoracle": {
             "id": "raacprimerateoracle",
             "name": "RAAC Prime Rate Oracle",
-            "contract": "0x158c6c40DF3E7f9B1AdA92Ab7D4B8b437749BF6b"
+            "contract": "0x312F47A51F398C6504B31794dfCf604acF174c67"
         },
         "crvusdtousdoracle": {
             "id": "crvusdtousdoracle",
             "name": "CRVUSD to USD Oracle",
-            "contract": "0x8A2E4B94ebf21A4b9CAF52958B2B8b6099CE46cA"
+            "contract": "0x627897baf46851500F116cec76346921C3292246"
         }
     },
     "governance": {
@@ -146,12 +146,12 @@
         "stabilitypool": {
             "id": "stabilitypool",
             "name": "Stability Pool",
-            "contract": "0xF88967cbdEf88063b4c4d0F4F5E93b429C39689A"
+            "contract": "0xd7663c079445A070Ef24405CD5ef1511B9d9E060"
         },
         "lendingpool": {
             "id": "lendingpool",
             "name": "Lending Pool",
-            "contract": "0xE281dB3E652f1c649F324aa621Fc1917f74a5243"
+            "contract": "0xefCff23AEed94ae0f23377DFDaB78C3c868eeB33"
         },
         "crvusdraacpool": {
             "id": "crvusdraacpool",
@@ -163,7 +163,7 @@
         "raacnft": {
             "id": "raacnft",
             "name": "RAAC NFT",
-            "contract": "0xbac60A20C0B932b65E18F636C94e9f4b41F3A426"
+            "contract": "0xb16453caAFF3c75e9D090793dD60C46668c1de52"
         },
         "raacbotnft": {
             "id": "raacbotnft",
@@ -194,19 +194,19 @@
             "id": "crvusd",
             "name": "CRVUSD",
             "decimals": 18,
-            "contract": "0x990c1Aa9162d2c5B51378F86420f1752874e034B"
+            "contract": "0x8047a14301583CAaf9e2128D5F88F9f435659d35"
         },
         "rtoken": {
             "id": "rtoken",
             "name": "RToken",
             "decimals": 18,
-            "contract": "0x062a641EF54810B321f123487fFf083cadB50989"
+            "contract": "0xc96c34825aa96A77A4AD884e393960a70c5f1186"
         },
         "detoken": {
             "id": "detoken",
             "name": "DEToken",
             "decimals": 18,
-            "contract": "0x229495b726Bdc55917DBE89674306D3F3Daa5aE5"
+            "contract": "0x5841dc06d2C9e0D2605392f669be71Bfe6d04cf7"
         },
         "raactoken": {
             "id": "raactoken",
@@ -230,13 +230,13 @@
             "id": "debttoken",
             "name": "Debt Token",
             "decimals": 18,
-            "contract": "0xd4bE0b77c07C58fc5cAea5629587f54572090F88"
+            "contract": "0x98db917a623a92a8553Fe59b9f05B8c936aa1E1e"
         },
         "rwaindextoken": {
             "id": "rwaindextoken",
             "name": "RWA Index Token",
             "decimals": 18,
-            "contract": "0x531b322933ebc65b4A139a11139534A3872bEB1a"
+            "contract": "0x1c1789629B2511821aC78618eBd23d41E7b04989"
         }
     },
     "adapters": {
@@ -244,13 +244,13 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0xd8Cb90b0A5b288F5f0c9a519Ae4B1B47D5E69353",
+                "contract": "0x608aD2608DAdDb633ceBe22d6Fcb7C9e660FfA65",
                 "type": "ERC721"
             },
             "rwaindextokenadapter": {
                 "id": "rwaindextokenadapter",
                 "name": "RWA Index Token",
-                "contract": "0x216433c8408A349B4b7342d60F948d89317E3366",
+                "contract": "0x5374287a807c5513fC31bc9AECE5aC40f0e37c71",
                 "type": "ERC20"
             }
         },
@@ -258,7 +258,7 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0x5b10F4F746f10632e4Bb832A2e93bd5543830D7d",
+                "contract": "0x531F5d54Fda86f103E297ECE796c8B799B835E0c",
                 "type": "ERC721"
             },
             "crvusdadapter": {
@@ -294,19 +294,49 @@
         }
     },
     "gauges": {
+        "raac_pmusd": {
+            "id": "RAAC_pmUSD",
+            "name": "RAAC pmUSD Gauge",
+            "type": "RAACGauge",
+            "contract": "0xc6471c956a6f77Af1D35Ea639a46544eE9340838",
+            "stakingToken": "0x0bd4E860e5e7A0C7c9d221Fa336976bF001F81fa",
+            "wrapped": true,
+            "underlying": "0x6F713079002a0a485E91fB276E4682CB01d18439",
+            "wrapper": "0x0bd4E860e5e7A0C7c9d221Fa336976bF001F81fa"
+        },
+        "raac_pmusd_lp": {
+            "id": "RAAC_pmUSD_LP",
+            "name": "RAAC pmUSD/RAAC LP Gauge",
+            "type": "RAACGauge",
+            "contract": "0xac6A07DEbbc683042478987f7BceEdb934161311",
+            "stakingToken": "0xAe98A7EF8557491fD34b45036Aada075c9385c6C"
+        },
         "raac_rcrvusd": {
             "id": "RAAC_RcrvUSD",
-            "name": "RAAC RcrvUSD Gauge",
+            "name": "RAAC RcrvUSD Gauge (deprecated)",
             "type": "RAACGauge",
-            "contract": "0xE8eBe8294542d47f481c17036C8165CB8935554a",
-            "stakingToken": "0x062a641EF54810B321f123487fFf083cadB50989"
+            "contract": "0xc6e49678e7a7D797Cb11EE5D2834A3896200096D",
+            "stakingToken": "0xa610498F28448Eb379BFD3179381F6f094ad110b",
+            "wrapped": true,
+            "underlying": "0x062a641EF54810B321f123487fFf083cadB50989",
+            "wrapper": "0xa610498F28448Eb379BFD3179381F6f094ad110b",
+            "_note": "Deprecated — being removed from the controller (replaced by raac_pmusd). Reclaim stuck votes via removePowerFromGauge."
         },
         "raac_crvusd_lp": {
             "id": "RAAC_crvUSD_LP",
-            "name": "RAAC crvUSD/RAAC LP Gauge",
+            "name": "RAAC crvUSD/RAAC LP Gauge (deprecated)",
             "type": "RAACGauge",
             "contract": "0x04F3e12A814b21B9F947c726be512719a41b980f",
-            "stakingToken": "0xCfDBbad91770fb7Fd57e623A59dcbD14670164c7"
+            "stakingToken": "0xCfDBbad91770fb7Fd57e623A59dcbD14670164c7",
+            "_note": "Deprecated — being removed from the controller (replaced by raac_pmusd_lp). Reclaim stuck votes via removePowerFromGauge."
+        },
+        "raac_rcrvusd_old": {
+            "id": "RAAC_RcrvUSD_old",
+            "name": "RAAC RcrvUSD Gauge (raw rebasing, removed)",
+            "type": "RAACGauge",
+            "contract": "0xE8eBe8294542d47f481c17036C8165CB8935554a",
+            "stakingToken": "0x062a641EF54810B321f123487fFf083cadB50989",
+            "_note": "Already removed from controller. Reclaim stuck votes via removePowerFromGauge."
         }
     }
 }

package/dist/contracts/governance/gaugeController/getGaugeEmissions.js

@@ -0,0 +1,136 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGaugeEmissions = 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");
+const E18 = 10n ** 18n;
+/**
+ * Per-epoch emissions actually received by a gauge: the GaugeController snapshots
+ * gauge weights per epoch, and the GaugeRewardsDistributor records the RAAC deposited
+ * per epoch. A gauge's emission for an epoch is therefore
+ *   depositedAtEpoch(epoch) × gaugeRelativeWeight(gauge, epoch).
+ *
+ * Returns a series ending at the current (in-progress) epoch so callers can chart
+ * "week of X → this gauge received Y RAAC".
+ *
+ * @param chainId - The chain/network to use.
+ * @param gauge - Gauge address (or config key).
+ * @param numEpochs - How many epochs to include, ending at the current one (default 8).
+ * @param provider - Optional ethers.js Provider instance.
+ */
+const getGaugeEmissions = async (chainId, gauge, numEpochs = 8, includeUpcoming = true, provider) => {
+    if (!provider) {
+        const rpc = chains_1.default[chainId].rpcs[0];
+        provider = new ethers_1.ethers.JsonRpcProvider(rpc);
+    }
+    const controller = new ethers_1.ethers.Contract((0, getContractAddress_1.getContractAddress)(chainId, "gaugecontroller"), (0, artifacts_1.getABI)("gaugecontroller"), provider);
+    const distributor = new ethers_1.ethers.Contract((0, getContractAddress_1.getContractAddress)(chainId, "gaugerewardsdistributor"), (0, artifacts_1.getABI)("gaugerewardsdistributor"), provider);
+    const [weekBn, currentEpochBn, startEpochBn, rewardToken] = await Promise.all([
+        controller.WEEK(),
+        controller.getCurrentEpoch(),
+        distributor.startEpoch(),
+        distributor.rewardToken(),
+    ]);
+    const week = BigInt(weekBn);
+    const currentEpoch = BigInt(currentEpochBn);
+    const startEpoch = BigInt(startEpochBn) > 0n ? BigInt(startEpochBn) : currentEpoch;
+    // Window: [currentEpoch - (numEpochs-1)*week .. currentEpoch], clamped to startEpoch.
+    const span = BigInt(Math.max(1, numEpochs) - 1) * week;
+    let from = currentEpoch - span;
+    if (from < startEpoch)
+        from = startEpoch;
+    const epochList = [];
+    for (let e = from; e <= currentEpoch; e += week)
+        epochList.push(e);
+    const epochs = await Promise.all(epochList.map(async (e) => {
+        let deposited = 0n;
+        let relativeWeight = 0n;
+        try {
+            deposited = BigInt(await distributor.depositedAtEpoch(rewardToken, e));
+        }
+        catch {
+            /* ignore */
+        }
+        try {
+            const [rel] = await controller.getGaugeRelativeWeightView(gauge, e);
+            relativeWeight = BigInt(rel);
+        }
+        catch {
+            /* no snapshot at this epoch */
+        }
+        const gaugeEmissionRaw = (deposited * relativeWeight) / E18;
+        return {
+            epoch: Number(e),
+            deposited: ethers_1.ethers.formatEther(deposited),
+            relativeWeight,
+            relativeWeightPct: Number((relativeWeight * 10000n) / E18) / 100,
+            gaugeEmission: ethers_1.ethers.formatEther(gaugeEmissionRaw),
+            gaugeEmissionRaw,
+            isCurrent: e === currentEpoch,
+        };
+    }));
+    const current = epochs[epochs.length - 1];
+    // ── Upcoming-epoch preview ────────────────────────────────────────────────
+    // Votes cast this epoch take effect at nextEpoch, so getGaugeRelativeWeightView
+    // at nextEpoch already reflects current voting. Nothing is deposited yet, so we
+    // project the distributor's deposit from the emission schedule:
+    //   projectedSystem = minterWeekly(nextEpoch) × distributorShareOfMinter
+    //   projectedGauge  = projectedSystem × gaugeRelativeWeight(nextEpoch)
+    if (includeUpcoming) {
+        const nextEpoch = currentEpoch + week;
+        let relNext = 0n;
+        let minterWeekly = 0n;
+        let distShare = 0n; // 1e18-scaled fraction of the minter routed to the distributor
+        try {
+            const [rel] = await controller.getGaugeRelativeWeightView(gauge, nextEpoch);
+            relNext = BigInt(rel);
+        }
+        catch {
+            /* no projected snapshot */
+        }
+        try {
+            const minter = new ethers_1.ethers.Contract((0, getContractAddress_1.getContractAddress)(chainId, "raacminter"), (0, artifacts_1.getABI)("raacminter"), provider);
+            minterWeekly = BigInt(await minter.calculateScheduledMintableAmount(nextEpoch, nextEpoch + week));
+            // distributor's share of the minter's weighted distribution
+            const distAddr = (0, getContractAddress_1.getContractAddress)(chainId, "gaugerewardsdistributor");
+            const [info, totalWeight] = await Promise.all([
+                minter.poolInfo(distAddr),
+                minter.totalWeight(),
+            ]);
+            const poolWeight = BigInt(info.weight ?? info[0] ?? 0n);
+            const exists = Boolean(info.exists ?? info[1]);
+            const tw = BigInt(totalWeight);
+            distShare = exists && tw > 0n ? (poolWeight * E18) / tw : 0n;
+        }
+        catch {
+            /* minter not readable — projection stays 0 */
+        }
+        const projectedSystem = (minterWeekly * distShare) / E18;
+        const projectedRaw = (projectedSystem * relNext) / E18;
+        epochs.push({
+            epoch: Number(nextEpoch),
+            deposited: ethers_1.ethers.formatEther(projectedSystem),
+            relativeWeight: relNext,
+            relativeWeightPct: Number((relNext * 10000n) / E18) / 100,
+            gaugeEmission: ethers_1.ethers.formatEther(projectedRaw),
+            gaugeEmissionRaw: projectedRaw,
+            isCurrent: false,
+            isProjected: true,
+        });
+    }
+    return {
+        gauge,
+        rewardToken,
+        currentEpoch: Number(currentEpoch),
+        weekSeconds: Number(week),
+        relativeWeightPct: current ? current.relativeWeightPct : 0,
+        currentWeekEmission: current ? current.gaugeEmission : "0",
+        epochs,
+    };
+};
+exports.getGaugeEmissions = getGaugeEmissions;

package/dist/contracts/governance/gaugeController/index.js

@@ -25,6 +25,7 @@ __exportStar(require("./getCurrentEpoch"), exports);
 __exportStar(require("./getGauge"), exports);
 __exportStar(require("./getGaugeRelativeWeight"), exports);
 __exportStar(require("./getGaugeRelativeWeightView"), exports);
+__exportStar(require("./getGaugeEmissions"), exports);
 __exportStar(require("./getGaugeWeight"), exports);
 __exportStar(require("./getLastVoteTime"), exports);
 __exportStar(require("./getNextEpoch"), exports);

package/dist/types/contracts/governance/gaugeController/getGaugeEmissions.d.ts

@@ -0,0 +1,51 @@
+import { Provider } from "ethers";
+import { ChainId } from "../../../configs/chains";
+export interface GaugeEpochEmission {
+    /** Epoch (Unix-week) start timestamp, seconds. */
+    epoch: number;
+    /** Reward token deposited into the distributor for this epoch (formatted). */
+    deposited: string;
+    /** Gauge relative weight at this epoch, 1e18-scaled (1e18 = 100%). */
+    relativeWeight: bigint;
+    /** Gauge relative weight as a percentage 0..100. */
+    relativeWeightPct: number;
+    /** RAAC this gauge received/was allocated for this epoch = deposited × relativeWeight. */
+    gaugeEmission: string;
+    gaugeEmissionRaw: bigint;
+    /** True for the in-progress (current) epoch — `deposited` may still grow via tick(). */
+    isCurrent: boolean;
+    /**
+     * True for the upcoming (next) epoch preview. Nothing is deposited yet, so `deposited`
+     * is the PROJECTED system emission for that week (schedule × distributor share) and
+     * `gaugeEmission` is the projection from the gauge's weight at `nextEpoch` — i.e. what
+     * this gauge would receive if voting stays as it currently stands.
+     */
+    isProjected?: boolean;
+}
+export interface GaugeEmissionsResult {
+    gauge: string;
+    rewardToken: string;
+    currentEpoch: number;
+    weekSeconds: number;
+    /** Current-epoch gauge relative weight as a percentage 0..100. */
+    relativeWeightPct: number;
+    /** RAAC allocated to this gauge for the current (in-progress) epoch. */
+    currentWeekEmission: string;
+    /** Per-epoch series, oldest → newest, ending at the current epoch. */
+    epochs: GaugeEpochEmission[];
+}
+/**
+ * Per-epoch emissions actually received by a gauge: the GaugeController snapshots
+ * gauge weights per epoch, and the GaugeRewardsDistributor records the RAAC deposited
+ * per epoch. A gauge's emission for an epoch is therefore
+ *   depositedAtEpoch(epoch) × gaugeRelativeWeight(gauge, epoch).
+ *
+ * Returns a series ending at the current (in-progress) epoch so callers can chart
+ * "week of X → this gauge received Y RAAC".
+ *
+ * @param chainId - The chain/network to use.
+ * @param gauge - Gauge address (or config key).
+ * @param numEpochs - How many epochs to include, ending at the current one (default 8).
+ * @param provider - Optional ethers.js Provider instance.
+ */
+export declare const getGaugeEmissions: (chainId: ChainId, gauge: string, numEpochs?: number, includeUpcoming?: boolean, provider?: Provider) => Promise<GaugeEmissionsResult>;

package/dist/types/contracts/governance/gaugeController/index.d.ts

@@ -8,6 +8,7 @@ export * from "./getCurrentEpoch";
 export * from "./getGauge";
 export * from "./getGaugeRelativeWeight";
 export * from "./getGaugeRelativeWeightView";
+export * from "./getGaugeEmissions";
 export * from "./getGaugeWeight";
 export * from "./getLastVoteTime";
 export * from "./getNextEpoch";

package/package.json

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