Merge pull request #4447 from BitGo/WP-0000-test-solana-lib-bump

fix(root): upgrade solana lib
BitGo · Apr 17, 2024 · 1220446 · 1220446
2 parents bdc37cc + 85d3cc3
commit 1220446
Show file tree

Hide file tree

Showing 8 changed files with 153 additions and 173 deletions.
diff --git a/modules/account-lib/package.json b/modules/account-lib/package.json
@@ -68,7 +68,7 @@
     "bs58": "^4.0.1"
   },
   "devDependencies": {
-    "@solana/web3.js": "1.56.0",
+    "@solana/web3.js": "1.91.6",
     "@types/bs58": "^4.0.1",
     "keccak": "3.0.3",
     "paillier-bigint": "3.3.0",

diff --git a/modules/sdk-coin-sol/package.json b/modules/sdk-coin-sol/package.json
@@ -44,7 +44,7 @@
     "@bitgo/sdk-lib-mpc": "^9.2.0",
     "@bitgo/statics": "^48.6.0",
     "@solana/spl-token": "0.3.1",
-    "@solana/web3.js": "1.78.0",
+    "@solana/web3.js": "1.91.6",
     "bignumber.js": "^9.0.0",
     "bs58": "^4.0.1",
     "lodash": "^4.17.14",

diff --git a/modules/sdk-coin-sol/src/lib/constants.ts b/modules/sdk-coin-sol/src/lib/constants.ts
@@ -5,6 +5,7 @@ export const MEMO_PROGRAM_PK = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
 export const SEED_LENGTH = 32;
 
 export const MAX_MEMO_LENGTH = 100;
+export const STAKE_ACCOUNT_RENT_EXEMPT_AMOUNT = 2282880;
 
 export const UNAVAILABLE_TEXT = 'UNAVAILABLE';
 

diff --git a/modules/sdk-coin-sol/src/lib/solInstructionFactory.ts b/modules/sdk-coin-sol/src/lib/solInstructionFactory.ts
@@ -241,12 +241,15 @@ function stakingDeactivateInstruction(data: StakingDeactivate): TransactionInstr
     });
     tx.add(assignAccount);
 
