Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 jaredvu
|
c0a00acdc6 |
@@ -0,0 +1,6 @@
|
||||
VITE_BASE_URL=https://v4.testnet.dydx.exchange
|
||||
|
||||
VITE_ALCHEMY_API_KEY=FP275q327Yh7qswtZWenbPXdZZdnAFmC
|
||||
|
||||
VITE_WALLETCONNECT1_BRIDGE=wss://api.dydx.exchange/wc/
|
||||
VITE_WALLETCONNECT2_PROJECT_ID=fbe94eaa691fa8d929561f8567062b32
|
||||
@@ -4,6 +4,7 @@ VITE_ALCHEMY_API_KEY=
|
||||
|
||||
VITE_PK_ENCRYPTION_KEY=
|
||||
|
||||
VITE_WALLETCONNECT1_BRIDGE=
|
||||
VITE_WALLETCONNECT2_PROJECT_ID=
|
||||
|
||||
VITE_V3_TOKEN_ADDRESS=
|
||||
@@ -13,7 +13,6 @@ dist
|
||||
dist-ssr
|
||||
*.local
|
||||
*.key
|
||||
.env
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
|
||||
+2
-2
@@ -38,9 +38,9 @@
|
||||
"@cosmjs/proto-signing": "^0.31.0",
|
||||
"@cosmjs/stargate": "^0.31.0",
|
||||
"@cosmjs/tendermint-rpc": "^0.31.0",
|
||||
"@dydxprotocol/v4-abacus": "^0.7.0",
|
||||
"@dydxprotocol/v4-abacus": "^0.6.4",
|
||||
"@dydxprotocol/v4-client-js": "^0.36.1",
|
||||
"@dydxprotocol/v4-localization": "^0.1.30",
|
||||
"@dydxprotocol/v4-localization": "^0.1.28",
|
||||
"@ethersproject/providers": "^5.7.2",
|
||||
"@js-joda/core": "^5.5.3",
|
||||
"@radix-ui/react-collapsible": "^1.0.3",
|
||||
|
||||
Generated
+12
-12
@@ -1,9 +1,5 @@
|
||||
lockfileVersion: '6.0'
|
||||
|
||||
settings:
|
||||
autoInstallPeers: true
|
||||
excludeLinksFromLockfile: false
|
||||
|
||||
dependencies:
|
||||
'@0xsquid/sdk':
|
||||
specifier: ^1.10.0
|
||||
@@ -27,14 +23,14 @@ dependencies:
|
||||
specifier: ^0.31.0
|
||||
version: 0.31.0
|
||||
'@dydxprotocol/v4-abacus':
|
||||
specifier: ^0.7.0
|
||||
version: 0.7.0
|
||||
specifier: ^0.6.4
|
||||
version: 0.6.4
|
||||
'@dydxprotocol/v4-client-js':
|
||||
specifier: ^0.36.1
|
||||
version: 0.36.1
|
||||
'@dydxprotocol/v4-localization':
|
||||
specifier: ^0.1.30
|
||||
version: 0.1.30
|
||||
specifier: ^0.1.28
|
||||
version: 0.1.28
|
||||
'@ethersproject/providers':
|
||||
specifier: ^5.7.2
|
||||
version: 5.7.2
|
||||
@@ -979,8 +975,8 @@ packages:
|
||||
resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
|
||||
dev: true
|
||||
|
||||
/@dydxprotocol/v4-abacus@0.7.0:
|
||||
resolution: {integrity: sha512-XheqfIpOODfQFG860oH0fneVgp9qQKPMDTwrvFXaM/JtKH9ekOUUO6De72EsJ7qOuxWwl1WgoALA8b4tRs0tiw==}
|
||||
/@dydxprotocol/v4-abacus@0.6.4:
|
||||
resolution: {integrity: sha512-eH+/9Q/OnQtwzBwM1BJyXybFPdivGmFQWrxM71MFWGs6uIQGbZX775mpoa8deweSTyQ/QrRLRQ1mP2BPDgBQYg==}
|
||||
dev: false
|
||||
|
||||
/@dydxprotocol/v4-client-js@0.36.1:
|
||||
@@ -1010,8 +1006,8 @@ packages:
|
||||
- utf-8-validate
|
||||
dev: false
|
||||
|
||||
/@dydxprotocol/v4-localization@0.1.30:
|
||||
resolution: {integrity: sha512-xTlQuQmPz7wfGkjd07giYMAxRrolDbJE3DryJSIMB6R1MBq1wLzAcwp/iR/nELRwilRX9c44Tap0gGt+oAajiQ==}
|
||||
/@dydxprotocol/v4-localization@0.1.28:
|
||||
resolution: {integrity: sha512-g6LwjX7EIRm9HISfSX0H6yhktBCZby5opP/yI2aIUvn2OYyB25WcjLEuEvzW5Bh9XXiLijgLf3Tk91wPKWuFbA==}
|
||||
dev: false
|
||||
|
||||
/@dydxprotocol/v4-proto@0.2.1:
|
||||
@@ -14099,3 +14095,7 @@ packages:
|
||||
/zwitch@2.0.4:
|
||||
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
|
||||
dev: true
|
||||
|
||||
settings:
|
||||
autoInstallPeers: true
|
||||
excludeLinksFromLockfile: false
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 193 KiB |
+65
-78
@@ -35,21 +35,17 @@
|
||||
"name": "v4 Dev",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydxprotocol-testnet",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -79,6 +75,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -95,21 +94,17 @@
|
||||
"name": "v4 Dev 2",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydxprotocol-testnet",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -138,6 +133,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -154,21 +152,17 @@
|
||||
"name": "v4 Dev 4",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydxprotocol-testnet",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -197,6 +191,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -213,21 +210,17 @@
|
||||
"name": "v4 Dev 5",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydxprotocol-testnet",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -256,6 +249,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -272,21 +268,17 @@
|
||||
"name": "v4 Staging",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydxprotocol-testnet",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -319,6 +311,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -335,21 +330,17 @@
|
||||
"name": "v4 Staging West",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydxprotocol-testnet",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -382,6 +373,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -397,22 +391,18 @@
|
||||
"dydxprotocol-testnet": {
|
||||
"name": "v4 Public Testnet",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydx-testnet-4",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"dydxChainId": "dydx-testnet-3",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -447,6 +437,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -455,29 +448,25 @@
|
||||
"callbackUrl": "/walletsegue"
|
||||
},
|
||||
"images": "/wallets/",
|
||||
"signTypedDataAction": "dYdX Chain Onboarding",
|
||||
"signTypedDataAction": "dYdX V4 Onboarding",
|
||||
"signTypedDataDomainName": "dYdX V4"
|
||||
}
|
||||
},
|
||||
"dydxprotocol-testnet-dydx": {
|
||||
"name": "v4 Public Testnet/dYdX",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydx-testnet-4",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"dydxChainId": "dydx-testnet-3",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -511,6 +500,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -519,29 +511,25 @@
|
||||
"callbackUrl": "/walletsegue"
|
||||
},
|
||||
"images": "/wallets/",
|
||||
"signTypedDataAction": "dYdX Chain Onboarding",
|
||||
"signTypedDataAction": "dYdX V4 Onboarding",
|
||||
"signTypedDataDomainName": "dYdX V4"
|
||||
}
|
||||
},
|
||||
"dydxprotocol-testnet-dsrv": {
|
||||
"name": "v4 Public Testnet/DSRV",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydx-testnet-4",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"dydxChainId": "dydx-testnet-3",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -575,6 +563,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -583,29 +574,25 @@
|
||||
"callbackUrl": "/walletsegue"
|
||||
},
|
||||
"images": "/wallets/",
|
||||
"signTypedDataAction": "dYdX Chain Onboarding",
|
||||
"signTypedDataAction": "dYdX V4 Onboarding",
|
||||
"signTypedDataDomainName": "dYdX V4"
|
||||
}
|
||||
},
|
||||
"dydxprotocol-testnet-nodefleet": {
|
||||
"name": "v4 Public Testnet/nodefleet",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydx-testnet-4",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"dydxChainId": "dydx-testnet-3",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -639,6 +626,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -647,29 +637,25 @@
|
||||
"callbackUrl": "/walletsegue"
|
||||
},
|
||||
"images": "/wallets/",
|
||||
"signTypedDataAction": "dYdX Chain Onboarding",
|
||||
"signTypedDataAction": "dYdX V4 Onboarding",
|
||||
"signTypedDataDomainName": "dYdX V4"
|
||||
}
|
||||
},
|
||||
"dydxprotocol-testnet-kingnodes": {
|
||||
"name": "v4 Public Testnet/KingNodes",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydx-testnet-4",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"dydxChainId": "dydx-testnet-3",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -703,6 +689,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -711,29 +700,25 @@
|
||||
"callbackUrl": "/walletsegue"
|
||||
},
|
||||
"images": "/wallets/",
|
||||
"signTypedDataAction": "dYdX Chain Onboarding",
|
||||
"signTypedDataAction": "dYdX V4 Onboarding",
|
||||
"signTypedDataDomainName": "dYdX V4"
|
||||
}
|
||||
},
|
||||
"dydxprotocol-testnet-liquify": {
|
||||
"name": "v4 Public Testnet/Liquify",
|
||||
"ethereumChainId": "5",
|
||||
"dydxChainId": "dydx-testnet-4",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"dydxChainId": "dydx-testnet-3",
|
||||
"isMainNet": false,
|
||||
"tokens": {
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -767,6 +752,9 @@
|
||||
"description": "dYdX v4 App",
|
||||
"iconUrl": "/logos/dydx-x.png"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
|
||||
}
|
||||
@@ -775,30 +763,26 @@
|
||||
"callbackUrl": "/walletsegue"
|
||||
},
|
||||
"images": "/wallets/",
|
||||
"signTypedDataAction": "dYdX Chain Onboarding",
|
||||
"signTypedDataAction": "dYdX V4 Onboarding",
|
||||
"signTypedDataDomainName": "dYdX V4"
|
||||
}
|
||||
},
|
||||
"dydxprotocol-mainnet": {
|
||||
"dydxprotocol-mainet": {
|
||||
"name": "v4",
|
||||
"ethereumChainId": "1",
|
||||
"dydxChainId": "[mainnet chain id]",
|
||||
"chainName": "dYdX Chain",
|
||||
"chainLogo": "dydx-chain.png",
|
||||
"isMainNet": true,
|
||||
"tokens": {
|
||||
"comment": "Change according to mainnet release",
|
||||
"chain": {
|
||||
"name": "DYDX",
|
||||
"denom": "adv4tnt",
|
||||
"decimals": 18,
|
||||
"denom": "dv4tnt",
|
||||
"image": "/currencies/dydx.png"
|
||||
},
|
||||
"usdc": {
|
||||
"name": "USDC",
|
||||
"denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
|
||||
"gasDenom": "uusdc",
|
||||
"decimals": 6,
|
||||
"image": "/currencies/usdc.png"
|
||||
}
|
||||
},
|
||||
@@ -831,6 +815,9 @@
|
||||
"description": "[Description of the app]",
|
||||
"iconUrl": "[Relative URL of the icon URL]"
|
||||
},
|
||||
"v1": {
|
||||
"bridgeUrl": "[Bridge URL]"
|
||||
},
|
||||
"v2": {
|
||||
"projectId": "[Project ID]"
|
||||
}
|
||||
|
||||
+449
-439
@@ -1,464 +1,474 @@
|
||||
[
|
||||
{
|
||||
"id": "c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96",
|
||||
"name": "MetaMask",
|
||||
"description": "",
|
||||
"homepage": "https://metamask.io/",
|
||||
"chains": [
|
||||
"eip155:1",
|
||||
"eip155:42161",
|
||||
"eip155:43114"
|
||||
],
|
||||
"versions": [
|
||||
"1"
|
||||
],
|
||||
"app": {
|
||||
"browser": "",
|
||||
"ios": "https://apps.apple.com/us/app/metamask/id1438144202",
|
||||
"android": "https://play.google.com/store/apps/details?id=io.metamask",
|
||||
"mac": "",
|
||||
"windows": "",
|
||||
"linux": ""
|
||||
},
|
||||
"mobile": {
|
||||
"native": "metamask:",
|
||||
"universal": "https://metamask.app.link"
|
||||
},
|
||||
"desktop": {
|
||||
"native": "",
|
||||
"universal": ""
|
||||
},
|
||||
"metadata": {
|
||||
"shortName": "MetaMask",
|
||||
"colors": {
|
||||
"primary": "rgb(255, 255, 255)",
|
||||
"secondary": ""
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"comment": "MetaMask",
|
||||
"iosMinVersion": "0",
|
||||
"imageUrl": "",
|
||||
"encoding": "=\"#%/<>?@\\^`{|}:&",
|
||||
"connections": [
|
||||
{
|
||||
"type": "walletConnectV2",
|
||||
"native": "metamask:",
|
||||
"universal": "https://metamask.app.link"
|
||||
"id":"c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96",
|
||||
"name":"MetaMask",
|
||||
"description":"",
|
||||
"homepage":"https://metamask.io/",
|
||||
"chains":[
|
||||
"eip155:1",
|
||||
"eip155:42161",
|
||||
"eip155:43114"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://apps.apple.com/us/app/metamask/id1438144202",
|
||||
"android":"https://play.google.com/store/apps/details?id=io.metamask",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"metamask:",
|
||||
"universal":"https://metamask.app.link"
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"MetaMask",
|
||||
"colors":{
|
||||
"primary":"rgb(255, 255, 255)",
|
||||
"secondary":""
|
||||
}
|
||||
],
|
||||
"methods": [
|
||||
"eth_sendTransaction",
|
||||
"personal_sign",
|
||||
"eth_signTypedData",
|
||||
"wallet_addEthereumChain"
|
||||
]
|
||||
},
|
||||
"userFields": {
|
||||
"analyticEvent": "METAMASK",
|
||||
"imageName": "metamask.png"
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"MetaMask",
|
||||
"iosMinVersion":"0",
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/metamask.png",
|
||||
"image":"metamask.png",
|
||||
"encoding":"=\"#%/<>?@\\^`{|}:&",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletConnectV2",
|
||||
"native":"metamask:",
|
||||
"universal":"https://metamask.app.link"
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"METAMASK"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "coinbase-wallet",
|
||||
"name": "Coinbase Wallet",
|
||||
"description": "",
|
||||
"homepage": "https://www.coinbase.com/wallet",
|
||||
"chains": [
|
||||
"eip155:1"
|
||||
],
|
||||
"versions": [
|
||||
"1"
|
||||
],
|
||||
"app": {
|
||||
"browser": "",
|
||||
"ios": "https://apps.apple.com/us/app/coinbase-wallet-nfts-crypto/id1278383455",
|
||||
"android": "https://play.google.com/store/apps/details?id=org.toshi",
|
||||
"mac": "",
|
||||
"windows": "",
|
||||
"linux": ""
|
||||
},
|
||||
"mobile": {
|
||||
"native": "cbwallet:",
|
||||
"universal": ""
|
||||
},
|
||||
"desktop": {
|
||||
"native": "",
|
||||
"universal": ""
|
||||
},
|
||||
"metadata": {
|
||||
"shortName": "Coinbase",
|
||||
"colors": {
|
||||
"primary": "rgb(255, 255, 255)",
|
||||
"secondary": ""
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"comment": "Coinbase",
|
||||
"iosMinVersion": "1.8.0",
|
||||
"imageUrl": "",
|
||||
"encoding": "=\"#%/<>?@\\^`{|}:&",
|
||||
"connections": [
|
||||
{
|
||||
"type": "walletSegue",
|
||||
"native": "cbwallet:",
|
||||
"universal": ""
|
||||
"id":"coinbase-wallet",
|
||||
"name":"Coinbase Wallet",
|
||||
"description":"",
|
||||
"homepage":"https://www.coinbase.com/wallet",
|
||||
"chains":[
|
||||
"eip155:1"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://apps.apple.com/us/app/coinbase-wallet-nfts-crypto/id1278383455",
|
||||
"android":"https://play.google.com/store/apps/details?id=org.toshi",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"cbwallet:",
|
||||
"universal":""
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"Coinbase",
|
||||
"colors":{
|
||||
"primary":"rgb(255, 255, 255)",
|
||||
"secondary":""
|
||||
}
|
||||
],
|
||||
"methods": [
|
||||
"eth_sendTransaction",
|
||||
"personal_sign",
|
||||
"eth_signTypedData",
|
||||
"wallet_addEthereumChain"
|
||||
]
|
||||
},
|
||||
"userFields": {
|
||||
"analyticEvent": "COINBASE_WALLET",
|
||||
"imageName": "coinbase-wallet.png"
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"Coinbase",
|
||||
"iosMinVersion":"1.8.0",
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/coinbase-wallet.png",
|
||||
"image":"coinbase-wallet.png",
|
||||
"encoding":"=\"#%/<>?@\\^`{|}:&",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletSegue",
|
||||
"native":"cbwallet:",
|
||||
"universal":""
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"COINBASE_WALLET"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "9d373b43ad4d2cf190fb1a774ec964a1addf406d6fd24af94ab7596e58c291b2",
|
||||
"name": "imToken",
|
||||
"description": "",
|
||||
"homepage": "https://token.im/",
|
||||
"chains": [
|
||||
"eip155:1"
|
||||
],
|
||||
"versions": [
|
||||
"1"
|
||||
],
|
||||
"app": {
|
||||
"browser": "",
|
||||
"ios": "https://itunes.apple.com/us/app/imtoken2/id1384798940",
|
||||
"android": "https://play.google.com/store/apps/details?id=im.token.app",
|
||||
"mac": "",
|
||||
"windows": "",
|
||||
"linux": ""
|
||||
},
|
||||
"mobile": {
|
||||
"native": "imtokenv2:",
|
||||
"universal": ""
|
||||
},
|
||||
"desktop": {
|
||||
"native": "",
|
||||
"universal": ""
|
||||
},
|
||||
"metadata": {
|
||||
"shortName": "imToken",
|
||||
"colors": {
|
||||
"primary": "rgb(255, 255, 255)",
|
||||
"secondary": ""
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"comment": "imToken",
|
||||
"iosMinVersion": "0",
|
||||
"imageUrl": "",
|
||||
"connections": [
|
||||
{
|
||||
"type": "walletConnectV2",
|
||||
"native": "imtokenv2:",
|
||||
"universal": ""
|
||||
"id":"9d373b43ad4d2cf190fb1a774ec964a1addf406d6fd24af94ab7596e58c291b2",
|
||||
"name":"imToken",
|
||||
"description":"",
|
||||
"homepage":"https://token.im/",
|
||||
"chains":[
|
||||
"eip155:1"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://itunes.apple.com/us/app/imtoken2/id1384798940",
|
||||
"android":"https://play.google.com/store/apps/details?id=im.token.app",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"imtokenv2:",
|
||||
"universal":""
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"imToken",
|
||||
"colors":{
|
||||
"primary":"rgb(255, 255, 255)",
|
||||
"secondary":""
|
||||
}
|
||||
],
|
||||
"methods": [
|
||||
"eth_sendTransaction",
|
||||
"personal_sign",
|
||||
"eth_signTypedData"
|
||||
]
|
||||
},
|
||||
"userFields": {
|
||||
"analyticEvent": "IMTOKEN",
|
||||
"imageName": "imtoken.png"
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"imToken",
|
||||
"iosMinVersion":"0",
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/imtoken.png",
|
||||
"image":"imtoken.png",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletConnect",
|
||||
"native":"imtokenv2:",
|
||||
"universal":""
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"IMTOKEN"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0",
|
||||
"name": "Trust Wallet",
|
||||
"description": "",
|
||||
"homepage": "https://trustwallet.com/",
|
||||
"chains": [
|
||||
"eip155:1",
|
||||
"eip155:42161",
|
||||
"eip155:43114"
|
||||
],
|
||||
"versions": [
|
||||
"1"
|
||||
],
|
||||
"app": {
|
||||
"browser": "",
|
||||
"ios": "https://apps.apple.com/app/apple-store/id1288339409",
|
||||
"android": "https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp",
|
||||
"mac": "",
|
||||
"windows": "",
|
||||
"linux": ""
|
||||
},
|
||||
"mobile": {
|
||||
"native": "trust:",
|
||||
"universal": "https://link.trustwallet.com"
|
||||
},
|
||||
"desktop": {
|
||||
"native": "",
|
||||
"universal": ""
|
||||
},
|
||||
"metadata": {
|
||||
"shortName": "Trust",
|
||||
"colors": {
|
||||
"primary": "rgb(51, 117, 187)",
|
||||
"secondary": ""
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"comment": "Trust Wallet",
|
||||
"iosMinVersion": "0",
|
||||
"encoding": "=\"#%/<>?@\\^`{|}:&",
|
||||
"imageUrl": "",
|
||||
"connections": [
|
||||
{
|
||||
"type": "walletConnectV2",
|
||||
"native": "trust:",
|
||||
"universal": "https://link.trustwallet.com"
|
||||
"id":"4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0",
|
||||
"name":"Trust Wallet",
|
||||
"description":"",
|
||||
"homepage":"https://trustwallet.com/",
|
||||
"chains":[
|
||||
"eip155:1",
|
||||
"eip155:42161",
|
||||
"eip155:43114"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://apps.apple.com/app/apple-store/id1288339409",
|
||||
"android":"https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"trust:",
|
||||
"universal":"https://link.trustwallet.com"
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"Trust",
|
||||
"colors":{
|
||||
"primary":"rgb(51, 117, 187)",
|
||||
"secondary":""
|
||||
}
|
||||
],
|
||||
"methods": [
|
||||
"eth_sendTransaction",
|
||||
"personal_sign",
|
||||
"eth_signTypedData"
|
||||
]
|
||||
},
|
||||
"userFields": {
|
||||
"analyticEvent": "TRUST_WALLET",
|
||||
"imageName": "trust-wallet.png"
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"Trust Wallet",
|
||||
"iosMinVersion":"0",
|
||||
"encoding":"=\"#%/<>?@\\^`{|}:&",
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/trust-wallet.png",
|
||||
"image":"trust-wallet.png",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletConnectV2",
|
||||
"native":"trust:",
|
||||
"universal":"https://link.trustwallet.com"
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"TRUST_WALLET"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "Zerion",
|
||||
"name": "Zerion",
|
||||
"description": "",
|
||||
"homepage": "https://zerion.io/",
|
||||
"chains": [
|
||||
"eip155:1"
|
||||
],
|
||||
"versions": [
|
||||
"1"
|
||||
],
|
||||
"app": {
|
||||
"browser": "",
|
||||
"ios": "https://apps.apple.com/app/apple-store/id1456732565",
|
||||
"android": "https://play.google.com/store/apps/details?id=io.zerion.android",
|
||||
"mac": "",
|
||||
"windows": "",
|
||||
"linux": ""
|
||||
},
|
||||
"mobile": {
|
||||
"native": "zerion:",
|
||||
"universal": ""
|
||||
},
|
||||
"desktop": {
|
||||
"native": "",
|
||||
"universal": ""
|
||||
},
|
||||
"metadata": {
|
||||
"shortName": "Zerion",
|
||||
"colors": {
|
||||
"primary": "rgb(51, 117, 187)",
|
||||
"secondary": ""
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"comment": "Zerion Wallet",
|
||||
"iosMinVersion": "0",
|
||||
"encoding": "=\"#%/<>?@\\^`{|}:&",
|
||||
"imageUrl": "",
|
||||
"connections": [
|
||||
{
|
||||
"type": "walletConnectV2",
|
||||
"native": "zerion:",
|
||||
"universal": ""
|
||||
"id":"Zerion",
|
||||
"name":"Zerion",
|
||||
"description":"",
|
||||
"homepage":"https://zerion.io/",
|
||||
"chains":[
|
||||
"eip155:1"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://apps.apple.com/app/apple-store/id1456732565",
|
||||
"android":"https://play.google.com/store/apps/details?id=io.zerion.android",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"zerion:",
|
||||
"universal":""
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"Zerion",
|
||||
"colors":{
|
||||
"primary":"rgb(51, 117, 187)",
|
||||
"secondary":""
|
||||
}
|
||||
],
|
||||
"methods": [
|
||||
"eth_sendTransaction",
|
||||
"personal_sign",
|
||||
"eth_signTypedData"
|
||||
]
|
||||
},
|
||||
"userFields": {
|
||||
"analyticEvent": "ZERION",
|
||||
"imageName": "zerion.png"
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"Zerion Wallet",
|
||||
"iosMinVersion":"0",
|
||||
"encoding":"=\"#%/<>?@\\^`{|}:&",
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/zerion.png",
|
||||
"image":"zerion.png",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletConnectV2",
|
||||
"native":"zerion:",
|
||||
"universal":""
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"ZERION"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66",
|
||||
"name": "TokenPocket",
|
||||
"description": "",
|
||||
"homepage": "https://tokenpocket.pro/",
|
||||
"chains": [
|
||||
"eip155:1"
|
||||
],
|
||||
"versions": [
|
||||
"1"
|
||||
],
|
||||
"app": {
|
||||
"browser": "",
|
||||
"ios": "https://apps.apple.com/us/app/tokenpocket-trusted-wallet/id1436028697",
|
||||
"android": "https://play.google.com/store/apps/details?id=vip.mytokenpocket",
|
||||
"mac": "",
|
||||
"windows": "",
|
||||
"linux": ""
|
||||
},
|
||||
"mobile": {
|
||||
"native": "tpoutside:",
|
||||
"universal": ""
|
||||
},
|
||||
"desktop": {
|
||||
"native": "",
|
||||
"universal": ""
|
||||
},
|
||||
"metadata": {
|
||||
"shortName": "TokenPocket",
|
||||
"colors": {
|
||||
"primary": "rgb(41, 128, 254)",
|
||||
"secondary": ""
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"comment": "TokenPocket",
|
||||
"iosMinVersion": "0",
|
||||
"imageUrl": "",
|
||||
"connections": [
|
||||
{
|
||||
"type": "walletConnectV2",
|
||||
"native": "tpoutside:",
|
||||
"universal": ""
|
||||
"id":"20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66",
|
||||
"name":"TokenPocket",
|
||||
"description":"",
|
||||
"homepage":"https://tokenpocket.pro/",
|
||||
"chains":[
|
||||
"eip155:1"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://apps.apple.com/us/app/tokenpocket-trusted-wallet/id1436028697",
|
||||
"android":"https://play.google.com/store/apps/details?id=vip.mytokenpocket",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"tpoutside:",
|
||||
"universal":""
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"TokenPocket",
|
||||
"colors":{
|
||||
"primary":"rgb(41, 128, 254)",
|
||||
"secondary":""
|
||||
}
|
||||
],
|
||||
"methods": [
|
||||
"eth_sendTransaction",
|
||||
"personal_sign",
|
||||
"eth_signTypedData"
|
||||
]
|
||||
},
|
||||
"userFields": {
|
||||
"analyticEvent": "TOKEN_POCKET",
|
||||
"imageName": "tokenpocket.png"
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"TokenPocket",
|
||||
"iosMinVersion":"0",
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/tokenpocket.png",
|
||||
"image":"tokenpocket.png",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletConnect",
|
||||
"native":"tpoutside:",
|
||||
"universal":""
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"TOKEN_POCKET"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369",
|
||||
"name": "Rainbow",
|
||||
"description": "",
|
||||
"homepage": "https://rainbow.me/",
|
||||
"chains": [
|
||||
"eip155:1"
|
||||
],
|
||||
"versions": [
|
||||
"1"
|
||||
],
|
||||
"app": {
|
||||
"browser": "",
|
||||
"ios": "https://apps.apple.com/us/app/rainbow-ethereum-wallet/id1457119021",
|
||||
"android": "",
|
||||
"mac": "",
|
||||
"windows": "",
|
||||
"linux": ""
|
||||
},
|
||||
"mobile": {
|
||||
"native": "rainbow:",
|
||||
"universal": "https://rnbwapp.com"
|
||||
},
|
||||
"desktop": {
|
||||
"native": "",
|
||||
"universal": ""
|
||||
},
|
||||
"metadata": {
|
||||
"shortName": "Rainbow",
|
||||
"colors": {
|
||||
"primary": "rgb(0, 30, 89)",
|
||||
"secondary": ""
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"comment": "Rainbow",
|
||||
"iosMinVersion": "0",
|
||||
"encoding": "=\"#%/<>?@\\^`{|}:&",
|
||||
"backlinked": true,
|
||||
"imageUrl": "",
|
||||
"connections": [
|
||||
{
|
||||
"type": "walletConnectV2",
|
||||
"native": "rainbow:",
|
||||
"universal": "https://rnbwapp.com"
|
||||
"id":"1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369",
|
||||
"name":"Rainbow",
|
||||
"description":"",
|
||||
"homepage":"https://rainbow.me/",
|
||||
"chains":[
|
||||
"eip155:1"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://apps.apple.com/us/app/rainbow-ethereum-wallet/id1457119021",
|
||||
"android":"",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"rainbow:",
|
||||
"universal":"https://rnbwapp.com"
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"Rainbow",
|
||||
"colors":{
|
||||
"primary":"rgb(0, 30, 89)",
|
||||
"secondary":""
|
||||
}
|
||||
],
|
||||
"methods": [
|
||||
"eth_sendTransaction",
|
||||
"personal_sign",
|
||||
"eth_signTypedData"
|
||||
]
|
||||
},
|
||||
"userFields": {
|
||||
"analyticEvent": "RAINBOW_WALLET",
|
||||
"imageName": "rainbow-wallet.png"
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"Rainbow",
|
||||
"iosMinVersion":"0",
|
||||
"encoding":"=\"#%/<>?@\\^`{|}:&",
|
||||
"backlinked":true,
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/rainbow-wallet.png",
|
||||
"image":"rainbow-wallet.png",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletConnectV2",
|
||||
"native":"rainbow:",
|
||||
"universal":"https://rnbwapp.com"
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"RAINBOW_WALLET"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "09102e7bbbd3f92001eda104abe23803181629f695e8f1b95af96d88ff7d5890",
|
||||
"name": "1inch Wallet",
|
||||
"description": "",
|
||||
"homepage": "https://1inch.io/wallet/",
|
||||
"chains": [
|
||||
"eip155:1",
|
||||
"eip155:56"
|
||||
],
|
||||
"versions": [
|
||||
"1"
|
||||
],
|
||||
"app": {
|
||||
"browser": "",
|
||||
"ios": "https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391",
|
||||
"android": "",
|
||||
"mac": "",
|
||||
"windows": "",
|
||||
"linux": ""
|
||||
},
|
||||
"mobile": {
|
||||
"native": "oneinch:",
|
||||
"universal": "https://wallet.1inch.io"
|
||||
},
|
||||
"desktop": {
|
||||
"native": "",
|
||||
"universal": ""
|
||||
},
|
||||
"metadata": {
|
||||
"shortName": "1inch",
|
||||
"colors": {
|
||||
"primary": "rgb(31, 36, 46)",
|
||||
"secondary": ""
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"comment": "1inch",
|
||||
"iosMinVersion": "0",
|
||||
"encoding": "=\"#%/<>?@\\^`{|}:&",
|
||||
"imageUrl": "",
|
||||
"connections": [
|
||||
{
|
||||
"type": "walletConnectV2",
|
||||
"native": "oneinch:",
|
||||
"universal": "https://wallet.1inch.io"
|
||||
"id":"09102e7bbbd3f92001eda104abe23803181629f695e8f1b95af96d88ff7d5890",
|
||||
"name":"1inch Wallet",
|
||||
"description":"",
|
||||
"homepage":"https://1inch.io/wallet/",
|
||||
"chains":[
|
||||
"eip155:1",
|
||||
"eip155:56"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391",
|
||||
"android":"",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"oneinch:",
|
||||
"universal":"https://wallet.1inch.io"
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"1inch",
|
||||
"colors":{
|
||||
"primary":"rgb(31, 36, 46)",
|
||||
"secondary":""
|
||||
}
|
||||
],
|
||||
"methods": [
|
||||
"eth_sendTransaction",
|
||||
"personal_sign",
|
||||
"eth_signTypedData"
|
||||
]
|
||||
},
|
||||
"userFields": {
|
||||
"analyticEvent": "1INCH",
|
||||
"imageName": "1inch.png"
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"1inch",
|
||||
"iosMinVersion":"0",
|
||||
"encoding":"=\"#%/<>?@\\^`{|}:&",
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/1inch.png",
|
||||
"image":"1inch.png",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletConnect",
|
||||
"native":"oneinch:",
|
||||
"universal":"https://wallet.1inch.io"
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"1INCH"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id":"bae74827272509a6d63ea25514d9c68ad235c14e45e183518c7ded4572a1b0c4",
|
||||
"name":"Huobi Wallet",
|
||||
"description":"",
|
||||
"homepage":"https://huobiwallet.com/",
|
||||
"chains":[
|
||||
"eip155:1"
|
||||
],
|
||||
"versions":[
|
||||
"1"
|
||||
],
|
||||
"app":{
|
||||
"browser":"",
|
||||
"ios":"https://apps.apple.com/us/app/id1433883012",
|
||||
"android":"https://play.google.com/store/apps/details?id=com.huobionchainwallet.gp",
|
||||
"mac":"",
|
||||
"windows":"",
|
||||
"linux":""
|
||||
},
|
||||
"mobile":{
|
||||
"native":"huobiwallet:",
|
||||
"universal":""
|
||||
},
|
||||
"desktop":{
|
||||
"native":"",
|
||||
"universal":""
|
||||
},
|
||||
"metadata":{
|
||||
"shortName":"Huobi",
|
||||
"colors":{
|
||||
"primary":"rgb(45,101,248)",
|
||||
"secondary":""
|
||||
}
|
||||
},
|
||||
"config":{
|
||||
"comment":"Huobi",
|
||||
"iosMinVersion":"0",
|
||||
"encoding":"=\"#%/<>?@\\^`{|}:&",
|
||||
"imageUrl":"https://v4.testnet.dydx.exchange/wallets/huobi-wallet.png",
|
||||
"image":"huobi-wallet.png",
|
||||
"connections":[
|
||||
{
|
||||
"type":"walletConnect",
|
||||
"native":"huobiwallet:",
|
||||
"universal":""
|
||||
}
|
||||
]
|
||||
},
|
||||
"userFields":{
|
||||
"analyticEvent":"HUOBI_WALLET"
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.5 MiB |
@@ -14,7 +14,6 @@ import { DialogAreaProvider, useDialogArea } from '@/hooks/useDialogArea';
|
||||
import { LocaleProvider } from '@/hooks/useLocaleSeparators';
|
||||
import { NotificationsProvider } from '@/hooks/useNotifications';
|
||||
import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
|
||||
import { RestrictionProvider } from '@/hooks/useRestrictions';
|
||||
import { SubaccountProvider } from '@/hooks/useSubaccount';
|
||||
import { SquidProvider } from '@/hooks/useSquid';
|
||||
|
||||
@@ -67,7 +66,6 @@ const Content = () => {
|
||||
<Route path=":market" element={<TradePage />} />
|
||||
<Route path={AppRoute.Trade} element={<TradePage />} />
|
||||
</Route>
|
||||
|
||||
<Route path={AppRoute.Markets} element={<MarketsPage />} />
|
||||
<Route path={AppRoute.Rewards} element={<RewardsPage />} />
|
||||
{isTablet && (
|
||||
@@ -81,7 +79,6 @@ const Content = () => {
|
||||
<Route element={<GuardedMobileRoute />}>
|
||||
<Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
|
||||
</Route>
|
||||
|
||||
<Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
|
||||
</Routes>
|
||||
</Suspense>
|
||||
@@ -112,7 +109,6 @@ const providers = [
|
||||
wrapProvider(GrazProvider),
|
||||
wrapProvider(WagmiConfig, { config }),
|
||||
wrapProvider(LocaleProvider),
|
||||
wrapProvider(RestrictionProvider),
|
||||
wrapProvider(DydxProvider),
|
||||
wrapProvider(AccountsProvider),
|
||||
wrapProvider(SubaccountProvider),
|
||||
|
||||
@@ -6,8 +6,6 @@ import {
|
||||
AddressConnectorIcon,
|
||||
ArrowIcon,
|
||||
Bar3Icon,
|
||||
BellIcon,
|
||||
BellStrokeIcon,
|
||||
BoxCloseIcon,
|
||||
CalculatorIcon,
|
||||
CaretIcon,
|
||||
@@ -73,8 +71,6 @@ export enum IconName {
|
||||
AddressConnector = 'AddressConnector',
|
||||
Arrow = 'Arrow',
|
||||
Bar3 = 'Bar3',
|
||||
Bell = 'Bell',
|
||||
BellStroked = 'BellStroked',
|
||||
BoxClose = 'BoxClose',
|
||||
Calculator = 'Calculator',
|
||||
Caret = 'Caret',
|
||||
@@ -141,8 +137,6 @@ const icons = {
|
||||
[IconName.AddressConnector]: AddressConnectorIcon,
|
||||
[IconName.Arrow]: ArrowIcon,
|
||||
[IconName.Bar3]: Bar3Icon,
|
||||
[IconName.Bell]: BellIcon,
|
||||
[IconName.BellStroked]: BellStrokeIcon,
|
||||
[IconName.BoxClose]: BoxCloseIcon,
|
||||
[IconName.Calculator]: CalculatorIcon,
|
||||
[IconName.Caret]: CaretIcon,
|
||||
@@ -219,8 +213,7 @@ export const Icon = styled(
|
||||
iconComponent: Component = iconName && icons[iconName],
|
||||
className,
|
||||
...props
|
||||
}: ElementProps & StyleProps) =>
|
||||
Component ? <Component className={className} {...props} /> : null
|
||||
}: ElementProps & StyleProps) => (Component ? <Component className={className} {...props} /> : null)
|
||||
)`
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
|
||||
@@ -207,16 +207,6 @@ const InputStyle = css`
|
||||
color: var(--color-text-0);
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
// Input autofill Styles
|
||||
&:-webkit-autofill,
|
||||
&:-webkit-autofill:focus {
|
||||
transition: background-color 600000s 0s, color 600000s 0s;
|
||||
}
|
||||
|
||||
&[data-autocompleted] {
|
||||
background-color: var(--input-backgroundColor) !important;
|
||||
}
|
||||
`;
|
||||
|
||||
Styled.NumericFormat = styled(NumericFormat)`
|
||||
|
||||
+10
-28
@@ -59,6 +59,16 @@ export const TransactionType = Abacus.exchange.dydx.abacus.protocols.Transaction
|
||||
const transactionTypes = [...TransactionType.values()] as const;
|
||||
export type TransactionTypes = (typeof transactionTypes)[number];
|
||||
|
||||
export type NetworkConfig = {
|
||||
chainId: string;
|
||||
indexerUrl: string;
|
||||
indexerSocketUrl: string;
|
||||
validatorUrl: string;
|
||||
faucetUrl?: string | null;
|
||||
};
|
||||
|
||||
export type ConnectNetworkEvent = CustomEvent<Partial<NetworkConfig>>;
|
||||
|
||||
// ------ State ------
|
||||
export type AbacusApiState = Abacus.exchange.dydx.abacus.state.manager.ApiState;
|
||||
export const AbacusApiStatus = Abacus.exchange.dydx.abacus.state.manager.ApiStatus;
|
||||
@@ -68,13 +78,8 @@ export const Changes = Abacus.exchange.dydx.abacus.state.changes.Changes;
|
||||
export type PerpetualStateChanges = Abacus.exchange.dydx.abacus.state.changes.StateChanges;
|
||||
export const AsyncAbacusStateManager =
|
||||
Abacus.exchange.dydx.abacus.state.manager.AsyncAbacusStateManager;
|
||||
|
||||
// ------ Parsing Errors ------ //
|
||||
export type ParsingError = Abacus.exchange.dydx.abacus.responses.ParsingError;
|
||||
export type ParsingErrors = kollections.List<ParsingError>;
|
||||
export const ParsingErrorType = Abacus.exchange.dydx.abacus.responses.ParsingErrorType;
|
||||
const parsingErrorTypes = [...ParsingErrorType.values()] as const;
|
||||
export type ParsingErrorTypes = (typeof parsingErrorTypes)[number];
|
||||
|
||||
// ------ Perpetuals/Markets ------ //
|
||||
export type PerpetualState = Abacus.exchange.dydx.abacus.output.PerpetualState;
|
||||
@@ -194,12 +199,6 @@ export type RiskLevels = (typeof riskLevels)[number];
|
||||
// ------ Notifications ------ //
|
||||
export type AbacusNotification = Abacus.exchange.dydx.abacus.output.Notification;
|
||||
|
||||
// ------ Restrictions ------ //
|
||||
export type UsageRestriction = Abacus.exchange.dydx.abacus.output.UsageRestriction;
|
||||
export const RestrictionType = Abacus.exchange.dydx.abacus.output.Restriction;
|
||||
const restrictionTypes = [...RestrictionType.values()] as const;
|
||||
export type RestrictionTypes = (typeof restrictionTypes)[number];
|
||||
|
||||
// ------ Enum Conversions ------ //
|
||||
type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2
|
||||
? A
|
||||
@@ -257,20 +256,3 @@ export const TRADE_TYPES: Record<
|
||||
[AbacusOrderType.liquidation.name]: null,
|
||||
[AbacusOrderType.trailingStop.name]: null,
|
||||
};
|
||||
|
||||
// Custom types involving Abacus
|
||||
|
||||
export type NetworkConfig = Partial<{
|
||||
indexerUrl: Nullable<string>;
|
||||
websocketUrl: Nullable<string>;
|
||||
validatorUrl: Nullable<string>;
|
||||
chainId: Nullable<string>;
|
||||
faucetUrl: Nullable<string>;
|
||||
USDC_DENOM: Nullable<string>;
|
||||
USDC_DECIMALS: Nullable<number>;
|
||||
USDC_GAS_DENOM: Nullable<string>;
|
||||
CHAINTOKEN_DENOM: Nullable<string>;
|
||||
CHAINTOKEN_DECIMALS: Nullable<number>;
|
||||
}>;
|
||||
|
||||
export type ConnectNetworkEvent = CustomEvent<Partial<NetworkConfig>>;
|
||||
|
||||
@@ -10,10 +10,7 @@ export enum DialogTypes {
|
||||
MobileSignIn = 'MobileSignIn',
|
||||
Onboarding = 'Onboarding',
|
||||
OrderDetails = 'OrderDetails',
|
||||
RateLimit = 'RateLimit',
|
||||
Receive = 'Receive',
|
||||
RestrictedGeo = 'RestrictedGeo',
|
||||
RestrictedWallet = 'RestrictedWallet',
|
||||
Trade = 'Trade',
|
||||
Transfer = 'Transfer',
|
||||
Withdraw = 'Withdraw',
|
||||
|
||||
@@ -24,6 +24,6 @@ export enum LocalStorageKey {
|
||||
}
|
||||
|
||||
export const LOCAL_STORAGE_VERSIONS = {
|
||||
[LocalStorageKey.EvmDerivedAddresses]: 'v2',
|
||||
[LocalStorageKey.EvmDerivedAddresses]: 'v1',
|
||||
// TODO: version all localStorage keys
|
||||
};
|
||||
|
||||
@@ -8,5 +8,5 @@ export const AVAILABLE_ENVIRONMENTS =
|
||||
|
||||
export const CURRENT_ABACUS_DEPLOYMENT = import.meta.env.MODE === 'production' ? 'TESTNET' : 'DEV';
|
||||
export const ENVIRONMENT_CONFIG_MAP = environments.environments;
|
||||
export type DydxNetwork = keyof typeof ENVIRONMENT_CONFIG_MAP;
|
||||
export type DydxNetwork = (typeof AVAILABLE_ENVIRONMENTS.environments)[number];
|
||||
export const DEFAULT_APP_ENVIRONMENT = AVAILABLE_ENVIRONMENTS.default as DydxNetwork;
|
||||
|
||||
+85
-48
@@ -32,6 +32,7 @@ export enum WalletConnectionType {
|
||||
CoinbaseWalletSdk = 'coinbaseWalletSdk',
|
||||
CosmosSigner = 'CosmosSigner',
|
||||
InjectedEip1193 = 'injectedEip1193',
|
||||
WalletConnect1 = 'walletConnect1',
|
||||
WalletConnect2 = 'walletConnect2',
|
||||
}
|
||||
|
||||
@@ -61,6 +62,10 @@ export const walletConnectionTypes: Record<WalletConnectionType, WalletConnectio
|
||||
name: 'injected EIP-1193 provider',
|
||||
wagmiConnectorId: 'injected',
|
||||
},
|
||||
[WalletConnectionType.WalletConnect1]: {
|
||||
name: 'WalletConnect 1.0',
|
||||
wagmiConnectorId: 'walletConnectLegacy',
|
||||
},
|
||||
[WalletConnectionType.WalletConnect2]: {
|
||||
name: 'WalletConnect 2.0',
|
||||
wagmiConnectorId: 'walletConnect',
|
||||
@@ -87,35 +92,19 @@ export enum WalletType {
|
||||
Rainbow = 'RAINBOW_WALLET',
|
||||
TokenPocket = 'TOKEN_POCKET',
|
||||
TrustWallet = 'TRUST_WALLET',
|
||||
WalletConnect = 'WALLETCONNECT',
|
||||
WalletConnect2 = 'WALLETCONNECT_2',
|
||||
// TestWallet = 'TEST_WALLET',
|
||||
OtherWallet = 'OTHER_WALLET',
|
||||
}
|
||||
|
||||
const WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS = {
|
||||
Metamask: 'c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96',
|
||||
imToken: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
|
||||
TokenPocket: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
|
||||
Trust: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
|
||||
Rainbow: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
|
||||
Zerion: 'ecc4036f814562b41a5268adc86270fba1365471402006302e70169465b7ac18',
|
||||
Ledger: '19177a98252e07ddfc9af2083ba8e07ef627cb6103467ffebb3f8f4205fd7927',
|
||||
Fireblocks: '5864e2ced7c293ed18ac35e0db085c09ed567d67346ccb6f58a0327a75137489',
|
||||
Uniswap: 'c03dfee351b6fcc421b4494ea33b9d4b92a984f87aa76d1663bb28705e95034a',
|
||||
Robinhood: '8837dd9413b1d9b585ee937d27a816590248386d9dbf59f5cd3422dbbb65683e',
|
||||
'1inch': 'c286eebc742a537cd1d6818363e9dc53b21759a1e8e5d9b263d0c03ec7703576',
|
||||
};
|
||||
|
||||
export const WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS = Object.values(
|
||||
WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS
|
||||
);
|
||||
|
||||
type WalletConfig = {
|
||||
type: WalletType;
|
||||
stringKey: string;
|
||||
icon: string;
|
||||
connectionTypes: WalletConnectionType[];
|
||||
matchesInjectedEip1193?: (provider: ExternalProvider & any) => boolean;
|
||||
walletconnect1Name?: string;
|
||||
walletconnect2Id?: string;
|
||||
};
|
||||
|
||||
@@ -128,6 +117,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
// WalletConnectionType.CoinbaseWalletSdk,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) =>
|
||||
Object.entries(wallets).every(
|
||||
@@ -141,22 +131,30 @@ export const wallets: Record<WalletType, WalletConfig> = {
|
||||
type: WalletType.BitKeep,
|
||||
stringKey: STRING_KEYS.BITKEEP,
|
||||
icon: BitkeepIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
|
||||
connectionTypes: [
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) => provider.isBitKeep, // isBitKeepChrome, isBitEthereum
|
||||
walletconnect1Name: 'bitkeep',
|
||||
walletconnect2Id: '38f5d18bd8522c244bdd70cb4a68e0e718865155811c043f052fb9f1c51de662',
|
||||
},
|
||||
[WalletType.BitPie]: {
|
||||
type: WalletType.BitPie,
|
||||
stringKey: STRING_KEYS.BITPIE,
|
||||
icon: BitpieIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193],
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1],
|
||||
matchesInjectedEip1193: (provider) => provider.isBitpie,
|
||||
walletconnect1Name: 'bitpie',
|
||||
},
|
||||
[WalletType.CloverWallet]: {
|
||||
type: WalletType.CloverWallet,
|
||||
stringKey: STRING_KEYS.CLOVER_WALLET,
|
||||
icon: CloverWalletIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193],
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1],
|
||||
matchesInjectedEip1193: (provider) => provider.isClover,
|
||||
// walletconnect1Name: 'clover',
|
||||
},
|
||||
[WalletType.CoinbaseWallet]: {
|
||||
type: WalletType.CoinbaseWallet,
|
||||
@@ -165,71 +163,109 @@ export const wallets: Record<WalletType, WalletConfig> = {
|
||||
connectionTypes: [
|
||||
WalletConnectionType.CoinbaseWalletSdk,
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) => provider.isCoinbaseWallet, // provider.selectedProvider?.isCoinbaseWallet,
|
||||
walletconnect1Name: 'coinbase',
|
||||
},
|
||||
[WalletType.Coin98]: {
|
||||
type: WalletType.Coin98,
|
||||
stringKey: STRING_KEYS.COIN98,
|
||||
icon: Coin98Icon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
|
||||
connectionTypes: [
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) => provider.isCoin98,
|
||||
walletconnect1Name: 'coin98',
|
||||
walletconnect2Id: '2a3c89040ac3b723a1972a33a125b1db11e258a6975d3a61252cd64e6ea5ea01',
|
||||
},
|
||||
[WalletType.HuobiWallet]: {
|
||||
type: WalletType.HuobiWallet,
|
||||
stringKey: STRING_KEYS.HUOBI_WALLET,
|
||||
icon: HuobiIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
|
||||
connectionTypes: [
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) => provider.isHbWallet,
|
||||
walletconnect2Id: '797c615e2c556b610c048eb35535f212c0dd58de5d03e763120e90a7d1350a77',
|
||||
},
|
||||
[WalletType.ImToken]: {
|
||||
type: WalletType.ImToken,
|
||||
stringKey: STRING_KEYS.IMTOKEN,
|
||||
icon: ImTokenIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
|
||||
connectionTypes: [
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) => provider.isImToken,
|
||||
walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.imToken,
|
||||
walletconnect1Name: 'imtoken',
|
||||
walletconnect2Id: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
|
||||
},
|
||||
[WalletType.MathWallet]: {
|
||||
type: WalletType.MathWallet,
|
||||
stringKey: STRING_KEYS.MATH_WALLET,
|
||||
icon: MathWalletIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193],
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1],
|
||||
matchesInjectedEip1193: (provider) => provider.isMathWallet,
|
||||
walletconnect1Name: 'math',
|
||||
walletconnect2Id: '7674bb4e353bf52886768a3ddc2a4562ce2f4191c80831291218ebd90f5f5e26',
|
||||
},
|
||||
[WalletType.MetaMask]: {
|
||||
type: WalletType.MetaMask,
|
||||
stringKey: STRING_KEYS.METAMASK,
|
||||
icon: MetaMaskIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
|
||||
connectionTypes: [
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: isMetaMask,
|
||||
walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Metamask,
|
||||
walletconnect1Name: 'metamask',
|
||||
walletconnect2Id: 'c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96',
|
||||
},
|
||||
[WalletType.Rainbow]: {
|
||||
type: WalletType.Rainbow,
|
||||
stringKey: STRING_KEYS.RAINBOW_WALLET,
|
||||
icon: RainbowIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
|
||||
connectionTypes: [
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) => provider.isRainbowWallet,
|
||||
walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Rainbow,
|
||||
walletconnect1Name: 'rainbow',
|
||||
walletconnect2Id: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
|
||||
},
|
||||
[WalletType.TokenPocket]: {
|
||||
type: WalletType.TokenPocket,
|
||||
stringKey: STRING_KEYS.TOKEN_POCKET,
|
||||
icon: TokenPocketIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
|
||||
connectionTypes: [
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) => provider.isTokenPocket,
|
||||
walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.TokenPocket,
|
||||
walletconnect1Name: 'tokenpocket',
|
||||
walletconnect2Id: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
|
||||
},
|
||||
[WalletType.TrustWallet]: {
|
||||
type: WalletType.TrustWallet,
|
||||
stringKey: STRING_KEYS.TRUST_WALLET,
|
||||
icon: TrustWalletIcon,
|
||||
connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
|
||||
connectionTypes: [
|
||||
WalletConnectionType.InjectedEip1193,
|
||||
WalletConnectionType.WalletConnect2,
|
||||
WalletConnectionType.WalletConnect1,
|
||||
],
|
||||
matchesInjectedEip1193: (provider) => provider.isTrust,
|
||||
walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Trust,
|
||||
walletconnect1Name: 'trust',
|
||||
walletconnect2Id: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
|
||||
},
|
||||
[WalletType.WalletConnect2]: {
|
||||
type: WalletType.WalletConnect2,
|
||||
@@ -237,6 +273,12 @@ export const wallets: Record<WalletType, WalletConfig> = {
|
||||
icon: WalletConnectIcon,
|
||||
connectionTypes: [WalletConnectionType.WalletConnect2],
|
||||
},
|
||||
[WalletType.WalletConnect]: {
|
||||
type: WalletType.WalletConnect,
|
||||
stringKey: STRING_KEYS.WALLET_CONNECT,
|
||||
icon: WalletConnectIcon,
|
||||
connectionTypes: [WalletConnectionType.WalletConnect1],
|
||||
},
|
||||
[WalletType.Keplr]: {
|
||||
type: WalletType.Keplr,
|
||||
stringKey: STRING_KEYS.KEPLR,
|
||||
@@ -302,10 +344,10 @@ export type DydxAddress = `dydx${string}`;
|
||||
export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
|
||||
rpc: 'https://dydx-testnet-archive.allthatnode.com:26657',
|
||||
rest: 'https://dydx-testnet-archive.allthatnode.com:1317',
|
||||
chainId: 'dydx-testnet-4',
|
||||
chainId: 'dydx-testnet-3',
|
||||
chainName: 'dYdX Public Testnet',
|
||||
chainSymbolImageUrl:
|
||||
'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-4/chain.png',
|
||||
'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-3/chain.png',
|
||||
bech32Config: {
|
||||
bech32PrefixAccPub: 'dydxpub',
|
||||
bech32PrefixValPub: 'dydxvaloperpub',
|
||||
@@ -319,31 +361,26 @@ export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
|
||||
},
|
||||
stakeCurrency: {
|
||||
coinDenom: 'DV4TNT',
|
||||
coinDecimals: 18,
|
||||
coinMinimalDenom: 'adv4tnt',
|
||||
coinDecimals: 6,
|
||||
coinMinimalDenom: 'dv4tnt',
|
||||
},
|
||||
currencies: [
|
||||
{
|
||||
coinDenom: 'DV4TNT',
|
||||
coinDecimals: 18,
|
||||
coinMinimalDenom: 'adv4tnt',
|
||||
coinDecimals: 6,
|
||||
coinMinimalDenom: 'dv4tnt',
|
||||
},
|
||||
{
|
||||
coinDenom: 'USDC',
|
||||
coinDecimals: 6,
|
||||
coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
|
||||
coinDecimals: 6,
|
||||
},
|
||||
],
|
||||
feeCurrencies: [
|
||||
{
|
||||
coinDenom: 'DV4TNT',
|
||||
coinDecimals: 18,
|
||||
coinMinimalDenom: 'adv4tnt',
|
||||
},
|
||||
{
|
||||
coinDenom: 'USDC',
|
||||
coinDecimals: 6,
|
||||
coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
|
||||
coinMinimalDenom: 'dv4tnt',
|
||||
},
|
||||
],
|
||||
features: [],
|
||||
|
||||
@@ -16,7 +16,6 @@ import { useLocalStorage } from './useLocalStorage';
|
||||
import { useNow } from './useNow';
|
||||
import { useOnClickOutside } from './useOnClickOutside';
|
||||
import { usePageTitlePriceUpdates } from './usePageTitlePriceUpdates';
|
||||
import { useRestrictions } from './useRestrictions';
|
||||
import { useShouldShowFooter } from './useShouldShowFooter';
|
||||
import { useSelectedNetwork } from './useSelectedNetwork';
|
||||
import { useStringGetter } from './useStringGetter';
|
||||
@@ -41,7 +40,6 @@ export {
|
||||
useNow,
|
||||
useOnClickOutside,
|
||||
usePageTitlePriceUpdates,
|
||||
useRestrictions,
|
||||
useShouldShowFooter,
|
||||
useSelectedNetwork,
|
||||
useStringGetter,
|
||||
|
||||
@@ -33,7 +33,7 @@ export const useTradingView = ({
|
||||
const marketIds = useSelector(getMarketIds, shallowEqual);
|
||||
const selectedLocale = useSelector(getSelectedLocale);
|
||||
const selectedNetwork = useSelector(getSelectedNetwork);
|
||||
const { getCandlesForDatafeed, isConnected: isClientConnected } = useDydxClient();
|
||||
const { getCandlesForDatafeed } = useDydxClient();
|
||||
|
||||
const [savedTvChartConfig, setTvChartConfig] = useLocalStorage<object | undefined>({
|
||||
key: LocalStorageKey.TradingViewChartConfig,
|
||||
@@ -44,7 +44,7 @@ export const useTradingView = ({
|
||||
const hasMarkets = marketIds.length > 0;
|
||||
|
||||
useEffect(() => {
|
||||
if (hasMarkets && isClientConnected) {
|
||||
if (hasMarkets) {
|
||||
const widgetOptions = getWidgetOptions();
|
||||
const widgetOverrides = getWidgetOverrides(appTheme);
|
||||
const options = {
|
||||
@@ -75,7 +75,7 @@ export const useTradingView = ({
|
||||
tvWidgetRef.current = null;
|
||||
setIsChartReady(false);
|
||||
};
|
||||
}, [getCandlesForDatafeed, isClientConnected, hasMarkets, selectedLocale, selectedNetwork]);
|
||||
}, [getCandlesForDatafeed, hasMarkets, selectedLocale, selectedNetwork]);
|
||||
|
||||
return { savedResolution };
|
||||
};
|
||||
|
||||
@@ -5,20 +5,18 @@ import { AES, enc } from 'crypto-js';
|
||||
import { LocalWallet, USDC_DENOM, type Subaccount } from '@dydxprotocol/v4-client-js';
|
||||
|
||||
import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/constants/account';
|
||||
import { DialogTypes } from '@/constants/dialogs';
|
||||
import { LocalStorageKey, LOCAL_STORAGE_VERSIONS } from '@/constants/localStorage';
|
||||
import { DydxAddress, EvmAddress, PrivateInformation } 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 { useDydxClient } from './useDydxClient';
|
||||
import { useLocalStorage } from './useLocalStorage';
|
||||
import { useRestrictions } from './useRestrictions';
|
||||
|
||||
import { useWalletConnection } from './useWalletConnection';
|
||||
import { useDydxClient } from './useDydxClient';
|
||||
|
||||
const AccountsContext = createContext<ReturnType<typeof useAccountsContext> | undefined>(undefined);
|
||||
|
||||
@@ -59,9 +57,7 @@ const useAccountsContext = () => {
|
||||
forgetEvmSignature(previousEvmAddress);
|
||||
}
|
||||
|
||||
if (evmAddress) {
|
||||
abacusStateManager.setTransfersSourceAddress(evmAddress);
|
||||
}
|
||||
if (evmAddress) abacusStateManager.setTransfersSourceAddress(evmAddress);
|
||||
|
||||
setPreviousEvmAddress(evmAddress);
|
||||
}, [evmAddress]);
|
||||
@@ -221,6 +217,7 @@ const useAccountsContext = () => {
|
||||
}, [evmAddress, evmDerivedAddresses, signerWagmi, connectedDydxAddress, signerGraz]);
|
||||
|
||||
// abacus
|
||||
// TODO: useAbacus({ dydxAddress })
|
||||
useEffect(() => {
|
||||
if (dydxAddress) abacusStateManager.setAccount(localDydxWallet);
|
||||
else abacusStateManager.attemptDisconnectAccount();
|
||||
@@ -261,21 +258,6 @@ const useAccountsContext = () => {
|
||||
);
|
||||
}, [dydxSubaccounts]);
|
||||
|
||||
// Restrictions
|
||||
const { isBadActor, sanctionedAddresses } = useRestrictions();
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
dydxAddress &&
|
||||
(isBadActor ||
|
||||
sanctionedAddresses.has(dydxAddress) ||
|
||||
(evmAddress && sanctionedAddresses.has(evmAddress)))
|
||||
) {
|
||||
dispatch(forceOpenDialog({ type: DialogTypes.RestrictedWallet }));
|
||||
disconnect();
|
||||
}
|
||||
}, [isBadActor, evmAddress, dydxAddress, sanctionedAddresses]);
|
||||
|
||||
// Disconnect wallet / accounts
|
||||
const disconnectLocalDydxWallet = () => {
|
||||
setLocalDydxWallet(undefined);
|
||||
|
||||
@@ -44,9 +44,6 @@ export const useCurrentMarketId = () => {
|
||||
}, [validId]);
|
||||
|
||||
useEffect(() => {
|
||||
// Check for marketIds otherwise Abacus will silently fail its isMarketValid check
|
||||
if (marketIds) {
|
||||
abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
|
||||
}
|
||||
}, [selectedNetwork, marketIds, marketId]);
|
||||
abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
|
||||
}, [selectedNetwork, marketId]);
|
||||
};
|
||||
|
||||
@@ -2,23 +2,27 @@ import { WalletType } from '@/constants/wallets';
|
||||
|
||||
import { isTruthy } from '@/lib/isTruthy';
|
||||
|
||||
import { useSelectedNetwork } from './useSelectedNetwork';
|
||||
|
||||
export const useDisplayedWallets = () => {
|
||||
const { selectedNetwork } = useSelectedNetwork();
|
||||
|
||||
return [
|
||||
WalletType.MetaMask,
|
||||
|
||||
import.meta.env.MODE !== 'production' && WalletType.Keplr,
|
||||
|
||||
WalletType.WalletConnect2,
|
||||
|
||||
WalletType.WalletConnect,
|
||||
|
||||
WalletType.CoinbaseWallet,
|
||||
|
||||
// Hide these wallet options until they can be properly tested on mainnet
|
||||
// WalletType.ImToken,
|
||||
// WalletType.Rainbow,
|
||||
// WalletType.TrustWallet,
|
||||
// WalletType.HuobiWallet,
|
||||
// WalletType.BitKeep,
|
||||
// WalletType.Coin98,
|
||||
|
||||
WalletType.ImToken,
|
||||
WalletType.Rainbow,
|
||||
WalletType.TrustWallet,
|
||||
WalletType.HuobiWallet,
|
||||
WalletType.BitKeep,
|
||||
WalletType.Coin98,
|
||||
|
||||
WalletType.OtherWallet,
|
||||
].filter(isTruthy);
|
||||
|
||||
@@ -13,15 +13,12 @@ import {
|
||||
|
||||
import type { ResolutionString } from 'public/tradingview/charting_library';
|
||||
|
||||
import type { ConnectNetworkEvent, NetworkConfig } from '@/constants/abacus';
|
||||
import type { NetworkConfig, ConnectNetworkEvent } from '@/constants/abacus';
|
||||
import { type Candle, RESOLUTION_MAP } from '@/constants/candles';
|
||||
|
||||
import { getSelectedNetwork } from '@/state/appSelectors';
|
||||
|
||||
import { log } from '@/lib/telemetry';
|
||||
|
||||
import { useRestrictions } from './useRestrictions';
|
||||
|
||||
type DydxContextType = ReturnType<typeof useDydxClientContext>;
|
||||
const DydxContext = createContext<DydxContextType>({} as DydxContextType);
|
||||
DydxContext.displayName = 'dYdXClient';
|
||||
@@ -37,7 +34,7 @@ const useDydxClientContext = () => {
|
||||
|
||||
const selectedNetwork = useSelector(getSelectedNetwork);
|
||||
|
||||
const [networkConfig, setNetworkConfig] = useState<NetworkConfig>();
|
||||
const [networkConfig, setNetworkConfig] = useState<Partial<NetworkConfig>>();
|
||||
|
||||
useEffect(() => {
|
||||
const onConnectNetwork = (event: ConnectNetworkEvent) => setNetworkConfig(event.detail);
|
||||
@@ -57,14 +54,14 @@ const useDydxClientContext = () => {
|
||||
if (
|
||||
networkConfig?.chainId &&
|
||||
networkConfig?.indexerUrl &&
|
||||
networkConfig?.websocketUrl &&
|
||||
networkConfig?.indexerSocketUrl &&
|
||||
networkConfig?.validatorUrl
|
||||
) {
|
||||
try {
|
||||
const initializedClient = await CompositeClient.connect(
|
||||
new Network(
|
||||
selectedNetwork,
|
||||
new IndexerConfig(networkConfig.indexerUrl, networkConfig.websocketUrl),
|
||||
new IndexerConfig(networkConfig.indexerUrl, networkConfig.indexerSocketUrl),
|
||||
new ValidatorConfig(networkConfig.validatorUrl, networkConfig.chainId, {
|
||||
broadcastPollIntervalMs: 3_000,
|
||||
broadcastTimeoutMs: 60_000,
|
||||
@@ -181,27 +178,7 @@ const useDydxClientContext = () => {
|
||||
[requestCandles]
|
||||
);
|
||||
|
||||
const { updateSanctionedAddresses } = useRestrictions();
|
||||
|
||||
const screenAddresses = useCallback(
|
||||
async ({ addresses }: { addresses: string[] }) => {
|
||||
if (compositeClient) {
|
||||
const promises = addresses.map((address) =>
|
||||
compositeClient.indexerClient.utility.screen(address)
|
||||
);
|
||||
|
||||
const results = await Promise.all(promises);
|
||||
|
||||
const screenedAddresses = Object.fromEntries(
|
||||
addresses.map((address, index) => [address, results[index]?.restricted])
|
||||
);
|
||||
|
||||
updateSanctionedAddresses(screenedAddresses);
|
||||
return screenedAddresses;
|
||||
}
|
||||
},
|
||||
[compositeClient]
|
||||
);
|
||||
// ------ Subacount Methods ------ //
|
||||
|
||||
return {
|
||||
// Client initialization
|
||||
@@ -209,13 +186,11 @@ const useDydxClientContext = () => {
|
||||
networkConfig,
|
||||
compositeClient,
|
||||
faucetClient,
|
||||
isConnected: !!compositeClient,
|
||||
|
||||
// Wallet Methods
|
||||
getWalletFromEvmSignature,
|
||||
|
||||
// Public Methods
|
||||
getCandlesForDatafeed,
|
||||
screenAddresses,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,14 +4,15 @@ import { useSelector, shallowEqual, useDispatch } from 'react-redux';
|
||||
import { groupBy } from 'lodash';
|
||||
|
||||
import { AlertType } from '@/constants/alerts';
|
||||
import { AbacusOrderStatus, ORDER_SIDES } from '@/constants/abacus';
|
||||
import { AbacusOrderStatus, ORDER_SIDES, ORDER_STATUS_STRINGS } from '@/constants/abacus';
|
||||
import { DialogTypes } from '@/constants/dialogs';
|
||||
import { STRING_KEYS, StringKey } from '@/constants/localization';
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { type NotificationTypeConfig, NotificationType } from '@/constants/notifications';
|
||||
import { ORDER_SIDE_STRINGS } from '@/constants/trade';
|
||||
import { ORDER_SIDE_STRINGS, TRADE_TYPE_STRINGS, TradeTypes } from '@/constants/trade';
|
||||
|
||||
import { useLocalNotifications } from '@/hooks/useLocalNotifications';
|
||||
|
||||
import { AlertMessage } from '@/components/AlertMessage';
|
||||
import { Icon, IconName } from '@/components/Icon';
|
||||
import { Output, OutputType } from '@/components/Output';
|
||||
import { TransferStatusToast } from '@/views/TransferStatus';
|
||||
@@ -68,11 +69,11 @@ export const notificationTypes = [
|
||||
<OrderStatusIcon status={order.status} totalFilled={order.totalFilled ?? 0} />
|
||||
),
|
||||
title: `${stringGetter({
|
||||
key: order.resources.typeStringKey as StringKey,
|
||||
key: TRADE_TYPE_STRINGS[order.type.rawValue as TradeTypes].tradeTypeKey,
|
||||
})} ${
|
||||
order.status === AbacusOrderStatus.open && (order?.totalFilled ?? 0) > 0
|
||||
? stringGetter({ key: STRING_KEYS.PARTIALLY_FILLED })
|
||||
: stringGetter({ key: order.resources.statusStringKey as StringKey })
|
||||
: stringGetter({ key: ORDER_STATUS_STRINGS[order.status.name] })
|
||||
}`,
|
||||
description: `${stringGetter({
|
||||
key: ORDER_SIDE_STRINGS[ORDER_SIDES[order.side.name]],
|
||||
@@ -90,34 +91,18 @@ export const notificationTypes = [
|
||||
}, [orderIds]);
|
||||
},
|
||||
|
||||
// useNotificationAction: () => {
|
||||
// const dispatch = useDispatch();
|
||||
// const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
|
||||
// const ordersByOrderId = Object.fromEntries(orders.map((order) => [order.id, order]));
|
||||
useNotificationAction: () => {
|
||||
const dispatch = useDispatch();
|
||||
|
||||
// const fills = useSelector(getSubaccountFills, shallowEqual) || [];
|
||||
// const fillsByOrderId = groupBy(fills, (fill) => fill.orderId);
|
||||
|
||||
// return (id) => {
|
||||
// if (ordersByOrderId[id]) {
|
||||
// dispatch(
|
||||
// openDialog({
|
||||
// type: DialogTypes.OrderDetails,
|
||||
// dialogProps: { orderId: id },
|
||||
// })
|
||||
// );
|
||||
// } else if (fillsByOrderId[id]) {
|
||||
// const fillId = fillsByOrderId[id][0].id;
|
||||
|
||||
// dispatch(
|
||||
// openDialog({
|
||||
// type: DialogTypes.FillDetails,
|
||||
// dialogProps: { fillId },
|
||||
// })
|
||||
// );
|
||||
// }
|
||||
// };
|
||||
// },
|
||||
return (orderId) => {
|
||||
dispatch(
|
||||
openDialog({
|
||||
type: DialogTypes.OrderDetails,
|
||||
dialogProps: { orderId },
|
||||
})
|
||||
);
|
||||
};
|
||||
},
|
||||
} as NotificationTypeConfig<string, [string, number]>,
|
||||
{
|
||||
type: NotificationType.SquidTransfer,
|
||||
@@ -125,18 +110,18 @@ export const notificationTypes = [
|
||||
const stringGetter = useStringGetter();
|
||||
const { transferNotifications } = useLocalNotifications();
|
||||
|
||||
const getTitleStringKey = useCallback((type: 'deposit' | 'withdrawal', finished: boolean) => {
|
||||
const getTitleStringKey = useCallback((type: 'deposit' | 'withdraw', finished: boolean) => {
|
||||
if (type === 'deposit' && !finished) return STRING_KEYS.DEPOSIT_IN_PROGRESS;
|
||||
if (type === 'deposit' && finished) return STRING_KEYS.DEPOSIT;
|
||||
if (type === 'withdrawal' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
|
||||
if (type === 'withdraw' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
|
||||
return STRING_KEYS.WITHDRAW;
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
for (const transfer of transferNotifications) {
|
||||
const { fromChainId, status, txHash, toAmount } = transfer;
|
||||
const { toChainId, status, txHash, toAmount } = transfer;
|
||||
const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
|
||||
const type = fromChainId === TESTNET_CHAIN_ID ? 'withdrawal' : 'deposit';
|
||||
const type = toChainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdraw';
|
||||
// @ts-ignore status.errors is not in the type definition but can be returned
|
||||
const error = status?.errors?.length ? status?.errors[0] : status?.error;
|
||||
|
||||
@@ -153,8 +138,7 @@ export const notificationTypes = [
|
||||
{stringGetter({
|
||||
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
|
||||
params: {
|
||||
ERROR_MESSAGE:
|
||||
error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
|
||||
ERROR_MESSAGE: error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
|
||||
},
|
||||
})}
|
||||
</Styled.ErrorMessage>
|
||||
@@ -170,7 +154,6 @@ export const notificationTypes = [
|
||||
description: description,
|
||||
customContent: (
|
||||
<TransferStatusToast
|
||||
type={type}
|
||||
toAmount={transfer.toAmount}
|
||||
triggeredAt={transfer.triggeredAt}
|
||||
status={transfer.status}
|
||||
@@ -179,7 +162,7 @@ export const notificationTypes = [
|
||||
customMenuContent: !finished && (
|
||||
<div>
|
||||
{description}
|
||||
<TransferStatusSteps status={transfer.status} type={type} />
|
||||
<TransferStatusSteps status={transfer.status} />
|
||||
</div>
|
||||
),
|
||||
toastSensitivity: 'foreground',
|
||||
@@ -198,8 +181,8 @@ Styled.TransferText = styled.span`
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.5ch;
|
||||
`;
|
||||
`
|
||||
|
||||
Styled.ErrorMessage = styled.div`
|
||||
max-width: 13rem;
|
||||
`;
|
||||
`;
|
||||
@@ -1,53 +0,0 @@
|
||||
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
|
||||
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
||||
|
||||
import { RestrictionType } from '@/constants/abacus';
|
||||
import { DialogTypes } from '@/constants/dialogs';
|
||||
|
||||
import { getRestrictionType } from '@/state/accountSelectors';
|
||||
import { forceOpenDialog } from '@/state/dialogs';
|
||||
import { isTruthy } from '@/lib/isTruthy';
|
||||
|
||||
const useRestrictionContext = () => {
|
||||
const dispatch = useDispatch();
|
||||
const restrictionType = useSelector(getRestrictionType, shallowEqual);
|
||||
const [sanctionedAddresses, setSanctionedAddresses] = useState<string[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
if (restrictionType === RestrictionType.GEO_RESTRICTED) {
|
||||
dispatch(
|
||||
forceOpenDialog({ type: DialogTypes.RestrictedGeo, dialogProps: { preventClose: true } })
|
||||
);
|
||||
}
|
||||
}, [restrictionType, dispatch]);
|
||||
|
||||
const updateSanctionedAddresses = useCallback(
|
||||
(screenedAddresses: { [address: string]: boolean }) => {
|
||||
const toAdd = Object.entries(screenedAddresses)
|
||||
.filter(([, isSanctioned]) => isSanctioned)
|
||||
.map(([address]) => address);
|
||||
|
||||
if (toAdd.length) {
|
||||
setSanctionedAddresses([...sanctionedAddresses, ...toAdd]);
|
||||
}
|
||||
},
|
||||
[sanctionedAddresses]
|
||||
);
|
||||
|
||||
return {
|
||||
isBadActor: restrictionType === RestrictionType.USER_RESTRICTED,
|
||||
isGeoRestricted: restrictionType === RestrictionType.GEO_RESTRICTED,
|
||||
updateSanctionedAddresses,
|
||||
sanctionedAddresses: useMemo(() => new Set(sanctionedAddresses), [sanctionedAddresses]),
|
||||
};
|
||||
};
|
||||
|
||||
type RestrictionContextType = ReturnType<typeof useRestrictionContext>;
|
||||
const RestrictionContext = createContext<RestrictionContextType>({} as RestrictionContextType);
|
||||
RestrictionContext.displayName = 'Restriction';
|
||||
|
||||
export const RestrictionProvider = ({ ...props }) => (
|
||||
<RestrictionContext.Provider value={useRestrictionContext()} {...props} />
|
||||
);
|
||||
|
||||
export const useRestrictions = () => useContext(RestrictionContext);
|
||||
@@ -1,15 +1,13 @@
|
||||
import { useCallback, useEffect } from 'react';
|
||||
import { useCallback } from 'react';
|
||||
import { useDispatch, useSelector } from 'react-redux';
|
||||
|
||||
import { DialogTypes } from '@/constants/dialogs';
|
||||
import { LocalStorageKey } from '@/constants/localStorage';
|
||||
import { DEFAULT_APP_ENVIRONMENT, DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
|
||||
import { DEFAULT_APP_ENVIRONMENT, DydxNetwork } from '@/constants/networks';
|
||||
|
||||
import { useAccounts, useLocalStorage } from '@/hooks';
|
||||
|
||||
import { setSelectedNetwork } from '@/state/app';
|
||||
import { getSelectedNetwork } from '@/state/appSelectors';
|
||||
import { openDialog } from '@/state/dialogs';
|
||||
|
||||
import { validateAgainstAvailableEnvironments } from '@/lib/network';
|
||||
|
||||
@@ -27,17 +25,6 @@ export const useSelectedNetwork = (): {
|
||||
validateFn: validateAgainstAvailableEnvironments,
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
import.meta.env.MODE === 'production' &&
|
||||
ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-4'
|
||||
) {
|
||||
dispatch(
|
||||
openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } })
|
||||
);
|
||||
}
|
||||
}, [selectedNetwork]);
|
||||
|
||||
const switchNetwork = useCallback(
|
||||
(network: DydxNetwork) => {
|
||||
disconnect();
|
||||
|
||||
@@ -36,6 +36,7 @@ import { log } from '@/lib/telemetry';
|
||||
import { useAccounts } from './useAccounts';
|
||||
import { useDydxClient } from './useDydxClient';
|
||||
|
||||
|
||||
type SubaccountContextType = ReturnType<typeof useSubaccountContext>;
|
||||
const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType);
|
||||
SubaccountContext.displayName = 'Subaccount';
|
||||
@@ -274,7 +275,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
|
||||
await getFaucetFunds({ dydxAddress, subaccountNumber });
|
||||
} catch (error) {
|
||||
log('useSubaccount/getFaucetFunds', error);
|
||||
throw error;
|
||||
}
|
||||
}, [dydxAddress, getFaucetFunds, subaccountNumber]);
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
<svg width="16" height="18" viewBox="0 0 16 18" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M10.3811 13.235C11.9338 13.0512 13.4593 12.6847 14.9261 12.1433C13.6839 10.7673 12.9975 8.97875 13.0003 7.125V6.54167V6.5C13.0003 5.17392 12.4735 3.90215 11.5358 2.96447C10.5981 2.02678 9.32636 1.5 8.00028 1.5C6.67419 1.5 5.40242 2.02678 4.46474 2.96447C3.52706 3.90215 3.00028 5.17392 3.00028 6.5V7.125C3.00279 8.97886 2.3161 10.7675 1.07361 12.1433C2.51778 12.6767 4.04027 13.0475 5.61944 13.235M10.3811 13.235C8.79943 13.4226 7.20112 13.4226 5.61944 13.235M10.3811 13.235C10.5012 13.6099 10.5311 14.0078 10.4683 14.3964C10.4055 14.785 10.2518 15.1533 10.0198 15.4713C9.78772 15.7893 9.48386 16.048 9.13293 16.2263C8.78201 16.4047 8.39392 16.4976 8.00028 16.4976C7.60663 16.4976 7.21854 16.4047 6.86762 16.2263C6.51669 16.048 6.21283 15.7893 5.98079 15.4713C5.74875 15.1533 5.59508 14.785 5.53229 14.3964C5.46949 14.0078 5.49936 13.6099 5.61944 13.235" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB |
+1
-1
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 24"><path fill="currentColor" d="M11 0C8.5 0 6.101.948 4.333 2.636 2.565 4.324 1.57 6.613 1.57 9v5.379l-1.11 1.06c-.22.21-.37.477-.43.768-.061.291-.03.593.089.867s.32.508.578.673c.259.165.562.253.873.253h18.86c.31 0 .614-.088.873-.253.258-.165.46-.399.578-.673.12-.274.15-.576.09-.867a1.48 1.48 0 0 0-.43-.768l-1.111-1.06V9c0-2.387-.993-4.676-2.762-6.364C15.9.948 13.501 0 11 0Zm0 24a4.83 4.83 0 0 1-3.334-1.318 4.399 4.399 0 0 1-1.38-3.182h9.428a4.399 4.399 0 0 1-1.38 3.182A4.83 4.83 0 0 1 11 24Z"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 24"><path fill="currentColor" d="M11 0C8.5 0 6.101.948 4.333 2.636 2.565 4.324 1.57 6.613 1.57 9v5.379l-1.11 1.06c-.22.21-.37.477-.43.768-.061.291-.03.593.089.867s.32.508.578.673c.259.165.562.253.873.253h18.86c.31 0 .614-.088.873-.253.258-.165.46-.399.578-.673.12-.274.15-.576.09-.867a1.48 1.48 0 0 0-.43-.768l-1.111-1.06V9c0-2.387-.993-4.676-2.762-6.364C15.9.948 13.501 0 11 0Zm0 24a4.83 4.83 0 0 1-3.334-1.318 4.399 4.399 0 0 1-1.38-3.182h9.428a4.399 4.399 0 0 1-1.38 3.182A4.83 4.83 0 0 1 11 24Z"/></svg>
|
||||
|
Before Width: | Height: | Size: 564 B After Width: | Height: | Size: 563 B |
@@ -2,7 +2,6 @@ export { default as AddressConnectorIcon } from './address-connector.svg';
|
||||
export { default as ArrowIcon } from './arrow.svg';
|
||||
export { default as Bar3Icon } from './bar3.svg';
|
||||
export { default as BellIcon } from './bell.svg';
|
||||
export { default as BellStrokeIcon } from './bell-stroke.svg';
|
||||
export { default as BoxCloseIcon } from './box-close.svg';
|
||||
export { default as CalculatorIcon } from './calculator.svg';
|
||||
export { default as CaretIcon } from './caret-down.svg';
|
||||
|
||||
@@ -15,12 +15,9 @@ import { ExternalNavKeplrDialog } from '@/views/dialogs/ExternalNavKeplrDialog';
|
||||
import { MnemonicExportDialog } from '@/views/dialogs/MnemonicExportDialog';
|
||||
import { MobileSignInDialog } from '@/views/dialogs/MobileSignInDialog';
|
||||
import { OnboardingDialog } from '@/views/dialogs/OnboardingDialog';
|
||||
import { RateLimitDialog } from '@/views/dialogs/RateLimitDialog';
|
||||
import { ReceiveDialog } from '@/views/dialogs/ReceiveDialog';
|
||||
import { RestrictedGeoDialog } from '@/views/dialogs/RestrictedGeoDialog';
|
||||
import { TradeDialog } from '@/views/dialogs/TradeDialog';
|
||||
import { TransferDialog } from '@/views/dialogs/TransferDialog';
|
||||
import { RestrictedWalletDialog } from '@/views/dialogs/RestrictedWalletDialog';
|
||||
import { WithdrawDialog } from '@/views/dialogs/WithdrawDialog';
|
||||
|
||||
import { OrderDetailsDialog } from '@/views/dialogs/DetailsDialog/OrderDetailsDialog';
|
||||
@@ -56,10 +53,7 @@ export const DialogManager = () => {
|
||||
[DialogTypes.MobileSignIn]: <MobileSignInDialog {...modalProps} />,
|
||||
[DialogTypes.Onboarding]: <OnboardingDialog {...modalProps} />,
|
||||
[DialogTypes.OrderDetails]: <OrderDetailsDialog {...modalProps} />,
|
||||
[DialogTypes.RateLimit]: <RateLimitDialog {...modalProps} />,
|
||||
[DialogTypes.Receive]: <ReceiveDialog {...modalProps} />,
|
||||
[DialogTypes.RestrictedGeo]: <RestrictedGeoDialog {...modalProps} />,
|
||||
[DialogTypes.RestrictedWallet]: <RestrictedWalletDialog {...modalProps} />,
|
||||
[DialogTypes.Trade]: <TradeDialog {...modalProps} />,
|
||||
[DialogTypes.Transfer]: <TransferDialog {...modalProps} />,
|
||||
[DialogTypes.Withdraw]: <WithdrawDialog {...modalProps} />,
|
||||
|
||||
@@ -7,7 +7,7 @@ import { DialogTypes } from '@/constants/dialogs';
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { AppRoute } from '@/constants/routes';
|
||||
import { useStringGetter } from '@/hooks';
|
||||
import { LogoShortIcon, BellStrokeIcon } from '@/icons';
|
||||
import { LogoShortIcon, BellIcon } from '@/icons';
|
||||
|
||||
import { Icon, IconName } from '@/components/Icon';
|
||||
import { IconButton } from '@/components/IconButton';
|
||||
@@ -131,9 +131,7 @@ export const HeaderDesktop = () => {
|
||||
<VerticalSeparator />
|
||||
|
||||
<NotificationsMenu
|
||||
slotTrigger={
|
||||
<Styled.IconButton shape={ButtonShape.Rectangle} iconComponent={BellStrokeIcon} />
|
||||
}
|
||||
slotTrigger={<Styled.IconButton shape={ButtonShape.Rectangle} iconComponent={BellIcon} />}
|
||||
/>
|
||||
|
||||
<VerticalSeparator />
|
||||
@@ -167,7 +165,7 @@ Styled.Header = styled.header`
|
||||
)
|
||||
var(--border-width) 1fr var(--border-width) auto;
|
||||
|
||||
font-size: 0.9375rem;
|
||||
font-size: 0.9375em;
|
||||
|
||||
:before {
|
||||
backdrop-filter: blur(10px);
|
||||
@@ -216,8 +214,7 @@ Styled.NavAfter = styled.div`
|
||||
}
|
||||
`;
|
||||
|
||||
Styled.IconButton = styled(IconButton)<{ size?: string }>`
|
||||
Styled.IconButton = styled(IconButton)`
|
||||
${headerMixins.button}
|
||||
--button-border: none;
|
||||
--button-icon-size: 1rem;
|
||||
`;
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
import environments from '../../../public/configs/env.json';
|
||||
|
||||
import { validateAgainstAvailableEnvironments } from '../network';
|
||||
|
||||
describe('validateAgainstAvailableEnvironments', () => {
|
||||
describe('production environment', () => {
|
||||
beforeAll(() => {
|
||||
jest.mock('../../constants/networks', () => ({
|
||||
AVAILABLE_ENVIRONMENTS: {
|
||||
environments: [],
|
||||
default: 'dydxprotocol-testnet-dydx',
|
||||
}, //environments.deployments.TESTNET,
|
||||
}));
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
jest.unmock('../../constants/networks');
|
||||
});
|
||||
|
||||
it('Returns true for valid environments', () => {
|
||||
expect(validateAgainstAvailableEnvironments('dydxprotocol-testnet-dydx')).toEqual(true);
|
||||
});
|
||||
|
||||
it('Returns false for invalid environments', () => {
|
||||
expect(validateAgainstAvailableEnvironments('dydxprotocol-dev')).toEqual(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('staging environment', () => {
|
||||
it('Returns true for valid environments', () => {
|
||||
expect(validateAgainstAvailableEnvironments('dydxprotocol-dev')).toEqual(true);
|
||||
});
|
||||
|
||||
it('Returns false for invalid environments', () => {
|
||||
expect(validateAgainstAvailableEnvironments('INVALID')).toEqual(false);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -45,11 +45,15 @@ describe('getStringsForDateTimeDiff', () => {
|
||||
|
||||
describe('getStringsForTimeInterval', () => {
|
||||
it.each([
|
||||
[Duration.fromObject({ months: 2 }), '2', 'MONTHS_ABBREVIATED'],
|
||||
[Duration.fromObject({ weeks: 3, days: 2 }), '3', 'WEEKS_ABBREVIATED'],
|
||||
[Duration.fromObject({ days: 5, hours: 12 }), '6', 'DAYS_ABBREVIATED'],
|
||||
[Duration.fromObject({ hours: 8, minutes: 30 }), '9', 'HOURS_ABBREVIATED'],
|
||||
[Duration.fromObject({ minutes: 45 }), '45', 'MINUTES_ABBREVIATED'],
|
||||
[Duration.fromObject({ months: 2 }), '2', 'APP.GENERAL.TIME_STRINGS.MONTHS_ABBREVIATED'],
|
||||
[Duration.fromObject({ weeks: 3, days: 2 }), '3', 'APP.GENERAL.TIME_STRINGS.WEEKS_ABBREVIATED'],
|
||||
[Duration.fromObject({ days: 5, hours: 12 }), '6', 'APP.GENERAL.TIME_STRINGS.DAYS_ABBREVIATED'],
|
||||
[
|
||||
Duration.fromObject({ hours: 8, minutes: 30 }),
|
||||
'9',
|
||||
'APP.GENERAL.TIME_STRINGS.HOURS_ABBREVIATED',
|
||||
],
|
||||
[Duration.fromObject({ minutes: 45 }), '45', 'APP.GENERAL.TIME_STRINGS.MINUTES_ABBREVIATED'],
|
||||
])(
|
||||
'returns the correct timeString and unitStringKey',
|
||||
(timeInterval, expectedTimeString, expectedUnitStringKey) => {
|
||||
@@ -61,17 +61,18 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
||||
}
|
||||
|
||||
async connectNetwork(
|
||||
paramsInJson: Nullable<string>,
|
||||
indexerUrl: string,
|
||||
indexerSocketUrl: string,
|
||||
validatorUrl: string,
|
||||
chainId: string,
|
||||
faucetUrl: Nullable<string> | undefined,
|
||||
callback: (p0: Nullable<string>) => void
|
||||
): Promise<void> {
|
||||
try {
|
||||
const parsedParams = paramsInJson ? JSON.parse(paramsInJson) : {};
|
||||
const { indexerUrl, websocketUrl, validatorUrl, chainId } = parsedParams;
|
||||
|
||||
const compositeClient = await CompositeClient.connect(
|
||||
new Network(
|
||||
chainId,
|
||||
new IndexerConfig(indexerUrl, websocketUrl),
|
||||
new IndexerConfig(indexerUrl, indexerSocketUrl),
|
||||
new ValidatorConfig(validatorUrl, chainId, {
|
||||
broadcastPollIntervalMs: 3_000,
|
||||
broadcastTimeoutMs: 60_000,
|
||||
@@ -83,7 +84,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
||||
|
||||
// Dispatch custom event to notify other parts of the app that the network has been connected
|
||||
const customEvent = new CustomEvent('abacus:connectNetwork', {
|
||||
detail: parsedParams,
|
||||
detail: {
|
||||
indexerUrl,
|
||||
indexerSocketUrl,
|
||||
validatorUrl,
|
||||
chainId,
|
||||
faucetUrl,
|
||||
},
|
||||
});
|
||||
|
||||
globalThis.dispatchEvent(customEvent);
|
||||
@@ -92,7 +99,9 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
||||
this.store?.dispatch(
|
||||
openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } })
|
||||
);
|
||||
|
||||
log('DydxChainTransactions/connectNetwork', error);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -242,7 +251,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
||||
const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount);
|
||||
|
||||
resolve([msg]);
|
||||
})
|
||||
}),
|
||||
);
|
||||
|
||||
const parsedTx = this.parseToPrimitives(tx);
|
||||
@@ -257,9 +266,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
||||
}
|
||||
}
|
||||
|
||||
async simulateTransferNativeTokenTransaction(
|
||||
params: HumanReadableTransferPayload
|
||||
): Promise<string> {
|
||||
async simulateTransferNativeTokenTransaction(params: HumanReadableTransferPayload): Promise<string> {
|
||||
if (!this.compositeClient || !this.localWallet) {
|
||||
throw new Error('Missing compositeClient or localWallet');
|
||||
}
|
||||
@@ -282,7 +289,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
||||
|
||||
resolve([msg]);
|
||||
}),
|
||||
GAS_PRICE_DYDX_DENOM
|
||||
GAS_PRICE_DYDX_DENOM,
|
||||
);
|
||||
|
||||
const parsedTx = this.parseToPrimitives(tx);
|
||||
@@ -390,10 +397,9 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
|
||||
break;
|
||||
case QueryType.GetAccountBalances:
|
||||
if (!this.localWallet?.address) throw new Error('Missing localWallet');
|
||||
const accountBalances =
|
||||
await this.compositeClient?.validatorClient.get.getAccountBalances(
|
||||
this.localWallet.address
|
||||
);
|
||||
const accountBalances = await this.compositeClient?.validatorClient.get.getAccountBalances(
|
||||
this.localWallet.address
|
||||
);
|
||||
const parsedAccountBalances = this.parseToPrimitives(accountBalances);
|
||||
callback(JSON.stringify(parsedAccountBalances));
|
||||
break;
|
||||
|
||||
@@ -47,11 +47,6 @@ class AbacusRest implements AbacusRestProtocol {
|
||||
body,
|
||||
};
|
||||
|
||||
if (!url) {
|
||||
callback(null, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
fetch(url, options)
|
||||
.then(async (response) => {
|
||||
const data = await response.text();
|
||||
|
||||
@@ -25,7 +25,6 @@ import {
|
||||
setFundingPayments,
|
||||
setHistoricalPnl,
|
||||
setLatestOrder,
|
||||
setRestrictionType,
|
||||
setSubaccount,
|
||||
setTransfers,
|
||||
setWallet,
|
||||
@@ -122,10 +121,6 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
|
||||
);
|
||||
}
|
||||
|
||||
if (changes.has(Changes.restriction)) {
|
||||
dispatch(setRestrictionType(updatedState.restriction));
|
||||
}
|
||||
|
||||
subaccountNumbers?.forEach((subaccountId: number) => {
|
||||
if (subaccountId !== null) {
|
||||
if (changes.has(Changes.subaccount)) {
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
|
||||
import { AVAILABLE_ENVIRONMENTS, type DydxNetwork } from '@/constants/networks';
|
||||
|
||||
export const validateAgainstAvailableEnvironments = (value: DydxNetwork) =>
|
||||
Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
|
||||
AVAILABLE_ENVIRONMENTS.environments.includes(value);
|
||||
|
||||
@@ -10,7 +10,7 @@ export const getTimestamp = (value?: BigNumberish | null) =>
|
||||
? value
|
||||
: typeof value === 'string'
|
||||
? new Date(value).getTime()
|
||||
: new Date(value.toString()).getTime()
|
||||
: new Date(value.toNumber()).getTime()
|
||||
: undefined;
|
||||
|
||||
export const getStringsForDateTimeDiff = (dateTime: DateTime) => {
|
||||
@@ -77,4 +77,4 @@ export const formatSeconds = (seconds: number) => {
|
||||
const minutes = Math.floor(seconds / 60);
|
||||
const remainingSeconds = seconds % 60;
|
||||
return `${getTimeString(minutes)}:${getTimeString(remainingSeconds)}`;
|
||||
}
|
||||
};
|
||||
|
||||
+48
-12
@@ -36,15 +36,7 @@ import { CoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet';
|
||||
import { InjectedConnector } from 'wagmi/connectors/injected';
|
||||
import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
|
||||
import { WalletConnectConnector } from 'wagmi/connectors/walletConnect';
|
||||
|
||||
import {
|
||||
type WalletConnection,
|
||||
WalletConnectionType,
|
||||
type WalletType,
|
||||
walletConnectionTypes,
|
||||
wallets,
|
||||
WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
|
||||
} from '@/constants/wallets';
|
||||
import { WalletConnectLegacyConnector } from 'wagmi/connectors/walletConnectLegacy';
|
||||
|
||||
// Config
|
||||
|
||||
@@ -95,6 +87,14 @@ const injectedConnectorOptions = {
|
||||
},
|
||||
};
|
||||
|
||||
const walletconnect1ConnectorOptions = {
|
||||
chains,
|
||||
options: {
|
||||
bridge: import.meta.env.VITE_WALLETCONNECT1_BRIDGE,
|
||||
qrcode: true,
|
||||
},
|
||||
};
|
||||
|
||||
const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnectConnector>[0] = {
|
||||
chains,
|
||||
options: {
|
||||
@@ -109,10 +109,20 @@ const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnect
|
||||
qrModalOptions: {
|
||||
themeMode: 'dark' as const,
|
||||
themeVariables: {
|
||||
'--wcm-accent-color': '#5973fe',
|
||||
'--wcm-font-family': 'var(--fontFamily-base)',
|
||||
'--w3m-accent-color': '#5973fe',
|
||||
'--w3m-background-color': '#5973fe',
|
||||
'--w3m-color-bg-1': 'var(--color-layer-3)',
|
||||
'--w3m-color-bg-2': 'var(--color-layer-4)',
|
||||
'--w3m-color-bg-3': 'var(--color-layer-5)',
|
||||
'--w3m-font-family': 'var(--fontFamily-base)',
|
||||
'--w3m-font-feature-settings': 'none',
|
||||
'--w3m-overlay-backdrop-filter': 'blur(6px)',
|
||||
// '--w3m-logo-image-url': 'https://trade.dydx.exchange/cbw-image.png',
|
||||
},
|
||||
explorerRecommendedWalletIds: WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
|
||||
enableExplorer: true,
|
||||
explorerAllowList: [],
|
||||
explorerDenyList: [],
|
||||
chainImages: {},
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -122,6 +132,7 @@ const connectors = [
|
||||
chains,
|
||||
options: {
|
||||
shimDisconnect: true,
|
||||
shimChainChangedDisconnect: false,
|
||||
},
|
||||
}),
|
||||
new CoinbaseWalletConnector({
|
||||
@@ -131,6 +142,7 @@ const connectors = [
|
||||
reloadOnDisconnect: false,
|
||||
},
|
||||
}),
|
||||
new WalletConnectLegacyConnector(walletconnect1ConnectorOptions),
|
||||
new WalletConnectConnector(walletconnect2ConnectorOptions),
|
||||
new InjectedConnector(injectedConnectorOptions),
|
||||
];
|
||||
@@ -153,6 +165,19 @@ const createInjectedConnectorWithProvider = (provider: ExternalProvider) =>
|
||||
provider as unknown as Awaited<ReturnType<InjectedConnector['getProvider']>>;
|
||||
})(injectedConnectorOptions) as InjectedConnector;
|
||||
|
||||
// Create a custom wagmi WalletConnectLegacyConnector with a modal showing only wallet links matching the given name
|
||||
const createWalletConnect1ConnectorWithName = (walletconnect1Name: string) =>
|
||||
new WalletConnectLegacyConnector({
|
||||
...walletconnect1ConnectorOptions,
|
||||
options: {
|
||||
...walletconnect1ConnectorOptions.options,
|
||||
qrcodeModalOptions: {
|
||||
desktopLinks: [walletconnect1Name],
|
||||
mobileLinks: [walletconnect1Name],
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
const createWalletConnect2ConnectorWithId = (walletconnect2Id: string) =>
|
||||
new WalletConnectConnector({
|
||||
...walletconnect2ConnectorOptions,
|
||||
@@ -162,11 +187,19 @@ const createWalletConnect2ConnectorWithId = (walletconnect2Id: string) =>
|
||||
...walletconnect2ConnectorOptions.options.qrModalOptions,
|
||||
explorerRecommendedWalletIds: [walletconnect2Id],
|
||||
explorerExcludedWalletIds: 'ALL',
|
||||
chainImages: {},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
// Custom connector from wallet selection
|
||||
import {
|
||||
type WalletConnection,
|
||||
WalletConnectionType,
|
||||
type WalletType,
|
||||
walletConnectionTypes,
|
||||
wallets,
|
||||
} from '@/constants/wallets';
|
||||
|
||||
export const resolveWagmiConnector = ({
|
||||
walletType,
|
||||
@@ -180,6 +213,9 @@ export const resolveWagmiConnector = ({
|
||||
|
||||
return walletConnection.type === WalletConnectionType.InjectedEip1193 && walletConnection.provider
|
||||
? createInjectedConnectorWithProvider(walletConnection.provider)
|
||||
: walletConnection.type === WalletConnectionType.WalletConnect1 &&
|
||||
walletConfig.walletconnect1Name
|
||||
? createWalletConnect1ConnectorWithName(walletConfig.walletconnect1Name)
|
||||
: walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id
|
||||
? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id)
|
||||
: connectors.find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
|
||||
|
||||
@@ -45,6 +45,12 @@ export const getWalletConnection = ({
|
||||
break;
|
||||
}
|
||||
|
||||
case WalletConnectionType.WalletConnect1: {
|
||||
return {
|
||||
type: WalletConnectionType.WalletConnect1,
|
||||
};
|
||||
}
|
||||
|
||||
case WalletConnectionType.WalletConnect2: {
|
||||
return {
|
||||
type: WalletConnectionType.WalletConnect2,
|
||||
|
||||
@@ -2,7 +2,6 @@ import { useMemo, useState } from 'react';
|
||||
import styled, { AnyStyledComponent, css } from 'styled-components';
|
||||
import { shallowEqual, useSelector } from 'react-redux';
|
||||
import { TooltipContextType } from '@visx/xychart';
|
||||
import BigNumber from 'bignumber.js';
|
||||
|
||||
import type { Nullable } from '@/constants/abacus';
|
||||
import { OnboardingState } from '@/constants/account';
|
||||
@@ -26,6 +25,7 @@ import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton
|
||||
import { isTruthy } from '@/lib/isTruthy';
|
||||
import { MustBigNumber } from '@/lib/numbers';
|
||||
|
||||
|
||||
export const usePortfolioValues = ({
|
||||
equity,
|
||||
visibleData,
|
||||
@@ -140,12 +140,7 @@ export const AccountDetailsAndHistory = () => {
|
||||
<Styled.AccountValue>
|
||||
<Styled.WithLabel label={accountValueLabel}>
|
||||
<Styled.AccountEquity>
|
||||
<Output
|
||||
type={OutputType.Fiat}
|
||||
value={accountEquity}
|
||||
roundingMode={BigNumber.ROUND_FLOOR}
|
||||
withBaseFont
|
||||
/>
|
||||
<Output type={OutputType.Fiat} value={accountEquity} withBaseFont />
|
||||
</Styled.AccountEquity>
|
||||
<Styled.PnlDiff isPositive={MustBigNumber(pnlDiff).gte(0)}>
|
||||
{pnlDiff && <TriangleIndicator value={MustBigNumber(pnlDiff)} />}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { configureStore } from '@reduxjs/toolkit';
|
||||
import abacusStateManager from '@/lib/abacus';
|
||||
import appMiddleware from './appMiddleware';
|
||||
import localizationMiddleware from './localizationMiddleware';
|
||||
import routerMiddleware from './routerMiddleware';
|
||||
|
||||
import { accountSlice } from './account';
|
||||
import { appSlice } from './app';
|
||||
@@ -12,6 +13,7 @@ import { dialogsSlice } from './dialogs';
|
||||
import { inputsSlice } from './inputs';
|
||||
import { layoutSlice } from './layout';
|
||||
import { localizationSlice } from './localization';
|
||||
import { navigationSlice } from './navigation';
|
||||
import { perpetualsSlice } from './perpetuals';
|
||||
|
||||
export const commandMenuSlices = [layoutSlice, localizationSlice];
|
||||
@@ -26,6 +28,7 @@ export const store = configureStore({
|
||||
inputs: inputsSlice.reducer,
|
||||
layout: layoutSlice.reducer,
|
||||
localization: localizationSlice.reducer,
|
||||
navigation: navigationSlice.reducer,
|
||||
perpetuals: perpetualsSlice.reducer,
|
||||
},
|
||||
|
||||
@@ -35,6 +38,7 @@ export const store = configureStore({
|
||||
}),
|
||||
appMiddleware,
|
||||
localizationMiddleware,
|
||||
routerMiddleware,
|
||||
],
|
||||
|
||||
devTools: process.env.NODE_ENV !== 'production',
|
||||
|
||||
+18
-40
@@ -12,7 +12,6 @@ import type {
|
||||
SubaccountTransfers,
|
||||
HistoricalPnlPeriods,
|
||||
SubAccountHistoricalPNLs,
|
||||
UsageRestriction,
|
||||
} from '@/constants/abacus';
|
||||
|
||||
import { OnboardingGuard, OnboardingState } from '@/constants/account';
|
||||
@@ -22,46 +21,34 @@ import { WalletType } from '@/constants/wallets';
|
||||
import { getLocalStorage } from '@/lib/localStorage';
|
||||
|
||||
export type AccountState = {
|
||||
balances?: Record<string, AccountBalance>;
|
||||
stakingBalances?: Record<string, AccountBalance>;
|
||||
wallet?: Nullable<Wallet>;
|
||||
walletType?: WalletType;
|
||||
|
||||
subaccount?: Nullable<Subaccount>;
|
||||
fills?: SubaccountFills;
|
||||
fundingPayments?: SubaccountFundingPayments;
|
||||
transfers?: SubaccountTransfers;
|
||||
historicalPnl?: SubAccountHistoricalPNLs;
|
||||
|
||||
onboardingGuards: Record<OnboardingGuard, boolean | undefined>;
|
||||
onboardingState: OnboardingState;
|
||||
|
||||
clearedOrderIds?: string[];
|
||||
hasUnseenFillUpdates: boolean;
|
||||
hasUnseenOrderUpdates: boolean;
|
||||
historicalPnl?: SubAccountHistoricalPNLs;
|
||||
latestOrder?: Nullable<SubaccountOrder>;
|
||||
historicalPnlPeriod?: HistoricalPnlPeriods;
|
||||
onboardingGuards: Record<OnboardingGuard, boolean | undefined>;
|
||||
onboardingState: OnboardingState;
|
||||
subaccount?: Nullable<Subaccount>;
|
||||
uncommittedOrderClientIds: number[];
|
||||
|
||||
restriction?: Nullable<UsageRestriction>;
|
||||
wallet?: Nullable<Wallet>;
|
||||
walletType?: WalletType;
|
||||
historicalPnlPeriod?: HistoricalPnlPeriods;
|
||||
balances?: Record<string, AccountBalance>;
|
||||
stakingBalances?: Record<string, AccountBalance>;
|
||||
};
|
||||
|
||||
const initialState: AccountState = {
|
||||
// Wallet
|
||||
balances: undefined,
|
||||
wallet: undefined,
|
||||
walletType: getLocalStorage<WalletType>({
|
||||
key: LocalStorageKey.OnboardingSelectedWalletType,
|
||||
}),
|
||||
|
||||
// Subaccount
|
||||
subaccount: undefined,
|
||||
fills: undefined,
|
||||
fundingPayments: undefined,
|
||||
transfers: undefined,
|
||||
clearedOrderIds: undefined,
|
||||
hasUnseenFillUpdates: false,
|
||||
hasUnseenOrderUpdates: false,
|
||||
historicalPnl: undefined,
|
||||
|
||||
// Onboarding
|
||||
latestOrder: undefined,
|
||||
onboardingGuards: {
|
||||
[OnboardingGuard.hasAcknowledgedTerms]: Boolean(
|
||||
getLocalStorage<boolean>({
|
||||
@@ -72,17 +59,12 @@ const initialState: AccountState = {
|
||||
[OnboardingGuard.hasPreviousTransactions]: undefined,
|
||||
},
|
||||
onboardingState: OnboardingState.Disconnected,
|
||||
|
||||
// UI
|
||||
clearedOrderIds: undefined,
|
||||
hasUnseenFillUpdates: false,
|
||||
hasUnseenOrderUpdates: false,
|
||||
latestOrder: undefined,
|
||||
subaccount: undefined,
|
||||
uncommittedOrderClientIds: [],
|
||||
historicalPnlPeriod: undefined,
|
||||
|
||||
// Restriction
|
||||
restriction: undefined,
|
||||
wallet: undefined,
|
||||
walletType: getLocalStorage<WalletType>({
|
||||
key: LocalStorageKey.OnboardingSelectedWalletType,
|
||||
}),
|
||||
};
|
||||
|
||||
export const accountSlice = createSlice({
|
||||
@@ -142,9 +124,6 @@ export const accountSlice = createSlice({
|
||||
state.historicalPnl = action.payload;
|
||||
}
|
||||
},
|
||||
setRestrictionType: (state, action: PayloadAction<Nullable<UsageRestriction>>) => {
|
||||
state.restriction = action.payload;
|
||||
},
|
||||
setSubaccount: (state, action: PayloadAction<Nullable<Subaccount>>) => {
|
||||
const existingOrderIds = state.subaccount?.orders
|
||||
? state.subaccount.orders.toArray().map((order) => order.id)
|
||||
@@ -199,7 +178,6 @@ export const {
|
||||
setOnboardingGuard,
|
||||
setOnboardingState,
|
||||
setHistoricalPnl,
|
||||
setRestrictionType,
|
||||
setSubaccount,
|
||||
setWallet,
|
||||
viewedFills,
|
||||
|
||||
@@ -342,13 +342,3 @@ export const getBalances = (state: RootState) => state.account?.balances;
|
||||
* @returns user wallet staking balances
|
||||
* */
|
||||
export const getStakingBalances = (state: RootState) => state.account?.stakingBalances;
|
||||
|
||||
/**
|
||||
* @returns UsageRestriction of the current session
|
||||
*/
|
||||
export const getUsageRestriction = (state: RootState) => state.account.restriction;
|
||||
|
||||
/**
|
||||
* @returns RestrictionType from the current session
|
||||
*/
|
||||
export const getRestrictionType = (state: RootState) => state.account.restriction?.restriction;
|
||||
|
||||
@@ -2,6 +2,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
|
||||
|
||||
import { AbacusApiState } from '@/constants/abacus';
|
||||
import { LocalStorageKey } from '@/constants/localStorage';
|
||||
|
||||
import { DEFAULT_APP_ENVIRONMENT, type DydxNetwork } from '@/constants/networks';
|
||||
|
||||
import { getLocalStorage } from '@/lib/localStorage';
|
||||
|
||||
+25
-22
@@ -23,36 +23,39 @@ export const dialogsSlice = createSlice({
|
||||
name: 'Dialogs',
|
||||
initialState,
|
||||
reducers: {
|
||||
openDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => {
|
||||
if (state.activeDialog) {
|
||||
state.dialogQueue.push(action.payload);
|
||||
} else {
|
||||
state.activeDialog = action.payload;
|
||||
}
|
||||
},
|
||||
closeDialog: (state: DialogsState) => {
|
||||
state.activeDialog = state.dialogQueue.shift();
|
||||
},
|
||||
forceOpenDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => {
|
||||
if (state.activeDialog) {
|
||||
state.dialogQueue.unshift(state.activeDialog);
|
||||
}
|
||||
state.activeDialog = action.payload;
|
||||
},
|
||||
closeDialogInTradeBox: (state: DialogsState) => {
|
||||
state.activeTradeBoxDialog = undefined;
|
||||
addDialogToQueue: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => {
|
||||
const dialogQueue = state.dialogQueue;
|
||||
dialogQueue.push(action.payload);
|
||||
|
||||
return {
|
||||
...state,
|
||||
dialogQueue,
|
||||
};
|
||||
},
|
||||
closeDialog: (state: DialogsState) => ({
|
||||
...state,
|
||||
activeDialog: state.dialogQueue.shift(),
|
||||
}),
|
||||
openDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => ({
|
||||
...state,
|
||||
activeDialog: action.payload,
|
||||
}),
|
||||
closeDialogInTradeBox: (state: DialogsState) => ({
|
||||
...state,
|
||||
activeTradeBoxDialog: undefined,
|
||||
}),
|
||||
openDialogInTradeBox: (
|
||||
state: DialogsState,
|
||||
action: PayloadAction<DialogInfo<TradeBoxDialogTypes>>
|
||||
) => {
|
||||
state.activeTradeBoxDialog = action.payload;
|
||||
},
|
||||
) => ({
|
||||
...state,
|
||||
activeTradeBoxDialog: action.payload,
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
export const {
|
||||
forceOpenDialog,
|
||||
addDialogToQueue,
|
||||
closeDialog,
|
||||
closeDialogInTradeBox,
|
||||
openDialog,
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
import { createSlice } from '@reduxjs/toolkit';
|
||||
|
||||
export interface NavigationState {
|
||||
tradeLocation: {
|
||||
hash: string;
|
||||
key: string;
|
||||
pathname: string;
|
||||
search: string;
|
||||
state: any;
|
||||
};
|
||||
}
|
||||
|
||||
export const CLEAR_TRADE_LOCATION = {
|
||||
hash: '',
|
||||
key: '',
|
||||
pathname: '',
|
||||
search: '',
|
||||
state: null,
|
||||
};
|
||||
|
||||
const initialState: NavigationState = {
|
||||
tradeLocation: {
|
||||
hash: '',
|
||||
key: '',
|
||||
pathname: '',
|
||||
search: '',
|
||||
state: null,
|
||||
},
|
||||
};
|
||||
|
||||
export const navigationSlice = createSlice({
|
||||
name: 'Navigation',
|
||||
initialState,
|
||||
reducers: {
|
||||
setTradeLocation: (state, { payload }) => ({
|
||||
...state,
|
||||
tradeLocation: payload,
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
export const { setTradeLocation } = navigationSlice.actions;
|
||||
@@ -0,0 +1,33 @@
|
||||
import type { PayloadAction } from '@reduxjs/toolkit';
|
||||
|
||||
import { LocalStorageKey } from '@/constants/localStorage';
|
||||
|
||||
import { closeDialogInTradeBox } from '@/state/dialogs';
|
||||
import { setTradeLocation } from '@/state/navigation';
|
||||
|
||||
import abacusStateManager from '@/lib/abacus';
|
||||
import { setLocalStorage } from '@/lib/localStorage';
|
||||
import { getMarketIdFromLocation } from '@/lib/tradeData';
|
||||
|
||||
export default (store: any) => (next: any) => async (action: PayloadAction<any>) => {
|
||||
next(action);
|
||||
|
||||
const { type, payload } = action;
|
||||
|
||||
switch (type) {
|
||||
case setTradeLocation.type: {
|
||||
const marketId = getMarketIdFromLocation(payload);
|
||||
|
||||
if (marketId) {
|
||||
abacusStateManager.setMarket(marketId);
|
||||
store.dispatch(closeDialogInTradeBox());
|
||||
setLocalStorage({ key: LocalStorageKey.LastViewedMarket, value: marketId });
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useCallback, useState, useMemo } from 'react';
|
||||
import styled, { type AnyStyledComponent } from 'styled-components';
|
||||
import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
|
||||
import { Root, Trigger, Content } from '@radix-ui/react-collapsible';
|
||||
import { StatusResponse } from '@0xsquid/sdk';
|
||||
|
||||
@@ -20,14 +21,12 @@ import { LoadingDots } from '@/components/Loading/LoadingDots';
|
||||
import { layoutMixins } from '@/styles/layoutMixins';
|
||||
|
||||
type ElementProps = {
|
||||
type: 'withdrawal' | 'deposit';
|
||||
toAmount?: number;
|
||||
triggeredAt?: number;
|
||||
status?: StatusResponse;
|
||||
};
|
||||
|
||||
export const TransferStatusToast = ({
|
||||
type,
|
||||
toAmount,
|
||||
triggeredAt = Date.now(),
|
||||
status,
|
||||
@@ -39,6 +38,11 @@ export const TransferStatusToast = ({
|
||||
// @ts-ignore status.errors is not in the type definition but can be returned
|
||||
const error = status?.errors?.length ? status?.errors[0] : status?.error;
|
||||
|
||||
const type = useMemo(
|
||||
() => (status?.toChain?.chainData?.chainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdrawal'),
|
||||
[status]
|
||||
);
|
||||
|
||||
const updateSecondsLeft = useCallback(() => {
|
||||
const fromChainEta = (status?.fromChain?.chainData?.estimatedRouteDuration || 0) * 1000;
|
||||
const toChainEta = (status?.toChain?.chainData?.estimatedRouteDuration || 0) * 1000;
|
||||
@@ -65,7 +69,7 @@ export const TransferStatusToast = ({
|
||||
side="bottom"
|
||||
slotReceipt={
|
||||
<Styled.Receipt>
|
||||
<TransferStatusSteps status={status} type={type} />
|
||||
<TransferStatusSteps status={status} />
|
||||
</Styled.Receipt>
|
||||
}
|
||||
>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useMemo } from 'react';
|
||||
import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components';
|
||||
import { StatusResponse } from '@0xsquid/sdk';
|
||||
import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
|
||||
|
||||
import { useStringGetter } from '@/hooks';
|
||||
|
||||
@@ -14,7 +15,6 @@ import { STRING_KEYS } from '@/constants/localization';
|
||||
|
||||
type ElementProps = {
|
||||
status?: StatusResponse;
|
||||
type: 'withdrawal' | 'deposit';
|
||||
};
|
||||
|
||||
enum TransferStatusStep {
|
||||
@@ -24,13 +24,14 @@ enum TransferStatusStep {
|
||||
Complete,
|
||||
}
|
||||
|
||||
export const TransferStatusSteps = ({ status, type }: ElementProps) => {
|
||||
export const TransferStatusSteps = ({ status }: ElementProps) => {
|
||||
const stringGetter = useStringGetter();
|
||||
|
||||
const { currentStep, steps } = useMemo(() => {
|
||||
const { currentStep, steps, type } = useMemo(() => {
|
||||
const routeStatus = status?.routeStatus;
|
||||
const fromChain = status?.fromChain?.chainData?.chainId;
|
||||
const toChain = status?.toChain?.chainData?.chainId;
|
||||
const type = toChain === TESTNET_CHAIN_ID ? 'deposit' : 'withdrawal';
|
||||
|
||||
const steps = [
|
||||
{
|
||||
@@ -73,10 +74,6 @@ export const TransferStatusSteps = ({ status, type }: ElementProps) => {
|
||||
currentStep = TransferStatusStep.FromChain;
|
||||
}
|
||||
|
||||
if (status?.squidTransactionStatus === 'success') {
|
||||
currentStep = TransferStatusStep.Complete;
|
||||
}
|
||||
|
||||
return {
|
||||
currentStep,
|
||||
steps,
|
||||
|
||||
@@ -25,11 +25,7 @@ import { TimeSeriesChart } from '@/components/visx/TimeSeriesChart';
|
||||
import { AxisLabelOutput } from '@/components/visx/AxisLabelOutput';
|
||||
// import { TooltipContent } from '@/components/visx/TooltipContent';
|
||||
|
||||
import {
|
||||
getSubaccount,
|
||||
getSubaccountHistoricalPnl,
|
||||
getSubaccountId,
|
||||
} from '@/state/accountSelectors';
|
||||
import { getSubaccount, getSubaccountHistoricalPnl, getSubaccountId } from '@/state/accountSelectors';
|
||||
|
||||
import abacusStateManager from '@/lib/abacus';
|
||||
import { formatRelativeTime } from '@/lib/dateTime';
|
||||
|
||||
@@ -5,9 +5,6 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
||||
import { AbacusApiStatus } from '@/constants/abacus';
|
||||
import { DialogTypes } from '@/constants/dialogs';
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
|
||||
import { UNICODE } from '@/constants/unicode';
|
||||
|
||||
import { useApiState, useStringGetter } from '@/hooks';
|
||||
import { layoutMixins } from '@/styles/layoutMixins';
|
||||
|
||||
@@ -32,16 +29,8 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps)
|
||||
const selectedNetwork = useSelector(getSelectedNetwork);
|
||||
const activeDialog = useSelector(getActiveDialog, shallowEqual);
|
||||
|
||||
const showOfflineMessage =
|
||||
import.meta.env.MODE === 'production' &&
|
||||
ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-4';
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
activeDialog?.type === DialogTypes.ExchangeOffline &&
|
||||
status === AbacusApiStatus.NORMAL &&
|
||||
!showOfflineMessage
|
||||
) {
|
||||
if (activeDialog?.type === DialogTypes.ExchangeOffline && status === AbacusApiStatus.NORMAL) {
|
||||
dispatch(closeDialog());
|
||||
}
|
||||
}, [status, selectedNetwork]);
|
||||
@@ -54,16 +43,7 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps)
|
||||
title={stringGetter({ key: STRING_KEYS.UNAVAILABLE })}
|
||||
>
|
||||
<Styled.Content>
|
||||
{showOfflineMessage ? (
|
||||
<>
|
||||
<p>Testnet is currently offline. Please check back!</p>
|
||||
<Styled.Link href="https://v4-teacher.vercel.app/testnets/schedule">
|
||||
{stringGetter({ key: STRING_KEYS.LEARN_MORE })} {UNICODE.ARROW_RIGHT}
|
||||
</Styled.Link>
|
||||
</>
|
||||
) : (
|
||||
<p>{statusErrorMessage}</p>
|
||||
)}
|
||||
<p>{statusErrorMessage}</p>
|
||||
{import.meta.env.MODE !== 'production' && <NetworkSelectMenu />}
|
||||
</Styled.Content>
|
||||
</Dialog>
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
import styled, { AnyStyledComponent } from 'styled-components';
|
||||
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { useStringGetter } from '@/hooks';
|
||||
import { layoutMixins } from '@/styles/layoutMixins';
|
||||
|
||||
import { Dialog } from '@/components/Dialog';
|
||||
import { Icon, IconName } from '@/components/Icon';
|
||||
|
||||
type ElementProps = {
|
||||
preventClose?: boolean;
|
||||
setIsOpen?: (open: boolean) => void;
|
||||
};
|
||||
|
||||
export const RateLimitDialog = ({ preventClose, setIsOpen }: ElementProps) => {
|
||||
const stringGetter = useStringGetter();
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
isOpen
|
||||
preventClose={preventClose}
|
||||
setIsOpen={setIsOpen}
|
||||
title={stringGetter({ key: STRING_KEYS.RATE_LIMIT_REACHED_ERROR_TITLE })}
|
||||
slotIcon={<Styled.Icon iconName={IconName.Warning} />}
|
||||
>
|
||||
<Styled.Content>
|
||||
{stringGetter({ key: STRING_KEYS.RATE_LIMIT_REACHED_ERROR_MESSAGE })}
|
||||
</Styled.Content>
|
||||
</Dialog>
|
||||
);
|
||||
};
|
||||
|
||||
const Styled: Record<string, AnyStyledComponent> = {};
|
||||
|
||||
Styled.Icon = styled(Icon)`
|
||||
color: var(--color-warning);
|
||||
`;
|
||||
|
||||
Styled.Content = styled.div`
|
||||
${layoutMixins.column}
|
||||
gap: 1rem;
|
||||
`;
|
||||
@@ -1,42 +0,0 @@
|
||||
import styled, { AnyStyledComponent } from 'styled-components';
|
||||
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { useStringGetter } from '@/hooks';
|
||||
import { layoutMixins } from '@/styles/layoutMixins';
|
||||
|
||||
import { Dialog } from '@/components/Dialog';
|
||||
import { Icon, IconName } from '@/components/Icon';
|
||||
|
||||
type ElementProps = {
|
||||
preventClose?: boolean;
|
||||
setIsOpen?: (open: boolean) => void;
|
||||
};
|
||||
|
||||
export const RestrictedGeoDialog = ({ preventClose, setIsOpen }: ElementProps) => {
|
||||
const stringGetter = useStringGetter();
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
isOpen
|
||||
preventClose={preventClose}
|
||||
setIsOpen={setIsOpen}
|
||||
title={stringGetter({ key: STRING_KEYS.REGION_NOT_PERMITTED_TITLE })}
|
||||
slotIcon={<Styled.Icon iconName={IconName.Warning} />}
|
||||
>
|
||||
<Styled.Content>
|
||||
{stringGetter({ key: STRING_KEYS.REGION_NOT_PERMITTED_SUBTITLE })}
|
||||
</Styled.Content>
|
||||
</Dialog>
|
||||
);
|
||||
};
|
||||
|
||||
const Styled: Record<string, AnyStyledComponent> = {};
|
||||
|
||||
Styled.Icon = styled(Icon)`
|
||||
color: var(--color-warning);
|
||||
`;
|
||||
|
||||
Styled.Content = styled.div`
|
||||
${layoutMixins.column}
|
||||
gap: 1rem;
|
||||
`;
|
||||
@@ -1,42 +0,0 @@
|
||||
import styled, { AnyStyledComponent } from 'styled-components';
|
||||
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { useStringGetter } from '@/hooks';
|
||||
import { layoutMixins } from '@/styles/layoutMixins';
|
||||
|
||||
import { Dialog } from '@/components/Dialog';
|
||||
import { Icon, IconName } from '@/components/Icon';
|
||||
|
||||
type ElementProps = {
|
||||
preventClose?: boolean;
|
||||
setIsOpen?: (open: boolean) => void;
|
||||
};
|
||||
|
||||
export const RestrictedWalletDialog = ({ preventClose, setIsOpen }: ElementProps) => {
|
||||
const stringGetter = useStringGetter();
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
isOpen
|
||||
preventClose={preventClose}
|
||||
setIsOpen={setIsOpen}
|
||||
title={stringGetter({ key: STRING_KEYS.WALLET_RESTRICTED_ERROR_TITLE })}
|
||||
slotIcon={<Styled.Icon iconName={IconName.Warning} />}
|
||||
>
|
||||
<Styled.Content>
|
||||
{stringGetter({ key: STRING_KEYS.REGION_NOT_PERMITTED_SUBTITLE })}
|
||||
</Styled.Content>
|
||||
</Dialog>
|
||||
);
|
||||
};
|
||||
|
||||
const Styled: Record<string, AnyStyledComponent> = {};
|
||||
|
||||
Styled.Icon = styled(Icon)`
|
||||
color: var(--color-warning);
|
||||
`;
|
||||
|
||||
Styled.Content = styled.div`
|
||||
${layoutMixins.column}
|
||||
gap: 1rem;
|
||||
`;
|
||||
@@ -10,16 +10,9 @@ import { TransferInputField, TransferInputTokenResource, TransferType } from '@/
|
||||
import { AlertType } from '@/constants/alerts';
|
||||
import { ButtonSize } from '@/constants/buttons';
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { NumberSign } from '@/constants/numbers';
|
||||
import { NumberSign, QUANTUM_MULTIPLIER } from '@/constants/numbers';
|
||||
|
||||
import {
|
||||
useAccounts,
|
||||
useDebounce,
|
||||
useDydxClient,
|
||||
useRestrictions,
|
||||
useStringGetter,
|
||||
useSubaccount,
|
||||
} from '@/hooks';
|
||||
import { useDebounce, useStringGetter, useSubaccount } from '@/hooks';
|
||||
import { useLocalNotifications } from '@/hooks/useLocalNotifications';
|
||||
|
||||
import { layoutMixins } from '@/styles/layoutMixins';
|
||||
@@ -46,11 +39,10 @@ import { MustBigNumber } from '@/lib/numbers';
|
||||
|
||||
import { TokenSelectMenu } from './TokenSelectMenu';
|
||||
import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt';
|
||||
import { join } from 'path';
|
||||
|
||||
export const WithdrawForm = () => {
|
||||
const stringGetter = useStringGetter();
|
||||
const [error, setError] = useState<string>();
|
||||
const [error, setError] = useState<Error | null>(null);
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
|
||||
const { sendSquidWithdraw } = useSubaccount();
|
||||
@@ -79,11 +71,9 @@ export const WithdrawForm = () => {
|
||||
const { addTransferNotification } = useLocalNotifications();
|
||||
|
||||
// Async Data
|
||||
const debouncedAmountBN = useMemo(() => MustBigNumber(debouncedAmount), [debouncedAmount]);
|
||||
const freeCollateralBN = useMemo(
|
||||
() => MustBigNumber(freeCollateral?.current),
|
||||
[freeCollateral?.current]
|
||||
);
|
||||
const debouncedAmountBN = MustBigNumber(debouncedAmount);
|
||||
const withdrawAmountBN = MustBigNumber(withdrawAmount);
|
||||
const freeCollateralBN = MustBigNumber(freeCollateral?.current);
|
||||
|
||||
useEffect(() => {
|
||||
abacusStateManager.setTransferValue({
|
||||
@@ -115,85 +105,50 @@ export const WithdrawForm = () => {
|
||||
value: debouncedAmount,
|
||||
field: TransferInputField.usdcSize,
|
||||
});
|
||||
setError(undefined);
|
||||
setError(null);
|
||||
}
|
||||
} catch (error) {
|
||||
setError(error.message);
|
||||
setError(error);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
setTransferValue();
|
||||
}, [debouncedAmountBN]);
|
||||
|
||||
const { screenAddresses } = useDydxClient();
|
||||
const { dydxAddress } = useAccounts();
|
||||
}, [debouncedAmountBN.toNumber()]);
|
||||
|
||||
const onSubmit = useCallback(
|
||||
async (e: FormEvent) => {
|
||||
try {
|
||||
e.preventDefault();
|
||||
|
||||
if (!requestPayload?.data || !debouncedAmountBN.toNumber() || !toAddress || !dydxAddress) {
|
||||
if (!requestPayload?.data || !debouncedAmountBN.toNumber()) {
|
||||
throw new Error('Invalid request payload');
|
||||
}
|
||||
|
||||
setIsLoading(true);
|
||||
setError(undefined);
|
||||
const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload?.data);
|
||||
|
||||
const screenResults = await screenAddresses({
|
||||
addresses: [toAddress, dydxAddress],
|
||||
});
|
||||
if (txHash?.hash) {
|
||||
const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
|
||||
|
||||
if (screenResults?.[dydxAddress]) {
|
||||
setError(
|
||||
stringGetter({
|
||||
key: STRING_KEYS.WALLET_RESTRICTED_WITHDRAWAL_TRANSFER_ORIGINATION_ERROR_MESSAGE,
|
||||
})
|
||||
);
|
||||
} else if (screenResults?.[toAddress]) {
|
||||
setError(
|
||||
stringGetter({
|
||||
key: STRING_KEYS.WALLET_RESTRICTED_WITHDRAWAL_TRANSFER_DESTINATION_ERROR_MESSAGE,
|
||||
})
|
||||
);
|
||||
} else {
|
||||
const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data);
|
||||
if (txHash?.hash) {
|
||||
const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
|
||||
addTransferNotification({
|
||||
txHash: hash,
|
||||
fromChainId: TESTNET_CHAIN_ID,
|
||||
toChainId: chainIdStr || undefined,
|
||||
toAmount: debouncedAmountBN.toNumber(),
|
||||
triggeredAt: Date.now(),
|
||||
});
|
||||
abacusStateManager.clearTransferInputValues();
|
||||
setWithdrawAmount('');
|
||||
}
|
||||
addTransferNotification({
|
||||
txHash: hash,
|
||||
fromChainId: TESTNET_CHAIN_ID,
|
||||
toChainId: chainIdStr || undefined,
|
||||
toAmount: debouncedAmountBN.toNumber(),
|
||||
triggeredAt: Date.now(),
|
||||
});
|
||||
abacusStateManager.clearTransferInputValues();
|
||||
setWithdrawAmount('');
|
||||
}
|
||||
} catch (error) {
|
||||
if (error?.code === 429) {
|
||||
setError(stringGetter({ key: STRING_KEYS.RATE_LIMIT_REACHED_ERROR_MESSAGE }));
|
||||
} else {
|
||||
setError(
|
||||
error.message
|
||||
? stringGetter({
|
||||
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
|
||||
params: {
|
||||
ERROR_MESSAGE:
|
||||
error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
|
||||
},
|
||||
})
|
||||
: stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG })
|
||||
);
|
||||
}
|
||||
setError(error);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
},
|
||||
[requestPayload, debouncedAmountBN, chainIdStr, toAddress, screenAddresses, stringGetter]
|
||||
[requestPayload, debouncedAmountBN, chainIdStr]
|
||||
);
|
||||
|
||||
const onChangeAddress = useCallback((e: ChangeEvent<HTMLInputElement>) => {
|
||||
@@ -224,7 +179,7 @@ export const WithdrawForm = () => {
|
||||
|
||||
const onClickMax = useCallback(() => {
|
||||
setWithdrawAmount(freeCollateralBN.toString());
|
||||
}, [freeCollateralBN, setWithdrawAmount]);
|
||||
}, [freeCollateral?.current, setWithdrawAmount]);
|
||||
|
||||
const onSelectChain = useCallback((chain: string) => {
|
||||
if (chain) {
|
||||
@@ -260,7 +215,7 @@ export const WithdrawForm = () => {
|
||||
value={freeCollateral?.current}
|
||||
newValue={freeCollateral?.postOrder}
|
||||
sign={NumberSign.Negative}
|
||||
hasInvalidNewValue={MustBigNumber(withdrawAmount).minus(freeCollateralBN).isNegative()}
|
||||
hasInvalidNewValue={withdrawAmountBN.minus(freeCollateralBN).isNegative()}
|
||||
withDiff={
|
||||
Boolean(withdrawAmount) && !debouncedAmountBN.isNaN() && !debouncedAmountBN.isZero()
|
||||
}
|
||||
@@ -269,23 +224,18 @@ export const WithdrawForm = () => {
|
||||
},
|
||||
];
|
||||
|
||||
const { sanctionedAddresses } = useRestrictions();
|
||||
|
||||
const errorMessage = useMemo(() => {
|
||||
if (error) {
|
||||
return stringGetter({
|
||||
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
|
||||
params: { ERROR_MESSAGE: error },
|
||||
});
|
||||
return error?.message
|
||||
? stringGetter({
|
||||
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
|
||||
params: { ERROR_MESSAGE: error.message },
|
||||
})
|
||||
: stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG });
|
||||
}
|
||||
|
||||
if (!toAddress) return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_ADDRESS });
|
||||
|
||||
if (sanctionedAddresses.has(toAddress))
|
||||
return stringGetter({
|
||||
key: STRING_KEYS.TRANSFER_INVALID_DYDX_ADDRESS,
|
||||
});
|
||||
|
||||
if (debouncedAmountBN) {
|
||||
if (!chainIdStr) {
|
||||
return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_CHAIN });
|
||||
@@ -299,15 +249,7 @@ export const WithdrawForm = () => {
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}, [
|
||||
error,
|
||||
freeCollateralBN,
|
||||
chainIdStr,
|
||||
debouncedAmountBN,
|
||||
toToken,
|
||||
toAddress,
|
||||
sanctionedAddresses,
|
||||
]);
|
||||
}, [error, freeCollateralBN, chainIdStr, debouncedAmountBN, toToken]);
|
||||
|
||||
const isDisabled =
|
||||
!!errorMessage ||
|
||||
@@ -315,8 +257,7 @@ export const WithdrawForm = () => {
|
||||
!chainIdStr ||
|
||||
!toAddress ||
|
||||
debouncedAmountBN.isNaN() ||
|
||||
debouncedAmountBN.isZero() ||
|
||||
isLoading;
|
||||
debouncedAmountBN.isZero();
|
||||
|
||||
return (
|
||||
<Styled.Form onSubmit={onSubmit}>
|
||||
|
||||
@@ -29,7 +29,7 @@ export const AdvancedTradeOptions = () => {
|
||||
const currentTradeFormConfig = useSelector(getInputTradeOptions, shallowEqual);
|
||||
const inputTradeData = useSelector(getInputTradeData, shallowEqual);
|
||||
|
||||
const { execution, goodTil, postOnly, reduceOnly, timeInForce, type } = inputTradeData || {};
|
||||
const { execution, goodTil, postOnly, reduceOnly, timeInForce } = inputTradeData || {};
|
||||
|
||||
const { executionOptions, needsGoodUntil, needsPostOnly, needsReduceOnly, timeInForceOptions } =
|
||||
currentTradeFormConfig || {};
|
||||
@@ -37,7 +37,6 @@ export const AdvancedTradeOptions = () => {
|
||||
const { duration, unit } = goodTil || {};
|
||||
|
||||
const needsExecution = executionOptions || needsPostOnly || needsReduceOnly;
|
||||
const hasTimeInForce = timeInForceOptions?.toArray()?.length;
|
||||
|
||||
return (
|
||||
<Styled.Collapsible
|
||||
@@ -48,7 +47,7 @@ export const AdvancedTradeOptions = () => {
|
||||
>
|
||||
<Styled.AdvancedInputsContainer>
|
||||
<Styled.AdvancedInputsRow needsGoodUntil={needsGoodUntil}>
|
||||
{hasTimeInForce && (
|
||||
{timeInForceOptions?.toArray() && (
|
||||
<Styled.SelectMenu
|
||||
value={timeInForce}
|
||||
onValueChange={(selectedTimeInForceOption: string) =>
|
||||
@@ -73,9 +72,7 @@ export const AdvancedTradeOptions = () => {
|
||||
id="trade-good-til-time"
|
||||
type={InputType.Number}
|
||||
decimals={INTEGER_DECIMALS}
|
||||
label={stringGetter({
|
||||
key: hasTimeInForce ? STRING_KEYS.TIME : STRING_KEYS.GOOD_TIL_TIME,
|
||||
})}
|
||||
label={stringGetter({ key: STRING_KEYS.TIME })}
|
||||
onChange={({ value }: NumberFormatValues) => {
|
||||
abacusStateManager.setTradeValue({
|
||||
value: Number(value),
|
||||
|
||||
@@ -3,6 +3,8 @@ import styled, { type AnyStyledComponent } from 'styled-components';
|
||||
import { type NumberFormatValues } from 'react-number-format';
|
||||
import { shallowEqual, useSelector } from 'react-redux';
|
||||
import type { SyntheticInputEvent } from 'react-number-format/types/types';
|
||||
import { debounce } from 'lodash';
|
||||
import { StdFee } from '@cosmjs/stargate';
|
||||
import { validation } from '@dydxprotocol/v4-client-js';
|
||||
|
||||
import { TransferInputField, TransferType } from '@/constants/abacus';
|
||||
@@ -10,7 +12,7 @@ import { AlertType } from '@/constants/alerts';
|
||||
import { ButtonShape, ButtonSize } from '@/constants/buttons';
|
||||
import { STRING_KEYS } from '@/constants/localization';
|
||||
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
|
||||
import { NumberSign } from '@/constants/numbers';
|
||||
import { NumberSign, QUANTUM_MULTIPLIER } from '@/constants/numbers';
|
||||
import {
|
||||
DYDX_CHAIN_ASSET_COIN_DENOM,
|
||||
DYDX_CHAIN_ASSET_TAGS,
|
||||
@@ -20,8 +22,6 @@ import {
|
||||
import {
|
||||
useAccountBalance,
|
||||
useAccounts,
|
||||
useDydxClient,
|
||||
useRestrictions,
|
||||
useSelectedNetwork,
|
||||
useStringGetter,
|
||||
useSubaccount,
|
||||
@@ -77,7 +77,7 @@ export const TransferForm = ({
|
||||
const [asset, setAsset] = useState<DydxChainAsset>(selectedAsset);
|
||||
|
||||
// Form states
|
||||
const [error, setError] = useState<string>();
|
||||
const [error, setError] = useState<Error | undefined>();
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
|
||||
const balance = asset === DydxChainAsset.USDC ? freeCollateral?.current : nativeTokenBalance;
|
||||
@@ -96,6 +96,16 @@ export const TransferForm = ({
|
||||
const balanceBN = MustBigNumber(balance);
|
||||
const newBalanceBN = MustBigNumber(newBalance);
|
||||
|
||||
const isAddressValid = useMemo(
|
||||
() =>
|
||||
recipientAddress &&
|
||||
dydxAddress !== recipientAddress &&
|
||||
validation.isValidAddress(recipientAddress),
|
||||
[recipientAddress]
|
||||
);
|
||||
|
||||
const isAmountValid = balance && amount && amountBN.gt(0) && newBalanceBN.gte(0);
|
||||
|
||||
useEffect(() => {
|
||||
abacusStateManager.setTransferValue({
|
||||
value: TransferType.transferOut.rawValue,
|
||||
@@ -115,21 +125,6 @@ export const TransferForm = ({
|
||||
});
|
||||
}, [asset]);
|
||||
|
||||
const { sanctionedAddresses } = useRestrictions();
|
||||
|
||||
const isAddressValid = useMemo(
|
||||
() =>
|
||||
recipientAddress &&
|
||||
dydxAddress !== recipientAddress &&
|
||||
validation.isValidAddress(recipientAddress) &&
|
||||
!sanctionedAddresses.has(recipientAddress),
|
||||
[recipientAddress, sanctionedAddresses, dydxAddress]
|
||||
);
|
||||
|
||||
const isAmountValid = balance && amount && amountBN.gt(0) && newBalanceBN.gte(0);
|
||||
|
||||
const { screenAddresses } = useDydxClient();
|
||||
|
||||
const onTransfer = async () => {
|
||||
if (!isAmountValid || !isAddressValid || !fee) return;
|
||||
setIsLoading(true);
|
||||
@@ -141,51 +136,20 @@ export const TransferForm = ({
|
||||
asset === DydxChainAsset.DYDX ? amountBN.minus(fee) : amountBN
|
||||
).toNumber();
|
||||
|
||||
const screenResults = await screenAddresses({
|
||||
addresses: [recipientAddress!, dydxAddress!],
|
||||
});
|
||||
const txResponse = await transfer(
|
||||
amountToTransfer,
|
||||
recipientAddress as string,
|
||||
DYDX_CHAIN_ASSET_COIN_DENOM[asset]
|
||||
);
|
||||
|
||||
if (screenResults?.[dydxAddress!]) {
|
||||
setError(
|
||||
stringGetter({
|
||||
key: STRING_KEYS.WALLET_RESTRICTED_WITHDRAWAL_TRANSFER_ORIGINATION_ERROR_MESSAGE,
|
||||
})
|
||||
);
|
||||
} else if (screenResults?.[recipientAddress!]) {
|
||||
setError(
|
||||
stringGetter({
|
||||
key: STRING_KEYS.WALLET_RESTRICTED_WITHDRAWAL_TRANSFER_DESTINATION_ERROR_MESSAGE,
|
||||
})
|
||||
);
|
||||
if (txResponse?.code === 0) {
|
||||
console.log('TransferForm > txReceipt > ', txResponse?.hash);
|
||||
onDone?.();
|
||||
} else {
|
||||
const txResponse = await transfer(
|
||||
amountToTransfer,
|
||||
recipientAddress as string,
|
||||
DYDX_CHAIN_ASSET_COIN_DENOM[asset]
|
||||
);
|
||||
|
||||
if (txResponse?.code === 0) {
|
||||
console.log('TransferForm > txReceipt > ', txResponse?.hash);
|
||||
onDone?.();
|
||||
} else {
|
||||
throw new Error(txResponse?.rawLog ?? 'Transaction did not commit.');
|
||||
}
|
||||
throw new Error(txResponse?.rawLog ?? 'Transaction did not commit.');
|
||||
}
|
||||
} catch (error) {
|
||||
if (error?.code === 429) {
|
||||
setError(stringGetter({ key: STRING_KEYS.RATE_LIMIT_REACHED_ERROR_MESSAGE }));
|
||||
} else {
|
||||
setError(
|
||||
error.message
|
||||
? stringGetter({
|
||||
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
|
||||
params: {
|
||||
ERROR_MESSAGE: error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
|
||||
},
|
||||
})
|
||||
: stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG })
|
||||
);
|
||||
}
|
||||
setError(error);
|
||||
log('TransferForm/onTransfer', error);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
@@ -267,6 +231,13 @@ export const TransferForm = ({
|
||||
},
|
||||
];
|
||||
|
||||
const addressValidationErrorMessage = stringGetter({
|
||||
key:
|
||||
dydxAddress === recipientAddress
|
||||
? STRING_KEYS.TRANSFER_TO_YOURSELF
|
||||
: STRING_KEYS.TRANSFER_INVALID_DYDX_ADDRESS,
|
||||
});
|
||||
|
||||
const renderFormInputButton = ({
|
||||
label,
|
||||
isInputEmpty,
|
||||
@@ -331,12 +302,7 @@ export const TransferForm = ({
|
||||
|
||||
{recipientAddress && !isAddressValid && (
|
||||
<Styled.AddressValidationAlertMessage type={AlertType.Error}>
|
||||
{stringGetter({
|
||||
key:
|
||||
dydxAddress === recipientAddress
|
||||
? STRING_KEYS.TRANSFER_TO_YOURSELF
|
||||
: STRING_KEYS.TRANSFER_INVALID_DYDX_ADDRESS,
|
||||
})}
|
||||
{addressValidationErrorMessage}
|
||||
</Styled.AddressValidationAlertMessage>
|
||||
)}
|
||||
|
||||
@@ -376,13 +342,13 @@ export const TransferForm = ({
|
||||
</AlertMessage>
|
||||
)}
|
||||
|
||||
{error && <AlertMessage type={AlertType.Error}>{error}</AlertMessage>}
|
||||
{error && <AlertMessage type={AlertType.Error}>{error.message}</AlertMessage>}
|
||||
|
||||
<Styled.Footer>
|
||||
<TransferButtonAndReceipt
|
||||
selectedAsset={asset}
|
||||
fees={fee || undefined}
|
||||
isDisabled={!isAmountValid || !isAddressValid || !fee || isLoading}
|
||||
isDisabled={!isAmountValid || !isAddressValid || !fee}
|
||||
isLoading={isLoading || Boolean(isAmountValid && isAddressValid && !fee)}
|
||||
/>
|
||||
</Styled.Footer>
|
||||
|
||||
@@ -178,11 +178,10 @@ export const NotificationsMenu = ({
|
||||
};
|
||||
|
||||
const $UnreadIndicator = styled.div`
|
||||
width: 0.5rem;
|
||||
height: 0.5rem;
|
||||
width: 0.5em;
|
||||
height: 0.5em;
|
||||
border-radius: 50%;
|
||||
background-color: var(--color-accent);
|
||||
border: 1px solid var(--color-layer-2);
|
||||
`;
|
||||
|
||||
const $TriggerContainer = styled.div`
|
||||
@@ -193,8 +192,8 @@ const $TriggerUnreadIndicator = styled($UnreadIndicator)`
|
||||
place-self: center;
|
||||
|
||||
position: relative;
|
||||
right: -0.2rem;
|
||||
top: -0.325rem;
|
||||
right: -0.425em;
|
||||
top: -0.425em;
|
||||
`;
|
||||
|
||||
const $Output = styled(Output)`
|
||||
|
||||
Reference in New Issue
Block a user