@raac/rpc 2.0.0-beta.21 → 2.0.0-beta.23

package/dist/configs/chains/1.json

@@ -133,6 +133,7 @@
     "psm": {
         "rpsm-susds": {
             "id": "rpsm-sUSDS",
+            "version": "1.0.0",
             "name": "RAAC Peg Stability Module sUSDS",
             "contract": "0xB2102B4d8802648EC6A9e89ACD46b4B799833469",
             "rateProvider": "0x9a6b5BDA2128e6341175c79E43Cd2A7E0C5F5b21"

package/dist/configs/chains/11155111.json

@@ -188,9 +188,10 @@
     "psm": {
         "rpsm-susds": {
             "id": "rpsm-sUSDS",
+            "version": "1.0.0",
             "name": "RAAC Peg Stability Module sUSDS",
-            "contract": "0xbcA54A6E7BeD62Ad3aA5660c0e51FeA1F6A47289",
-            "rateProvider": "0xB3b47F65dFeca20991148BAfe8dc34e1aDb6939b"
+            "contract": "0x1c7Dfbc9bea1d8b6eb33ce8C715dC5313DC3d8B8",
+            "rateProvider": "0xC0508Cf612C507E22E75C89501E7A1F64D634bd9"
         }
     },
     "pools": {
@@ -317,6 +318,20 @@
             "decimals": 6,
             "contract": "0xBBfc1B017954e2F65378b189735dd7be279AbC2A"
         },
+        "usds": {
+            "id": "usds",
+            "name": "USDS",
+            "symbol": "USDS",
+            "decimals": 18,
+            "contract": "0x169e984ec1F8111fA0fe570dD2630621688e82F4"
+        },
+        "susds": {
+            "id": "susds",
+            "name": "Savings USDS",
+            "symbol": "sUSDS",
+            "decimals": 18,
+            "contract": "0xAADD480013475e416cAC2F511697060c920bEE67"
+        },
         "rtoken": {
             "id": "rtoken",
             "name": "RToken",

package/dist/contracts/governance/gauge/getUserGaugeState.js

@@ -13,8 +13,7 @@ const _tokens_1 = require("./_tokens");
 const RAW_BALANCE_OF_ABI = ["function rawBalanceOf(address account) view returns (uint256)"];
 const tokenState = async (chainId, token, user, spender, provider) => {
     const contract = new ethers_1.ethers.Contract(token, _tokens_1.ERC20_ABI, provider);
-    const [balance, allowance, { decimals, symbol }] = await Promise.all([
-        contract.balanceOf(user),
+    const [allowance, { decimals, symbol }] = await Promise.all([
         contract.allowance(user, spender),
         (0, resolveTokenInfo_1.resolveTokenInfo)(chainId, token, provider),
     ]);
@@ -22,14 +21,14 @@ const tokenState = async (chainId, token, user, spender, provider) => {
         address: ethers_1.ethers.getAddress(token),
         symbol,
         decimals,
-        balance: (0, amount_1.toAmount)(balance, decimals, symbol),
         allowance: (0, amount_1.toAmount)(allowance, decimals, symbol),
         spender: ethers_1.ethers.getAddress(spender),
     };
 };
 /**
- * What a wallet needs to stake in, wrap for, or unstake from a gauge: its stake, its balance of the staking token and its
- * allowance to the gauge, and for a wrapped gauge its balance of the underlying and allowance to the wrapper.
+ * What a wallet needs to stake in, wrap for, or unstake from a gauge: its stake, its allowance of the staking token to the
+ * gauge, and for a wrapped gauge its allowance of the underlying to the wrapper. Read the wallet's token balances with
+ * `wallet.assets.getBalance`.
  *
  * @param chainId - The chain/network to use.
  * @param gaugeAddressOrId - Address of the gauge contract or its config ID.

package/dist/contracts/psm/_helpers.js

@@ -4,7 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePsmVault = resolvePsmVault;
+exports.getPsmVaultMajor = getPsmVaultMajor;
 exports.getPsmVaultContract = getPsmVaultContract;
+exports.getPairingToken = getPairingToken;
+exports.getPairingTokenDecimals = getPairingTokenDecimals;
 exports.getPsmRateProviderContract = getPsmRateProviderContract;
 exports.getDefaultProvider = getDefaultProvider;
 exports.getTokenReaderContract = getTokenReaderContract;
@@ -29,11 +32,38 @@ function resolvePsmVault(chainId, vaultKeyOrAddress) {
         throw new Error(`PSM vault "${vaultKeyOrAddress}" not configured for chain ${chainId}`);
     return { key, entry: psm[key] };
 }
+/** The first PSMVault major that calls the pairing token `pairingToken` instead of `savingsToken`. */
+const PAIRING_TOKEN_RENAME_MAJOR = 3;
+/**
+ * Major version of the vault's implementation, from the config entry's `version`.
+ * @throws When the version is missing, malformed, or has no ABI in this library.
+ */
+function getPsmVaultMajor(entry) {
+    const major = Number(entry.version?.split(".")[0]);
+    if (!Number.isInteger(major) || !(major in artifacts_1.PSM_VAULT_ABIS)) {
+        throw new Error(`PSM vault ${entry.contract} has unsupported version "${entry.version}"`);
+    }
+    return major;
+}
+/**
+ * The vault contract with the ABI of its configured version. Typed as the V1 surface, which every version shares
+ * except the pairing token getters; read those through `getPairingToken` and `getPairingTokenDecimals`.
+ */
 function getPsmVaultContract(chainId, vaultKeyOrAddress, providerOrSigner) {
-    const { key, entry } = resolvePsmVault(chainId, vaultKeyOrAddress);
-    const abi = (0, artifacts_1.getABI)(key);
+    const { entry } = resolvePsmVault(chainId, vaultKeyOrAddress);
+    const abi = artifacts_1.PSM_VAULT_ABIS[getPsmVaultMajor(entry)];
     return new ethers_1.ethers.Contract(entry.contract, abi, providerOrSigner);
 }
+/** The vault's pairing token address: `pairingToken()` from V3 on, `savingsToken()` before. */
+function getPairingToken(vault, major) {
+    return major >= PAIRING_TOKEN_RENAME_MAJOR ? vault.pairingToken() : vault.savingsToken();
+}
+/** The vault's cached pairing token decimals: `pairingTokenDecimals()` from V3 on, `savingsTokenDecimals()` before. */
+function getPairingTokenDecimals(vault, major) {
+    return major >= PAIRING_TOKEN_RENAME_MAJOR
+        ? vault.pairingTokenDecimals()
+        : vault.savingsTokenDecimals();
+}
 function getPsmRateProviderContract(chainId, vaultKeyOrAddress, providerOrSigner) {
     const { entry } = resolvePsmVault(chainId, vaultKeyOrAddress);
     const abi = (0, artifacts_1.getABI)("rateprovider");

package/dist/contracts/psm/getVaultInfo.js

@@ -19,6 +19,7 @@ async function getVaultInfo(chainId, vaultKeyOrAddress, userAddress, provider) {
     const contractAddress = entry.contract;
     try {
         const vault = (0, _helpers_1.getPsmVaultContract)(chainId, vaultKeyOrAddress, provider);
+        const major = (0, _helpers_1.getPsmVaultMajor)(entry);
         const [totalAssets, totalSupply, vaultDecimals, depositCap, swapFee, computeWithdrawFee, withdrawTime, withdrawTimeLimit, dripRate, dripEnd, pendingRewards, vaultComposition, minWithdrawFee, maxWithdrawFee, rebalancer, baseAssetModule, reserveRatioFloor, rebalanceThreshold, dripDuration, paused, circuitBreakerEnabled, navFloor, savingsToken, baseAsset,] = await Promise.all([
             vault.totalAssets(),
             vault.totalSupply(),
@@ -42,7 +43,7 @@ async function getVaultInfo(chainId, vaultKeyOrAddress, userAddress, provider) {
             vault.paused(),
             vault.circuitBreakerEnabled(),
             vault.navFloor(),
-            vault.savingsToken(),
+            (0, _helpers_1.getPairingToken)(vault, major),
             vault.asset(),
         ]);
         const savingsTokenContract = (0, _helpers_1.getTokenReaderContract)(savingsToken, provider);
@@ -65,14 +66,12 @@ async function getVaultInfo(chainId, vaultKeyOrAddress, userAddress, provider) {
         let user = null;
         if (userAddress) {
             const baseAssetContract = (0, _helpers_1.getTokenReaderContract)(baseAsset, provider);
-            const [shareBalance, redeemRequest, savingsTokenAllowance, baseAssetAllowance] = await Promise.all([
-                vault.balanceOf(userAddress),
+            const [redeemRequest, savingsTokenAllowance, baseAssetAllowance] = await Promise.all([
                 vault.redeemRequests(userAddress),
                 savingsTokenContract.allowance(userAddress, contractAddress),
                 baseAssetContract.allowance(userAddress, contractAddress),
             ]);
             user = {
-                shareBalance: (0, amount_1.toAmount)(shareBalance, Number(vaultDecimals), entry.id),
                 redeemRequest: {
                     shares: (0, amount_1.toAmount)(redeemRequest[0], Number(vaultDecimals), entry.id),
                     exitTime: Number(redeemRequest[1]),
@@ -82,6 +81,7 @@ async function getVaultInfo(chainId, vaultKeyOrAddress, userAddress, provider) {
             };
         }
         return {
+            version: entry.version,
             totalAssets: (0, amount_1.toTokenAmount)(chainId, "pmusd", totalAssets),
             totalSupply: (0, amount_1.toAmount)(totalSupply, Number(vaultDecimals), entry.id),
             depositCap: (0, amount_1.toTokenAmount)(chainId, "susds", depositCap),

package/dist/contracts/psm/getVaultSettings.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVaultSettings = getVaultSettings;
+const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 const rpcError_1 = require("../../utils/rpcError");
+const EIP1967_ADMIN_SLOT = "0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
 /**
  * Reads a PSM vault's settings from its storage getters only. Unlike `getVaultInfo`, nothing here touches the rate
  * provider, so it still answers when the savings token price is stale (`StalePrice`), which is when an operator
@@ -14,8 +16,10 @@ const rpcError_1 = require("../../utils/rpcError");
 async function getVaultSettings(chainId, vaultKeyOrAddress, provider) {
     const { entry } = (0, _helpers_1.resolvePsmVault)(chainId, vaultKeyOrAddress);
     try {
-        const vault = (0, _helpers_1.getPsmVaultContract)(chainId, vaultKeyOrAddress, provider ?? (0, _helpers_1.getDefaultProvider)(chainId));
-        const [paused, swapFee, minWithdrawFee, maxWithdrawFee, withdrawTime, withdrawTimeLimit, circuitBreakerEnabled, navFloor, reserveRatioFloor, rebalanceThreshold, depositCap, savingsTokenDecimals, baseAsset, savingsToken, rateProvider, rebalancer, baseAssetModule,] = await Promise.all([
+        const reader = provider ?? (0, _helpers_1.getDefaultProvider)(chainId);
+        const vault = (0, _helpers_1.getPsmVaultContract)(chainId, vaultKeyOrAddress, reader);
+        const major = (0, _helpers_1.getPsmVaultMajor)(entry);
+        const [paused, swapFee, minWithdrawFee, maxWithdrawFee, withdrawTime, withdrawTimeLimit, circuitBreakerEnabled, navFloor, reserveRatioFloor, rebalanceThreshold, depositCap, savingsTokenDecimals, baseAsset, savingsToken, rateProvider, rebalancer, baseAssetModule, adminSlot,] = await Promise.all([
             vault.paused(),
             vault.swapFee(),
             vault.minWithdrawFee(),
@@ -27,14 +31,19 @@ async function getVaultSettings(chainId, vaultKeyOrAddress, provider) {
             vault.reserveRatioFloor(),
             vault.rebalanceThreshold(),
             vault.depositCap(),
-            vault.savingsTokenDecimals(),
+            (0, _helpers_1.getPairingTokenDecimals)(vault, major),
             vault.baseAsset(),
-            vault.savingsToken(),
+            (0, _helpers_1.getPairingToken)(vault, major),
             vault.rateProvider(),
             vault.rebalancer(),
             vault.baseAssetModule(),
+            reader.getStorage(entry.contract, EIP1967_ADMIN_SLOT),
         ]);
+        const admin = ethers_1.ethers.getAddress(ethers_1.ethers.dataSlice(adminSlot, 12));
+        const proxyAdmin = admin === ethers_1.ethers.ZeroAddress ? null : admin;
+        const proxyAdminOwner = proxyAdmin && (await new ethers_1.ethers.Contract(proxyAdmin, ["function owner() view returns (address)"], reader).owner());
         return {
+            version: entry.version,
             paused,
             swapFee,
             minWithdrawFee,
@@ -52,6 +61,8 @@ async function getVaultSettings(chainId, vaultKeyOrAddress, provider) {
             rateProvider,
             rebalancer,
             baseAssetModule,
+            proxyAdmin,
+            proxyAdminOwner,
         };
     }
     catch (error) {