Merge pull request #10 from equilibria-xyz/arjun/forwarder-rounding

Fix forwarder rounding
equilibria-xyz · Jun 3, 2022 · 33edb6c · 33edb6c
2 parents eddbc9f + 5ec61bf
commit 33edb6c
Show file tree

Hide file tree

Showing 5 changed files with 368 additions and 29 deletions.
diff --git a/packages/perennial/contracts/forwarder/Forwarder.sol b/packages/perennial/contracts/forwarder/Forwarder.sol
@@ -55,7 +55,7 @@ contract Forwarder is IForwarder {
         IProduct product,
         UFixed18 amount
     ) external {
-        USDC.pull(msg.sender, amount);
+        USDC.pull(msg.sender, amount, true);
         batcher.wrap(amount, address(this));
         collateral.depositTo(account, product, amount);
         emit WrapAndDeposit(account, product, amount);

diff --git a/packages/perennial/contracts/interfaces/IForwarder.sol b/packages/perennial/contracts/interfaces/IForwarder.sol
@@ -10,8 +10,8 @@ import "./ICollateral.sol";
 interface IForwarder {
     event WrapAndDeposit(address indexed account, IProduct indexed product, UFixed18 amount);
 
-    function USDC() external view returns (Token6);
-    function DSU() external view returns (Token18);
+    function USDC() external view returns (Token6); // solhint-disable-line func-name-mixedcase
+    function DSU() external view returns (Token18); // solhint-disable-line func-name-mixedcase
     function batcher() external view returns (IBatcher);
     function collateral() external view returns (ICollateral);
     function wrapAndDeposit(address account, IProduct product, UFixed18 amount) external;

diff --git a/packages/perennial/deployments/kovan/Forwarder.json b/packages/perennial/deployments/kovan/Forwarder.json