Merge pull request #26 from TradeTrust/fix/tt-105-polygon-mumbai-depr…

…ecation fix: remove polygon mumbai as it is deprecated
TradeTrust · May 7, 2024 · a801a38 · a801a38
2 parents 6dfd805 + 4dfe5d0
commit a801a38
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,6 @@ npx -p @tradetrust-tt/tradetrust-cli tradetrust <arguments>
 | Ethereum Mainnet  | mainnet          | 1        | Ethereum    | Mainnet      |
 | Sepolia           | sepolia          | 11155111 | Ethereum    | Testnet      |
 | Polygon Mainnet   | matic            | 137      | Polygon     | Mainnet      |
-| Mumbai            | maticmum         | 80001    | Polygon     | Testnet      |
 | Amoy              | amoy             | 80002    | Polygon     | Testnet      |
 | XDC Network       | xdc              | 50       | XDC Network | Mainnet      |
 | Apothem           | xdcapothem       | 51       | XDC Network | Testnet      |

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -72,8 +72,8 @@
     "@snyk/protect": "^1.1196.0",
     "@tradetrust-tt/dnsprove": "^2.12.2",
     "@tradetrust-tt/document-store": "^2.7.0",
-    "@tradetrust-tt/token-registry": "^4.9.0",
-    "@tradetrust-tt/tradetrust": "^6.9.1",
+    "@tradetrust-tt/token-registry": "^4.10.1",
+    "@tradetrust-tt/tradetrust": "^6.9.4",
     "@tradetrust-tt/tradetrust-config": "^1.14.1",
     "@tradetrust-tt/tt-verify": "^8.9.1",
     "ajv": "^8.4.0",

