fix: build and todos

contracts/AddressResolver.sol

@@ -73,6 +73,7 @@ contract AddressResolver is Ownable, IAddressResolver {
     /// @param chainSlug_ The chain slug
     /// @return The address of the deployed Forwarder contract
     function getOrDeployForwarderContract(
+        address appDeployer_,
         address chainContractAddress_,
         uint32 chainSlug_
     ) public returns (address) {
@@ -112,8 +113,7 @@ contract AddressResolver is Ownable, IAddressResolver {
             }
         }
 
-        // todo: what to do?
-        // _setConfig(appDeployer_, newForwarder);
+        _setConfig(appDeployer_, newForwarder);
         emit ForwarderDeployed(newForwarder, salt);
         return newForwarder;
     }

contracts/apps/payload-delivery/ContractFactoryPlug.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.13;
 import {PlugBase} from "../../base/PlugBase.sol";
 import {Ownable} from "../../utils/Ownable.sol";
+
 /// @title ContractFactory
 /// @notice Abstract contract for deploying contracts
 contract ContractFactoryPlug is PlugBase, Ownable {
@@ -17,6 +18,10 @@ contract ContractFactoryPlug is PlugBase, Ownable {
         bytes memory creationCode,
         bytes32 salt
     ) public returns (address) {
+        if (msg.sender != address(socket__)) {
+            revert("Only socket can deploy contracts");
+        }
+
         address addr;
         assembly {
             addr := create2(

contracts/apps/payload-delivery/app-gateway/AuctionManager.sol

@@ -11,6 +11,7 @@ import {IAuctionHouse} from "../../../interfaces/IAuctionHouse.sol";
 /// @notice Contract for managing auctions and placing bids
 contract AuctionManager is AddressResolverUtil, Ownable(msg.sender) {
     SignatureVerifier public immutable signatureVerifier__;
+    uint32 public immutable vmChainSlug;
     mapping(bytes32 => Bid) public winningBids;
     // asyncId => auction status
     mapping(bytes32 => bool) public auctionClosed;
@@ -22,9 +23,11 @@ contract AuctionManager is AddressResolverUtil, Ownable(msg.sender) {
     /// @param addressResolver_ The address of the address resolver
     /// @param signatureVerifier_ The address of the signature verifier
     constructor(
+        uint32 vmChainSlug_,
         address addressResolver_,
         SignatureVerifier signatureVerifier_
     ) AddressResolverUtil(addressResolver_) {
+        vmChainSlug = vmChainSlug_;
         signatureVerifier__ = signatureVerifier_;
     }
 
@@ -58,9 +61,10 @@ contract AuctionManager is AddressResolverUtil, Ownable(msg.sender) {
     ) external {
         require(!auctionClosed[asyncId_], "Auction closed");
 
-        // todo: check chain slug for multiple offchain vm
         address transmitter = signatureVerifier__.recoverSigner(
-            keccak256(abi.encode(address(this), asyncId_, fee, extraData)),
+            keccak256(
+                abi.encode(address(this), vmChainSlug, asyncId_, fee, extraData)
+            ),
             transmitterSignature
         );
 

contracts/apps/payload-delivery/app-gateway/QueueAsync.sol

@@ -14,8 +14,6 @@ import {IContractFactoryPlug} from "../../../interfaces/IContractFactoryPlug.sol
 abstract contract QueueAsync is AddressResolverUtil {
     uint256 public saltCounter;
     uint256 public asyncCounter;
-
-    address public auctionManager;
     address public feesManager;
 
     CallParams[] public callParamsArray;
@@ -27,7 +25,6 @@ abstract contract QueueAsync is AddressResolverUtil {
     mapping(bytes32 => PayloadBatch) public payloadBatches;
     // asyncId => PayloadDetails[]
     mapping(bytes32 => PayloadDetails[]) public payloadBatchDetails;
-
     error InvalidPromise();
 
     modifier onlyPromises() {
@@ -37,8 +34,9 @@ abstract contract QueueAsync is AddressResolverUtil {
         _;
     }
 
-    modifier onlyAuctionManager() {
-        if (msg.sender != auctionManager) revert NotAuctionManager();
+    modifier onlyAuctionManager(bytes32 asyncId_) {
+        if (msg.sender != payloadBatches[asyncId_].auctionManager)
+            revert NotAuctionManager();
         _;
     }
 

contracts/base/AppDeployerBase.sol

@@ -54,6 +54,7 @@ abstract contract AppDeployerBase is AppGatewayBase, IAppDeployer {
 
         address forwarderContractAddress = addressResolver
             .getOrDeployForwarderContract(
+                address(this),
                 abi.decode(returnData_, (address)),
                 chainSlug
             );

contracts/interfaces/IAddressResolver.sol

@@ -71,6 +71,7 @@ interface IAddressResolver {
     /// @param chainSlug_ The identifier of the destination chain
     /// @return The address of the newly deployed forwarder contract
     function getOrDeployForwarderContract(
+        address appDeployer_,
         address chainContractAddress_,
         uint32 chainSlug_
     ) external returns (address);

contracts/socket/Socket.sol

@@ -49,7 +49,6 @@ contract Socket is SocketBase {
     /**
      * @dev keeps track of whether a payload has been executed or not using payload id
      */
-    // todo: add nottried, reverting and success
     mapping(bytes32 => bool) public payloadExecuted;
 
     constructor(

contracts/socket/switchboard/FastSwitchboard.sol

@@ -45,10 +45,6 @@ contract FastSwitchboard is SwitchboardBase {
         bytes32 root_,
         bytes calldata signature_
     ) external {
-        // removed root verification for now
-
-        // todo: can include orderHash, transmitter, bidAmount in digest and verify these
-        // here instead of including in root
         address watcher = signatureVerifier__.recoverSigner(
             keccak256(abi.encode(address(this), root_)),
             signature_