feat: updated debt switch interface (#559)

* feat: update debt switch * fix: updated tests
aave · Oct 4, 2023 · b108c62 · b108c62
1 parent 8e41d0e
commit b108c62
Show file tree

Hide file tree

Showing 4 changed files with 1,029 additions and 561 deletions.
diff --git a/packages/contract-helpers/src/paraswap-debtSwitch-contract/debtSwitch.test.ts b/packages/contract-helpers/src/paraswap-debtSwitch-contract/debtSwitch.test.ts
@@ -33,7 +33,8 @@ describe('DebtSwitchAdapterService', () => {
     const newAssetDebtToken = '0x0000000000000000000000000000000000000005';
     const augustus = '0x0000000000000000000000000000000000000006';
     const maxNewDebtAmount = '1000000';
-    const signedAmount = '1500000';
+    const extraCollateralAsset = '0x0000000000000000000000000000000000000000';
+    const extraCollateralAmount = '0';
 
     const txCalldata =
       '0x935fb84b0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae900000000000000000000000000000000000000000000000000000000119027b700000000000000000000000000000000000000000000001e483c86fa843f6c2000000000000000000000000000000000000000000000000000000000000000440000000000000000000000000000000000000000000000000000000000000180000000000000000000000000def171fe48cf0115b1d80b88dc8eab59176fee5700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000116446c67b6d00000000000000000000000000000000000000000000000000000000000000200000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c59900000000000000000000000000000000000000000000000000000000119027b700000000000000000000000000000000000000000000001dfec636122d1008df00000000000000000000000000000000000000000000001e4c566f818d31d01300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000006161766500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001120000000000000000000000000000000000000000000000000000000006177abb9ae2ba6c0362c11ec8f12233bf85851b3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000003a0430bf7cd2633af111ce3204db4b0990857a6f000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae90000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000108e47a6846afd000000000000000000000000000000000000000000000000000000000000099433f80000000000000000000000000000006daea1723962647b7e189d311d757fb793000000000000000000000000def171fe48cf0115b1d80b88dc8eab59176fee57000000000000000000000000100cec21fa2a0bdc21f770ec06e885e7c52a18680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006177abb93d1d355dba3f70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000001c558d406f7449cc936da0231093b069fcb8a42e3a2f0f78f0497515f8d795a29c3a57485920bb65c42c9f5884af63388d493b5cd0bcd2a6eed4fff7173982f4f800000000000000000000000000000000000000000000000000000000000011f80000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000420000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000003a0430bf7cd2633af111ce3204db4b0990857a6f000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000011abcf02276ffa00000000000000000000000000000000000000000000000000000000000082b007c000000000000000000000000b3c839dbde6b96d37c56ee4f9dad3390d49310aa000000000000000000000000def171fe48cf0115b1d80b88dc8eab59176fee57000000000000000000000000100cec21fa2a0bdc21f770ec06e885e7c52a18680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006177abd60000000000000000000000000000000000000000000000000000017cbb773bf00000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000001bc072f450f48f66263bd53e801840fbf545c7aa5aac969d568f87eb830b66f36907cba9fd12582a9a96f23d1396da6c94d46fa4bc0ab851972246cd117659949f0000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000003a0430bf7cd2633af111ce3204db4b0990857a6f0000000000000000000000000000000000000000000000000000000000002710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff00000000000000000000000000000000000000000000000000000000000009c400000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae9000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000386598f16ac87200000000000000000000000000000000000000000000000000046a1698a248c022a0000000000000000000000000000006daea1723962647b7e189d311d757fb793000000000000000000000000def171fe48cf0115b1d80b88dc8eab59176fee57000000000000000000000000100cec21fa2a0bdc21f770ec06e885e7c52a18680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006177abb902d4eee4d7c128000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000001c41623d640c08c3543660e464261260aed59bfba57c22b00326533525bd011953350326cee2a506e6daf1d0d8780eca139ec48cab2280c6e0bf1a1efe72b0ad880000000000000000000000000000000000000000000000000000000000000001000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff0000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae9000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000a91c3e5350e240000000000000000000000000000000000000000000000000000d41a7b6e826d0000000000000000000000000000b3c839dbde6b96d37c56ee4f9dad3390d49310aa000000000000000000000000def171fe48cf0115b1d80b88dc8eab59176fee57000000000000000000000000100cec21fa2a0bdc21f770ec06e885e7c52a18680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006177abd60000000000000000000000000000000000000000000000000000017cbb773bf00000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000001b842ca8317744091cfd12b2d2e9de4c17618cf2e19d5f0eecb68e3691b078542307aae0aeff4ae756ca20d0ec1dff2ec0a6cfdc595dd3a43d6b8a76f630c4b2f9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000';
@@ -65,17 +66,28 @@ describe('DebtSwitchAdapterService', () => {
         newAssetUnderlying,
         newAssetDebtToken,
         maxNewDebtAmount,
-        deadline: 0,
-        sigR: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        sigS: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        sigV: 0,
-        signedAmount,
+        extraCollateralAsset,
+        extraCollateralAmount,
+        creditDelegationPermit: {
+          value: 0,
+          deadline: 0,
+          v: 0,
+          r: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          s: '0x0000000000000000000000000000000000000000000000000000000000000000',
+        },
+        collateralPermit: {
+          value: 0,
+          deadline: 0,
+          v: 0,
+          r: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          s: '0x0000000000000000000000000000000000000000000000000000000000000000',
+        },
       });
 
       expect(txObj.from).toEqual(user);
       expect(txObj.to).toEqual(debtSwitchAdapterAddress);
       // function selector
-      expect(txObj.data?.substring(0, 10)).toEqual('0x636aa619');
+      expect(txObj.data?.substring(0, 10)).toEqual('0xb8bd1c6b');
 
       const txObjRepayAllFalse: PopulatedTransaction = swapInstance.debtSwitch({
         user,
@@ -88,17 +100,28 @@ describe('DebtSwitchAdapterService', () => {
         newAssetUnderlying,
         newAssetDebtToken,
         maxNewDebtAmount,
-        deadline: 0,
-        sigR: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        sigS: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        sigV: 0,
-        signedAmount,
+        extraCollateralAsset,
+        extraCollateralAmount,
+        creditDelegationPermit: {
+          value: 0,
+          deadline: 0,
+          v: 0,
+          r: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          s: '0x0000000000000000000000000000000000000000000000000000000000000000',
+        },
+        collateralPermit: {
+          value: 0,
+          deadline: 0,
+          v: 0,
+          r: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          s: '0x0000000000000000000000000000000000000000000000000000000000000000',
+        },
       });
 
       expect(txObjRepayAllFalse.from).toEqual(user);
       expect(txObjRepayAllFalse.to).toEqual(debtSwitchAdapterAddress);
       // function selector
-      expect(txObjRepayAllFalse.data?.substring(0, 10)).toEqual('0x636aa619');
+      expect(txObjRepayAllFalse.data?.substring(0, 10)).toEqual('0xb8bd1c6b');
     });
   });
 });
