diff --git a/contracts/protocol/bases/PriceDiscoveryBase.sol b/contracts/protocol/bases/PriceDiscoveryBase.sol index 6b3fbbd02..2b3f50356 100644 --- a/contracts/protocol/bases/PriceDiscoveryBase.sol +++ b/contracts/protocol/bases/PriceDiscoveryBase.sol @@ -21,24 +21,17 @@ contract PriceDiscoveryBase is ProtocolBase { using SafeERC20 for IERC20; IWrappedNative internal immutable wNative; - uint256 private immutable EXCHANGE_ID_2_2_0; // solhint-disable-line /** * @notice * For offers with native exchange token, it is expected the the price discovery contracts will * operate with wrapped native token. Set the address of the wrapped native token in the constructor. * - * After v2.2.0, token ids are derived from offerId and exchangeId. - * EXCHANGE_ID_2_2_0 is the first exchange id to use for 2.2.0. - * Set EXCHANGE_ID_2_2_0 in the constructor. - * * @param _wNative - the address of the wrapped native token - * @param _firstExchangeId2_2_0 - the first exchange id to use for 2.2.0 */ //solhint-disable-next-line - constructor(address _wNative, uint256 _firstExchangeId2_2_0) { + constructor(address _wNative) { wNative = IWrappedNative(_wNative); - EXCHANGE_ID_2_2_0 = _firstExchangeId2_2_0; } /** diff --git a/contracts/protocol/facets/PriceDiscoveryHandlerFacet.sol b/contracts/protocol/facets/PriceDiscoveryHandlerFacet.sol index a248e79d6..b4fc00eaa 100644 --- a/contracts/protocol/facets/PriceDiscoveryHandlerFacet.sol +++ b/contracts/protocol/facets/PriceDiscoveryHandlerFacet.sol @@ -29,15 +29,10 @@ contract PriceDiscoveryHandlerFacet is IBosonPriceDiscoveryHandler, PriceDiscove * For offers with native exchange token, it is expected the the price discovery contracts will * operate with wrapped native token. Set the address of the wrapped native token in the constructor. * - * After v2.2.0, token ids are derived from offerId and exchangeId. - * EXCHANGE_ID_2_2_0 is the first exchange id to use for 2.2.0. - * Set EXCHANGE_ID_2_2_0 in the constructor. - * * @param _wNative - the address of the wrapped native token - * @param _firstExchangeId2_2_0 - the first exchange id to use for 2.2.0 */ //solhint-disable-next-line - constructor(address _wNative, uint256 _firstExchangeId2_2_0) PriceDiscoveryBase(_wNative, _firstExchangeId2_2_0) {} + constructor(address _wNative) PriceDiscoveryBase(_wNative) {} /** * @notice Facet Initializer diff --git a/contracts/protocol/facets/SequentialCommitHandlerFacet.sol b/contracts/protocol/facets/SequentialCommitHandlerFacet.sol index c1b502389..6b4b6d047 100644 --- a/contracts/protocol/facets/SequentialCommitHandlerFacet.sol +++ b/contracts/protocol/facets/SequentialCommitHandlerFacet.sol @@ -24,15 +24,10 @@ contract SequentialCommitHandlerFacet is IBosonSequentialCommitHandler, PriceDis * For offers with native exchange token, it is expected the the price discovery contracts will * operate with wrapped native token. Set the address of the wrapped native token in the constructor. * - * After v2.2.0, token ids are derived from offerId and exchangeId. - * EXCHANGE_ID_2_2_0 is the first exchange id to use for 2.2.0. - * Set EXCHANGE_ID_2_2_0 in the constructor. - * * @param _wNative - the address of the wrapped native token - * @param _firstExchangeId2_2_0 - the first exchange id to use for 2.2.0 */ //solhint-disable-next-line - constructor(address _wNative, uint256 _firstExchangeId2_2_0) PriceDiscoveryBase(_wNative, _firstExchangeId2_2_0) {} + constructor(address _wNative) PriceDiscoveryBase(_wNative) {} /** * @notice Initializes facet. diff --git a/scripts/config/facet-deploy.js b/scripts/config/facet-deploy.js index 7426e80fe..5efa5b8b4 100644 --- a/scripts/config/facet-deploy.js +++ b/scripts/config/facet-deploy.js @@ -80,11 +80,11 @@ async function getFacets(config) { facetArgs["ExchangeHandlerFacet"] = { init: [], constructorArgs: [protocolConfig.EXCHANGE_ID_2_2_0[network]] }; facetArgs["SequentialCommitHandlerFacet"] = { init: [], - constructorArgs: [protocolConfig.WrappedNative[network], protocolConfig.EXCHANGE_ID_2_2_0[network]], + constructorArgs: [protocolConfig.WrappedNative[network]], }; facetArgs["PriceDiscoveryHandlerFacet"] = { init: [], - constructorArgs: [protocolConfig.WrappedNative[network], protocolConfig.EXCHANGE_ID_2_2_0[network]], + constructorArgs: [protocolConfig.WrappedNative[network]], }; // metaTransactionsHandlerFacet initializer arguments.