Abort key derivation if second signature fails

* Update env.json

* Add Polkachu option to environments

* Fix trailing comma error

package.json

@@ -39,7 +39,7 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^0.7.6",
+    "@dydxprotocol/v4-abacus": "^1.0.3",
     "@dydxprotocol/v4-client-js": "^0.40.3",
     "@dydxprotocol/v4-localization": "^0.1.32",
     "@ethersproject/providers": "^5.7.2",

pnpm-lock.yaml

@@ -27,8 +27,8 @@ dependencies:
     specifier: ^0.31.0
     version: 0.31.0
   '@dydxprotocol/v4-abacus':
-    specifier: ^0.7.6
-    version: 0.7.6
+    specifier: ^1.0.3
+    version: 1.0.3
   '@dydxprotocol/v4-client-js':
     specifier: ^0.40.3
     version: 0.40.3
@@ -979,8 +979,8 @@ packages:
     resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
     dev: true
 
-  /@dydxprotocol/v4-abacus@0.7.6:
-    resolution: {integrity: sha512-FdDXRaFMfxhyrJJs0dNrb1KG6X95lPHelua1yCn/SVgzwGaAqlJczrzmdh98INntuRAgIxOu69R5mCGyekumyg==}
+  /@dydxprotocol/v4-abacus@1.0.3:
+    resolution: {integrity: sha512-GuX37/DMMNSke8ZFcw52II7IVJfUgVGHqoi1Uw2cUb+hgIjjSG3OtbyRWedm5r6nqWq8BNLOexI0VVFB6OMVYg==}
     dev: false
 
   /@dydxprotocol/v4-client-js@0.40.3:

public/.well-known/apple-app-site-association

@@ -8,67 +8,43 @@
                 ],
                 "components": [
                     {
-                        "/": "/trade/*"
+                        "/": "/"
                     },
                     {
-                        "/": "/r/*"
+                        "/": "/#/"
                     },
                     {
-                        "/": "/portfolio/overview"
+                        "/": "*/markets"
                     },
                     {
-                        "/": "/portfolio/positions"
+                        "/": "*/trade"
                     },
                     {
-                        "/": "/portfolio/orders"
+                        "/": "*/trade/*"
                     },
                     {
-                        "/": "/portfolio/fees"
+                        "/": "*/portfolio"
                     },
                     {
-                        "/": "/portfolio/history"
+                        "/": "*/portfolio/overview"
                     },
                     {
-                        "/": "/portfolio/history/trades"
+                        "/": "*/portfolio/positions"
                     },
                     {
-                        "/": "/portfolio/history/transfers"
+                        "/": "*/portfolio/orders"
                     },
                     {
-                        "/": "/portfolio/history/funding"
+                        "/": "*/portfolio/fees"
                     },
                     {
-                        "/": "/rewards"
+                        "/": "*/portfolio/history/trades"
                     },
                     {
-                        "/": "/my-profile"
+                        "/": "*/portfolio/history/transfers"
                     },
                     {
-                        "/": "/rankings/hedgies"
-                    },
-                    {
-                        "/": "/rankings/competition"
-                    },
-                    {
-                        "/": "/rankings/diamond"
-                    },
-                    {
-                        "/": "/rankings/platinum"
-                    },
-                    {
-                        "/": "/rankings/gold"
-                    },
-                    {
-                        "/": "/rankings/silver"
-                    },
-                    {
-                        "/": "/rankings/bronze"
-                    },
-                    {
-                        "/": "/rankings/pnl-absolute"
-                    },
-                    {
-                        "/": "/rankings/pnl-percent"
+                        "/": "*/portfolio/history/funding"
                     },
                     {
                         "/": "/walletsegue",

public/configs/env.json

@@ -25,7 +25,8 @@
             "dydxprotocol-testnet-dsrv",
             "dydxprotocol-testnet-nodefleet",
             "dydxprotocol-testnet-kingnodes",
-            "dydxprotocol-testnet-liquify"
+            "dydxprotocol-testnet-liquify",
+            "dydxprotocol-testnet-polkachu"
          ],
          "default": "dydxprotocol-testnet"
       }
@@ -424,6 +425,7 @@
                }
             ],
             "validators": [
+               "https://dydx-testnet-rpc.polkachu.com/",
                "https://dydx-testnet.nodefleet.org",
                "https://test-dydx.kingnodes.com",
                "https://dydx-rpc.liquify.com/api=8878132/dydx"
@@ -779,6 +781,70 @@
             "signTypedDataDomainName": "dYdX V4"
          }
       },
+      "dydxprotocol-testnet-polkachu": {
+         "name": "v4 Public Testnet/Polkahcu",
+         "ethereumChainId": "5",
+         "dydxChainId": "dydx-testnet-4",
+         "chainName": "dYdX Chain",
+         "chainLogo": "dydx-chain.png",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
+               }
+            ],
+            "validators": [
+               "https://dydx-testnet-rpc.polkachu.com/"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "faucet": "https://faucet.v4testnet.dydx.exchange"
+         },
+         "links": {
+            "tos": "https://dydx.exchange/v4-terms",
+            "privacy": "https://dydx.exchange/privacy",
+            "statusPage": "https://status.v4testnet.dydx.exchange/",
+            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "documentation": "https://v4-teacher.vercel.app/",
+            "community": "https://discord.com/invite/dydx",
+            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX V4"
+         }
+      },
       "dydxprotocol-mainnet": {
          "name": "v4",
          "ethereumChainId": "1",

src/views/dialogs/OnboardingDialog/GenerateKeys.tsx

@@ -130,12 +130,14 @@ export const GenerateKeys = ({
           }
         }
       } catch (error) {
+        setStatus(EvmDerivedAccountStatus.NotDerived);
         const { message } = parseWalletError({ error, stringGetter });
 
         if (message) {
           track(AnalyticsEvent.OnboardingWalletIsNonDeterministic);
           setError(message);
         }
+        return;
       }
 
       await setWalletFromEvmSignature(signature);