test: Extend the coverage of account nonce discrepancies tests

contracts-abi/contracts/discrepancies/nonce/ChainedContracts.sol/ChainedContracts.json

@@ -0,0 +1,46 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "DeployedContract2Address",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "childContract",
+    "outputs": [
+      {
+        "internalType": "contract Deploys1Contract",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

contracts-abi/contracts/discrepancies/nonce/ChainedContracts.sol/Deploys1Contract.json

@@ -0,0 +1,46 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "DeployedContract1Address",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "childContract",
+    "outputs": [
+      {
+        "internalType": "contract EmptyContract",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

contracts-abi/contracts/discrepancies/nonce/ChainedContracts.sol/Deploys2Contracts.json

@@ -0,0 +1,59 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "Deploys2ContractsAddress",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "childContract1",
+    "outputs": [
+      {
+        "internalType": "contract Deploys1Contract",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "childContract2",
+    "outputs": [
+      {
+        "internalType": "contract EmptyContract",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

contracts-abi/contracts/discrepancies/nonce/ChainedContracts.sol/EmptyContract.json

@@ -0,0 +1,33 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "DeployedContract0Address",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

contracts-abi/contracts/discrepancies/nonce/InternalCallee.sol/InternalCallee.json

@@ -1,4 +1,36 @@
 [
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "DeployedContractAddress",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "_salt",
+        "type": "uint256"
+      }
+    ],
+    "name": "deployViaCreate2",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "externalFunction",
@@ -25,6 +57,24 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "_contract",
+        "type": "address"
+      },
+      {
+        "internalType": "address payable",
+        "name": "_receiver",
+        "type": "address"
+      }
+    ],
+    "name": "internalTransfer",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "revertWithRevertReason",
@@ -63,5 +113,18 @@
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "sampleAddress",
+        "type": "address"
+      }
+    ],
+    "name": "selfdestructSample",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   }
 ]

contracts-abi/contracts/discrepancies/nonce/InternalCallee.sol/Sample.json

@@ -0,0 +1,9 @@
+[
+  {
+    "inputs": [],
+    "name": "selfDestructSample",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

contracts/discrepancies/nonce/ChainedContracts.sol

@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+contract EmptyContract {
+    address public owner;
+    constructor(){
+        emit DeployedContract0Address(address(this));
+    }
+
+    event DeployedContract0Address(address);
+}
+
+contract Deploys1Contract {
+    address public owner;
+    EmptyContract  public childContract;
+
+    constructor() {
+        owner = msg.sender;
+        childContract = new EmptyContract();
+        emit DeployedContract1Address(address(this));
+    }
+
+        event DeployedContract1Address(address);
+}
+
+contract ChainedContracts {
+    address public owner;
+    Deploys1Contract  public childContract;
+
+    constructor() {
+        owner = msg.sender;
+        // Deploy Chain within ChildContract constructor
+        //  chainContract = new ChainContract();
+       childContract = new Deploys1Contract();
+    emit DeployedContract2Address(address(this));
+    }
+
+    event DeployedContract2Address(address);
+}
+
+contract Deploys2Contracts {
+    address public owner;
+    Deploys1Contract  public childContract1;
+    EmptyContract public childContract2;
+
+    constructor() {
+        owner = msg.sender;
+        // Deploy Chain within ChildContract constructor
+        //  chainContract = new ChainContract();
+       childContract1 = new Deploys1Contract();
+       childContract2 = new EmptyContract();
+    emit Deploys2ContractsAddress(address(this));
+    }
+
+    event Deploys2ContractsAddress(address);
+}

contracts/discrepancies/nonce/InternalCallee.sol

@@ -1,14 +1,19 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-contract Sample {}
+contract Sample {
+
+  function selfDestructSample() external {
+    selfdestruct(payable(msg.sender));
+  }
+}
 
 contract InternalCallee {
-    uint calledTimes = 0;
+  uint calledTimes = 0;
 
-    function factorySample() external returns (address) {
-        return address(new Sample());
-    }
+  function factorySample() external returns (address) {
+    return address(new Sample());
+  }
 
     function externalFunction() external returns (uint) {
         // mutate state to maintain non-view function status
@@ -28,4 +33,22 @@ contract InternalCallee {
     function selfDestruct(address payable _addr) external {
         selfdestruct(_addr);
     }
+
+  function selfdestructSample(address payable sampleAddress) external {
+    Sample(sampleAddress).selfDestructSample();
+  }
+
+  function internalTransfer(address payable _contract, address payable _receiver) payable external {
+   (bool success,) = _contract.call(abi.encodeWithSignature("transferTo(address)", _receiver));
+  require(success, "Function call failed");
+  }
+
+  event DeployedContractAddress(address);
+
+  function deployViaCreate2(uint256 _salt) external returns (address) {
+    Sample temp = new Sample{salt: bytes32(_salt)}();
+    emit DeployedContractAddress(address(temp));
+
+    return address(temp);
+  }
 }