From efd6eb2d4aa241464476b5e6dd97b6475995290a Mon Sep 17 00:00:00 2001
From: JaredBorders <jlbxsxs@gmail.com>
Date: Thu, 28 Sep 2023 17:14:20 -0400
Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Update=20tests=20for=20ERC2771?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/Deployment.t.sol                | 27 ++++++++++++++++++++++-----
 test/utils/Bootstrap.sol             | 12 ++++++++----
 test/utils/exposed/EngineExposed.sol | 13 +++++++++++--
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/test/Deployment.t.sol b/test/Deployment.t.sol
index 6a76d2af..7cff9855 100644
--- a/test/Deployment.t.sol
+++ b/test/Deployment.t.sol
@@ -11,7 +11,8 @@ contract DeploymentTest is Test, Setup {
             perpsMarketProxy: address(0x1),
             spotMarketProxy: address(0x2),
             sUSDProxy: address(0x3),
-            oracle: address(0x4)
+            oracle: address(0x4),
+            trustedForwarder: address(0x5)
         });
 
         assertTrue(address(engine) != address(0x0));
@@ -24,7 +25,8 @@ contract DeploymentTest is Test, Setup {
             perpsMarketProxy: address(0),
             spotMarketProxy: address(0x2),
             sUSDProxy: address(0x3),
-            oracle: address(0x4)
+            oracle: address(0x4),
+            trustedForwarder: address(0x5)
         });
     }
 
@@ -35,7 +37,8 @@ contract DeploymentTest is Test, Setup {
             perpsMarketProxy: address(0x1),
             spotMarketProxy: address(0),
             sUSDProxy: address(0x3),
-            oracle: address(0x4)
+            oracle: address(0x4),
+            trustedForwarder: address(0x5)
         });
     }
 
@@ -46,7 +49,8 @@ contract DeploymentTest is Test, Setup {
             perpsMarketProxy: address(0x1),
             spotMarketProxy: address(0x2),
             sUSDProxy: address(0),
-            oracle: address(0x4)
+            oracle: address(0x4),
+            trustedForwarder: address(0x5)
         });
     }
 
@@ -57,7 +61,20 @@ contract DeploymentTest is Test, Setup {
             perpsMarketProxy: address(0x1),
             spotMarketProxy: address(0x2),
             sUSDProxy: address(0x3),
-            oracle: address(0)
+            oracle: address(0),
+            trustedForwarder: address(0x5)
+        });
+    }
+
+    function test_deploy_trusted_forwarder_zero_address() public {
+        vm.expectRevert(abi.encodeWithSelector(IEngine.ZeroAddress.selector));
+
+        Setup.deploySystem({
+            perpsMarketProxy: address(0x1),
+            spotMarketProxy: address(0x2),
+            sUSDProxy: address(0x3),
+            oracle: address(0x4),
+            trustedForwarder: address(0)
         });
     }
 }
diff --git a/test/utils/Bootstrap.sol b/test/utils/Bootstrap.sol
index bad3923e..c5be4cec 100644
--- a/test/utils/Bootstrap.sol
+++ b/test/utils/Bootstrap.sol
@@ -107,14 +107,16 @@ contract BootstrapOptimism is Setup, OptimismParameters {
             perpsMarketProxy: PERPS_MARKET_PROXY,
             spotMarketProxy: SPOT_MARKET_PROXY,
             sUSDProxy: USD_PROXY,
-            oracle: PYTH
+            oracle: PYTH,
+            trustedForwarder: TRUSTED_FORWARDER
         });
 
         EngineExposed engineExposed = new EngineExposed({
             _perpsMarketProxy: PERPS_MARKET_PROXY,
             _spotMarketProxy: SPOT_MARKET_PROXY,
             _sUSDProxy: USD_PROXY,
-            _oracle: PYTH
+            _oracle: PYTH,
+            _trustedForwarder: TRUSTED_FORWARDER
         });
 
         return (
@@ -137,14 +139,16 @@ contract BootstrapOptimismGoerli is Setup, OptimismGoerliParameters {
             perpsMarketProxy: PERPS_MARKET_PROXY,
             spotMarketProxy: SPOT_MARKET_PROXY,
             sUSDProxy: USD_PROXY,
-            oracle: PYTH
+            oracle: PYTH,
+            trustedForwarder: TRUSTED_FORWARDER
         });
 
         EngineExposed engineExposed = new EngineExposed({
             _perpsMarketProxy: PERPS_MARKET_PROXY,
             _spotMarketProxy: SPOT_MARKET_PROXY,
             _sUSDProxy: USD_PROXY,
-            _oracle: PYTH
+            _oracle: PYTH,
+            _trustedForwarder: TRUSTED_FORWARDER
         });
 
         return (
diff --git a/test/utils/exposed/EngineExposed.sol b/test/utils/exposed/EngineExposed.sol
index 1bb9e378..ae72e387 100644
--- a/test/utils/exposed/EngineExposed.sol
+++ b/test/utils/exposed/EngineExposed.sol
@@ -10,8 +10,17 @@ contract EngineExposed is Engine {
         address _perpsMarketProxy,
         address _spotMarketProxy,
         address _sUSDProxy,
-        address _oracle
-    ) Engine(_perpsMarketProxy, _spotMarketProxy, _sUSDProxy, _oracle) {}
+        address _oracle,
+        address _trustedForwarder
+    )
+        Engine(
+            _perpsMarketProxy,
+            _spotMarketProxy,
+            _sUSDProxy,
+            _oracle,
+            _trustedForwarder
+        )
+    {}
 
     function getSynthAddress(uint128 synthMarketId)
         public