diff --git a/packages/contract-helpers/src/paraswap-debtSwitch-contract/index.ts b/packages/contract-helpers/src/paraswap-debtSwitch-contract/index.ts
@@ -21,14 +21,25 @@ export type DebtSwitchType = {
   newAssetDebtToken: string;
   newAssetUnderlying: string;
   maxNewDebtAmount: string;
+  extraCollateralAsset: string;
+  extraCollateralAmount: string;
   repayAll: boolean;
   txCalldata: string;
   augustus: string;
-  deadline: BigNumberish;
-  signedAmount: string;
-  sigV: BigNumberish;
-  sigR: BytesLike;
-  sigS: BytesLike;
+  creditDelegationPermit: {
+    value: BigNumberish;
+    deadline: BigNumberish;
+    v: BigNumberish;
+    r: BytesLike;
+    s: BytesLike;
+  };
+  collateralPermit: {
+    value: BigNumberish;
+    deadline: BigNumberish;
+    v: BigNumberish;
+    r: BytesLike;
+    s: BytesLike;
+  };
 };
 
 export interface ParaswapDebtSwitchInterface {
@@ -63,11 +74,10 @@ export class DebtSwitchAdapterService
     repayAll,
     txCalldata,
     augustus,
-    deadline,
-    sigV,
-    sigR,
-    sigS,
-    signedAmount,
+    extraCollateralAsset,
+    extraCollateralAmount,
+    creditDelegationPermit,
+    collateralPermit,
   }: DebtSwitchType): PopulatedTransaction {
     const callDataEncoded = utils.defaultAbiCoder.encode(
       ['bytes', 'address'],
@@ -82,23 +92,27 @@ export class DebtSwitchAdapterService
       maxNewDebtAmount,
       offset: repayAll ? augustusToAmountOffsetFromCalldata(txCalldata) : 0,
       paraswapData: callDataEncoded,
+      extraCollateralAsset,
+      extraCollateralAmount,
     };
 
     const creditDelParamsStruct: ParaSwapDebtSwapAdapter.CreditDelegationInputStruct =
       {
         debtToken: newAssetDebtToken,
-        value: signedAmount,
-        deadline,
-        v: sigV,
-        r: sigR,
-        s: sigS,
+        ...creditDelegationPermit,
       };
 
+    const permitInput: ParaSwapDebtSwapAdapter.PermitInputStruct = {
+      aToken: extraCollateralAsset,
+      ...collateralPermit,
+    };
+
     const actionTx: PopulatedTransaction = {};
 
     const txData = this.contractInterface.encodeFunctionData('swapDebt', [
       txParamsStruct,
       creditDelParamsStruct,
+      permitInput,
     ]);
 
     actionTx.to = this.debtSwitchAddress;