Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
348047baca | ||
|
|
9fbcc240bb | ||
|
|
5aeb01f968 | ||
|
|
c9596de9c3 |
+6
-1
@@ -155,5 +155,10 @@
|
||||
"vitest": "^0.32.2",
|
||||
"w3name": "^1.0.8",
|
||||
"web3.storage": "^4.5.4"
|
||||
},
|
||||
"pnpm": {
|
||||
"overrides": {
|
||||
"follow-redirects": "1.15.3"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
+12
-19
@@ -1,8 +1,7 @@
|
||||
lockfileVersion: '6.0'
|
||||
|
||||
settings:
|
||||
autoInstallPeers: true
|
||||
excludeLinksFromLockfile: false
|
||||
overrides:
|
||||
follow-redirects: 1.15.3
|
||||
|
||||
dependencies:
|
||||
'@0xsquid/sdk':
|
||||
@@ -7476,7 +7475,7 @@ packages:
|
||||
/axios@0.21.4:
|
||||
resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
|
||||
dependencies:
|
||||
follow-redirects: 1.15.5
|
||||
follow-redirects: 1.15.3
|
||||
transitivePeerDependencies:
|
||||
- debug
|
||||
dev: false
|
||||
@@ -7484,7 +7483,7 @@ packages:
|
||||
/axios@0.27.2:
|
||||
resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
|
||||
dependencies:
|
||||
follow-redirects: 1.15.2
|
||||
follow-redirects: 1.15.3
|
||||
form-data: 4.0.0
|
||||
transitivePeerDependencies:
|
||||
- debug
|
||||
@@ -7493,7 +7492,7 @@ packages:
|
||||
/axios@1.1.3:
|
||||
resolution: {integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==}
|
||||
dependencies:
|
||||
follow-redirects: 1.15.5
|
||||
follow-redirects: 1.15.3
|
||||
form-data: 4.0.0
|
||||
proxy-from-env: 1.1.0
|
||||
transitivePeerDependencies:
|
||||
@@ -7503,7 +7502,7 @@ packages:
|
||||
/axios@1.6.5:
|
||||
resolution: {integrity: sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==}
|
||||
dependencies:
|
||||
follow-redirects: 1.15.5
|
||||
follow-redirects: 1.15.3
|
||||
form-data: 4.0.0
|
||||
proxy-from-env: 1.1.0
|
||||
transitivePeerDependencies:
|
||||
@@ -9526,18 +9525,8 @@ packages:
|
||||
resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
|
||||
dev: true
|
||||
|
||||
/follow-redirects@1.15.2:
|
||||
resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
|
||||
engines: {node: '>=4.0'}
|
||||
peerDependencies:
|
||||
debug: '*'
|
||||
peerDependenciesMeta:
|
||||
debug:
|
||||
optional: true
|
||||
dev: false
|
||||
|
||||
/follow-redirects@1.15.5:
|
||||
resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==}
|
||||
/follow-redirects@1.15.3:
|
||||
resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==}
|
||||
engines: {node: '>=4.0'}
|
||||
peerDependencies:
|
||||
debug: '*'
|
||||
@@ -14920,3 +14909,7 @@ packages:
|
||||
/zwitch@2.0.4:
|
||||
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
|
||||
dev: true
|
||||
|
||||
settings:
|
||||
autoInstallPeers: true
|
||||
excludeLinksFromLockfile: false
|
||||
|
||||
@@ -33,6 +33,7 @@ export enum WalletConnectionType {
|
||||
CosmosSigner = 'CosmosSigner',
|
||||
InjectedEip1193 = 'injectedEip1193',
|
||||
WalletConnect2 = 'walletConnect2',
|
||||
TestWallet = 'TestWallet',
|
||||
}
|
||||
|
||||
export enum WalletErrorType {
|
||||
@@ -68,6 +69,9 @@ export const walletConnectionTypes: Record<WalletConnectionType, WalletConnectio
|
||||
[WalletConnectionType.CosmosSigner]: {
|
||||
name: 'CosmosSigner',
|
||||
},
|
||||
[WalletConnectionType.TestWallet]: {
|
||||
name: 'TestWallet',
|
||||
},
|
||||
};
|
||||
|
||||
// Wallets
|
||||
@@ -88,7 +92,7 @@ export enum WalletType {
|
||||
TokenPocket = 'TOKEN_POCKET',
|
||||
TrustWallet = 'TRUST_WALLET',
|
||||
WalletConnect2 = 'WALLETCONNECT_2',
|
||||
// TestWallet = 'TEST_WALLET',
|
||||
TestWallet = 'TEST_WALLET',
|
||||
OtherWallet = 'OTHER_WALLET',
|
||||
}
|
||||
|
||||
@@ -243,6 +247,12 @@ export const wallets: Record<WalletType, WalletConfig> = {
|
||||
icon: KeplrIcon,
|
||||
connectionTypes: [WalletConnectionType.CosmosSigner],
|
||||
},
|
||||
[WalletType.TestWallet]: {
|
||||
type: WalletType.TestWallet,
|
||||
stringKey: STRING_KEYS.TEST_WALLET,
|
||||
icon: GenericWalletIcon,
|
||||
connectionTypes: [WalletConnectionType.TestWallet],
|
||||
},
|
||||
};
|
||||
|
||||
// Injected EIP-1193 Providers
|
||||
@@ -354,3 +364,5 @@ export enum DydxChainAsset {
|
||||
USDC = 'usdc',
|
||||
CHAINTOKEN = 'chain',
|
||||
}
|
||||
|
||||
export const TEST_WALLET_EVM_ADDRESS: EvmAddress = '0x0000000000000000000000000000000000000000';
|
||||
|
||||
@@ -6,14 +6,22 @@ import { NOBLE_BECH32_PREFIX, LocalWallet, type Subaccount } from '@dydxprotocol
|
||||
|
||||
import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/constants/account';
|
||||
import { DialogTypes } from '@/constants/dialogs';
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { LocalStorageKey, LOCAL_STORAGE_VERSIONS } from '@/constants/localStorage';
|
||||
import { DydxAddress, EvmAddress, PrivateInformation } from '@/constants/wallets';
|
||||
import {
|
||||
DydxAddress,
|
||||
EvmAddress,
|
||||
PrivateInformation,
|
||||
TEST_WALLET_EVM_ADDRESS,
|
||||
WalletType,
|
||||
} from '@/constants/wallets';
|
||||
|
||||
import { setOnboardingState, setOnboardingGuard } from '@/state/account';
|
||||
import { forceOpenDialog } from '@/state/dialogs';
|
||||
|
||||
import abacusStateManager from '@/lib/abacus';
|
||||
import { log } from '@/lib/telemetry';
|
||||
import { testFlags } from '@/lib/testFlags';
|
||||
|
||||
import { useDydxClient } from './useDydxClient';
|
||||
import { useLocalStorage } from './useLocalStorage';
|
||||
@@ -178,7 +186,26 @@ const useAccountsContext = () => {
|
||||
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
if (connectedDydxAddress && signerGraz) {
|
||||
if (walletType === WalletType.TestWallet) {
|
||||
// Get override values. Use the testFlags value if it exists, otherwise use the previously
|
||||
// saved value where possible. If neither exist, use a default garbage value.
|
||||
const addressOverride: DydxAddress = testFlags.addressOverride as DydxAddress ||
|
||||
evmDerivedAddresses?.[TEST_WALLET_EVM_ADDRESS]?.dydxAddress as DydxAddress ||
|
||||
'dydx1';
|
||||
|
||||
dispatch(setOnboardingState(OnboardingState.WalletConnected));
|
||||
|
||||
// Set variables.
|
||||
saveEvmDerivedAccount({
|
||||
evmAddress: TEST_WALLET_EVM_ADDRESS,
|
||||
dydxAddress: addressOverride,
|
||||
});
|
||||
const wallet = new LocalWallet();
|
||||
wallet.address = addressOverride;
|
||||
setLocalDydxWallet(wallet);
|
||||
|
||||
dispatch(setOnboardingState(OnboardingState.AccountConnected));
|
||||
} else if (connectedDydxAddress && signerGraz) {
|
||||
dispatch(setOnboardingState(OnboardingState.WalletConnected));
|
||||
try {
|
||||
setLocalDydxWallet(await LocalWallet.fromOfflineSigner(signerGraz));
|
||||
|
||||
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useState, useMemo } from 'react';
|
||||
import { useSelector } from 'react-redux';
|
||||
|
||||
import { EvmDerivedAddresses } from '@/constants/account';
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { LocalStorageKey } from '@/constants/localStorage';
|
||||
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
|
||||
|
||||
@@ -38,6 +39,7 @@ import { getWalletConnection, parseWalletError } from '@/lib/wallet';
|
||||
import { log } from '@/lib/telemetry';
|
||||
|
||||
import { useStringGetter } from './useStringGetter';
|
||||
import { testFlags } from '@/lib/testFlags';
|
||||
|
||||
export const useWalletConnection = () => {
|
||||
const stringGetter = useStringGetter();
|
||||
@@ -138,6 +140,8 @@ export const useWalletConnection = () => {
|
||||
walletType: cosmosWalletType,
|
||||
});
|
||||
}
|
||||
} else if (walletConnection.type === WalletConnectionType.TestWallet) {
|
||||
saveEvmAddress(STRING_KEYS.TEST_WALLET as EvmAddress);
|
||||
} else {
|
||||
const isAccountConnected = Boolean(
|
||||
evmAddress && evmDerivedAddresses[evmAddress]?.encryptedSignature
|
||||
@@ -224,6 +228,15 @@ export const useWalletConnection = () => {
|
||||
setSelectedWalletType(walletType);
|
||||
};
|
||||
|
||||
// On page load, if testFlag.address is set, connect to the test wallet.
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
if (testFlags.addressOverride) {
|
||||
setSelectedWalletType(WalletType.TestWallet);
|
||||
}
|
||||
})();
|
||||
}, []);
|
||||
|
||||
return {
|
||||
// Wallet connection
|
||||
walletType,
|
||||
|
||||
@@ -22,6 +22,10 @@ class TestFlags {
|
||||
get showMobileSignInOption() {
|
||||
return !!this.queryParams.mobilesignin;
|
||||
}
|
||||
|
||||
get addressOverride():string {
|
||||
return this.queryParams.address;
|
||||
}
|
||||
}
|
||||
|
||||
export const testFlags = new TestFlags();
|
||||
|
||||
@@ -62,6 +62,12 @@ export const getWalletConnection = ({
|
||||
type: WalletConnectionType.CosmosSigner,
|
||||
};
|
||||
}
|
||||
|
||||
case WalletConnectionType.TestWallet: {
|
||||
return {
|
||||
type: WalletConnectionType.TestWallet,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user