Skip to content

Commit

Permalink
Merge branch 'master' into fix/add-group-quantity-for-market
Browse files Browse the repository at this point in the history
  • Loading branch information
sarah-thong committed Oct 30, 2024
2 parents 75d1145 + 31ff2f1 commit f976815
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 44 deletions.
76 changes: 41 additions & 35 deletions configs/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,33 @@
"usdc.1.6.e70e14"
],
"transfer_options": {
"Osmosis": 0,
"Noble": 1,
"Cosmos Hub": 2,
"Evmos": 3,
"Axelar": 4,
"Juno": 5,
"Stride": 6,
"Kujira": 7,
"Terra": 8,
"Comdex": 9,
"Stafihub": 10,
"Persistence Core": 11,
"Stargaze": 12,
"Canto": 13,
"Sommelier": 14,
"IRIS Hub": 15,
"Ethereum": 16,
"Arbitrum": 17,
"Polygon": 18,
"OKC": 19,
"Binance Smart Chain": 20,
"Carbon": 21,
"Neo": 22,
"Neo3": 23,
"Zilliqa": 24
"Mantle": 0,
"Base": 1,
"Osmosis": 2,
"Noble": 3,
"Cosmos Hub": 4,
"Evmos": 5,
"Axelar": 6,
"Juno": 7,
"Stride": 8,
"Kujira": 9,
"Terra": 10,
"Comdex": 11,
"Stafihub": 12,
"Persistence Core": 13,
"Stargaze": 14,
"Canto": 15,
"Sommelier": 16,
"IRIS Hub": 17,
"Ethereum": 18,
"Arbitrum": 19,
"Polygon": 20,
"OKC": 21,
"Binance Smart Chain": 22,
"Carbon": 23,
"Neo": 24,
"Neo3": 25,
"Zilliqa": 26
},
"network_fees": {
"swth": 0,
Expand Down Expand Up @@ -115,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 @@ -196,6 +200,8 @@
"cmkt/241": "#f06202",
"cmkt/242": "#1c1061",
"cmkt/243": "#f80cb4",
"cmkt/244": "#aaec0f",
"cmkt/245": "#59615e",
"Unused": "#7798E4"
},
"markets_override": {
Expand Down Expand Up @@ -372,20 +378,20 @@
},
"banners": [
{
"perp_pool_id": "9",
"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": "UNI (Uniswap) perp will be added to this pool on 17 Oct 08:00 AM UTC.",
"action_trigger_date": "2024-10-30T08:00+00:00",
"past_tense_text": "UNI (Uniswap) perp was added to this pool on 17 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 @@ -34,10 +34,10 @@
},
"perp_pools": {
"incentives": {
"proxy": "0x6245ED6419B5cAcfc94364c4C23B93edFCC67bBE",
"distributors": ["0x6BEb4e464C4e1dE744704353aA4761D93c90c7fa"]
"proxy": "0x74261efC64caE332E912F5bc645e4A9dcaC5EFaa",
"distributors": ["0x0c1f4B22A2B86971ee8581684bBC500b2E824559"]
},
"banners": []
},
"wswth_contract": "0x325f60362040B40DC2f3C5652095Ed262cf581F7"
"wswth_contract": "0xb4A23b09eBBA7dbA01A7bF95EFd41b3600fF22F9"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@cosmjs/tendermint-rpc": "~0.31.3",
"@types/node": "^18.11.9",
"@types/node-fetch": "^2.6.2",
"carbon-js-sdk": "^0.11.20",
"carbon-js-sdk": "^0.11.23",
"long": "^4.0.0",
"node-fetch": "^2.6.1",
"pajv": "^1.2.0",
Expand Down
4 changes: 3 additions & 1 deletion scripts/check_configs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,9 @@ async function main() {
const transferOptionsArr = Object.keys(jsonData.transfer_options)
const ibcBridgeNames = sdk.token.getIbcBlockchainNames();
if (!ibcBridgeNames.includes("Carbon")) ibcBridgeNames.push("Carbon");
const validTransferOptionChains = sdk.token.getPolynetworkBlockchainNames().concat(ibcBridgeNames);
const validTransferOptionChains = sdk.token.getPolynetworkBlockchainNames()
.concat(sdk.token.getAxelarBlockchainNames())
.concat(ibcBridgeNames);

const hasInvalidChains = checkValidEntries(transferOptionsArr, validTransferOptionChains);
if (hasInvalidChains.status && hasInvalidChains.entry) {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2251,10 +2251,10 @@ callsite@1.0.0:
resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
integrity sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==

carbon-js-sdk@^0.11.20:
version "0.11.20"
resolved "https://registry.yarnpkg.com/carbon-js-sdk/-/carbon-js-sdk-0.11.20.tgz#ba9cdaa6fee0b8590d481931de0efa96f699aef3"
integrity sha512-XQph2nhqFHLe5TLLhNKSXpH77NqIlN6oqC2JQOSHD0l4dcrSTC1CyfdBrrTTgGfCA7tns75KxL92d7B2eISKlA==
carbon-js-sdk@^0.11.23:
version "0.11.23"
resolved "https://registry.yarnpkg.com/carbon-js-sdk/-/carbon-js-sdk-0.11.23.tgz#8c35301bbc958df5b08ac1065d170dd34fe0e9c1"
integrity sha512-ngAB7JLb3U+KLjFy+AYiL3tXKRGZrtWGpoFfejkvJoIBko1i25KVIH16G+9HvUqdYlUVU02BgTm80jPKxfX72w==
dependencies:
"@cityofzion/neon-api" "^4.9.0"
"@cityofzion/neon-core" "^4.9.0"
Expand Down

0 comments on commit f976815

Please sign in to comment.