Contract adjustments n1

Anchor.toml

@@ -10,13 +10,13 @@ seeds = true
 skip-lint = false
 
 [programs.mainnet]
-validator_bonds = "vbondsKbsC4QSLQQnn6ngZvkqfywn6KgEeQbkGSpk1V"
+validator_bonds = "vBoNdEvzMrSai7is21XgVYik65mqtaKXuSdMBJ1xkW4"
 
 [programs.devnet]
-validator_bonds = "vbondsKbsC4QSLQQnn6ngZvkqfywn6KgEeQbkGSpk1V"
+validator_bonds = "vBoNdEvzMrSai7is21XgVYik65mqtaKXuSdMBJ1xkW4"
 
 [programs.localnet]
-validator_bonds = "vbondsKbsC4QSLQQnn6ngZvkqfywn6KgEeQbkGSpk1V"
+validator_bonds = "vBoNdEvzMrSai7is21XgVYik65mqtaKXuSdMBJ1xkW4"
 
 [registry]
 url = "https://api.apr.dev"

packages/validator-bonds-cli/__tests__/test-validator/initConfig.spec.ts

@@ -8,27 +8,28 @@ import {
   Transaction,
 } from '@solana/web3.js'
 import {
-  VALIDATOR_BONDS_PROGRAM_ID,
+  ValidatorBondsProgram,
   getConfig,
-  getProgram,
 } from '@marinade.finance/validator-bonds-sdk'
