Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: announcement banner on deposit withdraw screens #297

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/markets/pr_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Each json file under the [configs](../../configs) folder correspond to their res
|`blacklisted_markets` |`string[]` |true |The array of market names that are blacklisted. A market can be blacklisted for a number of reasons, such as it being invalid/duplicate/wrongly-added/etc. |The market names listed here **MUST** match the market names listed under the Carbon [Markets API](https://api.carbon.network/carbon/market/v1/markets?pagination.limit=10000). The market names listed here **CANNOT** be under the `prelaunch_markets` field at the same time. |
|`blacklisted_pools` |`string[]` |true |The array of pool ids that are blacklisted. A pool can be blacklisted for a number of reasons, such as it being invalid/duplicate/wrongly-added/etc. |The pool ids listed here **MUST** match the pool ids listed under the Carbon [Liquidity Pool API](https://api.carbon.network/carbon/liquiditypool/v1/pools?pagination.limit=10000). |
|`blacklisted_tokens` |`string[]` |true |The array of token denoms that are blacklisted. A token can be blacklisted for a number of reasons, such as it being invalid/deprecated/etc. |The token denoms listed here **MUST** match the token denoms listed under the Carbon [Tokens API](https://api.carbon.network/carbon/coin/v1/tokens?pagination.limit=10000). |
| `transfer_disabled_tokens` |`TransferDisabledTokens` |true |Object that contains tokens for which deposits and withdrawals are temporarily disabled | |
sarah-thong marked this conversation as resolved.
Show resolved Hide resolved
| `token_name_override_map` |`object` |true |Object that contains token denoms and their respective token name overrides. This is used if we need to override the full token name of the tokens listed here. |The token denoms listed here **MUST** match the token denoms listed under the Carbon [Tokens API](https://api.carbon.network/carbon/coin/v1/tokens?pagination.limit=10000). |
|`transfer_options` |`object` |true |A collection of blockchain networks along with their associated priority numbers, used to establish their order in the transfer options list for deposit and withdrawal forms. |Blockchain network listed here **MUST** match the valid chainName of the bridges listed under BridgeAll RPC call.<br /><br /> To view the values of BridgeAll RPC call, simply run `yarn get-bridges [network]` on the command line. Sample for mainnet: `yarn get-bridges mainnet`|
|`network_fees` |`object` |true |List of token denoms along with their associated priority numbers, used to establish their default order in the network fees preference list. |Token denoms listed here **MUST** match the valid denoms listed under MinGasPriceAll RPC call.<br /><br /> To view the values of MinGasPriceAll RPC call, simply run `yarn get-min-gas-prices [network]` on the command line. Sample for mainnet: `yarn get-min-gas-prices mainnet`|
Expand Down
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ More metadata will be added in the future if required by the Demex frontend. Ple
"blacklisted_token_2",
"blacklisted_token_3"
],
"transfer_disabled_tokens": [
"transfer_disabled_token_1",
"transfer_disabled_token_2",
"transfer_disabled_token_3"
],
"token_name_override_map": {
"token_1": "token_name_override_1",
"token_2": "token_name_override_2"
Expand Down
22 changes: 0 additions & 22 deletions config.schema.json
kylehoang92 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"blacklisted_markets",
"blacklisted_pools",
"blacklisted_tokens",
"transfer_disabled_tokens",
"token_name_override_map",
"transfer_options",
"network_fees",
Expand Down Expand Up @@ -53,27 +52,6 @@
"$ref": "#/$defs/blacklisted_token"
}
},
"transfer_disabled_tokens": {
"type": "object",
"description": "Object containing tokens for which deposits and withdrawals have been temporarily disabled",
"required": ["deposit", "withdraw"],
"properties": {
"deposit": {
"type": "array",
"description": "List of tokens for which deposits have been temporarily disabled",
"items": {
"type": "string"
}
},
"withdraw": {
"type": "array",
"description": "List of tokens for which withdrawals have been temporarily disabled",
"items": {
"type": "string"
}
}
}
},
"token_name_override_map": {
"type": "object",
"description": "Object that contains token denoms and their respective token name overrides.",
Expand Down
4 changes: 0 additions & 4 deletions configs/devnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
],
"blacklisted_pools": [],
"blacklisted_tokens": [],
"transfer_disabled_tokens": {
"deposit": [],
"withdraw": []
},
"token_name_override_map": {},
"transfer_options": {},
"network_fees": {
Expand Down
26 changes: 0 additions & 26 deletions configs/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,6 @@
"usdc.1.6.e70e14",
"bit.1.2.9d68c4"
],
"transfer_disabled_tokens": {
"deposit": [
"nex.1.17.59c1ba",
"gmx.1.19.70275d",
"wbnb.1.6.ad598c",
"blur.1.2.0c0069",
"brdg/0b02ac3efc9df2e80d00f141133c180cdaee0122f92d3e2e310f704e82425a18",
"brdg/1768794901f8a19c2ec795a5402653cef6cbfe6b3ec6398d39fc37de963cb667",
"brdg/a8bbd91ae3dda9de2e50926a0d93be4d0d5cea34f3080014e5c0c0db6eaf61a4",
"bnb.1.6.773edb",
"zbnb.1.18.c406be",
"usdc.1.17.851a3a"
],
"withdraw": [
"nex.1.17.59c1ba",
"gmx.1.19.70275d",
"wbnb.1.6.ad598c",
"blur.1.2.0c0069",
"brdg/0b02ac3efc9df2e80d00f141133c180cdaee0122f92d3e2e310f704e82425a18",
"brdg/1768794901f8a19c2ec795a5402653cef6cbfe6b3ec6398d39fc37de963cb667",
"brdg/a8bbd91ae3dda9de2e50926a0d93be4d0d5cea34f3080014e5c0c0db6eaf61a4",
"bnb.1.6.773edb",
"zbnb.1.18.c406be",
"usdc.1.17.851a3a"
]
},
"token_name_override_map": {
"brdg/1299d2e94c483e72f64100088886b8a5b7c13595047e53e032c9938d07a98c20": "Ether (Arbitrum)",
"brdg/e3877e2c8ed05e404e04417747e2f430285c11dc839663b943b39ff7cbb56377": "Ether (Ethereum)"
Expand Down
4 changes: 0 additions & 4 deletions configs/testnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
],
"blacklisted_pools": [],
"blacklisted_tokens": [],
"transfer_disabled_tokens": {
"deposit": [],
"withdraw": []
},
"token_name_override_map": {},
"transfer_options": {},
"network_fees": {
Expand Down
38 changes: 0 additions & 38 deletions scripts/check_configs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ interface ConfigJSON {
blacklisted_markets: string[];
blacklisted_pools: string[];
blacklisted_tokens: string[];
transfer_disabled_tokens: TransferDisabledTokensObj;
token_name_override_map: TokenNameOverrideMap;
transfer_options: {
[chainKey: string]: number;
Expand Down Expand Up @@ -250,39 +249,6 @@ function checkBlacklistedMarkets(marketData: string[], blacklistedMarkets: strin
};
}

function isValidTransferDisabledTokens(transferDisabledTokens: TransferDisabledTokensObj, denoms: string[], network: CarbonSDK.Network): boolean {
const dupDepositTknsOutcome = checkDuplicateEntries(transferDisabledTokens.deposit);
const dupWithdrawTknsOutcome = checkDuplicateEntries(transferDisabledTokens.withdraw);

if (dupDepositTknsOutcome.status || dupWithdrawTknsOutcome.status) {
if (isErrorOutcome(dupDepositTknsOutcome)) {
const duplicateDepositTokensStr = joinEntriesIntoStr(dupDepositTknsOutcome.entry!);
console.error(`[ERROR] transfer_disabled_tokens.deposit of ${network}.json has the following duplicate token denoms: ${duplicateDepositTokensStr}. Please make sure to input each denom only once.`);
}
if (isErrorOutcome(dupWithdrawTknsOutcome)) {
const duplicateWithdrawTokensStr = joinEntriesIntoStr(dupWithdrawTknsOutcome.entry!);
console.error(`[ERROR] transfer_disabled_tokens.withdraw of ${network}.json has the following duplicate token denoms: ${duplicateWithdrawTokensStr}. Please make sure to input each denom only once.`);
}
return false;
}

const validDepositTknsOutcome = checkValidEntries(transferDisabledTokens.deposit, denoms);
const validWithdrawTknsOutcome = checkValidEntries(transferDisabledTokens.withdraw, denoms);
if (validDepositTknsOutcome.status || dupWithdrawTknsOutcome.status) {
if (isErrorOutcome(validDepositTknsOutcome)) {
const invalidDepositTokensStr = joinEntriesIntoStr(validDepositTknsOutcome.entry!);
console.error(`[ERROR] transfer_disabled_tokens.deposit of ${network}.json has the following invalid token denoms: ${invalidDepositTokensStr}. Please make sure to input only valid token denoms.`);
}
if (isErrorOutcome(validWithdrawTknsOutcome)) {
const invalidWithdrawTokensStr = joinEntriesIntoStr(validWithdrawTknsOutcome.entry!);
console.error(`[ERROR] transfer_disabled_tokens.withdraw of ${network}.json has the following invalid token denoms: ${invalidWithdrawTokensStr}. Please make sure to input only valid token denoms.`);
}
return false;
}

return true;
}

function isValidTokenNameOverrideMap(tokenNameOverrideMap: TokenNameOverrideMap, denoms: string[], network: CarbonSDK.Network): boolean {
const denomKeysArr = Object.keys(tokenNameOverrideMap);
const invalidDenomsOutcome = checkValidEntries(denomKeysArr, denoms);
Expand Down Expand Up @@ -707,10 +673,6 @@ async function main() {
bridgesArr = bridgesArr.concat(axelarBridges)
}
sarah-thong marked this conversation as resolved.
Show resolved Hide resolved

// transfer disabled tokens object check
const isTransferDisabledTokensValid = isValidTransferDisabledTokens(jsonData.transfer_disabled_tokens, tokens, network);
if (!isTransferDisabledTokensValid) outcomeMap[network] = false;

// token_name_override_map check
const isTokenNameOverrideMapValid = isValidTokenNameOverrideMap(jsonData.token_name_override_map, tokens, network);
if (!isTokenNameOverrideMapValid) outcomeMap[network] = false;
Expand Down
Loading