feat(uniswapx-sdk): Implement Dutch V3 (#84)

Uniswap · Oct 24, 2024 · 6a0d553 · 6a0d553
1 parent 59420cc
commit 6a0d553
Show file tree

Hide file tree

Showing 26 changed files with 4,690 additions and 39 deletions.
diff --git a/sdks/uniswapx-sdk/abis/V3DutchOrderReactor.json b/sdks/uniswapx-sdk/abis/V3DutchOrderReactor.json
diff --git a/sdks/uniswapx-sdk/integration/test/V3DutchOrder.spec.ts b/sdks/uniswapx-sdk/integration/test/V3DutchOrder.spec.ts
diff --git a/sdks/uniswapx-sdk/integration/test/utils/time.ts b/sdks/uniswapx-sdk/integration/test/utils/time.ts
@@ -10,6 +10,15 @@ export class BlockchainTime {
     return timestamp + secondsFromNow;
   }
 
+  async blocksFromNow(blocksFromNow: number): Promise<number> {
+    const res = await hre.network.provider.send('eth_getBlockByNumber', [
+      'latest',
+      false,
+    ]);
+    const blockNum = parseInt(res.number, 16);
+    return blockNum + blocksFromNow;
+  }
+
   async increaseTime(seconds: number): Promise<void> {
     await hre.network.provider.send('evm_increaseTime', [seconds]);
     await hre.network.provider.send('evm_mine');

diff --git a/sdks/uniswapx-sdk/src/builder/V2DutchOrderBuilder.test.ts b/sdks/uniswapx-sdk/src/builder/V2DutchOrderBuilder.test.ts
@@ -349,7 +349,7 @@ describe("V2DutchOrderBuilder", () => {
         .outputOverrides([OUTPUT_START_AMOUNT.mul(102).div(100)])
         .build()
     ).toThrow(
-      "Invariant failed: inputOverride not set or larger than original input"
+      "Invariant failed: inputOverride larger than original input"
     );
   });
 
@@ -574,7 +574,7 @@ describe("V2DutchOrderBuilder", () => {
   });
 
   describe("partial order tests", () => {
-    it("builds an unsigned partial order with default cosignerData values", () => {
+    it("builds an unsigned partial order with default cosignerData values", () => { //TODO: partial orders don't have cosignerData...
       const deadline = Math.floor(Date.now() / 1000) + 1000;
       const order = builder
         .cosigner(constants.AddressZero)

diff --git a/sdks/uniswapx-sdk/src/builder/V2DutchOrderBuilder.ts b/sdks/uniswapx-sdk/src/builder/V2DutchOrderBuilder.ts
@@ -40,7 +40,7 @@ export class V2DutchOrderBuilder extends OrderBuilder {
       builder.output(output);
     }
 
-    if (isCosigned(order)) {
+    if (order instanceof CosignedV2DutchOrder) {
       builder.cosignature(order.info.cosignature);
       builder.decayEndTime(order.info.cosignerData.decayEndTime);
       builder.decayStartTime(order.info.cosignerData.decayStartTime);
@@ -287,9 +287,8 @@ export class V2DutchOrderBuilder extends OrderBuilder {
       "exclusivityOverrideBps not set"
     );
     invariant(
-      this.info.cosignerData.inputOverride !== undefined &&
         this.info.cosignerData.inputOverride.lte(this.info.input.startAmount),
-      "inputOverride not set or larger than original input"
+      "inputOverride larger than original input"
     );
     invariant(
       this.info.cosignerData.outputOverrides.length > 0,
@@ -339,9 +338,3 @@ export class V2DutchOrderBuilder extends OrderBuilder {
     };
   }
 }
-
-function isCosigned(
-  order: UnsignedV2DutchOrder | CosignedV2DutchOrder
-): order is CosignedV2DutchOrder {
-  return (order as CosignedV2DutchOrder).info.cosignature !== undefined;
-}