Merge pull request #8 from mean-dao/feature/new-program-address

Added support to specify MSP program ID

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mean-dao/msp",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "MSP Typescript SDK",
   "private": false,
   "main": "lib/index.js",

src/constants.ts

@@ -4,7 +4,8 @@ import { PublicKey } from '@solana/web3.js';
  * Constants
  */
 export class Constants {
-  static MSP = new PublicKey('MSPCUMbLfy2MeT6geLMMzrUkv1Tx88XRApaVRdyxTuu');
+  // DEVNET MSP program address: MSPdQo5ZdrPh6rU1LsvUv5nRhAnj1mj6YQEqBUq8YwZ
+  // MAINNET MSP program address: MSPCUMbLfy2MeT6geLMMzrUkv1Tx88XRApaVRdyxTuu
   static FEE_TREASURY = new PublicKey(
     '3TD6SWY9M1mLY2kZWJNavPLhwXvcRsWdnZLRaMzERJBw',
   );
@@ -15,6 +16,9 @@ export class Constants {
   static MAX_TX_SIZE = 1200;
   // This is an internal convention to identify the intention to use NATIVE sol and not SPL wSOL
   static SOL_MINT = new PublicKey('11111111111111111111111111111111');
+  static READONLY_PUBKEY = new PublicKey(
+    '3KmMEv7A8R3MMhScQceXBQe69qLmnFfxSM3q8HyzkrSx',
+  );
 }
 
 export const LATEST_IDL_FILE_VERSION = 4;

src/msp.ts

@@ -67,7 +67,6 @@ export class MSP {
   private connection: Connection;
   private program: Program<Msp>;
   private commitment: Commitment | ConnectionConfig | undefined;
-  private customProgramId: PublicKey | undefined;
 
   /**
    * Create a Streaming API object
@@ -76,31 +75,19 @@ export class MSP {
    */
   constructor(
     rpcUrl: string,
-    walletAddress: string,
+    programId: string,
     commitment: Commitment | string = 'finalized',
-    _customProgramId?: PublicKey,
   ) {
     this.commitment = commitment as Commitment;
     this.connection = new Connection(
       rpcUrl,
       (this.commitment as Commitment) || 'finalized',
     );
-    this.customProgramId = _customProgramId;
-    this.program = createProgram(
-      this.connection,
-      walletAddress,
-      _customProgramId,
-    );
+    this.program = createProgram(this.connection, programId);
   }
 
   public async getStream(id: PublicKey, friendly = true): Promise<any> {
-    const program = createProgram(
-      this.connection,
-      Constants.FEE_TREASURY.toBase58(),
-      this.customProgramId,
-    );
-
-    return getStream(program, id, friendly);
+    return getStream(this.program, id, friendly);
   }
 
   public async refreshStream(
@@ -111,18 +98,12 @@ export class MSP {
     const copyStreamInfo = Object.assign({}, streamInfo);
 
     if (hardUpdate) {
-      const program = createProgram(
-        this.connection,
-        Constants.FEE_TREASURY.toBase58(),
-        this.customProgramId,
-      );
-
       const streamId =
         typeof copyStreamInfo.id === 'string'
           ? new PublicKey(copyStreamInfo.id)
           : (copyStreamInfo.id as PublicKey);
 
-      return await getStream(program, streamId);
+      return await getStream(this.program, streamId);
     }
 
     return getStreamCached(copyStreamInfo, friendly);

src/utils.ts

@@ -65,24 +65,22 @@ const defaultStreamActivity: StreamActivity = {
 
 export const createProgram = (
   connection: Connection,
-  walletAddress: string,
-  _customProgramId?: PublicKey,
+  programId: string,
 ): Program<Msp> => {
   const opts: ConfirmOptions = {
     preflightCommitment: 'finalized',
     commitment: 'finalized',
   };
 
   const wallet: Wallet = {
-    publicKey: new PublicKey(walletAddress),
+    publicKey: Constants.READONLY_PUBKEY,
     signAllTransactions: async txs => txs,
     signTransaction: async tx => tx,
   };
 
   const provider = new AnchorProvider(connection, wallet, opts);
 
-  if (_customProgramId) return new Program(IDL, _customProgramId, provider);
-  return new Program(IDL, Constants.MSP, provider);
+  return new Program(IDL, programId, provider);
 };
 
 export const getStream = async (

tests/index.test.ts

@@ -48,14 +48,16 @@ describe('Tests creating a vesting treasury\n', async () => {
       lamports: 1000 * LAMPORTS_PER_SOL,
       toPubkey: new PublicKey("3TD6SWY9M1mLY2kZWJNavPLhwXvcRsWdnZLRaMzERJBw")
     }));
+    tx.add(SystemProgram.transfer({
+      fromPubkey: root.publicKey,
+      lamports: 1000 * LAMPORTS_PER_SOL,
+      toPubkey: Constants.READONLY_PUBKEY
+    }));
     await sendAndConfirmTransaction(connection, tx, [root], { commitment: 'confirmed' });
     console.log("Balance user1: : ", await connection.getBalance(user1Wallet.publicKey, 'confirmed'));
     console.log("Balance user2: : ", await connection.getBalance(user2Wallet.publicKey, 'confirmed'));
 
-    msp = new MSP(endpoint, user1Wallet.publicKey.toBase58(), 'confirmed',
-        // comment out to avoid error 'Attempt to load a program that does not exist'
-        new PublicKey("2nZ8KDGdPBexJwWznPZosioWJzNBSM3doUXUYdo37ndN")
-        );
+    msp = new MSP(endpoint, "MSPdQo5ZdrPh6rU1LsvUv5nRhAnj1mj6YQEqBUq8YwZ", 'confirmed');
   });
 
   it('Creates a vesting treasury and vesting stream\n', async () => {