@wireio/stake 0.5.0 → 0.5.2

package/src/assets/solana/types/liqsol_core.ts

@@ -604,25 +604,13 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "controllerState",
-          "docs": [
-            "Stake controller state - used to verify authority"
-          ]
-        },
-        {
-          "name": "globalConfig",
-          "docs": [
-            "Global config for cooldown_epochs"
-          ]
+          "name": "globalConfig"
         },
         {
           "name": "clock"
         },
         {
-          "name": "authority",
-          "docs": [
-            "Authority must match the stored authority in controller_state"
-          ],
+          "name": "cranky",
           "writable": true,
           "signer": true
         }
@@ -646,6 +634,9 @@ export type LiqsolCore = {
           "name": "admin",
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "globalState"
         },
@@ -688,6 +679,9 @@ export type LiqsolCore = {
           "name": "admin",
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "globalState",
           "writable": true
@@ -1347,14 +1341,17 @@ export type LiqsolCore = {
           "name": "globalConfig",
           "writable": true
         },
-        {
-          "name": "controllerState"
-        },
         {
           "name": "payer",
           "writable": true,
           "signer": true
         },
+        {
+          "name": "program"
+        },
+        {
+          "name": "programData"
+        },
         {
           "name": "systemProgram"
         }
@@ -1838,17 +1835,10 @@ export type LiqsolCore = {
       ],
       "accounts": [
         {
-          "name": "controllerState",
-          "docs": [
-            "Stake controller state - used to verify admin authority"
-          ]
+          "name": "globalConfig"
         },
         {
-          "name": "admin",
-          "docs": [
-            "Admin must match the stored authority in controller_state"
-          ],
-          "writable": true,
+          "name": "cranky",
           "signer": true
         },
         {
@@ -2874,6 +2864,9 @@ export type LiqsolCore = {
           "name": "admin",
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "globalState",
           "writable": true
@@ -2915,6 +2908,9 @@ export type LiqsolCore = {
           "writable": true,
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "trancheState",
           "writable": true
@@ -2947,6 +2943,9 @@ export type LiqsolCore = {
           "writable": true,
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "trancheState",
           "writable": true
@@ -2961,6 +2960,62 @@ export type LiqsolCore = {
       ],
       "args": []
     },
+    {
+      "name": "setAdmin",
+      "discriminator": [
+        251,
+        163,
+        0,
+        52,
+        91,
+        194,
+        187,
+        92
+      ],
+      "accounts": [
+        {
+          "name": "globalConfig",
+          "writable": true
+        },
+        {
+          "name": "admin",
+          "signer": true
+        },
+        {
+          "name": "newAuthority",
+          "signer": true
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "setCranky",
+      "discriminator": [
+        232,
+        48,
+        178,
+        74,
+        194,
+        60,
+        143,
+        164
+      ],
+      "accounts": [
+        {
+          "name": "globalConfig",
+          "writable": true
+        },
+        {
+          "name": "admin",
+          "signer": true
+        },
+        {
+          "name": "newAuthority",
+          "signer": true
+        }
+      ],
+      "args": []
+    },
     {
       "name": "setLastStateChangeEpoch",
       "docs": [
@@ -3017,6 +3072,9 @@ export type LiqsolCore = {
           "name": "admin",
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "globalState",
           "writable": true
@@ -3046,6 +3104,9 @@ export type LiqsolCore = {
           "name": "admin",
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "globalState",
           "writable": true
@@ -3083,6 +3144,9 @@ export type LiqsolCore = {
           "name": "admin",
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "globalState",
           "writable": true
@@ -3112,6 +3176,9 @@ export type LiqsolCore = {
           "name": "admin",
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "globalState",
           "writable": true
@@ -3194,6 +3261,9 @@ export type LiqsolCore = {
           "name": "admin",
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "globalState"
         },
@@ -3249,6 +3319,9 @@ export type LiqsolCore = {
     },
     {
       "name": "syncLeaderboardScoresBatch",
+      "docs": [
+        "region: Validator Leaderboard Syncing"
+      ],
       "discriminator": [
         52,
         11,
@@ -3511,13 +3584,7 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "controllerState"
-        },
-        {
-          "name": "authority",
-          "docs": [
-            "Authority must match StakeControllerState.authority"
-          ],
+          "name": "admin",
           "signer": true
         }
       ],
@@ -3554,13 +3621,7 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "controllerState"
-        },
-        {
-          "name": "authority",
-          "docs": [
-            "Authority must match StakeControllerState.authority"
-          ],
+          "name": "admin",
           "signer": true
         }
       ],
@@ -3597,13 +3658,7 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "controllerState"
-        },
-        {
-          "name": "authority",
-          "docs": [
-            "Authority must match StakeControllerState.authority"
-          ],
+          "name": "admin",
           "signer": true
         }
       ],
@@ -3640,13 +3695,7 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "controllerState"
-        },
-        {
-          "name": "authority",
-          "docs": [
-            "Authority must match StakeControllerState.authority"
-          ],
+          "name": "admin",
           "signer": true
         }
       ],
@@ -3683,6 +3732,9 @@ export type LiqsolCore = {
           "writable": true,
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "trancheState",
           "writable": true
@@ -3701,7 +3753,7 @@ export type LiqsolCore = {
           "type": "u16"
         },
         {
-          "name": "priceGrowthBps",
+          "name": "priceGrowthCents",
           "type": "u16"
         }
       ]
@@ -3724,6 +3776,9 @@ export type LiqsolCore = {
           "writable": true,
           "signer": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "trancheState",
           "writable": true
@@ -4188,118 +4243,8 @@ export type LiqsolCore = {
   "errors": [
     {
       "code": 6000,
-      "name": "destinationAccountDoesNotExist",
-      "msg": "Destination stake account does not exist"
-    },
-    {
-      "code": 6001,
-      "name": "sourceAccountDoesNotExist",
-      "msg": "Source stake account does not exist"
-    },
-    {
-      "code": 6002,
-      "name": "invalidDestinationOwner",
-      "msg": "Destination account not owned by stake program"
-    },
-    {
-      "code": 6003,
-      "name": "invalidSourceOwner",
-      "msg": "Source account not owned by stake program"
-    },
-    {
-      "code": 6004,
-      "name": "clockBorrowFailed",
-      "msg": "Failed to borrow clock data"
-    },
-    {
-      "code": 6005,
-      "name": "clockDeserializeFailed",
-      "msg": "Failed to deserialize clock"
-    },
-    {
-      "code": 6006,
-      "name": "destinationAnalysisFailed",
-      "msg": "Failed to analyze destination stake account"
-    },
-    {
-      "code": 6007,
-      "name": "sourceAnalysisFailed",
-      "msg": "Failed to analyze source stake account"
-    },
-    {
-      "code": 6008,
-      "name": "destinationStillActivating",
-      "msg": "Destination stake is still activating"
-    },
-    {
-      "code": 6009,
-      "name": "destinationDeactivating",
-      "msg": "Destination stake is deactivating"
-    },
-    {
-      "code": 6010,
-      "name": "sourceStillActivating",
-      "msg": "Source stake is still activating"
-    },
-    {
-      "code": 6011,
-      "name": "sourceDeactivating",
-      "msg": "Source stake is deactivating"
-    },
-    {
-      "code": 6012,
-      "name": "destinationBorrowFailed",
-      "msg": "Failed to borrow destination account data"
-    },
-    {
-      "code": 6013,
-      "name": "destinationParseFailed",
-      "msg": "Failed to parse destination stake state"
-    },
-    {
-      "code": 6014,
-      "name": "sourceBorrowFailed",
-      "msg": "Failed to borrow source account data"
-    },
-    {
-      "code": 6015,
-      "name": "sourceParseFailed",
-      "msg": "Failed to parse source stake state"
-    },
-    {
-      "code": 6016,
-      "name": "differentValidators",
-      "msg": "Stakes are delegated to different validators"
-    },
-    {
-      "code": 6017,
-      "name": "differentStakers",
-      "msg": "Stakes have different staker authorities"
-    },
-    {
-      "code": 6018,
-      "name": "differentWithdrawers",
-      "msg": "Stakes have different withdrawer authorities"
-    },
-    {
-      "code": 6019,
-      "name": "authoritiesNotFound",
-      "msg": "Could not extract authorities from accounts"
-    },
-    {
-      "code": 6020,
-      "name": "mergeInstructionFailed",
-      "msg": "Merge instruction failed"
-    },
-    {
-      "code": 6021,
-      "name": "epochRewardsActive",
-      "msg": "Epoch rewards distribution is active - stake operations blocked"
-    },
-    {
-      "code": 6022,
-      "name": "differentCreditsObserved",
-      "msg": "Stakes have different credits_observed - cannot merge until both earn same rewards"
+      "name": "accountBorrowFailed",
+      "msg": "Util Acc borrow Failed"
     }
   ],
   "types": [
@@ -4685,8 +4630,7 @@ export type LiqsolCore = {
     {
       "name": "globalConfig",
       "docs": [
-        "Zero-copy global config PDA",
-        "Authority is taken from StakeControllerState, not stored here"
+        "Zero-copy global config PDA"
       ],
       "serialization": "bytemuckunsafe",
       "repr": {
@@ -4708,6 +4652,23 @@ export type LiqsolCore = {
               ]
             }
           },
+          {
+            "name": "admin",
+            "type": "pubkey"
+          },
+          {
+            "name": "cranky",
+            "type": "pubkey"
+          },
+          {
+            "name": "reservedPubkey",
+            "type": {
+              "array": [
+                "pubkey",
+                1
+              ]
+            }
+          },
           {
             "name": "minUserDeposit",
             "docs": [
@@ -4894,10 +4855,6 @@ export type LiqsolCore = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "admin",
-            "type": "pubkey"
-          },
           {
             "name": "deployedAt",
             "type": "i64"
@@ -5858,13 +5815,6 @@ export type LiqsolCore = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "admin",
-            "docs": [
-              "Admin authority (can update growth parameters and price bounds)"
-            ],
-            "type": "pubkey"
-          },
           {
             "name": "currentTrancheNumber",
             "type": "u64"
@@ -5893,9 +5843,9 @@ export type LiqsolCore = {
             "type": "u16"
           },
           {
-            "name": "priceGrowthBps",
+            "name": "priceGrowthCents",
             "docs": [
-              "Price growth in basis points (e.g., 200 = 2%, max 10000)"
+              "Price growth in cents per tranche (0.01 USD units)"
             ],
             "type": "u16"
           },

package/src/networks/ethereum/clients/pretoken.client.ts

@@ -38,12 +38,9 @@ export class PretokenClient {
         if (allowance.lt(amountLiq)) {
             const liqWrite = this.contractService.getWrite('LiqEthToken');
 
-            // currently requested unlimited amount - potentially change to only request up to the current amount?
-            const approveAmount = ethers.constants.MaxUint256;
+            console.warn(`allowance insufficient (${allowance.toString()} < ${amountLiq.toString()}); sending approve(${depositorAddr}, ${amountLiq.toString()})`);
 
-            console.warn(`allowance insufficient (${allowance.toString()} < ${amountLiq.toString()}); sending approve(${depositorAddr}, ${approveAmount.toString()})`);
-
-            const approveTx = await liqWrite.approve(depositorAddr, approveAmount);
+            const approveTx = await liqWrite.approve(depositorAddr, amountLiq);
             await approveTx.wait(1);
 
             // re-read allowance to ensure approval succeeded

package/src/networks/ethereum/clients/stake.client.ts

@@ -50,11 +50,8 @@ export class StakeClient {
         if (allowance.lt(amountWei)) {
             const liqWrite = this.contractService.getWrite('LiqEthToken');
 
-            // currently requested unlimited amount - potentially change to only request up to the current amount?
-            const approveAmount = ethers.constants.MaxUint256;
-
-            console.warn(`allowance insufficient (${allowance.toString()} < ${amountWei.toString()}); sending approve(${depositor}, ${approveAmount.toString()})`);
-            const approveTx = await liqWrite.approve(depositor, approveAmount);
+            console.warn(`allowance insufficient (${allowance.toString()} < ${amountWei.toString()}); sending approve(${depositor}, ${amountWei.toString()})`);
+            const approveTx = await liqWrite.approve(depositor, amountWei);
             await approveTx.wait(1);
 
             // re-read allowance to ensure approval succeeded

package/src/networks/ethereum/contract.ts

@@ -23,7 +23,7 @@ import OPPArtifact from '../../assets/ethereum/ABI/outpost/OPP.sol/OPP.json';
 import OPPCommonArtifact from '../../assets/ethereum/ABI/outpost/OPPCommon.sol/OPPCommon.json';
 import OPPInboundArtifact from '../../assets/ethereum/ABI/outpost/OPPInbound.sol/OPPInbound.json';
 import PretokenArtifact from '../../assets/ethereum/ABI/outpost/Pretoken.sol/Pretoken.json';
-import AggregatorArtifact from '../../assets/ethereum/ABI/outpost/EthUsdPriceConsumer.sol/AggregatorV3Interface.json';
+import AggregatorArtifact from '../../assets/ethereum/ABI/outpost/Aggregator.sol/Aggregator.json';
 import EthUsdPriceConsumerArtifact from '../../assets/ethereum/ABI/outpost/EthUsdPriceConsumer.sol/EthUsdPriceConsumer.json';
 import PoolArtifact from '../../assets/ethereum/ABI/outpost/Pool.sol/Pool.json';
 import OutpostManagerAuthorityArtifact from '../../assets/ethereum/ABI/outpost/OutpostManagerAuthority.sol/OutpostManagerAuthority.json';
@@ -71,7 +71,7 @@ export const ADDRESSES: AddressBook = {
     Base58: "0x9F188Ec124c9ad9bF6D195650d8360Fd052F585A",
     sysio_merkle: "0x6eDA3C4c34421Cd667800C17fe33E48f5698e004",
     ReceiptNFT: "0xd083051d9bb8353875abCecAB50C6e4FB5e527a8",
-    MockAggregator: "0xD721d15Ae1D1bF58DF1B9471198d968A16B8e58D",
+    MockAggregator: "0xFCfc3ddd4CBd9Ad3b3af3A374B8bdA1b66eE6FFF",
     Pool: "0xee5F11aC9b104c18d2423f266c5E737fC95ebA92",
     OutpostManager: "0xB1B6ba7FA156652849069aC7ADB281283D235B9f",
     sysio_write: "0xEfA608136d372349C09a7aA57665C09Fb4a620Ca",
@@ -281,17 +281,17 @@ export class EthereumContractService {
             ERC721Artifact,
             ERC1155Artifact,
 
-            // liqETH suite
-            AccountingArtifact,
-            DepositManagerArtifact,
-            LiqEthArtifact,
-            // LiqEthBurnArtifact,
-            // LiqEthMintArtifact,
-            // RewardsERC20Artifact,
-            StakingModuleArtifact,
-            // ValidatorBalanceArtifact,
-            WithdrawalQueueArtifact,
-            WithdrawalVaultArtifact,
+            // // liqETH suite
+            // AccountingArtifact,
+            // DepositManagerArtifact,
+            // LiqEthArtifact,
+            // // LiqEthBurnArtifact,
+            // // LiqEthMintArtifact,
+            // // RewardsERC20Artifact,
+            // StakingModuleArtifact,
+            // // ValidatorBalanceArtifact,
+            // WithdrawalQueueArtifact,
+            // WithdrawalVaultArtifact,
             // YieldArtifact,
         ];