From d0ea3bf6d4f8d0bfc9cb9570f31a0fa4e6bb8099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20=C4=90=E1=BB=A9c=20=C4=90=C3=A0o?= Date: Mon, 4 Nov 2024 11:03:47 +0700 Subject: [PATCH 1/6] Config support native token deposit --- configs/mainnet.json | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/configs/mainnet.json b/configs/mainnet.json index 078444a..fcf9de7 100644 --- a/configs/mainnet.json +++ b/configs/mainnet.json @@ -359,7 +359,15 @@ "perp_pools": { "incentives": { "proxy": "0x7b1C7216C117cC62D875e3086518B238392cf04d", - "distributors": ["0x93903Ad6599271b2c23b5e5065da835dee2105b7", "0xD3997de7D72943d62a34f1089E52027C86b4764F", "0x06F2d494531eDCA39aA51B1C3EfB51dE9F1fA17d", "0xF1bE2Db4A62e3AeDEd389224B15b370E27e1e9A1", "0x6a09bC65Ef703466187f59083239399e1948fEbB", "0x8c6A1123744a78bf48B7b58Ae0ce02F364c30F8e", "0x4Ea7639a37d229914F64e832bF5038Bc634E51Fd"] + "distributors": [ + "0x93903Ad6599271b2c23b5e5065da835dee2105b7", + "0xD3997de7D72943d62a34f1089E52027C86b4764F", + "0x06F2d494531eDCA39aA51B1C3EfB51dE9F1fA17d", + "0xF1bE2Db4A62e3AeDEd389224B15b370E27e1e9A1", + "0x6a09bC65Ef703466187f59083239399e1948fEbB", + "0x8c6A1123744a78bf48B7b58Ae0ce02F364c30F8e", + "0x4Ea7639a37d229914F64e832bF5038Bc634E51Fd" + ] }, "banners": [ { @@ -386,5 +394,30 @@ } ] }, - "wswth_contract": "0x0e59f6Cf81B5Fae9F7a5912062Fe53909e7221C2" + "wswth_contract": "0x0e59f6Cf81B5Fae9F7a5912062Fe53909e7221C2", + + "support_native_token_deposit": { + "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": [ + { + "name": "ETH", + "type": "native", + "tokenAddress": "0x0000000000000000000000000000000000000000" + }, + { + "name": "WETH", + "type": "wrapped" + } + ], + "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": [ + { + "name": "MNT", + "type": "native", + "tokenAddress": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000" + }, + { + "name": "WMNT", + "type": "wrapped" + } + ] + } } From 015d818d4ddd8cd77f038a7042d95a4ff685b05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20=C4=90=E1=BB=A9c=20=C4=90=C3=A0o?= Date: Mon, 4 Nov 2024 12:49:49 +0700 Subject: [PATCH 2/6] Update config --- configs/mainnet.json | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/configs/mainnet.json b/configs/mainnet.json index fcf9de7..882e768 100644 --- a/configs/mainnet.json +++ b/configs/mainnet.json @@ -397,27 +397,15 @@ "wswth_contract": "0x0e59f6Cf81B5Fae9F7a5912062Fe53909e7221C2", "support_native_token_deposit": { - "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": [ - { - "name": "ETH", - "type": "native", - "tokenAddress": "0x0000000000000000000000000000000000000000" - }, - { - "name": "WETH", - "type": "wrapped" - } - ], - "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": [ - { - "name": "MNT", - "type": "native", - "tokenAddress": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000" - }, - { - "name": "WMNT", - "type": "wrapped" - } - ] - } + "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": { + "name": "ETH", + "tokenAddress": "0x0000000000000000000000000000000000000000" + }, + "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": { + "name": "MNT", + "tokenAddress": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000" + } + }, + + "native_depositor_contract": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65" } From f1ae1c9e0c5bb4f754a7502c4f4d664ec8dc83a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20=C4=90=E1=BB=A9c=20=C4=90=C3=A0o?= Date: Mon, 4 Nov 2024 16:18:50 +0700 Subject: [PATCH 3/6] Update typo in config --- configs/mainnet.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/mainnet.json b/configs/mainnet.json index 882e768..617b455 100644 --- a/configs/mainnet.json +++ b/configs/mainnet.json @@ -395,17 +395,13 @@ ] }, "wswth_contract": "0x0e59f6Cf81B5Fae9F7a5912062Fe53909e7221C2", - - "support_native_token_deposit": { + "native_token_contracts_map": { "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": { - "name": "ETH", "tokenAddress": "0x0000000000000000000000000000000000000000" }, "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": { - "name": "MNT", "tokenAddress": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000" } }, - "native_depositor_contract": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65" } From 26d04db0801ec726434aa801967f2307dea0f059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20=C4=90=E1=BB=A9c=20=C4=90=C3=A0o?= Date: Mon, 4 Nov 2024 17:09:54 +0700 Subject: [PATCH 4/6] Update table and schema --- .github/markets/pr_template.md | 9 ++++++++- config.schema.json | 13 +++++++++++++ configs/mainnet.json | 8 ++------ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/markets/pr_template.md b/.github/markets/pr_template.md index d7a8a3a..0cafa4a 100644 --- a/.github/markets/pr_template.md +++ b/.github/markets/pr_template.md @@ -95,4 +95,11 @@ 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.

This field **MUST** follow the valid ISO 8601 format
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.

This field **MUST** follow the valid ISO 8601 format
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. | \ No newline at end of file +|`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 | | \ No newline at end of file diff --git a/config.schema.json b/config.schema.json index eca36e9..37e1013 100644 --- a/config.schema.json +++ b/config.schema.json @@ -249,6 +249,19 @@ } } }, + "native_depositor_contract": { + "type": "string", + "description": "Contract address of the native depositor contract" + }, + "native_token_contracts_map": { + "type": "object", + "description": "Map of token denoms to their respective contract addresses on the native chain", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, "$defs": { "prelaunch_market": { "type": "string", diff --git a/configs/mainnet.json b/configs/mainnet.json index e8348de..5ad5af1 100644 --- a/configs/mainnet.json +++ b/configs/mainnet.json @@ -413,12 +413,8 @@ }, "wswth_contract": "0x0e59f6Cf81B5Fae9F7a5912062Fe53909e7221C2", "native_token_contracts_map": { - "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": { - "tokenAddress": "0x0000000000000000000000000000000000000000" - }, - "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": { - "tokenAddress": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000" - } + "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": "0x0000000000000000000000000000000000000000", + "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000" }, "native_depositor_contract": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65", "market_banners": [] From 89c4dc16053d1b17aa1b830ecbe5c6377730a6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20=C4=90=E1=BB=A9c=20=C4=90=C3=A0o?= Date: Thu, 7 Nov 2024 17:12:30 +0700 Subject: [PATCH 5/6] Update native depositor address config --- .github/markets/pr_template.md | 2 +- config.schema.json | 42 ++++++++++++---------------------- configs/mainnet.json | 5 +++- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/.github/markets/pr_template.md b/.github/markets/pr_template.md index 53ba7be..4eac2b9 100644 --- a/.github/markets/pr_template.md +++ b/.github/markets/pr_template.md @@ -24,7 +24,7 @@ Each json file under the [configs](../../configs) folder correspond to their res |`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 +| `native_depositor_contracts_map` | `object` | false | Map of token denoms to their respective native depositor contract addresses ## Maintenance Data Structure |Field |Type |Required |Description |Notes | diff --git a/config.schema.json b/config.schema.json index 37e1013..ae39e47 100644 --- a/config.schema.json +++ b/config.schema.json @@ -17,11 +17,7 @@ "properties": { "network": { "type": "string", - "enum": [ - "mainnet", - "testnet", - "devnet" - ] + "enum": ["mainnet", "testnet", "devnet"] }, "prelaunch_markets": { "type": "array", @@ -139,11 +135,7 @@ "description": "Ongoing survey configs for typeform survey widget", "items": { "type": "object", - "required": [ - "surveyLink", - "endTime", - "pages" - ], + "required": ["surveyLink", "endTime", "pages"], "properties": { "message": { "type": "string" @@ -226,10 +218,7 @@ "description": "List of banner information to be displayed over the TradingView chart for the required market", "items": { "type": "object", - "required": [ - "market_id", - "content" - ], + "required": ["market_id", "content"], "properties": { "market_id": { "$ref": "#/$defs/market_id" @@ -249,9 +238,14 @@ } } }, - "native_depositor_contract": { - "type": "string", - "description": "Contract address of the native depositor contract" + "native_depositor_contracts_map": { + "type": "object", + "description": "Map of token denoms to their respective native depositor contract", + "patternProperties": { + ".*": { + "type": "string" + } + } }, "native_token_contracts_map": { "type": "object", @@ -320,7 +314,7 @@ "type": "string", "description": "The message shown on the banner describing markets being added" }, - "subtext": { + "subtext": { "type": "string", "description": "The subtext shown on the banner" }, @@ -366,10 +360,7 @@ "additional_ibc_token_info": { "type": "object", "description": "Information for token that (1) is not added on Carbon blockchain or (2) requires packet forwarding.", - "required": [ - "baseDenom", - "chainRoutes" - ], + "required": ["baseDenom", "chainRoutes"], "properties": { "baseDenom": { "type": "string", @@ -409,10 +400,7 @@ "description": "List of perp pool banners", "items": { "type": "object", - "required": [ - "perp_pool_id", - "title" - ], + "required": ["perp_pool_id", "title"], "properties": { "perp_pool_id": { "$ref": "#/$defs/perp_pool_id" @@ -442,4 +430,4 @@ } } } -} \ No newline at end of file +} diff --git a/configs/mainnet.json b/configs/mainnet.json index 6f619ab..1885035 100644 --- a/configs/mainnet.json +++ b/configs/mainnet.json @@ -416,7 +416,10 @@ "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": "0x0000000000000000000000000000000000000000", "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000" }, - "native_depositor_contract": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65", + "native_depositor_contracts_map": { + "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65", + "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65" + }, "market_banners": [ { "market_id": "cmkt/246", From 3741a07c96c16be14aef759cef639a8276af0a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20=C4=90=E1=BB=A9c=20=C4=90=C3=A0o?= Date: Sun, 10 Nov 2024 17:45:53 +0700 Subject: [PATCH 6/6] update config and description --- .github/markets/pr_template.md | 2 +- config.schema.json | 2 +- configs/mainnet.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/markets/pr_template.md b/.github/markets/pr_template.md index 4eac2b9..7e6f62c 100644 --- a/.github/markets/pr_template.md +++ b/.github/markets/pr_template.md @@ -24,7 +24,7 @@ Each json file under the [configs](../../configs) folder correspond to their res |`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_contracts_map` | `object` | false | Map of token denoms to their respective native depositor contract addresses +| `native_depositor_contracts_map` | `object` | false | Map of axelar connection ids to their respective native depositor contract addresses ## Maintenance Data Structure |Field |Type |Required |Description |Notes | diff --git a/config.schema.json b/config.schema.json index ae39e47..a36020c 100644 --- a/config.schema.json +++ b/config.schema.json @@ -240,7 +240,7 @@ }, "native_depositor_contracts_map": { "type": "object", - "description": "Map of token denoms to their respective native depositor contract", + "description": "Map of axelar connection ids to their respective native depositor contract addresses", "patternProperties": { ".*": { "type": "string" diff --git a/configs/mainnet.json b/configs/mainnet.json index 1885035..5dafca4 100644 --- a/configs/mainnet.json +++ b/configs/mainnet.json @@ -417,8 +417,8 @@ "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000" }, "native_depositor_contracts_map": { - "brdg/6418666cedaf875fb344dbd90bea7c842300939872365b933f7ee8b6c1e825e8": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65", - "brdg/a02afc2c1edf77cc023eefa25fc036c184612faf9365cda9c1daa3b1675ebf8f": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65" + "3/base/0x4ab44c7e881ee37cb02bc0c98547a0bbfad9291b": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65", + "3/mantle/0x4ab44c7e881ee37cb02bc0c98547a0bbfad9291b": "0xd91a2AcbE1f9635277120fc200F73574f1Cdad65" }, "market_banners": [ {