This repository has been archived by the owner on Nov 11, 2022. It is now read-only.
NFT / Minter Architecture #39
Assignees
Labels
enhancement
New feature or request
Comments
|
Add links to Notion docs or leave comments below for discussion. |
|
Looked through contracts for some of the top NFT projects, noting down features here - https://www.notion.so/owlprotocol/NFT-Platforms-12e293b8d3194ba096ef37128eed9a0d#d22927b953de429f87d515c03c0fc7e4 Some of the notable ones found:
|
|
corbanvilla
added a commit
that referenced
this issue
Feb 23, 2022
|
/cib |
|
Branch issue-39 created! Clone with: |
corbanvilla
added a commit
that referenced
this issue
Mar 6, 2022
* Create PR for #40 * refactored to erc721 folder * added quick docs * fixed depend + annotation * beginning ERC721Mintable refactoring * enabled test skip * mint autoid contract * mintersimple contract * working minter contracts / breeding * Create PR for #39 * breeder * breeder setter / docs * mintableerc721 * rename * added overflow protection * minter contract testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com>
corbanvilla
added a commit
that referenced
this issue
Jul 4, 2022
* general project reference updates * Contract : NFTContractLibrary.sol (#11) * Create PR for #2 * initial data structs * general project reference updates * Create PR for #2 * initial data structs Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Testing : Dummy Contracts (#12) * Create PR for #10 * dummy contracts + testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Contract : NFTCrafter.sol (MVP) (#14) * Create PR for #5 * create / read function starts * added display struct * fix unused imports * finished create/read recipe, started deposit * recipe withdraws * withdraw function working * added craft function and testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Contract: INFTCrafter.sol (#16) * Create PR for #1 * basic interface file Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * NFTMinter: Initial DNA storage / generation (#21) * Create PR for #18 * initial files + contracts * Create PR for #20 * started NFTBreeder contract / testing * Create PR for #20 * minter project * finished nftminter mvp * added id exhaustion test case * check-effects pattern (best practice) Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * fixed minter * `Crafter` updates (#28) * Create PR for #23 * refactored NFTCrafter to Crafter * fixed recipe parsing, now uses field names * refactored/optimized crafter contract Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `uint256` DNA breeding (#31) * Create PR for #27 * initial dna breeding implementation * initial dna breeding implementation * testing contract * rename * code cleanup Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * cleanup * Create PR for #32 * metadata merge * Revert "metadata merge" This reverts commit e15b647. * `uint256` DNA breeding with mutations (#37) * Create PR for #29 * dna breeding with mutations Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * merge * merge * Create PR for #35 * removed custom padding function for web3.utils.padLeft() * Create PR for #34 * json schemas for nft-specie and erc721 * `NFTMinter` Updates (#30) * Create PR for #25 * minter refactoring (not finished yet) * fixed nftminter issues. beginning refactor * temp disable testing until issue #39 * code cleanup Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Finished schema and schema validation. Also added validateAndGetSchema() function that in addition to validation, will also return a SpecieMetadata object if it is valid. If it is invalid, throws the error from validateSchema() * `ERC721Mintable` base NFT contract (#43) * Create PR for #40 * refactored to erc721 folder * added quick docs * fixed depend + annotation Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * added testimages copy * added enum to validation schema for nft specie and test for it * Create PR for #36 * metadataToDna completed and tested * Create PR for #45 * finished dictionary rework * NFT / Minter Architecture (#44) * Create PR for #40 * refactored to erc721 folder * added quick docs * fixed depend + annotation * beginning ERC721Mintable refactoring * enabled test skip * mint autoid contract * mintersimple contract * working minter contracts / breeding * Create PR for #39 * breeder * breeder setter / docs * mintableerc721 * rename * added overflow protection * minter contract testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #56 * `EIP1820` Support (#58) * Create PR for #55 * added merkletreejs, updated solidity * erc1820 implementation and tests Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA` Refactor mutations logic as standalone (#59) * Create PR for #49 * fixed typescript issues * dna mutation refactoring / optimizations Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * factory for tests now work... 4 tests / 24 are failing. Need to debug those * metadata: Metadata type missing for some reason. Readded it * package.json scripts * scripts update * hh config * hardhat merge * added local solc files * `Minter` Allowlist (#62) * Create PR for #53 * started allowlist * allowlist working * merkle tree allowlist * workflow edit * allowlist tested + working Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * CrafterMint.sol (#61) * Create PR for #60 * license identifer warning * peer dep issue * implementation finished... tests needed * bug fix on CrafterMint Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Monorepo Refactor (#66) * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * `nft-launcher-contracts-sol` npm packaging (#69) * Create PR for #68 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #68 * setup for packaging * removed unused depends Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA.sol` test fixes (#70) * Create PR for #63 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #63 * fixed bad test Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA` Generation Counter (#52) * Create PR for #48 * generation counter * update node from 14.17 to 14.19 Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Hardhat Parallel Testing (low priority) (#71) * Create PR for #67 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * `nft-launcher-contracts-sol` npm packaging (#69) * Create PR for #68 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #68 * setup for packaging * removed unused depends Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA.sol` test fixes (#70) * Create PR for #63 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #63 * fixed bad test Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #67 * Create PR for #65 * `RosalindDNA` Generation Counter (#52) * Create PR for #48 * generation counter * update node from 14.17 to 14.19 Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #67 * Create PR for #65 * Create PR for #67 * ethers migration * update Rosalind tests * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * etherscan * remove old helper functions * migrated tests to ethersjs + waffle Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> * CrafterMint.sol (#61) * Create PR for #60 * license identifer warning * peer dep issue * implementation finished... tests needed * bug fix on CrafterMint Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #65 * merge develop * fix interface Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * update test location (#77) * Contract : Recipe Burn Address (#78) * Create PR for #9 * burn address working * Create PR for #9 Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Contracts` use OpenZeppelin upgradable pattern (#79) * Create PR for #38 * prettier fixes * added openzeppelin-upgrades plugins * MinterAutoId test file * upgradable minter contracts * upgradable minter contracts * upgradable contract updates Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Breeder` cooldown by generation (#80) * Create PR for #51 * cooldowns Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #72 * CloneFactory.sol imported into utils * ERC721 EIP 1167 Proxies * ERC721 Proxy test * Universal Proxy with CREATE2 * proxy launch tests * interacting with proxies test * OZCloneFactory.test.ts * rebase * CloneFactory Proxy (#73) * Create PR for #72 * CloneFactory.sol imported into utils * ERC721 EIP 1167 Proxies * ERC721 Proxy test * Universal Proxy with CREATE2 * proxy launch tests * interacting with proxies test * OZCloneFactory.test.ts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Delete contracts directory * Delete factory directory * Delete artifacts directory * Delete cache directory * Delete typechain directory * Delete test/unit/solidity directory * Delete hardhat.config.ts * Web3 and Ethers types (#92) * Create PR for #89 * types Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * TokenId Rest Endpoint (#95) * Create PR for #94 * basic rest server with hardcoded speciemetadata * fetching image nft metadata and final merge. Also caches previous fetches Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * removed duplicate dir * Move to non-hardcoded ipfs hash (#97) * Create PR for #96 * ipfs hash can now be passed Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Refactor project (#88) * Create PR for #87 * new crafter * ignore artifacts * Squashed commit of the following: commit 6060b20 Author: Corban Villa <corbanvilla@gmail.com> Date: Sat May 28 10:09:12 2022 +0200 partial refactor begun commit 5e1aa22 Author: corbanvilla <corbanvilla@users.noreply.github.com> Date: Thu May 26 18:42:35 2022 +0000 Create PR for #85 * remove artifacts * remove cache * update gitingore * remove typechain/ * remove factory * update config * update crafter * remove prepare scripts * crafter transfer * add ERC1167 proxy * deploy script * proxy factory use OZ safeCall * contracts-upgradeable * contract fixes * test tokens * unit tests * ERC20Owl.sol * ERC1155Owl.sol * CrafterMint.sol * updated testing for proxies, updated contract * ERC1155 testing * bugfix and removed unused vars Co-authored-by: leovigna <leovigna@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * SVG Usage (#99) * Create PR for #98 * importing svgs * svg specie generation and ipfs upload * merge library works with svgs * . * full generation * . * finished * docker * fix build * token and specieMetadata cache... all libraries seperate rn * image cache * minor bug fix * getImage route Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> * image cache bug fix * . * deploying assets (#103) * UNU Verse Metadata Encoding (#104) * Create PR for #102 * Create species.json for UNU Verse Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Add Documentation & Examples (#105) * Create PR for #101 * update readme * patch dockerfile * readme changes * concept of metadata * add morgan logging * update lockfile * more docs * . * deploy sciprts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * update dockerfile, remmove merge conflicts * CrafterTransfer.sol Refactor (#112) * Create PR for #111 * . * refactor tests * mints 1 billion by default not 1 million * CrafterTransfer.sol unit tests * additional CrafterTrasnfer tests * CrafterTransfer tests Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> * Deployment Scripts (#114) * Create PR for #113 * ERC721Owl deployed and verified... 1155 not enough funds * ERC1155 verifyciation and deploy Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * fix unit tests, optimize storage slots * update comments * Create .env.test Priv keys for testing * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Crafter Transfer ERC721 NTime (#118) * Create PR for #117 * need to fix testing * need to figure out error with multiple ingredients test * fixed testing bugs need to keep adding * added multiple ingredient unit tests * added original crafterTransfer tests * CrafterTransfer minor fixes * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #117 * CrafterTransfer NTime update Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * "name" and "description" fields with string format (#131) * Create PR for #130 * Crafter Transfer ERC721 NTime (#118) * Create PR for #117 * need to fix testing * need to figure out error with multiple ingredients test * fixed testing bugs need to keep adding * added multiple ingredient unit tests * added original crafterTransfer tests * CrafterTransfer minor fixes * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #117 * CrafterTransfer NTime update Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #130 * name and desc formatting done * metadata generation refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * npm scripts update * CrafterTransfer Audit (#139) * Create PR for #138 * audit done. deploy scripts editted Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint (#141) * Create PR for #140 * CrafterMint refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Deploy script nonce and address checks (#143) * Create PR for #142 * deployments and verifications Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * verify script * Deploying ERC721 and ERC1155 (#147) * Create PR for #146 * deploying ERC721 and ERc1155 beacon proxy instances Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterTransfer Refactor for beacon proxy initialization (#149) * Create PR for #148 * initializers refactor * CrafterTransferImpl redeployment * erc721 and erc1155 redeployed with correct beacon address * metadat server bug fixes * output minting * deposit and craft scripts... SwagBagToOwlParts deploy script incomplete as of now Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * English Auction Contract (#145) * Create PR for #144 * created english auction + tests * fixes for test * Deploying ERC721 and ERC1155 (#147) * Create PR for #146 * deploying ERC721 and ERc1155 beacon proxy instances Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * change transferFrom to transfer * implement reset time * add getters * Update EnglishAuction.sol * CrafterTransfer Refactor for beacon proxy initialization (#149) * Create PR for #148 * initializers refactor * CrafterTransferImpl redeployment * erc721 and erc1155 redeployed with correct beacon address * metadat server bug fixes * output minting * deposit and craft scripts... SwagBagToOwlParts deploy script incomplete as of now Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * fixed initial pr changes * created english auction + tests * fixes for test * change transferFrom to transfer * implement reset time * add getters * Update EnglishAuction.sol * fixed initial pr changes * created the proxy initializers and init initializers and fixed bugs with the test * small changes Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * Added OWLArchitecture.drawio * OWL architecture * Update OWLArchitecture.drawio * Dutch Auction (#152) * Create PR for #151 * need to start testing * new iteration * fixed currentPrice function * pushing non linear updates * finished dutch acutiopn Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Minor Dutch Auction changes (#158) * Create PR for #157 * English Auction and Dutch Auction audit * distinguished owner and winner claimed methods * remove End event Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * updating EnglishAuctionTest to conform with #157 (#160) * Create PR for #159 * updated tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Update OWLArchitecture.drawio * Dutch Auction Deploy Scripts (#165) * Create PR for #163 * added deployment scripts for dutch auction Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * English Auction Deploy Scripts (#162) * Create PR for #161 * finished deploy scripts for English Auction. need to modify the nonceToDeploy Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Deploy scripts refactor and nonce realignment (#167) * Create PR for #166 * nonces aligned and major deploy script refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * ERC1155 support for EnglishAuction contract (#168) * Create PR for #154 * added erc1155 functionality and updated test cases Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * ERC1155 support for DutchAuction contract (#169) * Create PR for #164 * added 1155 support + require statement in bid require statement added to bid to ensure nonwinners do not bid after auction is already won. Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Bring `Minter` contracts into the new architecture (#174) * Create PR for #173 * ERC1155 support for EnglishAuction contract (#168) * Create PR for #154 * added erc1155 functionality and updated test cases Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * ERC1155 support for DutchAuction contract (#169) * Create PR for #164 * added 1155 support + require statement in bid require statement added to bid to ensure nonwinners do not bid after auction is already won. Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #173 * move files and remove interaces * MinterAutoId.sol new architecture * MinterBreeding.sol new architecture * MinterRandom.sol new architecture * MinterSimple.sol new architecture * MinterSimpleMerkle.sol required redesign... but brought into the new architecture Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Fixed Price Smart Contract (#176) * Create PR for #170 * create fixed price auction contract + tests * remove FractionalExponents * addressed pr comments Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Sale Fee Enforcement on DutchAuction and EnglishAuction contracts (#177) * Create PR for #172 * implemented price fee for dutch and english auction fixed bug in english auction's ownerClaim method that transferred 1155s the wrong way * removed dutchAuction start method + added fixed tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Bundle Smart Contract (#179) * Sale Fee Enforcement on DutchAuction and EnglishAuction contracts (#177) * Create PR for #172 * implemented price fee for dutch and english auction fixed bug in english auction's ownerClaim method that transferred 1155s the wrong way * removed dutchAuction start method + added fixed tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Create PR for #178 * created bundle + tests * test setup finished Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Rent Smart Contract (#175) * Create PR for #171 * first iteration of Rent smart contract * updated events, fixed bugs, updated extending the rental, and added tests * fixed bug with ownerClaim and updated tests Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * Minter Changes (#181) * Create PR for #180 * prettier format * Changes to MinterSimple and MinterAutoId Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * ERC165 + ERC1820 Updates (#194) * Create PR for #182 * erc165 support Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Versioning for contracts (#195) * Create PR for #150 * versioning Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Bundle.sol` tests (#189) * Create PR for #188 * remove start from dutchAuction, create deployClone helper * removed start from fixedpriceauction tests and skipped bundle tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * `EnglishAuction.sol` Documentation (#199) * Create PR for #184 * added docs Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * fixed tests * Comparative Gas Cost Analysis (#200) * Create PR for #123 * `Bundle.sol` tests (#189) * Create PR for #188 * remove start from dutchAuction, create deployClone helper * removed start from fixedpriceauction tests and skipped bundle tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #123 * gasComp script Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * `contractUri()` for `OwlERC721` and `OwlERC1155` (#124) * Create PR for #122 * updated contractURI for both ERC721Owl and ERC1155Owl * remove package.json * . * Update ERC1155Owl.sol * modified base URI of 1155 used initialized uri as baseURI in ERC1155Owl contractURI * setter changes 1155 * Update ERC1155Owl.sol * addressed PR comments * Update ERC1155Owl.sol Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Documentation Generation (scripts) (#203) * Create PR for #187 * implemented docasaurus scripts * docasaurus configuration Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `ERC721OwlAttributes.sol` Implementation (#206) * Create PR for #205 * ERC721Owl made role vars internal to allow child contracts visibility and made version var private... will need its own getter * ERC721OwlAttributes.sol Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Storage Gaps (#207) * Create PR for #204 * added storage gaps Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: leovigna <leovigna@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local>
corbanvilla
added a commit
that referenced
this issue
Jul 4, 2022
* general project reference updates * Contract : NFTContractLibrary.sol (#11) * Create PR for #2 * initial data structs * general project reference updates * Create PR for #2 * initial data structs Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Testing : Dummy Contracts (#12) * Create PR for #10 * dummy contracts + testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Contract : NFTCrafter.sol (MVP) (#14) * Create PR for #5 * create / read function starts * added display struct * fix unused imports * finished create/read recipe, started deposit * recipe withdraws * withdraw function working * added craft function and testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Contract: INFTCrafter.sol (#16) * Create PR for #1 * basic interface file Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * NFTMinter: Initial DNA storage / generation (#21) * Create PR for #18 * initial files + contracts * Create PR for #20 * started NFTBreeder contract / testing * Create PR for #20 * minter project * finished nftminter mvp * added id exhaustion test case * check-effects pattern (best practice) Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * fixed minter * `Crafter` updates (#28) * Create PR for #23 * refactored NFTCrafter to Crafter * fixed recipe parsing, now uses field names * refactored/optimized crafter contract Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `uint256` DNA breeding (#31) * Create PR for #27 * initial dna breeding implementation * initial dna breeding implementation * testing contract * rename * code cleanup Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * cleanup * Create PR for #32 * metadata merge * Revert "metadata merge" This reverts commit e15b647. * `uint256` DNA breeding with mutations (#37) * Create PR for #29 * dna breeding with mutations Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * merge * merge * Create PR for #35 * removed custom padding function for web3.utils.padLeft() * Create PR for #34 * json schemas for nft-specie and erc721 * `NFTMinter` Updates (#30) * Create PR for #25 * minter refactoring (not finished yet) * fixed nftminter issues. beginning refactor * temp disable testing until issue #39 * code cleanup Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Finished schema and schema validation. Also added validateAndGetSchema() function that in addition to validation, will also return a SpecieMetadata object if it is valid. If it is invalid, throws the error from validateSchema() * `ERC721Mintable` base NFT contract (#43) * Create PR for #40 * refactored to erc721 folder * added quick docs * fixed depend + annotation Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * added testimages copy * added enum to validation schema for nft specie and test for it * Create PR for #36 * metadataToDna completed and tested * Create PR for #45 * finished dictionary rework * NFT / Minter Architecture (#44) * Create PR for #40 * refactored to erc721 folder * added quick docs * fixed depend + annotation * beginning ERC721Mintable refactoring * enabled test skip * mint autoid contract * mintersimple contract * working minter contracts / breeding * Create PR for #39 * breeder * breeder setter / docs * mintableerc721 * rename * added overflow protection * minter contract testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #56 * `EIP1820` Support (#58) * Create PR for #55 * added merkletreejs, updated solidity * erc1820 implementation and tests Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA` Refactor mutations logic as standalone (#59) * Create PR for #49 * fixed typescript issues * dna mutation refactoring / optimizations Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * factory for tests now work... 4 tests / 24 are failing. Need to debug those * metadata: Metadata type missing for some reason. Readded it * package.json scripts * scripts update * hh config * hardhat merge * added local solc files * `Minter` Allowlist (#62) * Create PR for #53 * started allowlist * allowlist working * merkle tree allowlist * workflow edit * allowlist tested + working Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * CrafterMint.sol (#61) * Create PR for #60 * license identifer warning * peer dep issue * implementation finished... tests needed * bug fix on CrafterMint Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Monorepo Refactor (#66) * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * `nft-launcher-contracts-sol` npm packaging (#69) * Create PR for #68 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #68 * setup for packaging * removed unused depends Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA.sol` test fixes (#70) * Create PR for #63 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #63 * fixed bad test Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA` Generation Counter (#52) * Create PR for #48 * generation counter * update node from 14.17 to 14.19 Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Hardhat Parallel Testing (low priority) (#71) * Create PR for #67 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * `nft-launcher-contracts-sol` npm packaging (#69) * Create PR for #68 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #68 * setup for packaging * removed unused depends Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA.sol` test fixes (#70) * Create PR for #63 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #63 * fixed bad test Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #67 * Create PR for #65 * `RosalindDNA` Generation Counter (#52) * Create PR for #48 * generation counter * update node from 14.17 to 14.19 Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #67 * Create PR for #65 * Create PR for #67 * ethers migration * update Rosalind tests * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * etherscan * remove old helper functions * migrated tests to ethersjs + waffle Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> * CrafterMint.sol (#61) * Create PR for #60 * license identifer warning * peer dep issue * implementation finished... tests needed * bug fix on CrafterMint Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #65 * merge develop * fix interface Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * update test location (#77) * Contract : Recipe Burn Address (#78) * Create PR for #9 * burn address working * Create PR for #9 Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Contracts` use OpenZeppelin upgradable pattern (#79) * Create PR for #38 * prettier fixes * added openzeppelin-upgrades plugins * MinterAutoId test file * upgradable minter contracts * upgradable minter contracts * upgradable contract updates Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Breeder` cooldown by generation (#80) * Create PR for #51 * cooldowns Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #72 * CloneFactory.sol imported into utils * ERC721 EIP 1167 Proxies * ERC721 Proxy test * Universal Proxy with CREATE2 * proxy launch tests * interacting with proxies test * OZCloneFactory.test.ts * rebase * CloneFactory Proxy (#73) * Create PR for #72 * CloneFactory.sol imported into utils * ERC721 EIP 1167 Proxies * ERC721 Proxy test * Universal Proxy with CREATE2 * proxy launch tests * interacting with proxies test * OZCloneFactory.test.ts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Delete contracts directory * Delete factory directory * Delete artifacts directory * Delete cache directory * Delete typechain directory * Delete test/unit/solidity directory * Delete hardhat.config.ts * Web3 and Ethers types (#92) * Create PR for #89 * types Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * TokenId Rest Endpoint (#95) * Create PR for #94 * basic rest server with hardcoded speciemetadata * fetching image nft metadata and final merge. Also caches previous fetches Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * removed duplicate dir * Move to non-hardcoded ipfs hash (#97) * Create PR for #96 * ipfs hash can now be passed Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Refactor project (#88) * Create PR for #87 * new crafter * ignore artifacts * Squashed commit of the following: commit 6060b20 Author: Corban Villa <corbanvilla@gmail.com> Date: Sat May 28 10:09:12 2022 +0200 partial refactor begun commit 5e1aa22 Author: corbanvilla <corbanvilla@users.noreply.github.com> Date: Thu May 26 18:42:35 2022 +0000 Create PR for #85 * remove artifacts * remove cache * update gitingore * remove typechain/ * remove factory * update config * update crafter * remove prepare scripts * crafter transfer * add ERC1167 proxy * deploy script * proxy factory use OZ safeCall * contracts-upgradeable * contract fixes * test tokens * unit tests * ERC20Owl.sol * ERC1155Owl.sol * CrafterMint.sol * updated testing for proxies, updated contract * ERC1155 testing * bugfix and removed unused vars Co-authored-by: leovigna <leovigna@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * SVG Usage (#99) * Create PR for #98 * importing svgs * svg specie generation and ipfs upload * merge library works with svgs * . * full generation * . * finished * docker * fix build * token and specieMetadata cache... all libraries seperate rn * image cache * minor bug fix * getImage route Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> * image cache bug fix * . * deploying assets (#103) * UNU Verse Metadata Encoding (#104) * Create PR for #102 * Create species.json for UNU Verse Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Add Documentation & Examples (#105) * Create PR for #101 * update readme * patch dockerfile * readme changes * concept of metadata * add morgan logging * update lockfile * more docs * . * deploy sciprts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * update dockerfile, remmove merge conflicts * CrafterTransfer.sol Refactor (#112) * Create PR for #111 * . * refactor tests * mints 1 billion by default not 1 million * CrafterTransfer.sol unit tests * additional CrafterTrasnfer tests * CrafterTransfer tests Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> * Deployment Scripts (#114) * Create PR for #113 * ERC721Owl deployed and verified... 1155 not enough funds * ERC1155 verifyciation and deploy Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * fix unit tests, optimize storage slots * update comments * Create .env.test Priv keys for testing * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Crafter Transfer ERC721 NTime (#118) * Create PR for #117 * need to fix testing * need to figure out error with multiple ingredients test * fixed testing bugs need to keep adding * added multiple ingredient unit tests * added original crafterTransfer tests * CrafterTransfer minor fixes * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #117 * CrafterTransfer NTime update Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * "name" and "description" fields with string format (#131) * Create PR for #130 * Crafter Transfer ERC721 NTime (#118) * Create PR for #117 * need to fix testing * need to figure out error with multiple ingredients test * fixed testing bugs need to keep adding * added multiple ingredient unit tests * added original crafterTransfer tests * CrafterTransfer minor fixes * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #117 * CrafterTransfer NTime update Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #130 * name and desc formatting done * metadata generation refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * npm scripts update * CrafterTransfer Audit (#139) * Create PR for #138 * audit done. deploy scripts editted Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint (#141) * Create PR for #140 * CrafterMint refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Deploy script nonce and address checks (#143) * Create PR for #142 * deployments and verifications Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * verify script * Deploying ERC721 and ERC1155 (#147) * Create PR for #146 * deploying ERC721 and ERc1155 beacon proxy instances Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterTransfer Refactor for beacon proxy initialization (#149) * Create PR for #148 * initializers refactor * CrafterTransferImpl redeployment * erc721 and erc1155 redeployed with correct beacon address * metadat server bug fixes * output minting * deposit and craft scripts... SwagBagToOwlParts deploy script incomplete as of now Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * English Auction Contract (#145) * Create PR for #144 * created english auction + tests * fixes for test * Deploying ERC721 and ERC1155 (#147) * Create PR for #146 * deploying ERC721 and ERc1155 beacon proxy instances Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * change transferFrom to transfer * implement reset time * add getters * Update EnglishAuction.sol * CrafterTransfer Refactor for beacon proxy initialization (#149) * Create PR for #148 * initializers refactor * CrafterTransferImpl redeployment * erc721 and erc1155 redeployed with correct beacon address * metadat server bug fixes * output minting * deposit and craft scripts... SwagBagToOwlParts deploy script incomplete as of now Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * fixed initial pr changes * created english auction + tests * fixes for test * change transferFrom to transfer * implement reset time * add getters * Update EnglishAuction.sol * fixed initial pr changes * created the proxy initializers and init initializers and fixed bugs with the test * small changes Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * Added OWLArchitecture.drawio * OWL architecture * Update OWLArchitecture.drawio * Dutch Auction (#152) * Create PR for #151 * need to start testing * new iteration * fixed currentPrice function * pushing non linear updates * finished dutch acutiopn Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Minor Dutch Auction changes (#158) * Create PR for #157 * English Auction and Dutch Auction audit * distinguished owner and winner claimed methods * remove End event Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * updating EnglishAuctionTest to conform with #157 (#160) * Create PR for #159 * updated tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Update OWLArchitecture.drawio * Dutch Auction Deploy Scripts (#165) * Create PR for #163 * added deployment scripts for dutch auction Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * English Auction Deploy Scripts (#162) * Create PR for #161 * finished deploy scripts for English Auction. need to modify the nonceToDeploy Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Deploy scripts refactor and nonce realignment (#167) * Create PR for #166 * nonces aligned and major deploy script refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * ERC1155 support for EnglishAuction contract (#168) * Create PR for #154 * added erc1155 functionality and updated test cases Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * ERC1155 support for DutchAuction contract (#169) * Create PR for #164 * added 1155 support + require statement in bid require statement added to bid to ensure nonwinners do not bid after auction is already won. Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Bring `Minter` contracts into the new architecture (#174) * Create PR for #173 * ERC1155 support for EnglishAuction contract (#168) * Create PR for #154 * added erc1155 functionality and updated test cases Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * ERC1155 support for DutchAuction contract (#169) * Create PR for #164 * added 1155 support + require statement in bid require statement added to bid to ensure nonwinners do not bid after auction is already won. Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #173 * move files and remove interaces * MinterAutoId.sol new architecture * MinterBreeding.sol new architecture * MinterRandom.sol new architecture * MinterSimple.sol new architecture * MinterSimpleMerkle.sol required redesign... but brought into the new architecture Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Fixed Price Smart Contract (#176) * Create PR for #170 * create fixed price auction contract + tests * remove FractionalExponents * addressed pr comments Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Sale Fee Enforcement on DutchAuction and EnglishAuction contracts (#177) * Create PR for #172 * implemented price fee for dutch and english auction fixed bug in english auction's ownerClaim method that transferred 1155s the wrong way * removed dutchAuction start method + added fixed tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Bundle Smart Contract (#179) * Sale Fee Enforcement on DutchAuction and EnglishAuction contracts (#177) * Create PR for #172 * implemented price fee for dutch and english auction fixed bug in english auction's ownerClaim method that transferred 1155s the wrong way * removed dutchAuction start method + added fixed tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Create PR for #178 * created bundle + tests * test setup finished Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Rent Smart Contract (#175) * Create PR for #171 * first iteration of Rent smart contract * updated events, fixed bugs, updated extending the rental, and added tests * fixed bug with ownerClaim and updated tests Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * Minter Changes (#181) * Create PR for #180 * prettier format * Changes to MinterSimple and MinterAutoId Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * ERC165 + ERC1820 Updates (#194) * Create PR for #182 * erc165 support Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Versioning for contracts (#195) * Create PR for #150 * versioning Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Bundle.sol` tests (#189) * Create PR for #188 * remove start from dutchAuction, create deployClone helper * removed start from fixedpriceauction tests and skipped bundle tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * `EnglishAuction.sol` Documentation (#199) * Create PR for #184 * added docs Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * fixed tests * Comparative Gas Cost Analysis (#200) * Create PR for #123 * `Bundle.sol` tests (#189) * Create PR for #188 * remove start from dutchAuction, create deployClone helper * removed start from fixedpriceauction tests and skipped bundle tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #123 * gasComp script Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * `contractUri()` for `OwlERC721` and `OwlERC1155` (#124) * Create PR for #122 * updated contractURI for both ERC721Owl and ERC1155Owl * remove package.json * . * Update ERC1155Owl.sol * modified base URI of 1155 used initialized uri as baseURI in ERC1155Owl contractURI * setter changes 1155 * Update ERC1155Owl.sol * addressed PR comments * Update ERC1155Owl.sol Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Documentation Generation (scripts) (#203) * Create PR for #187 * implemented docasaurus scripts * docasaurus configuration Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `ERC721OwlAttributes.sol` Implementation (#206) * Create PR for #205 * ERC721Owl made role vars internal to allow child contracts visibility and made version var private... will need its own getter * ERC721OwlAttributes.sol Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Storage Gaps (#207) * Create PR for #204 * added storage gaps Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #208 * Removed nft-launcher-libs and refactored CrafterMint * Created readme for contract folders finished crafter readme, need someone with more familiarity to write minter * removed nft-launcher-contracts-sol * remove unimplemented contracts * updated readme * added more docs * updated docs for CraftLib * fixed docgen * updated generated docs * fix docs * Delete README.md * Update README.md * unused contract tests * fixed crafterMint tokenID pop logic * version public function * minor changes to craftLib docs * using Counters library for incrementing * docs * ContractVersion test workingh * docs * removed gas limit on contract verison test * add build + test scripts * contract version test * Delete pnpm-lock.yaml * set strict peer dependencies for tests failing on pnpm -i * removed npx generate-types and ts ignored hardhat config * workflow * Update OWLArchitecture.drawio * Update main.yml * changed main yml * readme * updated updated docs * Update OWLArchitecture.drawio * Added OWLArchitecture.svg * Rename OWLArchitecture.drawio.svg to OWLArchitecture.svg * svg committed Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: leovigna <leovigna@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local>
corbanvilla
added a commit
that referenced
this issue
Jul 4, 2022
* general project reference updates * Contract : NFTContractLibrary.sol (#11) * Create PR for #2 * initial data structs * general project reference updates * Create PR for #2 * initial data structs Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Testing : Dummy Contracts (#12) * Create PR for #10 * dummy contracts + testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Contract : NFTCrafter.sol (MVP) (#14) * Create PR for #5 * create / read function starts * added display struct * fix unused imports * finished create/read recipe, started deposit * recipe withdraws * withdraw function working * added craft function and testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Contract: INFTCrafter.sol (#16) * Create PR for #1 * basic interface file Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * NFTMinter: Initial DNA storage / generation (#21) * Create PR for #18 * initial files + contracts * Create PR for #20 * started NFTBreeder contract / testing * Create PR for #20 * minter project * finished nftminter mvp * added id exhaustion test case * check-effects pattern (best practice) Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * fixed minter * `Crafter` updates (#28) * Create PR for #23 * refactored NFTCrafter to Crafter * fixed recipe parsing, now uses field names * refactored/optimized crafter contract Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `uint256` DNA breeding (#31) * Create PR for #27 * initial dna breeding implementation * initial dna breeding implementation * testing contract * rename * code cleanup Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * cleanup * Create PR for #32 * metadata merge * Revert "metadata merge" This reverts commit e15b647. * `uint256` DNA breeding with mutations (#37) * Create PR for #29 * dna breeding with mutations Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * merge * merge * Create PR for #35 * removed custom padding function for web3.utils.padLeft() * Create PR for #34 * json schemas for nft-specie and erc721 * `NFTMinter` Updates (#30) * Create PR for #25 * minter refactoring (not finished yet) * fixed nftminter issues. beginning refactor * temp disable testing until issue #39 * code cleanup Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Finished schema and schema validation. Also added validateAndGetSchema() function that in addition to validation, will also return a SpecieMetadata object if it is valid. If it is invalid, throws the error from validateSchema() * `ERC721Mintable` base NFT contract (#43) * Create PR for #40 * refactored to erc721 folder * added quick docs * fixed depend + annotation Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * added testimages copy * added enum to validation schema for nft specie and test for it * Create PR for #36 * metadataToDna completed and tested * Create PR for #45 * finished dictionary rework * NFT / Minter Architecture (#44) * Create PR for #40 * refactored to erc721 folder * added quick docs * fixed depend + annotation * beginning ERC721Mintable refactoring * enabled test skip * mint autoid contract * mintersimple contract * working minter contracts / breeding * Create PR for #39 * breeder * breeder setter / docs * mintableerc721 * rename * added overflow protection * minter contract testing Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #56 * `EIP1820` Support (#58) * Create PR for #55 * added merkletreejs, updated solidity * erc1820 implementation and tests Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA` Refactor mutations logic as standalone (#59) * Create PR for #49 * fixed typescript issues * dna mutation refactoring / optimizations Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * factory for tests now work... 4 tests / 24 are failing. Need to debug those * metadata: Metadata type missing for some reason. Readded it * package.json scripts * scripts update * hh config * hardhat merge * added local solc files * `Minter` Allowlist (#62) * Create PR for #53 * started allowlist * allowlist working * merkle tree allowlist * workflow edit * allowlist tested + working Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * CrafterMint.sol (#61) * Create PR for #60 * license identifer warning * peer dep issue * implementation finished... tests needed * bug fix on CrafterMint Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Monorepo Refactor (#66) * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * `nft-launcher-contracts-sol` npm packaging (#69) * Create PR for #68 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #68 * setup for packaging * removed unused depends Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA.sol` test fixes (#70) * Create PR for #63 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #63 * fixed bad test Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA` Generation Counter (#52) * Create PR for #48 * generation counter * update node from 14.17 to 14.19 Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Hardhat Parallel Testing (low priority) (#71) * Create PR for #67 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * `nft-launcher-contracts-sol` npm packaging (#69) * Create PR for #68 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #68 * setup for packaging * removed unused depends Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `RosalindDNA.sol` test fixes (#70) * Create PR for #63 * Create PR for #65 * nft-launcher-contrats-solc refactor * metadata lib refactor * refactor into monorepo * Create PR for #63 * fixed bad test Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #67 * Create PR for #65 * `RosalindDNA` Generation Counter (#52) * Create PR for #48 * generation counter * update node from 14.17 to 14.19 Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #67 * Create PR for #65 * Create PR for #67 * ethers migration * update Rosalind tests * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * Create PR for #65 * Create PR for #67 * etherscan * remove old helper functions * migrated tests to ethersjs + waffle Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> * CrafterMint.sol (#61) * Create PR for #60 * license identifer warning * peer dep issue * implementation finished... tests needed * bug fix on CrafterMint Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #65 * merge develop * fix interface Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * update test location (#77) * Contract : Recipe Burn Address (#78) * Create PR for #9 * burn address working * Create PR for #9 Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Contracts` use OpenZeppelin upgradable pattern (#79) * Create PR for #38 * prettier fixes * added openzeppelin-upgrades plugins * MinterAutoId test file * upgradable minter contracts * upgradable minter contracts * upgradable contract updates Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Breeder` cooldown by generation (#80) * Create PR for #51 * cooldowns Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #72 * CloneFactory.sol imported into utils * ERC721 EIP 1167 Proxies * ERC721 Proxy test * Universal Proxy with CREATE2 * proxy launch tests * interacting with proxies test * OZCloneFactory.test.ts * rebase * CloneFactory Proxy (#73) * Create PR for #72 * CloneFactory.sol imported into utils * ERC721 EIP 1167 Proxies * ERC721 Proxy test * Universal Proxy with CREATE2 * proxy launch tests * interacting with proxies test * OZCloneFactory.test.ts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Delete contracts directory * Delete factory directory * Delete artifacts directory * Delete cache directory * Delete typechain directory * Delete test/unit/solidity directory * Delete hardhat.config.ts * Web3 and Ethers types (#92) * Create PR for #89 * types Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * TokenId Rest Endpoint (#95) * Create PR for #94 * basic rest server with hardcoded speciemetadata * fetching image nft metadata and final merge. Also caches previous fetches Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * removed duplicate dir * Move to non-hardcoded ipfs hash (#97) * Create PR for #96 * ipfs hash can now be passed Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Refactor project (#88) * Create PR for #87 * new crafter * ignore artifacts * Squashed commit of the following: commit 6060b20 Author: Corban Villa <corbanvilla@gmail.com> Date: Sat May 28 10:09:12 2022 +0200 partial refactor begun commit 5e1aa22 Author: corbanvilla <corbanvilla@users.noreply.github.com> Date: Thu May 26 18:42:35 2022 +0000 Create PR for #85 * remove artifacts * remove cache * update gitingore * remove typechain/ * remove factory * update config * update crafter * remove prepare scripts * crafter transfer * add ERC1167 proxy * deploy script * proxy factory use OZ safeCall * contracts-upgradeable * contract fixes * test tokens * unit tests * ERC20Owl.sol * ERC1155Owl.sol * CrafterMint.sol * updated testing for proxies, updated contract * ERC1155 testing * bugfix and removed unused vars Co-authored-by: leovigna <leovigna@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * SVG Usage (#99) * Create PR for #98 * importing svgs * svg specie generation and ipfs upload * merge library works with svgs * . * full generation * . * finished * docker * fix build * token and specieMetadata cache... all libraries seperate rn * image cache * minor bug fix * getImage route Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> * image cache bug fix * . * deploying assets (#103) * UNU Verse Metadata Encoding (#104) * Create PR for #102 * Create species.json for UNU Verse Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Add Documentation & Examples (#105) * Create PR for #101 * update readme * patch dockerfile * readme changes * concept of metadata * add morgan logging * update lockfile * more docs * . * deploy sciprts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * update dockerfile, remmove merge conflicts * CrafterTransfer.sol Refactor (#112) * Create PR for #111 * . * refactor tests * mints 1 billion by default not 1 million * CrafterTransfer.sol unit tests * additional CrafterTrasnfer tests * CrafterTransfer tests Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> * Deployment Scripts (#114) * Create PR for #113 * ERC721Owl deployed and verified... 1155 not enough funds * ERC1155 verifyciation and deploy Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * fix unit tests, optimize storage slots * update comments * Create .env.test Priv keys for testing * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Crafter Transfer ERC721 NTime (#118) * Create PR for #117 * need to fix testing * need to figure out error with multiple ingredients test * fixed testing bugs need to keep adding * added multiple ingredient unit tests * added original crafterTransfer tests * CrafterTransfer minor fixes * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #117 * CrafterTransfer NTime update Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * "name" and "description" fields with string format (#131) * Create PR for #130 * Crafter Transfer ERC721 NTime (#118) * Create PR for #117 * need to fix testing * need to figure out error with multiple ingredients test * fixed testing bugs need to keep adding * added multiple ingredient unit tests * added original crafterTransfer tests * CrafterTransfer minor fixes * Split funds script Proxy deployment (#116) * Create PR for #115 * split funds scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Type Generation (#121) * Create PR for #108 * type scripts * fix indent Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * UUPS Upgradeable Proxy (#120) * Create PR for #119 * Beacon Proxy rework and deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * "name" and "description" metadata fields (#126) * Create PR for #125 * CrafterMint.sol (#128) * Create PR for #127 * CrafterMint.sol contract and unit tests * deploy scripts Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #125 * overrides Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #117 * CrafterTransfer NTime update Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Create PR for #130 * name and desc formatting done * metadata generation refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * npm scripts update * CrafterTransfer Audit (#139) * Create PR for #138 * audit done. deploy scripts editted Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterMint (#141) * Create PR for #140 * CrafterMint refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Deploy script nonce and address checks (#143) * Create PR for #142 * deployments and verifications Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * verify script * Deploying ERC721 and ERC1155 (#147) * Create PR for #146 * deploying ERC721 and ERc1155 beacon proxy instances Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * CrafterTransfer Refactor for beacon proxy initialization (#149) * Create PR for #148 * initializers refactor * CrafterTransferImpl redeployment * erc721 and erc1155 redeployed with correct beacon address * metadat server bug fixes * output minting * deposit and craft scripts... SwagBagToOwlParts deploy script incomplete as of now Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * English Auction Contract (#145) * Create PR for #144 * created english auction + tests * fixes for test * Deploying ERC721 and ERC1155 (#147) * Create PR for #146 * deploying ERC721 and ERc1155 beacon proxy instances Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * change transferFrom to transfer * implement reset time * add getters * Update EnglishAuction.sol * CrafterTransfer Refactor for beacon proxy initialization (#149) * Create PR for #148 * initializers refactor * CrafterTransferImpl redeployment * erc721 and erc1155 redeployed with correct beacon address * metadat server bug fixes * output minting * deposit and craft scripts... SwagBagToOwlParts deploy script incomplete as of now Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * fixed initial pr changes * created english auction + tests * fixes for test * change transferFrom to transfer * implement reset time * add getters * Update EnglishAuction.sol * fixed initial pr changes * created the proxy initializers and init initializers and fixed bugs with the test * small changes Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * Added OWLArchitecture.drawio * OWL architecture * Update OWLArchitecture.drawio * Dutch Auction (#152) * Create PR for #151 * need to start testing * new iteration * fixed currentPrice function * pushing non linear updates * finished dutch acutiopn Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Minor Dutch Auction changes (#158) * Create PR for #157 * English Auction and Dutch Auction audit * distinguished owner and winner claimed methods * remove End event Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * updating EnglishAuctionTest to conform with #157 (#160) * Create PR for #159 * updated tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Update OWLArchitecture.drawio * Dutch Auction Deploy Scripts (#165) * Create PR for #163 * added deployment scripts for dutch auction Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * English Auction Deploy Scripts (#162) * Create PR for #161 * finished deploy scripts for English Auction. need to modify the nonceToDeploy Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Deploy scripts refactor and nonce realignment (#167) * Create PR for #166 * nonces aligned and major deploy script refactor Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * ERC1155 support for EnglishAuction contract (#168) * Create PR for #154 * added erc1155 functionality and updated test cases Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * ERC1155 support for DutchAuction contract (#169) * Create PR for #164 * added 1155 support + require statement in bid require statement added to bid to ensure nonwinners do not bid after auction is already won. Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Bring `Minter` contracts into the new architecture (#174) * Create PR for #173 * ERC1155 support for EnglishAuction contract (#168) * Create PR for #154 * added erc1155 functionality and updated test cases Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * ERC1155 support for DutchAuction contract (#169) * Create PR for #164 * added 1155 support + require statement in bid require statement added to bid to ensure nonwinners do not bid after auction is already won. Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #173 * move files and remove interaces * MinterAutoId.sol new architecture * MinterBreeding.sol new architecture * MinterRandom.sol new architecture * MinterSimple.sol new architecture * MinterSimpleMerkle.sol required redesign... but brought into the new architecture Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Fixed Price Smart Contract (#176) * Create PR for #170 * create fixed price auction contract + tests * remove FractionalExponents * addressed pr comments Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Sale Fee Enforcement on DutchAuction and EnglishAuction contracts (#177) * Create PR for #172 * implemented price fee for dutch and english auction fixed bug in english auction's ownerClaim method that transferred 1155s the wrong way * removed dutchAuction start method + added fixed tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Bundle Smart Contract (#179) * Sale Fee Enforcement on DutchAuction and EnglishAuction contracts (#177) * Create PR for #172 * implemented price fee for dutch and english auction fixed bug in english auction's ownerClaim method that transferred 1155s the wrong way * removed dutchAuction start method + added fixed tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> * Create PR for #178 * created bundle + tests * test setup finished Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Rent Smart Contract (#175) * Create PR for #171 * first iteration of Rent smart contract * updated events, fixed bugs, updated extending the rental, and added tests * fixed bug with ownerClaim and updated tests Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local> * Minter Changes (#181) * Create PR for #180 * prettier format * Changes to MinterSimple and MinterAutoId Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * ERC165 + ERC1820 Updates (#194) * Create PR for #182 * erc165 support Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * Versioning for contracts (#195) * Create PR for #150 * versioning Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `Bundle.sol` tests (#189) * Create PR for #188 * remove start from dutchAuction, create deployClone helper * removed start from fixedpriceauction tests and skipped bundle tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * `EnglishAuction.sol` Documentation (#199) * Create PR for #184 * added docs Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * fixed tests * Comparative Gas Cost Analysis (#200) * Create PR for #123 * `Bundle.sol` tests (#189) * Create PR for #188 * remove start from dutchAuction, create deployClone helper * removed start from fixedpriceauction tests and skipped bundle tests Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #123 * gasComp script Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * `contractUri()` for `OwlERC721` and `OwlERC1155` (#124) * Create PR for #122 * updated contractURI for both ERC721Owl and ERC1155Owl * remove package.json * . * Update ERC1155Owl.sol * modified base URI of 1155 used initialized uri as baseURI in ERC1155Owl contractURI * setter changes 1155 * Update ERC1155Owl.sol * addressed PR comments * Update ERC1155Owl.sol Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Documentation Generation (scripts) (#203) * Create PR for #187 * implemented docasaurus scripts * docasaurus configuration Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: Corban Villa <corbanvilla@gmail.com> * `ERC721OwlAttributes.sol` Implementation (#206) * Create PR for #205 * ERC721Owl made role vars internal to allow child contracts visibility and made version var private... will need its own getter * ERC721OwlAttributes.sol Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Storage Gaps (#207) * Create PR for #204 * added storage gaps Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> * Create PR for #208 * Removed nft-launcher-libs and refactored CrafterMint * Created readme for contract folders finished crafter readme, need someone with more familiarity to write minter * removed nft-launcher-contracts-sol * remove unimplemented contracts * updated readme * added more docs * updated docs for CraftLib * fixed docgen * updated generated docs * fix docs * Delete README.md * Update README.md * unused contract tests * fixed crafterMint tokenID pop logic * version public function * minor changes to craftLib docs * using Counters library for incrementing * docs * ContractVersion test workingh * docs * removed gas limit on contract verison test * add build + test scripts * contract version test * Delete pnpm-lock.yaml * set strict peer dependencies for tests failing on pnpm -i * removed npx generate-types and ts ignored hardhat config * workflow * Update OWLArchitecture.drawio * Update main.yml * changed main yml * readme * updated updated docs * Update OWLArchitecture.drawio * Added OWLArchitecture.svg * Rename OWLArchitecture.drawio.svg to OWLArchitecture.svg * svg committed Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: corbanvilla <corbanvilla@users.noreply.github.com> Co-authored-by: HrikB <HrikB@users.noreply.github.com> Co-authored-by: HrikB <hrik.bhowal@gmail.com> Co-authored-by: leovigna <leovigna@users.noreply.github.com> Co-authored-by: Leo Vigna <leo.vigna@gmail.com> Co-authored-by: aqzhen <aqzhen@users.noreply.github.com> Co-authored-by: Andrew Zhen <43920774+aqzhen@users.noreply.github.com> Co-authored-by: vszammit <vszammit@users.noreply.github.com> Co-authored-by: Victoria Zammit <vszammit@gmail.com> Co-authored-by: Victoria Zammit <victoriazammit@Victorias-MacBook-Pro-3.local>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
The Owl NFT launcher will have the following architecture to enable dynamic NFTs
Mintercontracts that are delegated mint rights and define how the id is generatedThe text was updated successfully, but these errors were encountered: