CI workflow

.github/workflows/main.yml

@@ -0,0 +1,20 @@
+name: CI
+on:
+  pull_request:
+    types: [opened, synchronize, edited, ready_for_review]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install packages
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18.x'
+      - run: yarn --ignore-scripts
+        shell: bash
+      - name: Run Tests
+        run: yarn hardhat test
+        shell: bash

.prettierrc.json

@@ -1,5 +1,6 @@
 {
   "semi": true,
   "singleQuote": false,
+  "bracketSpacing": true,
   "printWidth": 120
 }

config/general.ts

@@ -60,8 +60,6 @@ export default async function ({ network }: HardhatRuntimeEnvironment) {
 
       skipBorrowingFeeForSmallerSide: false,
 
-      ignoreOpenInterestForUsageFactor: false,
-
       maxExecutionFeeMultiplierFactor: decimalToFloat(100),
     };
   }
@@ -120,8 +118,6 @@ export default async function ({ network }: HardhatRuntimeEnvironment) {
 
     skipBorrowingFeeForSmallerSide: true,
 
-    ignoreOpenInterestForUsageFactor: false,
-
     maxExecutionFeeMultiplierFactor: decimalToFloat(100),
   };
 
@@ -145,12 +141,10 @@ export default async function ({ network }: HardhatRuntimeEnvironment) {
       increaseOrderGasLimit: 3_000_000,
       decreaseOrderGasLimit: 3_000_000,
       swapOrderGasLimit: 2_500_000,
-      ignoreOpenInterestForUsageFactor: true,
     },
     avalanche: {
       increaseOrderGasLimit: 3_500_000,
       decreaseOrderGasLimit: 3_500_000,
-      ignoreOpenInterestForUsageFactor: true,
     },
   }[network.name];
 

contracts/adl/AdlUtils.sol