-    const splitStake = StakeProgram.split({
-      stakePubkey: new PublicKey(stakingAddress),
-      authorizedPubkey: new PublicKey(fromAddress),
-      splitStakePubkey: unstakingAddress,
-      lamports: new BigNumber(data.params.amount).toNumber(),
-    });
+    const splitStake = StakeProgram.split(
+      {
+        stakePubkey: new PublicKey(stakingAddress),
+        authorizedPubkey: new PublicKey(fromAddress),
+        splitStakePubkey: unstakingAddress,
+        lamports: new BigNumber(data.params.amount).toNumber(),
+      },
+      0
+    );
     tx.add(splitStake.instructions[1]);
 
     const deactivateStaking = StakeProgram.deactivate({

diff --git a/modules/sdk-coin-sol/src/lib/stakingDeactivateBuilder.ts b/modules/sdk-coin-sol/src/lib/stakingDeactivateBuilder.ts
@@ -2,7 +2,7 @@ import { BaseCoin as CoinConfig } from '@bitgo/statics';
 import assert from 'assert';
 
 import { BuildTransactionError, TransactionType } from '@bitgo/sdk-core';
-import { InstructionBuilderTypes } from './constants';
+import { InstructionBuilderTypes, STAKE_ACCOUNT_RENT_EXEMPT_AMOUNT } from './constants';
 import { StakingDeactivate, Transfer } from './iface';
 import { Transaction } from './transaction';
 import { TransactionBuilder } from './transactionBuilder';
@@ -12,7 +12,6 @@ export class StakingDeactivateBuilder extends TransactionBuilder {
   protected _stakingAddress: string;
   protected _stakingAddresses: string[];
   protected _amount?: string;
-  protected _fundUnstakeAddress = 2282880;
   protected _unstakingAddress: string;
 
   constructor(_coinConfig: Readonly<CoinConfig>) {
@@ -146,7 +145,7 @@ export class StakingDeactivateBuilder extends TransactionBuilder {
           type: InstructionBuilderTypes.Transfer,
           params: {
             fromAddress: this._sender,
-            amount: this._fundUnstakeAddress.toString(),
+            amount: STAKE_ACCOUNT_RENT_EXEMPT_AMOUNT.toString(),
             toAddress: this._unstakingAddress,
           },
         };

diff --git a/modules/sdk-coin-sol/test/unit/instructionParamsFactory.staking.ts b/modules/sdk-coin-sol/test/unit/instructionParamsFactory.staking.ts
@@ -3,7 +3,7 @@ import * as testData from '../resources/sol';
 import { instructionParamsFactory } from '../../src/lib/instructionParamsFactory';
 import { TransactionType } from '@bitgo/sdk-core';
 import { InstructionParams, Nonce, StakingActivate, StakingDeactivate, StakingWithdraw } from '../../src/lib/iface';
-import { InstructionBuilderTypes, MEMO_PROGRAM_PK } from '../../src/lib/constants';
+import { InstructionBuilderTypes, MEMO_PROGRAM_PK, STAKE_ACCOUNT_RENT_EXEMPT_AMOUNT } from '../../src/lib/constants';
 import {
   Keypair as SolKeypair,
   Lockup,
@@ -484,12 +484,15 @@ describe('Instruction Parser Staking Tests: ', function () {
             programId: StakeProgram.programId,
           });
 
-          const splitInstructions = StakeProgram.split({
-            stakePubkey: stakingAccount,
-            authorizedPubkey: fromAccount,
-            splitStakePubkey: splitStakeAccount,
-            lamports: 100000,
-          }).instructions;
+          const splitInstructions = StakeProgram.split(
+            {
+              stakePubkey: stakingAccount,
+              authorizedPubkey: fromAccount,
+              splitStakePubkey: splitStakeAccount,
+              lamports: 100000,
+            },
+            0
+          ).instructions;
 
           const stakingDeactivateInstructions = StakeProgram.deactivate({
             authorizedPubkey: fromAccount,
@@ -532,12 +535,15 @@ describe('Instruction Parser Staking Tests: ', function () {
             space: StakeProgram.space,
           });
 
-          const splitInstructions = StakeProgram.split({
-            stakePubkey: stakingAccount,
-            authorizedPubkey: fromAccount,
-            splitStakePubkey: splitStakeAccount,
-            lamports: 100000,
-          }).instructions;
+          const splitInstructions = StakeProgram.split(
+            {
+              stakePubkey: stakingAccount,
+              authorizedPubkey: fromAccount,
+              splitStakePubkey: splitStakeAccount,
+              lamports: 100000,
+            },
+            0
+          ).instructions;
 
           const stakingDeactivateInstructions = StakeProgram.deactivate({
             authorizedPubkey: fromAccount,
@@ -624,12 +630,15 @@ describe('Instruction Parser Staking Tests: ', function () {
             space: StakeProgram.space,
           });
 
-          const splitInstructions = StakeProgram.split({
-            stakePubkey: stakingAccount,
-            authorizedPubkey: fromAccount,
-            splitStakePubkey: splitStakeAccount,
-            lamports: 100000,
-          }).instructions;
+          const splitInstructions = StakeProgram.split(
+            {
+              stakePubkey: stakingAccount,
+              authorizedPubkey: fromAccount,
+              splitStakePubkey: splitStakeAccount,
+              lamports: 100000,
+            },
+            0
+          ).instructions;
 
           const assignInstruction = SystemProgram.assign({
             accountPubkey: splitStakeAccount,
@@ -683,12 +692,15 @@ describe('Instruction Parser Staking Tests: ', function () {
             programId: StakeProgram.programId,
           });
 
-          const splitInstructions = StakeProgram.split({
-            stakePubkey: stakingAccount,
-            authorizedPubkey: fromAccount,
-            splitStakePubkey: splitStakeAccount,
-            lamports: 100000,
-          }).instructions;
+          const splitInstructions = StakeProgram.split(
+            {
+              stakePubkey: stakingAccount,
+              authorizedPubkey: fromAccount,
+              splitStakePubkey: splitStakeAccount,
+              lamports: 100000,
+            },
+            0
+          ).instructions;
 
           const stakingDeactivateInstructions = StakeProgram.deactivate({
             authorizedPubkey: fromAccount,
@@ -738,12 +750,15 @@ describe('Instruction Parser Staking Tests: ', function () {
               programId: StakeProgram.programId,
             });
 
-            const splitInstructions = StakeProgram.split({
-              stakePubkey: stakingAccount,
-              authorizedPubkey: fromAccount,
-              splitStakePubkey: splitStakeAccount,
-              lamports: 100000,
-            }).instructions;
+            const splitInstructions = StakeProgram.split(
+              {
+                stakePubkey: stakingAccount,
+                authorizedPubkey: fromAccount,
+                splitStakePubkey: splitStakeAccount,
+                lamports: 100000,
+              },
+              0
+            ).instructions;
 
             const stakingDeactivateInstructions = StakeProgram.deactivate({
               authorizedPubkey: fromAccount,
@@ -793,12 +808,15 @@ describe('Instruction Parser Staking Tests: ', function () {
             programId: SystemProgram.programId,
           });
 
-          const splitInstructions = StakeProgram.split({
-            stakePubkey: stakingAccount,
-            authorizedPubkey: fromAccount,
-            splitStakePubkey: splitStakeAccount,
-            lamports: 100000,
-          }).instructions;
+          const splitInstructions = StakeProgram.split(
+            {
+              stakePubkey: stakingAccount,
+              authorizedPubkey: fromAccount,
+              splitStakePubkey: splitStakeAccount,
+              lamports: 100000,
+            },
+            0
+          ).instructions;
 
           const stakingDeactivateInstructions = StakeProgram.deactivate({
             authorizedPubkey: fromAccount,
@@ -848,12 +866,15 @@ describe('Instruction Parser Staking Tests: ', function () {
             programId: StakeProgram.programId,
           });
 
-          const splitInstructions = StakeProgram.split({
-            stakePubkey: stakingAccount,
-            authorizedPubkey: fromAccount,
-            splitStakePubkey: stakingAccount,
-            lamports: 100000,
-          }).instructions;
+          const splitInstructions = StakeProgram.split(
+            {
+              stakePubkey: stakingAccount,
+              authorizedPubkey: fromAccount,
+              splitStakePubkey: stakingAccount,
+              lamports: 100000,
+            },
+            0
+          ).instructions;
 
           const stakingDeactivateInstructions = StakeProgram.deactivate({
             authorizedPubkey: fromAccount,
@@ -902,12 +923,15 @@ describe('Instruction Parser Staking Tests: ', function () {
             programId: StakeProgram.programId,
           });
 
-          const splitInstructions = StakeProgram.split({
-            stakePubkey: stakingAccount,
-            authorizedPubkey: fromAccount,
-            splitStakePubkey: stakingAccount,
-            lamports: 100000,
-          }).instructions;
+          const splitInstructions = StakeProgram.split(
+            {
+              stakePubkey: stakingAccount,
+              authorizedPubkey: fromAccount,
+              splitStakePubkey: stakingAccount,
+              lamports: 100000,
+            },
+            0
+          ).instructions;
 
           const stakingDeactivateInstructions = StakeProgram.deactivate({
             authorizedPubkey: fromAccount,
@@ -951,7 +975,7 @@ describe('Instruction Parser Staking Tests: ', function () {
         const transferInstruction = SystemProgram.transfer({
           fromPubkey: new PublicKey(fromAccount),
           toPubkey: new PublicKey(splitStakeAccount),
-          lamports: parseInt((2282880).toString(), 10),
+          lamports: parseInt(STAKE_ACCOUNT_RENT_EXEMPT_AMOUNT.toString(), 10),
         });
 
         const allocateInstruction = SystemProgram.allocate({
@@ -964,12 +988,15 @@ describe('Instruction Parser Staking Tests: ', function () {
           programId: StakeProgram.programId,
         });
 
-        const splitInstructions = StakeProgram.split({
-          stakePubkey: stakingAccount,
-          authorizedPubkey: fromAccount,
-          splitStakePubkey: splitStakeAccount,
-          lamports: 100000,
-        }).instructions;
+        const splitInstructions = StakeProgram.split(
+          {
+            stakePubkey: stakingAccount,
+            authorizedPubkey: fromAccount,
+            splitStakePubkey: splitStakeAccount,
+            lamports: 100000,
+          },
+          0
+        ).instructions;
 
         const stakingDeactivateInstructions = StakeProgram.deactivate({
           authorizedPubkey: fromAccount,

diff --git a/package.json b/package.json
@@ -75,6 +75,7 @@
     "@polkadot/x-global": "12.3.2",
     "@polkadot/x-randomvalues": "12.3.2",
     "@polkadot/x-ws": "12.3.2",
+    "@solana/web3.js": "1.91.6",
     "@substrate/txwrapper-core": "7.0.1",
     "@substrate/txwrapper-polkadot": "7.0.1",
     "buffer": "^6.0.3",