Used Address type for dstToken

1inch · Jan 29, 2024 · 52b783b · 52b783b
1 parent fc0b967
commit 52b783b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -1,5 +1,5 @@
-EscrowFactoryTest:testFuzz_DeployCloneForMaker(bytes32,uint56,uint56) (runs: 256, μ: 234901, ~: 237997)
-EscrowFactoryTest:testFuzz_DeployCloneForTaker(bytes32,uint56) (runs: 256, μ: 180464, ~: 183236)
+EscrowFactoryTest:testFuzz_DeployCloneForMaker(bytes32,uint56,uint56) (runs: 256, μ: 234194, ~: 237909)
+EscrowFactoryTest:testFuzz_DeployCloneForTaker(bytes32,uint56) (runs: 256, μ: 180412, ~: 183236)
 EscrowFactoryTest:test_NoDeploymentForNotResolver() (gas: 103456)
 EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMaker() (gas: 185356)
 EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForTaker() (gas: 27715)
@@ -27,6 +27,6 @@ EscrowTest:test_WithdrawByAnyoneDst() (gas: 187575)
 EscrowTest:test_WithdrawByResolverDst() (gas: 186265)
 EscrowTest:test_WithdrawByResolverPublicDst() (gas: 187938)
 EscrowTest:test_WithdrawSrc() (gas: 245902)
-IntegrationEscrowFactoryTest:testFuzz_DeployCloneForMakerInt(bytes32,uint56,uint56) (runs: 256, μ: 296245, ~: 299960)
+IntegrationEscrowFactoryTest:testFuzz_DeployCloneForMakerInt(bytes32,uint56,uint56) (runs: 256, μ: 296280, ~: 299872)
 IntegrationEscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMakerInt() (gas: 281514)
 TimelocksLibTest:test_getStartTimestamps() (gas: 15326)
diff --git a/contracts/interfaces/IEscrow.sol b/contracts/interfaces/IEscrow.sol
@@ -2,6 +2,8 @@
 
 pragma solidity ^0.8.0;
 
+import { Address } from "solidity-utils/libraries/AddressLib.sol";
+
 import { PackedAddresses } from "../libraries/PackedAddressesLib.sol";
 import { Timelocks } from "../libraries/TimelocksLib.sol";
 
@@ -17,7 +19,7 @@ interface IEscrow {
         // maker, taker, token in two 32-byte slots
         PackedAddresses packedAddresses;
         uint256 dstChainId;
-        address dstToken;
+        Address dstToken;
         // 16 bytes for srcSafetyDeposit and 16 bytes for dstSafetyDeposit.
         uint256 deposits;
         Timelocks timelocks;

diff --git a/test/integration/EscrowFactory.t.sol b/test/integration/EscrowFactory.t.sol
@@ -5,9 +5,11 @@ import { IEscrowFactory } from "contracts/EscrowFactory.sol";
 import { Escrow, IEscrow } from "contracts/Escrow.sol";
 import { PackedAddressesMemLib } from "../utils/libraries/PackedAddressesMemLib.sol";
 
-import { BaseSetup, IOrderMixin, TakerTraits } from "../utils/BaseSetup.sol";
+import { Address, AddressLib, BaseSetup, IOrderMixin, TakerTraits } from "../utils/BaseSetup.sol";
 
 contract IntegrationEscrowFactoryTest is BaseSetup {
+    using AddressLib for Address;
+
     function setUp() public virtual override {
         BaseSetup.setUp();
     }
@@ -58,7 +60,7 @@ contract IntegrationEscrowFactoryTest is BaseSetup {
         IEscrow.SrcEscrowImmutables memory returnedImmutables = srcClone.srcEscrowImmutables();
         assertEq(returnedImmutables.hashlock, keccak256(abi.encodePacked(secret)));
         assertEq(PackedAddressesMemLib.taker(returnedImmutables.packedAddresses), bob.addr);
-        assertEq(returnedImmutables.dstToken, address(dai));
+        assertEq(returnedImmutables.dstToken.get(), address(dai));
     }
 
     function test_NoInsufficientBalanceDeploymentForMakerInt() public {

diff --git a/test/unit/EscrowFactory.t.sol b/test/unit/EscrowFactory.t.sol
@@ -8,11 +8,12 @@ import { IEscrowFactory } from "contracts/EscrowFactory.sol";
 import { PackedAddresses, PackedAddressesMemLib } from "../utils/libraries/PackedAddressesMemLib.sol";
 import { Timelocks, TimelocksLib } from "contracts/libraries/TimelocksLib.sol";
 
-import { BaseSetup, IOrderMixin } from "../utils/BaseSetup.sol";
+import { Address, AddressLib, BaseSetup, IOrderMixin } from "../utils/BaseSetup.sol";
 
 contract EscrowFactoryTest is BaseSetup {
-    using TimelocksLib for Timelocks;
+    using AddressLib for Address;
     using PackedAddressesMemLib for PackedAddresses;
+    using TimelocksLib for Timelocks;
 
     function setUp() public virtual override {
         BaseSetup.setUp();
@@ -50,7 +51,7 @@ contract EscrowFactoryTest is BaseSetup {
         assertEq(returnedImmutables.orderHash, orderHash);
         assertEq(returnedImmutables.hashlock, keccak256(abi.encodePacked(secret)));
         assertEq(returnedImmutables.srcAmount, srcAmount);
-        assertEq(returnedImmutables.dstToken, address(dai));
+        assertEq(returnedImmutables.dstToken.get(), address(dai));
         assertEq(returnedImmutables.packedAddresses.maker(), alice.addr);
         assertEq(returnedImmutables.packedAddresses.taker(), bob.addr);
         assertEq(returnedImmutables.packedAddresses.token(), address(usdc));