WIP. Removed all instances of keypair in api/index.ts, replaced with Wallet. Not finished in text-serde, or tests and examples.

Author: cbosborn

src/api/index.ts

@@ -1,7 +1,7 @@
 import * as anchor from '@project-serum/anchor';
 import { EventParser } from '@project-serum/anchor';
 import { Wallet } from '@project-serum/anchor/src/provider';
-import { Connection, Keypair, PublicKey } from '@solana/web3.js';
+import { Connection, PublicKey } from '@solana/web3.js';
 
 import { sleep, waitForFinality, Wallet_ } from '../utils';
 import { ENCRYPTION_OVERHEAD_BYTES } from '../utils/ecdh-encryption';
@@ -118,37 +118,37 @@ export async function getMetadataProgramAddress(
 // TODO: Simplify this function further now that we're no longer decrypting the device token.
 export async function getMetadata(
   program: anchor.Program,
-  user: PublicKey | anchor.web3.Keypair,
-  otherParty?: PublicKey | anchor.web3.Keypair | null,
+  user: PublicKey | Wallet,
+  otherParty?: PublicKey | Wallet | null,
 ): Promise<Metadata> {
   let shouldDecrypt = false;
-  let userIsKeypair = false;
-  let otherPartyIsKeypair = false;
+  let userIsWallet = false;
+  let otherPartyIsWallet = false;
 
   try {
     // assume user is pubkey
     new anchor.web3.PublicKey(user.toString());
   } catch {
-    // user is keypair
-    userIsKeypair = true;
+    // user is wallet
+    userIsWallet = true;
   }
 
   try {
     // assume otherParty is pubkey
     new anchor.web3.PublicKey(otherParty?.toString() || '');
   } catch {
-    // otherParty is keypair or null
-    otherPartyIsKeypair = (otherParty && true) || false;
+    // otherParty is wallet or null
+    otherPartyIsWallet = (otherParty && true) || false;
   }
 
-  if (otherParty && (userIsKeypair || otherPartyIsKeypair)) {
+  if (otherParty && (userIsWallet || otherPartyIsWallet)) {
     // cases 3 - 5
     shouldDecrypt = true;
   }
 
   const [metadataAddress] = await getMetadataProgramAddress(
     program,
-    userIsKeypair ? (user as Keypair).publicKey : (user as PublicKey),
+    userIsWallet ? (user as Wallet).publicKey : (user as PublicKey),
   );
   const metadata = await program.account.metadataAccount.fetch(metadataAddress);
 
@@ -162,51 +162,52 @@ export async function getMetadata(
 
 export async function createMetadata(
   program: anchor.Program,
-  user: anchor.web3.Keypair | Wallet,
 ): Promise<Metadata> {
+  const wallet = program.provider.wallet;
+  const publicKey = wallet.publicKey;
   const [metadataAddress, metadataNonce] = await getMetadataProgramAddress(
     program,
-    user.publicKey,
+    publicKey,
   );
   const tx = await program.rpc.createMetadata(new anchor.BN(metadataNonce), {
     accounts: {
-      user: user.publicKey,
+      user: publicKey,
       metadata: metadataAddress,
       rent: anchor.web3.SYSVAR_RENT_PUBKEY,
       systemProgram: anchor.web3.SystemProgram.programId,
     },
-    signers: 'secretKey' in user ? [user] : [],
   });
   await waitForFinality(program, tx);
-  return await getMetadata(program, user.publicKey);
+  return await getMetadata(program, publicKey);
 }
 
 export async function deleteMetadata(
   program: anchor.Program,
-  user: anchor.web3.Keypair | Wallet,
 ): Promise<void> {
+  const wallet = program.provider.wallet;
+  const publicKey = wallet.publicKey;
   const [metadataAddress, metadataNonce] = await getMetadataProgramAddress(
     program,
-    user.publicKey,
+    publicKey,
   );
   await program.rpc.closeMetadata(new anchor.BN(metadataNonce), {
     accounts: {
-      user: user.publicKey,
+      user: publicKey,
       metadata: metadataAddress,
       rent: anchor.web3.SYSVAR_RENT_PUBKEY,
       systemProgram: anchor.web3.SystemProgram.programId,
     },
-    signers: 'secretKey' in user ? [user] : [],
   });
 }
 
 export async function subscribeUser(
   program: anchor.Program,
   dialect: DialectAccount,
   user: PublicKey,
-  signer: Keypair,
 ): Promise<Metadata> {
-  const [publicKey, nonce] = await getDialectProgramAddress(
+  const wallet = program.provider.wallet;
+  const publicKey = wallet.publicKey;
+  const [dialectPublicKey, nonce] = await getDialectProgramAddress(
     program,
     dialect.dialect.members,
   );
@@ -219,14 +220,13 @@ export async function subscribeUser(
     new anchor.BN(metadataNonce),
     {
       accounts: {
-        dialect: publicKey,
-        signer: signer.publicKey,
+        dialect: dialectPublicKey,
+        signer: publicKey,
         user: user,
         metadata,
         rent: anchor.web3.SYSVAR_RENT_PUBKEY,
         systemProgram: anchor.web3.SystemProgram.programId,
       },
-      signers: [signer],
     },
   );
   await waitForFinality(program, tx);
@@ -254,9 +254,10 @@ export async function getDialectProgramAddress(
 
 function parseMessages(
   { messages: rawMessagesBuffer, members, encrypted }: RawDialect,
-  user?: anchor.web3.Keypair,
+  user?: Wallet,
 ) {
   if (encrypted && !user) {
+    // TODO: Raise encyprtion not supported
     return [];
   }
   const messagesBuffer = new CyclicByteBuffer(
@@ -288,7 +289,7 @@ function parseMessages(
   return allMessages.reverse();
 }
 
-function parseRawDialect(rawDialect: RawDialect, user?: anchor.web3.Keypair) {
+function parseRawDialect(rawDialect: RawDialect, user?: Wallet) {
   return {
     encrypted: rawDialect.encrypted,
     members: rawDialect.members,
@@ -301,15 +302,15 @@ function parseRawDialect(rawDialect: RawDialect, user?: anchor.web3.Keypair) {
 export async function getDialect(
   program: anchor.Program,
   publicKey: PublicKey,
-  user?: anchor.web3.Keypair | Wallet,
+  user?: Wallet,
 ): Promise<DialectAccount> {
   const rawDialect = (await program.account.dialectAccount.fetch(
     publicKey,
   )) as RawDialect;
   const account = await program.provider.connection.getAccountInfo(publicKey);
   const dialect = parseRawDialect(
     rawDialect,
-    user && 'secretKey' in user ? user : undefined,
+    user && 'diffieHellman' in user ? user : undefined,
   );
   return {
     ...account,
@@ -320,7 +321,7 @@ export async function getDialect(
 
 export async function getDialects(
   program: anchor.Program,
-  user: anchor.web3.Keypair | Wallet,
+  user: Wallet,
 ): Promise<DialectAccount[]> {
   const metadata = await getMetadata(program, user.publicKey);
   const enabledSubscriptions = metadata.subscriptions.filter(
@@ -341,7 +342,7 @@ export async function getDialects(
 export async function getDialectForMembers(
   program: anchor.Program,
   members: Member[],
-  user?: anchor.web3.Keypair,
+  user?: Wallet,
 ): Promise<DialectAccount> {
   const sortedMembers = members.sort((a, b) =>
     a.publicKey.toBuffer().compare(b.publicKey.toBuffer()),
@@ -393,10 +394,10 @@ export async function findDialects(
 
 export async function createDialect(
   program: anchor.Program,
-  owner: anchor.web3.Keypair | Wallet,
   members: Member[],
   encrypted = true,
 ): Promise<DialectAccount> {
+  const owner = program.provider.wallet;
   const sortedMembers = members.sort((a, b) =>
     a.publicKey.toBuffer().compare(b.publicKey.toBuffer()),
   );
@@ -421,7 +422,6 @@ export async function createDialect(
         rent: anchor.web3.SYSVAR_RENT_PUBKEY,
         systemProgram: anchor.web3.SystemProgram.programId,
       },
-      signers: 'secretKey' in owner ? [owner] : [],
     },
   );
   await waitForFinality(program, tx);
@@ -435,20 +435,19 @@ export async function createDialect(
 export async function deleteDialect(
   program: anchor.Program,
   { dialect }: DialectAccount,
-  owner: anchor.web3.Keypair | Wallet,
 ): Promise<void> {
+  const wallet = program.provider.wallet;
   const [dialectPublicKey, nonce] = await getDialectProgramAddress(
     program,
     dialect.members,
   );
   await program.rpc.closeDialect(new anchor.BN(nonce), {
     accounts: {
       dialect: dialectPublicKey,
-      owner: owner.publicKey,
+      owner: wallet.publicKey,
       rent: anchor.web3.SYSVAR_RENT_PUBKEY,
       systemProgram: anchor.web3.SystemProgram.programId,
     },
-    signers: 'secretKey' in owner ? [owner] : [],
   });
 }
 
@@ -468,9 +467,9 @@ Messages
 export async function sendMessage(
   program: anchor.Program,
   { dialect, publicKey }: DialectAccount,
-  sender: anchor.web3.Keypair | Wallet,
   text: string,
 ): Promise<Message> {
+  const wallet = program.provider.wallet;
   const [dialectPublicKey, nonce] = await getDialectProgramAddress(
     program,
     dialect.members,
@@ -480,7 +479,7 @@ export async function sendMessage(
       encrypted: dialect.encrypted,
       members: dialect.members,
     },
-    sender && 'secretKey' in sender ? sender : undefined,
+    wallet && 'diffieHellman' in wallet ? wallet : undefined,
   );
   const serializedText = textSerde.serialize(text);
   await program.rpc.sendMessage(
@@ -489,16 +488,15 @@ export async function sendMessage(
     {
       accounts: {
         dialect: dialectPublicKey,
-        sender: sender ? sender.publicKey : program.provider.wallet.publicKey,
+        sender: wallet.publicKey,
         member0: dialect.members[0].publicKey,
         member1: dialect.members[1].publicKey,
         rent: anchor.web3.SYSVAR_RENT_PUBKEY,
         systemProgram: anchor.web3.SystemProgram.programId,
       },
-      signers: sender && 'secretKey' in sender ? [sender] : [],
     },
   );
-  const d = await getDialect(program, publicKey, sender);
+  const d = await getDialect(program, publicKey, wallet);
   return d.dialect.messages[d.dialect.nextMessageIdx - 1]; // TODO: Support ring
 }
 

src/api/text-serde.ts

@@ -5,6 +5,7 @@ import {
 } from '../utils/nonce-generator';
 import { ecdhDecrypt, ecdhEncrypt } from '../utils/ecdh-encryption';
 import * as anchor from '@project-serum/anchor';
+import { Wallet } from '@project-serum/anchor/src/provider';
 
 export interface TextSerde {
   serialize(text: string): Uint8Array;
@@ -91,7 +92,7 @@ export type DialectAttributes = {
 export class TextSerdeFactory {
   static create(
     { encrypted, members }: DialectAttributes,
-    user?: anchor.web3.Keypair,
+    user?: Wallet,
   ): TextSerde {
     if (!encrypted) {
       return new UnencryptedTextSerde();