@@ -176,7 +176,8 @@ library AdlUtils {
             params.dataStore.getUint(Keys.MAX_CALLBACK_GAS_LIMIT), // callbackGasLimit
             0, // minOutputAmount
             params.updatedAtTime, // updatedAtTime
-            0 // validFromTime
+            0, // validFromTime
+            0 // srcChainId
         );
 
         Order.Flags memory flags = Order.Flags(
@@ -189,7 +190,8 @@ library AdlUtils {
         Order.Props memory order = Order.Props(
             addresses,
             numbers,
-            flags
+            flags,
+            new bytes32[](0)
         );
 
         bytes32 key = NonceUtils.getNextKey(params.dataStore);

contracts/callback/CallbackUtils.sol

@@ -15,6 +15,13 @@ import "./IGasFeeCallbackReceiver.sol";
 import "./IGlvDepositCallbackReceiver.sol";
 import "./IGlvWithdrawalCallbackReceiver.sol";
 
+import "../order/OrderEventUtils.sol";
+import "../withdrawal/WithdrawalEventUtils.sol";
+import "../deposit/DepositEventUtils.sol";
+import "../shift/ShiftEventUtils.sol";
+import "../glv/glvDeposit/GlvDepositEventUtils.sol";
+import "../glv/glvWithdrawal/GlvWithdrawalEventUtils.sol";
+
 // @title CallbackUtils
 // @dev most features require a two step process to complete
 // the user first sends a request transaction, then a second transaction is sent
@@ -64,7 +71,7 @@ library CallbackUtils {
     // executions to fail
     // @param dataStore DataStore
     // @param callbackGasLimit the callback gas limit
-    function validateCallbackGasLimit(DataStore dataStore, uint256 callbackGasLimit) internal view {
+    function validateCallbackGasLimit(DataStore dataStore, uint256 callbackGasLimit) external view {
         uint256 maxCallbackGasLimit = dataStore.getUint(Keys.MAX_CALLBACK_GAS_LIMIT);
         if (callbackGasLimit > maxCallbackGasLimit) {
             revert Errors.MaxCallbackGasLimitExceeded(callbackGasLimit, maxCallbackGasLimit);
@@ -82,7 +89,7 @@ library CallbackUtils {
         dataStore.setAddress(Keys.savedCallbackContract(account, market), callbackContract);
     }
 
-    function getSavedCallbackContract(DataStore dataStore, address account, address market) internal view returns (address) {
+    function getSavedCallbackContract(DataStore dataStore, address account, address market) external view returns (address) {
         return dataStore.getAddress(Keys.savedCallbackContract(account, market));
     }
 
@@ -116,14 +123,16 @@ library CallbackUtils {
         bytes32 key,
         Deposit.Props memory deposit,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(deposit.callbackContract())) { return; }
 
         validateGasLeftForCallback(deposit.callbackGasLimit());
 
+        EventUtils.EventLogData memory depositData = DepositEventUtils.createEventData(deposit, Deposit.DepositType.Normal);
+
         try IDepositCallbackReceiver(deposit.callbackContract()).afterDepositExecution{ gas: deposit.callbackGasLimit() }(
             key,
-            deposit,
+            depositData,
             eventData
         ) {
         } catch {
@@ -138,14 +147,16 @@ library CallbackUtils {
         bytes32 key,
         Deposit.Props memory deposit,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(deposit.callbackContract())) { return; }
 
         validateGasLeftForCallback(deposit.callbackGasLimit());
 
+        EventUtils.EventLogData memory depositData = DepositEventUtils.createEventData(deposit, Deposit.DepositType.Normal);
+
         try IDepositCallbackReceiver(deposit.callbackContract()).afterDepositCancellation{ gas: deposit.callbackGasLimit() }(
             key,
-            deposit,
+            depositData,
             eventData
         ) {
         } catch {
@@ -160,14 +171,16 @@ library CallbackUtils {
         bytes32 key,
         Withdrawal.Props memory withdrawal,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(withdrawal.callbackContract())) { return; }
 
         validateGasLeftForCallback(withdrawal.callbackGasLimit());
 
+        EventUtils.EventLogData memory withdrawalData = WithdrawalEventUtils.createEventData(withdrawal, Withdrawal.WithdrawalType.Normal);
+
         try IWithdrawalCallbackReceiver(withdrawal.callbackContract()).afterWithdrawalExecution{ gas: withdrawal.callbackGasLimit() }(
             key,
-            withdrawal,
+            withdrawalData,
             eventData
         ) {
         } catch {
@@ -182,14 +195,16 @@ library CallbackUtils {
         bytes32 key,
         Withdrawal.Props memory withdrawal,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(withdrawal.callbackContract())) { return; }
 
         validateGasLeftForCallback(withdrawal.callbackGasLimit());
 
+        EventUtils.EventLogData memory withdrawalData = WithdrawalEventUtils.createEventData(withdrawal, Withdrawal.WithdrawalType.Normal);
+
         try IWithdrawalCallbackReceiver(withdrawal.callbackContract()).afterWithdrawalCancellation{ gas: withdrawal.callbackGasLimit() }(
             key,
-            withdrawal,
+            withdrawalData,
             eventData
         ) {
         } catch {
@@ -201,14 +216,16 @@ library CallbackUtils {
         bytes32 key,
         Shift.Props memory shift,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(shift.callbackContract())) { return; }
 
         validateGasLeftForCallback(shift.callbackGasLimit());
 
+        EventUtils.EventLogData memory shiftData = ShiftEventUtils.createEventData(shift);
+
         try IShiftCallbackReceiver(shift.callbackContract()).afterShiftExecution{ gas: shift.callbackGasLimit() }(
             key,
-            shift,
+            shiftData,
             eventData
         ) {
         } catch {
@@ -219,14 +236,16 @@ library CallbackUtils {
         bytes32 key,
         Shift.Props memory shift,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(shift.callbackContract())) { return; }
 
         validateGasLeftForCallback(shift.callbackGasLimit());
 
+        EventUtils.EventLogData memory shiftData = ShiftEventUtils.createEventData(shift);
+
         try IShiftCallbackReceiver(shift.callbackContract()).afterShiftCancellation{ gas: shift.callbackGasLimit() }(
             key,
-            shift,
+            shiftData,
             eventData
         ) {
         } catch {
@@ -244,14 +263,16 @@ library CallbackUtils {
         bytes32 key,
         Order.Props memory order,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(order.callbackContract())) { return; }
 
         validateGasLeftForCallback(order.callbackGasLimit());
 
+        EventUtils.EventLogData memory orderData = OrderEventUtils.createEventData(order);
+
         try IOrderCallbackReceiver(order.callbackContract()).afterOrderExecution{ gas: order.callbackGasLimit() }(
             key,
-            order,
+            orderData,
             eventData
         ) {
         } catch {
@@ -266,14 +287,16 @@ library CallbackUtils {
         bytes32 key,
         Order.Props memory order,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(order.callbackContract())) { return; }
 
         validateGasLeftForCallback(order.callbackGasLimit());
 
+        EventUtils.EventLogData memory orderData = OrderEventUtils.createEventData(order);
+
         try IOrderCallbackReceiver(order.callbackContract()).afterOrderCancellation{ gas: order.callbackGasLimit() }(
             key,
-            order,
+            orderData,
             eventData
         ) {
         } catch {
@@ -288,14 +311,16 @@ library CallbackUtils {
         bytes32 key,
         Order.Props memory order,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(order.callbackContract())) { return; }
 
         validateGasLeftForCallback(order.callbackGasLimit());
 
+        EventUtils.EventLogData memory orderData = OrderEventUtils.createEventData(order);
+
         try IOrderCallbackReceiver(order.callbackContract()).afterOrderFrozen{ gas: order.callbackGasLimit() }(
             key,
-            order,
+            orderData,
             eventData
         ) {
         } catch {
@@ -310,16 +335,18 @@ library CallbackUtils {
         bytes32 key,
         GlvDeposit.Props memory glvDeposit,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(glvDeposit.callbackContract())) {
             return;
         }
 
         validateGasLeftForCallback(glvDeposit.callbackGasLimit());
 
+        EventUtils.EventLogData memory glvData = GlvDepositEventUtils.createEventData(glvDeposit);
+
         try IGlvDepositCallbackReceiver(glvDeposit.callbackContract()).afterGlvDepositExecution{ gas: glvDeposit.callbackGasLimit() }(
             key,
-            glvDeposit,
+            glvData,
             eventData
         ) {
         } catch {
@@ -334,14 +361,16 @@ library CallbackUtils {
         bytes32 key,
         GlvDeposit.Props memory glvDeposit,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(glvDeposit.callbackContract())) { return; }
 
         validateGasLeftForCallback(glvDeposit.callbackGasLimit());
 
+        EventUtils.EventLogData memory glvData = GlvDepositEventUtils.createEventData(glvDeposit);
+
         try IGlvDepositCallbackReceiver(glvDeposit.callbackContract()).afterGlvDepositCancellation{ gas: glvDeposit.callbackGasLimit() }(
             key,
-            glvDeposit,
+            glvData,
             eventData
         ) {
         } catch {
@@ -356,14 +385,16 @@ library CallbackUtils {
         bytes32 key,
         GlvWithdrawal.Props memory glvWithdrawal,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(glvWithdrawal.callbackContract())) { return; }
 
         validateGasLeftForCallback(glvWithdrawal.callbackGasLimit());
 
+        EventUtils.EventLogData memory glvData = GlvWithdrawalEventUtils.createEventData(glvWithdrawal);
+
         try IGlvWithdrawalCallbackReceiver(glvWithdrawal.callbackContract()).afterGlvWithdrawalExecution{ gas: glvWithdrawal.callbackGasLimit() }(
             key,
-            glvWithdrawal,
+            glvData,
             eventData
         ) {
         } catch {
@@ -378,14 +409,16 @@ library CallbackUtils {
         bytes32 key,
         GlvWithdrawal.Props memory glvWithdrawal,
         EventUtils.EventLogData memory eventData
-    ) internal {
+    ) external {
         if (!isValidCallbackContract(glvWithdrawal.callbackContract())) { return; }
 
         validateGasLeftForCallback(glvWithdrawal.callbackGasLimit());
 
+        EventUtils.EventLogData memory glvData = GlvWithdrawalEventUtils.createEventData(glvWithdrawal);
+
         try IGlvWithdrawalCallbackReceiver(glvWithdrawal.callbackContract()).afterGlvWithdrawalCancellation{ gas: glvWithdrawal.callbackGasLimit() }(
             key,
-            glvWithdrawal,
+            glvData,
             eventData
         ) {
         } catch {
@@ -395,7 +428,7 @@ library CallbackUtils {
 
     // @dev validates that the given address is a contract
     // @param callbackContract the contract to call
-    function isValidCallbackContract(address callbackContract) internal view returns (bool) {
+    function isValidCallbackContract(address callbackContract) public view returns (bool) {
         if (callbackContract == address(0)) { return false; }
         if (!callbackContract.isContract()) { return false; }
 

contracts/callback/IDepositCallbackReceiver.sol

@@ -3,18 +3,18 @@
 pragma solidity ^0.8.0;
 
 import "../event/EventUtils.sol";
-import "../deposit/Deposit.sol";
+
 
 // @title IDepositCallbackReceiver
 // @dev interface for a deposit callback contract
 interface IDepositCallbackReceiver {
     // @dev called after a deposit execution
     // @param key the key of the deposit
     // @param deposit the deposit that was executed
-    function afterDepositExecution(bytes32 key, Deposit.Props memory deposit, EventUtils.EventLogData memory eventData) external;
+    function afterDepositExecution(bytes32 key, EventUtils.EventLogData memory depositData, EventUtils.EventLogData memory eventData) external;
 
     // @dev called after a deposit cancellation
     // @param key the key of the deposit
     // @param deposit the deposit that was cancelled
-    function afterDepositCancellation(bytes32 key, Deposit.Props memory deposit, EventUtils.EventLogData memory eventData) external;
+    function afterDepositCancellation(bytes32 key, EventUtils.EventLogData memory depositData, EventUtils.EventLogData memory eventData) external;
 }