Skip to content

Commit cca8202

Browse files
chore: use new BlockNumberish (#361)
* blocknumberish * test snapshot * git submodule add * forge test snapshot
1 parent 687d9e1 commit cca8202

4 files changed

Lines changed: 6 additions & 2 deletions

File tree

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
[submodule "lib/calibur"]
1717
path = lib/calibur
1818
url = https://github.com/Uniswap/calibur
19+
[submodule "lib/blocknumberish"]
20+
path = lib/blocknumberish
21+
url = https://github.com/Uniswap/blocknumberish
1922
[submodule "Tribunal"]
2023
path = lib/Tribunal
2124
url = https://github.com/Uniswap/Tribunal

lib/blocknumberish

Submodule blocknumberish added at b911c96

remappings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ds-test/=lib/forge-std/lib/ds-test/src/
2+
blocknumberish/=lib/blocknumberish/
23
forge-gas-snapshot/=lib/forge-gas-snapshot/src/
34
forge-std/=lib/forge-std/src/
45
openzeppelin-contracts/utils=lib/openzeppelin-contracts/contracts/utils
@@ -7,4 +8,3 @@ openzeppelin-contracts/contracts/utils=lib/calibur/lib/openzeppelin-contracts/co
78
permit2/=lib/permit2/
89
solmate/=lib/solmate/
910
tribunal/=lib/Tribunal
10-

src/v4/resolvers/HybridAuctionResolver.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {SignedOrder, InputToken, OutputToken} from "../../base/ReactorStructs.so
99
import {ResolvedOrder} from "../base/ReactorStructs.sol";
1010
import {HybridOrder, HybridOrderLib, HybridInput, HybridOutput} from "../lib/HybridOrderLib.sol";
1111
import {CosignerLib} from "../../lib/CosignerLib.sol";
12-
import {BlockNumberish} from "../../base/BlockNumberish.sol";
12+
import {BlockNumberish} from "blocknumberish/src/BlockNumberish.sol";
1313

1414
/// @notice Resolver for hybrid Dutch + priority gas auctions following Tribunal's model
1515
contract HybridAuctionResolver is IAuctionResolver, BlockNumberish {

0 commit comments

Comments
 (0)