[contract] changing bond authority from vote account withdrawer to va…

…lidator identity (#10)

* [contract] changing bond authority from vote account withdrawer to validator identity

* removal vote withdrawer keypair generation in test as not needed

.github/workflows/typescript-lint.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   lint-and-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 50
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
@@ -28,6 +28,19 @@ jobs:
         with:
           components: rustfmt, clippy
 
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/            
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
       - run: pnpm install
       - run: pnpm lint
       - run: pnpm test:cargo

package.json

@@ -32,7 +32,7 @@
         "ts-jest": "^29.1.1",
         "ts-node": "^10.9.1",
         "typescript": "4.9.5",
-        "@marinade.finance/jest-utils": "^2.0.20"
+        "@marinade.finance/jest-utils": "^2.0.21"
     },
     "pnpm": {
         "peerDependencyRules": {

packages/validator-bonds-cli/README.md

@@ -19,8 +19,9 @@ The bond account is bound to a validator vote account.
 ```sh
 # bond account at mainnet
 validator-bonds -um init-bond -k <fee-payer-keypair> \
-  --vote-account <vote-account-pubkey> --vote-account-withdrawer <vote-account-withdrawer-keypair> \
-  --bond-authority <authority-on-bond-account-pubkey> --rent-payer <rent-payer-account-keypair>
+  --vote-account <vote-account-pubkey> --validator-identity <validator-identity-keypair> \
+  --bond-authority <authority-on-bond-account-pubkey> \
+  --rent-payer <rent-payer-account-keypair>
 
 # to configure bond account properties
 validator-bonds -um configure-bond --help

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

@@ -12,34 +12,29 @@ import {
 } from '@marinade.finance/validator-bonds-sdk/__tests__/utils/testTransactions'
 import {
   AnchorExtendedProvider,
+  getValidatorInfo,
   initTest,
 } from '@marinade.finance/validator-bonds-sdk/__tests__/test-validator/testValidator'
-import { createVoteAccount } from '@marinade.finance/validator-bonds-sdk/__tests__/utils/staking'
+import { createVoteAccountWithIdentity } from '@marinade.finance/validator-bonds-sdk/__tests__/utils/staking'
 
 describe('Configure bond account using CLI', () => {
   let provider: AnchorExtendedProvider
   let program: ValidatorBondsProgram
-  let voteWithdrawerPath: string
-  let voteWithdrawerKeypair: Keypair
-  let voteWithdrawerCleanup: () => Promise<void>
   let bondAuthorityPath: string
   let bondAuthorityKeypair: Keypair
   let bondAuthorityCleanup: () => Promise<void>
   let configAccount: PublicKey
   let bondAccount: PublicKey
   let voteAccount: PublicKey
+  let validatorIdentity: Keypair
+  let validatorIdentityPath: string
 
   beforeAll(async () => {
     shellMatchers()
     ;({ provider, program } = await initTest())
   })
 
   beforeEach(async () => {
-    ;({
-      path: voteWithdrawerPath,
-      keypair: voteWithdrawerKeypair,
-      cleanup: voteWithdrawerCleanup,
-    } = await createTempFileKeypair())
     ;({
       path: bondAuthorityPath,
       keypair: bondAuthorityKeypair,
@@ -54,26 +49,26 @@ describe('Configure bond account using CLI', () => {
     expect(
       provider.connection.getAccountInfo(configAccount)
     ).resolves.not.toBeNull()
-    ;({ voteAccount } = await createVoteAccount(
+    ;({ validatorIdentity, validatorIdentityPath } = await getValidatorInfo(
+      provider.connection
+    ))
+    ;({ voteAccount } = await createVoteAccountWithIdentity(
       provider,
-      undefined,
-      undefined,
-      voteWithdrawerKeypair
+      validatorIdentity
     ))
     ;({ bondAccount } = await executeInitBondInstruction(
       program,
       provider,
       configAccount,
       bondAuthorityKeypair,
       voteAccount,
-      voteWithdrawerKeypair,
+      validatorIdentity,
       33
     ))
   })
 
   afterEach(async () => {
     await bondAuthorityCleanup()
-    await voteWithdrawerCleanup()
   })
 
   it('configure bond account', async () => {
@@ -125,7 +120,7 @@ describe('Configure bond account using CLI', () => {
           '--vote-account',
           voteAccount.toBase58(),
           '--authority',
-          voteWithdrawerPath,
+          validatorIdentityPath,
           '--bond-authority',
           newBondAuthority.toBase58(),
           '--revenue-share',

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

@@ -15,9 +15,10 @@ import {
 import { executeInitConfigInstruction } from '@marinade.finance/validator-bonds-sdk/__tests__/utils/testTransactions'
 import {
   AnchorExtendedProvider,
+  getValidatorInfo,
   initTest,
 } from '@marinade.finance/validator-bonds-sdk/__tests__/test-validator/testValidator'
-import { createVoteAccount } from '@marinade.finance/validator-bonds-sdk/__tests__/utils/staking'
+import { createVoteAccountWithIdentity } from '@marinade.finance/validator-bonds-sdk/__tests__/utils/staking'
 
 describe('Init bond account using CLI', () => {
   let provider: AnchorExtendedProvider
@@ -26,11 +27,10 @@ describe('Init bond account using CLI', () => {
   let rentPayerKeypair: Keypair
   let rentPayerCleanup: () => Promise<void>
   const rentPayerFunds = 10 * LAMPORTS_PER_SOL
-  let voteWithdrawerPath: string
-  let voteWithdrawerKeypair: Keypair
-  let voteWithdrawerCleanup: () => Promise<void>
   let configAccount: PublicKey
   let voteAccount: PublicKey
+  let validatorIdentity: Keypair
+  let validatorIdentityPath: string
 
   beforeAll(async () => {
     shellMatchers()
@@ -43,11 +43,6 @@ describe('Init bond account using CLI', () => {
       keypair: rentPayerKeypair,
       cleanup: rentPayerCleanup,
     } = await createTempFileKeypair())
-    ;({
-      path: voteWithdrawerPath,
-      keypair: voteWithdrawerKeypair,
-      cleanup: voteWithdrawerCleanup,
-    } = await createTempFileKeypair())
     ;({ configAccount } = await executeInitConfigInstruction({
       program,
       provider,
@@ -57,11 +52,12 @@ describe('Init bond account using CLI', () => {
     expect(
       provider.connection.getAccountInfo(configAccount)
     ).resolves.not.toBeNull()
-    ;({ voteAccount } = await createVoteAccount(
+    ;({ validatorIdentity, validatorIdentityPath } = await getValidatorInfo(
+      provider.connection
+    ))
+    ;({ voteAccount } = await createVoteAccountWithIdentity(
       provider,
-      undefined,
-      undefined,
-      voteWithdrawerKeypair
+      validatorIdentity
     ))
 
     const tx = new Transaction().add(
@@ -79,7 +75,6 @@ describe('Init bond account using CLI', () => {
 
   afterEach(async () => {
     await rentPayerCleanup()
-    await voteWithdrawerCleanup()
   })
 
   it('init bond account', async () => {
@@ -99,8 +94,8 @@ describe('Init bond account using CLI', () => {
           configAccount.toBase58(),
           '--vote-account',
           voteAccount.toBase58(),
-          '--vote-account-withdrawer',
-          voteWithdrawerPath,
+          '--validator-identity',
+          validatorIdentityPath,
           '--bond-authority',
           bondAuthority.publicKey.toBase58(),
           '--revenue-share',

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

@@ -207,17 +207,15 @@ describe('Show command using CLI', () => {
     expect(
       provider.connection.getAccountInfo(configAccount)
     ).resolves.not.toBeNull()
-    const { voteAccount, authorizedWithdrawer } = await createVoteAccount(
-      provider
-    )
+    const { voteAccount, validatorIdentity } = await createVoteAccount(provider)
     const bondAuthority = Keypair.generate()
     const { bondAccount } = await executeInitBondInstruction(
       program,
       provider,
       configAccount,
       bondAuthority,
       voteAccount,
-      authorizedWithdrawer,
+      validatorIdentity,
       222
     )
     const [, bump] = bondAddress(configAccount, voteAccount, program.programId)

packages/validator-bonds-cli/package.json

@@ -27,9 +27,9 @@
     "@marinade.finance/validator-bonds-sdk": "^1.0.1",
     "@coral-xyz/anchor": "^0.29.0",
     "@solana/web3.js": "^1.87.6",
-    "@marinade.finance/cli-common": "^2.0.20",
-    "@marinade.finance/anchor-common": "^2.0.20",
-    "@marinade.finance/web3js-common": "^2.0.20",
+    "@marinade.finance/cli-common": "^2.0.21",
+    "@marinade.finance/anchor-common": "^2.0.21",
+    "@marinade.finance/web3js-common": "^2.0.21",
     "bn.js": "^5.2.1",
     "jsbi": "^4.3.0",
     "commander": "^9.5.0",
@@ -39,6 +39,6 @@
     "yaml": "^2.3.3"
   },
   "devDependencies": {
-    "@marinade.finance/jest-utils": "^2.0.20"
+    "@marinade.finance/jest-utils": "^2.0.21"
   }
 }

packages/validator-bonds-cli/src/commands/manage/configureBond.ts

@@ -37,7 +37,7 @@ export function installConfigureBond(program: Command) {
       '--authority <keypair_or_pubkey>',
       'Authority that is permitted to do changes in bonds account. ' +
         'It is either the authority defined in bonds account or ' +
-        'validator vote account withdrawer authority that the bond account is connected to. ' +
+        'vote account validator identity that the bond account is connected to. ' +
         '(default: wallet keypair)',
       parsePubkeyOrKeypair
     )

packages/validator-bonds-cli/src/commands/manage/initBond.ts

@@ -26,9 +26,9 @@ export function installInitBond(program: Command) {
       parsePubkey
     )
     .option(
-      '--vote-account-withdrawer <keypair_or_pubkey>',
-      'Validator vote account withdrawer authority. ' +
-        'To create the bond the signature of the account is needed (default: wallet keypair)',
+      '--validator-identity <keypair_or_pubkey>',
+      'Validator identity linked to the vote account. ' +
+        'To create the bond the signature of the validator identity is needed (default: wallet keypair)',
       parsePubkeyOrKeypair
     )
     .option(
@@ -52,22 +52,22 @@ export function installInitBond(program: Command) {
       async ({
         config,
         voteAccount,
-        voteAccountWithdrawer,
+        validatorIdentity,
         bondAuthority,
         revenueShare,
         rentPayer,
       }: {
         config?: Promise<PublicKey>
         voteAccount: Promise<PublicKey>
-        voteAccountWithdrawer?: Promise<PublicKey | Keypair>
+        validatorIdentity?: Promise<PublicKey | Keypair>
         bondAuthority: Promise<PublicKey>
         revenueShare: number
         rentPayer?: Promise<PublicKey | Keypair>
       }) => {
         await manageInitBond({
           config: await config,
           voteAccount: await voteAccount,
-          voteAccountWithdrawer: await voteAccountWithdrawer,
+          validatorIdentity: await validatorIdentity,
           bondAuthority: await bondAuthority,
           revenueShare: revenueShare,
           rentPayer: await rentPayer,
@@ -79,14 +79,14 @@ export function installInitBond(program: Command) {
 async function manageInitBond({
   config = CONFIG_ADDRESS,
   voteAccount,
-  voteAccountWithdrawer,
+  validatorIdentity,
   bondAuthority,
   revenueShare,
   rentPayer,
 }: {
   config?: PublicKey
   voteAccount: PublicKey
-  voteAccountWithdrawer?: PublicKey | Keypair
+  validatorIdentity?: PublicKey | Keypair
   bondAuthority: PublicKey
   revenueShare: number
   rentPayer?: PublicKey | Keypair
@@ -102,10 +102,10 @@ async function manageInitBond({
     signers.push(rentPayer)
     rentPayer = rentPayer.publicKey
   }
-  voteAccountWithdrawer = voteAccountWithdrawer || wallet.publicKey
-  if (voteAccountWithdrawer instanceof Keypair) {
-    signers.push(voteAccountWithdrawer)
-    voteAccountWithdrawer = voteAccountWithdrawer.publicKey
+  validatorIdentity = validatorIdentity || wallet.publicKey
+  if (validatorIdentity instanceof Keypair) {
+    signers.push(validatorIdentity)
+    validatorIdentity = validatorIdentity.publicKey
   }
 
   bondAuthority = bondAuthority || wallet.publicKey
@@ -115,7 +115,7 @@ async function manageInitBond({
     configAccount: config,
     bondAuthority,
     validatorVoteAccount: voteAccount,
-    validatorVoteWithdrawer: voteAccountWithdrawer,
+    validatorIdentity,
     revenueShareHundredthBps: revenueShare,
     rentPayer,
   })

packages/validator-bonds-sdk/__tests__/bankrun/configureBond.spec.ts

@@ -22,7 +22,7 @@ describe('Validator Bonds configure bond account', () => {
   let config: ProgramAccount<Config>
   let bond: ProgramAccount<Bond>
   let bondAuthority: Keypair
-  let withdrawerAuthority: Keypair
+  let validatorIdentity: Keypair
   let voterAuthority: Keypair
 
   beforeAll(async () => {
@@ -38,23 +38,26 @@ describe('Validator Bonds configure bond account', () => {
       publicKey: configAccount,
       account: await getConfig(program, configAccount),
     }
-    const { voteAccount, authorizedWithdrawer, authorizedVoter } =
-      await createVoteAccount(provider)
+    const {
+      voteAccount,
+      validatorIdentity: nodePubkey,
+      authorizedVoter,
+    } = await createVoteAccount(provider)
     bondAuthority = Keypair.generate()
     const { bondAccount } = await executeInitBondInstruction(
       program,
       provider,
       config.publicKey,
       bondAuthority,
       voteAccount,
-      authorizedWithdrawer,
+      nodePubkey,
       123
     )
     bond = {
       publicKey: bondAccount,
       account: await getBond(program, bondAccount),
     }
-    withdrawerAuthority = authorizedWithdrawer
+    validatorIdentity = nodePubkey
     voterAuthority = authorizedVoter
   })
 
@@ -91,10 +94,10 @@ describe('Validator Bonds configure bond account', () => {
     const { instruction } = await configureBondInstruction({
       program,
       bondAccount: bond.publicKey,
-      authority: withdrawerAuthority,
+      authority: validatorIdentity,
       newBondAuthority: newBondAuthority.publicKey,
     })
-    await provider.sendIx([withdrawerAuthority], instruction)
+    await provider.sendIx([validatorIdentity], instruction)
 
     const bondData = await getBond(program, bond.publicKey)
     expect(bondData.config).toEqual(config.publicKey)