Uniswap · gretzke · May 26, 2024 · May 25, 2024 · May 25, 2024 · May 26, 2024
@@ -1 +1 @@
-326027
+325929
@@ -1 +1 @@
-139529
+139505
@@ -1 +1 @@
-57275
+57229
@@ -1 +1 @@
-59520
+59496
@@ -1 +1 @@
-19871
+19837
@@ -1 +1 @@
-181644
+181448
@@ -1 +1 @@
-135933
+135835
@@ -1 +1 @@
-115761
+115664
@@ -1 +1 @@
-96504
+96455
@@ -1 +1 @@
-88544
+88495
@@ -1 +1 @@
-114348
+114299
@@ -1 +1 @@
-129513
+129464
@@ -1 +1 @@
-132045
+131947
@@ -1 +1 @@
-178951
+178853
@@ -1 +1 @@
-110009
+109936
@@ -1 +1 @@
-121356
+121307
@@ -1 +1 @@
-132744
+132695
@@ -1 +1 @@
-122135
+122086
@@ -1 +1 @@
-216725
+216627
@@ -1 +1 @@
-144786
+144737
@@ -1 +1 @@
-138356
+138307
@@ -1 +1 @@
-175722
+175673
@@ -1 +1 @@
-151822
+151773
@@ -1 +1 @@
-154464
+154415
@@ -36,43 +36,38 @@ library CurrencyLibrary {
     Currency public constant NATIVE = Currency.wrap(address(0));
 
     function transfer(Currency currency, address to, uint256 amount) internal {
-        // implementation from
-        // https://github.com/transmissions11/solmate/blob/e8f96f25d48fe702117ce76c79228ca4f20206cb/src/utils/SafeTransferLib.sol
+        // altered from https://github.com/Vectorized/solady/blob/89101d53b7c8784cca935c1f2f6403639cee48b2/src/utils/SafeTransferLib.sol
+        // modified custom error selectors
 
-        bool success;
         if (currency.isNative()) {
+            /// @solidity memory-safe-assembly
             assembly {
-                // Transfer the ETH and store if it succeeded or not.
-                success := call(gas(), to, amount, 0, 0, 0, 0)
+                // Transfer the ETH and revert if it fails.
+                if iszero(call(gas(), to, amount, 0x00, 0x00, 0x00, 0x00)) {
+                    mstore(0x00, 0xf4b3b1bc) // `NativeTransferFailed()`.
+                    revert(0x1c, 0x04)
+                }
             }
-
-            if (!success) revert NativeTransferFailed();
         } else {
+            /// @solidity memory-safe-assembly
             assembly {
-                // We'll write our calldata to this slot below, but restore it later.
-                let memPointer := mload(0x40)
-
-                // Write the abi-encoded calldata into memory, beginning with the function selector.
-                mstore(0, 0xa9059cbb00000000000000000000000000000000000000000000000000000000)
-                mstore(4, to) // Append the "to" argument.
-                mstore(36, amount) // Append the "amount" argument.
-
-                success :=
-                    and(
-                        // Set success to whether the call reverted, if not we check it either
-                        // returned exactly 1 (can't just be non-zero data), or had no return data.
-                        or(and(eq(mload(0), 1), gt(returndatasize(), 31)), iszero(returndatasize())),
-                        // We use 68 because that's the total length of our calldata (4 + 32 * 2)
-                        // Counterintuitively, this call() must be positioned after the or() in the
-                        // surrounding and() because and() evaluates its arguments from right to left.
-                        call(gas(), currency, 0, 0, 68, 0, 32)
+                mstore(0x14, to) // Store the `to` address in [0x20, 0x34).
+                mstore(0x34, amount) // Store the `amount` argument in [0x34, 0x54).
+                // Store the selector of `transfer(address,uint256)` in [0x10, 0x14).
+                // also cleans the upper bits of `to`
+                mstore(0x00, 0xa9059cbb000000000000000000000000)
+                // Perform the transfer, reverting upon failure.
+                if iszero(
+                    and( // The arguments of `and` are evaluated from right to left.
+                        or(eq(mload(0x00), 1), iszero(returndatasize())), // Returned 1 or nothing.
+                        call(gas(), currency, 0, 0x10, 0x44, 0x00, 0x20)
                     )
-
-                mstore(0x60, 0) // Restore the zero slot to zero.
-                mstore(0x40, memPointer) // Restore the memPointer.
+                ) {
+                    mstore(0x00, 0xf27f64e4) // `ERC20TransferFailed()`.
+                    revert(0x1c, 0x04)
+                }
+                mstore(0x34, 0) // Restore the part of the free memory pointer that was overwritten.
             }
-
-            if (!success) revert ERC20TransferFailed();
         }
     }