refactor(with-solana): handle multiple pubKeys via mapping

dapps/react-dapp-v2-with-solana-web3js/src/App.tsx

@@ -49,7 +49,7 @@ export default function App() {
     disconnect,
     chain,
     accounts,
-    publicKey,
+    publicKeys,
     balances,
     chainData,
     isInitializing,
@@ -83,14 +83,22 @@ export default function App() {
     await ping();
   };
 
-  const testSignTransaction = async (): Promise<IFormattedRpcResponse> => {
+  const testSignTransaction = async (account: string): Promise<IFormattedRpcResponse> => {
-    if (!client || !publicKey || !session) {
+    if (!client || !publicKeys || !session) {
       throw new Error("WalletConnect Client not initialized properly.");
     }
 
-    const transaction = new Transaction({ feePayer: publicKey }).add(
+    const address = account.split(":").pop();
+
+    if (!address) {
+      throw new Error(`Could not derive Solana address from CAIP account: ${account}`);
+    }
+
+    const senderPublicKey = publicKeys[address];
+
+    const transaction = new Transaction({ feePayer: senderPublicKey }).add(
       SystemProgram.transfer({
-        fromPubkey: publicKey,
+        fromPubkey: senderPublicKey,
         toPubkey: Keypair.generate().publicKey,
         lamports: 1,
       }),
@@ -132,19 +140,21 @@ export default function App() {
   };
 
   const getSolanaActions = (): AccountAction[] => {
-    const wrapRpcRequest = (rpcRequest: () => Promise<IFormattedRpcResponse>) => async () => {
+    const wrapRpcRequest =
-      openRequestModal();
+      (rpcRequest: (account: string) => Promise<IFormattedRpcResponse>) =>
-      try {
+      async (account: string) => {
-        setIsRpcRequestPending(true);
+        openRequestModal();
-        const result = await rpcRequest();
+        try {
-        setRpcResult(result);
+          setIsRpcRequestPending(true);
-      } catch (error) {
+          const result = await rpcRequest(account);
-        console.error("RPC request failed:", error);
+          setRpcResult(result);
-        setRpcResult({ result: error as string });
+        } catch (error) {
-      } finally {
+          console.error("RPC request failed:", error);
-        setIsRpcRequestPending(false);
+          setRpcResult({ result: error as string });
-      }
+        } finally {
-    };
+          setIsRpcRequestPending(false);
+        }
+      };
 
     return [
       {

dapps/react-dapp-v2-with-solana-web3js/src/components/Blockchain.tsx

@@ -120,7 +120,7 @@ function getBlockchainDisplayData(
 const Blockchain: FC<PropsWithChildren<BlockchainProps>> = (
   props: PropsWithChildren<BlockchainProps>,
 ) => {
-  const { fetching, chainId, address, onClick, balances, active, actions, isTestnet } = props;
+  const { fetching, address, onClick, balances, active, actions, isTestnet } = props;
 
   // if (!Object.keys(chainData).length) return null;
 
@@ -167,7 +167,7 @@ const Blockchain: FC<PropsWithChildren<BlockchainProps>> = (
                   </Column>
                 </SFullWidthContainer>
               ) : null}
-              {!!actions && actions.length ? (
+              {address && !!actions && actions.length ? (
                 <SFullWidthContainer>
                   <h6>Methods</h6>
                   {actions.map(action => (
@@ -175,7 +175,7 @@ const Blockchain: FC<PropsWithChildren<BlockchainProps>> = (
                       key={action.method}
                       left
                       rgb={chain.meta.rgb}
-                      onClick={() => action.callback(chainId)}
+                      onClick={() => action.callback(address)}
                     >
                       {action.method}
                     </SAction>

dapps/react-dapp-v2-with-solana-web3js/src/contexts/ClientContext.tsx

@@ -21,11 +21,6 @@ import { AccountBalances, ChainNamespaces, getAllChainNamespaces } from "../help
  * Types
  */
 
-export enum SolanaChainId {
-  Mainnet = "solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ",
-  Devnet = "solana:8E9rvCKLFQia2Y35HXjjpWzj8weVo44K",
-}
-
 export enum SolanaRpcMethod {
   SOL_SIGN_TRANSACTION = "sol_signTransaction",
 }
@@ -36,7 +31,7 @@ interface IContext {
   isInitializing: boolean;
   chain: string;
   pairings: string[];
-  publicKey?: PublicKey;
+  publicKeys?: Record<string, PublicKey>;
   accounts: string[];
   balances: AccountBalances;
   chainData: ChainNamespaces;
@@ -61,7 +56,7 @@ export function ClientContextProvider({ children }: { children: ReactNode | Reac
 
   const [balances, setBalances] = useState<AccountBalances>({});
   const [accounts, setAccounts] = useState<string[]>([]);
-  const [publicKey, setPublicKey] = useState<PublicKey>();
+  const [publicKeys, setPublicKeys] = useState<Record<string, PublicKey>>();
   const [chainData, setChainData] = useState<ChainNamespaces>({});
   const [chain, setChain] = useState<string>("");
 
@@ -69,7 +64,7 @@ export function ClientContextProvider({ children }: { children: ReactNode | Reac
     setPairings([]);
     setSession(undefined);
     setBalances({});
-    setPublicKey(undefined);
+    setPublicKeys(undefined);
     setAccounts([]);
     setChain("");
   };
@@ -94,17 +89,23 @@ export function ClientContextProvider({ children }: { children: ReactNode | Reac
   };
 
   const onSessionConnected = useCallback(async (_session: SessionTypes.Settled) => {
-    const account = _session.state.accounts[0].split(":").pop();
+    // Create a map of Solana address -> publicKey.
-    if (!account) {
+    const _publicKeys = _session.state.accounts.reduce(
-      throw new Error("Could not derive account address from `session.state.accounts`.");
+      (publicKeysMap: Record<string, PublicKey>, account) => {
-    }
+        const address = account.split(":").pop();
-
+        if (!address) {
-    const _publicKey = new PublicKey(account);
+          throw new Error(`Could not derive Solana address from CAIP account: ${account}`);
+        }
+        publicKeysMap[address] = new PublicKey(address);
+        return publicKeysMap;
+      },
+      {},
+    );
 
     setSession(_session);
     setChain(_session.permissions.blockchain.chains[0]);
     setAccounts(_session.state.accounts);
-    setPublicKey(_publicKey);
+    setPublicKeys(_publicKeys);
   }, []);
 
   const disconnect = useCallback(async () => {
@@ -236,7 +237,7 @@ export function ClientContextProvider({ children }: { children: ReactNode | Reac
       pairings,
       isInitializing,
       balances,
-      publicKey,
+      publicKeys,
       accounts,
       chain,
       client,
@@ -249,7 +250,7 @@ export function ClientContextProvider({ children }: { children: ReactNode | Reac
       pairings,
       isInitializing,
       balances,
-      publicKey,
+      publicKeys,
       accounts,
       chain,
       client,

dapps/react-dapp-v2-with-solana-web3js/src/helpers/types.ts

@@ -150,7 +150,7 @@ export interface ChainNamespaces {
 
 export interface AccountAction {
   method: string;
-  callback: (chainId: string) => Promise<void>;
+  callback: (account: string) => Promise<void>;
 }
 
 export interface AccountBalances {