bump again

* temp

* add into reciept

* bump localization

* add tag

package.json

@@ -37,9 +37,9 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^0.5.4",
+    "@dydxprotocol/v4-abacus": "^0.5.12",
     "@dydxprotocol/v4-client-js": "^0.36.1",
-    "@dydxprotocol/v4-localization": "^0.1.11",
+    "@dydxprotocol/v4-localization": "^0.1.12",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-collapsible": "^1.0.3",

pnpm-lock.yaml

@@ -27,14 +27,14 @@ dependencies:
     specifier: ^0.31.0
     version: 0.31.0
   '@dydxprotocol/v4-abacus':
-    specifier: ^0.5.4
-    version: 0.5.4
+    specifier: ^0.5.12
+    version: 0.5.12
   '@dydxprotocol/v4-client-js':
     specifier: ^0.36.1
     version: 0.36.1
   '@dydxprotocol/v4-localization':
-    specifier: ^0.1.11
-    version: 0.1.11
+    specifier: ^0.1.12
+    version: 0.1.12
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -979,8 +979,8 @@ packages:
     resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
     dev: true
 
-  /@dydxprotocol/v4-abacus@0.5.4:
-    resolution: {integrity: sha512-LMwmyXCih2bBdLX3vO5OwbdGWg3oZ8WSGj+4nqr8tn/bn1qCSKdYdZZ9/U20Yir2rMAcoC0jmznMcBwthlSp/w==}
+  /@dydxprotocol/v4-abacus@0.5.12:
+    resolution: {integrity: sha512-OigoIjGtp0az1elkP84nc9qKYBVg5Fg4QEJFDn7J7oiUqVvwNggYNfnDsX77D8+K4DJ/rtbi2yZYsDE8OZMSoQ==}
     dev: false
 
   /@dydxprotocol/v4-client-js@0.36.1:
@@ -1010,8 +1010,8 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@0.1.11:
-    resolution: {integrity: sha512-eW88t8KJuDT0fNEgaw615+n3gEYxDZYPeHhdBYquVDXjnkhLNznaH8ftmlLPVPyfu7o5aFeU/cw8ZiqRrf/Stw==}
+  /@dydxprotocol/v4-localization@0.1.12:
+    resolution: {integrity: sha512-EiP/8+6Nk9QBa6YSWsyzsZaXoVbz5o/KgUlMp1Cew6VWkXL6DkQY0oMIEEy21pv0zuu/woxhlbyXygpUIcpdMg==}
     dev: false
 
   /@dydxprotocol/v4-proto@0.2.1:

src/constants/abacus.ts

@@ -69,8 +69,8 @@ export type NetworkConfig = {
 export type ConnectNetworkEvent = CustomEvent<Partial<NetworkConfig>>;
 
 // ------ State ------
-export type AbacusApiState = Abacus.exchange.dydx.abacus.state.app.ApiState;
-export const AbacusApiStatus = Abacus.exchange.dydx.abacus.state.app.ApiStatus;
+export type AbacusApiState = Abacus.exchange.dydx.abacus.state.manager.ApiState;
+export const AbacusApiStatus = Abacus.exchange.dydx.abacus.state.manager.ApiStatus;
 const abacusApiStatuses = [...AbacusApiStatus.values()];
 export type AbacusApiStatuses = (typeof abacusApiStatuses)[number];
 export const Changes = Abacus.exchange.dydx.abacus.state.changes.Changes;
@@ -139,7 +139,7 @@ export type SubaccountTransfers = Abacus.exchange.dydx.abacus.output.SubaccountT
 // ------ Historical PnL ------ //
 export type SubAccountHistoricalPNL = Abacus.exchange.dydx.abacus.output.SubaccountHistoricalPNL;
 export type SubAccountHistoricalPNLs = Abacus.exchange.dydx.abacus.output.SubaccountHistoricalPNL[];
-export const HistoricalPnlPeriod = Abacus.exchange.dydx.abacus.state.app.HistoricalPnlPeriod;
+export const HistoricalPnlPeriod = Abacus.exchange.dydx.abacus.protocols.HistoricalPnlPeriod;
 const historicalPnlPeriod = [...HistoricalPnlPeriod.values()] as const;
 export type HistoricalPnlPeriods = (typeof historicalPnlPeriod)[number];
 
@@ -179,12 +179,6 @@ export const AbacusOrderSide = Abacus.exchange.dydx.abacus.output.input.OrderSid
 export const AbacusPositionSide = Abacus.exchange.dydx.abacus.output.PositionSide;
 export type AbacusPositionSides = Abacus.exchange.dydx.abacus.output.PositionSide;
 
-export type SubaccountPlaceOrderPayload =
-  Abacus.exchange.dydx.abacus.state.app.V4SubaccountPlaceOrderPayload2;
-
-export type SubaccountCancelOrderPayload =
-  Abacus.exchange.dydx.abacus.state.app.V4SubaccountCancelOrderPayload2;
-
 export type HumanReadablePlaceOrderPayload =
   Abacus.exchange.dydx.abacus.state.manager.HumanReadablePlaceOrderPayload;
 export type HumanReadableCancelOrderPayload =

src/constants/tooltips/trade.ts

@@ -94,6 +94,10 @@ export const tradeTooltips: TooltipStrings = {
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.MAINTENANCE_MARGIN_FRACTION_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.MAINTENANCE_MARGIN_FRACTION_BODY }),
   }),
