Skip to content

Commit

Permalink
Merge branch 'dev' into ab564-variableShare
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xPilou
0xPilou committed Oct 9, 2023
2 parents ebff8ee + b57ee48 commit ab01161
Show file tree
Hide file tree
Showing 4 changed files with 1,247 additions and 0 deletions.
242 changes: 242 additions & 0 deletions forge-cache/solidity-files-cache.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6089,6 +6089,66 @@
}
}
},
"src/token/ERC721/ERC721ABOE.sol": {
"lastModificationDate": 1696322758850,
"contentHash": "f31648078435acf839a046f667fd03c2",
"sourceName": "src/token/ERC721/ERC721ABOE.sol",
"solcConfig": {
"settings": {
"optimizer": {
"enabled": true,
"runs": 200
},
"metadata": {
"useLiteralContent": false,
"bytecodeHash": "ipfs",
"appendCBOR": true
},
"outputSelection": {
"*": {
"": [
"ast"
],
"*": [
"abi",
"evm.bytecode",
"evm.deployedBytecode",
"evm.methodIdentifiers",
"metadata"
]
}
},
"evmVersion": "paris",
"libraries": {}
}
},
"imports": [
"lib/ERC721A-Upgradeable/contracts/ERC721AStorage.sol",
"lib/ERC721A-Upgradeable/contracts/ERC721AUpgradeable.sol",
"lib/ERC721A-Upgradeable/contracts/ERC721A__Initializable.sol",
"lib/ERC721A-Upgradeable/contracts/ERC721A__InitializableStorage.sol",
"lib/ERC721A-Upgradeable/contracts/IERC721AUpgradeable.sol",
"lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol",
"lib/openzeppelin-contracts/contracts/utils/Strings.sol",
"lib/openzeppelin-contracts/contracts/utils/math/Math.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/utils/AddressUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/utils/ContextUpgradeable.sol",
"src/libraries/ABDataTypes.sol",
"src/libraries/ABErrors.sol",
"src/libraries/ABEvents.sol",
"src/token/ERC721/ERC721AB.sol",
"src/utils/IABDataRegistry.sol",
"src/utils/IABVerifier.sol"
],
"versionRequirement": "^0.8.18",
"artifacts": {
"ERC721ABOE": {
"0.8.19+commit.7dd6d404.Darwin.appleclang": "ERC721ABOE.sol/ERC721ABOE.json"
}
}
},
"src/utils/ABDataRegistry.sol": {
"lastModificationDate": 1695289811280,
"contentHash": "01daae19991c3d298a84da11cea6a548",
Expand Down Expand Up @@ -6706,6 +6766,47 @@
}
}
},
"test/_testdata/ERC721ABOE.td.sol": {
"lastModificationDate": 1695714837972,
"contentHash": "0788ecee578ed53f129ab21f714a4788",
"sourceName": "test/_testdata/ERC721ABOE.td.sol",
"solcConfig": {
"settings": {
"optimizer": {
"enabled": true,
"runs": 200
},
"metadata": {
"useLiteralContent": false,
"bytecodeHash": "ipfs",
"appendCBOR": true
},
"outputSelection": {
"*": {
"": [
"ast"
],
"*": [
"abi",
"evm.bytecode",
"evm.deployedBytecode",
"evm.methodIdentifiers",
"metadata"
]
}
},
"evmVersion": "paris",
"libraries": {}
}
},
"imports": [],
"versionRequirement": "^0.8.18",
"artifacts": {
"ERC721ABOETestData": {
"0.8.19+commit.7dd6d404.Darwin.appleclang": "ERC721ABOE.td.sol/ERC721ABOETestData.json"
}
}
},
"test/factory/AnotherCloneFactory.t.sol": {
"lastModificationDate": 1695887552259,
"contentHash": "28aa74940b4b4cac784b2cc9b9a6d370",
Expand Down Expand Up @@ -7253,6 +7354,147 @@
}
}
},
"test/token/ERC721/ERC721ABOE.t.sol": {
"lastModificationDate": 1696324340850,
"contentHash": "a7b541a46d9274042a34a4f4a02dbbde",
"sourceName": "test/token/ERC721/ERC721ABOE.t.sol",
"solcConfig": {
"settings": {
"optimizer": {
"enabled": true,
"runs": 200
},
"metadata": {
"useLiteralContent": false,
"bytecodeHash": "ipfs",
"appendCBOR": true
},
"outputSelection": {
"*": {
"": [
"ast"
],
"*": [
"abi",
"evm.bytecode",
"evm.deployedBytecode",
"evm.methodIdentifiers",
"metadata"
]
}
},
"evmVersion": "paris",
"libraries": {}
}
},
"imports": [
"lib/ERC721A-Upgradeable/contracts/ERC721AStorage.sol",
"lib/ERC721A-Upgradeable/contracts/ERC721AUpgradeable.sol",
"lib/ERC721A-Upgradeable/contracts/ERC721A__Initializable.sol",
"lib/ERC721A-Upgradeable/contracts/ERC721A__InitializableStorage.sol",
"lib/ERC721A-Upgradeable/contracts/IERC721AUpgradeable.sol",
"lib/forge-std/lib/ds-test/src/test.sol",
"lib/forge-std/src/Base.sol",
"lib/forge-std/src/StdAssertions.sol",
"lib/forge-std/src/StdChains.sol",
"lib/forge-std/src/StdCheats.sol",
"lib/forge-std/src/StdError.sol",
"lib/forge-std/src/StdInvariant.sol",
"lib/forge-std/src/StdJson.sol",
"lib/forge-std/src/StdMath.sol",
"lib/forge-std/src/StdStorage.sol",
"lib/forge-std/src/StdStyle.sol",
"lib/forge-std/src/StdUtils.sol",
"lib/forge-std/src/Test.sol",
"lib/forge-std/src/Vm.sol",
"lib/forge-std/src/console.sol",
"lib/forge-std/src/console2.sol",
"lib/forge-std/src/interfaces/IMulticall3.sol",
"lib/openzeppelin-contracts/contracts/access/Ownable.sol",
"lib/openzeppelin-contracts/contracts/interfaces/draft-IERC1822.sol",
"lib/openzeppelin-contracts/contracts/proxy/Clones.sol",
"lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol",
"lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Upgrade.sol",
"lib/openzeppelin-contracts/contracts/proxy/Proxy.sol",
"lib/openzeppelin-contracts/contracts/proxy/beacon/IBeacon.sol",
"lib/openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol",
"lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol",
"lib/openzeppelin-contracts/contracts/proxy/utils/Initializable.sol",
"lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol",
"lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol",
"lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol",
"lib/openzeppelin-contracts/contracts/token/ERC20/extensions/draft-IERC20Permit.sol",
"lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol",
"lib/openzeppelin-contracts/contracts/token/ERC777/IERC777.sol",
"lib/openzeppelin-contracts/contracts/token/ERC777/IERC777Recipient.sol",
"lib/openzeppelin-contracts/contracts/token/ERC777/IERC777Sender.sol",
"lib/openzeppelin-contracts/contracts/utils/Address.sol",
"lib/openzeppelin-contracts/contracts/utils/Context.sol",
"lib/openzeppelin-contracts/contracts/utils/StorageSlot.sol",
"lib/openzeppelin-contracts/contracts/utils/Strings.sol",
"lib/openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol",
"lib/openzeppelin-contracts/contracts/utils/introspection/IERC1820Registry.sol",
"lib/openzeppelin-contracts/contracts/utils/math/Math.sol",
"lib/openzeppelin-contracts/contracts/utils/math/SafeCast.sol",
"lib/openzeppelin-contracts/contracts/utils/math/SafeMath.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/access/IAccessControlUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/IERC1155ReceiverUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/IERC1155Upgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/extensions/IERC1155MetadataURIUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/utils/AddressUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/utils/ContextUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/utils/StringsUpgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/utils/introspection/ERC165Upgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol",
"lib/openzeppelin-contracts-upgradeable/contracts/utils/math/MathUpgradeable.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/agreements/IConstantFlowAgreementV1.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/agreements/IInstantDistributionAgreementV1.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/superfluid/Definitions.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperAgreement.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperApp.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperToken.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperTokenFactory.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluidGovernance.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluidToken.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/tokens/ERC20WithTokenInfo.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/interfaces/tokens/TokenInfo.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/libs/ERC777Helper.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/libs/EventsEmitter.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/libs/FixedSizeData.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/superfluid/SuperToken.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/superfluid/SuperfluidToken.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/upgradability/UUPSProxiable.sol",
"lib/protocol-monorepo/packages/ethereum-contracts/contracts/upgradability/UUPSUtils.sol",
"src/factory/AnotherCloneFactory.sol",
"src/libraries/ABDataTypes.sol",
"src/libraries/ABErrors.sol",
"src/libraries/ABEvents.sol",
"src/royalty/ABRoyalty.sol",
"src/royalty/IABRoyalty.sol",
"src/token/ERC1155/ERC1155AB.sol",
"src/token/ERC721/ERC721AB.sol",
"src/token/ERC721/ERC721ABOE.sol",
"src/utils/ABDataRegistry.sol",
"src/utils/ABVerifier.sol",
"src/utils/IABDataRegistry.sol",
"src/utils/IABVerifier.sol",
"test/_mocks/ABSuperToken.sol",
"test/_mocks/MockToken.sol",
"test/_testdata/ERC721ABOE.td.sol"
],
"versionRequirement": "^0.8.18",
"artifacts": {
"ERC721ABOETest": {
"0.8.19+commit.7dd6d404.Darwin.appleclang": "ERC721ABOE.t.sol/ERC721ABOETest.json"
}
}
},
"test/utils/ABDataRegistry.t.sol": {
"lastModificationDate": 1695306753046,
"contentHash": "c5537f68bf6c3c9c871bbde7e9d6c952",
Expand Down
Loading

0 comments on commit ab01161

Please sign in to comment.