Merge branch 'develop' into feat/updraft-addition

Author: mehtavishwa30

.circleci/config.yml

@@ -779,7 +779,7 @@ defaults:
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
-      image: cimg/node:18.16
+      image: cimg/node:lts
 
   - job_native_compile_ext_trident: &job_native_compile_ext_trident
       <<: *requires_b_ubu_static

docs/introduction-to-smart-contracts.rst

@@ -131,7 +131,7 @@ This contract introduces some new concepts, let us go through them one by one.
 The line ``address public minter;`` declares a state variable of type :ref:`address<address>`.
 The ``address`` type is a 160-bit value that does not allow any arithmetic operations.
 It is suitable for storing addresses of contracts, or a hash of the public half
-of a keypair belonging to :ref:`external accounts<accounts>`.
+of a keypair belonging to :ref:`externally-owned accounts<accounts>`.
 
 The keyword ``public`` automatically generates a function that allows you to access the current value of the state
 variable from outside of the contract. Without this keyword, other contracts have no way to access the variable.
@@ -338,11 +338,11 @@ Accounts
 ========
 
 There are two kinds of accounts in Ethereum which share the same
-address space: **External accounts** that are controlled by
+address space: **Externally-owned accounts** that are controlled by
 public-private key pairs (i.e. humans) and **contract accounts** which are
 controlled by the code stored together with the account.
 
-The address of an external account is determined from
+The address of an externally-owned account is determined from
 the public key while the address of a contract is
 determined at the time the contract is created
 (it is derived from the creator address and the number

docs/security-considerations.rst

@@ -144,7 +144,7 @@ Please be explicit about such cases in the documentation of your contracts.
 Sending and Receiving Ether
 ===========================
 
-- Neither contracts nor "external accounts" are currently able to prevent someone from sending them Ether.
+- Neither contracts nor "externally-owned accounts" are currently able to prevent someone from sending them Ether.
   Contracts can react on and reject a regular transfer, but there are ways to move Ether without creating a message call.
   One way is to simply "mine to" the contract address and the second way is using ``selfdestruct(x)``.
 

libsolidity/formal/CHC.h

@@ -74,18 +74,10 @@ class CHC: public SMTEncoder
 
 		friend bool operator<(CHCVerificationTarget const& _a, CHCVerificationTarget const& _b)
 		{
-			return _a.errorId < _b.errorId;
-		}
-	};
-
-	struct SafeTargetsCompare
-	{
-		bool operator()(CHCVerificationTarget const & _lhs, CHCVerificationTarget const & _rhs) const
-		{
-			if (_lhs.errorNode->id() == _rhs.errorNode->id())
-				return _lhs.type  < _rhs.type;
+			if (_a.errorNode->id() == _b.errorNode->id())
+				return _a.type < _b.type;
 			else
-				return _lhs.errorNode->id() == _rhs.errorNode->id();
+				return _a.errorNode->id() < _b.errorNode->id();
 		}
 	};
 
@@ -96,7 +88,7 @@ class CHC: public SMTEncoder
 		std::string message;
 	};
 
-	std::map<ASTNode const*, std::set<CHCVerificationTarget, SafeTargetsCompare>, smt::EncodingContext::IdCompare> const& safeTargets() const { return m_safeTargets; }
+	std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> const& safeTargets() const { return m_safeTargets; }
 	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> const& unsafeTargets() const { return m_unsafeTargets; }
 
 	/// This is used if the Horn solver is not directly linked into this binary.
@@ -434,7 +426,7 @@ class CHC: public SMTEncoder
 	std::map<unsigned, CHCVerificationTarget> m_verificationTargets;
 
 	/// Targets proved safe.
-	std::map<ASTNode const*, std::set<CHCVerificationTarget, SafeTargetsCompare>, smt::EncodingContext::IdCompare> m_safeTargets;
+	std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> m_safeTargets;
 	/// Targets proved unsafe.
 	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> m_unsafeTargets;
 	/// Targets not proved.

libyul/backends/evm/SSAControlFlowGraphBuilder.cpp

@@ -109,7 +109,7 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId
 
 	m_graph.block(phiInfo->block).phis.erase(_phi);
 
-	std::set<SSACFG::ValueId> phiUses;
+	std::vector<SSACFG::ValueId> phiUses;
 	for (size_t blockIdValue = 0; blockIdValue < m_graph.numBlocks(); ++blockIdValue)
 	{
 		auto& block = m_graph.block(SSACFG::BlockId{blockIdValue});
@@ -126,18 +126,13 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId
 					usedInPhi = true;
 				}
 			if (usedInPhi)
-				phiUses.emplace(blockPhi);
+				phiUses.push_back(blockPhi);
 		}
 		for (auto& op: block.operations)
