From ce324fafe11db4a23500f9d5b281e09b1fca9865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Mon, 6 Feb 2023 16:43:57 +0100 Subject: [PATCH 1/4] Remove sokol chain support --- src/Nethermind/Chains/sokol.json | 253 ------------------ .../ConfigFileTestsBase.cs | 7 +- .../Nethermind.Core/BlockchainIds.cs | 1 - .../ConfigFilesTests.cs | 16 +- .../Nethermind.Runner.Test.csproj | 3 - .../Properties/launchSettings.json | 7 - .../Nethermind.Runner/configs/sokol.cfg | 38 --- .../configs/sokol_archive.cfg | 28 -- .../configs/sokol_validator.cfg | 35 --- .../ChainSpecStyle/ChainSpecLoaderTests.cs | 47 +--- .../Nethermind.Specs/KnownHashes.cs | 2 - src/Nethermind/Nethermind.sln | 1 - 12 files changed, 4 insertions(+), 434 deletions(-) delete mode 100644 src/Nethermind/Chains/sokol.json delete mode 100644 src/Nethermind/Nethermind.Runner/configs/sokol.cfg delete mode 100644 src/Nethermind/Nethermind.Runner/configs/sokol_archive.cfg delete mode 100644 src/Nethermind/Nethermind.Runner/configs/sokol_validator.cfg diff --git a/src/Nethermind/Chains/sokol.json b/src/Nethermind/Chains/sokol.json deleted file mode 100644 index a974aa826a9..00000000000 --- a/src/Nethermind/Chains/sokol.json +++ /dev/null @@ -1,253 +0,0 @@ -{ - "name": "Sokol", - "engine": { - "authorityRound": { - "params": { - "stepDuration": 5, - "blockReward": "0xDE0B6B3A7640000", - "maximumUncleCountTransition": 0, - "maximumUncleCount": 0, - "validators": { - "multi": { - "0": { - "safeContract": "0x8bf38d4764929064f2d4d3a56520a76ab3df415b" - }, - "362296": { - "safeContract": "0xf5cE3f5D0366D6ec551C74CCb1F67e91c56F2e34" - }, - "509355": { - "safeContract": "0x03048F666359CFD3C74a1A5b9a97848BF71d5038" - }, - "4622420": { - "safeContract": "0x4c6a159659CCcb033F4b2e2Be0C16ACC62b89DDB" - } - } - }, - "blockRewardContractAddress": "0x3145197AD50D7083D0222DE4fCCf67d9BD05C30D", - "blockRewardContractTransition": 4639000, - "randomnessContractAddress": { - "13391641": "0x8f2b78169B0970F11a762e56659Db52B59CBCf1B" - } - } - } - }, - "params": { - "gasLimitBoundDivisor": "0x400", - "maximumExtraDataSize": "0x20", - "minGasLimit": "0x1388", - "networkID": "0x4D", - "eip140Transition": "0x0", - "eip211Transition": "0x0", - "eip214Transition": "0x0", - "eip658Transition": "0x0", - "eip145Transition": 6464300, - "eip1014Transition": 6464300, - "eip1052Transition": 6464300, - "eip1283Transition": 6464300, - "eip1283DisableTransition": 7026400, - "eip152Transition": 12095200, - "eip1108Transition": 12095200, - "eip1283ReenableTransition": 12095200, - "eip1344Transition": 12095200, - "eip1706Transition": 12095200, - "eip1884Transition": 12095200, - "eip2028Transition": 12095200, - "eip2565Transition": 21050600, - "eip2929Transition": 21050600, - "eip2930Transition": 21050600, - "eip3198Transition": 24114400, - "eip3529Transition": 24114400, - "eip3541Transition": 24114400, - "eip1559Transition": 24114400, - "eip1559BaseFeeMaxChangeDenominator": "0x8", - "eip1559ElasticityMultiplier": "0x2", - "eip1559BaseFeeInitialValue": "0x3b9aca00", - "eip1559FeeCollector": "0xE8DDc5c7A2d2F0D7a9798459c0104fDf5E987ACA", - "eip1559FeeCollectorTransition": 24114400 - }, - "genesis": { - "seal": { - "authorityRound": { - "step": "0x0", - "signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - } - }, - "difficulty": "0x20000", - "gasLimit": "0x663BE0" - }, - "nodes": [ - "enode://cc978cc512bb24e95e88f0f3f6acdeef91810600900ef7a9eb88ba756188f8ee159ff1d45bba29cf653a5245279dce459e21ddd8aba8661e6d1ce9b3109caaa5@45.77.52.149:30313", - "enode://10eb38a1b0384d478c98b763b5d608b79bdb1e9777391cb7fcec2d1c68f80ce2c958589e958d1d9319fd8a7713c3480444cab109091ad5cae273798dd50f9728@104.248.49.16:30303", - "enode://f11a0f80939b49a28bf99581da9b351a592ec1504b9d32a7dfda79b36510a891e96631239c4166e5c73368c21e9bb3241e7fd6929b899772e5a8fe9a7b7c3af6@45.77.52.149:30303" - ], - "accounts": { - "0000000000000000000000000000000000000005": { - "builtin": { - "name": "modexp", - "pricing": { - "0": { - "price": { - "modexp": { - "divisor": 20 - } - } - } - } - } - }, - "0000000000000000000000000000000000000006": { - "builtin": { - "name": "alt_bn128_add", - "pricing": { - "0": { - "price": { - "alt_bn128_const_operations": { - "price": 500 - } - } - }, - "12095200": { - "info": "Istanbul HF", - "price": { - "alt_bn128_const_operations": { - "price": 150 - } - } - } - } - } - }, - "0000000000000000000000000000000000000007": { - "builtin": { - "name": "alt_bn128_mul", - "pricing": { - "0": { - "price": { - "alt_bn128_const_operations": { - "price": 40000 - } - } - }, - "12095200": { - "info": "Istanbul HF", - "price": { - "alt_bn128_const_operations": { - "price": 6000 - } - } - } - } - } - }, - "0000000000000000000000000000000000000008": { - "builtin": { - "name": "alt_bn128_pairing", - "pricing": { - "0": { - "price": { - "alt_bn128_pairing": { - "base": 100000, - "pair": 80000 - } - } - }, - "12095200": { - "info": "Istanbul HF", - "price": { - "alt_bn128_pairing": { - "base": 45000, - "pair": 34000 - } - } - } - } - } - }, - "0x0000000000000000000000000000000000000009": { - "builtin": { - "name": "blake2_f", - "pricing": { - "12095200": { - "info": "Istanbul HF", - "price": { - "blake2_f": { - "gas_per_round": 1 - } - } - } - } - } - }, - "0x0000000000000000000000000000000000000001": { - "balance": "1", - "builtin": { - "name": "ecrecover", - "pricing": { - "0": { - "price": { - "linear": { - "base": 3000, - "word": 0 - } - } - } - } - } - }, - "0x0000000000000000000000000000000000000002": { - "balance": "1", - "builtin": { - "name": "sha256", - "pricing": { - "0": { - "price": { - "linear": { - "base": 60, - "word": 12 - } - } - } - } - } - }, - "0x0000000000000000000000000000000000000003": { - "balance": "1", - "builtin": { - "name": "ripemd160", - "pricing": { - "0": { - "price": { - "linear": { - "base": 600, - "word": 120 - } - } - } - } - } - }, - "0x0000000000000000000000000000000000000004": { - "balance": "1", - "builtin": { - "name": "identity", - "pricing": { - "0": { - "price": { - "linear": { - "base": 15, - "word": 3 - } - } - } - } - } - }, - "0xe8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca": { - "balance": "252460800000000000000000000" - }, - "0x8bf38d4764929064f2d4d3a56520a76ab3df415b": { - "balance": "1", - "constructor": "0x606060405260008060006101000a81548160ff0219169083151502179055506000600460006101000a81548160ff0219169083151502179055506000600460016101000a81548160ff02191690831515021790555073fffffffffffffffffffffffffffffffffffffffe600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055503415620000b557600080fd5b604051602080620018c98339810160405280805190602001909190505060008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141515156200011057600080fd5b81600460026101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550602060405190810160405280600460029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152506006906001620001c1929190620002cb565b50600090505b600680549050811015620002a257604080519081016040528060011515815260200182815250600960006006848154811015156200020157fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548160ff021916908315150217905550602082015181600101559050508080600101915050620001c7565b60068054905060088190555060066007908054620002c29291906200035a565b505050620003f7565b82805482825590600052602060002090810192821562000347579160200282015b82811115620003465782518260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555091602001919060010190620002ec565b5b509050620003569190620003b1565b5090565b8280548282559060005260206000209081019282156200039e5760005260206000209182015b828111156200039d57825482559160010191906001019062000380565b5b509050620003ad9190620003b1565b5090565b620003f491905b80821115620003f057600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550600101620003b8565b5090565b90565b6114c280620004076000396000f3006060604052600436106100fc576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806303aca79214610101578063108552691461016457806340a141ff1461019d57806340c9cdeb146101d65780634110a489146101ff57806345199e0a1461025757806349285b58146102c15780634d238c8e14610316578063752862111461034f578063900eb5a8146103645780639a573786146103c7578063a26a47d21461041c578063ae4b1b5b14610449578063b3f05b971461049e578063b7ab4db5146104cb578063d3e848f114610535578063fa81b2001461058a578063facd743b146105df575b600080fd5b341561010c57600080fd5b6101226004808035906020019091905050610630565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561016f57600080fd5b61019b600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190505061066f565b005b34156101a857600080fd5b6101d4600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610807565b005b34156101e157600080fd5b6101e9610bb7565b6040518082815260200191505060405180910390f35b341561020a57600080fd5b610236600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610bbd565b60405180831515151581526020018281526020019250505060405180910390f35b341561026257600080fd5b61026a610bee565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156102ad578082015181840152602081019050610292565b505050509050019250505060405180910390f35b34156102cc57600080fd5b6102d4610c82565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561032157600080fd5b61034d600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610d32565b005b341561035a57600080fd5b610362610fcc565b005b341561036f57600080fd5b61038560048080359060200190919050506110fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103d257600080fd5b6103da61113b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561042757600080fd5b61042f6111eb565b604051808215151515815260200191505060405180910390f35b341561045457600080fd5b61045c6111fe565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156104a957600080fd5b6104b1611224565b604051808215151515815260200191505060405180910390f35b34156104d657600080fd5b6104de611237565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b83811015610521578082015181840152602081019050610506565b505050509050019250505060405180910390f35b341561054057600080fd5b6105486112cb565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561059557600080fd5b61059d6112f1565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156105ea57600080fd5b610616600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611317565b604051808215151515815260200191505060405180910390f35b60078181548110151561063f57fe5b90600052602060002090016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156106cb57600080fd5b600460019054906101000a900460ff161515156106e757600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561072357600080fd5b80600a60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600460016101000a81548160ff0219169083151502179055507f600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a150565b600080600061081461113b565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561084d57600080fd5b83600960008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900460ff1615156108a957600080fd5b600960008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101549350600160078054905003925060078381548110151561090857fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1691508160078581548110151561094657fe5b906000526020600020900160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555083600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101819055506007838154811015156109e557fe5b906000526020600020900160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000600780549050111515610a2757600080fd5b6007805480919060019003610a3c9190611370565b506000600960008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101819055506000600960008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160006101000a81548160ff0219169083151502179055506000600460006101000a81548160ff0219169083151502179055506001430340600019167f55252fa6eee4741b4e24a74a70e9c11fd2c2281df8d6ea13126ff845f7825c89600760405180806020018281038252838181548152602001915080548015610ba257602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610b58575b50509250505060405180910390a25050505050565b60085481565b60096020528060005260406000206000915090508060000160009054906101000a900460ff16908060010154905082565b610bf661139c565b6007805480602002602001604051908101604052809291908181526020018280548015610c7857602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610c2e575b5050505050905090565b6000600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166349285b586000604051602001526040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b1515610d1257600080fd5b6102c65a03f11515610d2357600080fd5b50505060405180519050905090565b610d3a61113b565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610d7357600080fd5b80600960008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900460ff16151515610dd057600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614151515610e0c57600080fd5b6040805190810160405280600115158152602001600780549050815250600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548160ff0219169083151502179055506020820151816001015590505060078054806001018281610ea991906113b0565b9160005260206000209001600084909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506000600460006101000a81548160ff0219169083151502179055506001430340600019167f55252fa6eee4741b4e24a74a70e9c11fd2c2281df8d6ea13126ff845f7825c89600760405180806020018281038252838181548152602001915080548015610fba57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610f70575b50509250505060405180910390a25050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161480156110365750600460009054906101000a900460ff16155b151561104157600080fd5b6001600460006101000a81548160ff0219169083151502179055506007600690805461106e9291906113dc565b506006805490506008819055507f8564cd629b15f47dc310d45bcbfc9bcf5420b0d51bf0659a16c67f91d27632536110a4611237565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156110e75780820151818401526020810190506110cc565b505050509050019250505060405180910390a1565b60068181548110151561110b57fe5b90600052602060002090016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16639a5737866000604051602001526040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15156111cb57600080fd5b6102c65a03f115156111dc57600080fd5b50505060405180519050905090565b600460019054906101000a900460ff1681565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900460ff1681565b61123f61139c565b60068054806020026020016040519081016040528092919081815260200182805480156112c157602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311611277575b5050505050905090565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000600960008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900460ff169050919050565b81548183558181151161139757818360005260206000209182019101611396919061142e565b5b505050565b602060405190810160405280600081525090565b8154818355818115116113d7578183600052602060002091820191016113d6919061142e565b5b505050565b82805482825590600052602060002090810192821561141d5760005260206000209182015b8281111561141c578254825591600101919060010190611401565b5b50905061142a9190611453565b5090565b61145091905b8082111561144c576000816000905550600101611434565b5090565b90565b61149391905b8082111561148f57600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550600101611459565b5090565b905600a165627a7a7230582036ea35935c8246b68074adece2eab70c40e69a0193c08a6277ce06e5b25188510029000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca" - } - } -} diff --git a/src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs b/src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs index c881ae852d8..d77ff2e1cd3 100644 --- a/src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs +++ b/src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs @@ -60,11 +60,7 @@ protected IEnumerable RopstenConfigs [ConfigFileGroup("poacore")] protected IEnumerable PoaCoreConfigs => Configs.Where(config => config.Contains("poacore")); - - [ConfigFileGroup("sokol")] - protected IEnumerable SokolConfigs - => Configs.Where(config => config.Contains("sokol")); - + [ConfigFileGroup("volta")] protected IEnumerable VoltaConfigs => Configs.Where(config => config.Contains("volta")); @@ -112,7 +108,6 @@ protected IEnumerable NdmConfigs [ConfigFileGroup("aura")] protected IEnumerable AuraConfigs => PoaCoreConfigs - .Union(SokolConfigs) .Union(XDaiConfigs) .Union(VoltaConfigs) .Union(EnergyConfigs) diff --git a/src/Nethermind/Nethermind.Core/BlockchainIds.cs b/src/Nethermind/Nethermind.Core/BlockchainIds.cs index faf9635c44a..771f83b7146 100644 --- a/src/Nethermind/Nethermind.Core/BlockchainIds.cs +++ b/src/Nethermind/Nethermind.Core/BlockchainIds.cs @@ -17,7 +17,6 @@ namespace Nethermind.Core /// 8: Ubiq, the public Gubiq main network with flux difficulty chain ID 8 /// 42: Kovan, the public Parity-only PoA testnet /// 60: GoChain, the GoChain networks mainnet - /// 77: Sokol, the public POA Network testnet /// 99: Core, the public POA Network main network /// 100: xDai, the public MakerDAO/POA Network main network /// 246: EnergyWeb, the public Energyweb main network diff --git a/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs b/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs index 9a68c4563b2..26e39fe5afb 100644 --- a/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs +++ b/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs @@ -78,7 +78,6 @@ public void Networking_is_disabled_when_needed(string configWildcard, bool isEna [TestCase("rinkeby", "ws://localhost:3000/api")] [TestCase("goerli", "wss://stats.goerli.net/api")] [TestCase("mainnet", "wss://ethstats.net/api")] - [TestCase("sokol", "ws://localhost:3000/api")] [TestCase("poacore", "ws://localhost:3000/api")] [TestCase("xdai", "ws://localhost:3000/api")] [TestCase("spaceneth", "ws://localhost:3000/api")] @@ -104,7 +103,6 @@ public void Geth_limits_configs_are_correct(string configWildcard, bool useGethL [TestCase("rinkeby", "0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177")] [TestCase("goerli", "0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")] [TestCase("mainnet", "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")] - [TestCase("sokol", "0x5b28c1bfd3a15230c9a46b399cd0f9a6920d432e85381cc6a140b06e8410112f")] [TestCase("poacore", "0x39f02c003dde5b073b3f6e1700fc0b84b4877f6839bb23edadd3d2d82a488634")] [TestCase("xdai", "0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756")] [TestCase("volta", "0xebd8b413ca7b7f84a8dd20d17519ce2b01954c74d94a0a739a3e416abe0e43e5")] @@ -174,8 +172,6 @@ public void Cache_state_index(string configWildcard, bool expectedValue) [TestCase("xdai ^archive", 768000000)] [TestCase("poacore archive", 1024000000)] [TestCase("poacore ^archive", 768000000)] - [TestCase("sokol archive", 768000000)] - [TestCase("sokol ^archive", 512000000)] [TestCase("spaceneth.cfg", 64000000)] [TestCase("spaceneth_persistent.cfg", 128000000)] public void Memory_hint_values_are_correct(string configWildcard, long expectedValue) @@ -213,8 +209,8 @@ public void Network_diag_tracer_disabled_by_default(string configWildcard) } [TestCase("mainnet xdai poacore energy", 2048)] - [TestCase("^baseline ^mainnet ^spaceneth ^volta ^energy ^sokol ^poacore ^xdai", 1024)] - [TestCase("baseline volta sokol", 512)] + [TestCase("^baseline ^mainnet ^spaceneth ^volta ^energy ^poacore ^xdai", 1024)] + [TestCase("baseline volta", 512)] [TestCase("spaceneth", 128)] public void Tx_pool_defaults_are_correct(string configWildcard, int poolSize) { @@ -259,7 +255,6 @@ public void Fast_sync_settings_as_expected(string configWildcard, bool downloadB [TestCase("rinkeby.cfg", false)] [TestCase("sepolia.cfg", true)] [TestCase("xdai.cfg", false)] - [TestCase("sokol.cfg", false)] public void Snap_sync_settings_as_expected(string configWildcard, bool enabled) { Test(configWildcard, c => c.SnapSync, enabled); @@ -326,7 +321,6 @@ public void Clique_pivots_divide_by_30000_epoch_length(string configWildcard) [TestCase("goerli", false)] [TestCase("mainnet_archive.cfg", true)] [TestCase("mainnet.cfg", true)] - [TestCase("sokol", false)] [TestCase("poacore", true)] [TestCase("xdai", true)] [TestCase("volta", false)] @@ -351,9 +345,6 @@ public void Basic_configs_are_as_expected(string configWildcard, bool isProducti [TestCase("rinkeby")] [TestCase("goerli", new[] { 16, 16, 16, 16 })] [TestCase("mainnet")] - [TestCase("sokol.cfg", new[] { 16, 16, 16, 16 })] - [TestCase("sokol_archive.cfg", new[] { 16, 16, 16, 16 })] - [TestCase("sokol_validator.cfg", null, false)] [TestCase("poacore.cfg", new[] { 16, 16, 16, 16 })] [TestCase("poacore_archive.cfg", new[] { 16, 16, 16, 16 })] [TestCase("poacore_validator.cfg", null, false)] @@ -441,9 +432,6 @@ public void Memory_hint_is_enough(string configWildcard) "kovan_archive.cfg", "mainnet_archive.cfg", "mainnet.cfg", - "sokol.cfg", - "sokol_archive.cfg", - "sokol_validator.cfg", "poacore.cfg", "poacore_archive.cfg", "poacore_validator.cfg", diff --git a/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj b/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj index 6913c0068b0..14a138a4be5 100644 --- a/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj +++ b/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj @@ -49,9 +49,6 @@ Chains\ropsten.json - - Chains\sokol.json - Chains\spaceneth.json diff --git a/src/Nethermind/Nethermind.Runner/Properties/launchSettings.json b/src/Nethermind/Nethermind.Runner/Properties/launchSettings.json index b8757488a16..7d3499b365b 100644 --- a/src/Nethermind/Nethermind.Runner/Properties/launchSettings.json +++ b/src/Nethermind/Nethermind.Runner/Properties/launchSettings.json @@ -119,13 +119,6 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Sokol": { - "commandName": "Project", - "commandLineArgs": "-c sokol -dd %NETHERMIND_DATA_DIR% --JsonRpc.Enabled true", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, "Spaceneth": { "commandName": "Project", "commandLineArgs": "-c spaceneth -dd %NETHERMIND_DATA_DIR% --JsonRpc.Enabled true", diff --git a/src/Nethermind/Nethermind.Runner/configs/sokol.cfg b/src/Nethermind/Nethermind.Runner/configs/sokol.cfg deleted file mode 100644 index 1fae6d5c5c8..00000000000 --- a/src/Nethermind/Nethermind.Runner/configs/sokol.cfg +++ /dev/null @@ -1,38 +0,0 @@ -{ - "Init": { - "ChainSpecPath": "chainspec/sokol.json", - "GenesisHash": "0x5b28c1bfd3a15230c9a46b399cd0f9a6920d432e85381cc6a140b06e8410112f", - "BaseDbPath": "nethermind_db/sokol", - "LogFileName": "sokol.logs.txt", - "MemoryHint": 512000000 - }, - "TxPool": { - "Size": 512 - }, - "Sync": { - "FastSync": true, - "PivotNumber": 27720000, - "PivotHash": "0x4036322df9327beb7711a1c12a4ceede14cbc1daf95039c886bf9d81bf558d36", - "PivotTotalDifficulty": "9432627211048414207204744118008614821198573088", - "FastBlocks": true, - "UseGethLimitsInFastBlocks": false, - "FastSyncCatchUpHeightDelta": 10000000000 - }, - "EthStats": { - "Name": "Nethermind Sokol" - }, - "Metrics": { - "NodeName": "Sokol" - }, - "Bloom": { - "IndexLevelBucketSizes": [ - 16, - 16, - 16, - 16 - ] - }, - "Merge": { - "Enabled": false - } -} \ No newline at end of file diff --git a/src/Nethermind/Nethermind.Runner/configs/sokol_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/sokol_archive.cfg deleted file mode 100644 index 68b2f2c8efa..00000000000 --- a/src/Nethermind/Nethermind.Runner/configs/sokol_archive.cfg +++ /dev/null @@ -1,28 +0,0 @@ -{ - "Init": { - "ChainSpecPath": "chainspec/sokol.json", - "GenesisHash": "0x5b28c1bfd3a15230c9a46b399cd0f9a6920d432e85381cc6a140b06e8410112f", - "BaseDbPath": "nethermind_db/sokol_archive", - "LogFileName": "sokol_archive.logs.txt", - "MemoryHint": 768000000 - }, - "TxPool": { - "Size": 512 - }, - "EthStats": { - "Name": "Nethermind Sokol" - }, - "Metrics": { - "NodeName": "Sokol Archive" - }, - "Bloom": - { - "IndexLevelBucketSizes" : [16, 16, 16, 16] - }, - "Pruning": { - "Mode": "None" - }, - "Merge": { - "Enabled": false - } -} \ No newline at end of file diff --git a/src/Nethermind/Nethermind.Runner/configs/sokol_validator.cfg b/src/Nethermind/Nethermind.Runner/configs/sokol_validator.cfg deleted file mode 100644 index a131cd133e0..00000000000 --- a/src/Nethermind/Nethermind.Runner/configs/sokol_validator.cfg +++ /dev/null @@ -1,35 +0,0 @@ -{ - "Init": { - "StoreReceipts" : false, - "IsMining": true, - "ChainSpecPath": "chainspec/sokol.json", - "GenesisHash": "0x5b28c1bfd3a15230c9a46b399cd0f9a6920d432e85381cc6a140b06e8410112f", - "BaseDbPath": "nethermind_db/sokol_validator", - "LogFileName": "sokol_validator.logs.txt", - "MemoryHint": 512000000 - }, - "Sync": { - "FastSync": true, - "DownloadBodiesInFastSync": true, - "DownloadReceiptsInFastSync": false, - "PivotNumber": 12900000, - "PivotHash": "0xfb289bb3da92d8b30646fbab70d23f915bd487214e298958e0bd6827cedb5db7", - "PivotTotalDifficulty": "4389642533280106178677532436000000000000000000", - "FastBlocks": true, - "UseGethLimitsInFastBlocks": false, - "FastSyncCatchUpHeightDelta": 10000000000 - }, - "EthStats": { - "Name": "Nethermind Sokol" - }, - "Metrics": { - "NodeName": "Sokol Validator" - }, - "Bloom": - { - "Index" : false - }, - "Merge": { - "Enabled": false - } -} \ No newline at end of file diff --git a/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs b/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs index 285e82b3800..ab732603451 100644 --- a/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs +++ b/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs @@ -288,52 +288,7 @@ public void Can_load_mainnet() //should be added one the timestamp for Shanghai is know and included in the chainspec for mainent. //chainSpec.ShanghaiTimestamp.Should().Be(MainnetSpecProvider.ShanghaiBlockTimestamp); } - - [Test] - public void Can_load_sokol() - { - string path = Path.Combine(TestContext.CurrentContext.WorkDirectory, "../../../../", "Chains/sokol.json"); - ChainSpec chainSpec = LoadChainSpec(path); - - Assert.AreEqual(1.GWei(), chainSpec.Parameters.Eip1559BaseFeeInitialValue, $"fork base fee"); - Assert.AreEqual(0x4d, chainSpec.NetworkId, $"{nameof(chainSpec.NetworkId)}"); - Assert.AreEqual("Sokol", chainSpec.Name, $"{nameof(chainSpec.Name)}"); - Assert.AreEqual(SealEngineType.AuRa, chainSpec.SealEngineType, "engine"); - Assert.NotNull(chainSpec.AuRa, "AuRa"); - Assert.AreEqual(0, chainSpec.AuRa.MaximumUncleCount, "maximum uncle count"); - Assert.AreEqual(0L, chainSpec.AuRa.MaximumUncleCountTransition, "maximum uncle count tr"); - Assert.AreEqual(5L, chainSpec.AuRa.StepDuration[0], "step duration"); - Assert.AreEqual(UInt256.Parse("1000000000000000000"), chainSpec.AuRa.BlockReward[0], "rew"); - Assert.AreEqual(4639000, chainSpec.AuRa.BlockRewardContractTransition, "rew tr"); - Assert.AreEqual(new Address("0x3145197AD50D7083D0222DE4fCCf67d9BD05C30D"), chainSpec.AuRa.BlockRewardContractAddress, "rew add"); - - Assert.AreEqual(new Address("0x8bf38d4764929064f2d4d3a56520a76ab3df415b"), chainSpec.AuRa.Validators.Validators[0].Addresses.First(), "val 0"); - Assert.AreEqual(new Address("0xf5cE3f5D0366D6ec551C74CCb1F67e91c56F2e34"), chainSpec.AuRa.Validators.Validators[362296].Addresses.First(), "val 362296"); - Assert.AreEqual(new Address("0x03048F666359CFD3C74a1A5b9a97848BF71d5038"), chainSpec.AuRa.Validators.Validators[509355].Addresses.First(), "val 509355"); - Assert.AreEqual(new Address("0x4c6a159659CCcb033F4b2e2Be0C16ACC62b89DDB"), chainSpec.AuRa.Validators.Validators[4622420].Addresses.First(), "val 4622420"); - - Assert.AreEqual(0, chainSpec.HomesteadBlockNumber, "homestead no"); - Assert.AreEqual(null, chainSpec.DaoForkBlockNumber, "dao no"); - - Assert.AreEqual((long?)0, chainSpec.Parameters.Eip140Transition, "eip140"); - - Assert.AreEqual((long?)0, chainSpec.Parameters.Eip150Transition, "eip150"); - Assert.AreEqual((long?)0, chainSpec.Parameters.Eip160Transition, "eip160"); - Assert.AreEqual((long?)0, chainSpec.Parameters.Eip161abcTransition, "eip161abc"); - Assert.AreEqual((long?)0, chainSpec.Parameters.Eip161dTransition, "eip161d"); - - Assert.AreEqual((long?)0, chainSpec.TangerineWhistleBlockNumber, "tw no"); - Assert.AreEqual((long?)0, chainSpec.SpuriousDragonBlockNumber, "sd no"); - - Assert.AreEqual((long?)0, chainSpec.ByzantiumBlockNumber, "byzantium no"); - Assert.AreEqual((long?)6464300, chainSpec.ConstantinopleBlockNumber, "constantinople no"); - Assert.AreEqual((long?)7026400, chainSpec.ConstantinopleFixBlockNumber, "constantinople fix no"); - Assert.AreEqual((long?)12095200, chainSpec.Parameters.Eip1706Transition, "eip2200"); - Assert.AreEqual((long?)12095200, chainSpec.Parameters.Eip1283ReenableTransition, "eip2200"); - - Assert.AreEqual("0x606060405260008060006101000a81548160ff0219169083151502179055506000600460006101000a81548160ff0219169083151502179055506000600460016101000a81548160ff02191690831515021790555073fffffffffffffffffffffffffffffffffffffffe600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055503415620000b557600080fd5b604051602080620018c98339810160405280805190602001909190505060008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141515156200011057600080fd5b81600460026101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550602060405190810160405280600460029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152506006906001620001c1929190620002cb565b50600090505b600680549050811015620002a257604080519081016040528060011515815260200182815250600960006006848154811015156200020157fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548160ff021916908315150217905550602082015181600101559050508080600101915050620001c7565b60068054905060088190555060066007908054620002c29291906200035a565b505050620003f7565b82805482825590600052602060002090810192821562000347579160200282015b82811115620003465782518260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555091602001919060010190620002ec565b5b509050620003569190620003b1565b5090565b8280548282559060005260206000209081019282156200039e5760005260206000209182015b828111156200039d57825482559160010191906001019062000380565b5b509050620003ad9190620003b1565b5090565b620003f491905b80821115620003f057600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550600101620003b8565b5090565b90565b6114c280620004076000396000f3006060604052600436106100fc576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806303aca79214610101578063108552691461016457806340a141ff1461019d57806340c9cdeb146101d65780634110a489146101ff57806345199e0a1461025757806349285b58146102c15780634d238c8e14610316578063752862111461034f578063900eb5a8146103645780639a573786146103c7578063a26a47d21461041c578063ae4b1b5b14610449578063b3f05b971461049e578063b7ab4db5146104cb578063d3e848f114610535578063fa81b2001461058a578063facd743b146105df575b600080fd5b341561010c57600080fd5b6101226004808035906020019091905050610630565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561016f57600080fd5b61019b600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190505061066f565b005b34156101a857600080fd5b6101d4600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610807565b005b34156101e157600080fd5b6101e9610bb7565b6040518082815260200191505060405180910390f35b341561020a57600080fd5b610236600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610bbd565b60405180831515151581526020018281526020019250505060405180910390f35b341561026257600080fd5b61026a610bee565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156102ad578082015181840152602081019050610292565b505050509050019250505060405180910390f35b34156102cc57600080fd5b6102d4610c82565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561032157600080fd5b61034d600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610d32565b005b341561035a57600080fd5b610362610fcc565b005b341561036f57600080fd5b61038560048080359060200190919050506110fc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103d257600080fd5b6103da61113b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561042757600080fd5b61042f6111eb565b604051808215151515815260200191505060405180910390f35b341561045457600080fd5b61045c6111fe565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156104a957600080fd5b6104b1611224565b604051808215151515815260200191505060405180910390f35b34156104d657600080fd5b6104de611237565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b83811015610521578082015181840152602081019050610506565b505050509050019250505060405180910390f35b341561054057600080fd5b6105486112cb565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561059557600080fd5b61059d6112f1565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156105ea57600080fd5b610616600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611317565b604051808215151515815260200191505060405180910390f35b60078181548110151561063f57fe5b90600052602060002090016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156106cb57600080fd5b600460019054906101000a900460ff161515156106e757600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561072357600080fd5b80600a60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600460016101000a81548160ff0219169083151502179055507f600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a150565b600080600061081461113b565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561084d57600080fd5b83600960008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900460ff1615156108a957600080fd5b600960008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101549350600160078054905003925060078381548110151561090857fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1691508160078581548110151561094657fe5b906000526020600020900160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555083600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101819055506007838154811015156109e557fe5b906000526020600020900160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000600780549050111515610a2757600080fd5b6007805480919060019003610a3c9190611370565b506000600960008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101819055506000600960008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160006101000a81548160ff0219169083151502179055506000600460006101000a81548160ff0219169083151502179055506001430340600019167f55252fa6eee4741b4e24a74a70e9c11fd2c2281df8d6ea13126ff845f7825c89600760405180806020018281038252838181548152602001915080548015610ba257602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610b58575b50509250505060405180910390a25050505050565b60085481565b60096020528060005260406000206000915090508060000160009054906101000a900460ff16908060010154905082565b610bf661139c565b6007805480602002602001604051908101604052809291908181526020018280548015610c7857602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610c2e575b5050505050905090565b6000600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166349285b586000604051602001526040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b1515610d1257600080fd5b6102c65a03f11515610d2357600080fd5b50505060405180519050905090565b610d3a61113b565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610d7357600080fd5b80600960008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900460ff16151515610dd057600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614151515610e0c57600080fd5b6040805190810160405280600115158152602001600780549050815250600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548160ff0219169083151502179055506020820151816001015590505060078054806001018281610ea991906113b0565b9160005260206000209001600084909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506000600460006101000a81548160ff0219169083151502179055506001430340600019167f55252fa6eee4741b4e24a74a70e9c11fd2c2281df8d6ea13126ff845f7825c89600760405180806020018281038252838181548152602001915080548015610fba57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610f70575b50509250505060405180910390a25050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161480156110365750600460009054906101000a900460ff16155b151561104157600080fd5b6001600460006101000a81548160ff0219169083151502179055506007600690805461106e9291906113dc565b506006805490506008819055507f8564cd629b15f47dc310d45bcbfc9bcf5420b0d51bf0659a16c67f91d27632536110a4611237565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156110e75780820151818401526020810190506110cc565b505050509050019250505060405180910390a1565b60068181548110151561110b57fe5b90600052602060002090016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16639a5737866000604051602001526040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15156111cb57600080fd5b6102c65a03f115156111dc57600080fd5b50505060405180519050905090565b600460019054906101000a900460ff1681565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900460ff1681565b61123f61139c565b60068054806020026020016040519081016040528092919081815260200182805480156112c157602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311611277575b5050505050905090565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000600960008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900460ff169050919050565b81548183558181151161139757818360005260206000209182019101611396919061142e565b5b505050565b602060405190810160405280600081525090565b8154818355818115116113d7578183600052602060002091820191016113d6919061142e565b5b505050565b82805482825590600052602060002090810192821561141d5760005260206000209182015b8281111561141c578254825591600101919060010190611401565b5b50905061142a9190611453565b5090565b61145091905b8082111561144c576000816000905550600101611434565b5090565b90565b61149391905b8082111561148f57600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550600101611459565b5090565b905600a165627a7a7230582036ea35935c8246b68074adece2eab70c40e69a0193c08a6277ce06e5b25188510029000000000000000000000000e8ddc5c7a2d2f0d7a9798459c0104fdf5e987aca", chainSpec.Allocations[new Address("0x8bf38d4764929064f2d4d3a56520a76ab3df415b")].Constructor?.ToHexString(true), "constantinople no"); - } - + [Test] public void Can_load_spaceneth() { diff --git a/src/Nethermind/Nethermind.Specs/KnownHashes.cs b/src/Nethermind/Nethermind.Specs/KnownHashes.cs index 27fa6ad0f0d..90218c2b499 100644 --- a/src/Nethermind/Nethermind.Specs/KnownHashes.cs +++ b/src/Nethermind/Nethermind.Specs/KnownHashes.cs @@ -19,8 +19,6 @@ public static class KnownHashes public static readonly Keccak RopstenGenesis = new("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d"); public static readonly Keccak RopstenConstantinopleFix = new("0x8696d2eed8197e186d8d682756a0c2a1947ab5e71257475ebcce4fa3252ee9f7"); - public static readonly Keccak SokolGenesis = new("0x5b28c1bfd3a15230c9a46b399cd0f9a6920d432e85381cc6a140b06e8410112f"); - public static readonly Keccak SepoliaGenesis = new("0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9"); public static readonly Keccak GnosisGenesis = new("0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756"); diff --git a/src/Nethermind/Nethermind.sln b/src/Nethermind/Nethermind.sln index 41e083fa067..a556c10a2cc 100644 --- a/src/Nethermind/Nethermind.sln +++ b/src/Nethermind/Nethermind.sln @@ -53,7 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Chains", "Chains", "{D75E83 Chains\poacore.json = Chains\poacore.json Chains\rinkeby.json = Chains\rinkeby.json Chains\ropsten.json = Chains\ropsten.json - Chains\sokol.json = Chains\sokol.json Chains\spaceneth.json = Chains\spaceneth.json Chains\volta.json = Chains\volta.json Chains\wit.json = Chains\wit.json From b62fb1bc80738063cdb62faa8e6c42610dee22c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Mon, 6 Feb 2023 16:47:21 +0100 Subject: [PATCH 2/4] Remove sokol from config bump and poa bootnodes --- .github/workflows/update-poa-bootnodes.yml | 6 ------ scripts/syncSettings.py | 5 ----- 2 files changed, 11 deletions(-) diff --git a/.github/workflows/update-poa-bootnodes.yml b/.github/workflows/update-poa-bootnodes.yml index 652f6055b47..c9b857afb18 100644 --- a/.github/workflows/update-poa-bootnodes.yml +++ b/.github/workflows/update-poa-bootnodes.yml @@ -27,12 +27,6 @@ jobs: git checkout core cd .. cat src/Nethermind/Chains/poacore.json | jq ".nodes = $(cat poa-chain-spec/spec.json | jq ".nodes")" > src/Nethermind/Chains/poacore.json - - name: Update Sokol chainspec - run: | - cd poa-chain-spec/ - git checkout sokol - cd .. - cat src/Nethermind/Chains/sokol.json | jq ".nodes = $(cat poa-chain-spec/spec.json | jq ".nodes")" > src/Nethermind/Chains/sokol.json - name: Update xDai chainspec run: | cd poa-chain-spec/ diff --git a/scripts/syncSettings.py b/scripts/syncSettings.py index 3f4695a11d6..b5b6588b81a 100644 --- a/scripts/syncSettings.py +++ b/scripts/syncSettings.py @@ -54,11 +54,6 @@ "blockReduced": 1000, "multiplierRequirement": 1000 }, - "sokol": { - "url": "https://sokol.poa.network", - "blockReduced": 8192, - "multiplierRequirement": 10000 - }, "energyweb": { "url": "https://rpc.energyweb.org", "blockReduced": 8192, From 31cc6e33a9b448b1b59f8a9bd975f08b40134896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Mon, 6 Feb 2023 16:53:55 +0100 Subject: [PATCH 3/4] Remaining sokol instances removed --- .github/workflows/update-poa-bootnodes.yml | 2 +- .../Nethermind.Baseline.Test/BaselineConfigTests.cs | 3 --- .../Nethermind.Baseline.Test.csproj | 12 ------------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/update-poa-bootnodes.yml b/.github/workflows/update-poa-bootnodes.yml index c9b857afb18..7881fa6b5ec 100644 --- a/.github/workflows/update-poa-bootnodes.yml +++ b/.github/workflows/update-poa-bootnodes.yml @@ -42,7 +42,7 @@ jobs: commit-message: Update bootnodes body: | Nethermind bootnodes have been updated. - - Files included - poacore.json, sokol.json, xdai.json + - Files included - poacore.json, xdai.json - Auto-generated by [create-pull-request][1] [1]: https://github.com/peter-evans/create-pull-request diff --git a/src/Nethermind/Nethermind.Baseline.Test/BaselineConfigTests.cs b/src/Nethermind/Nethermind.Baseline.Test/BaselineConfigTests.cs index 23ca1f6984c..9a3a70a60c6 100644 --- a/src/Nethermind/Nethermind.Baseline.Test/BaselineConfigTests.cs +++ b/src/Nethermind/Nethermind.Baseline.Test/BaselineConfigTests.cs @@ -69,9 +69,6 @@ public void Baseline_is_disabled_by_default(string configWildcard, bool enabled) "kovan_archive.cfg", "mainnet_archive.cfg", "mainnet.cfg", - "sokol.cfg", - "sokol_archive.cfg", - "sokol_validator.cfg", "poacore.cfg", "poacore_archive.cfg", "poacore_validator.cfg", diff --git a/src/Nethermind/Nethermind.Baseline.Test/Nethermind.Baseline.Test.csproj b/src/Nethermind/Nethermind.Baseline.Test/Nethermind.Baseline.Test.csproj index 8ef7be49c54..ce1526ff7d1 100644 --- a/src/Nethermind/Nethermind.Baseline.Test/Nethermind.Baseline.Test.csproj +++ b/src/Nethermind/Nethermind.Baseline.Test/Nethermind.Baseline.Test.csproj @@ -114,18 +114,6 @@ configs\ropsten_archive.cfg PreserveNewest - - configs\sokol.cfg - PreserveNewest - - - configs\sokol_archive.cfg - PreserveNewest - - - configs\sokol_validator.cfg - PreserveNewest - configs\spaceneth.cfg PreserveNewest From 98bacf1768f5506fe15f72d1fa5c8e3e2cc6cb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Mon, 6 Feb 2023 16:59:29 +0100 Subject: [PATCH 4/4] whitespaces --- src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs | 2 +- .../ChainSpecStyle/ChainSpecLoaderTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs b/src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs index d77ff2e1cd3..025aa647eae 100644 --- a/src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs +++ b/src/Nethermind/Nethermind.Config.Test/ConfigFileTestsBase.cs @@ -60,7 +60,7 @@ protected IEnumerable RopstenConfigs [ConfigFileGroup("poacore")] protected IEnumerable PoaCoreConfigs => Configs.Where(config => config.Contains("poacore")); - + [ConfigFileGroup("volta")] protected IEnumerable VoltaConfigs => Configs.Where(config => config.Contains("volta")); diff --git a/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs b/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs index ab732603451..1dea66ad0af 100644 --- a/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs +++ b/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs @@ -288,7 +288,7 @@ public void Can_load_mainnet() //should be added one the timestamp for Shanghai is know and included in the chainspec for mainent. //chainSpec.ShanghaiTimestamp.Should().Be(MainnetSpecProvider.ShanghaiBlockTimestamp); } - + [Test] public void Can_load_spaceneth() {