From 7056fdcfbcadc21476e3e78870bcbea24a936b4d Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Wed, 25 Nov 2020 13:35:03 +0100 Subject: [PATCH] Use CAIP-2 prefixing for filename - closes #130 Note: so far CI wise only EIP155 is accepted as namespace - will be extended when chains from other namespaces are PRed in --- _data/chains/1007.json | 18 ---------- _data/chains/1012.json | 18 ---------- _data/chains/1139.json | 16 --------- _data/chains/1140.json | 16 --------- _data/chains/14.json | 19 ----------- _data/chains/16.json | 18 ---------- _data/chains/2020.json | 16 --------- _data/chains/499.json | 17 ---------- _data/chains/50.json | 18 ---------- _data/chains/51.json | 18 ---------- _data/chains/{1.json => eip155-1.json} | 0 _data/chains/{100.json => eip155-100.json} | 0 _data/chains/{101.json => eip155-101.json} | 0 _data/chains/{108.json => eip155-108.json} | 0 _data/chains/{11.json => eip155-11.json} | 0 ...1122334455.json => eip155-1122334455.json} | 0 _data/chains/{12.json => eip155-12.json} | 0 _data/chains/{122.json => eip155-122.json} | 0 _data/chains/{13.json => eip155-13.json} | 0 .../{1313114.json => eip155-1313114.json} | 0 ...1313161554.json => eip155-1313161554.json} | 0 ...1313161555.json => eip155-1313161555.json} | 0 .../{1313500.json => eip155-1313500.json} | 0 .../{13371337.json => eip155-13371337.json} | 0 _data/chains/{137.json => eip155-137.json} | 0 _data/chains/{15.json => eip155-15.json} | 0 _data/chains/{162.json => eip155-162.json} | 0 _data/chains/{1620.json => eip155-1620.json} | 0 _data/chains/{163.json => eip155-163.json} | 0 _data/chains/{18.json => eip155-18.json} | 0 .../{18289463.json => eip155-18289463.json} | 0 _data/chains/{1856.json => eip155-1856.json} | 0 _data/chains/{1987.json => eip155-1987.json} | 0 _data/chains/{2.json => eip155-2.json} | 0 _data/chains/{20.json => eip155-20.json} | 0 .../{200625.json => eip155-200625.json} | 0 _data/chains/{21.json => eip155-21.json} | 0 _data/chains/{211.json => eip155-211.json} | 0 .../chains/{24484.json => eip155-24484.json} | 0 _data/chains/{246.json => eip155-246.json} | 0 .../{246529.json => eip155-246529.json} | 0 .../{246785.json => eip155-246785.json} | 0 _data/chains/{250.json => eip155-250.json} | 0 _data/chains/{269.json => eip155-269.json} | 0 .../{28945486.json => eip155-28945486.json} | 0 _data/chains/{3.json => eip155-3.json} | 0 _data/chains/{30.json => eip155-30.json} | 0 _data/chains/{31.json => eip155-31.json} | 0 .../chains/{31102.json => eip155-31102.json} | 0 ...3125659152.json => eip155-3125659152.json} | 0 .../{35855456.json => eip155-35855456.json} | 0 _data/chains/{38.json => eip155-38.json} | 0 _data/chains/{385.json => eip155-385.json} | 0 .../chains/{39797.json => eip155-39797.json} | 0 _data/chains/{4.json => eip155-4.json} | 0 _data/chains/{42.json => eip155-42.json} | 0 _data/chains/{420.json => eip155-420.json} | 0 .../chains/{43110.json => eip155-43110.json} | 0 .../chains/{49797.json => eip155-49797.json} | 0 _data/chains/{5.json => eip155-5.json} | 0 _data/chains/{558.json => eip155-558.json} | 0 _data/chains/{56.json => eip155-56.json} | 0 _data/chains/{5869.json => eip155-5869.json} | 0 _data/chains/{595.json => eip155-595.json} | 0 _data/chains/{6.json => eip155-6.json} | 0 _data/chains/{60.json => eip155-60.json} | 0 _data/chains/{61.json => eip155-61.json} | 0 .../{61717561.json => eip155-61717561.json} | 0 _data/chains/{62.json => eip155-62.json} | 0 _data/chains/{63.json => eip155-63.json} | 0 _data/chains/{64.json => eip155-64.json} | 0 _data/chains/{67.json => eip155-67.json} | 0 _data/chains/{686.json => eip155-686.json} | 0 _data/chains/{7.json => eip155-7.json} | 0 .../chains/{73799.json => eip155-73799.json} | 0 _data/chains/{76.json => eip155-76.json} | 0 _data/chains/{77.json => eip155-77.json} | 0 .../{7762959.json => eip155-7762959.json} | 0 .../chains/{78110.json => eip155-78110.json} | 0 _data/chains/{787.json => eip155-787.json} | 0 _data/chains/{8.json => eip155-8.json} | 0 .../chains/{80001.json => eip155-80001.json} | 0 _data/chains/{82.json => eip155-82.json} | 0 _data/chains/{820.json => eip155-820.json} | 0 _data/chains/{821.json => eip155-821.json} | 0 _data/chains/{88.json => eip155-88.json} | 0 _data/chains/{8995.json => eip155-8995.json} | 0 _data/chains/{9.json => eip155-9.json} | 0 _data/chains/{97.json => eip155-97.json} | 0 _data/chains/{977.json => eip155-977.json} | 0 _data/chains/{99.json => eip155-99.json} | 0 .../{99415706.json => eip155-99415706.json} | 0 .../kotlin/org/ethereum/lists/chains/Main.kt | 8 +++-- .../ethereum/lists/chains/model/Exceptions.kt | 3 +- src/test/kotlin/TheChainChecker.kt | 34 +++++++++---------- .../invalid/{1.json => eip155-1.json} | 0 .../invalid/{1.nojson => eip155-1.nojson} | 0 .../invalid/{100.json => eip155-100.json} | 0 .../invalid/{101.json => eip155-101.json} | 0 .../invalid/{102.json => eip155-102.json} | 0 .../invalid/{2.json => eip155-2.json} | 0 .../invalid/{3.json => eip155-3.json} | 0 .../invalid/{4.json => eip155-4.json} | 0 .../invalid/{99.json => eip155-99.json} | 0 ...extracomma.json => eip155-extracomma.json} | 0 ...name.json => eip155-invalid_filename.json} | 0 .../sameshortname/{1.json => eip155-1.json} | 0 .../sameshortname/{5.json => eip155-5.json} | 0 .../valid/{1.json => eip155-1.json} | 0 .../valid/{5.json => eip155-5.json} | 0 110 files changed, 25 insertions(+), 194 deletions(-) delete mode 100644 _data/chains/1007.json delete mode 100644 _data/chains/1012.json delete mode 100644 _data/chains/1139.json delete mode 100644 _data/chains/1140.json delete mode 100644 _data/chains/14.json delete mode 100644 _data/chains/16.json delete mode 100644 _data/chains/2020.json delete mode 100644 _data/chains/499.json delete mode 100644 _data/chains/50.json delete mode 100644 _data/chains/51.json rename _data/chains/{1.json => eip155-1.json} (100%) rename _data/chains/{100.json => eip155-100.json} (100%) rename _data/chains/{101.json => eip155-101.json} (100%) rename _data/chains/{108.json => eip155-108.json} (100%) rename _data/chains/{11.json => eip155-11.json} (100%) rename _data/chains/{1122334455.json => eip155-1122334455.json} (100%) rename _data/chains/{12.json => eip155-12.json} (100%) rename _data/chains/{122.json => eip155-122.json} (100%) rename _data/chains/{13.json => eip155-13.json} (100%) rename _data/chains/{1313114.json => eip155-1313114.json} (100%) rename _data/chains/{1313161554.json => eip155-1313161554.json} (100%) rename _data/chains/{1313161555.json => eip155-1313161555.json} (100%) rename _data/chains/{1313500.json => eip155-1313500.json} (100%) rename _data/chains/{13371337.json => eip155-13371337.json} (100%) rename _data/chains/{137.json => eip155-137.json} (100%) rename _data/chains/{15.json => eip155-15.json} (100%) rename _data/chains/{162.json => eip155-162.json} (100%) rename _data/chains/{1620.json => eip155-1620.json} (100%) rename _data/chains/{163.json => eip155-163.json} (100%) rename _data/chains/{18.json => eip155-18.json} (100%) rename _data/chains/{18289463.json => eip155-18289463.json} (100%) rename _data/chains/{1856.json => eip155-1856.json} (100%) rename _data/chains/{1987.json => eip155-1987.json} (100%) rename _data/chains/{2.json => eip155-2.json} (100%) rename _data/chains/{20.json => eip155-20.json} (100%) rename _data/chains/{200625.json => eip155-200625.json} (100%) rename _data/chains/{21.json => eip155-21.json} (100%) rename _data/chains/{211.json => eip155-211.json} (100%) rename _data/chains/{24484.json => eip155-24484.json} (100%) rename _data/chains/{246.json => eip155-246.json} (100%) rename _data/chains/{246529.json => eip155-246529.json} (100%) rename _data/chains/{246785.json => eip155-246785.json} (100%) rename _data/chains/{250.json => eip155-250.json} (100%) rename _data/chains/{269.json => eip155-269.json} (100%) rename _data/chains/{28945486.json => eip155-28945486.json} (100%) rename _data/chains/{3.json => eip155-3.json} (100%) rename _data/chains/{30.json => eip155-30.json} (100%) rename _data/chains/{31.json => eip155-31.json} (100%) rename _data/chains/{31102.json => eip155-31102.json} (100%) rename _data/chains/{3125659152.json => eip155-3125659152.json} (100%) rename _data/chains/{35855456.json => eip155-35855456.json} (100%) rename _data/chains/{38.json => eip155-38.json} (100%) rename _data/chains/{385.json => eip155-385.json} (100%) rename _data/chains/{39797.json => eip155-39797.json} (100%) rename _data/chains/{4.json => eip155-4.json} (100%) rename _data/chains/{42.json => eip155-42.json} (100%) rename _data/chains/{420.json => eip155-420.json} (100%) rename _data/chains/{43110.json => eip155-43110.json} (100%) rename _data/chains/{49797.json => eip155-49797.json} (100%) rename _data/chains/{5.json => eip155-5.json} (100%) rename _data/chains/{558.json => eip155-558.json} (100%) rename _data/chains/{56.json => eip155-56.json} (100%) rename _data/chains/{5869.json => eip155-5869.json} (100%) rename _data/chains/{595.json => eip155-595.json} (100%) rename _data/chains/{6.json => eip155-6.json} (100%) rename _data/chains/{60.json => eip155-60.json} (100%) rename _data/chains/{61.json => eip155-61.json} (100%) rename _data/chains/{61717561.json => eip155-61717561.json} (100%) rename _data/chains/{62.json => eip155-62.json} (100%) rename _data/chains/{63.json => eip155-63.json} (100%) rename _data/chains/{64.json => eip155-64.json} (100%) rename _data/chains/{67.json => eip155-67.json} (100%) rename _data/chains/{686.json => eip155-686.json} (100%) rename _data/chains/{7.json => eip155-7.json} (100%) rename _data/chains/{73799.json => eip155-73799.json} (100%) rename _data/chains/{76.json => eip155-76.json} (100%) rename _data/chains/{77.json => eip155-77.json} (100%) rename _data/chains/{7762959.json => eip155-7762959.json} (100%) rename _data/chains/{78110.json => eip155-78110.json} (100%) rename _data/chains/{787.json => eip155-787.json} (100%) rename _data/chains/{8.json => eip155-8.json} (100%) rename _data/chains/{80001.json => eip155-80001.json} (100%) rename _data/chains/{82.json => eip155-82.json} (100%) rename _data/chains/{820.json => eip155-820.json} (100%) rename _data/chains/{821.json => eip155-821.json} (100%) rename _data/chains/{88.json => eip155-88.json} (100%) rename _data/chains/{8995.json => eip155-8995.json} (100%) rename _data/chains/{9.json => eip155-9.json} (100%) rename _data/chains/{97.json => eip155-97.json} (100%) rename _data/chains/{977.json => eip155-977.json} (100%) rename _data/chains/{99.json => eip155-99.json} (100%) rename _data/chains/{99415706.json => eip155-99415706.json} (100%) rename src/test/resources/test_chains/invalid/{1.json => eip155-1.json} (100%) rename src/test/resources/test_chains/invalid/{1.nojson => eip155-1.nojson} (100%) rename src/test/resources/test_chains/invalid/{100.json => eip155-100.json} (100%) rename src/test/resources/test_chains/invalid/{101.json => eip155-101.json} (100%) rename src/test/resources/test_chains/invalid/{102.json => eip155-102.json} (100%) rename src/test/resources/test_chains/invalid/{2.json => eip155-2.json} (100%) rename src/test/resources/test_chains/invalid/{3.json => eip155-3.json} (100%) rename src/test/resources/test_chains/invalid/{4.json => eip155-4.json} (100%) rename src/test/resources/test_chains/invalid/{99.json => eip155-99.json} (100%) rename src/test/resources/test_chains/invalid/{extracomma.json => eip155-extracomma.json} (100%) rename src/test/resources/test_chains/invalid/{invalid_filename.json => eip155-invalid_filename.json} (100%) rename src/test/resources/test_chains/invalid/sameshortname/{1.json => eip155-1.json} (100%) rename src/test/resources/test_chains/invalid/sameshortname/{5.json => eip155-5.json} (100%) rename src/test/resources/test_chains/valid/{1.json => eip155-1.json} (100%) rename src/test/resources/test_chains/valid/{5.json => eip155-5.json} (100%) diff --git a/_data/chains/1007.json b/_data/chains/1007.json deleted file mode 100644 index b66433b8..00000000 --- a/_data/chains/1007.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Newton Testnet", - "chain": "NEW", - "network": "testnet", - "rpc": [ - "https://rpc1.newchain.newtonproject.org" - ], - "faucets": [], - "nativeCurrency": { - "name": "Newton", - "symbol": "NEW", - "decimals": 18 - }, - "infoURL": "https://www.newtonproject.org/", - "shortName": "tnew", - "chainId": 1007, - "networkId": 1007 -} \ No newline at end of file diff --git a/_data/chains/1012.json b/_data/chains/1012.json deleted file mode 100644 index d77c5215..00000000 --- a/_data/chains/1012.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Newton", - "chain": "NEW", - "network": "mainnet", - "rpc": [ - "https://global.rpc.mainnet.newtonproject.org" - ], - "faucets": [], - "nativeCurrency": { - "name": "Newton", - "symbol": "NEW", - "decimals": 18 - }, - "infoURL": "https://www.newtonproject.org/", - "shortName": "new", - "chainId": 1012, - "networkId": 1012 -} \ No newline at end of file diff --git a/_data/chains/1139.json b/_data/chains/1139.json deleted file mode 100644 index c558969b..00000000 --- a/_data/chains/1139.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "MathChain", - "chain": "MATH", - "network": "mainnet", - "rpc": [], - "faucets": [], - "nativeCurrency": { - "name": "MathChain", - "symbol": "MATH", - "decimals": 18 - }, - "infoURL": "https://mathwallet.org", - "shortName": "MATH", - "chainId": 1139, - "networkId": 1139 - } \ No newline at end of file diff --git a/_data/chains/1140.json b/_data/chains/1140.json deleted file mode 100644 index bd8be432..00000000 --- a/_data/chains/1140.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "MathChain Testnet", - "chain": "MATH", - "network": "testnet", - "rpc": [], - "faucets": [], - "nativeCurrency": { - "name": "MathChain", - "symbol": "MATH", - "decimals": 18 - }, - "infoURL": "https://mathwallet.org/", - "shortName": "tMATH", - "chainId": 1140, - "networkId": 1140 - } \ No newline at end of file diff --git a/_data/chains/14.json b/_data/chains/14.json deleted file mode 100644 index 08af816e..00000000 --- a/_data/chains/14.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "Flare Mainnet", - "chain": "FLR", - "network": "flare", - "rpc": [ - ], - "faucets": [ - ], - "nativeCurrency": { - "name": "Spark", - "symbol": "FLR", - "decimals": 18 - }, - "infoURL": "https://flare.xyz", - "shortName": "flr", - "chainId": 14, - "networkId": 14, - "slip44": 554 -} diff --git a/_data/chains/16.json b/_data/chains/16.json deleted file mode 100644 index e65f7464..00000000 --- a/_data/chains/16.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Flare Testnet Coston", - "chain": "FLR", - "network": "coston", - "rpc": [ - ], - "faucets": [ - ], - "nativeCurrency": { - "name": "Coston Spark", - "symbol": "CFLR", - "decimals": 18 - }, - "infoURL": "https://github.com/flare-eng/coston", - "shortName": "cflr", - "chainId": 16, - "networkId": 16 -} \ No newline at end of file diff --git a/_data/chains/2020.json b/_data/chains/2020.json deleted file mode 100644 index e8f40f5b..00000000 --- a/_data/chains/2020.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "420coin", - "chain": "420", - "network": "mainnet", - "rpc": [], - "faucets": [], - "nativeCurrency": { - "name": "Fourtwenty", - "symbol": "420", - "decimals": 18 - }, - "infoURL": "https://420integrated.com", - "shortName": "420", - "chainId": 2020, - "networkId": 2020 -} diff --git a/_data/chains/499.json b/_data/chains/499.json deleted file mode 100644 index 3f8e9b76..00000000 --- a/_data/chains/499.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Rupaya", - "chain": "RUPX", - "network": "mainnet", - "rpc": [], - "faucets": [], - "nativeCurrency": { - "name": "Rupaya", - "symbol": "RUPX", - "decimals": 18 - }, - "infoURL": "https://www.rupx.io", - "shortName": "rupx", - "chainId": 499, - "networkId": 499, - "slip44": 499 -} \ No newline at end of file diff --git a/_data/chains/50.json b/_data/chains/50.json deleted file mode 100644 index 2393460b..00000000 --- a/_data/chains/50.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "XinFin Network Mainnet", - "chain": "XDC", - "network": "mainnet", - "rpc": [ - "https://rpc.xinfin.network" - ], - "faucets": [], - "nativeCurrency": { - "name": "XinFin", - "symbol": "XDC", - "decimals": 18 - }, - "infoURL": "https://xinfin.org", - "shortName": "xdc", - "chainId": 50, - "networkId": 50 -} diff --git a/_data/chains/51.json b/_data/chains/51.json deleted file mode 100644 index 4c63ac40..00000000 --- a/_data/chains/51.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "XinFin Apothem Testnet", - "chain": "TXDC", - "network": "testnet", - "rpc": [ - "https://rpc.apothem.network" - ], - "faucets": [], - "nativeCurrency": { - "name": "XinFinTest", - "symbol": "TXDC", - "decimals": 18 - }, - "infoURL": "https://xinfin.org", - "shortName": "TXDC", - "chainId": 51, - "networkId": 51 -} diff --git a/_data/chains/1.json b/_data/chains/eip155-1.json similarity index 100% rename from _data/chains/1.json rename to _data/chains/eip155-1.json diff --git a/_data/chains/100.json b/_data/chains/eip155-100.json similarity index 100% rename from _data/chains/100.json rename to _data/chains/eip155-100.json diff --git a/_data/chains/101.json b/_data/chains/eip155-101.json similarity index 100% rename from _data/chains/101.json rename to _data/chains/eip155-101.json diff --git a/_data/chains/108.json b/_data/chains/eip155-108.json similarity index 100% rename from _data/chains/108.json rename to _data/chains/eip155-108.json diff --git a/_data/chains/11.json b/_data/chains/eip155-11.json similarity index 100% rename from _data/chains/11.json rename to _data/chains/eip155-11.json diff --git a/_data/chains/1122334455.json b/_data/chains/eip155-1122334455.json similarity index 100% rename from _data/chains/1122334455.json rename to _data/chains/eip155-1122334455.json diff --git a/_data/chains/12.json b/_data/chains/eip155-12.json similarity index 100% rename from _data/chains/12.json rename to _data/chains/eip155-12.json diff --git a/_data/chains/122.json b/_data/chains/eip155-122.json similarity index 100% rename from _data/chains/122.json rename to _data/chains/eip155-122.json diff --git a/_data/chains/13.json b/_data/chains/eip155-13.json similarity index 100% rename from _data/chains/13.json rename to _data/chains/eip155-13.json diff --git a/_data/chains/1313114.json b/_data/chains/eip155-1313114.json similarity index 100% rename from _data/chains/1313114.json rename to _data/chains/eip155-1313114.json diff --git a/_data/chains/1313161554.json b/_data/chains/eip155-1313161554.json similarity index 100% rename from _data/chains/1313161554.json rename to _data/chains/eip155-1313161554.json diff --git a/_data/chains/1313161555.json b/_data/chains/eip155-1313161555.json similarity index 100% rename from _data/chains/1313161555.json rename to _data/chains/eip155-1313161555.json diff --git a/_data/chains/1313500.json b/_data/chains/eip155-1313500.json similarity index 100% rename from _data/chains/1313500.json rename to _data/chains/eip155-1313500.json diff --git a/_data/chains/13371337.json b/_data/chains/eip155-13371337.json similarity index 100% rename from _data/chains/13371337.json rename to _data/chains/eip155-13371337.json diff --git a/_data/chains/137.json b/_data/chains/eip155-137.json similarity index 100% rename from _data/chains/137.json rename to _data/chains/eip155-137.json diff --git a/_data/chains/15.json b/_data/chains/eip155-15.json similarity index 100% rename from _data/chains/15.json rename to _data/chains/eip155-15.json diff --git a/_data/chains/162.json b/_data/chains/eip155-162.json similarity index 100% rename from _data/chains/162.json rename to _data/chains/eip155-162.json diff --git a/_data/chains/1620.json b/_data/chains/eip155-1620.json similarity index 100% rename from _data/chains/1620.json rename to _data/chains/eip155-1620.json diff --git a/_data/chains/163.json b/_data/chains/eip155-163.json similarity index 100% rename from _data/chains/163.json rename to _data/chains/eip155-163.json diff --git a/_data/chains/18.json b/_data/chains/eip155-18.json similarity index 100% rename from _data/chains/18.json rename to _data/chains/eip155-18.json diff --git a/_data/chains/18289463.json b/_data/chains/eip155-18289463.json similarity index 100% rename from _data/chains/18289463.json rename to _data/chains/eip155-18289463.json diff --git a/_data/chains/1856.json b/_data/chains/eip155-1856.json similarity index 100% rename from _data/chains/1856.json rename to _data/chains/eip155-1856.json diff --git a/_data/chains/1987.json b/_data/chains/eip155-1987.json similarity index 100% rename from _data/chains/1987.json rename to _data/chains/eip155-1987.json diff --git a/_data/chains/2.json b/_data/chains/eip155-2.json similarity index 100% rename from _data/chains/2.json rename to _data/chains/eip155-2.json diff --git a/_data/chains/20.json b/_data/chains/eip155-20.json similarity index 100% rename from _data/chains/20.json rename to _data/chains/eip155-20.json diff --git a/_data/chains/200625.json b/_data/chains/eip155-200625.json similarity index 100% rename from _data/chains/200625.json rename to _data/chains/eip155-200625.json diff --git a/_data/chains/21.json b/_data/chains/eip155-21.json similarity index 100% rename from _data/chains/21.json rename to _data/chains/eip155-21.json diff --git a/_data/chains/211.json b/_data/chains/eip155-211.json similarity index 100% rename from _data/chains/211.json rename to _data/chains/eip155-211.json diff --git a/_data/chains/24484.json b/_data/chains/eip155-24484.json similarity index 100% rename from _data/chains/24484.json rename to _data/chains/eip155-24484.json diff --git a/_data/chains/246.json b/_data/chains/eip155-246.json similarity index 100% rename from _data/chains/246.json rename to _data/chains/eip155-246.json diff --git a/_data/chains/246529.json b/_data/chains/eip155-246529.json similarity index 100% rename from _data/chains/246529.json rename to _data/chains/eip155-246529.json diff --git a/_data/chains/246785.json b/_data/chains/eip155-246785.json similarity index 100% rename from _data/chains/246785.json rename to _data/chains/eip155-246785.json diff --git a/_data/chains/250.json b/_data/chains/eip155-250.json similarity index 100% rename from _data/chains/250.json rename to _data/chains/eip155-250.json diff --git a/_data/chains/269.json b/_data/chains/eip155-269.json similarity index 100% rename from _data/chains/269.json rename to _data/chains/eip155-269.json diff --git a/_data/chains/28945486.json b/_data/chains/eip155-28945486.json similarity index 100% rename from _data/chains/28945486.json rename to _data/chains/eip155-28945486.json diff --git a/_data/chains/3.json b/_data/chains/eip155-3.json similarity index 100% rename from _data/chains/3.json rename to _data/chains/eip155-3.json diff --git a/_data/chains/30.json b/_data/chains/eip155-30.json similarity index 100% rename from _data/chains/30.json rename to _data/chains/eip155-30.json diff --git a/_data/chains/31.json b/_data/chains/eip155-31.json similarity index 100% rename from _data/chains/31.json rename to _data/chains/eip155-31.json diff --git a/_data/chains/31102.json b/_data/chains/eip155-31102.json similarity index 100% rename from _data/chains/31102.json rename to _data/chains/eip155-31102.json diff --git a/_data/chains/3125659152.json b/_data/chains/eip155-3125659152.json similarity index 100% rename from _data/chains/3125659152.json rename to _data/chains/eip155-3125659152.json diff --git a/_data/chains/35855456.json b/_data/chains/eip155-35855456.json similarity index 100% rename from _data/chains/35855456.json rename to _data/chains/eip155-35855456.json diff --git a/_data/chains/38.json b/_data/chains/eip155-38.json similarity index 100% rename from _data/chains/38.json rename to _data/chains/eip155-38.json diff --git a/_data/chains/385.json b/_data/chains/eip155-385.json similarity index 100% rename from _data/chains/385.json rename to _data/chains/eip155-385.json diff --git a/_data/chains/39797.json b/_data/chains/eip155-39797.json similarity index 100% rename from _data/chains/39797.json rename to _data/chains/eip155-39797.json diff --git a/_data/chains/4.json b/_data/chains/eip155-4.json similarity index 100% rename from _data/chains/4.json rename to _data/chains/eip155-4.json diff --git a/_data/chains/42.json b/_data/chains/eip155-42.json similarity index 100% rename from _data/chains/42.json rename to _data/chains/eip155-42.json diff --git a/_data/chains/420.json b/_data/chains/eip155-420.json similarity index 100% rename from _data/chains/420.json rename to _data/chains/eip155-420.json diff --git a/_data/chains/43110.json b/_data/chains/eip155-43110.json similarity index 100% rename from _data/chains/43110.json rename to _data/chains/eip155-43110.json diff --git a/_data/chains/49797.json b/_data/chains/eip155-49797.json similarity index 100% rename from _data/chains/49797.json rename to _data/chains/eip155-49797.json diff --git a/_data/chains/5.json b/_data/chains/eip155-5.json similarity index 100% rename from _data/chains/5.json rename to _data/chains/eip155-5.json diff --git a/_data/chains/558.json b/_data/chains/eip155-558.json similarity index 100% rename from _data/chains/558.json rename to _data/chains/eip155-558.json diff --git a/_data/chains/56.json b/_data/chains/eip155-56.json similarity index 100% rename from _data/chains/56.json rename to _data/chains/eip155-56.json diff --git a/_data/chains/5869.json b/_data/chains/eip155-5869.json similarity index 100% rename from _data/chains/5869.json rename to _data/chains/eip155-5869.json diff --git a/_data/chains/595.json b/_data/chains/eip155-595.json similarity index 100% rename from _data/chains/595.json rename to _data/chains/eip155-595.json diff --git a/_data/chains/6.json b/_data/chains/eip155-6.json similarity index 100% rename from _data/chains/6.json rename to _data/chains/eip155-6.json diff --git a/_data/chains/60.json b/_data/chains/eip155-60.json similarity index 100% rename from _data/chains/60.json rename to _data/chains/eip155-60.json diff --git a/_data/chains/61.json b/_data/chains/eip155-61.json similarity index 100% rename from _data/chains/61.json rename to _data/chains/eip155-61.json diff --git a/_data/chains/61717561.json b/_data/chains/eip155-61717561.json similarity index 100% rename from _data/chains/61717561.json rename to _data/chains/eip155-61717561.json diff --git a/_data/chains/62.json b/_data/chains/eip155-62.json similarity index 100% rename from _data/chains/62.json rename to _data/chains/eip155-62.json diff --git a/_data/chains/63.json b/_data/chains/eip155-63.json similarity index 100% rename from _data/chains/63.json rename to _data/chains/eip155-63.json diff --git a/_data/chains/64.json b/_data/chains/eip155-64.json similarity index 100% rename from _data/chains/64.json rename to _data/chains/eip155-64.json diff --git a/_data/chains/67.json b/_data/chains/eip155-67.json similarity index 100% rename from _data/chains/67.json rename to _data/chains/eip155-67.json diff --git a/_data/chains/686.json b/_data/chains/eip155-686.json similarity index 100% rename from _data/chains/686.json rename to _data/chains/eip155-686.json diff --git a/_data/chains/7.json b/_data/chains/eip155-7.json similarity index 100% rename from _data/chains/7.json rename to _data/chains/eip155-7.json diff --git a/_data/chains/73799.json b/_data/chains/eip155-73799.json similarity index 100% rename from _data/chains/73799.json rename to _data/chains/eip155-73799.json diff --git a/_data/chains/76.json b/_data/chains/eip155-76.json similarity index 100% rename from _data/chains/76.json rename to _data/chains/eip155-76.json diff --git a/_data/chains/77.json b/_data/chains/eip155-77.json similarity index 100% rename from _data/chains/77.json rename to _data/chains/eip155-77.json diff --git a/_data/chains/7762959.json b/_data/chains/eip155-7762959.json similarity index 100% rename from _data/chains/7762959.json rename to _data/chains/eip155-7762959.json diff --git a/_data/chains/78110.json b/_data/chains/eip155-78110.json similarity index 100% rename from _data/chains/78110.json rename to _data/chains/eip155-78110.json diff --git a/_data/chains/787.json b/_data/chains/eip155-787.json similarity index 100% rename from _data/chains/787.json rename to _data/chains/eip155-787.json diff --git a/_data/chains/8.json b/_data/chains/eip155-8.json similarity index 100% rename from _data/chains/8.json rename to _data/chains/eip155-8.json diff --git a/_data/chains/80001.json b/_data/chains/eip155-80001.json similarity index 100% rename from _data/chains/80001.json rename to _data/chains/eip155-80001.json diff --git a/_data/chains/82.json b/_data/chains/eip155-82.json similarity index 100% rename from _data/chains/82.json rename to _data/chains/eip155-82.json diff --git a/_data/chains/820.json b/_data/chains/eip155-820.json similarity index 100% rename from _data/chains/820.json rename to _data/chains/eip155-820.json diff --git a/_data/chains/821.json b/_data/chains/eip155-821.json similarity index 100% rename from _data/chains/821.json rename to _data/chains/eip155-821.json diff --git a/_data/chains/88.json b/_data/chains/eip155-88.json similarity index 100% rename from _data/chains/88.json rename to _data/chains/eip155-88.json diff --git a/_data/chains/8995.json b/_data/chains/eip155-8995.json similarity index 100% rename from _data/chains/8995.json rename to _data/chains/eip155-8995.json diff --git a/_data/chains/9.json b/_data/chains/eip155-9.json similarity index 100% rename from _data/chains/9.json rename to _data/chains/eip155-9.json diff --git a/_data/chains/97.json b/_data/chains/eip155-97.json similarity index 100% rename from _data/chains/97.json rename to _data/chains/eip155-97.json diff --git a/_data/chains/977.json b/_data/chains/eip155-977.json similarity index 100% rename from _data/chains/977.json rename to _data/chains/eip155-977.json diff --git a/_data/chains/99.json b/_data/chains/eip155-99.json similarity index 100% rename from _data/chains/99.json rename to _data/chains/eip155-99.json diff --git a/_data/chains/99415706.json b/_data/chains/eip155-99415706.json similarity index 100% rename from _data/chains/99415706.json rename to _data/chains/eip155-99415706.json diff --git a/src/main/kotlin/org/ethereum/lists/chains/Main.kt b/src/main/kotlin/org/ethereum/lists/chains/Main.kt index aafde6bd..cdb9168e 100644 --- a/src/main/kotlin/org/ethereum/lists/chains/Main.kt +++ b/src/main/kotlin/org/ethereum/lists/chains/Main.kt @@ -27,8 +27,12 @@ fun checkChain(it: File, connectRPC: Boolean) { val jsonObject = Klaxon().parseJsonObject(it.reader()) val chainAsLong = getNumber(jsonObject, "chainId") - if (chainAsLong != it.nameWithoutExtension.toLongOrNull()) { - throw(FileNameMustMatchChainId()) + if (it.nameWithoutExtension.startsWith("eip155-")) { + if (chainAsLong != it.nameWithoutExtension.replace("eip155-","").toLongOrNull()) { + throw(FileNameMustMatchChainId()) + } + } else { + throw(UnsupportedNamespace()) } if (it.extension != "json") { diff --git a/src/main/kotlin/org/ethereum/lists/chains/model/Exceptions.kt b/src/main/kotlin/org/ethereum/lists/chains/model/Exceptions.kt index 39b89769..a6451307 100644 --- a/src/main/kotlin/org/ethereum/lists/chains/model/Exceptions.kt +++ b/src/main/kotlin/org/ethereum/lists/chains/model/Exceptions.kt @@ -10,4 +10,5 @@ class ENSMustBeObject: Exception("ens must be an object") class ENSMustHaveOnlyRegistry: Exception("ens can only have a registry currently") class ENSRegistryAddressMustBeValid: Exception("ens registry must have valid address") class NameMustBeUnique(dup: String): Exception(" name must be unique - but found `$dup` more than once") -class ShortNameMustBeUnique(dup: String): Exception("short name must be unique - but found `$dup` more than once") \ No newline at end of file +class ShortNameMustBeUnique(dup: String): Exception("short name must be unique - but found `$dup` more than once") +class UnsupportedNamespace(): Exception("So far only the EIP155 namespace is supported") \ No newline at end of file diff --git a/src/test/kotlin/TheChainChecker.kt b/src/test/kotlin/TheChainChecker.kt index 8f8b9910..54ba0f21 100644 --- a/src/test/kotlin/TheChainChecker.kt +++ b/src/test/kotlin/TheChainChecker.kt @@ -15,35 +15,35 @@ class TheChainChecker { @Test fun shouldPassForValidChain() { - val file = getFile("valid/1.json") + val file = getFile("valid/eip155-1.json") checkChain(file, false) } @Test(expected = FileNameMustMatchChainId::class) fun shouldFailForInvalidFilename() { - val file = getFile("invalid/invalid_filename.json") + val file = getFile("invalid/eip155-invalid_filename.json") checkChain(file, false) } @Test(expected = FileNameMustMatchChainId::class) fun shouldFailForChainNotMatchingFilename() { - val file = getFile("invalid/3.json") + val file = getFile("invalid/eip155-3.json") checkChain(file, false) } @Test(expected = ShouldHaveNoExtraFields::class) fun shouldFailForExtraField() { - val file = getFile("invalid/1.json") + val file = getFile("invalid/eip155-1.json") checkChain(file, false) } @Test(expected = ShouldHaveNoMissingFields::class) fun shouldFailForMissingField() { - val file = getFile("invalid/4.json") + val file = getFile("invalid/eip155-4.json") checkChain(file, false) } @@ -51,62 +51,62 @@ class TheChainChecker { @Test(expected = ENSRegistryAddressMustBeValid::class) fun shouldFailForInvalidENSAddress() { - val file = getFile("invalid/99.json") + val file = getFile("invalid/eip155-99.json") checkChain(file, false) } @Test(expected = ENSMustHaveOnlyRegistry::class) fun shouldFailForExtraENSFields() { - val file = getFile("invalid/100.json") + val file = getFile("invalid/eip155-100.json") checkChain(file, false) } @Test(expected = ENSMustHaveOnlyRegistry::class) fun shouldFailForNoRegistryField() { - val file = getFile("invalid/101.json") + val file = getFile("invalid/eip155-101.json") checkChain(file, false) } @Test(expected = ENSMustBeObject::class) fun shouldFailForENSISNotObject() { - val file = getFile("invalid/102.json") + val file = getFile("invalid/eip155-102.json") checkChain(file, false) } @Test(expected = ExtensionMustBeJSON::class) fun shouldFailForNonJSON() { - val file = getFile("invalid/1.nojson") + val file = getFile("invalid/eip155-1.nojson") checkChain(file, false) } @Test(expected = JsonEncodingException::class) fun shouldFailForExtraComma() { - val file = getFile("invalid/extracomma.json") + val file = getFile("invalid/eip155-extracomma.json") checkChain(file, false) } @Test(expected = NameMustBeUnique::class) fun shouldFailOnNonUniqueName() { - checkChain(getFile("valid/1.json"), false) - checkChain(getFile("valid/1.json"), false) + checkChain(getFile("valid/eip155-1.json"), false) + checkChain(getFile("valid/eip155-1.json"), false) } @Test(expected = ShortNameMustBeUnique::class) fun shouldFailOnNonUniqueShortName() { - checkChain(getFile("invalid/sameshortname/5.json"), false) - checkChain(getFile("invalid/sameshortname/1.json"), false) + checkChain(getFile("invalid/sameshortname/eip155-5.json"), false) + checkChain(getFile("invalid/sameshortname/eip155-1.json"), false) } @Test fun canParse2chains() { - checkChain(getFile("valid/1.json"), false) - checkChain(getFile("valid/5.json"), false) + checkChain(getFile("valid/eip155-1.json"), false) + checkChain(getFile("valid/eip155-5.json"), false) } private fun getFile(s: String) = File(javaClass.classLoader.getResource("test_chains/$s").file) diff --git a/src/test/resources/test_chains/invalid/1.json b/src/test/resources/test_chains/invalid/eip155-1.json similarity index 100% rename from src/test/resources/test_chains/invalid/1.json rename to src/test/resources/test_chains/invalid/eip155-1.json diff --git a/src/test/resources/test_chains/invalid/1.nojson b/src/test/resources/test_chains/invalid/eip155-1.nojson similarity index 100% rename from src/test/resources/test_chains/invalid/1.nojson rename to src/test/resources/test_chains/invalid/eip155-1.nojson diff --git a/src/test/resources/test_chains/invalid/100.json b/src/test/resources/test_chains/invalid/eip155-100.json similarity index 100% rename from src/test/resources/test_chains/invalid/100.json rename to src/test/resources/test_chains/invalid/eip155-100.json diff --git a/src/test/resources/test_chains/invalid/101.json b/src/test/resources/test_chains/invalid/eip155-101.json similarity index 100% rename from src/test/resources/test_chains/invalid/101.json rename to src/test/resources/test_chains/invalid/eip155-101.json diff --git a/src/test/resources/test_chains/invalid/102.json b/src/test/resources/test_chains/invalid/eip155-102.json similarity index 100% rename from src/test/resources/test_chains/invalid/102.json rename to src/test/resources/test_chains/invalid/eip155-102.json diff --git a/src/test/resources/test_chains/invalid/2.json b/src/test/resources/test_chains/invalid/eip155-2.json similarity index 100% rename from src/test/resources/test_chains/invalid/2.json rename to src/test/resources/test_chains/invalid/eip155-2.json diff --git a/src/test/resources/test_chains/invalid/3.json b/src/test/resources/test_chains/invalid/eip155-3.json similarity index 100% rename from src/test/resources/test_chains/invalid/3.json rename to src/test/resources/test_chains/invalid/eip155-3.json diff --git a/src/test/resources/test_chains/invalid/4.json b/src/test/resources/test_chains/invalid/eip155-4.json similarity index 100% rename from src/test/resources/test_chains/invalid/4.json rename to src/test/resources/test_chains/invalid/eip155-4.json diff --git a/src/test/resources/test_chains/invalid/99.json b/src/test/resources/test_chains/invalid/eip155-99.json similarity index 100% rename from src/test/resources/test_chains/invalid/99.json rename to src/test/resources/test_chains/invalid/eip155-99.json diff --git a/src/test/resources/test_chains/invalid/extracomma.json b/src/test/resources/test_chains/invalid/eip155-extracomma.json similarity index 100% rename from src/test/resources/test_chains/invalid/extracomma.json rename to src/test/resources/test_chains/invalid/eip155-extracomma.json diff --git a/src/test/resources/test_chains/invalid/invalid_filename.json b/src/test/resources/test_chains/invalid/eip155-invalid_filename.json similarity index 100% rename from src/test/resources/test_chains/invalid/invalid_filename.json rename to src/test/resources/test_chains/invalid/eip155-invalid_filename.json diff --git a/src/test/resources/test_chains/invalid/sameshortname/1.json b/src/test/resources/test_chains/invalid/sameshortname/eip155-1.json similarity index 100% rename from src/test/resources/test_chains/invalid/sameshortname/1.json rename to src/test/resources/test_chains/invalid/sameshortname/eip155-1.json diff --git a/src/test/resources/test_chains/invalid/sameshortname/5.json b/src/test/resources/test_chains/invalid/sameshortname/eip155-5.json similarity index 100% rename from src/test/resources/test_chains/invalid/sameshortname/5.json rename to src/test/resources/test_chains/invalid/sameshortname/eip155-5.json diff --git a/src/test/resources/test_chains/valid/1.json b/src/test/resources/test_chains/valid/eip155-1.json similarity index 100% rename from src/test/resources/test_chains/valid/1.json rename to src/test/resources/test_chains/valid/eip155-1.json diff --git a/src/test/resources/test_chains/valid/5.json b/src/test/resources/test_chains/valid/eip155-5.json similarity index 100% rename from src/test/resources/test_chains/valid/5.json rename to src/test/resources/test_chains/valid/eip155-5.json