From 613be90630d897bee69b544c449e6031408a4bb9 Mon Sep 17 00:00:00 2001
From: anonymoussprocket <42718855+anonymoussprocket@users.noreply.github.com>
Date: Thu, 19 Mar 2020 10:42:51 -0400
Subject: [PATCH] Metadata update (#728)

* - metadata fix for Arronax #304

* - metadata fix for Arronax #304

* - updated baker name data

* - added proposal names

* - removed proposals table

* - removed proposals table
---
 .../resources/metadata/tezos.carthagenet.conf | 21 -----
 .../resources/metadata/tezos.mainnet.conf     | 81 ++++++++++++-------
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/metadata/tezos.carthagenet.conf b/src/main/resources/metadata/tezos.carthagenet.conf
index 7254f2f12..8f4885d0e 100644
--- a/src/main/resources/metadata/tezos.carthagenet.conf
+++ b/src/main/resources/metadata/tezos.carthagenet.conf
@@ -820,27 +820,6 @@
         }
       }
     }
-    proposals {
-      display-name-plural: "Proposals"
-      display-name: "Proposal"
-      visible: true
-      attributes {
-        protocol_hash {
-          visible: true
-        }
-        block_id {
-          display-name: "Block Hash"
-          data-type: "hash"
-          visible: true
-        }
-        block_level {
-          visible: true
-        }
-        supporters {
-          visible: true
-        }
-      }
-    }
     delegates {
       display-name-plural: "Bakers"
       display-name: "Baker"
diff --git a/src/main/resources/metadata/tezos.mainnet.conf b/src/main/resources/metadata/tezos.mainnet.conf
index 7254f2f12..4ca878cbb 100644
--- a/src/main/resources/metadata/tezos.mainnet.conf
+++ b/src/main/resources/metadata/tezos.mainnet.conf
@@ -820,27 +820,6 @@
         }
       }
     }
