Merge branch 'master' into RARE-4827f1-assets-1700248117350

multiversx · Nov 18, 2023 · 3cff7e5 · 3cff7e5
2 parents 9e424a4 + 6c7d7a9
commit 3cff7e5
Show file tree

Hide file tree

Showing 3,247 changed files with 134,594 additions and 244,096 deletions.
diff --git a/.github/snippet.sh b/.github/snippet.sh
@@ -3,7 +3,7 @@ DIR=""
 validate_filenames() {
   ADDED_FILES=$@
   for file in $ADDED_FILES; do
-    if [[ ${file} != *"/info.json"* && ${file} != *"/logo.png"* && ${file} != *"/logo.svg"* && ${file} != *"accounts/"* ]]; then
+    if [[ ${file} != *"/info.json"* && ${file} != *"/logo.png"* && ${file} != *"/logo.svg"* && ${file} != *"accounts/"* && ${file} != *".github/"* && ${file} != *"/ranks.json"* && ${file} != *"README.md"* ]]; then
       echo "Filename ${file} isn't expected!"
       exit 1
     fi
@@ -17,7 +17,8 @@ validate_file_size() {
   SIZE_LIMIT=100
   for file in $ADDED_FILES; do
     if [[ ${file} == *"/logo.svg"* || ${file} == *"/logo.svg"* ]]; then
-      file_size_kb=$(ls -s --block-size=K ${file} | grep -o -E '^[0-9]+')
+      file_size_blocks=$(ls -sh ${file} | grep -o -E '^[0-9]+')
+      file_size_kb=$(expr ${file_size_blocks} / 2)
 
       if [[ ${file_size_kb} -gt $SIZE_LIMIT ]]; then
         echo "File ${file} is too large! (${file_size_kb} KB)"
@@ -56,16 +57,20 @@ validate_svg_square() {
 
 validate_png_dimensions() {
   ADDED_FILES=$@
-  EXPECTED_PNG_DIMENSIONS="200x200"
+  EXPECTED_PNG_DIMENSIONS="200 x 200"
 
   for file in $ADDED_FILES; do
-    if [[ ${file} == *"/logo.png"* ]]; then 
-      png_dimensions=$(identify $file | grep -E -o "[0-9]+x[0-9]+" | head -1)
+    if [[ ${file} == *"/logo.png"* && ${file} == *"tokens/"* ]]; then 
+      png_dimensions=$(file $file | grep -E -o "[0-9]+ x [0-9]+" | head -1)
+
+      echo "PNG dimensions: $png_dimensions"
 
       if [[ $png_dimensions != $EXPECTED_PNG_DIMENSIONS ]]; then
         echo "Invalid dimensions for PNG! ( $png_dimensions )"
         exit 1
       fi
+
+      exit 0;
     fi
   done
 }
@@ -95,4 +100,4 @@ validate_token_existence() {
 
   echo "Invalid token $DIR"
   exit 1
-}
+}
diff --git a/.github/workflows/check-signature-rerun-on-comment.yml b/.github/workflows/check-signature-rerun-on-comment.yml
@@ -0,0 +1,19 @@
+name: Check signature rerun on comment
+
+permissions:
+  contents: read
+  actions: write
+
+on: [issue_comment]
+
+jobs:
+  check-signature:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: multiversx/mx-workflow-rerun-on-comment@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          REGEX: '[0-9a-fA-F]{64}$|^[0-9a-fA-F]{128}'
+          NAME: 'Check identities signature'
+
+
diff --git a/.github/workflows/check-signature.yml b/.github/workflows/check-signature.yml
@@ -0,0 +1,18 @@
+name: Check identities signature
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on: [pull_request]
+
+jobs:
+  check-signature:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: multiversx/mx-assets-checker@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ADMIN_ADDRESS: ${{ secrets.ADMIN_ADDRESS }}
+
+
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
@@ -1,5 +1,5 @@
 name: Cleanup
-    
+
 on:
   schedule:
     - cron: "0 0 * * *"
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout repository content
-        uses: actions/checkout@v2 
+        uses: actions/checkout@v2
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
@@ -23,17 +23,16 @@ jobs:
       - name: Execute cleanup script
         run: |
           python3 .github/cleanup.py
-      - name: setup git config
+      - name: Cleanup
         run: |
           git config user.name "GitHub Cleanup Bot"
           git config user.email "<>"
-      - name: check for changes
-        run: git status
-      - name: stage changed files
-        run: git add .
-      - name: commit changed files
-        run: git commit -m "Cleanup"
-      - name: fetch from master
-        run: git fetch origin master
-      - name: push code to master
-        run: git push origin HEAD:master
+
+          STATUS=$(git status)
+          if [ $STATUS != "" ]
+          then
+            git add .
+            git commit -m "Cleanup"
+            git fetch origin master
+            git push origin HEAD:master
+          fi
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -2,15 +2,19 @@ name: Validate filenames & JSON informations
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   validation:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - name: Install Dependencies
+        run: |
+          sudo apt install imagemagick-6.q16
+        shell: bash
       - name: Collecting file paths
         run: |
           echo "FILE_PATHS=$(find ./tokens -type f -name '*info.json' -printf '%p,'| sed 's/,$//' )" >> $GITHUB_ENV
@@ -19,10 +23,10 @@ jobs:
         name: Validate files
         uses: jitterbit/get-changed-files@v1
       - run: |
-          source .github/snippet.sh ; validate_file_size ${{ steps.files.outputs.added }}
-          source .github/snippet.sh ; validate_filenames ${{ steps.files.outputs.added }}
-          source .github/snippet.sh ; validate_png_dimensions ${{ steps.files.outputs.added }}
-          source .github/snippet.sh ; validate_svg_square ${{ steps.files.outputs.added }}
+          source .github/snippet.sh ; validate_file_size ${{ steps.files.outputs.added_modified }}
+          source .github/snippet.sh ; validate_filenames ${{ steps.files.outputs.added_modified }}
+          source .github/snippet.sh ; validate_png_dimensions ${{ steps.files.outputs.added_modified }}
+          source .github/snippet.sh ; validate_svg_square ${{ steps.files.outputs.added_modified }}
         shell: bash
       - name: Validate token existence
         run: |
@@ -33,4 +37,3 @@ jobs:
         env:
           INPUT_SCHEMA: ./schema.json
           INPUT_JSONS: ${{ env.FILE_PATHS }}
-
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # Introduction
 
-This repository holds a list of whitelisted tokens in the Elrond web tools. A whitelisted token can have website and socials URLs, a logo or a description, that will be displayed on Elrond products, such as the Elrond Explorer or the Web Wallet. The logos are also used in the Maiar App.
+This repository holds a list of whitelisted tokens in the MultiversX web tools. A whitelisted token can have website and socials URLs, a logo or a description, that will be displayed on MultiversX products, such as the MultiversX Explorer or the Web Wallet. The logos are also used in the xPortal App.
 
 # Custom ESDT logo & description
-Amplify your brand via the Elrond Network web tools & the Maiar App.
+Amplify your brand via the MultiversX Network web tools & the Mobile Wallet.
 
 Add a logo, description & socials for your ESDT token.
 
@@ -15,20 +15,20 @@ Here’s a prefilled template for the .json file to get you started:
 
 ```JSON
 {
-    "website": "https://www.elrondtoken.com",
-    "description": "The ERD token is the utility token of Elrond Token",
+    "website": "https://www.multiversxtoken.com",
+    "description": "The EGLD token is the utility token of MultiversX Token",
     "ledgerSignature": "1234",
     "social": {
-        "email": "erd-token@elrond.com",
-        "blog": "https://www.elrondtoken.com/ERD-token-blog",
-        "twitter": "https://twitter.com/ERD-token-twitter",
-        "whitepaper": "https://www.elrondtoken.com/ERD-token-whitepaper.pdf",
-        "coinmarketcap": "https://coinmarketcap.com/currencies/ERD-token",
-        "coingecko": "https://www.coingecko.com/en/coins/ERD-token"
+        "email": "egld-token@multiversx.com",
+        "blog": "https://www.multiversxtoken.com/EGLD-token-blog",
+        "twitter": "https://twitter.com/EGLD-token-twitter",
+        "whitepaper": "https://www.multiversxtoken.com/EGLD-token-whitepaper.pdf",
+        "coinmarketcap": "https://coinmarketcap.com/currencies/EGLD-token",
+        "coingecko": "https://www.coingecko.com/en/coins/EGLD-token"
     },
     "lockedAccounts": {
-        "erd1alice": "Team vesting",
-        "erd1bob": "Locked private sale"
+        "egld1alice": "Team vesting",
+        "egld1bob": "Locked private sale"
     },
     "extraTokens": [
         "LPTOKEN-1234",
@@ -38,18 +38,18 @@ Here’s a prefilled template for the .json file to get you started:
 }
 ```
 
-- `ledgerSignature` will be generated by Elrond. It will give your token “whitelist” status on the Ledger app and enable a more data rich flow for users storing your token on their Ledger hardware wallets. If one wants to set a Ledger signature, request it when opening a PR.
+- `ledgerSignature` will be generated by MultiversX. It will give your token “whitelist” status on the Ledger app and enable a more data rich flow for users storing your token on their Ledger hardware wallets. If one wants to set a Ledger signature, request it when opening a PR.
 - `lockedAccounts` defines accounts that do not actively transfer tokens, which will be subtracted from the supply to determine the circulating supply of the token
 - `extraTokens` defines tokens / MetaESDT collection identifiers that are part of the token itself (LP tokens, Farm tokens, Metastaking tokens, etc). These extra tokens will be also taken into consideration when calculating distinct `accounts` & total number of `transactions` in the token details API endpoint
 
 ## Guidelines:
-- logo does not resemble Elrond/Maiar logos, or other trademarked visual identities
+- logo does not resemble MultiversX/Mobile Wallet logos, or other trademarked visual identities
 - PR files need to be named info.json, logo.svg and logo.png
 - the PR title has to be the token name + identifier (ex: TOKEN-abc123)
 - projects need to have a minimum of 1000 token holders and token transactions
 - projects need to have a minimum of 1000+ Twitter, Discord or TG official channel followers
 - projects need to have a working website
-- max pic size 100kb (.png, .jpg)
+- max pic size 100kb (.png)
 
 ## Logos general requirements
 
@@ -62,15 +62,15 @@ Here’s a prefilled template for the .json file to get you started:
 - mandatory when opening a pull request
 - must have a resolution of 200x200 pixels
 
-| ![RIDE png](https://github.com/ElrondNetwork/assets/blob/master/tokens/RIDE-7d18e9/logo.png?raw=true) | 
-|:--:| 
-| *Example* |
+| ![RIDE png](https://github.com/multiversx/mx-assets/blob/master/tokens/RIDE-7d18e9/logo.png?raw=true) |
+| :---------------------------------------------------------------------------------------------------: |
+|                                               *Example*                                               |
 
 ## logo.svg
 
 - mandatory when opening a pull request
 - must have a square format
 
-| ![RIDE svg](https://github.com/ElrondNetwork/assets/blob/master/tokens/RIDE-7d18e9/logo.svg?raw=true) | 
-|:--:| 
-| *Example* |
+| ![RIDE svg](https://github.com/multiversx/mx-assets/blob/master/tokens/RIDE-7d18e9/logo.svg?raw=true) |
+| :---------------------------------------------------------------------------------------------------: |
+|                                               *Example*                                               |
diff --git a/accounts/erd10pfhtx6lzkqz7faq4lcuwt0mjmqrnd6l4mdph45pvacwd63tgzyss4fnm9.json b/accounts/erd10pfhtx6lzkqz7faq4lcuwt0mjmqrnd6l4mdph45pvacwd63tgzyss4fnm9.json
@@ -0,0 +1,8 @@
+{
+  "name": "Exchange: Exbi",
+  "description": "",
+  "tags": [
+    "exbi",
+    "exchange"
+  ]
+}
diff --git a/accounts/erd1272et87h3sa7hlg5keuswh50guz2ngmd6lhmjxkwwu0ah6gdds5qhka964.json b/accounts/erd1272et87h3sa7hlg5keuswh50guz2ngmd6lhmjxkwwu0ah6gdds5qhka964.json
@@ -0,0 +1,10 @@
+{
+  "name": "JEXchange: Fees Wallet",
+  "description": "",
+  "tags": [
+    "jexchange",
+    "fees",
+    "earning"
+  ],
+  "icon": "jexchange"
+}
diff --git a/accounts/erd144vlu9tklz6p2993tqtx9zahxfspfqnzmgd6chqxnyhzmzlfwmaqmmxg2h.json b/accounts/erd144vlu9tklz6p2993tqtx9zahxfspfqnzmgd6chqxnyhzmzlfwmaqmmxg2h.json
@@ -0,0 +1,9 @@
+{
+  "name": "xPortal: Registration Funding",
+  "description": "",
+  "tags": [
+    "xportal",
+    "funding"
+  ],
+  "icon": "multiversx"
+}
diff --git a/accounts/erd15qltd5ccalm5smmgdc5wnx46ssda3p32xhsz4wpp6usldq7hq7xqq5fmn6.json b/accounts/erd15qltd5ccalm5smmgdc5wnx46ssda3p32xhsz4wpp6usldq7hq7xqq5fmn6.json
@@ -0,0 +1,8 @@
+{
+  "name": "Exchange: Ascendex",
+  "description": "",
+  "tags": [
+    "ascendex",
+    "exchange"
+  ]
+}
diff --git a/accounts/erd1674qkct0yrqmxyuks35v68sju6v6476s96wpdfmh2343zve7ff8s54k3dx.json b/accounts/erd1674qkct0yrqmxyuks35v68sju6v6476s96wpdfmh2343zve7ff8s54k3dx.json
@@ -0,0 +1,10 @@
+{
+  "name": "xPortal: Cashback Rewards",
+  "description": "",
+  "tags": [
+    "xportal",
+    "rewards",
+    "cashback"
+  ],
+  "icon": "multiversx"
+}
diff --git a/accounts/erd16jruked88jgtsar78ej85hjp3qsd9jkjcw4swsn7k0teqh3wgcqqgyrupq.json b/accounts/erd16jruked88jgtsar78ej85hjp3qsd9jkjcw4swsn7k0teqh3wgcqqgyrupq.json
@@ -0,0 +1,9 @@
+{
+  "name": "Exchange: Coinbase",
+  "description": "",
+  "tags": [
+    "coinbase",
+    "exchange"
+  ],
+  "icon": "coinbase"
+}
diff --git a/accounts/erd16rp9ur5crj6lcjyttr0ftft8vspmcgq3kk00wmzkv6p7lnqg3v8quhqhh5.json b/accounts/erd16rp9ur5crj6lcjyttr0ftft8vspmcgq3kk00wmzkv6p7lnqg3v8quhqhh5.json
@@ -0,0 +1,10 @@
+{
+  "name": "MultiversX Foundation: Protocol Treasury",
+  "description": "",
+  "tags": [
+    "multiversx",
+    "foundation",
+    "treasury"
+  ],
+  "icon": "multiversx"
+}
diff --git a/accounts/erd16utyd55gt2a4lwcdcdhe48u6yjmfx77ea447xz6u8n8k0qw5mt8sy3h9rw.json b/accounts/erd16utyd55gt2a4lwcdcdhe48u6yjmfx77ea447xz6u8n8k0qw5mt8sy3h9rw.json
@@ -0,0 +1,8 @@
+{
+  "name": "QoWatt: Burn",
+  "description": "Wallet for burn",
+  "tags": [
+    "qowatt",
+    "burn"
+  ]
+}
diff --git a/accounts/erd16x7le8dpkjsafgwjx0e5kw94evsqw039rwp42m2j9eesd88x8zzs75tzry.json b/accounts/erd16x7le8dpkjsafgwjx0e5kw94evsqw039rwp42m2j9eesd88x8zzs75tzry.json
@@ -0,0 +1,9 @@
+{
+  "name": "Exchange: Binance.com",
+  "description": "",
+  "tags": [
+    "binance",
+    "exchange"
+  ],
+  "icon": "binance"
+}
diff --git a/accounts/erd17kcvm8snyjmqrhehlawzt7gmurjzclgwfz5kxgspq6j7cn6g0jksxt4f9y.json b/accounts/erd17kcvm8snyjmqrhehlawzt7gmurjzclgwfz5kxgspq6j7cn6g0jksxt4f9y.json
@@ -0,0 +1,10 @@
+{
+  "name": "xPortal: Herotag Creation Relayer",
+  "description": "",
+  "tags": [
+    "xportal",
+    "herotag",
+    "creation",
+    "relayer"
+  ]
+}
diff --git a/accounts/erd17rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rcqqkhty3.json b/accounts/erd17rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rc0pu8s7rcqqkhty3.json
@@ -0,0 +1,10 @@
+{
+  "name": "System: Genesis minting",
+  "description": "",
+  "tags": [
+    "system",
+    "genesis",
+    "minting"
+  ],
+  "icon": "multiversx"
+}
diff --git a/accounts/erd18umqd6v045nww2g9kgneupj4dwme9lycrpjn293sfkrhpntx9z2ss4kvhg.json b/accounts/erd18umqd6v045nww2g9kgneupj4dwme9lycrpjn293sfkrhpntx9z2ss4kvhg.json
@@ -0,0 +1,9 @@
+{
+  "name": "Exchange: Binance.com",
+  "description": "",
+  "tags": [
+    "binance",
+    "exchange"
+  ],
+  "icon": "binance"
+}