Merge pull request #13 from jscottbranson/develop

Update settings and requirements
jscottbranson · Sep 27, 2023 · b8c82e7 · b8c82e7
2 parents 433cf96 + aedc1ee
commit b8c82e7
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 109 deletions.
diff --git a/amendments.py b/amendments.py
@@ -1,42 +1,22 @@
 AMENDMENTS = [
     {
-        'id': '0285B7E5E08E1A8E4C15636F0591D87F73CB6A7B6452A932AD72BBC8E5D1CBE3',
-        'name': 'fixNFTokenDirV1 (dep)',
+        'id': '8CC0774A3BF66D1D22E76BBDA8E8A232E6B6313834301B3B23E8601196AE6455',
+        'name': 'AMM',
     },
     {
-        'id': '3C43D9A973AA4443EF3FC38E42DD306160FBFFDAB901CD8BAA15D09F2597EB87',
-        'name': 'NonFungibleTokensV1 (dep)',
+        'id': '56B241D7A43D40354D02A9DC4C8DF5C7A1F930D92A9035C4E12291B3CA3E1C2B',
+        'name': 'Clawback',
     },
     {
-        'id': '36799EA497B1369B170805C078AEFE6188345F9B3E324C21E9CA3FF574E3C3D6',
-        'name': 'fixNFTokenNegOffer (dep)',
+        'id': '27CD95EE8E1E5A537FF2F89B6CEB7C622E78E9374EBD7DCBEDFAE21CD6F16E0A',
+        'name': 'fixReducedOffersV1',
     },
     {
         'id': '93E516234E35E08CA689FA33A6D38E103881F8DCB53023F728C307AA89D515A7',
         'name': 'XRPFees',
     },
     {
-        'id': '75A7E01C505DD5A179DFE3E000A9B6F1EDDEB55A12F95579A23E15B15DC8BE5A',
-        'name': 'ImmediateOfferKilled',
-    },
-    {
-        'id': '2E2FB9CF8A44EB80F4694D38AADAE9B8B7ADAFD2F092E10068E61C98C4F092B0',
-        'name': 'fixUniversalNumber',
-    },
-    {
-        'id': 'F1ED6B4A411D8B872E65B9DCB4C8B100375B0DD3D62D07192E011D6D7F339013',
-        'name': 'fixTrustLinesToSelf',
-    },
-    {
-        'id': '73761231F7F3D94EC3D8C63D91BDD0D89045C6F71B917D1925C01253515A6669',
-        'name': 'fixNonFungibleTokensV1_2',
-    },
-    {
-        'id': '47C3002ABA31628447E8E9A8B315FAA935CE30183F9A9B86845E469CA2CDC3DF',
-        'name': 'DisallowIncoming',
-    },
-    {
-        'id': '9178256A980A86CF3D70D0260A7DA6402AAFE43632FDBCB88037978404188871',
-        'name': 'OwnerPaysFee',
+        'id': 'AE35ABDEFBDE520372B31C957020B34A7A4A9DC3115A69803A44016477C84D6E',
+        'name': 'fixNfTokenRemint',
     },
 ]
diff --git a/requirements.txt b/requirements.txt
@@ -1,14 +1,15 @@
-aiohttp==3.8.3
+aiohttp==3.8.5
 aiosignal==1.3.1
-async-timeout==4.0.2
-attrs==22.2.0
-certifi==2022.12.7
-charset-normalizer==2.1.1
-frozenlist==1.3.3
+async-timeout==4.0.3
+attrs==23.1.0
+certifi==2023.7.22
+charset-normalizer==3.2.0
+frozenlist==1.4.0
 idna==3.4
 multidict==6.0.4