-			std::replace(op.inputs.begin(), op.inputs.end(), _phi, same);
+			ranges::replace(op.inputs, _phi, same);
 		std::visit(util::GenericVisitor{
 			[_phi, same](SSACFG::BasicBlock::FunctionReturn& _functionReturn) {
-				std::replace(
-					_functionReturn.returnValues.begin(),
-					_functionReturn.returnValues.end(),
-					_phi,
-					same
-				);
+				ranges::replace(_functionReturn.returnValues,_phi, same);
 			},
 			[_phi, same](SSACFG::BasicBlock::ConditionalJump& _condJump) {
 				if (_condJump.condition == _phi)
@@ -188,22 +183,17 @@ void SSAControlFlowGraphBuilder::cleanUnreachable()
 	{
 		auto& block = m_graph.block(blockId);
 
-		std::set<SSACFG::ValueId> maybeTrivialPhi;
-		for (auto it = block.entries.begin(); it != block.entries.end();)
-			if (reachabilityCheck.visited.count(*it))
-				it++;
-			else
-				it = block.entries.erase(it);
+		std::vector<SSACFG::ValueId> maybeTrivialPhi;
+		std::erase_if(block.entries, [&](auto const& entry) { return !reachabilityCheck.visited.contains(entry); });
 		for (auto phi: block.phis)
 			if (auto* phiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(phi)))
-				std::erase_if(phiInfo->arguments, [&](SSACFG::ValueId _arg) {
-					if (std::holds_alternative<SSACFG::UnreachableValue>(m_graph.valueInfo(_arg)))
-					{
-						maybeTrivialPhi.insert(phi);
-						return true;
-					}
-					return false;
+			{
+				auto erasedCount = std::erase_if(phiInfo->arguments, [&](SSACFG::ValueId _arg) {
+					return std::holds_alternative<SSACFG::UnreachableValue>(m_graph.valueInfo(_arg));
 				});
+				if (erasedCount > 0)
+					maybeTrivialPhi.push_back(phi);
+			}
 
 		// After removing a phi argument, we might end up with a trivial phi that can be removed.
 		for (auto phi: maybeTrivialPhi)

libyul/backends/evm/StackLayoutGenerator.cpp

@@ -308,7 +308,7 @@ Stack StackLayoutGenerator::propagateStackThroughOperation(Stack _exitStack, CFG
 	// generated on the fly), s.t. shuffling the `stack + _operation.output` to _exitLayout is cheap.
 	Stack stack = createIdealLayout(_operation.output, _exitStack, generateSlotOnTheFly, reachableStackDepth());
 
-	// Make sure the resulting previous slots do not overlap with any assignmed variables.
+	// Make sure the resulting previous slots do not overlap with any assigned variables.
 	if (auto const* assignment = std::get_if<CFG::Assignment>(&_operation.operation))
 		for (auto& stackSlot: stack)
 			if (auto const* varSlot = std::get_if<VariableSlot>(&stackSlot))

scripts/regressions.py

@@ -22,15 +22,15 @@ def __init__(self, interval=300):
         thread.start()
 
     def run(self):
-        """ Runs until the main Python thread exits. """
-        ## Print a newline at the very beginning.
+        """ Run indefinitely until the main Python thread exits. """
+        ## Print an initial newline at the very beginning.
         print("")
         while True:
             # Print dot
             print(".")
             time.sleep(self.interval)
 
-class regressor:
+class Regressor:
     _re_sanitizer_log = re.compile(r"""ERROR: (libFuzzer|UndefinedBehaviorSanitizer)""")
 
     def __init__(self, description, args):
@@ -87,7 +87,7 @@ def process_log(self, logfile):
                 False      -> Failure
         """
 
-        ## Log may contain non ASCII characters, so we simply stringify them
+        ## Log may contain non-ASCII characters, so we simply stringify them
         ## since they don't matter for regular expression matching
         with open(logfile, 'rb', encoding=None) as f:
             rawtext = str(f.read())
@@ -122,5 +122,5 @@ def run(self):
 
 if __name__ == '__main__':
     dotprinter = PrintDotsThread()
-    tool = regressor(DESCRIPTION, sys.argv[1:])
+    tool = Regressor(DESCRIPTION, sys.argv[1:])
     sys.exit(not tool.run())

scripts/splitSources.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 # This script reads a syntaxTest file and writes all
-# sources into their own files. If one source-name specifies subdirectories
+# sources into separate files. If a source name specifies subdirectories,
 # those will be created too.
 
 # Usage: scripts/splitSources.py pathToTestfile
@@ -18,7 +18,7 @@ def uncaught_exception_hook(exc_type, exc_value, exc_traceback):
     # The script `scripts/ASTImportTest.sh` will interpret return code 3
     # as a critical error (because of the uncaught exception) and will
     # terminate further execution.
-    print("Unhandled exception: %s", "".join(traceback.format_exception(exc_type, exc_value, exc_traceback)))
+    print("Unhandled exception: " + "".join(traceback.format_exception(exc_type, exc_value, exc_traceback)))
     sys.exit(3)
 
 
@@ -42,7 +42,7 @@ def writeSourceToFile(lines):
     with open(srcName, mode='a+', encoding='utf8', newline='') as f:
         for idx, line in enumerate(lines[1:]):
             # write to file
-            if line[:12] != "==== Source:":
+            if not line.startswith("==== Source:"):
                 f.write(line + '\n')
 
             # recursive call if there is another source

test/compilationTests/corion/provider.sol

@@ -185,7 +185,7 @@ contract provider is module, safeMath, announcementTypes {
     }
     function setRightForInterest(uint256 oldValue, uint256 newValue, bool priv) internal {
         /*
-            It checks if the provider has enough connected captital to be able to get from the token emission.
+            It checks if the provider has enough connected capital to be able to get from the token emission.
             In case the provider is not able to get the share from the token emission then the connected capital will not count to the value of the globalFunds, to the current schelling round.
 
             @oldValue       old

test/compilationTests/corion/schelling.sol

@@ -256,7 +256,7 @@ contract schelling is module, announcementTypes, schellingVars {
             @_moduleHandler         Address of ModuleHandler.
             @_db                    Address of the database.
             @_forReplace            This address will be replaced with the old one or not.
-            @_icoExpansionAddress   This address can turn schelling runds during ICO.
+            @_icoExpansionAddress   This address can turn schelling funds during ICO.
         */
         db = schellingDB(_db);
         super.registerModuleHandler(_moduleHandler);