PR comments

RequestNetwork · Apr 12, 2021 · 8070bdf · 8070bdf
1 parent 124c332
commit 8070bdf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/payment-processor/src/index.ts b/packages/payment-processor/src/index.ts
@@ -6,6 +6,7 @@ export * from './payment/erc20-fee-proxy';
 export * from './payment/eth-input-data';
 export * from './payment/eth-proxy';
 export * from './payment/swap-conversion-erc20';
+export * from './payment/swap-any-to-erc20';
 export * from './payment/swap-erc20';
 export * from './payment/swap-erc20-fee-proxy';
 export * from './payment/conversion-erc20';

diff --git a/packages/payment-processor/src/payment/swap-any-to-erc20.ts b/packages/payment-processor/src/payment/swap-any-to-erc20.ts
@@ -52,7 +52,6 @@ export async function swapToPayAnyToErc20Request(
  * Encodes the call to pay a request through the ERC20 fee proxy contract, can be used with a Multisig contract.
  * @param request request to pay
  * @param signerOrProvider the Web3 provider, or signer. Defaults to window.ethereum
- * @param settings settings for the swap and the on-chain conversion
  * @param options to override amount, feeAmount and transaction parameters
  */
 export function encodeSwapToPayAnyToErc20Request(

diff --git a/packages/payment-processor/src/payment/swap-conversion-erc20.ts b/packages/payment-processor/src/payment/swap-conversion-erc20.ts
@@ -25,9 +25,11 @@ export async function approveErc20ForSwapWithConversionIfNeeded(
   minAmount: BigNumberish,
   overrides?: ITransactionOverrides,
 ): Promise<ContractTransaction | void> {
+  if (!request.extensions[PaymentTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY]) {
+    throw new Error(`The request must have the payment network any-to-erc20-proxy`);
+  }
   const network =
-    request.extensions[PaymentTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY].values.network ||
-    'mainnet';
+    request.extensions[PaymentTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY].values.network;
   if (
     !(await checkErc20Allowance(
       ownerAddress,