chore: update deps

package.json

@@ -20,6 +20,8 @@
   },
   "dependencies": {
     "@ardrive/turbo-sdk": "1.19.0",
+    "@solana/web3.js": "^1.95.3",
+    "ethers": "^6.13.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.20.1"

src/pages/UploadPage.tsx

@@ -1,5 +1,5 @@
-import { InputHTMLAttributes, useState } from "react";
-import { ErrMsgCallbackAsProps } from "../types";
+import { useState } from "react";
+import { ErrMsgCallbackAsProps, ExtendedFileInputProps } from "../types";
 import { ardriveAppUrl, turboConfig } from "../constants";
 import { Page } from "./Page";
 import {
@@ -10,30 +10,9 @@ import {
 } from "@ardrive/turbo-sdk/web";
 import { getArconnect } from "../utils/arconnect";
 import { NewToArDriveInfo } from "../components/NewToArDriveInfo";
-import { Eip1193Provider, ethers } from "ethers";
+import { ethers } from "ethers";
 import { PublicKey } from "@solana/web3.js";
 
-declare global {
-  interface Window {
-    ethereum: {
-      isMetaMask?: boolean;
-      providers?: Array<Eip1193Provider & { isMetaMask: boolean }>;
-      request: (args: {
-        method: string;
-        params?: Array<unknown>;
-      }) => Promise<unknown>;
-      on: (eventName: string, callback: (...args: unknown[]) => void) => void;
-    };
-    solana: {
-      connect: () => Promise<{ publicKey: PublicKey }>;
-      signMessage: (message: Uint8Array) => Promise<{ signature: Uint8Array }>;
-    };
-  }
-}
-interface ExtendedFileInputProps extends InputHTMLAttributes<HTMLInputElement> {
-  webkitdirectory?: boolean;
-}
-
 function UploadForm({ errorCallback }: ErrMsgCallbackAsProps) {
   const [selectedFiles, setSelectedFiles] = useState<FileList | null>(null);
   const [currentWallet, setCurrentWallet] = useState<string | null>(null);
@@ -66,6 +45,7 @@ function UploadForm({ errorCallback }: ErrMsgCallbackAsProps) {
             },
           }),
         );
+
         setCurrentWallet("ethereum");
       }
     } catch (err) {
@@ -79,14 +59,10 @@ function UploadForm({ errorCallback }: ErrMsgCallbackAsProps) {
       if (window.solana) {
         const provider = window.solana;
 
-        const publicKey = await provider.connect();
-        console.log("publicKey", publicKey);
-
-        const pkey = new PublicKey(publicKey.publicKey.toString());
-        console.log("pkey", pkey);
+        const publicKey = new PublicKey((await provider.connect()).publicKey);
 
         const wallet: SolanaWalletAdapter = {
-          publicKey: pkey,
+          publicKey,
           signMessage: async (message: Uint8Array) => {
             // Call Phantom's signMessage method
             const { signature } = await provider.signMessage(message);

src/types.ts

@@ -1,4 +1,31 @@
+import { PublicKey } from "@solana/web3.js";
+import { Eip1193Provider } from "ethers";
+import { InputHTMLAttributes } from "react";
+
 export type ErrMsgCallback = (error: string) => void;
 export type ErrMsgCallbackAsProps = {
   errorCallback: ErrMsgCallback;
 };
+
+declare global {
+  interface Window {
+    ethereum: {
+      isMetaMask?: boolean;
+      providers?: Array<Eip1193Provider & { isMetaMask: boolean }>;
+      request: (args: {
+        method: string;
+        params?: Array<unknown>;
+      }) => Promise<unknown>;
+      on: (eventName: string, callback: (...args: unknown[]) => void) => void;
+    };
+    solana: {
+      connect: () => Promise<{ publicKey: PublicKey }>;
+      signMessage: (message: Uint8Array) => Promise<{ signature: Uint8Array }>;
+    };
+  }
+}
+
+export interface ExtendedFileInputProps
+  extends InputHTMLAttributes<HTMLInputElement> {
+  webkitdirectory?: boolean;
+}

yarn.lock

@@ -1224,7 +1224,7 @@
   dependencies:
     buffer "~6.0.3"
 
-"@solana/web3.js@^1.91.7":
+"@solana/web3.js@^1.91.7", "@solana/web3.js@^1.95.3":
   version "1.95.3"
   resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.95.3.tgz#70b5f4d76823f56b5af6403da51125fffeb65ff3"
   integrity sha512-O6rPUN0w2fkNqx/Z3QJMB9L225Ex10PRDH8bTaIUPZXMPV0QP8ZpPvjQnXK+upUczlRgzHzd6SjKIha1p+I6og==
@@ -2458,7 +2458,7 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-ethers@^6.12.0:
+ethers@^6.12.0, ethers@^6.13.3:
   version "6.13.3"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.13.3.tgz#b87afdadb91cc8df5f56b9c59c96e5b206f4a600"
   integrity sha512-/DzbZOLVtoO4fKvvQwpEucHAQgIwBGWuRvBdwE/lMXgXvvHHTSkn7XqAQ2b+gjJzZDJjWA9OD05bVceVOsBHbg==