@requestnetwork/smart-contracts 0.29.1-next.1857 → 0.29.1-next.1860

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@requestnetwork/smart-contracts",
-  "version": "0.29.1-next.1857+ae5862a9",
+  "version": "0.29.1-next.1860+7965ebcd",
   "publishConfig": {
     "access": "public"
   },
@@ -61,9 +61,9 @@
     "@nomiclabs/hardhat-web3": "2.0.0",
     "@openzeppelin/contracts": "4.4.2",
     "@openzeppelin/test-helpers": "0.5.6",
-    "@requestnetwork/currency": "0.9.1-next.1857+ae5862a9",
-    "@requestnetwork/types": "0.36.1-next.1857+ae5862a9",
-    "@requestnetwork/utils": "0.36.1-next.1857+ae5862a9",
+    "@requestnetwork/currency": "0.9.1-next.1860+7965ebcd",
+    "@requestnetwork/types": "0.36.1-next.1860+7965ebcd",
+    "@requestnetwork/utils": "0.36.1-next.1860+7965ebcd",
     "@superfluid-finance/ethereum-contracts": "1.1.1",
     "@typechain/ethers-v5": "7.0.1",
     "@typechain/hardhat": "2.1.2",
@@ -81,5 +81,5 @@
     "typechain": "5.1.1",
     "web3": "1.7.3"
   },
-  "gitHead": "ae5862a9b173e140fc4e7339c389b5bdaf6bc3c9"
+  "gitHead": "7965ebcd3ac14b7303584adb2f37b80ae2935030"
 }

package/types/ChainlinkConversionPath.d.ts

