Merge pull request #8 from meemproject/feature/errors

latest
meemproject · Apr 13, 2022 · ca38c1d · ca38c1d
2 parents c47434f + 515a358
commit ca38c1d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/.diamond/4.json b/.diamond/4.json
diff --git a/contracts/Meem/libraries/LibERC721.sol b/contracts/Meem/libraries/LibERC721.sol
@@ -5,7 +5,7 @@ import {LibAppStorage} from '../storage/LibAppStorage.sol';
 import {LibArray} from '../libraries/LibArray.sol';
 import {LibMeem} from '../libraries/LibMeem.sol';
 import {LibAccessControl} from '../libraries/LibAccessControl.sol';
-import {Meem, MeemType} from '../interfaces/MeemStandard.sol';
+import {Meem, MeemType, URISource} from '../interfaces/MeemStandard.sol';
 import {NotTokenOwner, InvalidZeroAddressQuery, IndexOutOfRange, TokenNotFound, NotApproved, NoApproveSelf, ERC721ReceiverNotImplemented, TokenAlreadyExists, ToAddressInvalid, NoTransferWrappedNFT, MeemNotVerified, NotTokenAdmin} from '../libraries/Errors.sol';
 import '../interfaces/IERC721TokenReceiver.sol';
 
@@ -159,6 +159,10 @@ library LibERC721 {
 			revert TokenNotFound(tokenId);
 		}
 
+		if (s.meems[tokenId].uriSource == URISource.Data) {
+			return s.meems[tokenId].data;
+		}
+
 		return s.tokenURIs[tokenId];
 	}
 

diff --git a/contracts/Meem/libraries/LibMeem.sol b/contracts/Meem/libraries/LibMeem.sol
@@ -151,6 +151,7 @@ library LibMeem {
 		s.meems[tokenId].mintedAt = block.timestamp;
 		s.meems[tokenId].data = params.data;
 		s.meems[tokenId].reactionTypes = params.reactionTypes;
+		s.meems[tokenId].uriSource = params.uriSource;
 
 		if (
 			params.mintedBy != address(0) &&

diff --git a/test/childMeem.test.ts b/test/childMeem.test.ts
@@ -273,4 +273,41 @@ describe('Child Meem Minting', function Test() {
 			)
 		)
 	})
+
+	it('Can mint with locked URI', async () => {
+		const mintData = {
+			...meemMintData,
+			splits: [
+				...meemMintData.splits,
+				{
+					toAddress: signers[1].address,
+					amount: 100,
+					lockedBy: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
+				},
+				{
+					toAddress: signers[2].address,
+					amount: 100,
+					lockedBy: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
+				}
+			]
+		}
+
+		await meemFacet.connect(signers[2]).mint(
+			{
+				to: signers[4].address,
+				tokenURI: ipfsURL,
+				parentChain: Chain.Polygon,
+				parent: contractAddress,
+				parentTokenId: token0,
+				meemType: MeemType.Remix,
+				data: '',
+				isURILocked: true,
+				reactionTypes: [],
+				uriSource: UriSource.TokenUri,
+				mintedBy: signers[0].address
+			},
+			mintData,
+			mintData
+		)
+	})
 })