Merge branch '234-make-sure-that-assume-excludes-the-possibility-of-i…

…ncoming-parameters-matching-with-sentinel' into 2024-09-13-FlowERC1155PreviewDefinedFlowIOForERC20MultiElementArraysTest

test/concrete/flowErc1155/FlowExpressionTest.sol

@@ -54,6 +54,7 @@ contract FlowExpressionTest is FlowERC1155Test {
     ) public {
         vm.assume(!alice.isContract());
         vm.assume(alice != address(0));
+        vm.assume(sentinel != amount);
 
         uint256[][] memory matrixCallerContext =
             fuzzedcallerContext0.matrixFrom(fuzzedcallerContext1, fuzzedcallerContext0);

test/concrete/flowErc1155/FlowPreviewTest.sol

@@ -48,6 +48,7 @@ contract FlowPreviewTest is FlowERC1155Test {
     function testFlowERC1155PreviewEmptyFlowIO(string memory uri, address alice, uint256 amount) public {
         (IFlowERC1155V5 flow,) = deployIFlowERC1155V5({uri: uri});
         assumeEtchable(alice, address(flow));
+        vm.assume(sentinel != amount);
 
         ERC1155SupplyChange[] memory mints = new ERC1155SupplyChange[](2);
         mints[0] = ERC1155SupplyChange({account: alice, id: 1, amount: amount});

test/concrete/flowErc1155/FlowSignedContextTest.sol

@@ -27,6 +27,9 @@ contract FlowSignedContextTest is FlowUtilsAbstractTest, FlowERC1155Test {
         uint256 fuzzedKeyBob
     ) public {
         vm.assume(fuzzedKeyBob != fuzzedKeyAlice);
+        vm.assume(sentinel != amount);
+        vm.assume(sentinel != id);
+
         (IFlowERC1155V5 erc1155Flow, EvaluableV2 memory evaluable) = deployIFlowERC1155V5(uri);
 
         // Ensure the fuzzed key is within the valid range for secp256k1
@@ -84,6 +87,9 @@ contract FlowSignedContextTest is FlowUtilsAbstractTest, FlowERC1155Test {
         uint256 amount
     ) public {
         vm.assume(fuzzedKeyBob != fuzzedKeyAlice);
+        vm.assume(sentinel != amount);
+        vm.assume(sentinel != id);
+
         (IFlowERC1155V5 erc1155Flow, EvaluableV2 memory evaluable) = deployIFlowERC1155V5(uri);
 
         // Ensure the fuzzed key is within the valid range for secp256k1

test/concrete/flowErc1155/FlowTest.sol

@@ -37,6 +37,7 @@ contract Erc1155FlowTest is FlowERC1155Test {
         vm.assume(sentinel != erc721InTokenId);
         vm.assume(sentinel != erc1155OutTokenId);
         vm.assume(sentinel != erc1155OutAmount);
+        vm.assume(sentinel != id);
         vm.assume(address(0) != alice);
         vm.assume(!alice.isContract());
 
@@ -106,6 +107,7 @@ contract Erc1155FlowTest is FlowERC1155Test {
     ) external {
         vm.assume(sentinel != erc1155OutAmount);
         vm.assume(sentinel != erc20InAmount);
+        vm.assume(sentinel != id);
 
         // Ensure the fuzzed key is within the valid range for secp256k1
         uint256 aliceKey = (fuzzedKeyAlice % (SECP256K1_ORDER - 1)) + 1;
@@ -165,6 +167,7 @@ contract Erc1155FlowTest is FlowERC1155Test {
 
         vm.assume(sentinel != erc721OutTokenId);
         vm.assume(sentinel != erc721InTokenId);
+        vm.assume(sentinel != amount);
 
         (IFlowERC1155V5 erc1155Flow, EvaluableV2 memory evaluable) = deployIFlowERC1155V5(uri);
         assumeEtchable(alice, address(erc1155Flow));
@@ -347,6 +350,7 @@ contract Erc1155FlowTest is FlowERC1155Test {
     ) external {
         vm.assume(alice != address(0));
         vm.assume(sentinel != amount);
+        vm.assume(sentinel != id);
         vm.assume(expressionA != expressionB);
         vm.assume(writeToStore.length != 0);
         vm.assume(!alice.isContract());

test/concrete/flowErc1155/FlowTimeTest.sol

@@ -24,6 +24,8 @@ contract FlowTimeTest is FlowUtilsAbstractTest, FlowERC1155Test {
     {
         vm.assume(alice != address(0));
         vm.assume(amount != 0);
+        vm.assume(sentinel != amount);
+        vm.assume(sentinel != id);
         vm.assume(writeToStore.length != 0);
         vm.assume(!alice.isContract());
 

test/concrete/flowErc721/FlowExpressionTest.sol

@@ -58,6 +58,7 @@ contract FlowExpressionTest is FlowERC721Test {
     ) public {
         vm.assume(alice != address(0));
         vm.assume(!alice.isContract());
+        vm.assume(sentinel != id);
 
         uint256[][] memory matrixCallerContext =
             fuzzedcallerContext0.matrixFrom(fuzzedcallerContext1, fuzzedcallerContext0);

test/concrete/flowErc721/FlowSignedContextTest.sol

@@ -25,6 +25,7 @@ contract FlowSignedContextTest is FlowERC721Test {
         uint256 id
     ) public {
         vm.assume(fuzzedKeyBob != fuzzedKeyAlice);
+        vm.assume(sentinel != id);
         (IFlowERC721V5 erc721Flow, EvaluableV2 memory evaluable) =
             deployFlowERC721({name: name, symbol: symbol, baseURI: baseURI});
 
@@ -91,6 +92,7 @@ contract FlowSignedContextTest is FlowERC721Test {
         uint256 id
     ) public {
         vm.assume(fuzzedKeyBob != fuzzedKeyAlice);
+        vm.assume(sentinel != id);
         (IFlowERC721V5 erc721Flow, EvaluableV2 memory evaluable) =
             deployFlowERC721({name: name, symbol: symbol, baseURI: baseURI});
 

test/concrete/flowErc721/FlowTest.sol

@@ -328,6 +328,7 @@ contract Erc721FlowTest is FlowERC721Test {
 
         vm.assume(sentinel != erc721OutTokenId);
         vm.assume(sentinel != erc721InTokenId);
+        vm.assume(sentinel != id);
 
         (IFlowERC721V5 erc721Flow, EvaluableV2 memory evaluable) =
             deployFlowERC721({name: "FlowErc721", symbol: "FErc721", baseURI: baseURI});
@@ -385,6 +386,7 @@ contract Erc721FlowTest is FlowERC721Test {
         vm.assume(alice != address(0));
         vm.assume(expressionA != expressionB);
         vm.assume(writeToStore.length != 0);
+        vm.assume(sentinel != tokenId);
 
         address[] memory expressions = new address[](1);
         expressions[0] = expressionA;

test/concrete/flowErc721/FlowTimeTest.sol

@@ -25,6 +25,7 @@ contract FlowTimeTest is FlowERC721Test {
     ) public {
         vm.assume(writeToStore.length != 0);
         vm.assume(alice != address(0));
+        vm.assume(sentinel != id);
         vm.assume(!alice.isContract());
 
         (IFlowERC721V5 erc1155Flow, EvaluableV2 memory evaluable) = deployFlowERC721(name, symbol, uri);