diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index ac73958e..6669210d 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -1,4 +1,4 @@ -name: "CI" +name: "Linter" on: push: branches: [main, develop] @@ -6,7 +6,7 @@ on: branches: [main, develop] jobs: tests: - name: "Tests" + name: "Lint" runs-on: ubuntu-latest needs: [] steps: diff --git a/.solhint.json b/.solhint.json index 7b6e069f..9fb8ce8d 100644 --- a/.solhint.json +++ b/.solhint.json @@ -3,6 +3,9 @@ "extends": "solhint:recommended", "rules": { "prettier/prettier": "error", - "compiler-version": ["error", "^0.8.4"] + "compiler-version": ["error", "^0.8.4"], + "not-rely-on-time": "off", + "reason-string": ["warn", { "maxLength": 100 }], + "func-visibility": ["warn", { "ignoreConstructors": true }] } } diff --git a/abi/contracts/pco-license/facets/CFABasePCOFacet.sol/CFABasePCOFacet.json b/abi/contracts/pco-license/facets/CFABasePCOFacet.sol/CFABasePCOFacet.json index e45f95d5..bd0fc677 100644 --- a/abi/contracts/pco-license/facets/CFABasePCOFacet.sol/CFABasePCOFacet.json +++ b/abi/contracts/pco-license/facets/CFABasePCOFacet.sol/CFABasePCOFacet.json @@ -117,12 +117,12 @@ }, { "internalType": "contract IERC721", - "name": "_license", + "name": "initLicense", "type": "address" }, { "internalType": "uint256", - "name": "_licenseId", + "name": "initLicenseId", "type": "uint256" }, { diff --git a/abi/contracts/registry/facets/ERC721Facet.sol/ERC721Facet.json b/abi/contracts/registry/facets/ERC721Facet.sol/ERC721Facet.json index 18580ae1..6ef487f7 100644 --- a/abi/contracts/registry/facets/ERC721Facet.sol/ERC721Facet.json +++ b/abi/contracts/registry/facets/ERC721Facet.sol/ERC721Facet.json @@ -134,12 +134,12 @@ "inputs": [ { "internalType": "string", - "name": "_name", + "name": "initName", "type": "string" }, { "internalType": "string", - "name": "_symbol", + "name": "initSymbol", "type": "string" } ], diff --git a/abi/contracts/registry/facets/PCOLicenseClaimerFacet.sol/PCOLicenseClaimerFacet.json b/abi/contracts/registry/facets/PCOLicenseClaimerFacet.sol/PCOLicenseClaimerFacet.json index d68a60a5..5cc3632f 100644 --- a/abi/contracts/registry/facets/PCOLicenseClaimerFacet.sol/PCOLicenseClaimerFacet.json +++ b/abi/contracts/registry/facets/PCOLicenseClaimerFacet.sol/PCOLicenseClaimerFacet.json @@ -199,7 +199,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_auctionEnd", + "name": "auctionEnd", "type": "uint256" } ], @@ -212,7 +212,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_auctionStart", + "name": "auctionStart", "type": "uint256" } ], @@ -225,7 +225,7 @@ "inputs": [ { "internalType": "address", - "name": "_beacon", + "name": "beacon", "type": "address" } ], @@ -238,7 +238,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_endingBid", + "name": "endingBid", "type": "uint256" } ], @@ -251,7 +251,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_startingBid", + "name": "startingBid", "type": "uint256" } ], diff --git a/abi/contracts/registry/libraries/LibGeoWebCoordinate.sol/LibGeoWebCoordinate.json b/abi/contracts/registry/libraries/LibGeoWebCoordinate.sol/LibGeoWebCoordinate.json index 3c23adf3..133e2abd 100644 --- a/abi/contracts/registry/libraries/LibGeoWebCoordinate.sol/LibGeoWebCoordinate.json +++ b/abi/contracts/registry/libraries/LibGeoWebCoordinate.sol/LibGeoWebCoordinate.json @@ -37,12 +37,12 @@ "outputs": [ { "internalType": "uint256", - "name": "i_x", + "name": "iX", "type": "uint256" }, { "internalType": "uint256", - "name": "i_y", + "name": "iY", "type": "uint256" }, { @@ -68,17 +68,17 @@ }, { "internalType": "uint256", - "name": "_i_x", + "name": "iX", "type": "uint256" }, { "internalType": "uint256", - "name": "_i_y", + "name": "iY", "type": "uint256" }, { "internalType": "uint256", - "name": "_i", + "name": "i", "type": "uint256" } ], @@ -86,22 +86,22 @@ "outputs": [ { "internalType": "uint64", - "name": "destination", + "name": "", "type": "uint64" }, { "internalType": "uint256", - "name": "i_x", + "name": "", "type": "uint256" }, { "internalType": "uint256", - "name": "i_y", + "name": "", "type": "uint256" }, { "internalType": "uint256", - "name": "i", + "name": "", "type": "uint256" } ], diff --git a/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/PCOLicenseDiamond.json b/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/PCOLicenseDiamond.json index 24eaec33..fc06d5e4 100644 --- a/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/PCOLicenseDiamond.json +++ b/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/PCOLicenseDiamond.json @@ -117,12 +117,12 @@ }, { "internalType": "contract IERC721", - "name": "_license", + "name": "initLicense", "type": "address" }, { "internalType": "uint256", - "name": "_licenseId", + "name": "initLicenseId", "type": "uint256" }, { diff --git a/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/RegistryDiamond.json b/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/RegistryDiamond.json index 7c9ca2c1..381cfb18 100644 --- a/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/RegistryDiamond.json +++ b/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/RegistryDiamond.json @@ -134,12 +134,12 @@ "inputs": [ { "internalType": "string", - "name": "_name", + "name": "initName", "type": "string" }, { "internalType": "string", - "name": "_symbol", + "name": "initSymbol", "type": "string" } ], @@ -680,7 +680,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_auctionEnd", + "name": "auctionEnd", "type": "uint256" } ], @@ -693,7 +693,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_auctionStart", + "name": "auctionStart", "type": "uint256" } ], @@ -706,7 +706,7 @@ "inputs": [ { "internalType": "address", - "name": "_beacon", + "name": "beacon", "type": "address" } ], @@ -719,7 +719,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_endingBid", + "name": "endingBid", "type": "uint256" } ], @@ -732,7 +732,7 @@ "inputs": [ { "internalType": "uint256", - "name": "_startingBid", + "name": "startingBid", "type": "uint256" } ], diff --git a/contracts/beacon-diamond/BeaconDiamond.sol b/contracts/beacon-diamond/BeaconDiamond.sol index beeb1ccd..84bf3736 100644 --- a/contracts/beacon-diamond/BeaconDiamond.sol +++ b/contracts/beacon-diamond/BeaconDiamond.sol @@ -20,6 +20,7 @@ contract BeaconDiamond { // Find facet for function that is called and execute the // function if a facet is found and return any value. + // solhint-disable-next-line no-complex-fallback fallback() external payable { LibBeaconDiamond.DiamondStorage storage ds = LibBeaconDiamond .diamondStorage(); @@ -28,6 +29,7 @@ contract BeaconDiamond { address facet = ds.beacon.facetAddress(msg.sig); require(facet != address(0), "Diamond: Function does not exist"); // Execute external function from facet using delegatecall and return any value. + // solhint-disable-next-line no-inline-assembly assembly { // copy function selector and any arguments calldatacopy(0, 0, calldatasize()) @@ -46,5 +48,6 @@ contract BeaconDiamond { } } + // solhint-disable-next-line no-empty-blocks receive() external payable {} } diff --git a/contracts/beacon-diamond/libraries/LibBeaconDiamond.sol b/contracts/beacon-diamond/libraries/LibBeaconDiamond.sol index 0320447c..4204fcb5 100644 --- a/contracts/beacon-diamond/libraries/LibBeaconDiamond.sol +++ b/contracts/beacon-diamond/libraries/LibBeaconDiamond.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.4; import {IDiamondLoupe} from "hardhat-deploy/solc_0.8/diamond/interfaces/IDiamondLoupe.sol"; library LibBeaconDiamond { - bytes32 constant STORAGE_POSITION = + bytes32 private constant STORAGE_POSITION = keccak256("diamond.standard.diamond.storage.LibBeaconDiamond"); struct DiamondStorage { @@ -18,6 +18,8 @@ library LibBeaconDiamond { returns (DiamondStorage storage ds) { bytes32 position = STORAGE_POSITION; + + // solhint-disable-next-line no-inline-assembly assembly { ds.slot := position } diff --git a/contracts/pco-license/facets/CFABasePCOFacet.sol b/contracts/pco-license/facets/CFABasePCOFacet.sol index 86202fc0..009a4ee3 100644 --- a/contracts/pco-license/facets/CFABasePCOFacet.sol +++ b/contracts/pco-license/facets/CFABasePCOFacet.sol @@ -44,16 +44,16 @@ contract CFABasePCOFacet is IBasePCO, CFABasePCOFacetModifiers { * - Must have payment token buffer deposited * - Must have permissions to create flow for bidder * @param paramsStore Global store for parameters - * @param _license Underlying ERC721 license - * @param _licenseId Token ID of license + * @param initLicense Underlying ERC721 license + * @param initLicenseId Token ID of license * @param bidder Initial bidder * @param newContributionRate New contribution rate for bid * @param newForSalePrice Intented new for sale price. Must be within rounding bounds of newContributionRate */ function initializeBid( IPCOLicenseParamsStore paramsStore, - IERC721 _license, - uint256 _licenseId, + IERC721 initLicense, + uint256 initLicenseId, address bidder, int96 newContributionRate, uint256 newForSalePrice @@ -63,8 +63,8 @@ contract CFABasePCOFacet is IBasePCO, CFABasePCOFacetModifiers { LibCFABasePCO.DiamondStorage storage ds = LibCFABasePCO .diamondStorage(); ds.paramsStore = paramsStore; - ds.license = _license; - ds.licenseId = _licenseId; + ds.license = initLicense; + ds.licenseId = initLicenseId; uint256 perSecondFeeNumerator = ds .paramsStore diff --git a/contracts/pco-license/facets/CFAPenaltyBidFacet.sol b/contracts/pco-license/facets/CFAPenaltyBidFacet.sol index e20a7f90..13a71c9d 100644 --- a/contracts/pco-license/facets/CFAPenaltyBidFacet.sol +++ b/contracts/pco-license/facets/CFAPenaltyBidFacet.sol @@ -41,7 +41,7 @@ contract CFAPenaltyBidFacet is ICFABiddable, CFABasePCOFacetModifiers { modifier onlyIfPendingBid() { // Check if pending bid exists require( - this.hasPendingBid() == true, + this.hasPendingBid(), "CFAPenaltyBidFacet: Pending bid does not exist" ); _; @@ -50,7 +50,7 @@ contract CFAPenaltyBidFacet is ICFABiddable, CFABasePCOFacetModifiers { modifier onlyIfNotPendingBid() { // Check if pending bid exists require( - this.hasPendingBid() == false, + !this.hasPendingBid(), "CFAPenaltyBidFacet: Pending bid exists" ); _; @@ -64,7 +64,7 @@ contract CFAPenaltyBidFacet is ICFABiddable, CFABasePCOFacetModifiers { .diamondStorage(); // Succeed if payer bid is not active - if (LibCFABasePCO._isPayerBidActive() == true) { + if (LibCFABasePCO._isPayerBidActive()) { uint256 bidPeriodLengthInSeconds = ds .paramsStore .getBidPeriodLengthInSeconds(); @@ -156,7 +156,7 @@ contract CFAPenaltyBidFacet is ICFABiddable, CFABasePCOFacetModifiers { // Check if pending bid exists require( - this.hasPendingBid() == false, + !this.hasPendingBid(), "CFAPenaltyBidFacet: Pending bid already exists" ); diff --git a/contracts/pco-license/libraries/LibCFABasePCO.sol b/contracts/pco-license/libraries/LibCFABasePCO.sol index c88ef878..365977e7 100644 --- a/contracts/pco-license/libraries/LibCFABasePCO.sol +++ b/contracts/pco-license/libraries/LibCFABasePCO.sol @@ -10,13 +10,13 @@ library LibCFABasePCO { using CFAv1Library for CFAv1Library.InitData; using SafeERC20 for ISuperToken; - bytes32 constant STORAGE_POSITION = + bytes32 private constant STORAGE_POSITION = keccak256("diamond.standard.diamond.storage.LibBasePCO"); - bytes32 constant STORAGE_POSITION_CUR_BID = + bytes32 private constant STORAGE_POSITION_CUR_BID = keccak256("diamond.standard.diamond.storage.LibBasePCO.currentBid"); - bytes32 constant STORAGE_POSITION_CFA = + bytes32 private constant STORAGE_POSITION_CFA = keccak256("diamond.standard.diamond.storage.LibBasePCO.cfa"); struct Bid { @@ -56,6 +56,7 @@ library LibCFABasePCO { returns (DiamondStorage storage ds) { bytes32 position = STORAGE_POSITION; + // solhint-disable-next-line no-inline-assembly assembly { ds.slot := position } @@ -64,6 +65,7 @@ library LibCFABasePCO { /// @dev Store currentBid in separate position so struct is upgradeable function _currentBid() internal pure returns (Bid storage bid) { bytes32 position = STORAGE_POSITION_CUR_BID; + // solhint-disable-next-line no-inline-assembly assembly { bid.slot := position } @@ -72,6 +74,7 @@ library LibCFABasePCO { /// @dev Store cfa in separate position so struct is upgradeable function cfaStorage() internal pure returns (DiamondCFAStorage storage ds) { bytes32 position = STORAGE_POSITION_CFA; + // solhint-disable-next-line no-inline-assembly assembly { ds.slot := position } diff --git a/contracts/pco-license/libraries/LibCFAPenaltyBid.sol b/contracts/pco-license/libraries/LibCFAPenaltyBid.sol index 7f450695..7e81ca65 100644 --- a/contracts/pco-license/libraries/LibCFAPenaltyBid.sol +++ b/contracts/pco-license/libraries/LibCFAPenaltyBid.sol @@ -10,7 +10,7 @@ library LibCFAPenaltyBid { using CFAv1Library for CFAv1Library.InitData; using SafeERC20 for ISuperToken; - bytes32 constant STORAGE_POSITION_OUT_BID = + bytes32 private constant STORAGE_POSITION_OUT_BID = keccak256( "diamond.standard.diamond.storage.LibCFAPenaltyBid.pendingBid" ); @@ -26,6 +26,7 @@ library LibCFAPenaltyBid { function pendingBid() internal pure returns (Bid storage ds) { bytes32 position = STORAGE_POSITION_OUT_BID; + // solhint-disable-next-line no-inline-assembly assembly { ds.slot := position } @@ -97,6 +98,7 @@ library LibCFAPenaltyBid { } // Create bidder flow + /* solhint-disable no-empty-blocks */ try cs.cfaV1.host.callAgreement( cs.cfaV1.cfa, @@ -113,6 +115,7 @@ library LibCFAPenaltyBid { new bytes(0) ) {} catch {} + /* solhint-enable no-empty-blocks */ // Update beneficiary flow address beneficiary = ds.paramsStore.getBeneficiary(); diff --git a/contracts/registry/facets/ERC721Facet.sol b/contracts/registry/facets/ERC721Facet.sol index 95f8cde5..98b6706a 100644 --- a/contracts/registry/facets/ERC721Facet.sol +++ b/contracts/registry/facets/ERC721Facet.sol @@ -9,15 +9,15 @@ import "@openzeppelin/contracts/utils/introspection/ERC165.sol"; import "@openzeppelin/contracts/utils/Context.sol"; contract ERC721Facet is IERC721, ERC165, IERC721Metadata, Context { - function initialize(string calldata _name, string calldata _symbol) + function initialize(string calldata initName, string calldata initSymbol) external { LibDiamond.enforceIsContractOwner(); LibERC721.DiamondStorage storage ds = LibERC721.diamondStorage(); - ds.name = _name; - ds.symbol = _symbol; + ds.name = initName; + ds.symbol = initSymbol; } /** diff --git a/contracts/registry/facets/PCOLicenseClaimerFacet.sol b/contracts/registry/facets/PCOLicenseClaimerFacet.sol index d0a79d93..51e862e3 100644 --- a/contracts/registry/facets/PCOLicenseClaimerFacet.sol +++ b/contracts/registry/facets/PCOLicenseClaimerFacet.sol @@ -49,14 +49,14 @@ contract PCOLicenseClaimerFacet { /** * @notice Admin can update the starting bid. - * @param _startingBid The new starting bid + * @param startingBid The new starting bid */ - function setStartingBid(uint256 _startingBid) external { + function setStartingBid(uint256 startingBid) external { LibDiamond.enforceIsContractOwner(); LibPCOLicenseClaimer.DiamondStorage storage ds = LibPCOLicenseClaimer .diamondStorage(); - ds.startingBid = _startingBid; + ds.startingBid = startingBid; } /// @notice Starting bid @@ -69,14 +69,14 @@ contract PCOLicenseClaimerFacet { /** * @notice Admin can update the ending bid. - * @param _endingBid The new ending bid + * @param endingBid The new ending bid */ - function setEndingBid(uint256 _endingBid) external { + function setEndingBid(uint256 endingBid) external { LibDiamond.enforceIsContractOwner(); LibPCOLicenseClaimer.DiamondStorage storage ds = LibPCOLicenseClaimer .diamondStorage(); - ds.endingBid = _endingBid; + ds.endingBid = endingBid; } /// @notice Ending bid @@ -89,14 +89,14 @@ contract PCOLicenseClaimerFacet { /** * @notice Admin can update the start time of the initial Dutch auction. - * @param _auctionStart The new start time of the initial Dutch auction + * @param auctionStart The new start time of the initial Dutch auction */ - function setAuctionStart(uint256 _auctionStart) external { + function setAuctionStart(uint256 auctionStart) external { LibDiamond.enforceIsContractOwner(); LibPCOLicenseClaimer.DiamondStorage storage ds = LibPCOLicenseClaimer .diamondStorage(); - ds.auctionStart = _auctionStart; + ds.auctionStart = auctionStart; } /// @notice Auction start @@ -109,14 +109,14 @@ contract PCOLicenseClaimerFacet { /** * @notice Admin can update the end time of the initial Dutch auction. - * @param _auctionEnd The new end time of the initial Dutch auction + * @param auctionEnd The new end time of the initial Dutch auction */ - function setAuctionEnd(uint256 _auctionEnd) external { + function setAuctionEnd(uint256 auctionEnd) external { LibDiamond.enforceIsContractOwner(); LibPCOLicenseClaimer.DiamondStorage storage ds = LibPCOLicenseClaimer .diamondStorage(); - ds.auctionEnd = _auctionEnd; + ds.auctionEnd = auctionEnd; } /// @notice Auction end @@ -129,14 +129,14 @@ contract PCOLicenseClaimerFacet { /** * @notice Admin can update the beacon contract - * @param _beacon The new beacon contract + * @param beacon The new beacon contract */ - function setBeacon(address _beacon) external { + function setBeacon(address beacon) external { LibDiamond.enforceIsContractOwner(); LibPCOLicenseClaimer.DiamondStorage storage ds = LibPCOLicenseClaimer .diamondStorage(); - ds.beacon = _beacon; + ds.beacon = beacon; } /// @notice Get Beacon diff --git a/contracts/registry/libraries/LibERC721.sol b/contracts/registry/libraries/LibERC721.sol index f4b8c2f8..8d56d86a 100644 --- a/contracts/registry/libraries/LibERC721.sol +++ b/contracts/registry/libraries/LibERC721.sol @@ -9,7 +9,7 @@ import "./LibPCOLicenseClaimer.sol"; library LibERC721 { using Address for address; - bytes32 constant STORAGE_POSITION = + bytes32 private constant STORAGE_POSITION = keccak256("diamond.standard.diamond.storage.LibERC721License"); /** @@ -60,6 +60,7 @@ library LibERC721 { returns (DiamondStorage storage ds) { bytes32 position = STORAGE_POSITION; + // solhint-disable-next-line no-inline-assembly assembly { ds.slot := position } @@ -214,42 +215,10 @@ library LibERC721 { DiamondStorage storage ds = diamondStorage(); - _beforeTokenTransfer(address(0), to, tokenId); - ds.balances[to] += 1; ds.owners[tokenId] = to; emit Transfer(address(0), to, tokenId); - - _afterTokenTransfer(address(0), to, tokenId); - } - - /** - * @dev Destroys `tokenId`. - * The approval is cleared when the token is burned. - * - * Requirements: - * - * - `tokenId` must exist. - * - * Emits a {Transfer} event. - */ - function _burn(uint256 tokenId) internal { - DiamondStorage storage ds = diamondStorage(); - - address owner = ownerOf(tokenId); - - _beforeTokenTransfer(owner, address(0), tokenId); - - // Clear approvals - delete ds.tokenApprovals[tokenId]; - - ds.balances[owner] -= 1; - delete ds.owners[tokenId]; - - emit Transfer(owner, address(0), tokenId); - - _afterTokenTransfer(owner, address(0), tokenId); } /** @@ -276,8 +245,6 @@ library LibERC721 { DiamondStorage storage ds = diamondStorage(); - _beforeTokenTransfer(from, to, tokenId); - // Clear approvals from the previous owner delete ds.tokenApprovals[tokenId]; @@ -286,8 +253,6 @@ library LibERC721 { ds.owners[tokenId] = to; emit Transfer(from, to, tokenId); - - _afterTokenTransfer(from, to, tokenId); } /** @@ -360,6 +325,7 @@ library LibERC721 { ); } else { /// @solidity memory-safe-assembly + // solhint-disable-next-line no-inline-assembly assembly { revert(add(32, reason), mload(reason)) } @@ -369,43 +335,4 @@ library LibERC721 { return true; } } - - /** - * @dev Hook that is called before any token transfer. This includes minting - * and burning. - * - * Calling conditions: - * - * - When `from` and `to` are both non-zero, ``from``'s `tokenId` will be - * transferred to `to`. - * - When `from` is zero, `tokenId` will be minted for `to`. - * - When `to` is zero, ``from``'s `tokenId` will be burned. - * - `from` and `to` are never both zero. - * - * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks]. - */ - function _beforeTokenTransfer( - address from, - address to, - uint256 tokenId - ) internal { - // TODO: Disable token transfers? - } - - /** - * @dev Hook that is called after any transfer of tokens. This includes - * minting and burning. - * - * Calling conditions: - * - * - when `from` and `to` are both non-zero. - * - `from` and `to` are never both zero. - * - * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks]. - */ - function _afterTokenTransfer( - address from, - address to, - uint256 tokenId - ) internal {} } diff --git a/contracts/registry/libraries/LibGeoWebCoordinate.sol b/contracts/registry/libraries/LibGeoWebCoordinate.sol index 78cf85ef..d233800d 100644 --- a/contracts/registry/libraries/LibGeoWebCoordinate.sol +++ b/contracts/registry/libraries/LibGeoWebCoordinate.sol @@ -14,78 +14,74 @@ library LibGeoWebCoordinate { function traverse( uint64 origin, uint256 direction, - uint256 _i_x, - uint256 _i_y, - uint256 _i + uint256 iX, + uint256 iY, + uint256 i ) external pure returns ( - uint64 destination, - uint256 i_x, - uint256 i_y, - uint256 i + uint64, + uint256, + uint256, + uint256 ) { - return _traverse(origin, direction, _i_x, _i_y, _i); + return _traverse(origin, direction, iX, iY, i); } function _traverse( uint64 origin, uint256 direction, - uint256 _i_x, - uint256 _i_y, - uint256 _i + uint256 iX, + uint256 iY, + uint256 i ) internal pure returns ( - uint64 destination, - uint256 i_x, - uint256 i_y, - uint256 i + uint64, + uint256, + uint256, + uint256 ) { - uint64 origin_x = _getX(origin); - uint64 origin_y = _getY(origin); - - i_x = _i_x; - i_y = _i_y; - i = _i; + uint64 originX = _getX(origin); + uint64 originY = _getY(origin); if (direction == 0) { // North - origin_y += 1; - require(origin_y <= MAX_Y, "Direction went too far north!"); + originY += 1; + require(originY <= MAX_Y, "Direction went too far north!"); - if (origin_y % 16 == 0) { - i_y += 1; + if (originY % 16 == 0) { + iY += 1; i -= 240; } else { i += 16; } } else if (direction == 1) { // South - require(origin_y > 0, "Direction went too far south!"); - origin_y -= 1; + require(originY > 0, "Direction went too far south!"); + originY -= 1; - if (origin_y % 16 == 15) { - i_y -= 1; + if (originY % 16 == 15) { + iY -= 1; i += 240; } else { i -= 16; } } else if (direction == 2) { // East - if (origin_x >= MAX_X) { + if (originX >= MAX_X) { // Wrap to west - origin_x = 0; - i_x = 0; + originX = 0; + iX = 0; i -= 15; } else { - origin_x += 1; - if (origin_x % 16 == 0) { - i_x += 1; + originX += 1; + if (originX % 16 == 0) { + iX += 1; i -= 15; } else { i += 1; @@ -93,15 +89,15 @@ library LibGeoWebCoordinate { } } else if (direction == 3) { // West - if (origin_x == 0) { + if (originX == 0) { // Wrap to east - origin_x = MAX_X; - i_x = MAX_X / 16; + originX = MAX_X; + iX = MAX_X / 16; i += 15; } else { - origin_x -= 1; - if (origin_x % 16 == 15) { - i_x -= 1; + originX -= 1; + if (originX % 16 == 15) { + iX -= 1; i += 15; } else { i -= 1; @@ -109,19 +105,21 @@ library LibGeoWebCoordinate { } } - destination = (origin_y | (origin_x << 32)); + uint64 destination = (originY | (originX << 32)); + + return (destination, iX, iY, i); } /// @notice Get the X coordinate - function _getX(uint64 coord) internal pure returns (uint64 coord_x) { - coord_x = (coord >> 32); // Take first 32 bits - require(coord_x <= MAX_X, "X coordinate is out of bounds"); + function _getX(uint64 coord) internal pure returns (uint64 coordX) { + coordX = (coord >> 32); // Take first 32 bits + require(coordX <= MAX_X, "X coordinate is out of bounds"); } /// @notice Get the Y coordinate - function _getY(uint64 coord) internal pure returns (uint64 coord_y) { - coord_y = (coord & ((2**32) - 1)); // Take last 32 bits - require(coord_y <= MAX_Y, "Y coordinate is out of bounds"); + function _getY(uint64 coord) internal pure returns (uint64 coordY) { + coordY = (coord & ((2**32) - 1)); // Take last 32 bits + require(coordY <= MAX_Y, "Y coordinate is out of bounds"); } /// @notice Convert coordinate to word index @@ -129,8 +127,8 @@ library LibGeoWebCoordinate { external pure returns ( - uint256 i_x, - uint256 i_y, + uint256 iX, + uint256 iY, uint256 i ) { @@ -141,28 +139,28 @@ library LibGeoWebCoordinate { internal pure returns ( - uint256 i_x, - uint256 i_y, + uint256 iX, + uint256 iY, uint256 i ) { - uint256 coord_x = uint256(_getX(coord)); - uint256 coord_y = uint256(_getY(coord)); + uint256 coordX = uint256(_getX(coord)); + uint256 coordY = uint256(_getY(coord)); - i_x = coord_x / 16; - i_y = coord_y / 16; + iX = coordX / 16; + iY = coordY / 16; - uint256 l_x = coord_x % 16; - uint256 l_y = coord_y % 16; + uint256 lX = coordX % 16; + uint256 lY = coordY % 16; - i = l_y * 16 + l_x; + i = lY * 16 + lX; } } /// @notice LibGeoWebCoordinatePath stores a path of directions in a uint256. The most significant 8 bits encodes the length of the path library LibGeoWebCoordinatePath { - uint256 constant INNER_PATH_MASK = (2**(256 - 8)) - 1; - uint256 constant PATH_SEGMENT_MASK = (2**2) - 1; + uint256 private constant INNER_PATH_MASK = (2**(256 - 8)) - 1; + uint256 private constant PATH_SEGMENT_MASK = (2**2) - 1; /// @notice Get next direction from path /// @param path The path to get the direction from diff --git a/contracts/registry/libraries/LibGeoWebParcel.sol b/contracts/registry/libraries/LibGeoWebParcel.sol index 3d823deb..79f1872e 100644 --- a/contracts/registry/libraries/LibGeoWebParcel.sol +++ b/contracts/registry/libraries/LibGeoWebParcel.sol @@ -8,7 +8,7 @@ library LibGeoWebParcel { using LibGeoWebCoordinate for uint64; using LibGeoWebCoordinatePath for uint256; - bytes32 constant STORAGE_POSITION = + bytes32 private constant STORAGE_POSITION = keccak256("diamond.standard.diamond.storage.LibGeoWebParcel"); /// @dev Structure of a land parcel @@ -25,7 +25,7 @@ library LibGeoWebParcel { } /// @dev Maxmium uint256 stored as a constant to use for masking - uint256 constant MAX_INT = 2**256 - 1; + uint256 private constant MAX_INT = 2**256 - 1; /// @notice Emitted when a parcel is built event ParcelBuilt(uint256 indexed _id); @@ -51,6 +51,7 @@ library LibGeoWebParcel { returns (DiamondStorage storage ds) { bytes32 position = STORAGE_POSITION; + // solhint-disable-next-line no-inline-assembly assembly { ds.slot := position } @@ -112,11 +113,11 @@ library LibGeoWebParcel { uint64 currentCoord = baseCoordinate; - uint256 p_i = 0; - uint256 currentPath = path[p_i]; + uint256 pI = 0; + uint256 currentPath = path[pI]; - (uint256 i_x, uint256 i_y, uint256 i) = currentCoord._toWordIndex(); - uint256 word = ds.availabilityIndex[i_x][i_y]; + (uint256 iX, uint256 iY, uint256 i) = currentCoord._toWordIndex(); + uint256 word = ds.availabilityIndex[iX][iY]; do { if (action == Action.Build) { @@ -140,39 +141,39 @@ library LibGeoWebParcel { if (!hasNext) { // Try next path - p_i += 1; - if (p_i >= path.length) { + pI += 1; + if (pI >= path.length) { break; } - currentPath = path[p_i]; + currentPath = path[pI]; (hasNext, direction, currentPath) = currentPath ._nextDirection(); } // Traverse to next coordinate - uint256 new_i_x; - uint256 new_i_y; - (currentCoord, new_i_x, new_i_y, i) = currentCoord._traverse( + uint256 newIX; + uint256 newIY; + (currentCoord, newIX, newIY, i) = currentCoord._traverse( direction, - i_x, - i_y, + iX, + iY, i ); // If new coordinate is in new word - if (new_i_x != i_x || new_i_y != i_y) { + if (newIX != iX || newIY != iY) { // Update word in storage - ds.availabilityIndex[i_x][i_y] = word; + ds.availabilityIndex[iX][iY] = word; // Advance to next word - word = ds.availabilityIndex[new_i_x][new_i_y]; + word = ds.availabilityIndex[newIX][newIY]; } - i_x = new_i_x; - i_y = new_i_y; + iX = newIX; + iY = newIY; } while (true); // Update last word in storage - ds.availabilityIndex[i_x][i_y] = word; + ds.availabilityIndex[iX][iY] = word; } } diff --git a/contracts/registry/libraries/LibPCOLicenseClaimer.sol b/contracts/registry/libraries/LibPCOLicenseClaimer.sol index c251374a..a408cc5e 100644 --- a/contracts/registry/libraries/LibPCOLicenseClaimer.sol +++ b/contracts/registry/libraries/LibPCOLicenseClaimer.sol @@ -5,7 +5,7 @@ import "./LibGeoWebParcel.sol"; import "./LibERC721.sol"; library LibPCOLicenseClaimer { - bytes32 constant STORAGE_POSITION = + bytes32 private constant STORAGE_POSITION = keccak256("diamond.standard.diamond.storage.LibPCOLicenseClaimer"); struct DiamondStorage { @@ -31,6 +31,7 @@ library LibPCOLicenseClaimer { returns (DiamondStorage storage ds) { bytes32 position = STORAGE_POSITION; + // solhint-disable-next-line no-inline-assembly assembly { ds.slot := position } diff --git a/contracts/registry/libraries/LibPCOLicenseParams.sol b/contracts/registry/libraries/LibPCOLicenseParams.sol index e2377dcd..8c7c4937 100644 --- a/contracts/registry/libraries/LibPCOLicenseParams.sol +++ b/contracts/registry/libraries/LibPCOLicenseParams.sol @@ -6,7 +6,7 @@ import {CFAv1Library} from "@superfluid-finance/ethereum-contracts/contracts/app import {ISuperToken} from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperToken.sol"; library LibPCOLicenseParams { - bytes32 constant STORAGE_POSITION = + bytes32 private constant STORAGE_POSITION = keccak256("diamond.standard.diamond.storage.LibPCOLicenseParams"); struct DiamondStorage { @@ -36,6 +36,7 @@ library LibPCOLicenseParams { returns (DiamondStorage storage ds) { bytes32 position = STORAGE_POSITION; + // solhint-disable-next-line no-inline-assembly assembly { ds.slot := position } diff --git a/test/registry/GeoWebCoordinateFacet.ts b/test/registry/GeoWebCoordinateFacet.ts index 230d8e31..494663df 100644 --- a/test/registry/GeoWebCoordinateFacet.ts +++ b/test/registry/GeoWebCoordinateFacet.ts @@ -61,16 +61,16 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), BigNumber.from(0b1).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "0", "X is not correct"); + assert.equal(result[1].toString(), "0", "X is not correct"); - assert.equal(result.i_y.toString(), "0", "Y is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); - assert.equal(result.i.toString(), "16", "I is not correct"); + assert.equal(result[3].toString(), "16", "I is not correct"); }); it("should traverse south", async () => { @@ -85,16 +85,14 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), BigNumber.from(0b0).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "0", "X is not correct"); - - assert.equal(result.i_y.toString(), "0", "Y is not correct"); - - assert.equal(result.i.toString(), "0", "I is not correct"); + assert.equal(result[1].toString(), "0", "X is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); + assert.equal(result[3].toString(), "0", "I is not correct"); }); it("should traverse east", async () => { @@ -109,16 +107,16 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), BigNumber.from(0b1).shl(32).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "0", "X is not correct"); + assert.equal(result[1].toString(), "0", "X is not correct"); - assert.equal(result.i_y.toString(), "0", "Y is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); - assert.equal(result.i.toString(), "1", "I is not correct"); + assert.equal(result[3].toString(), "1", "I is not correct"); }); it("should traverse west", async () => { @@ -133,16 +131,16 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), BigNumber.from(0b0).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "0", "X is not correct"); + assert.equal(result[1].toString(), "0", "X is not correct"); - assert.equal(result.i_y.toString(), "0", "Y is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); - assert.equal(result.i.toString(), "0", "I is not correct"); + assert.equal(result[3].toString(), "0", "I is not correct"); }); it("should traverse north into new word", async () => { @@ -157,16 +155,16 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), makeCoord(8, 16).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "0", "X is not correct"); + assert.equal(result[1].toString(), "0", "X is not correct"); - assert.equal(result.i_y.toString(), "1", "Y is not correct"); + assert.equal(result[2].toString(), "1", "Y is not correct"); - assert.equal(result.i.toString(), "8", "I is not correct"); + assert.equal(result[3].toString(), "8", "I is not correct"); }); it("should traverse south into new word", async () => { @@ -181,16 +179,16 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), makeCoord(8, 15).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "0", "X is not correct"); + assert.equal(result[1].toString(), "0", "X is not correct"); - assert.equal(result.i_y.toString(), "0", "Y is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); - assert.equal(result.i.toString(), "248", "I is not correct"); + assert.equal(result[3].toString(), "248", "I is not correct"); }); it("should traverse east into new word", async () => { @@ -205,16 +203,16 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), makeCoord(16, 8).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "1", "X is not correct"); + assert.equal(result[1].toString(), "1", "X is not correct"); - assert.equal(result.i_y.toString(), "0", "Y is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); - assert.equal(result.i.toString(), "128", "I is not correct"); + assert.equal(result[3].toString(), "128", "I is not correct"); }); it("should traverse west into new word", async () => { @@ -229,16 +227,16 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), makeCoord(15, 8).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "0", "X is not correct"); + assert.equal(result[1].toString(), "0", "X is not correct"); - assert.equal(result.i_y.toString(), "0", "Y is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); - assert.equal(result.i.toString(), "143", "I is not correct"); + assert.equal(result[3].toString(), "143", "I is not correct"); }); it("should not traverse too far north", async () => { @@ -293,16 +291,16 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), makeCoord(0, 0).toString(), "Destination is not correct" ); - assert.equal(result.i_x.toString(), "0", "X is not correct"); + assert.equal(result[1].toString(), "0", "X is not correct"); - assert.equal(result.i_y.toString(), "0", "Y is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); - assert.equal(result.i.toString(), "0", "I is not correct"); + assert.equal(result[3].toString(), "0", "I is not correct"); }); it("should traverse meridian west -> east", async () => { @@ -319,20 +317,20 @@ describe("LibGeoWebCoordinate", async () => { ); assert.equal( - result.destination.toString(), + result[0].toString(), makeCoord(max_x, 0).toString(), "Destination is not correct" ); assert.equal( - result.i_x.toString(), + result[1].toString(), BigNumber.from(Math.floor(max_x / 16)).toString(), "X is not correct" ); - assert.equal(result.i_y.toString(), "0", "Y is not correct"); + assert.equal(result[2].toString(), "0", "Y is not correct"); - assert.equal(result.i.toString(), "15", "I is not correct"); + assert.equal(result[3].toString(), "15", "I is not correct"); }); it("should convert to a word index", async () => { @@ -342,13 +340,13 @@ describe("LibGeoWebCoordinate", async () => { let result = await geoWebCoordinate.toWordIndex(coord); assert.equal( - result.i_x.toString(), + result.iX.toString(), BigNumber.from(0).toString(), "X coord is incorrect" ); assert.equal( - result.i_y.toString(), + result.iY.toString(), BigNumber.from(2).toString(), "Y coord is incorrect" ); @@ -367,13 +365,13 @@ describe("LibGeoWebCoordinate", async () => { let result = await geoWebCoordinate.toWordIndex(coord); assert.equal( - result.i_x.toString(), + result.iX.toString(), BigNumber.from(0).toString(), "X coord is incorrect" ); assert.equal( - result.i_y.toString(), + result.iY.toString(), BigNumber.from(2).toString(), "Y coord is incorrect" ); diff --git a/typechain-types/PCOLicenseClaimerFacet.ts b/typechain-types/PCOLicenseClaimerFacet.ts index a1afd2f8..ddbde6b4 100644 --- a/typechain-types/PCOLicenseClaimerFacet.ts +++ b/typechain-types/PCOLicenseClaimerFacet.ts @@ -226,27 +226,27 @@ export interface PCOLicenseClaimerFacet extends BaseContract { requiredBid(overrides?: CallOverrides): Promise<[BigNumber]>; setAuctionEnd( - _auctionEnd: BigNumberish, + auctionEnd: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setAuctionStart( - _auctionStart: BigNumberish, + auctionStart: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setBeacon( - _beacon: string, + beacon: string, overrides?: Overrides & { from?: string | Promise } ): Promise; setEndingBid( - _endingBid: BigNumberish, + endingBid: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setStartingBid( - _startingBid: BigNumberish, + startingBid: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; }; @@ -288,27 +288,27 @@ export interface PCOLicenseClaimerFacet extends BaseContract { requiredBid(overrides?: CallOverrides): Promise; setAuctionEnd( - _auctionEnd: BigNumberish, + auctionEnd: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setAuctionStart( - _auctionStart: BigNumberish, + auctionStart: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setBeacon( - _beacon: string, + beacon: string, overrides?: Overrides & { from?: string | Promise } ): Promise; setEndingBid( - _endingBid: BigNumberish, + endingBid: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setStartingBid( - _startingBid: BigNumberish, + startingBid: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; @@ -353,24 +353,24 @@ export interface PCOLicenseClaimerFacet extends BaseContract { requiredBid(overrides?: CallOverrides): Promise; setAuctionEnd( - _auctionEnd: BigNumberish, + auctionEnd: BigNumberish, overrides?: CallOverrides ): Promise; setAuctionStart( - _auctionStart: BigNumberish, + auctionStart: BigNumberish, overrides?: CallOverrides ): Promise; - setBeacon(_beacon: string, overrides?: CallOverrides): Promise; + setBeacon(beacon: string, overrides?: CallOverrides): Promise; setEndingBid( - _endingBid: BigNumberish, + endingBid: BigNumberish, overrides?: CallOverrides ): Promise; setStartingBid( - _startingBid: BigNumberish, + startingBid: BigNumberish, overrides?: CallOverrides ): Promise; }; @@ -427,27 +427,27 @@ export interface PCOLicenseClaimerFacet extends BaseContract { requiredBid(overrides?: CallOverrides): Promise; setAuctionEnd( - _auctionEnd: BigNumberish, + auctionEnd: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setAuctionStart( - _auctionStart: BigNumberish, + auctionStart: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setBeacon( - _beacon: string, + beacon: string, overrides?: Overrides & { from?: string | Promise } ): Promise; setEndingBid( - _endingBid: BigNumberish, + endingBid: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setStartingBid( - _startingBid: BigNumberish, + startingBid: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; }; @@ -493,27 +493,27 @@ export interface PCOLicenseClaimerFacet extends BaseContract { requiredBid(overrides?: CallOverrides): Promise; setAuctionEnd( - _auctionEnd: BigNumberish, + auctionEnd: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setAuctionStart( - _auctionStart: BigNumberish, + auctionStart: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setBeacon( - _beacon: string, + beacon: string, overrides?: Overrides & { from?: string | Promise } ): Promise; setEndingBid( - _endingBid: BigNumberish, + endingBid: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; setStartingBid( - _startingBid: BigNumberish, + startingBid: BigNumberish, overrides?: Overrides & { from?: string | Promise } ): Promise; }; diff --git a/typechain-types/factories/CFABasePCOFacet__factory.ts b/typechain-types/factories/CFABasePCOFacet__factory.ts index 589c4a88..3d3d8a37 100644 --- a/typechain-types/factories/CFABasePCOFacet__factory.ts +++ b/typechain-types/factories/CFABasePCOFacet__factory.ts @@ -127,12 +127,12 @@ const _abi = [ }, { internalType: "contract IERC721", - name: "_license", + name: "initLicense", type: "address", }, { internalType: "uint256", - name: "_licenseId", + name: "initLicenseId", type: "uint256", }, { @@ -211,7 +211,7 @@ const _abi = [ ]; const _bytecode = - "0x608060405234801561001057600080fd5b5061114d806100206000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80638d107ff51161005b5780638d107ff5146100ed5780639190f8d31461011e578063cdd42e9514610126578063def181011461013b57600080fd5b8063123119cd1461008d5780632c55dbed146100b25780636b87d24c146100ca5780636df38b84146100d2575b600080fd5b610095610196565b6040516001600160a01b0390911681526020015b60405180910390f35b6100ba6101ce565b60405190151581526020016100a9565b6100956101dd565b6100da610206565b604051600b9190910b81526020016100a9565b7f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532cb545b6040519081526020016100a9565b610110610210565b610139610134366004610e23565b61024b565b005b6101436107f4565b6040516100a99190815181526020808301516001600160a01b031690820152604080830151600b0b90820152606080830151908201526080808301519082015260a0918201519181019190915260c00190565b6000807f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f415b600101546001600160a01b031692915050565b60006101d8610922565b905090565b6000807f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532c96101bb565b60006101d8610936565b600061021a610922565b1561024557507f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455490565b50600090565b610253610b07565b7f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532c980546001600160a01b03199081166001600160a01b0389811691821784557f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532ca8054909316908916179091557f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532cb86905560408051630b51881360e11b81529051600092916316a310269160048083019260209291908290030181865afa158015610321573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103459190610e93565b905060008260000160009054906101000a90046001600160a01b03166001600160a01b031663014df4146040518163ffffffff1660e01b8152600401602060405180830381865afa15801561039e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c29190610e93565b90506103d084868484610b90565b6104335760405162461bcd60e51b815260206004820152602960248201527f4346414261736550434f46616365743a20496e636f727265637420666f722073604482015268616c6520707269636560b81b60648201526084015b60405180910390fd5b8254604080516320bc442560e01b815290517feaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da6926000926001600160a01b03909116916320bc4425916004808201926020929091908290030181865afa1580156104a1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c59190610eac565b6040805180820182526001600160a01b0383168082529151635b69006f60e11b81527fa9214cc96615e0085d3bb077758db69497dc2dce3b2b1e97bc93c3d18d83efd360048201529293509160208301919063b6d200de90602401602060405180830381865afa15801561053d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105619190610eac565b6001600160a01b03908116909152815184549082166001600160a01b03199182161785556020928301516001860180549184169190921617905586546040805163d41c3a6560e01b81529051600094929093169263d41c3a65926004808401939192918290030181865afa1580156105dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106019190610eac565b905060008660000160009054906101000a90046001600160a01b03166001600160a01b031663565a2e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561065a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061067e9190610eac565b905061068d848b30858d610bc3565b5061069a8482848c610bf2565b427f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f419081556bffffffffffffffffffffffff8a16600160a01b026001600160a01b038c169081177f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f42557f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f438890557f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f448790557f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f458a9055604080518b815290517fae3c4f18410e9cfcd20fc8664a5a0082a92f07a0a5febdc22bec0c53939373369181900360200190a2604051600b8b900b81526001600160a01b038c16907f6602f4d39e226f3807ddac3e7aab03883832e2ea2d07ccdeaf513c16679fdcd09060200160405180910390a25050505050505050505050505050565b6108396040518060c001604052806000815260200160006001600160a01b031681526020016000600b0b81526020016000815260200160008152602001600081525090565b506040805160c0810182527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f415481527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f42546001600160a01b0381166020830152600160a01b9004600b0b918101919091527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f435460608201527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f445460808201527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455460a082015290565b60008061092d610936565b600b0b13905090565b7feaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da7547f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532c980546040805163d41c3a6560e01b815290516000947feaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da69386936001600160a01b039283169363e6a1e888939092169163d41c3a65916004808201926020929091908290030181865afa1580156109f3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a179190610eac565b8554604080516315968b8b60e21b8152905130926001600160a01b03169163565a2e2c9160048083019260209291908290030181865afa158015610a5f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a839190610eac565b60405160e085901b6001600160e01b03191681526001600160a01b03938416600482015291831660248301529091166044820152606401608060405180830381865afa158015610ad7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610afb9190610ed0565b50909695505050505050565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c600401546001600160a01b03163314610b8e5760405162461bcd60e51b815260206004820152602260248201527f4c69624469616d6f6e643a204d75737420626520636f6e7472616374206f776e60448201526132b960f11b606482015260840161042a565b565b60008082610b9e8588610f0e565b610ba89190610f3b565b6bffffffffffffffffffffffff861614915050949350505050565b604080516000815260208101909152606090610be89087908790879087908790610c18565b9695505050505050565b604080516000815260208101909152610c12908590859085908590610d1d565b50505050565b855460018701546060916001600160a01b03908116916339255d5b9116806394229ecb888b8b8a60006040519080825280601f01601f191660200182016040528015610c6b576020820181803683370190505b50604051602401610c80959493929190610fcb565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b0319168252610ccb939250908790600401611009565b6000604051808303816000875af1158015610cea573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d12919081019061103f565b979650505050505050565b845460018601546040805160008152602081019091526001600160a01b03928316926339255d5b92169081906362fc305e90610d629089908b908a90604481016110e1565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b0319168252610dad939250908690600401611009565b6000604051808303816000875af1158015610dcc573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610df4919081019061103f565b505050505050565b6001600160a01b0381168114610e1157600080fd5b50565b80600b0b8114610e1157600080fd5b60008060008060008060c08789031215610e3c57600080fd5b8635610e4781610dfc565b95506020870135610e5781610dfc565b9450604087013593506060870135610e6e81610dfc565b92506080870135610e7e81610e14565b8092505060a087013590509295509295509295565b600060208284031215610ea557600080fd5b5051919050565b600060208284031215610ebe57600080fd5b8151610ec981610dfc565b9392505050565b60008060008060808587031215610ee657600080fd5b845193506020850151610ef881610e14565b6040860151606090960151949790965092505050565b6000816000190483118215151615610f3657634e487b7160e01b600052601160045260246000fd5b500290565b600082610f5857634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052604160045260246000fd5b60005b83811015610f8e578181015183820152602001610f76565b83811115610c125750506000910152565b60008151808452610fb7816020860160208601610f73565b601f01601f19169290920160200192915050565b6001600160a01b038681168252858116602083015284166040820152600b83900b606082015260a060808201819052600090610d1290830184610f9f565b6001600160a01b038416815260606020820181905260009061102d90830185610f9f565b8281036040840152610be88185610f9f565b60006020828403121561105157600080fd5b815167ffffffffffffffff8082111561106957600080fd5b818401915084601f83011261107d57600080fd5b81518181111561108f5761108f610f5d565b604051601f8201601f19908116603f011681019083821181831017156110b7576110b7610f5d565b816040528281528760208487010111156110d057600080fd5b610d12836020830160208801610f73565b6001600160a01b03858116825284166020820152600b83900b6040820152608060608201819052600090610be890830184610f9f56fea2646970667358221220326e82fee44b30ca86fb9faa1305329a860517c9f433f62eda4f2f26818d593164736f6c634300080e0033"; + "0x608060405234801561001057600080fd5b5061114d806100206000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80638d107ff51161005b5780638d107ff5146100ed5780639190f8d31461011e578063cdd42e9514610126578063def181011461013b57600080fd5b8063123119cd1461008d5780632c55dbed146100b25780636b87d24c146100ca5780636df38b84146100d2575b600080fd5b610095610196565b6040516001600160a01b0390911681526020015b60405180910390f35b6100ba6101ce565b60405190151581526020016100a9565b6100956101dd565b6100da610206565b604051600b9190910b81526020016100a9565b7f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532cb545b6040519081526020016100a9565b610110610210565b610139610134366004610e23565b61024b565b005b6101436107f4565b6040516100a99190815181526020808301516001600160a01b031690820152604080830151600b0b90820152606080830151908201526080808301519082015260a0918201519181019190915260c00190565b6000807f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f415b600101546001600160a01b031692915050565b60006101d8610922565b905090565b6000807f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532c96101bb565b60006101d8610936565b600061021a610922565b1561024557507f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455490565b50600090565b610253610b07565b7f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532c980546001600160a01b03199081166001600160a01b0389811691821784557f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532ca8054909316908916179091557f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532cb86905560408051630b51881360e11b81529051600092916316a310269160048083019260209291908290030181865afa158015610321573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103459190610e93565b905060008260000160009054906101000a90046001600160a01b03166001600160a01b031663014df4146040518163ffffffff1660e01b8152600401602060405180830381865afa15801561039e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c29190610e93565b90506103d084868484610b90565b6104335760405162461bcd60e51b815260206004820152602960248201527f4346414261736550434f46616365743a20496e636f727265637420666f722073604482015268616c6520707269636560b81b60648201526084015b60405180910390fd5b8254604080516320bc442560e01b815290517feaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da6926000926001600160a01b03909116916320bc4425916004808201926020929091908290030181865afa1580156104a1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c59190610eac565b6040805180820182526001600160a01b0383168082529151635b69006f60e11b81527fa9214cc96615e0085d3bb077758db69497dc2dce3b2b1e97bc93c3d18d83efd360048201529293509160208301919063b6d200de90602401602060405180830381865afa15801561053d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105619190610eac565b6001600160a01b03908116909152815184549082166001600160a01b03199182161785556020928301516001860180549184169190921617905586546040805163d41c3a6560e01b81529051600094929093169263d41c3a65926004808401939192918290030181865afa1580156105dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106019190610eac565b905060008660000160009054906101000a90046001600160a01b03166001600160a01b031663565a2e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561065a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061067e9190610eac565b905061068d848b30858d610bc3565b5061069a8482848c610bf2565b427f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f419081556bffffffffffffffffffffffff8a16600160a01b026001600160a01b038c169081177f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f42557f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f438890557f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f448790557f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f458a9055604080518b815290517fae3c4f18410e9cfcd20fc8664a5a0082a92f07a0a5febdc22bec0c53939373369181900360200190a2604051600b8b900b81526001600160a01b038c16907f6602f4d39e226f3807ddac3e7aab03883832e2ea2d07ccdeaf513c16679fdcd09060200160405180910390a25050505050505050505050505050565b6108396040518060c001604052806000815260200160006001600160a01b031681526020016000600b0b81526020016000815260200160008152602001600081525090565b506040805160c0810182527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f415481527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f42546001600160a01b0381166020830152600160a01b9004600b0b918101919091527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f435460608201527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f445460808201527f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455460a082015290565b60008061092d610936565b600b0b13905090565b7feaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da7547f7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532c980546040805163d41c3a6560e01b815290516000947feaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da69386936001600160a01b039283169363e6a1e888939092169163d41c3a65916004808201926020929091908290030181865afa1580156109f3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a179190610eac565b8554604080516315968b8b60e21b8152905130926001600160a01b03169163565a2e2c9160048083019260209291908290030181865afa158015610a5f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a839190610eac565b60405160e085901b6001600160e01b03191681526001600160a01b03938416600482015291831660248301529091166044820152606401608060405180830381865afa158015610ad7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610afb9190610ed0565b50909695505050505050565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c600401546001600160a01b03163314610b8e5760405162461bcd60e51b815260206004820152602260248201527f4c69624469616d6f6e643a204d75737420626520636f6e7472616374206f776e60448201526132b960f11b606482015260840161042a565b565b60008082610b9e8588610f0e565b610ba89190610f3b565b6bffffffffffffffffffffffff861614915050949350505050565b604080516000815260208101909152606090610be89087908790879087908790610c18565b9695505050505050565b604080516000815260208101909152610c12908590859085908590610d1d565b50505050565b855460018701546060916001600160a01b03908116916339255d5b9116806394229ecb888b8b8a60006040519080825280601f01601f191660200182016040528015610c6b576020820181803683370190505b50604051602401610c80959493929190610fcb565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b0319168252610ccb939250908790600401611009565b6000604051808303816000875af1158015610cea573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d12919081019061103f565b979650505050505050565b845460018601546040805160008152602081019091526001600160a01b03928316926339255d5b92169081906362fc305e90610d629089908b908a90604481016110e1565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b0319168252610dad939250908690600401611009565b6000604051808303816000875af1158015610dcc573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610df4919081019061103f565b505050505050565b6001600160a01b0381168114610e1157600080fd5b50565b80600b0b8114610e1157600080fd5b60008060008060008060c08789031215610e3c57600080fd5b8635610e4781610dfc565b95506020870135610e5781610dfc565b9450604087013593506060870135610e6e81610dfc565b92506080870135610e7e81610e14565b8092505060a087013590509295509295509295565b600060208284031215610ea557600080fd5b5051919050565b600060208284031215610ebe57600080fd5b8151610ec981610dfc565b9392505050565b60008060008060808587031215610ee657600080fd5b845193506020850151610ef881610e14565b6040860151606090960151949790965092505050565b6000816000190483118215151615610f3657634e487b7160e01b600052601160045260246000fd5b500290565b600082610f5857634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052604160045260246000fd5b60005b83811015610f8e578181015183820152602001610f76565b83811115610c125750506000910152565b60008151808452610fb7816020860160208601610f73565b601f01601f19169290920160200192915050565b6001600160a01b038681168252858116602083015284166040820152600b83900b606082015260a060808201819052600090610d1290830184610f9f565b6001600160a01b038416815260606020820181905260009061102d90830185610f9f565b8281036040840152610be88185610f9f565b60006020828403121561105157600080fd5b815167ffffffffffffffff8082111561106957600080fd5b818401915084601f83011261107d57600080fd5b81518181111561108f5761108f610f5d565b604051601f8201601f19908116603f011681019083821181831017156110b7576110b7610f5d565b816040528281528760208487010111156110d057600080fd5b610d12836020830160208801610f73565b6001600160a01b03858116825284166020820152600b83900b6040820152608060608201819052600090610be890830184610f9f56fea2646970667358221220aeef3f464fc15a72ceeb5cbb09f6759384b756a5c5095342041d655e5b8b235a64736f6c634300080e0033"; type CFABasePCOFacetConstructorParams = | [signer?: Signer] diff --git a/typechain-types/factories/CFAPenaltyBidFacet__factory.ts b/typechain-types/factories/CFAPenaltyBidFacet__factory.ts index 490cef86..397f8043 100644 --- a/typechain-types/factories/CFAPenaltyBidFacet__factory.ts +++ b/typechain-types/factories/CFAPenaltyBidFacet__factory.ts @@ -246,7 +246,7 @@ const _abi = [ ]; const _bytecode = - "0x608060405234801561001057600080fd5b50613145806100206000396000f3fe608060405234801561001057600080fd5b50600436106100875760003560e01c80639e41ec671161005b5780639e41ec6714610137578063ce2ccb151461014d578063e52a787414610155578063f11663e81461015d57600080fd5b8062fa68021461008c578063084024a2146100a15780633e3581a7146100d457806392f1f73e146100dc575b600080fd5b61009f61009a366004612ae7565b610170565b005b600080516020613050833981519152546000600160a01b909104600b0b1360405190151581526020015b60405180910390f35b61009f6108ba565b6100e4610b0d565b6040516100cb9190815181526020808301516001600160a01b031690820152604080830151600b0b90820152606080830151908201526080808301519082015260a0918201519181019190915260c00190565b61013f610c17565b6040519081526020016100cb565b61009f610c26565b61009f610e77565b61009f61016b366004612ae7565b6110c0565b6101786111d4565b6101f95760405162461bcd60e51b815260206004820152604160248201527f4346414261736550434f46616365743a2043616e206f6e6c7920706572666f7260448201527f6d20616374696f6e207768656e207061796572206269642069732061637469766064820152606560f81b608482015260a4015b60405180910390fd5b60006000805160206130d08339815191529050306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa15801561024a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026e9190612b13565b156102d25760405162461bcd60e51b815260206004820152602e60248201527f43464150656e616c747942696446616365743a2050656e64696e67206269642060448201526d616c72656164792065786973747360901b60648201526084016101f0565b6000805160206130f0833981519152805460408051630b51881360e11b81529051600080516020613090833981519152926000926001600160a01b03909116916316a31026916004808201926020929091908290030181865afa15801561033d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103619190612b35565b905060008360000160009054906101000a90046001600160a01b03166001600160a01b031663014df4146040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103de9190612b35565b90506000805160206130b08339815191526103fb878985856111e8565b61045c5760405162461bcd60e51b815260206004820152602c60248201527f43464150656e616c747942696446616365743a20496e636f727265637420666f60448201526b722073616c6520707269636560a01b60648201526084016101f0565b6001810154600160a01b9004600b90810b9089900b12156104e55760405162461bcd60e51b815260206004820152603c60248201527f43464150656e616c747942696446616365743a204e657720636f6e747269627560448201527f74696f6e2072617465206973206e6f74206869676820656e6f7567680000000060648201526084016101f0565b600184015485546040805163d41c3a6560e01b8152905160009384936001600160a01b039182169362422bbe93919092169163d41c3a659160048083019260209291908290030181865afa158015610541573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105659190612b63565b33306040518463ffffffff1660e01b815260040161058593929190612b80565b606060405180830381865afa1580156105a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c69190612ba3565b92509250506105d6826000611216565b6106415760405162461bcd60e51b815260206004820152603660248201527f43464150656e616c747942696446616365743a204352454154455f464c4f57206044820152751c195c9b5a5cdcda5bdb881b9bdd0819dc985b9d195960521b60648201526084016101f0565b89600b0b81600b0b12156106cf5760405162461bcd60e51b815260206004820152604960248201527f43464150656e616c747942696446616365743a204352454154455f464c4f572060448201527f7065726d697373696f6e20646f6573206e6f74206861766520656e6f75676820606482015268616c6c6f77616e636560b81b608482015260a4016101f0565b86546040805163d41c3a6560e01b815290516000926001600160a01b03169163d41c3a659160048083019260209291908290030181865afa158015610718573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061073c9190612b63565b60018801546040516346ccbfb760e11b81526001600160a01b038084166004830152600b8f900b602483015292935060009290911690638d997f6e90604401602060405180830381865afa158015610798573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107bc9190612b35565b905060006107ca8c83612c02565b90506107e16001600160a01b038416333084611275565b428b60000181905550338b60010160006101000a8154816001600160a01b0302191690836001600160a01b031602179055508c8b60010160146101000a8154816001600160601b030219169083600b0b6001600160601b03160217905550878b60020181905550868b600301819055508b8b60040181905550336001600160a01b03167f51dc3f0ae56a56b314941620a5450aa63fb32261ffdd59993bdd4a5645ed6d728e8e6040516108a3929190600b9290920b8252602082015260400190565b60405180910390a250505050505050505050505050565b600080516020613070833981519152546000805160206130b0833981519152906001600160a01b031633146109015760405162461bcd60e51b81526004016101f090612c1a565b306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa15801561093f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109639190612b13565b15156001146109845760405162461bcd60e51b81526004016101f090612c77565b6000805160206130f083398151915280546040805163400e2d8f60e11b815290516000805160206130d0833981519152936000805160206130b08339815191529390926000926001600160a01b039092169163801c5b1e916004808201926020929091908290030181865afa158015610a01573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a259190612b35565b8454909150600090610a379042612cc5565b9050818110610a585760405162461bcd60e51b81526004016101f090612cdc565b60008051602061305083398151915254600080516020613070833981519152547f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455460408051918252516000805160206130d0833981519152936000805160206130b0833981519152936001600160a01b03918216939116917f70ba5911930f2b49bef0e3806b54c696faa41fcf48becb8291d011ca4c1d8db49181900360200190a3610b036112e0565b5050505050505050565b610b526040518060c001604052806000815260200160006001600160a01b031681526020016000600b0b81526020016000815260200160008152602001600081525090565b506040805160c0810182526000805160206130d0833981519152548152600080516020613050833981519152546001600160a01b0381166020830152600160a01b9004600b0b918101919091527fab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670df5460608201527fab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670e05460808201527fab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670e15460a082015290565b6000610c21611638565b905090565b306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c889190612b13565b1515600114610ca95760405162461bcd60e51b81526004016101f090612c77565b6000805160206130d08339815191526000805160206130f0833981519152610ccf6111d4565b1515600103610dc35780546040805163400e2d8f60e11b815290516000926001600160a01b03169163801c5b1e9160048083019260209291908290030181865afa158015610d21573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d459190612b35565b8354909150600090610d579042612cc5565b905081811015610dc05760405162461bcd60e51b815260206004820152602e60248201527f43464150656e616c747942696446616365743a2042696420706572696f64206860448201526d185cc81b9bdd08195b185c1cd95960921b60648201526084016101f0565b50505b60008051602061305083398151915254600080516020613070833981519152547f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455460408051918252516000805160206130d0833981519152936000805160206130b0833981519152936001600160a01b039182169391169133917f5057e7232685b7cad2bf4919b2c3e735cf044c7b689b15fd24035359a9581458919081900360200190a4610e71611770565b50505050565b600080516020613070833981519152546000805160206130b0833981519152906001600160a01b03163314610ebe5760405162461bcd60e51b81526004016101f090612c1a565b306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa158015610efc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f209190612b13565b1515600114610f415760405162461bcd60e51b81526004016101f090612c77565b6000805160206130f083398151915280546040805163400e2d8f60e11b815290516000805160206130d0833981519152936000805160206130b08339815191529390926000926001600160a01b039092169163801c5b1e916004808201926020929091908290030181865afa158015610fbe573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fe29190612b35565b8454909150600090610ff49042612cc5565b90508181106110155760405162461bcd60e51b81526004016101f090612cdc565b60008051602061305083398151915254600080516020613070833981519152547f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455460408051918252516000805160206130d0833981519152936000805160206130b0833981519152936001600160a01b03918216939116917fcea76e88a336bcad5acb8cf244393e65f4bbe4b4bcaa2e989f754f5f2bd29eaf9181900360200190a3610b03611770565b600080516020613070833981519152546000805160206130b0833981519152906001600160a01b031633146111075760405162461bcd60e51b81526004016101f090612c1a565b306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa158015611145573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111699190612b13565b156111c55760405162461bcd60e51b815260206004820152602660248201527f43464150656e616c747942696446616365743a2050656e64696e67206269642060448201526565786973747360d01b60648201526084016101f0565b6111cf8383611db2565b505050565b6000806111df612381565b600b0b13905090565b600080826111f68588612d26565b6112009190612d45565b6001600160601b03861614915050949350505050565b60008082600281111561122b5761122b612d67565b0361123c575060018281161461126f565b600182600281111561125057611250612d67565b036112635750600182811c81161461126f565b506001600283901c8116145b92915050565b6040516001600160a01b0380851660248301528316604482015260648101829052610e719085906323b872dd60e01b906084015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152612515565b6000805160206130f083398151915280546040805163d41c3a6560e01b81529051600080516020613090833981519152926000805160206130b0833981519152926000805160206130d0833981519152926000926001600160a01b03169163d41c3a659160048083019260209291908290030181865afa158015611368573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061138c9190612b63565b905060008560000160009054906101000a90046001600160a01b03166001600160a01b031663565a2e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156113e5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114099190612b63565b90506000611415611638565b604051632ec8eec760e01b815230600482015290915060009081906001600160a01b03861690632ec8eec790602401608060405180830381865afa158015611461573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114859190612d7d565b505091509150600080828461149a9190612db3565b126114ac576114a98284612db3565b90505b600189810154908801546040516346ccbfb760e11b81526001600160a01b038981166004830152600160a01b909204600b0b60248201526000929190911690638d997f6e90604401602060405180830381865afa158015611511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115359190612b35565b9050828211156115cf576115498383612cc5565b9150600081896004015461155d9190612c02565b9050808311156115b1576001890154611583906001600160a01b038a81169116836125e7565b61158d8184612cc5565b60018b01549093506115ac906001600160a01b038a81169116856125e7565b6115cd565b60018901546115cd906001600160a01b038a81169116856125e7565b505b60018901546115ec906001600160a01b0389811691168888611275565b6001880154600489015461160a91600160a01b9004600b0b90611db2565b61162b60008051602061305083398151915280546001600160a01b03169055565b5050505050505050505050565b6000805160206130f083398151915280546040805163304fb4bb60e21b81529051600093926000805160206130d08339815191529285926001600160a01b039092169163c13ed2ec916004808201926020929091908290030181865afa1580156116a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116ca9190612b35565b905060008360000160009054906101000a90046001600160a01b03166001600160a01b0316637d51ce906040518163ffffffff1660e01b8152600401602060405180830381865afa158015611723573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117479190612b35565b905060008183856004015461175c9190612d26565b6117669190612d45565b9695505050505050565b6000805160206130f083398151915280546040805163d41c3a6560e01b81529051600080516020613090833981519152926000805160206130b0833981519152926000805160206130d0833981519152926000926001600160a01b03169163d41c3a659160048083019260209291908290030181865afa1580156117f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061181c9190612b63565b60018581015490850154604051631cd43d1160e31b81529293506000926001600160a01b039283169263e6a1e8889261185f928792909116903090600401612b80565b608060405180830381865afa15801561187c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118a09190612df4565b5050915050600081600b0b13156118cc5760018401546118cc9086906001600160a01b03163085612617565b8454600180870154908501546040805160008152602081019091526001600160a01b03938416936339255d5b9381169283926394229ecb92611924928a92918116913091600160a01b9004600b0b9060448101612ea0565b60408051601f19818403018152918152602080830180516001600160e01b031660e095861b179052815160008152908101918290529286901b6001600160e01b03191690526119799392509060248101612ede565b6000604051808303816000875af19250505080156119b957506040513d6000823e601f3d908101601f191682016040526119b69190810190612f14565b60015b156119c057505b8554604080516315968b8b60e21b815290516000926001600160a01b03169163565a2e2c9160048083019260209291908290030181865afa158015611a09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a2d9190612b63565b6001870154604051631cd43d1160e31b81529192506001600160a01b03169063e6a1e88890611a6490869030908690600401612b80565b608060405180830381865afa158015611a81573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611aa59190612df4565b5090935050506000600b83900b1315611adb576001840154611ad690879083908690600160a01b9004600b0b612637565b611af9565b6001840154611af990879083908690600160a01b9004600b0b612657565b600187810154868201549186015460028a0154604051632142170760e11b81526001600160a01b039485166004820152918416602483015260448201529116906342842e0e90606401600060405180830381600087803b158015611b5c57600080fd5b505af1158015611b70573d6000803e3d6000fd5b5050604051632ec8eec760e01b8152306004820152600092508291506001600160a01b03861690632ec8eec790602401608060405180830381865afa158015611bbd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611be19190612d7d565b5050915091506000808284611bf69190612db3565b12611c0857611c058284612db3565b90505b600189810154908801546040516346ccbfb760e11b81526001600160a01b038981166004830152600160a01b909204600b0b60248201526000929190911690638d997f6e90604401602060405180830381865afa158015611c6d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c919190612b35565b905080821115611d2f57611ca58183612cc5565b9150600089600401548960040154611cbd9190612cc5565b905080831115611d11576001890154611ce3906001600160a01b038a81169116836125e7565b611ced8184612cc5565b60018b0154909350611d0c906001600160a01b038a81169116856125e7565b611d2d565b6001890154611d2d906001600160a01b038a81169116856125e7565b505b8754895560018089018054918b0180546001600160a01b0319166001600160a01b03909316928317815590546001600160601b03600160a01b9182900416029091179055600280890154908a0155600380890154908a0155600480890154908a015561162b60008051602061305083398151915280546001600160a01b03169055565b6000805160206130f0833981519152805460408051630b51881360e11b81529051600080516020613090833981519152926000805160206130b0833981519152926000926001600160a01b03909216916316a31026916004808201926020929091908290030181865afa158015611e2d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e519190612b35565b905060008460000160009054906101000a90046001600160a01b03166001600160a01b031663014df4146040518163ffffffff1660e01b8152600401602060405180830381865afa158015611eaa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ece9190612b35565b9050611edc868884846111e8565b611f385760405162461bcd60e51b815260206004820152602760248201527f4c69624346414261736550434f3a20496e636f727265637420666f722073616c6044820152666520707269636560c81b60648201526084016101f0565b84546040805163d41c3a6560e01b815290516000926001600160a01b03169163d41c3a659160048083019260209291908290030181865afa158015611f81573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611fa59190612b63565b905060008660000160009054906101000a90046001600160a01b03166001600160a01b031663565a2e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611ffe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120229190612b63565b604051632ec8eec760e01b81523060048201529091506000906001600160a01b03841690632ec8eec790602401608060405180830381865afa15801561206c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120909190612d7d565b505060018901546040516346ccbfb760e11b81526001600160a01b038781166004830152600b8f900b602483015292945060009350911690638d997f6e90604401602060405180830381865afa1580156120ee573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121129190612b35565b905061213533306121238585612cc5565b6001600160a01b038816929190611275565b505060018087015490860154604051631cd43d1160e31b81526000926001600160a01b039081169263e6a1e8889261217592889216903090600401612b80565b608060405180830381865afa158015612192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121b69190612df4565b5050915050600081600b0b13156121e95760018601546121e39088906001600160a01b031630868e612677565b50612207565b60018601546122059088906001600160a01b031630868e61269c565b505b6001870154604051631cd43d1160e31b81526001600160a01b039091169063e6a1e8889061223d90869030908790600401612b80565b608060405180830381865afa15801561225a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061227e9190612df4565b5090925050506000600b82900b13156122a25761229d8783858d612637565b6122ae565b6122ae8783858d612657565b4286556001860180546001600160601b038c16600160a01b026001600160a01b039182168181179093556002890188905560038901879055600489018c90556040519116909117907fae3c4f18410e9cfcd20fc8664a5a0082a92f07a0a5febdc22bec0c539393733690612325908c815260200190565b60405180910390a26001860154604051600b8c900b81526001600160a01b03909116907f6602f4d39e226f3807ddac3e7aab03883832e2ea2d07ccdeaf513c16679fdcd09060200160405180910390a250505050505050505050565b7feaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da7546000805160206130f083398151915280546040805163d41c3a6560e01b815290516000946000805160206130908339815191529386936001600160a01b039283169363e6a1e888939092169163d41c3a65916004808201926020929091908290030181865afa15801561241a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061243e9190612b63565b8554604080516315968b8b60e21b8152905130926001600160a01b03169163565a2e2c9160048083019260209291908290030181865afa158015612486573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124aa9190612b63565b6040518463ffffffff1660e01b81526004016124c893929190612b80565b608060405180830381865afa1580156124e5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906125099190612df4565b50909695505050505050565b600061256a826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166126c19092919063ffffffff16565b8051909150156111cf57808060200190518101906125889190612b13565b6111cf5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b60648201526084016101f0565b6040516001600160a01b0383166024820152604481018290526111cf90849063a9059cbb60e01b906064016112a9565b604080516000815260208101909152610e719085908590859085906126da565b604080516000815260208101909152610e719085908590859085906127b9565b604080516000815260208101909152610e7190859085908590859061281d565b6040805160008152602081019091526060906117669087908790879087908790612847565b604080516000815260208101909152606090611766908790879087908790879061294d565b60606126d0848460008561297b565b90505b9392505050565b845460018601546040805160008152602081019091526001600160a01b03928316926339255d5b921690819063b4b333c69061271f9088908b908b9060448101612fb6565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b031916825261276a939250908690600401612ede565b6000604051808303816000875af1158015612789573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526127b19190810190612f14565b505050505050565b845460018601546001600160a01b03918216916339255d5b9116806350209a6287898860005b6040519080825280601f01601f191660200182016040528015612809576020820181803683370190505b5060405160240161271f9493929190612fea565b845460018601546001600160a01b03918216916339255d5b9116806362fc305e87898860006127df565b855460018701546060916001600160a01b03908116916339255d5b91168063354b9590888b8b8a60005b6040519080825280601f01601f19166020018201604052801561289b576020820181803683370190505b506040516024016128b0959493929190612ea0565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b03191682526128fb939250908790600401612ede565b6000604051808303816000875af115801561291a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526129429190810190612f14565b979650505050505050565b855460018701546060916001600160a01b03908116916339255d5b9116806394229ecb888b8b8a6000612871565b6060824710156129dc5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b60648201526084016101f0565b6001600160a01b0385163b612a335760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016101f0565b600080866001600160a01b03168587604051612a4f9190613020565b60006040518083038185875af1925050503d8060008114612a8c576040519150601f19603f3d011682016040523d82523d6000602084013e612a91565b606091505b509150915061294282828660608315612aab5750816126d3565b825115612abb5782518084602001fd5b8160405162461bcd60e51b81526004016101f0919061303c565b80600b0b8114612ae457600080fd5b50565b60008060408385031215612afa57600080fd5b8235612b0581612ad5565b946020939093013593505050565b600060208284031215612b2557600080fd5b815180151581146126d357600080fd5b600060208284031215612b4757600080fd5b5051919050565b6001600160a01b0381168114612ae457600080fd5b600060208284031215612b7557600080fd5b81516126d381612b4e565b6001600160a01b0393841681529183166020830152909116604082015260600190565b600080600060608486031215612bb857600080fd5b83519250602084015160ff81168114612bd057600080fd5b6040850151909250612be181612ad5565b809150509250925092565b634e487b7160e01b600052601160045260246000fd5b60008219821115612c1557612c15612bec565b500190565b6020808252603d908201527f4346414261736550434f46616365743a204f6e6c79207061796572206973206160408201527f6c6c6f77656420746f20706572666f726d207468697320616374696f6e000000606082015260800190565b6020808252602e908201527f43464150656e616c747942696446616365743a2050656e64696e67206269642060408201526d191bd95cc81b9bdd08195e1a5cdd60921b606082015260800190565b600082821015612cd757612cd7612bec565b500390565b6020808252602a908201527f43464150656e616c747942696446616365743a2042696420706572696f642068604082015269185cc8195b185c1cd95960b21b606082015260800190565b6000816000190483118215151615612d4057612d40612bec565b500290565b600082612d6257634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052602160045260246000fd5b60008060008060808587031215612d9357600080fd5b505082516020840151604085015160609095015191969095509092509050565b600080821280156001600160ff1b0384900385131615612dd557612dd5612bec565b600160ff1b8390038412811615612dee57612dee612bec565b50500190565b60008060008060808587031215612e0a57600080fd5b845193506020850151612e1c81612ad5565b6040860151606090960151949790965092505050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015612e63578181015183820152602001612e4b565b83811115610e715750506000910152565b60008151808452612e8c816020860160208601612e48565b601f01601f19169290920160200192915050565b6001600160a01b038681168252858116602083015284166040820152600b83900b606082015260a06080820181905260009061294290830184612e74565b6001600160a01b0384168152606060208201819052600090612f0290830185612e74565b82810360408401526117668185612e74565b600060208284031215612f2657600080fd5b815167ffffffffffffffff80821115612f3e57600080fd5b818401915084601f830112612f5257600080fd5b815181811115612f6457612f64612e32565b604051601f8201601f19908116603f01168101908382118183101715612f8c57612f8c612e32565b81604052828152876020848701011115612fa557600080fd5b612942836020830160208801612e48565b6001600160a01b03858116825284811660208301528316604082015260806060820181905260009061176690830184612e74565b6001600160a01b03858116825284166020820152600b83900b604082015260806060820181905260009061176690830184612e74565b60008251613032818460208701612e48565b9190910192915050565b6020815260006126d36020830184612e7456feab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670de3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f42eaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da63c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f41ab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670dd7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532c9a26469706673582212203de80cfe36d744a622d9348a5cfc5727d182ed9ebbd059610f94ca76a96b406f64736f6c634300080e0033"; + "0x608060405234801561001057600080fd5b50613132806100206000396000f3fe608060405234801561001057600080fd5b50600436106100875760003560e01c80639e41ec671161005b5780639e41ec6714610137578063ce2ccb151461014d578063e52a787414610155578063f11663e81461015d57600080fd5b8062fa68021461008c578063084024a2146100a15780633e3581a7146100d457806392f1f73e146100dc575b600080fd5b61009f61009a366004612ad4565b610170565b005b60008051602061303d833981519152546000600160a01b909104600b0b1360405190151581526020015b60405180910390f35b61009f6108ba565b6100e4610b08565b6040516100cb9190815181526020808301516001600160a01b031690820152604080830151600b0b90820152606080830151908201526080808301519082015260a0918201519181019190915260c00190565b61013f610c12565b6040519081526020016100cb565b61009f610c21565b61009f610e69565b61009f61016b366004612ad4565b6110ad565b6101786111c1565b6101f95760405162461bcd60e51b815260206004820152604160248201527f4346414261736550434f46616365743a2043616e206f6e6c7920706572666f7260448201527f6d20616374696f6e207768656e207061796572206269642069732061637469766064820152606560f81b608482015260a4015b60405180910390fd5b60006000805160206130bd8339815191529050306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa15801561024a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026e9190612b00565b156102d25760405162461bcd60e51b815260206004820152602e60248201527f43464150656e616c747942696446616365743a2050656e64696e67206269642060448201526d616c72656164792065786973747360901b60648201526084016101f0565b6000805160206130dd833981519152805460408051630b51881360e11b8152905160008051602061307d833981519152926000926001600160a01b03909116916316a31026916004808201926020929091908290030181865afa15801561033d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103619190612b22565b905060008360000160009054906101000a90046001600160a01b03166001600160a01b031663014df4146040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103de9190612b22565b905060008051602061309d8339815191526103fb878985856111d5565b61045c5760405162461bcd60e51b815260206004820152602c60248201527f43464150656e616c747942696446616365743a20496e636f727265637420666f60448201526b722073616c6520707269636560a01b60648201526084016101f0565b6001810154600160a01b9004600b90810b9089900b12156104e55760405162461bcd60e51b815260206004820152603c60248201527f43464150656e616c747942696446616365743a204e657720636f6e747269627560448201527f74696f6e2072617465206973206e6f74206869676820656e6f7567680000000060648201526084016101f0565b600184015485546040805163d41c3a6560e01b8152905160009384936001600160a01b039182169362422bbe93919092169163d41c3a659160048083019260209291908290030181865afa158015610541573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105659190612b50565b33306040518463ffffffff1660e01b815260040161058593929190612b6d565b606060405180830381865afa1580156105a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c69190612b90565b92509250506105d6826000611203565b6106415760405162461bcd60e51b815260206004820152603660248201527f43464150656e616c747942696446616365743a204352454154455f464c4f57206044820152751c195c9b5a5cdcda5bdb881b9bdd0819dc985b9d195960521b60648201526084016101f0565b89600b0b81600b0b12156106cf5760405162461bcd60e51b815260206004820152604960248201527f43464150656e616c747942696446616365743a204352454154455f464c4f572060448201527f7065726d697373696f6e20646f6573206e6f74206861766520656e6f75676820606482015268616c6c6f77616e636560b81b608482015260a4016101f0565b86546040805163d41c3a6560e01b815290516000926001600160a01b03169163d41c3a659160048083019260209291908290030181865afa158015610718573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061073c9190612b50565b60018801546040516346ccbfb760e11b81526001600160a01b038084166004830152600b8f900b602483015292935060009290911690638d997f6e90604401602060405180830381865afa158015610798573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107bc9190612b22565b905060006107ca8c83612bef565b90506107e16001600160a01b038416333084611262565b428b60000181905550338b60010160006101000a8154816001600160a01b0302191690836001600160a01b031602179055508c8b60010160146101000a8154816001600160601b030219169083600b0b6001600160601b03160217905550878b60020181905550868b600301819055508b8b60040181905550336001600160a01b03167f51dc3f0ae56a56b314941620a5450aa63fb32261ffdd59993bdd4a5645ed6d728e8e6040516108a3929190600b9290920b8252602082015260400190565b60405180910390a250505050505050505050505050565b60008051602061305d8339815191525460008051602061309d833981519152906001600160a01b031633146109015760405162461bcd60e51b81526004016101f090612c07565b306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa15801561093f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109639190612b00565b61097f5760405162461bcd60e51b81526004016101f090612c64565b6000805160206130dd83398151915280546040805163400e2d8f60e11b815290516000805160206130bd8339815191529360008051602061309d8339815191529390926000926001600160a01b039092169163801c5b1e916004808201926020929091908290030181865afa1580156109fc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a209190612b22565b8454909150600090610a329042612cb2565b9050818110610a535760405162461bcd60e51b81526004016101f090612cc9565b60008051602061303d8339815191525460008051602061305d833981519152547f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455460408051918252516000805160206130bd8339815191529360008051602061309d833981519152936001600160a01b03918216939116917f70ba5911930f2b49bef0e3806b54c696faa41fcf48becb8291d011ca4c1d8db49181900360200190a3610afe6112cd565b5050505050505050565b610b4d6040518060c001604052806000815260200160006001600160a01b031681526020016000600b0b81526020016000815260200160008152602001600081525090565b506040805160c0810182526000805160206130bd83398151915254815260008051602061303d833981519152546001600160a01b0381166020830152600160a01b9004600b0b918101919091527fab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670df5460608201527fab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670e05460808201527fab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670e15460a082015290565b6000610c1c611625565b905090565b306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c5f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c839190612b00565b610c9f5760405162461bcd60e51b81526004016101f090612c64565b6000805160206130bd8339815191526000805160206130dd833981519152610cc56111c1565b15610db55780546040805163400e2d8f60e11b815290516000926001600160a01b03169163801c5b1e9160048083019260209291908290030181865afa158015610d13573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d379190612b22565b8354909150600090610d499042612cb2565b905081811015610db25760405162461bcd60e51b815260206004820152602e60248201527f43464150656e616c747942696446616365743a2042696420706572696f64206860448201526d185cc81b9bdd08195b185c1cd95960921b60648201526084016101f0565b50505b60008051602061303d8339815191525460008051602061305d833981519152547f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455460408051918252516000805160206130bd8339815191529360008051602061309d833981519152936001600160a01b039182169391169133917f5057e7232685b7cad2bf4919b2c3e735cf044c7b689b15fd24035359a9581458919081900360200190a4610e6361175d565b50505050565b60008051602061305d8339815191525460008051602061309d833981519152906001600160a01b03163314610eb05760405162461bcd60e51b81526004016101f090612c07565b306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa158015610eee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f129190612b00565b610f2e5760405162461bcd60e51b81526004016101f090612c64565b6000805160206130dd83398151915280546040805163400e2d8f60e11b815290516000805160206130bd8339815191529360008051602061309d8339815191529390926000926001600160a01b039092169163801c5b1e916004808201926020929091908290030181865afa158015610fab573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fcf9190612b22565b8454909150600090610fe19042612cb2565b90508181106110025760405162461bcd60e51b81526004016101f090612cc9565b60008051602061303d8339815191525460008051602061305d833981519152547f3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f455460408051918252516000805160206130bd8339815191529360008051602061309d833981519152936001600160a01b03918216939116917fcea76e88a336bcad5acb8cf244393e65f4bbe4b4bcaa2e989f754f5f2bd29eaf9181900360200190a3610afe61175d565b60008051602061305d8339815191525460008051602061309d833981519152906001600160a01b031633146110f45760405162461bcd60e51b81526004016101f090612c07565b306001600160a01b031663084024a26040518163ffffffff1660e01b8152600401602060405180830381865afa158015611132573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111569190612b00565b156111b25760405162461bcd60e51b815260206004820152602660248201527f43464150656e616c747942696446616365743a2050656e64696e67206269642060448201526565786973747360d01b60648201526084016101f0565b6111bc8383611d9f565b505050565b6000806111cc61236e565b600b0b13905090565b600080826111e38588612d13565b6111ed9190612d32565b6001600160601b03861614915050949350505050565b60008082600281111561121857611218612d54565b03611229575060018281161461125c565b600182600281111561123d5761123d612d54565b036112505750600182811c81161461125c565b506001600283901c8116145b92915050565b6040516001600160a01b0380851660248301528316604482015260648101829052610e639085906323b872dd60e01b906084015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152612502565b6000805160206130dd83398151915280546040805163d41c3a6560e01b8152905160008051602061307d8339815191529260008051602061309d833981519152926000805160206130bd833981519152926000926001600160a01b03169163d41c3a659160048083019260209291908290030181865afa158015611355573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113799190612b50565b905060008560000160009054906101000a90046001600160a01b03166001600160a01b031663565a2e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156113d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113f69190612b50565b90506000611402611625565b604051632ec8eec760e01b815230600482015290915060009081906001600160a01b03861690632ec8eec790602401608060405180830381865afa15801561144e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114729190612d6a565b50509150915060008082846114879190612da0565b12611499576114968284612da0565b90505b600189810154908801546040516346ccbfb760e11b81526001600160a01b038981166004830152600160a01b909204600b0b60248201526000929190911690638d997f6e90604401602060405180830381865afa1580156114fe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115229190612b22565b9050828211156115bc576115368383612cb2565b9150600081896004015461154a9190612bef565b90508083111561159e576001890154611570906001600160a01b038a81169116836125d4565b61157a8184612cb2565b60018b0154909350611599906001600160a01b038a81169116856125d4565b6115ba565b60018901546115ba906001600160a01b038a81169116856125d4565b505b60018901546115d9906001600160a01b0389811691168888611262565b600188015460048901546115f791600160a01b9004600b0b90611d9f565b61161860008051602061303d83398151915280546001600160a01b03169055565b5050505050505050505050565b6000805160206130dd83398151915280546040805163304fb4bb60e21b81529051600093926000805160206130bd8339815191529285926001600160a01b039092169163c13ed2ec916004808201926020929091908290030181865afa158015611693573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116b79190612b22565b905060008360000160009054906101000a90046001600160a01b03166001600160a01b0316637d51ce906040518163ffffffff1660e01b8152600401602060405180830381865afa158015611710573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117349190612b22565b90506000818385600401546117499190612d13565b6117539190612d32565b9695505050505050565b6000805160206130dd83398151915280546040805163d41c3a6560e01b8152905160008051602061307d8339815191529260008051602061309d833981519152926000805160206130bd833981519152926000926001600160a01b03169163d41c3a659160048083019260209291908290030181865afa1580156117e5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118099190612b50565b60018581015490850154604051631cd43d1160e31b81529293506000926001600160a01b039283169263e6a1e8889261184c928792909116903090600401612b6d565b608060405180830381865afa158015611869573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061188d9190612de1565b5050915050600081600b0b13156118b95760018401546118b99086906001600160a01b03163085612604565b8454600180870154908501546040805160008152602081019091526001600160a01b03938416936339255d5b9381169283926394229ecb92611911928a92918116913091600160a01b9004600b0b9060448101612e8d565b60408051601f19818403018152918152602080830180516001600160e01b031660e095861b179052815160008152908101918290529286901b6001600160e01b03191690526119669392509060248101612ecb565b6000604051808303816000875af19250505080156119a657506040513d6000823e601f3d908101601f191682016040526119a39190810190612f01565b60015b156119ad57505b8554604080516315968b8b60e21b815290516000926001600160a01b03169163565a2e2c9160048083019260209291908290030181865afa1580156119f6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a1a9190612b50565b6001870154604051631cd43d1160e31b81529192506001600160a01b03169063e6a1e88890611a5190869030908690600401612b6d565b608060405180830381865afa158015611a6e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a929190612de1565b5090935050506000600b83900b1315611ac8576001840154611ac390879083908690600160a01b9004600b0b612624565b611ae6565b6001840154611ae690879083908690600160a01b9004600b0b612644565b600187810154868201549186015460028a0154604051632142170760e11b81526001600160a01b039485166004820152918416602483015260448201529116906342842e0e90606401600060405180830381600087803b158015611b4957600080fd5b505af1158015611b5d573d6000803e3d6000fd5b5050604051632ec8eec760e01b8152306004820152600092508291506001600160a01b03861690632ec8eec790602401608060405180830381865afa158015611baa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611bce9190612d6a565b5050915091506000808284611be39190612da0565b12611bf557611bf28284612da0565b90505b600189810154908801546040516346ccbfb760e11b81526001600160a01b038981166004830152600160a01b909204600b0b60248201526000929190911690638d997f6e90604401602060405180830381865afa158015611c5a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c7e9190612b22565b905080821115611d1c57611c928183612cb2565b9150600089600401548960040154611caa9190612cb2565b905080831115611cfe576001890154611cd0906001600160a01b038a81169116836125d4565b611cda8184612cb2565b60018b0154909350611cf9906001600160a01b038a81169116856125d4565b611d1a565b6001890154611d1a906001600160a01b038a81169116856125d4565b505b8754895560018089018054918b0180546001600160a01b0319166001600160a01b03909316928317815590546001600160601b03600160a01b9182900416029091179055600280890154908a0155600380890154908a0155600480890154908a015561161860008051602061303d83398151915280546001600160a01b03169055565b6000805160206130dd833981519152805460408051630b51881360e11b8152905160008051602061307d8339815191529260008051602061309d833981519152926000926001600160a01b03909216916316a31026916004808201926020929091908290030181865afa158015611e1a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e3e9190612b22565b905060008460000160009054906101000a90046001600160a01b03166001600160a01b031663014df4146040518163ffffffff1660e01b8152600401602060405180830381865afa158015611e97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ebb9190612b22565b9050611ec9868884846111d5565b611f255760405162461bcd60e51b815260206004820152602760248201527f4c69624346414261736550434f3a20496e636f727265637420666f722073616c6044820152666520707269636560c81b60648201526084016101f0565b84546040805163d41c3a6560e01b815290516000926001600160a01b03169163d41c3a659160048083019260209291908290030181865afa158015611f6e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f929190612b50565b905060008660000160009054906101000a90046001600160a01b03166001600160a01b031663565a2e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611feb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061200f9190612b50565b604051632ec8eec760e01b81523060048201529091506000906001600160a01b03841690632ec8eec790602401608060405180830381865afa158015612059573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061207d9190612d6a565b505060018901546040516346ccbfb760e11b81526001600160a01b038781166004830152600b8f900b602483015292945060009350911690638d997f6e90604401602060405180830381865afa1580156120db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120ff9190612b22565b905061212233306121108585612cb2565b6001600160a01b038816929190611262565b505060018087015490860154604051631cd43d1160e31b81526000926001600160a01b039081169263e6a1e8889261216292889216903090600401612b6d565b608060405180830381865afa15801561217f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121a39190612de1565b5050915050600081600b0b13156121d65760018601546121d09088906001600160a01b031630868e612664565b506121f4565b60018601546121f29088906001600160a01b031630868e612689565b505b6001870154604051631cd43d1160e31b81526001600160a01b039091169063e6a1e8889061222a90869030908790600401612b6d565b608060405180830381865afa158015612247573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061226b9190612de1565b5090925050506000600b82900b131561228f5761228a8783858d612624565b61229b565b61229b8783858d612644565b4286556001860180546001600160601b038c16600160a01b026001600160a01b039182168181179093556002890188905560038901879055600489018c90556040519116909117907fae3c4f18410e9cfcd20fc8664a5a0082a92f07a0a5febdc22bec0c539393733690612312908c815260200190565b60405180910390a26001860154604051600b8c900b81526001600160a01b03909116907f6602f4d39e226f3807ddac3e7aab03883832e2ea2d07ccdeaf513c16679fdcd09060200160405180910390a250505050505050505050565b7feaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da7546000805160206130dd83398151915280546040805163d41c3a6560e01b8152905160009460008051602061307d8339815191529386936001600160a01b039283169363e6a1e888939092169163d41c3a65916004808201926020929091908290030181865afa158015612407573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061242b9190612b50565b8554604080516315968b8b60e21b8152905130926001600160a01b03169163565a2e2c9160048083019260209291908290030181865afa158015612473573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124979190612b50565b6040518463ffffffff1660e01b81526004016124b593929190612b6d565b608060405180830381865afa1580156124d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124f69190612de1565b50909695505050505050565b6000612557826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166126ae9092919063ffffffff16565b8051909150156111bc57808060200190518101906125759190612b00565b6111bc5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b60648201526084016101f0565b6040516001600160a01b0383166024820152604481018290526111bc90849063a9059cbb60e01b90606401611296565b604080516000815260208101909152610e639085908590859085906126c7565b604080516000815260208101909152610e639085908590859085906127a6565b604080516000815260208101909152610e6390859085908590859061280a565b6040805160008152602081019091526060906117539087908790879087908790612834565b604080516000815260208101909152606090611753908790879087908790879061293a565b60606126bd8484600085612968565b90505b9392505050565b845460018601546040805160008152602081019091526001600160a01b03928316926339255d5b921690819063b4b333c69061270c9088908b908b9060448101612fa3565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b0319168252612757939250908690600401612ecb565b6000604051808303816000875af1158015612776573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261279e9190810190612f01565b505050505050565b845460018601546001600160a01b03918216916339255d5b9116806350209a6287898860005b6040519080825280601f01601f1916602001820160405280156127f6576020820181803683370190505b5060405160240161270c9493929190612fd7565b845460018601546001600160a01b03918216916339255d5b9116806362fc305e87898860006127cc565b855460018701546060916001600160a01b03908116916339255d5b91168063354b9590888b8b8a60005b6040519080825280601f01601f191660200182016040528015612888576020820181803683370190505b5060405160240161289d959493929190612e8d565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b03191682526128e8939250908790600401612ecb565b6000604051808303816000875af1158015612907573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261292f9190810190612f01565b979650505050505050565b855460018701546060916001600160a01b03908116916339255d5b9116806394229ecb888b8b8a600061285e565b6060824710156129c95760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b60648201526084016101f0565b6001600160a01b0385163b612a205760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016101f0565b600080866001600160a01b03168587604051612a3c919061300d565b60006040518083038185875af1925050503d8060008114612a79576040519150601f19603f3d011682016040523d82523d6000602084013e612a7e565b606091505b509150915061292f82828660608315612a985750816126c0565b825115612aa85782518084602001fd5b8160405162461bcd60e51b81526004016101f09190613029565b80600b0b8114612ad157600080fd5b50565b60008060408385031215612ae757600080fd5b8235612af281612ac2565b946020939093013593505050565b600060208284031215612b1257600080fd5b815180151581146126c057600080fd5b600060208284031215612b3457600080fd5b5051919050565b6001600160a01b0381168114612ad157600080fd5b600060208284031215612b6257600080fd5b81516126c081612b3b565b6001600160a01b0393841681529183166020830152909116604082015260600190565b600080600060608486031215612ba557600080fd5b83519250602084015160ff81168114612bbd57600080fd5b6040850151909250612bce81612ac2565b809150509250925092565b634e487b7160e01b600052601160045260246000fd5b60008219821115612c0257612c02612bd9565b500190565b6020808252603d908201527f4346414261736550434f46616365743a204f6e6c79207061796572206973206160408201527f6c6c6f77656420746f20706572666f726d207468697320616374696f6e000000606082015260800190565b6020808252602e908201527f43464150656e616c747942696446616365743a2050656e64696e67206269642060408201526d191bd95cc81b9bdd08195e1a5cdd60921b606082015260800190565b600082821015612cc457612cc4612bd9565b500390565b6020808252602a908201527f43464150656e616c747942696446616365743a2042696420706572696f642068604082015269185cc8195b185c1cd95960b21b606082015260800190565b6000816000190483118215151615612d2d57612d2d612bd9565b500290565b600082612d4f57634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052602160045260246000fd5b60008060008060808587031215612d8057600080fd5b505082516020840151604085015160609095015191969095509092509050565b600080821280156001600160ff1b0384900385131615612dc257612dc2612bd9565b600160ff1b8390038412811615612ddb57612ddb612bd9565b50500190565b60008060008060808587031215612df757600080fd5b845193506020850151612e0981612ac2565b6040860151606090960151949790965092505050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015612e50578181015183820152602001612e38565b83811115610e635750506000910152565b60008151808452612e79816020860160208601612e35565b601f01601f19169290920160200192915050565b6001600160a01b038681168252858116602083015284166040820152600b83900b606082015260a06080820181905260009061292f90830184612e61565b6001600160a01b0384168152606060208201819052600090612eef90830185612e61565b82810360408401526117538185612e61565b600060208284031215612f1357600080fd5b815167ffffffffffffffff80821115612f2b57600080fd5b818401915084601f830112612f3f57600080fd5b815181811115612f5157612f51612e1f565b604051601f8201601f19908116603f01168101908382118183101715612f7957612f79612e1f565b81604052828152876020848701011115612f9257600080fd5b61292f836020830160208801612e35565b6001600160a01b03858116825284811660208301528316604082015260806060820181905260009061175390830184612e61565b6001600160a01b03858116825284166020820152600b83900b604082015260806060820181905260009061175390830184612e61565b6000825161301f818460208701612e35565b9190910192915050565b6020815260006126c06020830184612e6156feab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670de3c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f42eaf1cf088be31249661a61fc7743edf628a39210375613d4be0a9cda3ec06da63c72d60a0f1018560e1ecd381dcc70c04920ba28255c0b6f8b496f8f6f727f41ab844abc5ac35bdf8e8581a4c7c97fb9e92911442226ad6bdb029a2dbfe670dd7afbdc140ed2feae39152d66ce3c9b7394a1bbd963c668f15d7196d48d2532c9a2646970667358221220e88e16739f461cb85d5c8997baa3a8a0722693c181143fffd096d483a19ff91264736f6c634300080e0033"; type CFAPenaltyBidFacetConstructorParams = | [signer?: Signer] diff --git a/typechain-types/factories/ERC721Facet__factory.ts b/typechain-types/factories/ERC721Facet__factory.ts index 6020d149..96fc9d6b 100644 --- a/typechain-types/factories/ERC721Facet__factory.ts +++ b/typechain-types/factories/ERC721Facet__factory.ts @@ -141,12 +141,12 @@ const _abi = [ inputs: [ { internalType: "string", - name: "_name", + name: "initName", type: "string", }, { internalType: "string", - name: "_symbol", + name: "initSymbol", type: "string", }, ], @@ -357,7 +357,7 @@ const _abi = [ ]; const _bytecode = - "0x608060405234801561001057600080fd5b50611390806100206000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80636352211e1161008c578063a22cb46511610066578063a22cb465146101e1578063b88d4fde146101f4578063c87b56dd14610207578063e985e9c51461021a57600080fd5b80636352211e146101a557806370a08231146101b857806395d89b41146101d957600080fd5b8063095ea7b3116100c8578063095ea7b31461015757806323b872dd1461016c57806342842e0e1461017f5780634cd88b761461019257600080fd5b806301ffc9a7146100ef57806306fdde0314610117578063081812fc1461012c575b600080fd5b6101026100fd366004610e78565b61022d565b60405190151581526020015b60405180910390f35b61011f61027f565b60405161010e9190610ee2565b61013f61013a366004610ef5565b610323565b6040516001600160a01b03909116815260200161010e565b61016a610165366004610f2a565b61032e565b005b61016a61017a366004610f54565b610448565b61016a61018d366004610f54565b610479565b61016a6101a0366004610fd9565b610494565b61013f6101b3366004610ef5565b6104cd565b6101cb6101c6366004611045565b6104d8565b60405190815260200161010e565b61011f61057d565b61016a6101ef366004611060565b6105bc565b61016a6102023660046110b2565b6105cb565b61011f610215366004610ef5565b610603565b61010261022836600461118e565b610622565b60006001600160e01b031982166380ac58cd60e01b148061025e57506001600160e01b03198216635b5e139f60e01b145b8061027957506301ffc9a760e01b6001600160e01b03198316145b92915050565b60008051602061133b833981519152805460609190819061029f906111c1565b80601f01602080910402602001604051908101604052809291908181526020018280546102cb906111c1565b80156103185780601f106102ed57610100808354040283529160200191610318565b820191906000526020600020905b8154815290600101906020018083116102fb57829003601f168201915b505050505091505090565b600061027982610635565b60006103398261066c565b9050806001600160a01b0316836001600160a01b0316036103ab5760405162461bcd60e51b815260206004820152602160248201527f4552433732313a20617070726f76616c20746f2063757272656e74206f776e656044820152603960f91b60648201526084015b60405180910390fd5b336001600160a01b03821614806103c757506103c78133610622565b6104395760405162461bcd60e51b815260206004820152603e60248201527f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60448201527f6b656e206f776e6572206e6f7220617070726f76656420666f7220616c6c000060648201526084016103a2565b61044383836106fb565b505050565b6104523382610799565b61046e5760405162461bcd60e51b81526004016103a2906111fb565b610443838383610840565b610443838383604051806020016040528060008152506105cb565b61049c610a3d565b60008051602061133b8339815191526104b6818686610dc9565b506104c5600182018484610dc9565b505050505050565b60006102798261066c565b60006001600160a01b0382166105425760405162461bcd60e51b815260206004820152602960248201527f4552433732313a2061646472657373207a65726f206973206e6f7420612076616044820152683634b21037bbb732b960b91b60648201526084016103a2565b506001600160a01b031660009081527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25b602052604090205490565b7f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce259805460609160008051602061133b8339815191529161029f906111c1565b6105c7338383610ac6565b5050565b6105d53383610799565b6105f15760405162461bcd60e51b81526004016103a2906111fb565b6105fd84848484610bc6565b50505050565b606061060e82610bf9565b505060408051602081019091526000815290565b600061062e8383610c7a565b9392505050565b600060008051602061133b83398151915261064f83610bf9565b60009283526004016020525060409020546001600160a01b031690565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25a602052604081205460008051602061133b833981519152906001600160a01b03168061062e5760405162461bcd60e51b8152602060048201526018602482015277115490cdcc8c4e881a5b9d985b1a59081d1bdad95b88125160421b60448201526064016103a2565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25c6020526040902080546001600160a01b0319166001600160a01b03841690811790915560008051602061133b83398151915290829061075f8261066c565b6001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560405160405180910390a4505050565b60007f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc1816107c68461066c565b9050806001600160a01b0316856001600160a01b03161480610803575060008481526005830160205260409020546001600160a01b038681169116145b8061081357506108138186610c7a565b806108375750846001600160a01b031661082c85610635565b6001600160a01b0316145b95945050505050565b826001600160a01b03166108538261066c565b6001600160a01b0316146108b75760405162461bcd60e51b815260206004820152602560248201527f4552433732313a207472616e736665722066726f6d20696e636f72726563742060448201526437bbb732b960d91b60648201526084016103a2565b6001600160a01b0382166109195760405162461bcd60e51b8152602060048201526024808201527f4552433732313a207472616e7366657220746f20746865207a65726f206164646044820152637265737360e01b60648201526084016103a2565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25c6020908152604080832080546001600160a01b03191690556001600160a01b03861683527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25b9091528120805460008051602061133b83398151915292600192916109aa90849061125f565b90915550506001600160a01b038316600090815260038201602052604081208054600192906109da908490611276565b9091555050600082815260028201602052604080822080546001600160a01b0319166001600160a01b0387811691821790925591518593918816917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef91a46105fd565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c600401546001600160a01b03163314610ac45760405162461bcd60e51b815260206004820152602260248201527f4c69624469616d6f6e643a204d75737420626520636f6e7472616374206f776e60448201526132b960f11b60648201526084016103a2565b565b816001600160a01b0316836001600160a01b031603610b275760405162461bcd60e51b815260206004820152601960248201527f4552433732313a20617070726f766520746f2063616c6c65720000000000000060448201526064016103a2565b6001600160a01b0383811660008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25d6020908152604080832094871680845294825291829020805460ff19168615159081179091558251908152915160008051602061133b8339815191529493927f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3192908290030190a350505050565b610bd1848484610840565b610bdd84848484610cc7565b6105fd5760405162461bcd60e51b81526004016103a29061128e565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25a60205260409020546001600160a01b0316610c775760405162461bcd60e51b8152602060048201526018602482015277115490cdcc8c4e881a5b9d985b1a59081d1bdad95b88125160421b60448201526064016103a2565b50565b6001600160a01b0391821660009081527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25d6020908152604080832093909416825291909152205460ff1690565b60006001600160a01b0384163b15610dbd57604051630a85bd0160e11b81526001600160a01b0385169063150b7a0290610d0b9033908990889088906004016112e0565b6020604051808303816000875af1925050508015610d46575060408051601f3d908101601f19168201909252610d439181019061131d565b60015b610da3573d808015610d74576040519150601f19603f3d011682016040523d82523d6000602084013e610d79565b606091505b508051600003610d9b5760405162461bcd60e51b81526004016103a29061128e565b805181602001fd5b6001600160e01b031916630a85bd0160e11b149050610dc1565b5060015b949350505050565b828054610dd5906111c1565b90600052602060002090601f016020900481019282610df75760008555610e3d565b82601f10610e105782800160ff19823516178555610e3d565b82800160010185558215610e3d579182015b82811115610e3d578235825591602001919060010190610e22565b50610e49929150610e4d565b5090565b5b80821115610e495760008155600101610e4e565b6001600160e01b031981168114610c7757600080fd5b600060208284031215610e8a57600080fd5b813561062e81610e62565b6000815180845260005b81811015610ebb57602081850181015186830182015201610e9f565b81811115610ecd576000602083870101525b50601f01601f19169290920160200192915050565b60208152600061062e6020830184610e95565b600060208284031215610f0757600080fd5b5035919050565b80356001600160a01b0381168114610f2557600080fd5b919050565b60008060408385031215610f3d57600080fd5b610f4683610f0e565b946020939093013593505050565b600080600060608486031215610f6957600080fd5b610f7284610f0e565b9250610f8060208501610f0e565b9150604084013590509250925092565b60008083601f840112610fa257600080fd5b50813567ffffffffffffffff811115610fba57600080fd5b602083019150836020828501011115610fd257600080fd5b9250929050565b60008060008060408587031215610fef57600080fd5b843567ffffffffffffffff8082111561100757600080fd5b61101388838901610f90565b9096509450602087013591508082111561102c57600080fd5b5061103987828801610f90565b95989497509550505050565b60006020828403121561105757600080fd5b61062e82610f0e565b6000806040838503121561107357600080fd5b61107c83610f0e565b91506020830135801515811461109157600080fd5b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b600080600080608085870312156110c857600080fd5b6110d185610f0e565b93506110df60208601610f0e565b925060408501359150606085013567ffffffffffffffff8082111561110357600080fd5b818701915087601f83011261111757600080fd5b8135818111156111295761112961109c565b604051601f8201601f19908116603f011681019083821181831017156111515761115161109c565b816040528281528a602084870101111561116a57600080fd5b82602086016020830137600060208483010152809550505050505092959194509250565b600080604083850312156111a157600080fd5b6111aa83610f0e565b91506111b860208401610f0e565b90509250929050565b600181811c908216806111d557607f821691505b6020821081036111f557634e487b7160e01b600052602260045260246000fd5b50919050565b6020808252602e908201527f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560408201526d1c881b9bdc88185c1c1c9bdd995960921b606082015260800190565b634e487b7160e01b600052601160045260246000fd5b60008282101561127157611271611249565b500390565b6000821982111561128957611289611249565b500190565b60208082526032908201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560408201527131b2b4bb32b91034b6b83632b6b2b73a32b960711b606082015260800190565b6001600160a01b038581168252841660208201526040810183905260806060820181905260009061131390830184610e95565b9695505050505050565b60006020828403121561132f57600080fd5b815161062e81610e6256fe0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce258a264697066735822122095f06234ea138a0a7543e13bab12ab8c5c08cd5e6405f541436948be943c05a864736f6c634300080e0033"; + "0x608060405234801561001057600080fd5b50611391806100206000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80636352211e1161008c578063a22cb46511610066578063a22cb465146101e1578063b88d4fde146101f4578063c87b56dd14610207578063e985e9c51461021a57600080fd5b80636352211e146101a557806370a08231146101b857806395d89b41146101d957600080fd5b8063095ea7b3116100c8578063095ea7b31461015757806323b872dd1461016c57806342842e0e1461017f5780634cd88b761461019257600080fd5b806301ffc9a7146100ef57806306fdde0314610117578063081812fc1461012c575b600080fd5b6101026100fd366004610e79565b61022d565b60405190151581526020015b60405180910390f35b61011f61027f565b60405161010e9190610ee3565b61013f61013a366004610ef6565b610323565b6040516001600160a01b03909116815260200161010e565b61016a610165366004610f2b565b61032e565b005b61016a61017a366004610f55565b610448565b61016a61018d366004610f55565b610479565b61016a6101a0366004610fda565b610494565b61013f6101b3366004610ef6565b6104cd565b6101cb6101c6366004611046565b6104d8565b60405190815260200161010e565b61011f61057d565b61016a6101ef366004611061565b6105bc565b61016a6102023660046110b3565b6105cb565b61011f610215366004610ef6565b610603565b61010261022836600461118f565b610622565b60006001600160e01b031982166380ac58cd60e01b148061025e57506001600160e01b03198216635b5e139f60e01b145b8061027957506301ffc9a760e01b6001600160e01b03198316145b92915050565b60008051602061133c833981519152805460609190819061029f906111c2565b80601f01602080910402602001604051908101604052809291908181526020018280546102cb906111c2565b80156103185780601f106102ed57610100808354040283529160200191610318565b820191906000526020600020905b8154815290600101906020018083116102fb57829003601f168201915b505050505091505090565b600061027982610635565b60006103398261066c565b9050806001600160a01b0316836001600160a01b0316036103ab5760405162461bcd60e51b815260206004820152602160248201527f4552433732313a20617070726f76616c20746f2063757272656e74206f776e656044820152603960f91b60648201526084015b60405180910390fd5b336001600160a01b03821614806103c757506103c78133610622565b6104395760405162461bcd60e51b815260206004820152603e60248201527f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60448201527f6b656e206f776e6572206e6f7220617070726f76656420666f7220616c6c000060648201526084016103a2565b61044383836106fb565b505050565b6104523382610799565b61046e5760405162461bcd60e51b81526004016103a2906111fc565b610443838383610840565b610443838383604051806020016040528060008152506105cb565b61049c610a3e565b60008051602061133c8339815191526104b6818686610dca565b506104c5600182018484610dca565b505050505050565b60006102798261066c565b60006001600160a01b0382166105425760405162461bcd60e51b815260206004820152602960248201527f4552433732313a2061646472657373207a65726f206973206e6f7420612076616044820152683634b21037bbb732b960b91b60648201526084016103a2565b506001600160a01b031660009081527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25b602052604090205490565b7f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce259805460609160008051602061133c8339815191529161029f906111c2565b6105c7338383610ac7565b5050565b6105d53383610799565b6105f15760405162461bcd60e51b81526004016103a2906111fc565b6105fd84848484610bc7565b50505050565b606061060e82610bfa565b505060408051602081019091526000815290565b600061062e8383610c7b565b9392505050565b600060008051602061133c83398151915261064f83610bfa565b60009283526004016020525060409020546001600160a01b031690565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25a602052604081205460008051602061133c833981519152906001600160a01b03168061062e5760405162461bcd60e51b8152602060048201526018602482015277115490cdcc8c4e881a5b9d985b1a59081d1bdad95b88125160421b60448201526064016103a2565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25c6020526040902080546001600160a01b0319166001600160a01b03841690811790915560008051602061133c83398151915290829061075f8261066c565b6001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560405160405180910390a4505050565b60007f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc1816107c68461066c565b9050806001600160a01b0316856001600160a01b03161480610803575060008481526005830160205260409020546001600160a01b038681169116145b8061081357506108138186610c7b565b806108375750846001600160a01b031661082c85610635565b6001600160a01b0316145b95945050505050565b826001600160a01b03166108538261066c565b6001600160a01b0316146108b75760405162461bcd60e51b815260206004820152602560248201527f4552433732313a207472616e736665722066726f6d20696e636f72726563742060448201526437bbb732b960d91b60648201526084016103a2565b6001600160a01b0382166109195760405162461bcd60e51b8152602060048201526024808201527f4552433732313a207472616e7366657220746f20746865207a65726f206164646044820152637265737360e01b60648201526084016103a2565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25c6020908152604080832080546001600160a01b03191690556001600160a01b03861683527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25b9091528120805460008051602061133c83398151915292600192916109aa908490611260565b90915550506001600160a01b038316600090815260038201602052604081208054600192906109da908490611277565b9091555050600082815260028201602052604080822080546001600160a01b0319166001600160a01b0387811691821790925591518593918816917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef91a450505050565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c600401546001600160a01b03163314610ac55760405162461bcd60e51b815260206004820152602260248201527f4c69624469616d6f6e643a204d75737420626520636f6e7472616374206f776e60448201526132b960f11b60648201526084016103a2565b565b816001600160a01b0316836001600160a01b031603610b285760405162461bcd60e51b815260206004820152601960248201527f4552433732313a20617070726f766520746f2063616c6c65720000000000000060448201526064016103a2565b6001600160a01b0383811660008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25d6020908152604080832094871680845294825291829020805460ff19168615159081179091558251908152915160008051602061133c8339815191529493927f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3192908290030190a350505050565b610bd2848484610840565b610bde84848484610cc8565b6105fd5760405162461bcd60e51b81526004016103a29061128f565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25a60205260409020546001600160a01b0316610c785760405162461bcd60e51b8152602060048201526018602482015277115490cdcc8c4e881a5b9d985b1a59081d1bdad95b88125160421b60448201526064016103a2565b50565b6001600160a01b0391821660009081527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25d6020908152604080832093909416825291909152205460ff1690565b60006001600160a01b0384163b15610dbe57604051630a85bd0160e11b81526001600160a01b0385169063150b7a0290610d0c9033908990889088906004016112e1565b6020604051808303816000875af1925050508015610d47575060408051601f3d908101601f19168201909252610d449181019061131e565b60015b610da4573d808015610d75576040519150601f19603f3d011682016040523d82523d6000602084013e610d7a565b606091505b508051600003610d9c5760405162461bcd60e51b81526004016103a29061128f565b805181602001fd5b6001600160e01b031916630a85bd0160e11b149050610dc2565b5060015b949350505050565b828054610dd6906111c2565b90600052602060002090601f016020900481019282610df85760008555610e3e565b82601f10610e115782800160ff19823516178555610e3e565b82800160010185558215610e3e579182015b82811115610e3e578235825591602001919060010190610e23565b50610e4a929150610e4e565b5090565b5b80821115610e4a5760008155600101610e4f565b6001600160e01b031981168114610c7857600080fd5b600060208284031215610e8b57600080fd5b813561062e81610e63565b6000815180845260005b81811015610ebc57602081850181015186830182015201610ea0565b81811115610ece576000602083870101525b50601f01601f19169290920160200192915050565b60208152600061062e6020830184610e96565b600060208284031215610f0857600080fd5b5035919050565b80356001600160a01b0381168114610f2657600080fd5b919050565b60008060408385031215610f3e57600080fd5b610f4783610f0f565b946020939093013593505050565b600080600060608486031215610f6a57600080fd5b610f7384610f0f565b9250610f8160208501610f0f565b9150604084013590509250925092565b60008083601f840112610fa357600080fd5b50813567ffffffffffffffff811115610fbb57600080fd5b602083019150836020828501011115610fd357600080fd5b9250929050565b60008060008060408587031215610ff057600080fd5b843567ffffffffffffffff8082111561100857600080fd5b61101488838901610f91565b9096509450602087013591508082111561102d57600080fd5b5061103a87828801610f91565b95989497509550505050565b60006020828403121561105857600080fd5b61062e82610f0f565b6000806040838503121561107457600080fd5b61107d83610f0f565b91506020830135801515811461109257600080fd5b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b600080600080608085870312156110c957600080fd5b6110d285610f0f565b93506110e060208601610f0f565b925060408501359150606085013567ffffffffffffffff8082111561110457600080fd5b818701915087601f83011261111857600080fd5b81358181111561112a5761112a61109d565b604051601f8201601f19908116603f011681019083821181831017156111525761115261109d565b816040528281528a602084870101111561116b57600080fd5b82602086016020830137600060208483010152809550505050505092959194509250565b600080604083850312156111a257600080fd5b6111ab83610f0f565b91506111b960208401610f0f565b90509250929050565b600181811c908216806111d657607f821691505b6020821081036111f657634e487b7160e01b600052602260045260246000fd5b50919050565b6020808252602e908201527f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560408201526d1c881b9bdc88185c1c1c9bdd995960921b606082015260800190565b634e487b7160e01b600052601160045260246000fd5b6000828210156112725761127261124a565b500390565b6000821982111561128a5761128a61124a565b500190565b60208082526032908201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560408201527131b2b4bb32b91034b6b83632b6b2b73a32b960711b606082015260800190565b6001600160a01b038581168252841660208201526040810183905260806060820181905260009061131490830184610e96565b9695505050505050565b60006020828403121561133057600080fd5b815161062e81610e6356fe0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce258a2646970667358221220907ec54f113cf0246cdc398fa56d8db2075791aa3d100c6901f6a0cc3e1e6c3f64736f6c634300080e0033"; type ERC721FacetConstructorParams = | [signer?: Signer] diff --git a/typechain-types/factories/GeoWebParcelFacet__factory.ts b/typechain-types/factories/GeoWebParcelFacet__factory.ts index 0767802a..c780043a 100644 --- a/typechain-types/factories/GeoWebParcelFacet__factory.ts +++ b/typechain-types/factories/GeoWebParcelFacet__factory.ts @@ -60,7 +60,7 @@ const _abi = [ ]; const _bytecode = - "0x608060405234801561001057600080fd5b5061023f806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806331a5ee9c1461003b578063e7feff2e14610098575b600080fd5b610085610049366004610176565b60009182527f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f86020908152604080842092845291905290205490565b6040519081526020015b60405180910390f35b6100ab6100a6366004610198565b6100b9565b60405161008f9291906101b1565b60008181527f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f96020908152604080832080546001820180548451818702810187019095528085526060957f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f89567ffffffffffffffff9094169391839183018282801561016457602002820191906000526020600020905b815481526020019060010190808311610150575b50505050509050935093505050915091565b6000806040838503121561018957600080fd5b50508035926020909101359150565b6000602082840312156101aa57600080fd5b5035919050565b60006040820167ffffffffffffffff851683526020604081850152818551808452606086019150828701935060005b818110156101fc578451835293830193918301916001016101e0565b509097965050505050505056fea26469706673582212206fc140681cc87b621d5d8720d6475338ce9d8013ed3a34be7cddca6259d9bfa764736f6c634300080e0033"; + "0x608060405234801561001057600080fd5b5061023f806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806331a5ee9c1461003b578063e7feff2e14610098575b600080fd5b610085610049366004610176565b60009182527f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f86020908152604080842092845291905290205490565b6040519081526020015b60405180910390f35b6100ab6100a6366004610198565b6100b9565b60405161008f9291906101b1565b60008181527f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f96020908152604080832080546001820180548451818702810187019095528085526060957f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f89567ffffffffffffffff9094169391839183018282801561016457602002820191906000526020600020905b815481526020019060010190808311610150575b50505050509050935093505050915091565b6000806040838503121561018957600080fd5b50508035926020909101359150565b6000602082840312156101aa57600080fd5b5035919050565b60006040820167ffffffffffffffff851683526020604081850152818551808452606086019150828701935060005b818110156101fc578451835293830193918301916001016101e0565b509097965050505050505056fea2646970667358221220ef2984fea65013cf7e38fdd178b9ad98e0d21dee599cf4b92d0409175a98deb664736f6c634300080e0033"; type GeoWebParcelFacetConstructorParams = | [signer?: Signer] diff --git a/typechain-types/factories/PCOLicenseClaimerFacet__factory.ts b/typechain-types/factories/PCOLicenseClaimerFacet__factory.ts index fcf69ca9..eec126d0 100644 --- a/typechain-types/factories/PCOLicenseClaimerFacet__factory.ts +++ b/typechain-types/factories/PCOLicenseClaimerFacet__factory.ts @@ -209,7 +209,7 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "_auctionEnd", + name: "auctionEnd", type: "uint256", }, ], @@ -222,7 +222,7 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "_auctionStart", + name: "auctionStart", type: "uint256", }, ], @@ -235,7 +235,7 @@ const _abi = [ inputs: [ { internalType: "address", - name: "_beacon", + name: "beacon", type: "address", }, ], @@ -248,7 +248,7 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "_endingBid", + name: "endingBid", type: "uint256", }, ], @@ -261,7 +261,7 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "_startingBid", + name: "startingBid", type: "uint256", }, ], @@ -273,7 +273,7 @@ const _abi = [ ]; const _bytecode = - "0x608060405234801561001057600080fd5b50612476806100206000396000f3fe60806040523480156200001157600080fd5b5060043610620001085760003560e01c8063644e979711620000a357806398dec6cc116200006e57806398dec6cc14620002515780639fcbf16b146200029c578063c250dc8b14620002b3578063d42afb5614620002db57600080fd5b8063644e979714620001e4578063738ce0ca14620001fb57806385c04d7a146200021257806387dc0c55146200023a57600080fd5b80631cbb2ce311620000e45780631cbb2ce314620001545780632d6b3a6b146200016b57806331b2ab2614620001b45780635ced333414620001cb57600080fd5b8062e8842c146200010d5780630556e9b91462000126578063181f4456146200013d575b600080fd5b620001246200011e36600462001a04565b620002f2565b005b620001246200013736600462001a54565b620003a8565b620001246200014e36600462001a54565b620003d6565b620001246200016536600462001a54565b620003f3565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc5546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b62000124620001c536600462001a84565b62000421565b620001d56200081b565b604051908152602001620001ab565b6000805160206200242183398151915254620001d5565b620001246200020c36600462001a54565b6200082c565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc454620001d5565b6000805160206200240183398151915254620001d5565b620001976200026236600462001a54565b60009081527f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc660205260409020546001600160a01b031690565b62000197620002ad36600462001b8b565b62000849565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc354620001d5565b62000124620002ec36600462001b8b565b620009b1565b620002fc620009fc565b600080516020620024218339815191529490945560008051602062002401833981519152929092557f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc3557f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc4557f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc580546001600160a01b0319166001600160a01b03909216919091179055565b620003b2620009fc565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc355565b620003e0620009fc565b6000805160206200242183398151915255565b620003fd620009fc565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc455565b600080516020620024218339815191527f6ee8bf8f33d87ee8fc792bdab0fa8c5d1fb2132b416aab215664bf4732bc299760006200045e62000a87565b905080861015620004ed5760405162461bcd60e51b815260206004820152604860248201527f50434f4c6963656e7365436c61696d657246616365743a20496e697469616c2060448201527f666f722073616c6520707269636520646f6573206e6f74206d656574207265716064820152671d5a5c995b595b9d60c21b608482015260a4015b60405180910390fd5b826001015442116200051b57815460018301546200051b916001600160a01b03918216913391168962000b28565b60006200052a33878762000b8a565b336000818152600687016020908152604080832054905194955091936200056b9392910160609290921b6001600160601b0319168252601482015260340190565b60408051601f198184030181529082905280516020909101206004870154909130916001600160a01b031690620005a29062001976565b6001600160a01b039283168152911660208201526040018190604051809103906000f5905080158015620005da573d6000803e3d6000fd5b50336000908152600687016020526040812080549293506001929091906200060490849062001bc1565b9091555050600082815260058601602052604080822080546001600160a01b0319166001600160a01b038581169190911790915560028701549151635b69006f60e11b81527fa9214cc96615e0085d3bb077758db69497dc2dce3b2b1e97bc93c3d18d83efd3600482015291169063b6d200de90602401602060405180830381865afa15801562000699573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620006bf919062001bdc565b60018601546040516346ccbfb760e11b81526001600160a01b039182166004820152600b8d900b602482015291925060009190831690638d997f6e90604401602060405180830381865afa1580156200071c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000742919062001bfc565b600187015490915062000761906001600160a01b031633858462000b28565b505060405163cdd42e9560e01b81523060048201819052602482015260448101839052336064820152600b8a900b608482015260a481018990526001600160a01b0382169063cdd42e959060c401600060405180830381600087803b158015620007ca57600080fd5b505af1158015620007df573d6000803e3d6000fd5b50506040513392508491507f97c7a37a01ea09716c8cd03bacec8d6db1e30927bfa2ff373e434b074f81775f90600090a3505050505050505050565b60006200082762000a87565b905090565b62000836620009fc565b6000805160206200240183398151915255565b6001600160a01b03811660009081527f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc7602090815260408083205490516001600160601b0319606086901b1692810192909252603482015260008051602062002421833981519152906001600160f81b03199030906054016040516020818303038152906040528051906020012060405180602001620008e99062001976565b601f1982820381018352601f90910116604081815260048701543060208401526001600160a01b03169082015260600160408051601f198184030181529082905262000939929160200162001c45565b604051602081830303815290604052805190602001206040516020016200099294939291906001600160f81b031994909416845260609290921b6001600160601b03191660018401526015830152603582015260550190565b60408051601f1981840301815291905280516020909101209392505050565b620009bb620009fc565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc580546001600160a01b0319166001600160a01b0392909216919091179055565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c600401546001600160a01b0316331462000a855760405162461bcd60e51b815260206004820152602260248201527f4c69624469616d6f6e643a204d75737420626520636f6e7472616374206f776e60448201526132b960f11b6064820152608401620004e4565b565b6000805160206200240183398151915254600090600080516020620024218339815191529042111562000abd5760030154919050565b805460009062000ace904262001c78565b905060008260000154836001015462000ae8919062001c78565b905060008183856002015462000aff919062001c92565b62000b0b919062001cca565b905080846002015462000b1f919062001c78565b94505050505090565b604080516001600160a01b0385811660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b17905262000b8490859062000bad565b50505050565b600062000b98838362000c8b565b905062000ba6848262000dcc565b9392505050565b600062000c04826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b031662000dec9092919063ffffffff16565b80519091501562000c86578080602001905181019062000c25919062001ce1565b62000c865760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401620004e4565b505050565b60008082511162000cfe5760405162461bcd60e51b815260206004820152603660248201527f4c696247656f57656250617263656c3a2050617468206d757374206861766520604482015275185d081b19585cdd081bdb994818dbdb5c1bdb995b9d60521b6064820152608401620004e4565b7f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f862000d2d6000858562000e05565b60028101546000908152600180830160209081526040909220805467ffffffffffffffff19166001600160401b0388161781558551909262000d76928401919087019062001984565b5060028201546040517f10b9af39155ed127f01ba5cd8b7893608d2619511eece37bbf623781af4d70de90600090a26002820180549350600190600062000dbe838762001bc1565b909155509295945050505050565b62000de88282604051806020016040528060008152506200106a565b5050565b606062000dfd8484600085620010a4565b949350505050565b60007f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f89050600083905060008084828151811062000e475762000e4762001d05565b60200260200101519050600080600062000e6a866001600160401b0316620011df565b600083815260208b8152604080832085845290915290205492955090935091505b60008b600281111562000ea25762000ea262001d1b565b0362000f2f5762000eb582600262001e30565b81161562000f1b5760405162461bcd60e51b815260206004820152602c60248201527f4c696247656f57656250617263656c3a20436f6f7264696e617465206973206e60448201526b6f7420617661696c61626c6560a01b6064820152608401620004e4565b62000f2882600262001e30565b1762000f5f565b60018b600281111562000f465762000f4662001d1b565b0362000f5f5760001962000f5c83600262001e30565b18165b60008062000f6d8762001279565b985090925090508162000fcc5762000f8760018962001bc1565b97508a51881062000f9a57505062001045565b8a888151811062000faf5762000faf62001d05565b6020026020010151965062000fc48762001279565b985090925090505b60008062000fe76001600160401b038c16848a8a8a620012ce565b929d50919750925090508782141580620010015750868114155b156200103757600088815260208d815260408083208a84528252808320979097558382528d815286822083835290529490942054935b909650945062000e8b915050565b6000938452602097885260408085209385529290975250902093909355505050505050565b620010768383620015c0565b6200108560008484846200176b565b62000c865760405162461bcd60e51b8152600401620004e49062001e3e565b606082471015620011075760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401620004e4565b6001600160a01b0385163b620011605760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401620004e4565b600080866001600160a01b031685876040516200117e919062001e90565b60006040518083038185875af1925050503d8060008114620011bd576040519150601f19603f3d011682016040523d82523d6000602084013e620011c2565b606091505b5091509150620011d482828662001877565b979650505050505050565b600080600080620011f085620018b5565b6001600160401b03169050600062001208866200191a565b6001600160401b031690506200122060108362001cca565b94506200122f60108262001cca565b935060006200124060108462001eae565b905060006200125160108462001eae565b9050816200126182601062001c92565b6200126d919062001bc1565b96989597505050505050565b60f881901c801515906000908190836200129b575060009150819050620012c7565b6003851692506001600160f81b03851660f8620012ba60018462001c78565b901b600282901c17925050505b9193909250565b6000806000806000620012e18a620018b5565b90506000620012f08b6200191a565b905088945087935086925089600003620013c0576200131160018262001ec5565b9050621fffff6001600160401b0382161115620013715760405162461bcd60e51b815260206004820152601d60248201527f446972656374696f6e2077656e7420746f6f20666172206e6f727468210000006044820152606401620004e4565b6200137e60108262001eea565b6001600160401b0316600003620013b3576200139c60018562001bc1565b9350620013ab60f08462001c78565b9250620015a0565b620013ab60108462001bc1565b896001036200147a576000816001600160401b031611620014245760405162461bcd60e51b815260206004820152601d60248201527f446972656374696f6e2077656e7420746f6f2066617220736f757468210000006044820152606401620004e4565b6200143160018262001f13565b90506200144060108262001eea565b6001600160401b0316600f036200146d576200145e60018562001c78565b9350620013ab60f08462001bc1565b620013ab60108462001c78565b896002036200150157623fffff6001600160401b03831610620014ab5760009450849150620013ab600f8462001c78565b620014b860018362001ec5565b9150620014c760108362001eea565b6001600160401b0316600003620014f457620014e560018662001bc1565b9450620013ab600f8462001c78565b620013ab60018462001bc1565b89600303620015a057816001600160401b03166000036200154757623fffff91506200152f60108362001f3e565b6001600160401b03169450620013ab600f8462001bc1565b6200155460018362001f13565b91506200156360108362001eea565b6001600160401b0316600f0362001590576200158160018662001c78565b9450620013ab600f8462001bc1565b6200159d60018462001c78565b92505b6020826001600160401b0316901b81179550505095509550955095915050565b6001600160a01b038216620016185760405162461bcd60e51b815260206004820181905260248201527f4552433732313a206d696e7420746f20746865207a65726f20616464726573736044820152606401620004e4565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25a60205260409020546001600160a01b0316156200169e5760405162461bcd60e51b815260206004820152601c60248201527f4552433732313a20746f6b656e20616c7265616479206d696e746564000000006044820152606401620004e4565b6001600160a01b03821660009081527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25b6020526040812080547f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25892600192916200170a90849062001bc1565b9091555050600082815260028201602052604080822080546001600160a01b0319166001600160a01b03871690811790915590518492907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef908290a4505050565b60006001600160a01b0384163b156200186e57604051630a85bd0160e11b81526001600160a01b0385169063150b7a0290620017b290339089908890889060040162001f95565b6020604051808303816000875af1925050508015620017f0575060408051601f3d908101601f19168201909252620017ed9181019062001fd4565b60015b62001853573d80801562001821576040519150601f19603f3d011682016040523d82523d6000602084013e62001826565b606091505b5080516000036200184b5760405162461bcd60e51b8152600401620004e49062001e3e565b805181602001fd5b6001600160e01b031916630a85bd0160e11b14905062000dfd565b50600162000dfd565b606083156200188857508162000ba6565b825115620018995782518084602001fd5b8160405162461bcd60e51b8152600401620004e4919062002000565b63ffffffff602082901c16623fffff811115620019155760405162461bcd60e51b815260206004820152601d60248201527f5820636f6f7264696e617465206973206f7574206f6620626f756e64730000006044820152606401620004e4565b919050565b63ffffffff8116621fffff811115620019155760405162461bcd60e51b815260206004820152601d60248201527f5920636f6f7264696e617465206973206f7574206f6620626f756e64730000006044820152606401620004e4565b6103eb806200201683390190565b828054828255906000526020600020908101928215620019c2579160200282015b82811115620019c2578251825591602001919060010190620019a5565b50620019d0929150620019d4565b5090565b5b80821115620019d05760008155600101620019d5565b6001600160a01b038116811462001a0157600080fd5b50565b600080600080600060a0868803121562001a1d57600080fd5b85359450602086013593506040860135925060608601359150608086013562001a4681620019eb565b809150509295509295909350565b60006020828403121562001a6757600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b6000806000806080858703121562001a9b57600080fd5b843580600b0b811462001aad57600080fd5b9350602085810135935060408601356001600160401b03808216821462001ad357600080fd5b9093506060870135908082111562001aea57600080fd5b818801915088601f83011262001aff57600080fd5b81358181111562001b145762001b1462001a6e565b8060051b604051601f19603f8301168101818110858211171562001b3c5762001b3c62001a6e565b60405291825284820192508381018501918b83111562001b5b57600080fd5b938501935b8285101562001b7b5784358452938501939285019262001b60565b989b979a50959850505050505050565b60006020828403121562001b9e57600080fd5b813562000ba681620019eb565b634e487b7160e01b600052601160045260246000fd5b6000821982111562001bd75762001bd762001bab565b500190565b60006020828403121562001bef57600080fd5b815162000ba681620019eb565b60006020828403121562001c0f57600080fd5b5051919050565b60005b8381101562001c3357818101518382015260200162001c19565b8381111562000b845750506000910152565b6000835162001c5981846020880162001c16565b83519083019062001c6f81836020880162001c16565b01949350505050565b60008282101562001c8d5762001c8d62001bab565b500390565b600081600019048311821515161562001caf5762001caf62001bab565b500290565b634e487b7160e01b600052601260045260246000fd5b60008262001cdc5762001cdc62001cb4565b500490565b60006020828403121562001cf457600080fd5b8151801515811462000ba657600080fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052602160045260246000fd5b600181815b8085111562001d7257816000190482111562001d565762001d5662001bab565b8085161562001d6457918102915b93841c939080029062001d36565b509250929050565b60008262001d8b5750600162001e2a565b8162001d9a5750600062001e2a565b816001811462001db3576002811462001dbe5762001dde565b600191505062001e2a565b60ff84111562001dd25762001dd262001bab565b50506001821b62001e2a565b5060208310610133831016604e8410600b841016171562001e03575081810a62001e2a565b62001e0f838362001d31565b806000190482111562001e265762001e2662001bab565b0290505b92915050565b600062000ba6838362001d7a565b60208082526032908201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560408201527131b2b4bb32b91034b6b83632b6b2b73a32b960711b606082015260800190565b6000825162001ea481846020870162001c16565b9190910192915050565b60008262001ec05762001ec062001cb4565b500690565b60006001600160401b0380831681851680830382111562001c6f5762001c6f62001bab565b60006001600160401b038084168062001f075762001f0762001cb4565b92169190910692915050565b60006001600160401b038381169083168181101562001f365762001f3662001bab565b039392505050565b60006001600160401b038084168062001f5b5762001f5b62001cb4565b92169190910492915050565b6000815180845262001f8181602086016020860162001c16565b601f01601f19169290920160200192915050565b6001600160a01b038581168252841660208201526040810183905260806060820181905260009062001fca9083018462001f67565b9695505050505050565b60006020828403121562001fe757600080fd5b81516001600160e01b03198116811462000ba657600080fd5b60208152600062000ba6602083018462001f6756fe60806040526040516103eb3803806103eb8339810160408190526100229161013d565b6100358261004f60201b6101291760201c565b610048816100e460201b6101be1760201c565b5050610177565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c132080546001600160a01b031981166001600160a01b038481169182179093556040517fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c939092169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3505050565b7f5e00cdf5c1893326764dad3c20a33374e89545ec2d5f6a96396c2e00569864d680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b038116811461013a57600080fd5b50565b6000806040838503121561015057600080fd5b825161015b81610125565b602084015190925061016c81610125565b809150509250929050565b610265806101866000396000f3fe60806040523661000b57005b60007f5e00cdf5c1893326764dad3c20a33374e89545ec2d5f6a96396c2e00569864d680546040516366ffd66360e11b8152600080356001600160e01b03191660048301529293506001600160a01b039091169063cdffacc690602401602060405180830381865afa158015610085573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100a991906101ff565b90506001600160a01b0381166101055760405162461bcd60e51b815260206004820181905260248201527f4469616d6f6e643a2046756e6374696f6e20646f6573206e6f74206578697374604482015260640160405180910390fd5b3660008037600080366000845af43d6000803e808015610124573d6000f35b3d6000fd5b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c132080546001600160a01b031981166001600160a01b038481169182179093556040517fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c939092169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3505050565b7f5e00cdf5c1893326764dad3c20a33374e89545ec2d5f6a96396c2e00569864d680546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561021157600080fd5b81516001600160a01b038116811461022857600080fd5b939250505056fea2646970667358221220fa26deb6877612b343376352fc4dc48f499847386bd6bc5a0bf415b7f864360864736f6c634300080e00333b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc23b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc1a26469706673582212203de756e93dd93a936d192467032800af6d727a6edf993a3c82e8937146d3cfff64736f6c634300080e0033"; + "0x608060405234801561001057600080fd5b50612472806100206000396000f3fe60806040523480156200001157600080fd5b5060043610620001085760003560e01c8063644e979711620000a357806398dec6cc116200006e57806398dec6cc14620002515780639fcbf16b146200029c578063c250dc8b14620002b3578063d42afb5614620002db57600080fd5b8063644e979714620001e4578063738ce0ca14620001fb57806385c04d7a146200021257806387dc0c55146200023a57600080fd5b80631cbb2ce311620000e45780631cbb2ce314620001545780632d6b3a6b146200016b57806331b2ab2614620001b45780635ced333414620001cb57600080fd5b8062e8842c146200010d5780630556e9b91462000126578063181f4456146200013d575b600080fd5b620001246200011e36600462001a00565b620002f2565b005b620001246200013736600462001a50565b620003a8565b620001246200014e36600462001a50565b620003d6565b620001246200016536600462001a50565b620003f3565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc5546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b62000124620001c536600462001a80565b62000421565b620001d56200081b565b604051908152602001620001ab565b6000805160206200241d83398151915254620001d5565b620001246200020c36600462001a50565b6200082c565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc454620001d5565b600080516020620023fd83398151915254620001d5565b620001976200026236600462001a50565b60009081527f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc660205260409020546001600160a01b031690565b62000197620002ad36600462001b87565b62000849565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc354620001d5565b62000124620002ec36600462001b87565b620009b1565b620002fc620009fc565b6000805160206200241d83398151915294909455600080516020620023fd833981519152929092557f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc3557f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc4557f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc580546001600160a01b0319166001600160a01b03909216919091179055565b620003b2620009fc565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc355565b620003e0620009fc565b6000805160206200241d83398151915255565b620003fd620009fc565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc455565b6000805160206200241d8339815191527f6ee8bf8f33d87ee8fc792bdab0fa8c5d1fb2132b416aab215664bf4732bc299760006200045e62000a87565b905080861015620004ed5760405162461bcd60e51b815260206004820152604860248201527f50434f4c6963656e7365436c61696d657246616365743a20496e697469616c2060448201527f666f722073616c6520707269636520646f6573206e6f74206d656574207265716064820152671d5a5c995b595b9d60c21b608482015260a4015b60405180910390fd5b826001015442116200051b57815460018301546200051b916001600160a01b03918216913391168962000b28565b60006200052a33878762000b8a565b336000818152600687016020908152604080832054905194955091936200056b9392910160609290921b6001600160601b0319168252601482015260340190565b60408051601f198184030181529082905280516020909101206004870154909130916001600160a01b031690620005a29062001972565b6001600160a01b039283168152911660208201526040018190604051809103906000f5905080158015620005da573d6000803e3d6000fd5b50336000908152600687016020526040812080549293506001929091906200060490849062001bbd565b9091555050600082815260058601602052604080822080546001600160a01b0319166001600160a01b038581169190911790915560028701549151635b69006f60e11b81527fa9214cc96615e0085d3bb077758db69497dc2dce3b2b1e97bc93c3d18d83efd3600482015291169063b6d200de90602401602060405180830381865afa15801562000699573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620006bf919062001bd8565b60018601546040516346ccbfb760e11b81526001600160a01b039182166004820152600b8d900b602482015291925060009190831690638d997f6e90604401602060405180830381865afa1580156200071c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000742919062001bf8565b600187015490915062000761906001600160a01b031633858462000b28565b505060405163cdd42e9560e01b81523060048201819052602482015260448101839052336064820152600b8a900b608482015260a481018990526001600160a01b0382169063cdd42e959060c401600060405180830381600087803b158015620007ca57600080fd5b505af1158015620007df573d6000803e3d6000fd5b50506040513392508491507f97c7a37a01ea09716c8cd03bacec8d6db1e30927bfa2ff373e434b074f81775f90600090a3505050505050505050565b60006200082762000a87565b905090565b62000836620009fc565b600080516020620023fd83398151915255565b6001600160a01b03811660009081527f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc7602090815260408083205490516001600160601b0319606086901b169281019290925260348201526000805160206200241d833981519152906001600160f81b03199030906054016040516020818303038152906040528051906020012060405180602001620008e99062001972565b601f1982820381018352601f90910116604081815260048701543060208401526001600160a01b03169082015260600160408051601f198184030181529082905262000939929160200162001c41565b604051602081830303815290604052805190602001206040516020016200099294939291906001600160f81b031994909416845260609290921b6001600160601b03191660018401526015830152603582015260550190565b60408051601f1981840301815291905280516020909101209392505050565b620009bb620009fc565b7f3b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc580546001600160a01b0319166001600160a01b0392909216919091179055565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c600401546001600160a01b0316331462000a855760405162461bcd60e51b815260206004820152602260248201527f4c69624469616d6f6e643a204d75737420626520636f6e7472616374206f776e60448201526132b960f11b6064820152608401620004e4565b565b600080516020620023fd833981519152546000906000805160206200241d8339815191529042111562000abd5760030154919050565b805460009062000ace904262001c74565b905060008260000154836001015462000ae8919062001c74565b905060008183856002015462000aff919062001c8e565b62000b0b919062001cc6565b905080846002015462000b1f919062001c74565b94505050505090565b604080516001600160a01b0385811660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b17905262000b8490859062000bad565b50505050565b600062000b98838362000c8b565b905062000ba6848262000dcc565b9392505050565b600062000c04826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b031662000dec9092919063ffffffff16565b80519091501562000c86578080602001905181019062000c25919062001cdd565b62000c865760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401620004e4565b505050565b60008082511162000cfe5760405162461bcd60e51b815260206004820152603660248201527f4c696247656f57656250617263656c3a2050617468206d757374206861766520604482015275185d081b19585cdd081bdb994818dbdb5c1bdb995b9d60521b6064820152608401620004e4565b7f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f862000d2d6000858562000e05565b60028101546000908152600180830160209081526040909220805467ffffffffffffffff19166001600160401b0388161781558551909262000d76928401919087019062001980565b5060028201546040517f10b9af39155ed127f01ba5cd8b7893608d2619511eece37bbf623781af4d70de90600090a26002820180549350600190600062000dbe838762001bbd565b909155509295945050505050565b62000de88282604051806020016040528060008152506200106a565b5050565b606062000dfd8484600085620010a4565b949350505050565b60007f1d99a33cbbd99d244d8804dd6e7f77acb60cc0c0934fe2f7b00cabddc4b4b0f89050600083905060008084828151811062000e475762000e4762001d01565b60200260200101519050600080600062000e6a866001600160401b0316620011df565b600083815260208b8152604080832085845290915290205492955090935091505b60008b600281111562000ea25762000ea262001d17565b0362000f2f5762000eb582600262001e2c565b81161562000f1b5760405162461bcd60e51b815260206004820152602c60248201527f4c696247656f57656250617263656c3a20436f6f7264696e617465206973206e60448201526b6f7420617661696c61626c6560a01b6064820152608401620004e4565b62000f2882600262001e2c565b1762000f5f565b60018b600281111562000f465762000f4662001d17565b0362000f5f5760001962000f5c83600262001e2c565b18165b60008062000f6d8762001279565b985090925090508162000fcc5762000f8760018962001bbd565b97508a51881062000f9a57505062001045565b8a888151811062000faf5762000faf62001d01565b6020026020010151965062000fc48762001279565b985090925090505b60008062000fe76001600160401b038c16848a8a8a620012ce565b929d50919750925090508782141580620010015750868114155b156200103757600088815260208d815260408083208a84528252808320979097558382528d815286822083835290529490942054935b909650945062000e8b915050565b6000938452602097885260408085209385529290975250902093909355505050505050565b620010768383620015bc565b62001085600084848462001767565b62000c865760405162461bcd60e51b8152600401620004e49062001e3a565b606082471015620011075760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401620004e4565b6001600160a01b0385163b620011605760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401620004e4565b600080866001600160a01b031685876040516200117e919062001e8c565b60006040518083038185875af1925050503d8060008114620011bd576040519150601f19603f3d011682016040523d82523d6000602084013e620011c2565b606091505b5091509150620011d482828662001873565b979650505050505050565b600080600080620011f085620018b1565b6001600160401b031690506000620012088662001916565b6001600160401b031690506200122060108362001cc6565b94506200122f60108262001cc6565b935060006200124060108462001eaa565b905060006200125160108462001eaa565b9050816200126182601062001c8e565b6200126d919062001bbd565b96989597505050505050565b60f881901c801515906000908190836200129b575060009150819050620012c7565b6003851692506001600160f81b03851660f8620012ba60018462001c74565b901b600282901c17925050505b9193909250565b6000806000806000620012e18a620018b1565b90506000620012f08b62001916565b905089600003620013b7576200130860018262001ec1565b9050621fffff6001600160401b0382161115620013685760405162461bcd60e51b815260206004820152601d60248201527f446972656374696f6e2077656e7420746f6f20666172206e6f727468210000006044820152606401620004e4565b6200137560108262001ee6565b6001600160401b0316600003620013aa576200139360018962001bbd565b9750620013a260f08862001c74565b965062001597565b620013a260108862001bbd565b8960010362001471576000816001600160401b0316116200141b5760405162461bcd60e51b815260206004820152601d60248201527f446972656374696f6e2077656e7420746f6f2066617220736f757468210000006044820152606401620004e4565b6200142860018262001f0f565b90506200143760108262001ee6565b6001600160401b0316600f0362001464576200145560018962001c74565b9750620013a260f08862001bbd565b620013a260108862001c74565b89600203620014f857623fffff6001600160401b03831610620014a25760009850889150620013a2600f8862001c74565b620014af60018362001ec1565b9150620014be60108362001ee6565b6001600160401b0316600003620014eb57620014dc60018a62001bbd565b9850620013a2600f8862001c74565b620013a260018862001bbd565b896003036200159757816001600160401b03166000036200153e57623fffff91506200152660108362001f3a565b6001600160401b03169850620013a2600f8862001bbd565b6200154b60018362001f0f565b91506200155a60108362001ee6565b6001600160401b0316600f0362001587576200157860018a62001c74565b9850620013a2600f8862001bbd565b6200159460018862001c74565b96505b60209190911b6bffffffffffffffff0000000016179996985094965092949350505050565b6001600160a01b038216620016145760405162461bcd60e51b815260206004820181905260248201527f4552433732313a206d696e7420746f20746865207a65726f20616464726573736044820152606401620004e4565b60008181527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25a60205260409020546001600160a01b0316156200169a5760405162461bcd60e51b815260206004820152601c60248201527f4552433732313a20746f6b656e20616c7265616479206d696e746564000000006044820152606401620004e4565b6001600160a01b03821660009081527f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25b6020526040812080547f0a8995bbdd46f9746786f007089f3b619f2ad0fc5dfe298d61305940ef1ce25892600192916200170690849062001bbd565b9091555050600082815260028201602052604080822080546001600160a01b0319166001600160a01b03871690811790915590518492907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef908290a4505050565b60006001600160a01b0384163b156200186a57604051630a85bd0160e11b81526001600160a01b0385169063150b7a0290620017ae90339089908890889060040162001f91565b6020604051808303816000875af1925050508015620017ec575060408051601f3d908101601f19168201909252620017e99181019062001fd0565b60015b6200184f573d8080156200181d576040519150601f19603f3d011682016040523d82523d6000602084013e62001822565b606091505b508051600003620018475760405162461bcd60e51b8152600401620004e49062001e3a565b805181602001fd5b6001600160e01b031916630a85bd0160e11b14905062000dfd565b50600162000dfd565b606083156200188457508162000ba6565b825115620018955782518084602001fd5b8160405162461bcd60e51b8152600401620004e4919062001ffc565b63ffffffff602082901c16623fffff811115620019115760405162461bcd60e51b815260206004820152601d60248201527f5820636f6f7264696e617465206973206f7574206f6620626f756e64730000006044820152606401620004e4565b919050565b63ffffffff8116621fffff811115620019115760405162461bcd60e51b815260206004820152601d60248201527f5920636f6f7264696e617465206973206f7574206f6620626f756e64730000006044820152606401620004e4565b6103eb806200201283390190565b828054828255906000526020600020908101928215620019be579160200282015b82811115620019be578251825591602001919060010190620019a1565b50620019cc929150620019d0565b5090565b5b80821115620019cc5760008155600101620019d1565b6001600160a01b0381168114620019fd57600080fd5b50565b600080600080600060a0868803121562001a1957600080fd5b85359450602086013593506040860135925060608601359150608086013562001a4281620019e7565b809150509295509295909350565b60006020828403121562001a6357600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b6000806000806080858703121562001a9757600080fd5b843580600b0b811462001aa957600080fd5b9350602085810135935060408601356001600160401b03808216821462001acf57600080fd5b9093506060870135908082111562001ae657600080fd5b818801915088601f83011262001afb57600080fd5b81358181111562001b105762001b1062001a6a565b8060051b604051601f19603f8301168101818110858211171562001b385762001b3862001a6a565b60405291825284820192508381018501918b83111562001b5757600080fd5b938501935b8285101562001b775784358452938501939285019262001b5c565b989b979a50959850505050505050565b60006020828403121562001b9a57600080fd5b813562000ba681620019e7565b634e487b7160e01b600052601160045260246000fd5b6000821982111562001bd35762001bd362001ba7565b500190565b60006020828403121562001beb57600080fd5b815162000ba681620019e7565b60006020828403121562001c0b57600080fd5b5051919050565b60005b8381101562001c2f57818101518382015260200162001c15565b8381111562000b845750506000910152565b6000835162001c5581846020880162001c12565b83519083019062001c6b81836020880162001c12565b01949350505050565b60008282101562001c895762001c8962001ba7565b500390565b600081600019048311821515161562001cab5762001cab62001ba7565b500290565b634e487b7160e01b600052601260045260246000fd5b60008262001cd85762001cd862001cb0565b500490565b60006020828403121562001cf057600080fd5b8151801515811462000ba657600080fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052602160045260246000fd5b600181815b8085111562001d6e57816000190482111562001d525762001d5262001ba7565b8085161562001d6057918102915b93841c939080029062001d32565b509250929050565b60008262001d875750600162001e26565b8162001d965750600062001e26565b816001811462001daf576002811462001dba5762001dda565b600191505062001e26565b60ff84111562001dce5762001dce62001ba7565b50506001821b62001e26565b5060208310610133831016604e8410600b841016171562001dff575081810a62001e26565b62001e0b838362001d2d565b806000190482111562001e225762001e2262001ba7565b0290505b92915050565b600062000ba6838362001d76565b60208082526032908201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560408201527131b2b4bb32b91034b6b83632b6b2b73a32b960711b606082015260800190565b6000825162001ea081846020870162001c12565b9190910192915050565b60008262001ebc5762001ebc62001cb0565b500690565b60006001600160401b0380831681851680830382111562001c6b5762001c6b62001ba7565b60006001600160401b038084168062001f035762001f0362001cb0565b92169190910692915050565b60006001600160401b038381169083168181101562001f325762001f3262001ba7565b039392505050565b60006001600160401b038084168062001f575762001f5762001cb0565b92169190910492915050565b6000815180845262001f7d81602086016020860162001c12565b601f01601f19169290920160200192915050565b6001600160a01b038581168252841660208201526040810183905260806060820181905260009062001fc69083018462001f63565b9695505050505050565b60006020828403121562001fe357600080fd5b81516001600160e01b03198116811462000ba657600080fd5b60208152600062000ba6602083018462001f6356fe60806040526040516103eb3803806103eb8339810160408190526100229161013d565b6100358261004f60201b6101291760201c565b610048816100e460201b6101be1760201c565b5050610177565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c132080546001600160a01b031981166001600160a01b038481169182179093556040517fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c939092169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3505050565b7f5e00cdf5c1893326764dad3c20a33374e89545ec2d5f6a96396c2e00569864d680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b038116811461013a57600080fd5b50565b6000806040838503121561015057600080fd5b825161015b81610125565b602084015190925061016c81610125565b809150509250929050565b610265806101866000396000f3fe60806040523661000b57005b60007f5e00cdf5c1893326764dad3c20a33374e89545ec2d5f6a96396c2e00569864d680546040516366ffd66360e11b8152600080356001600160e01b03191660048301529293506001600160a01b039091169063cdffacc690602401602060405180830381865afa158015610085573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100a991906101ff565b90506001600160a01b0381166101055760405162461bcd60e51b815260206004820181905260248201527f4469616d6f6e643a2046756e6374696f6e20646f6573206e6f74206578697374604482015260640160405180910390fd5b3660008037600080366000845af43d6000803e808015610124573d6000f35b3d6000fd5b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c132080546001600160a01b031981166001600160a01b038481169182179093556040517fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c939092169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3505050565b7f5e00cdf5c1893326764dad3c20a33374e89545ec2d5f6a96396c2e00569864d680546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561021157600080fd5b81516001600160a01b038116811461022857600080fd5b939250505056fea264697066735822122027f9d6cde67ee10d47e335027ec867b92970d80f4025786443b65ed748d6415864736f6c634300080e00333b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc23b663854d6275cb61693c120edcaa0245b186f0d96cfc1f673910ff9abaa8bc1a264697066735822122054f38125297154708b163e64394d07cde2e7e702ce9c69896df1f63b328865f264736f6c634300080e0033"; type PCOLicenseClaimerFacetConstructorParams = | [signer?: Signer] diff --git a/typechain-types/factories/PCOLicenseDiamond__factory.ts b/typechain-types/factories/PCOLicenseDiamond__factory.ts index 7f4cd8e1..a301edb0 100644 --- a/typechain-types/factories/PCOLicenseDiamond__factory.ts +++ b/typechain-types/factories/PCOLicenseDiamond__factory.ts @@ -128,12 +128,12 @@ const _abi = [ }, { internalType: "contract IERC721", - name: "_license", + name: "initLicense", type: "address", }, { internalType: "uint256", - name: "_licenseId", + name: "initLicenseId", type: "uint256", }, { diff --git a/typechain-types/factories/PCOLicenseParamsFacet__factory.ts b/typechain-types/factories/PCOLicenseParamsFacet__factory.ts index fbacf131..b471d0d2 100644 --- a/typechain-types/factories/PCOLicenseParamsFacet__factory.ts +++ b/typechain-types/factories/PCOLicenseParamsFacet__factory.ts @@ -299,7 +299,7 @@ const _abi = [ ]; const _bytecode = - "0x608060405234801561001057600080fd5b506106b1806100206000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c806373a29931116100ad578063a3cecf8311610071578063a3cecf8314610210578063bf7cdf6d14610223578063c13ed2ec14610236578063c85e0be21461023e578063d41c3a651461025157600080fd5b806373a29931146101c757806377742126146101da5780637c627e1b146101ed5780637d51ce9014610200578063801c5b1e1461020857600080fd5b8063229f2e4d116100f4578063229f2e4d1461017e5780634d73f0b414610191578063520aa8ee146101a4578063565a2e2c146101ac5780636a326ab1146101b457600080fd5b8063014df4141461012657806316a31026146101415780631c31f7101461014957806320bc44251461015e575b600080fd5b61012e610259565b6040519081526020015b60405180910390f35b61012e61026e565b61015c6101573660046105bd565b610283565b005b6101666102b7565b6040516001600160a01b039091168152602001610138565b61015c61018c3660046105e1565b6102d5565b61015c61019f366004610662565b610351565b61012e61036d565b610166610382565b61015c6101c23660046105bd565b61039d565b61015c6101d5366004610662565b6103d4565b61015c6101e8366004610662565b6103f0565b61015c6101fb366004610662565b61040c565b61012e610428565b61012e61043d565b61015c61021e366004610662565b610452565b61015c610231366004610662565b61046e565b61012e61048a565b61015c61024c3660046105bd565b61049f565b6101666104d6565b6000806102646104f4565b6004015492915050565b6000806102796104f4565b6003015492915050565b61028b610518565b60006102956104f4565b80546001600160a01b0319166001600160a01b03939093169290921790915550565b6000806102c26104f4565b600201546001600160a01b031692915050565b6102dd610518565b60006102e76104f4565b80546001600160a01b039b8c166001600160a01b03199182161782556001820180549b8d169b82169b909b17909a5560028101805499909b169890991697909717909855600387019490945560048601929092556005850155600684015560078301555060080155565b610359610518565b60006103636104f4565b6004019190915550565b6000806103786104f4565b6008015492915050565b60008061038d6104f4565b546001600160a01b031692915050565b6103a5610518565b60006103af6104f4565b60010180546001600160a01b0319166001600160a01b03939093169290921790915550565b6103dc610518565b60006103e66104f4565b6005019190915550565b6103f8610518565b60006104026104f4565b6008019190915550565b610414610518565b600061041e6104f4565b6006019190915550565b6000806104336104f4565b6006015492915050565b6000806104486104f4565b6007015492915050565b61045a610518565b60006104646104f4565b6003019190915550565b610476610518565b60006104806104f4565b6007019190915550565b6000806104956104f4565b6005015492915050565b6104a7610518565b60006104b16104f4565b60020180546001600160a01b0319166001600160a01b03939093169290921790915550565b6000806104e16104f4565b600101546001600160a01b031692915050565b7f6ee8bf8f33d87ee8fc792bdab0fa8c5d1fb2132b416aab215664bf4732bc299790565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c600401546001600160a01b031633146105a35760405162461bcd60e51b815260206004820152602260248201527f4c69624469616d6f6e643a204d75737420626520636f6e7472616374206f776e60448201526132b960f11b606482015260840160405180910390fd5b565b6001600160a01b03811681146105ba57600080fd5b50565b6000602082840312156105cf57600080fd5b81356105da816105a5565b9392505050565b60008060008060008060008060006101208a8c03121561060057600080fd5b893561060b816105a5565b985060208a013561061b816105a5565b975060408a013561062b816105a5565b989b979a5097986060810135985060808101359760a0820135975060c0820135965060e08201359550610100909101359350915050565b60006020828403121561067457600080fd5b503591905056fea2646970667358221220e43e5378f81db7b101e775e0ade5eb348d9165bf76e438ef51ac42b90526981b64736f6c634300080e0033"; + "0x608060405234801561001057600080fd5b506106b1806100206000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c806373a29931116100ad578063a3cecf8311610071578063a3cecf8314610210578063bf7cdf6d14610223578063c13ed2ec14610236578063c85e0be21461023e578063d41c3a651461025157600080fd5b806373a29931146101c757806377742126146101da5780637c627e1b146101ed5780637d51ce9014610200578063801c5b1e1461020857600080fd5b8063229f2e4d116100f4578063229f2e4d1461017e5780634d73f0b414610191578063520aa8ee146101a4578063565a2e2c146101ac5780636a326ab1146101b457600080fd5b8063014df4141461012657806316a31026146101415780631c31f7101461014957806320bc44251461015e575b600080fd5b61012e610259565b6040519081526020015b60405180910390f35b61012e61026e565b61015c6101573660046105bd565b610283565b005b6101666102b7565b6040516001600160a01b039091168152602001610138565b61015c61018c3660046105e1565b6102d5565b61015c61019f366004610662565b610351565b61012e61036d565b610166610382565b61015c6101c23660046105bd565b61039d565b61015c6101d5366004610662565b6103d4565b61015c6101e8366004610662565b6103f0565b61015c6101fb366004610662565b61040c565b61012e610428565b61012e61043d565b61015c61021e366004610662565b610452565b61015c610231366004610662565b61046e565b61012e61048a565b61015c61024c3660046105bd565b61049f565b6101666104d6565b6000806102646104f4565b6004015492915050565b6000806102796104f4565b6003015492915050565b61028b610518565b60006102956104f4565b80546001600160a01b0319166001600160a01b03939093169290921790915550565b6000806102c26104f4565b600201546001600160a01b031692915050565b6102dd610518565b60006102e76104f4565b80546001600160a01b039b8c166001600160a01b03199182161782556001820180549b8d169b82169b909b17909a5560028101805499909b169890991697909717909855600387019490945560048601929092556005850155600684015560078301555060080155565b610359610518565b60006103636104f4565b6004019190915550565b6000806103786104f4565b6008015492915050565b60008061038d6104f4565b546001600160a01b031692915050565b6103a5610518565b60006103af6104f4565b60010180546001600160a01b0319166001600160a01b03939093169290921790915550565b6103dc610518565b60006103e66104f4565b6005019190915550565b6103f8610518565b60006104026104f4565b6008019190915550565b610414610518565b600061041e6104f4565b6006019190915550565b6000806104336104f4565b6006015492915050565b6000806104486104f4565b6007015492915050565b61045a610518565b60006104646104f4565b6003019190915550565b610476610518565b60006104806104f4565b6007019190915550565b6000806104956104f4565b6005015492915050565b6104a7610518565b60006104b16104f4565b60020180546001600160a01b0319166001600160a01b03939093169290921790915550565b6000806104e16104f4565b600101546001600160a01b031692915050565b7f6ee8bf8f33d87ee8fc792bdab0fa8c5d1fb2132b416aab215664bf4732bc299790565b7fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c600401546001600160a01b031633146105a35760405162461bcd60e51b815260206004820152602260248201527f4c69624469616d6f6e643a204d75737420626520636f6e7472616374206f776e60448201526132b960f11b606482015260840160405180910390fd5b565b6001600160a01b03811681146105ba57600080fd5b50565b6000602082840312156105cf57600080fd5b81356105da816105a5565b9392505050565b60008060008060008060008060006101208a8c03121561060057600080fd5b893561060b816105a5565b985060208a013561061b816105a5565b975060408a013561062b816105a5565b989b979a5097986060810135985060808101359760a0820135975060c0820135965060e08201359550610100909101359350915050565b60006020828403121561067457600080fd5b503591905056fea2646970667358221220fb02714da3414183374319f50fb521c04d4668aca2b63a21a55ca3d4a297124264736f6c634300080e0033"; type PCOLicenseParamsFacetConstructorParams = | [signer?: Signer] diff --git a/typechain-types/factories/RegistryDiamond__factory.ts b/typechain-types/factories/RegistryDiamond__factory.ts index 9949245c..8ebbf083 100644 --- a/typechain-types/factories/RegistryDiamond__factory.ts +++ b/typechain-types/factories/RegistryDiamond__factory.ts @@ -145,12 +145,12 @@ const _abi = [ inputs: [ { internalType: "string", - name: "_name", + name: "initName", type: "string", }, { internalType: "string", - name: "_symbol", + name: "initSymbol", type: "string", }, ], @@ -691,7 +691,7 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "_auctionEnd", + name: "auctionEnd", type: "uint256", }, ], @@ -704,7 +704,7 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "_auctionStart", + name: "auctionStart", type: "uint256", }, ], @@ -717,7 +717,7 @@ const _abi = [ inputs: [ { internalType: "address", - name: "_beacon", + name: "beacon", type: "address", }, ], @@ -730,7 +730,7 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "_endingBid", + name: "endingBid", type: "uint256", }, ], @@ -743,7 +743,7 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "_startingBid", + name: "startingBid", type: "uint256", }, ],