+  'max-reward': ({ stringGetter }) => ({
+    title: stringGetter({ key: TOOLTIP_STRING_KEYS.MAXIMUM_REWARDS_TITLE }),
+    body: stringGetter({ key: TOOLTIP_STRING_KEYS.MAXIMUM_REWARDS_BODY }),
+  }),
   'max-withdraw': ({ stringGetter }) => ({
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.MAX_WITHDRAW_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.MAX_WITHDRAW_BODY }),

src/hooks/useAccountBalance.ts

@@ -37,10 +37,10 @@ type UseAccountBalanceProps = {
  * 0xSquid uses this 0x address as the chain's default token.
  * @todo We will need to add additional logic here if we 'useAccountBalance' on non-Squid related forms.
  */
-const CHAIN_DEFAULT_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
+export const CHAIN_DEFAULT_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
 
 export const useAccountBalance = ({
-  addressOrDenom = CHAIN_DEFAULT_TOKEN_ADDRESS,
+  addressOrDenom,
   assetSymbol,
   bech32AddrPrefix,
   chainId,

src/lib/abacus/dydxChainTransactions.ts

@@ -403,6 +403,22 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
           const parsedAccountBalances = this.parseToPrimitives(accountBalances);
           callback(JSON.stringify(parsedAccountBalances));
           break;
+        case QueryType.RewardsParams:
+          const rewardsParams = await this.compositeClient?.validatorClient.get.getRewardsParams();
+          const parsedRewardsParams = this.parseToPrimitives(rewardsParams);
+          callback(JSON.stringify(parsedRewardsParams));
+          break;
+        case QueryType.GetMarketPrice:
+          const price = await this.compositeClient?.validatorClient.get.getPrice(params.marketId);
+          const parsedPrice = this.parseToPrimitives(price);
+          callback(JSON.stringify(parsedPrice));
+          break;
+        case QueryType.GetDelegations:
+          const delegations =
+            await this.compositeClient?.validatorClient.get.getDelegatorDelegations(params.address);
+          const parseDelegations = this.parseToPrimitives(delegations);
+          callback(JSON.stringify(parseDelegations));
+          break;
         // Do not implement Transfers (yet)
         case QueryType.Transfers:
         default:

src/views/forms/AccountManagementForms/DepositForm.tsx

@@ -14,7 +14,7 @@ import { NumberSign } from '@/constants/numbers';
 import type { EvmAddress } from '@/constants/wallets';
 
 import { useAccounts, useDebounce, useStringGetter } from '@/hooks';
-import { useAccountBalance } from '@/hooks/useAccountBalance';
+import { useAccountBalance, CHAIN_DEFAULT_TOKEN_ADDRESS } from '@/hooks/useAccountBalance';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 import { NATIVE_TOKEN_ADDRESS, useSquid } from '@/hooks/useSquid';
 import { useWalletConnection } from '@/hooks/useWalletConnection';
@@ -86,7 +86,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
 
   // Async Data
   const { balance, queryStatus, isQueryFetching } = useAccountBalance({
-    addressOrDenom: sourceToken?.address || undefined,
+    addressOrDenom: sourceToken?.address || CHAIN_DEFAULT_TOKEN_ADDRESS,
     assetSymbol: sourceToken?.symbol || undefined,
     chainId: chainId,
     decimals: sourceToken?.decimals || undefined,

src/views/forms/AccountManagementForms/WithdrawForm/WithdrawButtonAndReceipt.tsx

@@ -49,15 +49,15 @@ export const WithdrawButtonAndReceipt = ({
   const [isEditingSlippage, setIsEditingSlipapge] = useState(false);
   const stringGetter = useStringGetter();
 
-  const { balance, queryStatus } = useAccountBalance({
-    addressOrDenom: withdrawToken?.address || undefined,
-    assetSymbol: withdrawToken?.symbol || undefined,
-    chainId: withdrawChain ? parseInt(withdrawChain) : undefined,
-    decimals: withdrawToken?.decimals || undefined,
-    isCosmosChain: false,
-  });
-
   // TODO: uncomment when we have a way to get token amount estimate from abacus
+  // const { balance, queryStatus } = useAccountBalance({
+  //   addressOrDenom: withdrawToken?.address || undefined,
+  //   assetSymbol: withdrawToken?.symbol || undefined,
+  //   chainId: withdrawChain ? parseInt(withdrawChain) : undefined,
+  //   decimals: withdrawToken?.decimals || undefined,
+  //   isCosmosChain: false,
+  // });
+
   // const balanceBN = MustBigNumber(balance);
   // const newBalance =
   //   // toAmountMin && withdrawToken && parseUnits(toAmountMin, withdrawToken.decimals).toString();
@@ -158,7 +158,7 @@ export const WithdrawButtonAndReceipt = ({
     // },
   ];
 
-  const isFormValid = !isDisabled && !isEditingSlippage && queryStatus !== 'error';
+  const isFormValid = !isDisabled && !isEditingSlippage;
 
   return (
     <Styled.WithReceipt

src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx

@@ -9,6 +9,7 @@ import { TRADE_TYPE_STRINGS, MobilePlaceOrderSteps } from '@/constants/trade';
 
 import { useStringGetter } from '@/hooks';
 
+import { AssetIcon } from '@/components/AssetIcon';
 import { Button } from '@/components/Button';
 import { Output, OutputType, ShowSign } from '@/components/Output';
 import { WithDetailsReceipt } from '@/components/WithDetailsReceipt';
@@ -62,7 +63,7 @@ export const PlaceOrderButtonAndReceipt = ({
   const selectedTradeType = getSelectedTradeType(type);
   const selectedOrderSide = getSelectedOrderSide(side);
 
-  const { fee, price: expectedPrice, total } = summary || {};
+  const { fee, price: expectedPrice, total, reward } = summary || {};
 
   const items = [
     {
@@ -79,6 +80,17 @@ export const PlaceOrderButtonAndReceipt = ({
       label: stringGetter({ key: STRING_KEYS.FEE }),
       value: <Output type={OutputType.Fiat} value={fee} useGrouping />,
     },
+    {
+      key: 'max-reward',
+      label: (
+        <>
+          {stringGetter({ key: STRING_KEYS.MAXIMUM_REWARDS })}
+          {/* <AssetIcon symbol="DYDX" /> */}
+        </>
+      ),
+      value: <Output type={OutputType.Asset} value={reward} useGrouping tag={reward ? "Dv4TNT" : ''} />,
+      tooltip: 'max-reward',
+    },
     {
       key: 'total',
       label: stringGetter({ key: STRING_KEYS.TOTAL }),