Skip to content

Commit 0e6ae2b

Browse files
nrjsutharnrjsuthar
authored
Merge pull request #505 from BitGo/feature/COIN-1708
chore(wrw): config changes addition of avaxc coin
2 parents b2b0c19 + f4e3938 commit 0e6ae2b

File tree

8 files changed

+7301
-4989
lines changed

8 files changed

+7301
-4989
lines changed

‎package-lock.json‎

Lines changed: 7233 additions & 4940 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,49 @@
99
}
1010
},
1111
"dependencies": {
12-
"@bitgo/abstract-cosmos": "11.0.5",
13-
"@bitgo/abstract-utxo": "8.14.2",
14-
"@bitgo/sdk-api": "1.54.1",
15-
"@bitgo/sdk-coin-ada": "4.2.14",
16-
"@bitgo/sdk-coin-algo": "2.1.34",
17-
"@bitgo/sdk-coin-arbeth": "21.0.28",
18-
"@bitgo/sdk-coin-atom": "13.0.5",
19-
"@bitgo/sdk-coin-avaxc": "5.0.28",
20-
"@bitgo/sdk-coin-bch": "2.0.36",
21-
"@bitgo/sdk-coin-bcha": "2.1.20",
22-
"@bitgo/sdk-coin-bld": "3.0.5",
23-
"@bitgo/sdk-coin-bsc": "22.1.20",
24-
"@bitgo/sdk-coin-bsv": "2.0.36",
25-
"@bitgo/sdk-coin-btc": "2.2.7",
26-
"@bitgo/sdk-coin-btg": "2.0.36",
27-
"@bitgo/sdk-coin-coreum": "21.0.5",
28-
"@bitgo/sdk-coin-dash": "2.0.36",
29-
"@bitgo/sdk-coin-doge": "2.0.36",
30-
"@bitgo/sdk-coin-dot": "4.1.14",
31-
"@bitgo/sdk-coin-eos": "2.1.29",
32-
"@bitgo/sdk-coin-etc": "2.2.3",
33-
"@bitgo/sdk-coin-eth": "24.2.25",
34-
"@bitgo/sdk-coin-ethlike": "1.1.17",
35-
"@bitgo/sdk-coin-ethw": "20.0.36",
36-
"@bitgo/sdk-coin-hash": "3.0.5",
37-
"@bitgo/sdk-coin-hbar": "2.0.36",
38-
"@bitgo/sdk-coin-injective": "3.0.5",
39-
"@bitgo/sdk-coin-ltc": "3.0.36",
40-
"@bitgo/sdk-coin-near": "2.0.36",
41-
"@bitgo/sdk-coin-opeth": "18.1.21",
42-
"@bitgo/sdk-coin-osmo": "3.0.5",
43-
"@bitgo/sdk-coin-polygon": "21.0.5",
44-
"@bitgo/sdk-coin-sei": "3.0.5",
45-
"@bitgo/sdk-coin-sol": "4.5.2",
46-
"@bitgo/sdk-coin-sui": "5.7.0",
47-
"@bitgo/sdk-coin-tia": "3.0.5",
48-
"@bitgo/sdk-coin-trx": "2.0.36",
49-
"@bitgo/sdk-coin-xlm": "3.2.10",
50-
"@bitgo/sdk-coin-xrp": "2.1.17",
51-
"@bitgo/sdk-coin-zec": "2.0.36",
52-
"@bitgo/sdk-coin-zeta": "3.0.5",
53-
"@bitgo/sdk-opensslbytes": "^2.0.0",
54-
"@bitgo/utxo-lib": "10.3.0",
12+
"@bitgo/abstract-cosmos": "11.0.8",
13+
"@bitgo/abstract-utxo": "9.0.0",
14+
"@bitgo/sdk-api": "1.55.0",
15+
"@bitgo/sdk-coin-ada": "4.2.17",
16+
"@bitgo/sdk-coin-algo": "2.1.37",
17+
"@bitgo/sdk-coin-arbeth": "21.0.31",
18+
"@bitgo/sdk-coin-atom": "13.0.8",
19+
"@bitgo/sdk-coin-avaxc": "5.1.0",
20+
"@bitgo/sdk-coin-bch": "2.0.39",
21+
"@bitgo/sdk-coin-bcha": "2.1.23",
22+
"@bitgo/sdk-coin-bld": "3.0.8",
23+
"@bitgo/sdk-coin-bsc": "22.1.23",
24+
"@bitgo/sdk-coin-bsv": "2.0.39",
25+
"@bitgo/sdk-coin-btc": "2.3.0",
26+
"@bitgo/sdk-coin-btg": "2.0.39",
27+
"@bitgo/sdk-coin-coreum": "21.0.8",
28+
"@bitgo/sdk-coin-dash": "2.0.39",
29+
"@bitgo/sdk-coin-doge": "2.0.39",
30+
"@bitgo/sdk-coin-dot": "4.1.17",
31+
"@bitgo/sdk-coin-eos": "2.1.32",
32+
"@bitgo/sdk-coin-etc": "2.2.6",
33+
"@bitgo/sdk-coin-eth": "24.2.28",
34+
"@bitgo/sdk-coin-ethlike": "1.1.20",
35+
"@bitgo/sdk-coin-ethw": "20.0.39",
36+
"@bitgo/sdk-coin-hash": "3.0.8",
37+
"@bitgo/sdk-coin-hbar": "2.0.39",
38+
"@bitgo/sdk-coin-injective": "3.0.8",
39+
"@bitgo/sdk-coin-ltc": "3.0.39",
40+
"@bitgo/sdk-coin-near": "2.0.39",
41+
"@bitgo/sdk-coin-opeth": "18.1.24",
42+
"@bitgo/sdk-coin-osmo": "3.0.8",
43+
"@bitgo/sdk-coin-polygon": "21.0.8",
44+
"@bitgo/sdk-coin-sei": "3.0.8",
45+
"@bitgo/sdk-coin-sol": "4.5.5",
46+
"@bitgo/sdk-coin-sui": "5.7.2",
47+
"@bitgo/sdk-coin-tia": "3.0.8",
48+
"@bitgo/sdk-coin-trx": "2.0.39",
49+
"@bitgo/sdk-coin-xlm": "3.2.13",
50+
"@bitgo/sdk-coin-xrp": "2.1.20",
51+
"@bitgo/sdk-coin-zec": "2.0.39",
52+
"@bitgo/sdk-coin-zeta": "3.0.8",
53+
"@bitgo/sdk-opensslbytes": "2.0.0",
54+
"@bitgo/utxo-lib": "11.0.0",
5555
"@ethereumjs/common": "2.6.5",
5656
"@lottiefiles/react-lottie-player": "3.4.9",
5757
"clsx": "1.2.1",

‎src/containers/EvmCrossChainRecoveryWallet/ColdWalletForm.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const validationSchema = Yup.object({
1111
userKeyId: Yup.string(),
1212
walletContractAddress: Yup.string().required(),
1313
tokenContractAddress: Yup.string(),
14-
apiKey: Yup.string().required(),
14+
apiKey: Yup.string(),
1515
wrongChain: Yup.string().required(),
1616
intendedChain: Yup.string().required(),
1717
}).required();

‎src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryBaseForm.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import {
88
CoinMetadata,
99
allWalletMetas,
1010
} from '~/helpers/config';
11-
import { BitgoEnv, isBscChain, safeEnv } from '~/helpers';
12-
import { allCoinMetas } from '~/helpers/config';
11+
import { BitgoEnv, isAvaxcCoin, safeEnv } from '~/helpers';
1312

1413
export function EvmCrossChainRecoveryBaseForm({
1514
formik,
@@ -34,6 +33,7 @@ export function EvmCrossChainRecoveryBaseForm({
3433
{`${coin.Title}: ${coin.Description}`}
3534
</option>
3635
));
36+
3737
wrongChainCoinsChildren.unshift(
3838
<option disabled selected value="">
3939
{' '}
@@ -128,7 +128,7 @@ export function EvmCrossChainRecoveryBaseForm({
128128
Width="fill"
129129
/>
130130
</div>
131-
{!isCustodyWallet && (
131+
{!isCustodyWallet && !isAvaxcCoin(wrongChain) &&(
132132
<div className="tw-mb-4">
133133
<FormikTextfield
134134
HelperText="An Api-Key Token required for the explorer."

‎src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryWallet.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ interface CustodyWalletParams extends BaseParams {
4242
interface NonCustodyWalletParams extends BaseParams {
4343
walletContractAddress: string;
4444
bitgoFeeAddress: string;
45-
apiKey: string;
45+
apiKey?: string;
4646
}
4747

4848
interface HotWalletParams extends NonCustodyWalletParams {

‎src/containers/EvmCrossChainRecoveryWallet/HotWalletForm.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const validationSchema = Yup.object({
1111
walletContractAddress: Yup.string().required(),
1212
walletPassphrase: Yup.string().required(),
1313
tokenContractAddress: Yup.string(),
14-
apiKey: Yup.string().required(),
14+
apiKey: Yup.string(),
1515
wrongChain: Yup.string().required(),
1616
intendedChain: Yup.string().required(),
1717
}).required();

‎src/helpers/config.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,7 @@ export const evmCCRWrongChainCoins: Record<BitgoEnv, readonly CoinMetadata[]> =
820820
allCoinMetas.bsc,
821821
allCoinMetas.baseeth,
822822
allCoinMetas.arbeth,
823+
allCoinMetas.avaxc
823824
] as const,
824825
test: [
825826
allCoinMetas.tpolygon,
@@ -828,6 +829,7 @@ export const evmCCRWrongChainCoins: Record<BitgoEnv, readonly CoinMetadata[]> =
828829
allCoinMetas.tbsc,
829830
allCoinMetas.tbaseeth,
830831
allCoinMetas.tarbeth,
832+
allCoinMetas.tavaxc
831833
] as const,
832834
};
833835

@@ -897,6 +899,18 @@ export const evmCCRIntendedChainCoins: Record<string, readonly CoinMetadata[]> =
897899
allCoinMetas.tpolygon,
898900
allCoinMetas.topeth,
899901
] as const,
902+
avaxc: [
903+
allCoinMetas.eth,
904+
allCoinMetas.polygon,
905+
allCoinMetas.opeth,
906+
allCoinMetas.arbeth,
907+
] as const,
908+
tavaxc: [
909+
allCoinMetas.hteth,
910+
allCoinMetas.tpolygon,
911+
allCoinMetas.topeth,
912+
allCoinMetas.tarbeth,
913+
] as const,
900914
};
901915

902916
export const broadcastTransactionCoins: Record<

‎src/helpers/index.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,3 +274,8 @@ export function getEip1559Params(coin: string, maxFeePerGas: number, maxPriority
274274
maxPriorityFeePerGas: toWei(maxPriorityFeePerGas),
275275
}
276276
}
277+
278+
279+
export function isAvaxcCoin(chainName: string) {
280+
return (chainName === 'tavaxc' || chainName === 'avaxc') ;
281+
}

0 commit comments

Comments
 (0)