-    proposals {
-      display-name-plural: "Proposals"
-      display-name: "Proposal"
-      visible: true
-      attributes {
-        protocol_hash {
-          visible: true
-        }
-        block_id {
-          display-name: "Block Hash"
-          data-type: "hash"
-          visible: true
-        }
-        block_level {
-          visible: true
-        }
-        supporters {
-          visible: true
-        }
-      }
-    }
     delegates {
       display-name-plural: "Bakers"
       display-name: "Baker"
@@ -860,13 +839,50 @@
             max-result-size: 100
           }
           value-map: {
-            "tz1gk3TDbU7cJuiBRMhwQXVvgDnjsxuWhcEA": "Airfoil",
-            "tz1hTFcQk2KJRPzZyHkCwbj7E1zY1xBkiHsk": "ownBLOCK",
-            "tz1P2Po7YM526ughEsRbY4oR9zaUPDZjxFrb": "P2P Validator",
-            "tz1MJx9vhaNRSimcuXPK2rW4fLccQnDAnVKJ": "TezosAirGap",
-            "tz1NortRftucvAkD1J58L32EhSVrQEWJCEnB": "Bake'n'Rolls",
-            "tz1P2Po7YM526ughEsRbY4oR9zaUPDZjxFrb": "Everstake",
-            "tz3adcvQaKXTCg12zbninqo3q8ptKKtDFTLv": "Tezzigator"
+            "tz1gk3TDbU7cJuiBRMhwQXVvgDnjsxuWhcEA": "Airfoil"
+            "tz1MJx9vhaNRSimcuXPK2rW4fLccQnDAnVKJ": "AirGap"
+            "tz3e75hU4EhDU3ukyJueh5v6UvEHzGwkg3yC": "At James"
+            "tz1ei4WtWEMEJekSv8qDnu9PExG6Q8HgRGr3": "Bake Tz"
+            "tz1NortRftucvAkD1J58L32EhSVrQEWJCEnB": "Bake'n'Rolls"
+            "KT1ChNsEFxwyCbJyWGSL3KdjeXE28AY1Kaog": "TCF Baker Registry"
+            "tz1S8MNvuFEUsWgjHvi3AxibRBf388NhT1q2": "Binance"
+            "tz1KtGwriE7VuLwT3LwuvU9Nv4wAxP7XZ57d": "Bitfinex"
+            "tz1SYq214SCBy9naR6cvycQsYcUGpBqQAE8d": "Coinone"
+            "tz1eEnQhbwf6trb8Q8mPb2RaPkNk2rN7BKi8": "Cryptium Labs"
+            "tz1MXFrtZoaXckE41bjUCSjAjAap3AFDSr3N": "Everstake"
+            "tz1TzaNn7wSQSP5gYPXCnNzBCpyMiidCq1PX": "Flippin' tacos"
+            "tz3RDC3Jdn4j15J7bBHZd29EUee9gVB1CxD9": "Foundation Baker 1"
+            "tz3bvNMQ95vfAYtG8193ymshqjSvmxiCUuR5": "Foundation Baker 2"
+            "tz3RB4aoyjov4KEVRbuhvQ1CKJgBJMWhaeB8": "Foundation Baker 3"
+            "tz3bTdwZinP8U1JmSweNzVKhmwafqWmFWRfk": "Foundation Baker 4"
+            "tz3NExpXn9aPNZPorRE4SdjJ2RGrfbJgMAaV": "Foundation Baker 5"
+            "tz3UoffC7FG7zfpmvmjUmUeAaHvzdcUvAj6r": "Foundation Baker 6"
+            "tz3WMqdzXqRWXwyvj5Hp2H7QEepaUuS7vd9K": "Foundation Baker 7"
+            "tz3VEZ4k6a4Wx42iyev6i2aVAptTRLEAivNN": "Foundation Baker 8"
+            "tz1djRgXXWWJiY1rpMECCxr5d9ZBqWewuiU1": "Galleon Support"
+            "tz1NpWrAyDL9k2Lmnyxcgr9xuJakbBxdq7FB": "Gate.io"
+            "tz1WCd2jm4uSt4vntk4vSuUWoZQGhLcDuR9q": "Happy Tezos"
+            "tz1gfArv665EUkSg2ojMBzcbfwuPxAvqPvjo": "Kraken"
+            "tz1X1fpAZtwQk94QXUgZwfgsvkQgyc2KHp9d": "ownBLOCK (Legacy)"
+            "tz1hTFcQk2KJRPzZyHkCwbj7E1zY1xBkiHsk": "ownBLOCK"
+            "tz1P2Po7YM526ughEsRbY4oR9zaUPDZjxFrb": "P2P Validator"
+            "tz1KtvGSYU5hdKD288a1koTBURWYuADJGrLE": "Ø Crypto Pool"
+            "tz1Yju7jmmsaUiG9qQLoYv35v5pHgnWoLWbt": "Polychain Labs"
+            "tz2TSvNTh2epDMhZHrw73nV9piBX7kLZ9K9m": "Polychain Labs 2"
+            "tz1Y42aKCk53vMbaJNpf1hBg1rznGdBxHJ5C": "Tezos Berlin"
+            "tz1Vyuu4EJ5Nym4JcrfRLnp3hpaq1DSEp1Ke": "POS Bakerz"
+            "tz1b7YSEeNRqgmjuX4d4aiai2sQTF4A7WBZf": "Tezos Japan (Legacy)"
+            "tz1ijdEfmUoQXJfSiKCLRioeCfSrKP3sVsff": "Tezos Japan"
+            "tz1PPUo28B8BroqmVCMMNDudG4ShA2bzicrU": "Tezos Korea"
+            "tz1b3SaPHFSw51r92ARcV5mGyYbSSsdFd5Gz": "Tezos MX"
+            "tz1Kf25fX1VdmYGSEzwFy1wNmkbSEZ2V83sY": "Tezos Seoul"
+            "tz1RAzdkp1x5ZDqms4ZUrSdfJuUYGH9JTPK2": "Tezos Spanish (Legacy)"
+            "tz1hAYfexyzPGG6RhZZMpDvAHifubsbb6kgn": "Tezos Suisse"
+            "tz1VYQpZvjVhv1CdcENuCNWJQXu1TWBJ8KTD": "Tezos Tokyo"
+            "tz1R6Ej25VSerE3MkSoEEeBjKHCDTFbpKuSX": "TezosSEAsia"
+            "tz1Lh9jeLSWDHYy8AshvG2dpNQseDaHg7cms": "TezosSpanish"
+            "tz1PesW5khQNhy4revu2ETvMtWPtuVyH2XkZ": "Tz Dutch"
+            "tz1Pwgj6j55akKCyvTwwr9X4np1RskSXpQY4": "Validators.com"
           }
         }
         block_id {
@@ -1081,6 +1097,15 @@
           display_name: "Proposal"
           data-type: "hash"
           visible: true
+          value-map: {
+            "PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb": "Carthage 2.0"
+            "PtCarthavAMoXqbjBPVgDCRd5LgT7qqKWUPXnYii3xCaHRBMfHH": "Carthage"
+            "PsBABY5HQTSkA4297zNHfsZNKtxULfL18y95qb3m53QJiXGmrbU": "Babylon 2.0"
+            "PsBABY5nk4JhdEv1N1pZbt6m6ccB9BfNqa23iKZcHBh23jmRS9f": "Babylon"
+            "PtdRxBHvc91c2ea2evV6wkoqnzW7TadTg9aqS9jAn2GbcPGtumD": "Brest A"
+            "Psd1ynUBhMZAeajwcZJAeq5NrxorM6UCU4GJqxZ7Bx2e9vUWB6z": "Athens B"
+            "Pt24m4xiPbLDhVgVfABUjirbmda3yohdN82Sp9FeuAXJ4eV9otd": "Athens A"
+          }
         }
         yay_count {
           display_name: "Yay Votes"