Compare commits

..
Author SHA1 Message Date
Bill He 464f8165d6 add TODO 2023-10-19 10:50:26 -07:00
Bill He 1eed6e3e5c address comments 2023-10-19 10:34:14 -07:00
Bill He 483ea78260 use cancelRawOrder 2023-10-19 10:09:35 -07:00
Bill He eceaea5235 chain -> chaintoken 2023-10-19 10:04:47 -07:00
Bill He ab04f262ab bump 2023-10-19 10:04:47 -07:00
Bill He 0dae28d605 Have tokens be configurable, bump v4-client 2023-10-19 10:04:44 -07:00
6 changed files with 17 additions and 24 deletions
+1 -1
View File
@@ -38,7 +38,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": "^0.7.2",
"@dydxprotocol/v4-client-js": "^0.40.3",
"@dydxprotocol/v4-localization": "^0.1.30",
"@ethersproject/providers": "^5.7.2",
+4 -4
View File
@@ -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: ^0.7.2
version: 0.7.2
'@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@0.7.2:
resolution: {integrity: sha512-5foamomN82FH6ko3EuzwFlSoAEY6Sal8fDgvZo2RsB19Ks6SFgFDeeOcEDdfoa3DNwvl8yW0C9cfxeQ+BfU8uA==}
dev: false
/@dydxprotocol/v4-client-js@0.40.3:
+1 -1
View File
@@ -44,4 +44,4 @@ export type EvmDerivedAddresses = {
};
};
export const AMOUNT_RESERVED_FOR_GAS_USDC = 0.1;
export const AMOUNT_RESERVED_FOR_GAS_USDC = 100_000;
+1 -11
View File
@@ -15,8 +15,6 @@ import type { ResolutionString } from 'public/tradingview/charting_library';
import type { ConnectNetworkEvent, NetworkConfig } from '@/constants/abacus';
import { type Candle, RESOLUTION_MAP } from '@/constants/candles';
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { DydxChainAsset } from '@/constants/wallets';
import { getSelectedNetwork } from '@/state/appSelectors';
@@ -38,7 +36,6 @@ const useDydxClientContext = () => {
// ------ Network ------ //
const selectedNetwork = useSelector(getSelectedNetwork);
const tokensConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].tokens;
const [networkConfig, setNetworkConfig] = useState<NetworkConfig>();
@@ -68,14 +65,7 @@ const useDydxClientContext = () => {
new Network(
selectedNetwork,
new IndexerConfig(networkConfig.indexerUrl, networkConfig.websocketUrl),
new ValidatorConfig(networkConfig.validatorUrl, networkConfig.chainId,
{
USDC_DENOM: tokensConfigs[DydxChainAsset.USDC].denom,
USDC_DECIMALS: tokensConfigs[DydxChainAsset.USDC].decimals,
USDC_GAS_DENOM: tokensConfigs[DydxChainAsset.USDC].gasDenom,
CHAINTOKEN_DENOM: tokensConfigs[DydxChainAsset.CHAINTOKEN].denom,
CHAINTOKEN_DECIMALS: tokensConfigs[DydxChainAsset.CHAINTOKEN].decimals,
}, {
new ValidatorConfig(networkConfig.validatorUrl, networkConfig.chainId, {
broadcastPollIntervalMs: 3_000,
broadcastTimeoutMs: 60_000,
})
+10 -5
View File
@@ -74,12 +74,13 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
() => ({
depositToSubaccount: async ({
subaccountClient,
assetId = 0,
amount,
}: {
subaccountClient: SubaccountClient;
assetId?: number;
amount: number;
}) => await compositeClient?.depositToSubaccount(subaccountClient, amount.toString()),
amount: Long;
}) => await compositeClient?.validatorClient.post.deposit(subaccountClient, assetId, amount),
withdrawFromSubaccount: async ({
subaccountClient,
@@ -200,9 +201,13 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
async (balance: AccountBalance) => {
if (!localDydxWallet) return;
const amount = parseFloat(balance.amount) - AMOUNT_RESERVED_FOR_GAS_USDC;
const amountAfterDust = MustBigNumber(balance.amount)
.minus(AMOUNT_RESERVED_FOR_GAS_USDC) // keep 0.1 USDC in user's wallet for gas
.toString();
if (amount > 0) {
const amount = Long.fromString(amountAfterDust || '0');
if (amount.greaterThan(Long.ZERO)) {
const subaccountClient = new SubaccountClient(localDydxWallet, 0);
await depositToSubaccount({ amount, subaccountClient });
}
@@ -220,7 +225,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
}, [usdcCoinBalance]);
const deposit = useCallback(
async (amount: number) => {
async (amount: Long) => {
if (!subaccountClient) {
return;
}
-2
View File
@@ -9,13 +9,11 @@ export const useTokenConfigs = (): {
denom: string;
name: string;
decimals: number;
gasDenom?: string;
},
[DydxChainAsset.CHAINTOKEN]: {
denom: string;
name: string;
decimals: number;
gasDenom?: string;
},
};
usdcDenom: string;