feat: Integrate phantom connection and account derivation - round 2 (#…

…923)
dydxprotocol · Aug 20, 2024 · 3cc087a · 3cc087a
1 parent 0f886fd
commit 3cc087a
Show file tree

Hide file tree

Showing 16 changed files with 373 additions and 90 deletions.
diff --git a/package.json b/package.json
@@ -91,6 +91,7 @@
     "@scure/bip32": "^1.3.0",
     "@scure/bip39": "^1.2.0",
     "@skip-router/core": "^5.1.0",
+    "@solana/web3.js": "^1.93.0",
     "@statsig/js-client": "1.4.0",
     "@statsig/react-bindings": "1.4.0",
     "@tanstack/react-query": "^5.37.1",
@@ -117,6 +118,7 @@
     "crypto-js": "^4.1.1",
     "ethers": "^6.6.1",
     "export-to-csv": "^1.2.3",
+    "fast-json-stable-stringify": "^2.1.0",
     "graz": "^0.0.43",
     "jsdom": "^24.1.0",
     "lodash": "^4.17.21",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/constants/account.ts b/src/constants/account.ts
@@ -1,4 +1,5 @@
 import type { DydxAddress, EvmAddress } from './wallets';
+import { SolAddress } from './wallets';
 
 export enum OnboardingSteps {
   ChooseWallet = 'ChooseWallet',
@@ -43,6 +44,16 @@ export type EvmDerivedAddresses = {
   };
 };
 
+export type SolDerivedAddresses = {
+  version?: string;
+} & Record<
+  SolAddress,
+  {
+    encryptedSignature?: string;
+    dydxAddress?: DydxAddress;
+  }
+>;
+
 export type Hdkey = {
   mnemonic: string;
   privateKey: Uint8Array | null;

diff --git a/src/constants/localStorage.ts b/src/constants/localStorage.ts
@@ -1,11 +1,13 @@
 export enum LocalStorageKey {
   // Onboarding / Accounts
   EvmAddress = 'dydx.EvmAddress',
+  SolAddress = 'dydx.SolAddress',
   DydxAddress = 'dydx.DydxAddress',
   OnboardingSelectedWalletType = 'dydx.OnboardingSelectedWalletType',
   WalletConnectionType = 'dydx.WalletConnectionType',
   OnboardingHasAcknowledgedTerms = 'dydx.OnboardingHasAcknowledgedTerms',
   EvmDerivedAddresses = 'dydx.EvmDerivedAddresses',
+  SolDerivedAddresses = 'dydx.SolDerivedAddresses',
 
   // Gas
   SelectedGasDenom = 'dydx.SelectedGasDenom',
@@ -39,6 +41,7 @@ export enum LocalStorageKey {
 
 export const LOCAL_STORAGE_VERSIONS = {
   [LocalStorageKey.EvmDerivedAddresses]: 'v2',
+  [LocalStorageKey.SolDerivedAddresses]: 'v1',
   [LocalStorageKey.NotificationPreferences]: 'v2',
   [LocalStorageKey.TransferNotifications]: 'v1',
   [LocalStorageKey.Notifications]: 'v1',

diff --git a/src/constants/wallets.ts b/src/constants/wallets.ts
@@ -19,6 +19,7 @@ import {
   MathWalletIcon,
   MetaMaskIcon,
   OkxWalletIcon,
+  PhantomIcon,
   RainbowIcon,
   TokenPocketIcon,
   TrustWalletIcon,
@@ -36,6 +37,7 @@ export enum WalletConnectionType {
   InjectedEip1193 = 'injectedEip1193',
   WalletConnect2 = 'walletConnect2',
   TestWallet = 'TestWallet',
+  Phantom = 'Phantom',
 }
 
 export enum WalletErrorType {
@@ -69,6 +71,9 @@ export const walletConnectionTypes: Record<WalletConnectionType, WalletConnectio
     name: 'WalletConnect 2.0',
     wagmiConnectorId: 'walletConnect',
   },
+  [WalletConnectionType.Phantom]: {
+    name: 'Phantom',
+  },
   [WalletConnectionType.CosmosSigner]: {
     name: 'CosmosSigner',
   },
@@ -102,6 +107,7 @@ export enum WalletType {
   TestWallet = 'TEST_WALLET',
   OtherWallet = 'OTHER_WALLET',
   Privy = 'PRIVY',
+  Phantom = 'PHANTOM',
 }
 
 const WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS = {
@@ -277,6 +283,12 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: EmailIcon,
     connectionTypes: [WalletConnectionType.Privy],
   },
+  [WalletType.Phantom]: {
+    type: WalletType.Phantom,
+    stringKey: STRING_KEYS.PHANTOM,
+    icon: PhantomIcon,
+    connectionTypes: [WalletConnectionType.Phantom],
+  },
 };
 
 // Injected EIP-1193 Providers
@@ -332,6 +344,7 @@ export const getSignTypedData = (selectedDydxChainId: DydxChainId) =>
 export type PrivateInformation = ReturnType<typeof onboarding.deriveHDKeyFromEthereumSignature>;
 
 export type EvmAddress = `0x${string}`;
+export type SolAddress = `${string}`;
 export type DydxAddress = `dydx${string}`;
 
 export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {