@requestnetwork/smart-contracts 0.28.1-next.1703 → 0.28.1-next.1705

package/types/ERC20SwapToConversion.d.ts

@@ -21,22 +21,23 @@ import { TypedEventFilter, TypedEvent, TypedListener } from "./commons";
 
 interface ERC20SwapToConversionInterface extends ethers.utils.Interface {
   functions: {
-    "approvePaymentProxyToSpend(address)": FunctionFragment;
+    "approvePaymentProxyToSpend(address,address)": FunctionFragment;
     "approveRouterToSpend(address)": FunctionFragment;
     "chainlinkConversionPath()": FunctionFragment;
     "owner()": FunctionFragment;
-    "paymentProxy()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
-    "setPaymentProxy(address)": FunctionFragment;
+    "requestSwapFees()": FunctionFragment;
     "setRouter(address)": FunctionFragment;
     "swapRouter()": FunctionFragment;
-    "swapTransferWithReference(address,uint256,uint256,address[],address[],bytes,uint256,address,uint256,uint256)": FunctionFragment;
+    "swapTransferWithReference(address,address,uint256,uint256,address[],address[],bytes,uint256,address,uint256,uint256)": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
+    "updateConversionPathAddress(address)": FunctionFragment;
+    "updateRequestSwapFees(uint256)": FunctionFragment;
   };
 
   encodeFunctionData(
     functionFragment: "approvePaymentProxyToSpend",
-    values: [string]
+    values: [string, string]
   ): string;
   encodeFunctionData(
     functionFragment: "approveRouterToSpend",
@@ -47,17 +48,13 @@ interface ERC20SwapToConversionInterface extends ethers.utils.Interface {
     values?: undefined
   ): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "paymentProxy",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "renounceOwnership",
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "setPaymentProxy",
-    values: [string]
+    functionFragment: "requestSwapFees",
+    values?: undefined
   ): string;
   encodeFunctionData(functionFragment: "setRouter", values: [string]): string;
   encodeFunctionData(
@@ -67,6 +64,7 @@ interface ERC20SwapToConversionInterface extends ethers.utils.Interface {
   encodeFunctionData(
     functionFragment: "swapTransferWithReference",
     values: [
+      string,
       string,
       BigNumberish,
       BigNumberish,
@@ -83,6 +81,14 @@ interface ERC20SwapToConversionInterface extends ethers.utils.Interface {
     functionFragment: "transferOwnership",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "updateConversionPathAddress",
+    values: [string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "updateRequestSwapFees",
+    values: [BigNumberish]
+  ): string;
 
   decodeFunctionResult(
     functionFragment: "approvePaymentProxyToSpend",
@@ -97,16 +103,12 @@ interface ERC20SwapToConversionInterface extends ethers.utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "paymentProxy",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "renounceOwnership",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "setPaymentProxy",
+    functionFragment: "requestSwapFees",
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "setRouter", data: BytesLike): Result;
@@ -119,6 +121,14 @@ interface ERC20SwapToConversionInterface extends ethers.utils.Interface {
     functionFragment: "transferOwnership",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateConversionPathAddress",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateRequestSwapFees",
+    data: BytesLike
+  ): Result;
 
   events: {
     "OwnershipTransferred(address,address)": EventFragment;
@@ -173,6 +183,7 @@ export class ERC20SwapToConversion extends BaseContract {
   functions: {
     approvePaymentProxyToSpend(
       _erc20Address: string,
+      _paymentProxy: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -185,16 +196,11 @@ export class ERC20SwapToConversion extends BaseContract {
 
     owner(overrides?: CallOverrides): Promise<[string]>;
 
-    paymentProxy(overrides?: CallOverrides): Promise<[string]>;
-
     renounceOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    setPaymentProxy(
-      _paymentProxyAddress: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
+    requestSwapFees(overrides?: CallOverrides): Promise<[BigNumber]>;
 
     setRouter(
       _newSwapRouterAddress: string,
@@ -204,15 +210,16 @@ export class ERC20SwapToConversion extends BaseContract {
     swapRouter(overrides?: CallOverrides): Promise<[string]>;
 
     swapTransferWithReference(
+      _paymentProxy: string,
       _to: string,
       _requestAmount: BigNumberish,
       _amountInMax: BigNumberish,
-      _uniswapPath: string[],
+      _swapRouterPath: string[],
       _chainlinkPath: string[],
       _paymentReference: BytesLike,
       _requestFeeAmount: BigNumberish,
       _feeAddress: string,
-      _uniswapDeadline: BigNumberish,
+      _deadline: BigNumberish,
       _chainlinkMaxRateTimespan: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -221,10 +228,21 @@ export class ERC20SwapToConversion extends BaseContract {
       newOwner: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
+
+    updateConversionPathAddress(
+      _chainlinkConversionPath: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    updateRequestSwapFees(
+      _newRequestSwapFees: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
   approvePaymentProxyToSpend(
     _erc20Address: string,
+    _paymentProxy: string,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -237,16 +255,11 @@ export class ERC20SwapToConversion extends BaseContract {
 
   owner(overrides?: CallOverrides): Promise<string>;
 
-  paymentProxy(overrides?: CallOverrides): Promise<string>;
-
   renounceOwnership(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  setPaymentProxy(
-    _paymentProxyAddress: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
+  requestSwapFees(overrides?: CallOverrides): Promise<BigNumber>;
 
   setRouter(
     _newSwapRouterAddress: string,
@@ -256,15 +269,16 @@ export class ERC20SwapToConversion extends BaseContract {
   swapRouter(overrides?: CallOverrides): Promise<string>;
 
   swapTransferWithReference(
+    _paymentProxy: string,
     _to: string,
     _requestAmount: BigNumberish,
     _amountInMax: BigNumberish,
-    _uniswapPath: string[],
+    _swapRouterPath: string[],
     _chainlinkPath: string[],
     _paymentReference: BytesLike,
     _requestFeeAmount: BigNumberish,
     _feeAddress: string,
-    _uniswapDeadline: BigNumberish,
+    _deadline: BigNumberish,
     _chainlinkMaxRateTimespan: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -274,9 +288,20 @@ export class ERC20SwapToConversion extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  updateConversionPathAddress(
+    _chainlinkConversionPath: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  updateRequestSwapFees(
+    _newRequestSwapFees: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   callStatic: {
     approvePaymentProxyToSpend(
       _erc20Address: string,
+      _paymentProxy: string,
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -289,14 +314,9 @@ export class ERC20SwapToConversion extends BaseContract {
 
     owner(overrides?: CallOverrides): Promise<string>;
 
-    paymentProxy(overrides?: CallOverrides): Promise<string>;
-
     renounceOwnership(overrides?: CallOverrides): Promise<void>;
 
-    setPaymentProxy(
-      _paymentProxyAddress: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
+    requestSwapFees(overrides?: CallOverrides): Promise<BigNumber>;
 
     setRouter(
       _newSwapRouterAddress: string,
@@ -306,15 +326,16 @@ export class ERC20SwapToConversion extends BaseContract {
     swapRouter(overrides?: CallOverrides): Promise<string>;
 
     swapTransferWithReference(
+      _paymentProxy: string,
       _to: string,
       _requestAmount: BigNumberish,
       _amountInMax: BigNumberish,
-      _uniswapPath: string[],
+      _swapRouterPath: string[],
       _chainlinkPath: string[],
       _paymentReference: BytesLike,
       _requestFeeAmount: BigNumberish,
       _feeAddress: string,
-      _uniswapDeadline: BigNumberish,
+      _deadline: BigNumberish,
       _chainlinkMaxRateTimespan: BigNumberish,
       overrides?: CallOverrides
     ): Promise<void>;
@@ -323,6 +344,16 @@ export class ERC20SwapToConversion extends BaseContract {
       newOwner: string,
       overrides?: CallOverrides
     ): Promise<void>;
+
+    updateConversionPathAddress(
+      _chainlinkConversionPath: string,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    updateRequestSwapFees(
+      _newRequestSwapFees: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
   };
 
   filters: {
@@ -338,6 +369,7 @@ export class ERC20SwapToConversion extends BaseContract {
   estimateGas: {
     approvePaymentProxyToSpend(
       _erc20Address: string,
+      _paymentProxy: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -350,16 +382,11 @@ export class ERC20SwapToConversion extends BaseContract {
 
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
-    paymentProxy(overrides?: CallOverrides): Promise<BigNumber>;
-
     renounceOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    setPaymentProxy(
-      _paymentProxyAddress: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
+    requestSwapFees(overrides?: CallOverrides): Promise<BigNumber>;
 
     setRouter(
       _newSwapRouterAddress: string,
@@ -369,15 +396,16 @@ export class ERC20SwapToConversion extends BaseContract {
     swapRouter(overrides?: CallOverrides): Promise<BigNumber>;
 
     swapTransferWithReference(
+      _paymentProxy: string,
       _to: string,
       _requestAmount: BigNumberish,
       _amountInMax: BigNumberish,
-      _uniswapPath: string[],
+      _swapRouterPath: string[],
       _chainlinkPath: string[],
       _paymentReference: BytesLike,
       _requestFeeAmount: BigNumberish,
       _feeAddress: string,
-      _uniswapDeadline: BigNumberish,
+      _deadline: BigNumberish,
       _chainlinkMaxRateTimespan: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -386,11 +414,22 @@ export class ERC20SwapToConversion extends BaseContract {
       newOwner: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
+
+    updateConversionPathAddress(
+      _chainlinkConversionPath: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    updateRequestSwapFees(
+      _newRequestSwapFees: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
   };
 
   populateTransaction: {
     approvePaymentProxyToSpend(
       _erc20Address: string,
+      _paymentProxy: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -405,16 +444,11 @@ export class ERC20SwapToConversion extends BaseContract {
 
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    paymentProxy(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     renounceOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    setPaymentProxy(
-      _paymentProxyAddress: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
+    requestSwapFees(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     setRouter(
       _newSwapRouterAddress: string,
@@ -424,15 +458,16 @@ export class ERC20SwapToConversion extends BaseContract {
     swapRouter(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     swapTransferWithReference(
+      _paymentProxy: string,
       _to: string,
       _requestAmount: BigNumberish,
       _amountInMax: BigNumberish,
-      _uniswapPath: string[],
+      _swapRouterPath: string[],
       _chainlinkPath: string[],
       _paymentReference: BytesLike,
       _requestFeeAmount: BigNumberish,
       _feeAddress: string,
-      _uniswapDeadline: BigNumberish,
+      _deadline: BigNumberish,
       _chainlinkMaxRateTimespan: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -441,5 +476,15 @@ export class ERC20SwapToConversion extends BaseContract {
       newOwner: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
+
+    updateConversionPathAddress(
+      _chainlinkConversionPath: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    updateRequestSwapFees(
+      _newRequestSwapFees: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }

package/types/IERC20ConversionProxy.d.ts

@@ -0,0 +1,207 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import {
+  ethers,
+  EventFilter,
+  Signer,
+  BigNumber,
+  BigNumberish,
+  PopulatedTransaction,
+  BaseContract,
+  ContractTransaction,
+  Overrides,
+  CallOverrides,
+} from "ethers";
+import { BytesLike } from "@ethersproject/bytes";
+import { Listener, Provider } from "@ethersproject/providers";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import { TypedEventFilter, TypedEvent, TypedListener } from "./commons";
+
+interface IERC20ConversionProxyInterface extends ethers.utils.Interface {
+  functions: {
+    "transferFromWithReferenceAndFee(address,uint256,address[],bytes,uint256,address,uint256,uint256)": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "transferFromWithReferenceAndFee",
+    values: [
+      string,
+      BigNumberish,
+      string[],
+      BytesLike,
+      BigNumberish,
+      string,
+      BigNumberish,
+      BigNumberish
+    ]
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "transferFromWithReferenceAndFee",
+    data: BytesLike
+  ): Result;
+
+  events: {
+    "TransferWithConversionAndReference(uint256,address,bytes,uint256,uint256)": EventFragment;
+    "TransferWithReferenceAndFee(address,address,uint256,bytes,uint256,address)": EventFragment;
+  };
+
+  getEvent(
+    nameOrSignatureOrTopic: "TransferWithConversionAndReference"
+  ): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "TransferWithReferenceAndFee"
+  ): EventFragment;
+}
+
+export class IERC20ConversionProxy extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
+  off<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  on<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  once<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): this;
+
+  listeners(eventName?: string): Array<Listener>;
+  off(eventName: string, listener: Listener): this;
+  on(eventName: string, listener: Listener): this;
+  once(eventName: string, listener: Listener): this;
+  removeListener(eventName: string, listener: Listener): this;
+  removeAllListeners(eventName?: string): this;
+
+  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
+    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
+
+  interface: IERC20ConversionProxyInterface;
+
+  functions: {
+    transferFromWithReferenceAndFee(
+      _to: string,
+      _requestAmount: BigNumberish,
+      _path: string[],
+      _paymentReference: BytesLike,
+      _feeAmount: BigNumberish,
+      _feeAddress: string,
+      _maxToSpend: BigNumberish,
+      _maxRateTimespan: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  transferFromWithReferenceAndFee(
+    _to: string,
+    _requestAmount: BigNumberish,
+    _path: string[],
+    _paymentReference: BytesLike,
+    _feeAmount: BigNumberish,
+    _feeAddress: string,
+    _maxToSpend: BigNumberish,
+    _maxRateTimespan: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    transferFromWithReferenceAndFee(
+      _to: string,
+      _requestAmount: BigNumberish,
+      _path: string[],
+      _paymentReference: BytesLike,
+      _feeAmount: BigNumberish,
+      _feeAddress: string,
+      _maxToSpend: BigNumberish,
+      _maxRateTimespan: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
+  };
+
+  filters: {
+    TransferWithConversionAndReference(
+      amount?: null,
+      currency?: null,
+      paymentReference?: BytesLike | null,
+      feeAmount?: null,
+      maxRateTimespan?: null
+    ): TypedEventFilter<
+      [BigNumber, string, string, BigNumber, BigNumber],
+      {
+        amount: BigNumber;
+        currency: string;
+        paymentReference: string;
+        feeAmount: BigNumber;
+        maxRateTimespan: BigNumber;
+      }
+    >;
+
+    TransferWithReferenceAndFee(
+      tokenAddress?: null,
+      to?: null,
+      amount?: null,
+      paymentReference?: BytesLike | null,
+      feeAmount?: null,
+      feeAddress?: null
+    ): TypedEventFilter<
+      [string, string, BigNumber, string, BigNumber, string],
+      {
+        tokenAddress: string;
+        to: string;
+        amount: BigNumber;
+        paymentReference: string;
+        feeAmount: BigNumber;
+        feeAddress: string;
+      }
+    >;
+  };
+
+  estimateGas: {
+    transferFromWithReferenceAndFee(
+      _to: string,
+      _requestAmount: BigNumberish,
+      _path: string[],
+      _paymentReference: BytesLike,
+      _feeAmount: BigNumberish,
+      _feeAddress: string,
+      _maxToSpend: BigNumberish,
+      _maxRateTimespan: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    transferFromWithReferenceAndFee(
+      _to: string,
+      _requestAmount: BigNumberish,
+      _path: string[],
+      _paymentReference: BytesLike,
+      _feeAmount: BigNumberish,
+      _feeAddress: string,
+      _maxToSpend: BigNumberish,
+      _maxRateTimespan: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}