From a364c35a47088ff85c1889276996bfb687604225 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Tue, 21 Sep 2021 13:39:49 -0400 Subject: [PATCH 1/4] Remove morden testnet --- docs/web3-eth-net.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/web3-eth-net.rst b/docs/web3-eth-net.rst index b32284c04e7..8aadff77a79 100644 --- a/docs/web3-eth-net.rst +++ b/docs/web3-eth-net.rst @@ -33,7 +33,6 @@ Returns ``Promise`` returns ``String``: - ``"main"`` for main network - - ``"morden"`` for the morden test network - ``"ropsten"`` for the morden test network - ``"private"`` for undetectable networks. From 6fd0b0f941c918a2315fa40d01584a4026d38c90 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Tue, 21 Sep 2021 13:40:56 -0400 Subject: [PATCH 2/4] remove morden --- test/eth.net.getNetworkType.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/eth.net.getNetworkType.js b/test/eth.net.getNetworkType.js index 132f44056e3..9cc6fec756c 100644 --- a/test/eth.net.getNetworkType.js +++ b/test/eth.net.getNetworkType.js @@ -7,10 +7,6 @@ var tests = [{ hash: '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3', id: 1, result: 'main' -},{ - hash: '0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303', - id: 2, - result: 'morden' },{ hash: '0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d', id: 3, From 8b9bdb9fa5af528e987c1ed4262e43ee60657ea0 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Tue, 21 Sep 2021 13:41:48 -0400 Subject: [PATCH 3/4] Remove Morden --- packages/web3-eth/src/getNetworkType.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/web3-eth/src/getNetworkType.js b/packages/web3-eth/src/getNetworkType.js index 5f9b9b31e57..dec73702753 100644 --- a/packages/web3-eth/src/getNetworkType.js +++ b/packages/web3-eth/src/getNetworkType.js @@ -41,10 +41,6 @@ var getNetworkType = function (callback) { id === 1) { returnValue = 'main'; } - if (genesis.hash === '0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303' && - id === 2) { - returnValue = 'morden'; - } if (genesis.hash === '0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d' && id === 3) { returnValue = 'ropsten'; From 69be4b4ace674f8795a149af644059711b8fb704 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Mon, 7 Feb 2022 19:35:42 -0500 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81ee4f921b1..b4116741bbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -514,5 +514,10 @@ Released with 1.0.0-beta.37 code base. ### Changed - Muted E2E gnosis dex tests in CI until fix for issue #4436 is applied (#4701) + +### Removed +- Removed deprecated Morden testnet code (#4339) + + ### Security -- Ran `npm audit fix` to address vulnerabilities and update libraries (#4719) (#4728) \ No newline at end of file +- Ran `npm audit fix` to address vulnerabilities and update libraries (#4719) (#4728)