Refactoring for more modularity

package.json

@@ -20,7 +20,7 @@
     "prepare": "husky install",
     "pretest": "pnpm lint",
     "test": "pnpm test:unit",
-    "test:unit": "jest --roots '<rootDir>/src'",
+    "test:unit": "jest --testTimeout 20000 --roots '<rootDir>/src'",
     "test:integration": "anchor test",
     "_test:integration": "jest --testTimeout 90000 --runInBand --globalSetup '<rootDir>/test/setup/globalSetup.ts' --roots '<rootDir>/test' -- $FILE",
     "lint": "gts lint",
@@ -38,8 +38,8 @@
     "@coral-xyz/anchor": "^0.28.0",
     "@marinade.finance/directed-stake-sdk": "^0.0.4",
     "@marinade.finance/native-staking-sdk": "^1.0.0",
-    "@solana/spl-stake-pool": "^0.6.5",
-    "@solana/spl-token-3.x": "npm:@solana/spl-token@^0.3.8",
+    "@solana/spl-stake-pool": "^0.7.0",
+    "@solana/spl-token": "^0.3.8",
     "borsh": "^0.7.0",
     "bs58": "^5.0.0"
   },

src/config/marinade-config.ts

@@ -1,36 +1,22 @@
-import { web3 } from '@coral-xyz/anchor'
-
-const DEFAULT_PROVIDER_URL = 'https://api.devnet.solana.com'
-
-export class MarinadeConfig {
-  marinadeFinanceProgramId = new web3.PublicKey(
-    'MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD'
-  )
-  marinadeReferralProgramId = new web3.PublicKey(
-    'MR2LqxoSbw831bNy68utpu5n4YqBH3AzDmddkgk9LQv'
-  )
-
-  marinadeStateAddress = new web3.PublicKey(
-    '8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC'
-  )
-  marinadeReferralGlobalStateAddress = new web3.PublicKey(
-    'MRSh4rUNrpn7mjAq9ENHV4rvwwPKMij113ScZq3twp2'
-  )
-
-  stakeWithdrawAuthPDA = new web3.PublicKey(
-    '9eG63CdHjsfhHmobHgLtESGC8GabbmRcaSpHAZrtmhco'
-  )
-
-  lookupTableAddress = new web3.PublicKey(
-    'DCcQeBaCiYsEsjjmEsSYPCr9o4n174LKqXNDvQT5wVd8'
-  )
-
-  connection = new web3.Connection(DEFAULT_PROVIDER_URL)
-  publicKey: web3.PublicKey | null = null
-
-  referralCode: web3.PublicKey | null = null
-
-  constructor(configOverrides: Partial<MarinadeConfig> = {}) {
-    Object.assign(this, configOverrides)
-  }
-}
+import { PublicKey } from '@solana/web3.js'
+
+export const DEFAULT_PROVIDER_URL = 'https://api.devnet.solana.com'
+
+export const DEFAULT_MARINADE_PROGRAM_ID = new PublicKey(
+  'MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD'
+)
+export const DEFAULT_MARINADE_REFERRAL_PROGRAM_ID = new PublicKey(
+  'MR2LqxoSbw831bNy68utpu5n4YqBH3AzDmddkgk9LQv'
+)
+export const DEFAULT_MARINADE_STATE_ADDRESS = new PublicKey(
+  '8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC'
+)
+export const DEFAULT_MARINADE_REFERRAL_GLOBAL_STATE_ADDRESS = new PublicKey(
+  'MRSh4rUNrpn7mjAq9ENHV4rvwwPKMij113ScZq3twp2'
+)
+// export const DEFAULT_STAKE_WITHDRAW_AUTH_PDA = new PublicKey(
+//   '9eG63CdHjsfhHmobHgLtESGC8GabbmRcaSpHAZrtmhco'
+// )
+export const LOOKUP_TABLE_ADDRESS = new PublicKey(
+  'DCcQeBaCiYsEsjjmEsSYPCr9o4n174LKqXNDvQT5wVd8'
+)

src/index.ts

@@ -1,10 +1,11 @@
-export { Marinade } from './marinade'
+export * from './marinade'
 export * from './marinade-native-stake'
-export { MarinadeConfig } from './config/marinade-config'
+export * from './marinade-directed-stake'
+export * from './config/marinade-config'
+export * from './marinade-referral-state/marinade-referral-global-state'
+export * from './marinade-referral-state/marinade-referral-partner-state'
+export * from './marinade-state/marinade-state'
 export * as MarinadeBorsh from './marinade-state/borsh/index'
-export { MarinadeReferralPartnerState } from './marinade-referral-state/marinade-referral-partner-state'
-export { MarinadeState } from './marinade-state/marinade-state'
 export { MarinadeMint } from './marinade-mint/marinade-mint'
 export * as MarinadeUtils from './util/index'
-export { Wallet, BN, web3, Provider } from '@coral-xyz/anchor'
 export * as StakePoolHelpers from './util/stake-pool-helpers'