[SC-467] Update to latest xchain-helpers (#20)

* update to latest xchain-helpers and some minor cosmetic refactoring

* update xchain-helpers

script/Deploy.s.sol

@@ -14,9 +14,9 @@ import { DSROracleForwarderBaseChain }   from "src/forwarders/DSROracleForwarder
 import { DSROracleForwarderGnosis }      from "src/forwarders/DSROracleForwarderGnosis.sol";
 import { DSROracleForwarderArbitrumOne } from "src/forwarders/DSROracleForwarderArbitrumOne.sol";
 
-import { DSROracleReceiverOptimism } from "src/receivers/DSROracleReceiverOptimism.sol";
-import { DSROracleReceiverGnosis }   from "src/receivers/DSROracleReceiverGnosis.sol";
-import { DSROracleReceiverArbitrum } from "src/receivers/DSROracleReceiverArbitrum.sol";
+import { AMBReceiver }      from "xchain-helpers/receivers/AMBReceiver.sol";
+import { ArbitrumReceiver } from "xchain-helpers/receivers/ArbitrumReceiver.sol";
+import { OptimismReceiver } from "xchain-helpers/receivers/OptimismReceiver.sol";
 
 contract Deploy is Script {
 
@@ -41,7 +41,7 @@ contract Deploy is Script {
 
         vm.startBroadcast();
         DSRAuthOracle oracle = new DSRAuthOracle();
-        address receiver = deployReceiver(forwarder, oracle);
+        address receiver = deployReceiver(forwarder, address(oracle));
         require(receiver == expectedReceiver, "receiver mismatch");
         DSRBalancerRateProviderAdapter adapter = new DSRBalancerRateProviderAdapter(oracle);
 
@@ -63,7 +63,7 @@ contract Deploy is Script {
         return address(0);
     }
 
-    function deployReceiver(address, IDSRAuthOracle) internal virtual returns (address) {
+    function deployReceiver(address, address) internal virtual returns (address) {
         return address(0);
     }
 
@@ -79,8 +79,8 @@ contract DeployOptimism is Deploy {
         return address(new DSROracleForwarderOptimism(MCD_POT, receiver));
     }
 
-    function deployReceiver(address forwarder, IDSRAuthOracle oracle) internal override returns (address) {
-        return address(new DSROracleReceiverOptimism(forwarder, oracle));
+    function deployReceiver(address forwarder, address oracle) internal override returns (address) {
+        return address(new OptimismReceiver(forwarder, oracle));
     }
 
 }
@@ -95,8 +95,8 @@ contract DeployBase is Deploy {
         return address(new DSROracleForwarderBaseChain(MCD_POT, receiver));
     }
 
-    function deployReceiver(address forwarder, IDSRAuthOracle oracle) internal override returns (address) {
-        return address(new DSROracleReceiverOptimism(forwarder, oracle));
+    function deployReceiver(address forwarder, address oracle) internal override returns (address) {
+        return address(new OptimismReceiver(forwarder, oracle));
     }
 
 }
@@ -111,8 +111,8 @@ contract DeployGnosis is Deploy {
         return address(new DSROracleForwarderGnosis(MCD_POT, receiver));
     }
 
-    function deployReceiver(address forwarder, IDSRAuthOracle oracle) internal override returns (address) {
-        return address(new DSROracleReceiverGnosis(Gnosis.L2_AMB, 1, forwarder, oracle));
+    function deployReceiver(address forwarder, address oracle) internal override returns (address) {
+        return address(new AMBReceiver(Gnosis.L2_AMB, bytes32(uint256(1)), forwarder, oracle));
     }
 
 }
@@ -127,8 +127,8 @@ contract DeployArbitrumOne is Deploy {
         return address(new DSROracleForwarderArbitrumOne(MCD_POT, receiver));
     }
 
-    function deployReceiver(address forwarder, IDSRAuthOracle oracle) internal override returns (address) {
-        return address(new DSROracleReceiverArbitrum(forwarder, oracle));
+    function deployReceiver(address forwarder, address oracle) internal override returns (address) {
+        return address(new ArbitrumReceiver(forwarder, oracle));
     }
 
 }

src/forwarders/DSROracleForwarderArbitrumOne.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import { XChainForwarders } from 'xchain-helpers/XChainForwarders.sol';
+import { ArbitrumForwarder } from 'xchain-helpers/forwarders/ArbitrumForwarder.sol';
 
 import { DSROracleForwarderBase } from './DSROracleForwarderBase.sol';
 
@@ -16,7 +16,8 @@ contract DSROracleForwarderArbitrumOne is DSROracleForwarderBase {
         uint256 maxFeePerGas,
         uint256 baseFee
     ) public payable {
-        XChainForwarders.sendMessageArbitrumOne(
+        ArbitrumForwarder.sendMessageL1toL2(
+            ArbitrumForwarder.L1_CROSS_DOMAIN_ARBITRUM_ONE,
             address(l2Oracle),
             _packMessage(),
             gasLimit,

src/forwarders/DSROracleForwarderBaseChain.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import { XChainForwarders } from 'xchain-helpers/XChainForwarders.sol';
+import { OptimismForwarder } from 'xchain-helpers/forwarders/OptimismForwarder.sol';
 
 import { DSROracleForwarderBase } from './DSROracleForwarderBase.sol';
 
@@ -12,7 +12,8 @@ contract DSROracleForwarderBaseChain is DSROracleForwarderBase {
     }
 
     function refresh(uint256 gasLimit) public {
-        XChainForwarders.sendMessageBase(
+        OptimismForwarder.sendMessageL1toL2(
+            OptimismForwarder.L1_CROSS_DOMAIN_BASE,
             address(l2Oracle),
             _packMessage(),
             gasLimit

src/forwarders/DSROracleForwarderGnosis.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import { XChainForwarders } from 'xchain-helpers/XChainForwarders.sol';
+import { AMBForwarder } from 'xchain-helpers/forwarders/AMBForwarder.sol';
 
 import { DSROracleForwarderBase } from './DSROracleForwarderBase.sol';
 
@@ -12,7 +12,7 @@ contract DSROracleForwarderGnosis is DSROracleForwarderBase {
     }
 
     function refresh(uint256 gasLimit) public {
-        XChainForwarders.sendMessageGnosis(
+        AMBForwarder.sendMessageEthereumToGnosisChain(
             address(l2Oracle),
             _packMessage(),
             gasLimit

src/forwarders/DSROracleForwarderOptimism.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import { XChainForwarders } from 'xchain-helpers/XChainForwarders.sol';
+import { OptimismForwarder } from 'xchain-helpers/forwarders/OptimismForwarder.sol';
 
 import { DSROracleForwarderBase } from './DSROracleForwarderBase.sol';
 
@@ -12,7 +12,8 @@ contract DSROracleForwarderOptimism is DSROracleForwarderBase {
     }
 
     function refresh(uint256 gasLimit) public {
-        XChainForwarders.sendMessageOptimismMainnet(
+        OptimismForwarder.sendMessageL1toL2(
+            OptimismForwarder.L1_CROSS_DOMAIN_OPTIMISM,
             address(l2Oracle),
             _packMessage(),
             gasLimit