Merge branch 'main' into meta-txn

Uniswap · Nov 3, 2023 · 13783ed · 13783ed
2 parents 3615d65 + 4bc3d8d
commit 13783ed
Show file tree

Hide file tree

Showing 11 changed files with 256 additions and 106 deletions.
diff --git a/.forge-snapshots/Base-ExclusiveDutchLimitOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-ExclusiveDutchLimitOrder-BaseExecuteSingleWithFee.snap
diff --git a/.forge-snapshots/Base-ExclusiveDutchLimitOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-ExclusiveDutchLimitOrder-ExecuteSingleNativeOutput.snap
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/permit2"]
-	path = lib/permit2
-	url = [email protected]:Uniswap/permit2.git
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/transmissions11/solmate
@@ -16,3 +13,6 @@
 [submodule "lib/universal-router"]
 	path = lib/universal-router
 	url = https://github.com/uniswap/universal-router
+[submodule "lib/permit2"]
+	path = lib/permit2
+	url = https://github.com/Uniswap/permit2
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ Note that UniswapX handles fee-on-transfer tokens by transferring the amount spe
 
 # Audit
 
-This codebase was audited by [ABDK](./audit/ABDK.pdf).
+This codebase was audited by [ABDK](./audit/v1.1/ABDK.pdf) and [OpenZeppelin](./audit/v1.1/OpenZeppelin.pdf).
 
 ## Bug Bounty
 

diff --git a/audit/v1.1/OpenZeppelin.pdf b/audit/v1.1/OpenZeppelin.pdf
diff --git a/lib/permit2 b/lib/permit2
diff --git a/src/sample-executors/SwapRouter02Executor.sol b/src/sample-executors/SwapRouter02Executor.sol
@@ -18,7 +18,7 @@ contract SwapRouter02Executor is IReactorCallback, Owned {
 
     /// @notice thrown if reactorCallback is called with a non-whitelisted filler
     error CallerNotWhitelisted();
-    /// @notice thrown if reactorCallback is called by an adress other than the reactor
+    /// @notice thrown if reactorCallback is called by an address other than the reactor
     error MsgSenderNotReactor();
 
     ISwapRouter02 private immutable swapRouter02;

diff --git a/test/base/BaseReactor.t.sol b/test/base/BaseReactor.t.sol
diff --git a/test/util/mock/MockFillContract.sol b/test/util/mock/MockFillContract.sol
@@ -11,9 +11,6 @@ import {IReactorCallback} from "../../../src/interfaces/IReactorCallback.sol";
 contract MockFillContract is IReactorCallback {
     using CurrencyLibrary for address;
 
-    /// @notice thrown if native transfer fails to the reactor
-    error NativeTransferFailed();
-
     IReactor immutable reactor;
 
     constructor(address _reactor) {

diff --git a/test/util/mock/MockFillContractDoubleExecution.sol b/test/util/mock/MockFillContractDoubleExecution.sol
@@ -11,9 +11,6 @@ import {IReactorCallback} from "../../../src/interfaces/IReactorCallback.sol";
 contract MockFillContractDoubleExecution is IReactorCallback {
     using CurrencyLibrary for address;
 
-    /// @notice thrown if native transfer fails to the reactor
-    error NativeTransferFailed();
-
     IReactor immutable reactor1;
     IReactor immutable reactor2;
 

diff --git a/test/util/mock/MockFillContractWithOutputOverride.sol b/test/util/mock/MockFillContractWithOutputOverride.sol
@@ -13,9 +13,6 @@ contract MockFillContractWithOutputOverride is IReactorCallback {
     uint256 outputAmount;
 
     IReactor immutable reactor;
-    /// @notice thrown if native transfer fails to the reactor
-
-    error NativeTransferFailed();
 
     constructor(address _reactor) {
         reactor = IReactor(_reactor);
-Original file line number
+Diff line change
@@ Expand Up @@
     # Audit
-    This codebase was audited by [ABDK](./audit/ABDK.pdf).
+    This codebase was audited by [ABDK](./audit/v1.1/ABDK.pdf) and [OpenZeppelin](./audit/v1.1/OpenZeppelin.pdf).
     ## Bug Bounty
@@ Expand Down @@
+53 −53		.gas-snapshot
+1 −1		src/interfaces/IAllowanceTransfer.sol
+1 −1		src/interfaces/IDAIPermit.sol
+1 −1		src/interfaces/IEIP712.sol
+1 −1		src/interfaces/IERC1271.sol
+1 −1		src/interfaces/ISignatureTransfer.sol