Merge pull request #1571 from AntelopeIO/main_catchup

Catchup `hotstuff_integration` with the latest changes in `main`
AntelopeIO · Aug 27, 2023 · d6cf723 · d6cf723
2 parents aa926f0 + ceed0e1
commit d6cf723
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/libraries/chain/webassembly/console.cpp b/libraries/chain/webassembly/console.cpp
@@ -46,8 +46,9 @@ namespace eosio { namespace chain { namespace webassembly {
 			bool is_negative = (*val < 0);
 			unsigned __int128 val_magnitude;
 
+			// negate after conversion to unsigned to avoid possible integer overflow
 			if( is_negative )
-				val_magnitude = static_cast<unsigned __int128>(-*val); // Works even if val is at the lowest possible value of a int128_t
+				val_magnitude = -static_cast<unsigned __int128>(*val); // Works even if val is at the lowest possible value of a int128_t
 			else
 				val_magnitude = static_cast<unsigned __int128>(*val);
 

diff --git a/libraries/libfc/libraries/bls12-381 b/libraries/libfc/libraries/bls12-381
diff --git a/libraries/wasm-jit/Source/WAST/ParseNumbers.cpp b/libraries/wasm-jit/Source/WAST/ParseNumbers.cpp
@@ -229,7 +229,7 @@ bool tryParseInt(ParseState& state,UnsignedInt& outUnsignedInt,I64 minSignedValu
 	{
 	case t_decimalInt:
 		isNegative = parseSign(nextChar);
-		u64 = parseDecimalUnsignedInt(nextChar,state,isNegative ? U64(-minSignedValue) : maxUnsignedValue,"int literal");
+		u64 = parseDecimalUnsignedInt(nextChar,state,isNegative ? -U64(minSignedValue) : maxUnsignedValue,"int literal");
 		break;
 	case t_hexInt:
 		isNegative = parseSign(nextChar);
@@ -239,7 +239,7 @@ bool tryParseInt(ParseState& state,UnsignedInt& outUnsignedInt,I64 minSignedValu
 		return false;
 	};
 
-	outUnsignedInt = isNegative ? UnsignedInt(-I64(u64)) : UnsignedInt(u64);
+	outUnsignedInt = isNegative ? -UnsignedInt(u64) : UnsignedInt(u64);
 
 	++state.nextToken;
 	WAVM_ASSERT_THROW(nextChar <= state.string + state.nextToken->begin);

diff --git a/tutorials/bios-boot-tutorial/bios-boot-tutorial.py b/tutorials/bios-boot-tutorial/bios-boot-tutorial.py
@@ -112,7 +112,7 @@ def startNode(nodeIndex, account):
         '    --config-dir ' + os.path.abspath(dir) +
         '    --data-dir ' + os.path.abspath(dir) +
         '    --chain-state-db-size-mb 1024'
-        '    --http-server-address 127.0.0.1:' + str(8000 + nodeIndex) +
+        '    --http-server-address 127.0.0.1:' + str(args.http_port + nodeIndex) +
         '    --p2p-listen-endpoint 127.0.0.1:' + str(9000 + nodeIndex) +
         '    --max-clients ' + str(maxClients) +
         '    --p2p-max-nodes-per-host ' + str(maxClients) +