+import { initTest } from './utils'
 
 beforeAll(() => {
   shellMatchers()
 })
 
 describe('Init config account using CLI', () => {
-  const provider = AnchorProvider.env()
-  provider.opts.skipPreflight = true
-  const program = getProgram({
-    connection: provider,
-    programId: VALIDATOR_BONDS_PROGRAM_ID,
-  })
+  let provider: AnchorProvider
+  let program: ValidatorBondsProgram
 
   let configPath: string
   let configKeypair: Keypair
   let configCleanup: () => Promise<void>
 
+  beforeAll(async () => {
+    shellMatchers()
+    ;({ provider, program } = await initTest())
+  })
+
   beforeEach(async () => {
     // eslint-disable-next-line @typescript-eslint/no-extra-semi
     ;({

packages/validator-bonds-cli/__tests__/test-validator/show.spec.ts

@@ -2,28 +2,26 @@ import { AnchorProvider } from '@coral-xyz/anchor'
 import { shellMatchers } from '@marinade.finance/jest-utils'
 import YAML from 'yaml'
 import {
-  getProgram,
   initConfigInstruction,
-  VALIDATOR_BONDS_PROGRAM_ID,
   findBondsWithdrawerAuthority,
+  ValidatorBondsProgram,
 } from '@marinade.finance/validator-bonds-sdk'
 import { executeTxSimple } from '@marinade.finance/web3js-common'
 import { transaction } from '@marinade.finance/anchor-common'
 import { Keypair } from '@solana/web3.js'
+import { initTest } from './utils'
 
 beforeAll(() => {
   shellMatchers()
 })
 
 describe('Show command using CLI', () => {
-  const provider = AnchorProvider.env()
-  provider.opts.skipPreflight = true
-  provider.opts.commitment = 'confirmed'
-  const program = getProgram({
-    connection: provider.connection,
-    wallet: provider.wallet,
-    opts: provider.opts,
-    programId: VALIDATOR_BONDS_PROGRAM_ID,
+  let provider: AnchorProvider
+  let program: ValidatorBondsProgram
+
+  beforeAll(async () => {
+    shellMatchers()
+    ;({ provider, program } = await initTest())
   })
 
   it('show config', async () => {
@@ -74,6 +72,7 @@ describe('Show command using CLI', () => {
           operatorAuthority: operatorAuthority.toBase58(),
           epochsToClaimSettlement: 101,
           withdrawLockupEpochs: 102,
+          minimumStakeLamports: 1000000000,
           bondsWithdrawerAuthorityBump,
           reserved: [512],
         },
@@ -111,6 +110,7 @@ describe('Show command using CLI', () => {
             operatorAuthority: operatorAuthority.toBase58(),
             epochsToClaimSettlement: 101,
             withdrawLockupEpochs: 102,
+            minimumStakeLamports: 1000000000,
             bondsWithdrawerAuthorityBump,
             reserved: [512],
           },
@@ -175,6 +175,7 @@ describe('Show command using CLI', () => {
             operatorAuthority: operatorAuthority.toBase58(),
             epochsToClaimSettlement: 101,
             withdrawLockupEpochs: 102,
+            minimumStakeLamports: 1000000000,
             bondsWithdrawerAuthorityBump,
             reserved: [512],
           },

packages/validator-bonds-cli/__tests__/test-validator/utils.ts

@@ -0,0 +1,19 @@
+import * as anchor from '@coral-xyz/anchor'
+import { AnchorProvider } from '@coral-xyz/anchor'
+import {
+  ValidatorBondsProgram,
+  getProgram,
+} from '@marinade.finance/validator-bonds-sdk'
+
+export async function initTest(): Promise<{
+  program: ValidatorBondsProgram
+  provider: AnchorProvider
+}> {
+  if (process.env.ANCHOR_PROVIDER_URL?.includes('localhost')) {
+    // workaround to: https://github.com/coral-xyz/anchor/pull/2725
+    process.env.ANCHOR_PROVIDER_URL = 'http://127.0.0.1:8899'
+  }
+  const provider = AnchorProvider.env() as anchor.AnchorProvider
+  provider.opts.skipPreflight = true
+  return { program: getProgram(provider), provider }
+}

packages/validator-bonds-cli/src/index.ts

@@ -20,7 +20,8 @@ program
   .allowExcessArguments(false)
   .option(
     '-u, --cluster <cluster>',
-    'solana cluster URL, accepts shortcuts (d/devnet, m/mainnet) (default: http://localhost:8899)'
+    'solana cluster URL, accepts shortcuts (d/devnet, m/mainnet)',
+    'http://127.0.0.1:8899'
   )
   .option('-c <cluster>', 'alias for "-u, --cluster"')
   .option('--commitment <commitment>', 'Commitment', 'confirmed')

packages/validator-bonds-sdk/__tests__/test-validator/utils.ts

@@ -6,8 +6,11 @@ export async function initTest(): Promise<{
   program: ValidatorBondsProgram
   provider: AnchorProvider
 }> {
-  anchor.setProvider(anchor.AnchorProvider.env())
-  const provider = anchor.getProvider() as anchor.AnchorProvider
+  if (process.env.ANCHOR_PROVIDER_URL?.includes('localhost')) {
+    // workaround to: https://github.com/coral-xyz/anchor/pull/2725
+    process.env.ANCHOR_PROVIDER_URL = 'http://127.0.0.1:8899'
+  }
+  const provider = AnchorProvider.env() as anchor.AnchorProvider
   provider.opts.skipPreflight = true
   return { program: getProgram(provider), provider }
 }

packages/validator-bonds-sdk/generated/validator_bonds.ts

@@ -276,7 +276,7 @@ export type ValidatorBonds = {
           "isMut": false,
           "isSigner": false,
           "docs": [
-            "authority that the provided stake account will be assigned to, authority owner is the program"
+            "new authority owner, it's the bonds program"
           ],
           "pda": {
             "seeds": [
@@ -296,7 +296,7 @@ export type ValidatorBonds = {
         },
         {
           "name": "stakeAccount",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false,
           "docs": [
             "stake account to be deposited"
@@ -2289,7 +2289,7 @@ export type ValidatorBonds = {
       ]
     },
     {
-      "name": "DepositBondEvent",
+      "name": "FundBondEvent",
       "fields": [
         {
           "name": "bond",
@@ -2812,7 +2812,7 @@ export type ValidatorBonds = {
       ]
     },
     {
-      "name": "WithdrawEvent",
+      "name": "ClaimWithdrawRequestEvent",
       "fields": [
         {
           "name": "withdrawRequest",
@@ -2926,18 +2926,18 @@ export type ValidatorBonds = {
     },
     {
       "code": 6012,
-      "name": "HundrethBasisPointsOverflow",
+      "name": "HundredthBasisPointsOverflow",
       "msg": "Value of hundredth basis points is too big"
     },
     {
       "code": 6013,
-      "name": "HundrethBasisPointsCalculation",
-      "msg": "Hundreth basis points calculation failure"
+      "name": "HundredthBasisPointsCalculation",
+      "msg": "Hundredth basis points calculation failure"
     },
     {
       "code": 6014,
-      "name": "HundrethBasisPointsParse",
-      "msg": "Hundreth basis points failure to parse the value"
+      "name": "HundredthBasisPointsParse",
+      "msg": "Hundredth basis points failure to parse the value"
     },
     {
       "code": 6015,
@@ -3081,13 +3081,23 @@ export type ValidatorBonds = {
     },
     {
       "code": 6043,
+      "name": "NonBondStakeAuthorities",
+      "msg": "One or both stake authorities does not belong to bonds program"
+    },
+    {
+      "code": 6044,
       "name": "SettlementAuthorityMismatch",
       "msg": "Settlement stake account authority does not match with the provided stake account authority"
     },
     {
-      "code": 6044,
+      "code": 6045,
       "name": "StakeDelegationMismatch",
       "msg": "Delegation of provided stake account mismatches"
+    },
+    {
+      "code": 6046,
+      "name": "NotYetImplemented",
+      "msg": "Not yet implemented"
     }
   ]
 };
@@ -3370,7 +3380,7 @@ export const IDL: ValidatorBonds = {
           "isMut": false,
           "isSigner": false,
           "docs": [
-            "authority that the provided stake account will be assigned to, authority owner is the program"
+            "new authority owner, it's the bonds program"
           ],
           "pda": {
             "seeds": [
@@ -3390,7 +3400,7 @@ export const IDL: ValidatorBonds = {
         },
         {
           "name": "stakeAccount",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false,
           "docs": [
             "stake account to be deposited"
@@ -5383,7 +5393,7 @@ export const IDL: ValidatorBonds = {
       ]
     },
     {
-      "name": "DepositBondEvent",
+      "name": "FundBondEvent",
       "fields": [
         {
           "name": "bond",
@@ -5906,7 +5916,7 @@ export const IDL: ValidatorBonds = {
       ]
     },
     {
-      "name": "WithdrawEvent",
+      "name": "ClaimWithdrawRequestEvent",
       "fields": [
         {
           "name": "withdrawRequest",
@@ -6020,18 +6030,18 @@ export const IDL: ValidatorBonds = {
     },
     {
       "code": 6012,
-      "name": "HundrethBasisPointsOverflow",
+      "name": "HundredthBasisPointsOverflow",
       "msg": "Value of hundredth basis points is too big"
     },
     {
       "code": 6013,
-      "name": "HundrethBasisPointsCalculation",
-      "msg": "Hundreth basis points calculation failure"
+      "name": "HundredthBasisPointsCalculation",
+      "msg": "Hundredth basis points calculation failure"
     },
     {
       "code": 6014,
-      "name": "HundrethBasisPointsParse",
-      "msg": "Hundreth basis points failure to parse the value"
+      "name": "HundredthBasisPointsParse",
+      "msg": "Hundredth basis points failure to parse the value"
     },
     {
       "code": 6015,
@@ -6175,13 +6185,23 @@ export const IDL: ValidatorBonds = {
     },
     {
       "code": 6043,
+      "name": "NonBondStakeAuthorities",
+      "msg": "One or both stake authorities does not belong to bonds program"
+    },
+    {
+      "code": 6044,
       "name": "SettlementAuthorityMismatch",
       "msg": "Settlement stake account authority does not match with the provided stake account authority"
     },
     {
-      "code": 6044,
+      "code": 6045,
       "name": "StakeDelegationMismatch",
       "msg": "Delegation of provided stake account mismatches"
+    },
+    {
+      "code": 6046,
+      "name": "NotYetImplemented",
+      "msg": "Not yet implemented"
     }
   ]
 };

packages/validator-bonds-sdk/src/api.ts

@@ -2,6 +2,9 @@ import { ProgramAccount } from '@coral-xyz/anchor'
 import { PublicKey } from '@solana/web3.js'
 import { ValidatorBondsProgram, Config } from './sdk'
 
+// TODO:
+//   - users can create arbitrary stake accounts (even with lockups), sdk must be prepared for that when showing total usable deposits
+
 export async function getConfig(
   program: ValidatorBondsProgram,
   address: PublicKey