-prettytable==3.5.0
-urllib3==1.26.13
-wcwidth==0.2.5
-websockets==10.4
-yarl==1.8.2
+prettytable==3.9.0
+requests==2.31.0
+urllib3==2.0.5
+wcwidth==0.2.6
+websockets==11.0.3
+yarl==1.9.2
diff --git a/settings_ex.py b/settings_ex.py
@@ -36,44 +36,24 @@
 
 AMENDMENTS = [
     {
-        'id': '0285B7E5E08E1A8E4C15636F0591D87F73CB6A7B6452A932AD72BBC8E5D1CBE3',
-        'name': 'fixNFTokenDirV1 (dep)',
+        'id': '8CC0774A3BF66D1D22E76BBDA8E8A232E6B6313834301B3B23E8601196AE6455',
+        'name': 'AMM',
     },
     {
-        'id': '3C43D9A973AA4443EF3FC38E42DD306160FBFFDAB901CD8BAA15D09F2597EB87',
-        'name': 'NonFungibleTokensV1 (dep)',
+        'id': '56B241D7A43D40354D02A9DC4C8DF5C7A1F930D92A9035C4E12291B3CA3E1C2B',
+        'name': 'Clawback',
     },
     {
-        'id': '36799EA497B1369B170805C078AEFE6188345F9B3E324C21E9CA3FF574E3C3D6',
-        'name': 'fixNFTokenNegOffer (dep)',
+        'id': '27CD95EE8E1E5A537FF2F89B6CEB7C622E78E9374EBD7DCBEDFAE21CD6F16E0A',
+        'name': 'fixReducedOffersV1',
     },
     {
         'id': '93E516234E35E08CA689FA33A6D38E103881F8DCB53023F728C307AA89D515A7',
         'name': 'XRPFees',
     },
     {
-        'id': '75A7E01C505DD5A179DFE3E000A9B6F1EDDEB55A12F95579A23E15B15DC8BE5A',
-        'name': 'ImmediateOfferKilled',
-    },
-    {
-        'id': '2E2FB9CF8A44EB80F4694D38AADAE9B8B7ADAFD2F092E10068E61C98C4F092B0',
-        'name': 'fixUniversalNumber',
-    },
-    {
-        'id': 'F1ED6B4A411D8B872E65B9DCB4C8B100375B0DD3D62D07192E011D6D7F339013',
-        'name': 'fixTrustLinesToSelf',
-    },
-    {
-        'id': '73761231F7F3D94EC3D8C63D91BDD0D89045C6F71B917D1925C01253515A6669',
-        'name': 'fixNonFungibleTokensV1_2',
-    },
-    {
-        'id': '47C3002ABA31628447E8E9A8B315FAA935CE30183F9A9B86845E469CA2CDC3DF',
-        'name': 'DisallowIncoming',
-    },
-    {
-        'id': '9178256A980A86CF3D70D0260A7DA6402AAFE43632FDBCB88037978404188871',
-        'name': 'OwnerPaysFee',
+        'id': 'AE35ABDEFBDE520372B31C957020B34A7A4A9DC3115A69803A44016477C84D6E',
+        'name': 'fixNfTokenRemint',
     },
 ]
 