@@ -30,6 +30,7 @@ interface ChainlinkConversionPathInterface extends ethers.utils.Interface {
     "renounceWhitelistAdmin()": FunctionFragment;
     "updateAggregator(address,address,address)": FunctionFragment;
     "updateAggregatorsList(address[],address[],address[])": FunctionFragment;
+    "updateNativeTokenHash(address)": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -65,6 +66,10 @@ interface ChainlinkConversionPathInterface extends ethers.utils.Interface {
     functionFragment: "updateAggregatorsList",
     values: [string[], string[], string[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "updateNativeTokenHash",
+    values: [string]
+  ): string;
 
   decodeFunctionResult(
     functionFragment: "addWhitelistAdmin",
@@ -99,6 +104,10 @@ interface ChainlinkConversionPathInterface extends ethers.utils.Interface {
     functionFragment: "updateAggregatorsList",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateNativeTokenHash",
+    data: BytesLike
+  ): Result;
 
   events: {
     "AggregatorUpdated(address,address,address)": EventFragment;
@@ -212,6 +221,11 @@ export class ChainlinkConversionPath extends BaseContract {
       _aggregators: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
+
+    updateNativeTokenHash(
+      _nativeTokenHash: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
   addWhitelistAdmin(
@@ -272,6 +286,11 @@ export class ChainlinkConversionPath extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  updateNativeTokenHash(
+    _nativeTokenHash: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   callStatic: {
     addWhitelistAdmin(
       account: string,
@@ -328,6 +347,11 @@ export class ChainlinkConversionPath extends BaseContract {
       _aggregators: string[],
       overrides?: CallOverrides
     ): Promise<void>;
+
+    updateNativeTokenHash(
+      _nativeTokenHash: string,
+      overrides?: CallOverrides
+    ): Promise<void>;
   };
 
   filters: {
@@ -393,6 +417,11 @@ export class ChainlinkConversionPath extends BaseContract {
       _aggregators: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
+
+    updateNativeTokenHash(
+      _nativeTokenHash: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
   };
 
   populateTransaction: {
@@ -442,5 +471,10 @@ export class ChainlinkConversionPath extends BaseContract {
       _aggregators: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
+
+    updateNativeTokenHash(
+      _nativeTokenHash: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }

package/types/ERC20SwapToPay.d.ts

@@ -21,38 +21,34 @@ import { TypedEventFilter, TypedEvent, TypedListener } from "./commons";
 
 interface ERC20SwapToPayInterface extends ethers.utils.Interface {
   functions: {
-    "approvePaymentProxyToSpend(address)": FunctionFragment;
+    "approvePaymentProxyToSpend(address,address)": FunctionFragment;
     "approveRouterToSpend(address)": FunctionFragment;
     "owner()": FunctionFragment;
-    "paymentProxy()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
-    "setPaymentProxy(address)": FunctionFragment;
+    "requestSwapFees()": FunctionFragment;
     "setRouter(address)": FunctionFragment;
     "swapRouter()": FunctionFragment;
-    "swapTransferWithReference(address,uint256,uint256,address[],bytes,uint256,address,uint256)": FunctionFragment;
+    "swapTransferWithReference(address,address,uint256,uint256,address[],bytes,uint256,address,uint256)": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
+    "updateRequestSwapFees(uint256)": FunctionFragment;
   };
 
   encodeFunctionData(
     functionFragment: "approvePaymentProxyToSpend",
-    values: [string]
+    values: [string, string]
   ): string;
   encodeFunctionData(
     functionFragment: "approveRouterToSpend",
     values: [string]
   ): 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(
@@ -62,6 +58,7 @@ interface ERC20SwapToPayInterface extends ethers.utils.Interface {
   encodeFunctionData(
     functionFragment: "swapTransferWithReference",
     values: [
+      string,
       string,
       BigNumberish,
       BigNumberish,
@@ -76,6 +73,10 @@ interface ERC20SwapToPayInterface extends ethers.utils.Interface {
     functionFragment: "transferOwnership",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "updateRequestSwapFees",
+    values: [BigNumberish]
+  ): string;
 
   decodeFunctionResult(
     functionFragment: "approvePaymentProxyToSpend",
@@ -86,16 +87,12 @@ interface ERC20SwapToPayInterface 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;
@@ -108,6 +105,10 @@ interface ERC20SwapToPayInterface extends ethers.utils.Interface {
     functionFragment: "transferOwnership",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateRequestSwapFees",
+    data: BytesLike
+  ): Result;
 
   events: {
     "OwnershipTransferred(address,address)": EventFragment;
@@ -162,6 +163,7 @@ export class ERC20SwapToPay extends BaseContract {
   functions: {
     approvePaymentProxyToSpend(
       _erc20Address: string,
+      _paymentProxy: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -172,16 +174,11 @@ export class ERC20SwapToPay 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,
@@ -191,6 +188,7 @@ export class ERC20SwapToPay extends BaseContract {
     swapRouter(overrides?: CallOverrides): Promise<[string]>;
 
     swapTransferWithReference(
+      _paymentProxy: string,
       _to: string,
       _amount: BigNumberish,
       _amountInMax: BigNumberish,
@@ -206,10 +204,16 @@ export class ERC20SwapToPay extends BaseContract {
       newOwner: 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>;
 
@@ -220,16 +224,11 @@ export class ERC20SwapToPay 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,
@@ -239,6 +238,7 @@ export class ERC20SwapToPay extends BaseContract {
   swapRouter(overrides?: CallOverrides): Promise<string>;
 
   swapTransferWithReference(
+    _paymentProxy: string,
     _to: string,
     _amount: BigNumberish,
     _amountInMax: BigNumberish,
@@ -255,9 +255,15 @@ export class ERC20SwapToPay extends BaseContract {
     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>;
 
@@ -268,14 +274,9 @@ export class ERC20SwapToPay 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,
@@ -285,6 +286,7 @@ export class ERC20SwapToPay extends BaseContract {
     swapRouter(overrides?: CallOverrides): Promise<string>;
 
     swapTransferWithReference(
+      _paymentProxy: string,
       _to: string,
       _amount: BigNumberish,
       _amountInMax: BigNumberish,
@@ -300,6 +302,11 @@ export class ERC20SwapToPay extends BaseContract {
       newOwner: string,
       overrides?: CallOverrides
     ): Promise<void>;
+
+    updateRequestSwapFees(
+      _newRequestSwapFees: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
   };
 
   filters: {
@@ -315,6 +322,7 @@ export class ERC20SwapToPay extends BaseContract {
   estimateGas: {
     approvePaymentProxyToSpend(
       _erc20Address: string,
+      _paymentProxy: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -325,16 +333,11 @@ export class ERC20SwapToPay 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,
@@ -344,6 +347,7 @@ export class ERC20SwapToPay extends BaseContract {
     swapRouter(overrides?: CallOverrides): Promise<BigNumber>;
 
     swapTransferWithReference(
+      _paymentProxy: string,
       _to: string,
       _amount: BigNumberish,
       _amountInMax: BigNumberish,
@@ -359,11 +363,17 @@ export class ERC20SwapToPay extends BaseContract {
       newOwner: 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>;
 
@@ -374,16 +384,11 @@ export class ERC20SwapToPay 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,
@@ -393,6 +398,7 @@ export class ERC20SwapToPay extends BaseContract {
     swapRouter(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     swapTransferWithReference(
+      _paymentProxy: string,
       _to: string,
       _amount: BigNumberish,
       _amountInMax: BigNumberish,
@@ -408,5 +414,10 @@ export class ERC20SwapToPay extends BaseContract {
       newOwner: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
+
+    updateRequestSwapFees(
+      _newRequestSwapFees: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }

package/types/EthConversionProxy.d.ts

@@ -31,6 +31,7 @@ interface EthConversionProxyInterface extends ethers.utils.Interface {
     "transferWithReferenceAndFee(address,uint256,address[],bytes,uint256,address,uint256)": FunctionFragment;
     "updateConversionPathAddress(address)": FunctionFragment;
     "updateConversionProxyAddress(address)": FunctionFragment;
+    "updateNativeTokenHash(address)": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -77,6 +78,10 @@ interface EthConversionProxyInterface extends ethers.utils.Interface {
     functionFragment: "updateConversionProxyAddress",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "updateNativeTokenHash",
+    values: [string]
+  ): string;
 
   decodeFunctionResult(
     functionFragment: "addWhitelistAdmin",
@@ -114,6 +119,10 @@ interface EthConversionProxyInterface extends ethers.utils.Interface {
     functionFragment: "updateConversionProxyAddress",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateNativeTokenHash",
+    data: BytesLike
+  ): Result;
 
   events: {
     "TransferWithConversionAndReference(uint256,address,bytes,uint256,uint256)": EventFragment;
@@ -216,6 +225,11 @@ export class EthConversionProxy extends BaseContract {
       _paymentProxyAddress: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
+
+    updateNativeTokenHash(
+      _nativeTokenHash: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
   addWhitelistAdmin(
@@ -259,6 +273,11 @@ export class EthConversionProxy extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  updateNativeTokenHash(
+    _nativeTokenHash: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   callStatic: {
     addWhitelistAdmin(
       account: string,
@@ -298,6 +317,11 @@ export class EthConversionProxy extends BaseContract {
       _paymentProxyAddress: string,
       overrides?: CallOverrides
     ): Promise<void>;
+
+    updateNativeTokenHash(
+      _nativeTokenHash: string,
+      overrides?: CallOverrides
+    ): Promise<void>;
   };
 
   filters: {
@@ -385,6 +409,11 @@ export class EthConversionProxy extends BaseContract {
       _paymentProxyAddress: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
+
+    updateNativeTokenHash(
+      _nativeTokenHash: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
   };
 
   populateTransaction: {
@@ -430,5 +459,10 @@ export class EthConversionProxy extends BaseContract {
       _paymentProxyAddress: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
+
+    updateNativeTokenHash(
+      _nativeTokenHash: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }