fix conflicts

Meria-finance · Jun 10, 2024 · 1b6c1aa · 1b6c1aa
2 parents 7f6e163 + bb84f2f
commit 1b6c1aa
Show file tree

Hide file tree

Showing 65 changed files with 540 additions and 26 deletions.
diff --git a/.github/workflows/cloudinary.yaml b/.github/workflows/cloudinary.yaml
@@ -1,6 +1,9 @@
 name: Deploy to Cloudinary
 
 on:
+  merge_group:
+    branches:
+      - main
   push:
     branches:
       - main

diff --git a/.github/workflows/prettier.yaml b/.github/workflows/prettier.yaml
@@ -0,0 +1,16 @@
+name: Lint Check
+on: [push, pull_request, merge_group]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Lint Check
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 18
+      - name: Install prettier
+        run: npm install -g prettier
+      - name: Check linting
+        run: prettier --check src/
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -1,5 +1,5 @@
 name: Tests
-on: [push, pull_request]
+on: [push, pull_request, merge_group]
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # 🐻@berachain/default-lists🐻
 
 [![Tests](https://github.com/Uniswap/token-lists/workflows/Tests/badge.svg)](https://github.com/Berachain/default-token-list/actions?query=workflow%3ATests)
+[![Lint Check](https://github.com/berachain/default-lists/actions/workflows/prettier.yaml/badge.svg)](https://github.com/berachain/default-lists/actions/workflows/prettier.yaml)
 
 This GitHub repo contains default lists for configuring Berachain interfaces.
 
@@ -19,7 +20,11 @@ To request that we add a gauge to the list,
 To request that we add a validator to the list,
 [file an issue](https://github.com/berachain/default-lists/issues/new?assignees=&labels=validator+request&projects=&template=validator-request.md&title=Add+%7BVALIDATOR_NAME%7D).
 
-ℹ️ AFTER OPENING AN ISSUE, CREATE A BRANCH AND ADD YOUR CHANGES. WHEN READY, CREATE A PR AND LINK YOUR ISSUE IN THE PR 🚀
+## Contributing
+
+- ℹ️ PLEASE ADD YOUR NEW ITEM TO THE TOP OF THE LIST TO AVOID JSON TRAILING COMMA ISSUE 🚀
+- ℹ️ AFTER OPENING AN ISSUE, CREATE A BRANCH AND ADD YOUR CHANGES. WHEN READY, CREATE A PR AND LINK YOUR ISSUE IN THE PR 🚀
+- ℹ️ PLEASE RUN `pnpm lint`BEFORE YOU PUSH 🚀
 
 ### Disclaimer
 

diff --git a/package.json b/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "test": "mocha",
     "build": "rimraf build && mkdir -p build",
-    "prepublishOnly": "npm test && npm run build"
+    "prepublishOnly": "npm test && npm run build",
+    "lint": "prettier --write src/"
   },
   "files": [
     "build/berachain-default.tokenlist.json"
@@ -34,5 +35,8 @@
     "chai": "^4.2.0",
     "mocha": "^8.0.1",
     "rimraf": "^3.0.2"
+  },
+  "dependencies": {
+    "prettier": "^3.3.1"
   }
 }
diff --git a/src/assets/01node.png b/src/assets/01node.png
diff --git a/src/assets/BCW.png b/src/assets/BCW.png
diff --git a/src/assets/Brightlystake-logo.png b/src/assets/Brightlystake-logo.png
diff --git a/src/assets/Everstake.png b/src/assets/Everstake.png
diff --git a/src/assets/KingSuper.png b/src/assets/KingSuper.png
diff --git a/src/assets/L0vd.svg b/src/assets/L0vd.svg
diff --git a/src/assets/NodeStake.png b/src/assets/NodeStake.png
diff --git a/src/assets/OriginStake_Logo_1.png b/src/assets/OriginStake_Logo_1.png
diff --git a/src/assets/Provalidator.jpg b/src/assets/Provalidator.jpg
diff --git a/src/assets/StakeLab.png b/src/assets/StakeLab.png
diff --git a/src/assets/Synergy_Nodes_Logo.png b/src/assets/Synergy_Nodes_Logo.png
diff --git a/src/assets/ahoney.png b/src/assets/ahoney.png
diff --git a/src/assets/allnodes.png b/src/assets/allnodes.png
diff --git a/src/assets/b-harvest.png b/src/assets/b-harvest.png
diff --git a/src/assets/beralandlogo.png b/src/assets/beralandlogo.png
diff --git a/src/assets/bhoneyg.png b/src/assets/bhoneyg.png
diff --git a/src/assets/blockhunters.png b/src/assets/blockhunters.png
diff --git a/src/assets/blrd.gif b/src/assets/blrd.gif
diff --git a/src/assets/cosmostation.png b/src/assets/cosmostation.png
diff --git a/src/assets/daic_cng.png b/src/assets/daic_cng.png
diff --git a/src/assets/despread.png b/src/assets/despread.png
diff --git a/src/assets/enigma.png b/src/assets/enigma.png
diff --git a/src/assets/flipside.png b/src/assets/flipside.png
diff --git a/src/assets/genznodes.png b/src/assets/genznodes.png
diff --git a/src/assets/honeybera.png b/src/assets/honeybera.png
diff --git a/src/assets/imperator.png b/src/assets/imperator.png
diff --git a/src/assets/informal-systems.png b/src/assets/informal-systems.png
diff --git a/src/assets/jetking.png b/src/assets/jetking.png
diff --git a/src/assets/kiln.png b/src/assets/kiln.png
diff --git a/src/assets/kingnodes.jpg b/src/assets/kingnodes.jpg
diff --git a/src/assets/kintsugi.png b/src/assets/kintsugi.png
diff --git a/src/assets/kudasaijp.png b/src/assets/kudasaijp.png
diff --git a/src/assets/kysenpool.png b/src/assets/kysenpool.png
diff --git a/src/assets/laminated.png b/src/assets/laminated.png
diff --git a/src/assets/lavenderfive.png b/src/assets/lavenderfive.png
diff --git a/src/assets/nocturnal.jpg b/src/assets/nocturnal.jpg
diff --git a/src/assets/node101.png b/src/assets/node101.png
diff --git a/src/assets/nodeinfra.png b/src/assets/nodeinfra.png
diff --git a/src/assets/nodemeister.png b/src/assets/nodemeister.png
diff --git a/src/assets/noders.png b/src/assets/noders.png
diff --git a/src/assets/nodesguru.png b/src/assets/nodesguru.png
diff --git a/src/assets/piertwo.png b/src/assets/piertwo.png
diff --git a/src/assets/polkachu.png b/src/assets/polkachu.png
diff --git a/src/assets/quantnode.png b/src/assets/quantnode.png
diff --git a/src/assets/republic-crypto.png b/src/assets/republic-crypto.png
diff --git a/src/assets/restake.jpg b/src/assets/restake.jpg
diff --git a/src/assets/rhino.png b/src/assets/rhino.png
diff --git a/src/assets/senseinode.png b/src/assets/senseinode.png
diff --git a/src/assets/shinlabs.png b/src/assets/shinlabs.png
diff --git a/src/assets/stakecito_logo.png b/src/assets/stakecito_logo.png
diff --git a/src/assets/staketab.png b/src/assets/staketab.png
diff --git a/src/assets/stakingcabin.png b/src/assets/stakingcabin.png
diff --git a/src/assets/verse2.png b/src/assets/verse2.png
diff --git a/src/assets/whispernode.png b/src/assets/whispernode.png
diff --git a/src/gauges/bartio/defaultGaugeList.json b/src/gauges/bartio/defaultGaugeList.json
@@ -4,25 +4,25 @@
     {
       "name": "HONEY",
       "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/honey.png",
-      "url": "https://honey.app",
+      "url": "https://bartio.honey.berachain.com",
       "description": "A stablecoin that's integral to the Berachain ecosystem. Utilize HONEY for seamless trading, ensuring value consistency."
     },
     {
       "name": "BEX",
       "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/bex.png",
-      "url": "https://bex.app",
+      "url": "https://bartio.bex.berachain.com",
       "description": "Swap a variety of tokens effortlessly on our decentralized platform. Provide liquidity to pools and earn BGT rewards."
     },
     {
       "name": "BEND",
       "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/bend.png",
-      "url": "https://bend.app",
+      "url": "https://bartio.bend.berachain.com",
       "description": "Supply assets and unlock the potential to borrow HONEY. Earn BGT rewards while you supply and borrow."
     },
     {
       "name": "BERPS",
       "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/berps.png",
-      "url": "https://perp.app",
+      "url": "https://bartio.berps.berachain.com",
       "description": "Experience the thrill of high leverage trading, tailored for both novices and seasoned traders. With an impressive 100x leverage."
     }
   ],
@@ -31,26 +31,26 @@
       "receiptTokenAddress": "0x1339503343be5626B40Ee3Aee12a4DF50Aa4C0B9",
       "vaultAddress": "0x2E8410239bB4b099EE2d5683e3EF9d6f04E321CC",
       "name": "VDHONEY",
-      "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/honey.png",
+      "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/ahoney.png",
       "product": "BEND",
-      "url": "",
+      "url": "https://bartio.bend.berachain.com/dashboard",
       "support": false
     },
     {
       "receiptTokenAddress": "0x874545db2C8809baB99FD235D23Fe302e3a0A9Be",
       "vaultAddress": "0xc80d9250f76afd0a7beff61d5cce0198b6e2c708",
       "name": "BHONEY",
-      "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/bhoney.png",
+      "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/bhoneyg.png",
       "product": "BERPS",
-      "url": ""
+      "url": "https://bartio.berps.berachain.com/vault"
     },
     {
       "receiptTokenAddress": "0xd28d852cbcc68DCEC922f6d5C7a8185dBaa104B7",
       "vaultAddress": "0xad57d7d39a487c04a44d3522b910421888fb9c6d",
       "name": "HONEY-WBERA",
-      "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/wbera.png",
+      "logoURI": "https://res.cloudinary.com/duv0g402y/raw/upload/src/assets/honeybera.png",
       "product": "BEX",
-      "url": ""
+      "url": "https://bartio.bex.berachain.com/pool/0xd28d852cbcc68DCEC922f6d5C7a8185dBaa104B7"
     }
   ],
   "version": {

diff --git a/src/tokens/bartio/defaultTokenList.json b/src/tokens/bartio/defaultTokenList.json
@@ -30,7 +30,7 @@
     "deposit": {
       "name": "Deposit Token",
       "description": "Tokens that can be deposited in Bend"
-    }, 
+    },
     "rewardToken": {
       "name": "Reward Token",
       "description": "Tokens that are used for vault deposits to earn BGT rewards"
@@ -58,7 +58,7 @@
     },
     {
       "chainId": 80084,
-      "address": "0x5903ebb4012750FC020D9729ad310B4f5766bCB3",
+      "address": "0xbDa130737BDd9618301681329bF2e46A016ff9Ad",
       "symbol": "BGT",
       "name": "Bera Governance Token",
       "decimals": 18,
@@ -118,7 +118,8 @@
       "decimals": 18,
       "logoURI": "https://artio-static-asset-public.s3.ap-southeast-1.amazonaws.com/assets/honey.png",
       "tags": ["supply"]
-    },{
+    },
+    {
       "chainId": 80084,
       "address": "0x8Ce5C1c42CD58B7aE61512790e514a82d84375Ed",
       "symbol": "aWETH",
@@ -138,7 +139,7 @@
     },
     {
       "chainId": 80084,
-      "address": "0x917Bb6c98D5FE6177c78eA21E0dD94175e175Dca",
+      "address": "0x1306D3c36eC7E38dd2c128fBe3097C2C2449af64",
       "symbol": "bHONEY",
       "name": "Honey bToken",
       "decimals": 18,