diff --git a/src/commands/config/config.type.ts b/src/commands/config/config.type.ts
@@ -11,7 +11,6 @@ export interface CreateConfigCommand {
 export enum TestNetwork {
   Local = "local",
   Sepolia = "sepolia",
-  Mumbai = "mumbai (polygon)",
   Amoy = "amoy (polygon)",
   Apothem = "apothem (xdc)",
   Hedera = "hedera (testnet)",

diff --git a/src/commands/config/create.ts b/src/commands/config/create.ts
@@ -63,7 +63,6 @@ export const handler = async (args: CreateConfigCommand): Promise<void> => {
     const networks = [
       TestNetwork.Local,
       TestNetwork.Sepolia,
-      TestNetwork.Mumbai,
       TestNetwork.Amoy,
       TestNetwork.Apothem,
       TestNetwork.Hedera,
@@ -90,7 +89,6 @@ const convertNetworkToNetworkCmdName = (selectedNetwork: TestNetwork): NetworkCm
   const network = {
     [TestNetwork.Local]: NetworkCmdName.Local,
     [TestNetwork.Sepolia]: NetworkCmdName.Sepolia,
-    [TestNetwork.Mumbai]: NetworkCmdName.Maticmum,
     [TestNetwork.Amoy]: NetworkCmdName.Amoy,
     [TestNetwork.Apothem]: NetworkCmdName.XDCApothem,
     [TestNetwork.Hedera]: NetworkCmdName.HederaTestnet,

diff --git a/src/commands/dns/txt-record/__test__/__snapshots__/get.test.ts.snap b/src/commands/dns/txt-record/__test__/__snapshots__/get.test.ts.snap
@@ -33,6 +33,20 @@ exports[`get should return dns-txt 1`] = `
           "netId": "1",
           "type": "openatts",
         },
+        Object {
+          "addr": "0x45FBA334733c57A348Dca45fB66CfAf00Ce43aBc",
+          "dnssec": true,
+          "net": "ethereum",
+          "netId": "101010",
+          "type": "openatts",
+        },
+        Object {
+          "addr": "0xA0Da221B3cd3e863425E1F1D34B9307D295a9d03",
+          "dnssec": true,
+          "net": "ethereum",
+          "netId": "101010",
+          "type": "openatts",
+        },
         Object {
           "addr": "0x7Ae2aE35f66ACE6671CB2bfb985011b0a2d9cf72",
           "dnssec": true,
@@ -82,6 +96,20 @@ exports[`get should return dns-txt 1`] = `
           "netId": "3",
           "type": "openatts",
         },
+        Object {
+          "addr": "0x31376b6FB90c6C16320eE8A782E4bbbCC1a96B11",
+          "dnssec": true,
+          "net": "ethereum",
+          "netId": "50",
+          "type": "openatts",
+        },
+        Object {
+          "addr": "0xB8E950A74637797e67BB402F55BF77920306640a",
+          "dnssec": true,
+          "net": "ethereum",
+          "netId": "50",
+          "type": "openatts",
+        },
       ],
     ],
     Array [
@@ -93,6 +121,13 @@ exports[`get should return dns-txt 1`] = `
           "type": "openatts",
           "version": "1.0",
         },
+        Object {
+          "algorithm": "dns-did",
+          "dnssec": true,
+          "publicKey": "did:ethr:0x433097a1C1b8a3e9188d8C54eCC057B1D69f1638#controller",
+          "type": "openatts",
+          "version": "1.0",
+        },
         Object {
           "algorithm": "dns-did",
           "dnssec": true,
@@ -149,6 +184,20 @@ exports[`get should return dns-txt 2`] = `
           "netId": "1",
           "type": "openatts",
         },
+        Object {
+          "addr": "0x45FBA334733c57A348Dca45fB66CfAf00Ce43aBc",
+          "dnssec": true,
+          "net": "ethereum",
+          "netId": "101010",
+          "type": "openatts",
+        },
+        Object {
+          "addr": "0xA0Da221B3cd3e863425E1F1D34B9307D295a9d03",
+          "dnssec": true,
+          "net": "ethereum",
+          "netId": "101010",
+          "type": "openatts",
+        },
         Object {
           "addr": "0x7Ae2aE35f66ACE6671CB2bfb985011b0a2d9cf72",
           "dnssec": true,
@@ -198,6 +247,20 @@ exports[`get should return dns-txt 2`] = `
           "netId": "3",
           "type": "openatts",
         },
+        Object {
+          "addr": "0x31376b6FB90c6C16320eE8A782E4bbbCC1a96B11",
+          "dnssec": true,
+          "net": "ethereum",
+          "netId": "50",
+          "type": "openatts",
+        },
+        Object {
+          "addr": "0xB8E950A74637797e67BB402F55BF77920306640a",
+          "dnssec": true,
+          "net": "ethereum",
+          "netId": "50",
+          "type": "openatts",
+        },
       ],
     ],
     Array [
@@ -209,6 +272,13 @@ exports[`get should return dns-txt 2`] = `
           "type": "openatts",
           "version": "1.0",
         },
+        Object {
+          "algorithm": "dns-did",
+          "dnssec": true,
+          "publicKey": "did:ethr:0x433097a1C1b8a3e9188d8C54eCC057B1D69f1638#controller",
+          "type": "openatts",
+          "version": "1.0",
+        },
         Object {
           "algorithm": "dns-did",
           "dnssec": true,

diff --git a/src/common/networks.ts b/src/common/networks.ts
@@ -18,7 +18,6 @@ export enum NetworkCmdName {
   Mainnet = "mainnet",
   Sepolia = "sepolia",
   Matic = "matic",
-  Maticmum = "maticmum",
   Amoy = "amoy",
   XDC = "xdc",
   XDCApothem = "xdcapothem",
@@ -70,14 +69,6 @@ export const supportedNetwork: {
     currency: "MATIC",
     gasStation: gasStation("https://gasstation.polygon.technology/v2"),
   },
-  [NetworkCmdName.Maticmum]: {
-    explorer: "https://mumbai.polygonscan.com",
-    provider: defaultInfuraProvider("maticmum"),
-    networkId: 80001,
-    networkName: NetworkCmdName.Maticmum,
-    currency: "MATIC",
-    gasStation: gasStation("https://gasstation-testnet.polygon.technology/v2"),
-  },
   [NetworkCmdName.Amoy]: {
     explorer: "https://www.oklink.com/amoy",
     provider: jsonRpcProvider("https://polygon-amoy.infura.io/v3/48bea089ceb34f579d2381195ca46c1d"),