@@ -283,44 +263,6 @@
 # The bot is set will automatically cull duplicate validator entries based on either key type
 
 VALIDATORS = [
-    {
-        "master_key": "nHDwHQGjKTz6R6pFigSSrNBrhNYyUGFPHA75HiTccTCQzuu9d7Za",
-        "server_name": "Coil.com (master)",
-        "notifications": {
-            "twilio": {
-                "notify_twilio": False,
-                "phone_numbers": [
-                    {
-                        "phone_from": "+19000000",
-                        "phone_to": "+10000000",
-                    },
-                ],
-            },
-
-            "discord": {
-                "notify_discord": False,
-                "discord_servers": [
-                    {
-                        "discord_id": "",
-                        "discord_token": "",
-                    },
-                ],
-            },
-
-            "mattermost": {
-                "notify_mattermost": False,
-            },
-
-            "slack": {
-                "notify_slack": False,
-            },
-
-            "smtp": {
-                "notify_smtp": False,
-            },
-        },
-    },
-
     {
         "master_key": "nHU4bLE3EmSqNwfL4AP1UZeTNPrSPPP6FXLKXo2uqfHuvBQxDVKd",
         "server_name": "Ripple.com (master)",

diff --git a/utils_for_humans/to_monitor.py b/utils_for_humans/to_monitor.py
@@ -12,17 +12,18 @@
     {"master_key": "nHUFE9prPXPrHcG3SkwP1UzAQbSphqyQkQK9ATXLZsfkezhhda3p", "server_name": "Alloy",},
     {"master_key": "nHB8QMKGt9VB4Vg71VszjBVQnDW3v3QudM4DwFaJfy96bj4Pv9fA", "server_name": "Bithomp",},
     {"master_key": "nHUd8g4DWm6HgjGTjKKSfYiRyf8qCvEN1PXR7YDJ5QTFyAnZHkbW", "server_name": "Brex",},
-    {"master_key": "nHDwHQGjKTz6R6pFigSSrNBrhNYyUGFPHA75HiTccTCQzuu9d7Za", "server_name": "Coil",},
+    {"master_key": "nHUwGQrfZfieeLFeGRdGnAmGpHBCZq9wvm5c59wTc2JhJMjoXmd8", "server_name": "XRPGoat",},
+    {"master_key": "nHBWa56Vr7csoFcCnEPzCCKVvnDQw3L28mATgHYQMGtbEfUjuYyB", "server_name": "Vet",},
+    {"master_key": "nHUge3GFusbqmfYAJjxfKgm2j4JXGxrRsfYMcEViHrFSzQDdk5Hq", "server_name": "Katczynski",},
     {"master_key": "nHUvzia57LRXr9zqnYpyFUFeKvis2tqn4DkXBVGSppt5M4nNq43C", "server_name": "Digifin",},
     {"master_key": "nHUnhRJK3csknycNK5SXRFi8jvDp3sKoWvS9wKWLq1ATBBGgPBjp", "server_name": "PeerIsland",},
     {"master_key": "nHU4bLE3EmSqNwfL4AP1UZeTNPrSPPP6FXLKXo2uqfHuvBQxDVKd", "server_name": "Ripple.com",},
-    {"master_key": "nHUcQnmEbCNq4uhntFudzfrZV8P5WLoBrR5h3R9jAd621Aaz1pSy", "server_name": "RippleItIn.nz",},
     {"master_key": "nHUtmbn4ALrdU6U8pmd8AMt4qKTdZTbYJ3u1LHyAzXga3Zuopv5Y", "server_name": "Towo",},
     {"master_key": "nHUryiyDqEtyWVtFG24AAhaYjMf9FRLietbGzviF3piJsMm9qyDR", "server_name": "Bitrue",},
     {"master_key": "nHUbgDd63HiuP68VRWazKwZRzS61N37K3NbfQaZLhSQ24LGGmjtn", "server_name": "ANU.edu.au",},
     {"master_key": "nHUpDEZX5Zy9auiu4yhDmhirNu6PyB1LvzQEL9Mxmqjr818w663q", "server_name": "XSpectar",},
     {"master_key": "nHUED59jjpQ5QbNhesXMhqii9gA8UfbBmv3i5StgyxG98qjsT4yn", "server_name": "Arrington",},
-    {"master_key": "nHDB2PAPYqF86j9j3c6w1F1ZqwvQfiWcFShZ9Pokg9q4ohNDSkAz", "server_name": "XRP Scan",},
+    {"master_key": "nHDB2PAPYqF86j9j3c6w1F1ZqwvQfiWcFShZ9Pokg9q4ohNDSkAz", "server_name": "XRPScan",},
     {"master_key": "nHUvcCcmoH1FJMMC6NtF9KKA4LpCWhjsxk2reCQidsp5AHQ7QY9H", "server_name": "Jon Nilsen",},
     {"master_key": "nHUY14bKLLm72ukzo2t6AVnQiu4bCd1jkimwWyJk3txvLeGhvro5", "server_name": "Gatehub",},
     {"master_key": "nHUfPizyJyhAJZzeq3duRVrZmsTZfcLn7yLF5s2adzHdcHMb9HmQ", "server_name": "UNIC.ac.cy",},
@@ -40,7 +41,7 @@
     {"master_key": "nHU95JxeaHJoSdpE7R49Mxp4611Yk5yL9SGEc12UDJLr4oEUN4NT", "server_name": "Flagship Solutions",},
     {"master_key": "nHUpcmNsxAw47yt2ADDoNoQrzLyTJPgnyq16u6Qx2kRPA17oUNHz", "server_name": "ISRDC.in",},
     {"master_key": "nHUpJSKQTZdB1TDkbCREMuf8vEqFkk84BcvZDhsQsDufFDQVajam", "server_name": "Data443",},
-    {"validation_public_key": "n9Kb81J9kqGgYkrNDRSPT3UCgz8Bei1CPHGMt85yxz9mUSvuzV5k", "server_name": "Coil.com (eph)"},
+    {"master_key": "nHBgiH2aih5JoaL3wbiiqSQfhrC21vJjxXoCoD2fuqcNbriXsfLm", "server_name": "AtTokyo",},
     {"validation_public_key": "n9M2UqXLK25h9YEQTskmCXbWPGhQmB1pFVqeXia38UwLaL838VbG", "server_name": "Gatehub.net (eph)"},
     {"validation_public_key": "nHU3AenyRuJ4Yei4YHkh6frZg8y2RwXznkMAomUE1ptV5Spvqsih", "server_name": "aesthetes.art",},
 ]