Skip to content

Commit

Permalink
Fix comment and merge branch master to resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Minh Đức Đào authored and Minh Đức Đào committed Nov 7, 2024
2 parents 26d04db + 918ac8c commit c081f80
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
11 changes: 3 additions & 8 deletions .github/markets/pr_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Each json file under the [configs](../../configs) folder correspond to their res
|`perp_pools` |`PerpPoolConfig` |false |Object that contains the configs for Perp Pools |
|`wswth_contract` |`string` |false |wSWTH ERC-20 contract. |
|`market_banners` |`MarketBanner[]` |true |market banner configs. |
| `native_token_contracts_map` | `object` | false | Map of token denoms to their respective contract addresses on the native chain. | |
| `native_depositor_contract` | `string` | false | Contract address supporting native token deposits

## Maintenance Data Structure
|Field |Type |Required |Description |Notes |
Expand Down Expand Up @@ -95,11 +97,4 @@ Each json file under the [configs](../../configs) folder correspond to their res
|`show_from` |`string` |false |The date and time when the market banner is scheduled to begin displaying. |If not provided, the banner will be shown immediately.<br /><br /> This field **MUST** follow the valid ISO 8601 format <br /> e.g. *2024-01-23T09:00+00:00* (23 Jan 2024, 9am UTC) |
|`show_until` |`string` |false |The date and time when the market banner is scheduled to stop displaying. |If not provided, the banner will continue to display indefinitely.<br /><br /> This field **MUST** follow the valid ISO 8601 format <br /> e.g. *2024-01-23T09:00+00:00* (23 Jan 2024, 9am UTC) |
|`content` |`string` |true |The content shown on the market banner. |
|`hideable` |`boolean` |false |Indicates if user can hide the banner by clicking on the close button |If set to `false`, the close button will not be rendered on the banner, and user will not be able to dismiss the banner. |

## Native Contract Info

| Field | Type | Required | Description | Notes |
| ---------------------------- | ------------------------ | -------- | -------------------------------------------------------------------------------------------------------------------- | ----- |
| `native_token_contracts_map` | `NativeTokenContractMap` | false | Here is a list of denoms that support deposits with native tokens, including the corresponding native token address. | |
| `native_depositor_contract` | `string` | false | Contract address supporting native token deposits | |
|`hideable` |`boolean` |false |Indicates if user can hide the banner by clicking on the close button |If set to `false`, the close button will not be rendered on the banner, and user will not be able to dismiss the banner. |
12 changes: 9 additions & 3 deletions configs/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,9 @@
"perp_pool_id": "10",
"show_until": "2025-12-30T08:00+00:00",
"title": "New Markets Added",
"added_markets": "HYPE (Hyperliquid) pre-launch perp will be added to this pool on 4 Nov 08:00 AM UTC. Learn about pre-launch perps here: https://guide.dem.exchange/trade/futures/market-specifications/pre-launch-perpetuals.",
"added_markets": "HYPE (Hyperliquid) pre-launch perp will be added to this pool on 4 Nov 08:00 AM UTC. $HYPE token assumes a total supply of 1 billion tokens. [Learn more.](https://guide.dem.exchange/trade/futures/market-specifications/pre-launch-perpetuals)",
"action_trigger_date": "2024-11-04T08:00+00:00",
"past_tense_text": "HYPE (Hyperliquid) pre-launch perp was added to this pool on 4 Nov 08:00 AM UTC. Learn about pre-launch perps here: https://guide.dem.exchange/trade/futures/market-specifications/pre-launch-perpetuals."
"past_tense_text": "HYPE (Hyperliquid) pre-launch perp was added to this pool on 4 Nov 08:00 AM UTC. $HYPE token assumes a total supply of 1 billion tokens. [Learn more.](https://guide.dem.exchange/trade/futures/market-specifications/pre-launch-perpetuals)"
},
{
"perp_pool_id": "7",
Expand All @@ -417,5 +417,11 @@
"brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000"
},
"native_depositor_contract": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65",
"market_banners": []
"market_banners": [
{
"market_id": "cmkt/246",
"content": "This is a pre-launch perp for Hyperliquid's HYPE and assumes a total supply of 1 billion. [Learn more.](https://guide.dem.exchange/trade/futures/market-specifications/pre-launch-perpetuals)",
"show_from": "2024-11-04T09:00+00:00"
}
]
}

0 comments on commit c081f80

Please sign in to comment.