Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(payment-processor): load hinkal lib asyncronously #1573

Merged
merged 3 commits into from
Feb 21, 2025
Merged

chore(payment-processor): load hinkal lib asyncronously #1573

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0151e06
chore: load hinkal lib asyncronously
alexandre-abrioux Feb 18, 2025
750f938
add missing await
alexandre-abrioux Feb 18, 2025
e31f685
remove corepack property
alexandre-abrioux Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions packages/payment-processor/src/payment/erc-20-private-payment-hinkal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import { Contract, ContractTransaction, Signer, BigNumberish, providers, BigNumber } from 'ethers';
import { BigNumber, BigNumberish, Contract, ContractTransaction, providers, Signer } from 'ethers';
import { erc20FeeProxyArtifact } from '@requestnetwork/smart-contracts';
import {
ERC20__factory,
ERC20FeeProxy__factory,
ERC20Proxy__factory,
ERC20__factory,
} from '@requestnetwork/smart-contracts/types';
import { ClientTypes, ExtensionTypes } from '@requestnetwork/types';
import { Erc20PaymentNetwork, getPaymentNetworkExtension } from '@requestnetwork/payment-detection';
import { EvmChains } from '@requestnetwork/currency';
import {
getAmountToPay,
getProvider,
getProxyAddress,
getRequestPaymentValues,
getSigner,
validateRequest,
validateErc20FeeProxyRequest,
getProxyAddress,
validateRequest,
} from './utils';
import { IPreparedPrivateTransaction } from './prepared-transaction';

import { emporiumOp, IHinkal, RelayerTransaction } from '@hinkal/common';
import type { IHinkal, RelayerTransaction } from '@hinkal/common';
import { prepareEthersHinkal } from '@hinkal/common/providers/prepareEthersHinkal';

/**
Expand Down Expand Up @@ -85,10 +85,8 @@ export async function payErc20ProxyRequestFromHinkalShieldedAddress(
const signer = getSigner(signerOrProvider);
const hinkalObject = await addToHinkalStore(signer);

const { amountToPay, tokenAddress, ops } = prepareErc20ProxyPaymentFromHinkalShieldedAddress(
request,
amount,
);
const { amountToPay, tokenAddress, ops } =
await prepareErc20ProxyPaymentFromHinkalShieldedAddress(request, amount);

return hinkalObject.actionPrivateWallet(
[tokenAddress],
Expand All @@ -114,11 +112,8 @@ export async function payErc20FeeProxyRequestFromHinkalShieldedAddress(
const signer = getSigner(signerOrProvider);
const hinkalObject = await addToHinkalStore(signer);

const { amountToPay, tokenAddress, ops } = prepareErc20FeeProxyPaymentFromHinkalShieldedAddress(
request,
amount,
feeAmount,
);
const { amountToPay, tokenAddress, ops } =
await prepareErc20FeeProxyPaymentFromHinkalShieldedAddress(request, amount, feeAmount);

return hinkalObject.actionPrivateWallet(
[tokenAddress],
Expand All @@ -133,10 +128,10 @@ export async function payErc20FeeProxyRequestFromHinkalShieldedAddress(
* @param request request to pay
* @param amount optionally, the amount to pay. Defaults to remaining amount of the request.
*/
export function prepareErc20ProxyPaymentFromHinkalShieldedAddress(
export async function prepareErc20ProxyPaymentFromHinkalShieldedAddress(
request: ClientTypes.IRequestData,
amount?: BigNumberish,
): IPreparedPrivateTransaction {
): Promise<IPreparedPrivateTransaction> {
validateRequest(request, ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_PROXY_CONTRACT);

const { value: tokenAddress } = request.currencyInfo;
Expand All @@ -150,6 +145,7 @@ export function prepareErc20ProxyPaymentFromHinkalShieldedAddress(

const { paymentReference, paymentAddress } = getRequestPaymentValues(request);
const amountToPay = getAmountToPay(request, amount);
const { emporiumOp } = await import('@hinkal/common');

const ops = [
emporiumOp(tokenContract, 'approve', [proxyContract.address, amountToPay]),
Expand All @@ -174,11 +170,11 @@ export function prepareErc20ProxyPaymentFromHinkalShieldedAddress(
* @param amount optionally, the amount to pay. Defaults to remaining amount of the request.
* @param feeAmountOverride optionally, the fee amount to pay. Defaults to the fee amount of the request.
*/
export function prepareErc20FeeProxyPaymentFromHinkalShieldedAddress(
export async function prepareErc20FeeProxyPaymentFromHinkalShieldedAddress(
request: ClientTypes.IRequestData,
amount?: BigNumberish,
feeAmountOverride?: BigNumberish,
): IPreparedPrivateTransaction {
): Promise<IPreparedPrivateTransaction> {
validateErc20FeeProxyRequest(request, amount, feeAmountOverride);

const { value: tokenAddress, network } = request.currencyInfo;
Expand All @@ -194,6 +190,7 @@ export function prepareErc20FeeProxyPaymentFromHinkalShieldedAddress(
const amountToPay = getAmountToPay(request, amount);
const feeToPay = String(feeAmountOverride || feeAmount || 0);
const totalAmount = amountToPay.add(BigNumber.from(feeToPay));
const { emporiumOp } = await import('@hinkal/common');

const ops = [
emporiumOp(tokenContract, 'approve', [proxyContract.address, totalAmount]),
Expand Down