solve merge conflicts

paraswap · Oct 27, 2023 · f5c79f3 · f5c79f3
1 parent 8febe66
commit f5c79f3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.17.0",
+  "version": "2.42.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

diff --git a/src/config.ts b/src/config.ts
@@ -145,6 +145,7 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     rfqConfigs: {},
     rpcPollingMaxAllowedStateDelayInBlocks: 5,
     rpcPollingBlocksBackToTriggerUpdate: 3,
+    forceRpcFallbackDexs: [],
   },
   [Network.BSC]: {
     network: Network.BSC,

diff --git a/src/router/buy.ts b/src/router/buy.ts
@@ -62,6 +62,18 @@ export class Buy extends PayloadEncoder implements IRouter<BuyParam> {
       minMaxAmount,
       priceRoute.srcAmount,
     );
+
+    const [partner, feePercent] = referrerAddress
+      ? [referrerAddress, encodeFeePercentForReferrer(SwapSide.BUY)]
+      : [
+          encodePartnerAddressForFeeLogic({
+            partnerAddress,
+            partnerFeePercent,
+            takeSurplus,
+          }),
+          encodeFeePercent(partnerFeePercent, takeSurplus, SwapSide.BUY),
+        ];
+
     const buyData: ContractBuyData = {
       adapter,
       fromToken: priceRoute.srcToken,

diff --git a/tests/utils-e2e.ts b/tests/utils-e2e.ts
@@ -378,8 +378,6 @@ export async function testE2E(
       poolIdentifiers,
       transferFees,
     );
-    // uncomment to avoid tenderly simulation
-    // process.exit()
     expect(parseFloat(priceRoute.destAmount)).toBeGreaterThan(0);
 
     // Calculate slippage. Default is 1%