Skip to content

Commit

Permalink
Merge branch 'master' into andrewsoon-patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
sarah-thong committed Oct 30, 2024
2 parents 538a6c9 + 0c841db commit b02cbaa
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 13 deletions.
25 changes: 15 additions & 10 deletions configs/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@
"cmkt/212": "BYBIT:POPCATUSDT",
"cmkt/226": "BINANCE:SOLETH",
"cmkt/235": "BINANCE:NEIROETHUSDT.P",
"cmkt/237": "CRYPTO:KASUSD"
"cmkt/237": "CRYPTO:KASUSD",
"cmkt/244": "OKX:GRASSUSDT",
"cmkt/245": "BINANCE:GOATUSDT.P"
},
"perp_pool_pie_chart_colors": {
"cmkt/117": "#875DFF",
Expand Down Expand Up @@ -197,6 +199,9 @@
"cmkt/240": "#5046e4",
"cmkt/241": "#f06202",
"cmkt/242": "#1c1061",
"cmkt/243": "#f80cb4",
"cmkt/244": "#aaec0f",
"cmkt/245": "#59615e",
"Unused": "#7798E4"
},
"markets_override": {
Expand Down Expand Up @@ -360,20 +365,20 @@
},
"banners": [
{
"perp_pool_id": "4",
"show_until": "2024-10-30T08:00+00:00",
"perp_pool_id": "5",
"show_until": "2024-11-14T08:00+00:00",
"title": "New Markets Added",
"added_markets": "EIGEN (EIGEN) perp will be added to this pool on 8 Oct 08:00 AM UTC.",
"action_trigger_date": "2024-10-30T08:00+00:00",
"past_tense_text": "EIGEN (EIGEN) perp was added to this pool on 8 Oct 08:00 AM UTC."
"added_markets": "GRASS (Grass) perp will be added to this pool on 28 Oct 02:00 PM UTC.",
"action_trigger_date": "2024-10-28T08:00+00:00",
"past_tense_text": "GRASS (Grass) perp was added to this pool on 28 Oct 02:00 PM UTC."
},
{
"perp_pool_id": "8",
"show_until": "2024-09-30T08:00+00:00",
"show_until": "2024-11-14T08:00+00:00",
"title": "New Markets Added",
"added_markets": "POL (ex-matic) perp will be added to this pool on 19 Sep 08:00 AM UTC.",
"action_trigger_date": "2024-09-19T08:00+00:00",
"past_tense_text": "POL (ex-matic) perp was added to this pool on 19 Sep 08:00 AM UTC."
"added_markets": "GOAT (Goatseus Maximus) perp will be added to this pool on 29 Oct 08:00 AM UTC.",
"action_trigger_date": "2024-10-29T08:00+00:00",
"past_tense_text": "GOAT (Goatseus Maximus) perp was added to this pool on 29 Oct 08:00 AM UTC."
},
{
"perp_pool_id": "1",
Expand Down
6 changes: 3 additions & 3 deletions configs/testnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
},
"perp_pools": {
"incentives": {
"proxy": "0x6245ED6419B5cAcfc94364c4C23B93edFCC67bBE",
"distributors": ["0x6BEb4e464C4e1dE744704353aA4761D93c90c7fa"]
"proxy": "0x74261efC64caE332E912F5bc645e4A9dcaC5EFaa",
"distributors": ["0x0c1f4B22A2B86971ee8581684bBC500b2E824559"]
},
"banners": []
},
"wswth_contract": "0x325f60362040B40DC2f3C5652095Ed262cf581F7"
"wswth_contract": "0xb4A23b09eBBA7dbA01A7bF95EFd41b3600fF22F9"
}

0 comments on commit b02cbaa

Please sign in to comment.