Merge pull request #48 from Web3Auth/fix/type-fixes

Fix/type fixes

Author: chaitanyapotti

examples/getting-started/index.html examples/getting-started/eth/index.htmlexamples/getting-started/index.html renamed to examples/getting-started/eth/index.html

@@ -5,6 +5,11 @@
 - `npm i -g http-server`
 
 
-### Run Example
+### Run Ethereum Example
 
-- `http-server .`
+- `http-server eth/`
+
+
+### Run Solana Example
+
+- `http-server solana/`

examples/getting-started/readme.md

@@ -82,7 +82,7 @@ <h1>Web3Auth Integration Example</h1>
   console.log(address, "->", balance);
 
   $("#address").text("Address: " + address + ".");
-  $("#balance").text("Balance: " + balance + ".");
+  $("#balance").text("Balance: " + balance.value + ".");
 }
 
 $("#login").click(async function (event) {

examples/getting-started/index2.html …amples/getting-started/solana/index.htmlexamples/getting-started/index2.html renamed to examples/getting-started/solana/index.html examples/getting-started/index2.html renamed to examples/getting-started/solana/index.html

@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@toruslabs/eslint-config-typescript": "^0.2.0",
-    "@toruslabs/torus-scripts": "^0.2.2",
+    "@toruslabs/torus-scripts": "^0.3.0",
     "@types/node": "^16",
     "@typescript-eslint/eslint-plugin": "^5.9.1",
     "cross-env": "^7.0.3",

package.json

@@ -1,4 +1,4 @@
-import { PhantomWallet } from "@web3auth/solana-provider";
+import type { IPhantomWalletProvider } from "@web3auth/solana-provider";
 
 export function poll(callback: () => boolean | Promise<boolean>, interval: number, count: number): Promise<boolean> {
   return new Promise((resolve, reject) => {
@@ -20,7 +20,9 @@ export function poll(callback: () => boolean | Promise<boolean>, interval: numbe
   });
 }
 
-export const detectProvider = async (options: { interval: number; count: number } = { interval: 1000, count: 3 }): Promise<PhantomWallet | null> => {
+export const detectProvider = async (
+  options: { interval: number; count: number } = { interval: 1000, count: 3 }
+): Promise<IPhantomWalletProvider | null> => {
   const isPhantomAvailable = typeof window !== "undefined" && !!(window as any).solana?.isPhantom;
   if (isPhantomAvailable) {
     return (window as any).solana;

packages/adapters/phantom-adapter/src/utils.ts

@@ -25,7 +25,6 @@ import {
 import { WalletConnectProvider } from "@web3auth/ethereum-provider";
 import log from "loglevel";
 
-import { defaultWalletConnectV1Options } from "./config";
 import { WalletConnectV1AdapterOptions } from "./interface";
 
 class WalletConnectV1Adapter extends BaseAdapter<void> {
@@ -53,7 +52,7 @@ class WalletConnectV1Adapter extends BaseAdapter<void> {
 
   constructor(options: WalletConnectV1AdapterOptions = {}) {
     super();
-    this.adapterOptions = { ...defaultWalletConnectV1Options, ...options };
+    this.adapterOptions = { ...options };
     this.chainConfig = options.chainConfig;
   }
 

packages/adapters/wallet-connect-v1-adapter/src/config.ts

@@ -38,6 +38,7 @@ export const getDefaultAdapterModule = async (params: {
     const defaultOptions = getOpenloginDefaultOptions(customChainConfig.chainNamespace, customChainConfig?.chainId);
     const adapter = new OpenloginAdapter({
       ...defaultOptions,
+      chainConfig: { ...(defaultOptions.chainConfig || {}), ...finalChainConfig },
       adapterSettings: { ...(defaultOptions.adapterSettings as OpenLoginOptions), clientId },
     });
     return adapter;

packages/adapters/wallet-connect-v1-adapter/src/walletConnectV1adapter.ts

@@ -1927,10 +1927,10 @@
     eslint-config-problems "^6.0.0"
     eslint-config-standard "^17.0.0-1"
 
-"@toruslabs/torus-scripts@^0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@toruslabs/torus-scripts/-/torus-scripts-0.2.2.tgz#5680e8ea9e73a782babedf56ecc4b0fed3a7c42f"
-  integrity sha512-3uhibBvo/bTscK5Vvkysw81k6faqDvcc9pnO1TRd/5ruQp3FBP22woRAWvik1uYZLtV9z3cvGAbQ6qRH006+Ew==
+"@toruslabs/torus-scripts@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@toruslabs/torus-scripts/-/torus-scripts-0.3.0.tgz#950224168a545541c53e1ef288200cd7a51cf866"
+  integrity sha512-a2KmQvekii3MvX/sPwiywUaKXEY8ElJaOFAHP3oKY65+ASUOg+AG9nXi09SefX/wkZbZbPKqZC2su4Af92bh9A==
   dependencies:
     "@babel/core" "~7.16.12"
     "@babel/plugin-proposal-class-properties" "^7.16.7"