Merge pull request #864 from EricDevito/master

NounsDescriptorV3

packages/nouns-contracts/.env.example

@@ -8,3 +8,4 @@ WALLET_PUBLIC_KEY=
 WALLET_PRIVATE_KEY=
 
 FOUNDRY_PROFILE=lite
+RPC_MAINNET=

packages/nouns-contracts/contracts/NounsArt.sol

@@ -327,6 +327,154 @@ contract NounsArt is INounsArt {
         emit GlassesAdded(imageCount);
     }
 
+    /**
+     * @notice Replace all pages of body images with new ones.
+     * @param encodedCompressed bytes created by taking a string array of RLE-encoded images, abi encoding it as a bytes array,
+     * and finally compressing it using deflate.
+     * @param decompressedLength the size in bytes the images bytes were prior to compression; required input for Inflate.
+     * @param imageCount the number of images in this batch; used when searching for images among batches.
+     * @dev This function can only be called by the descriptor.
+     */
+    function updateBodies(
+        bytes calldata encodedCompressed,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) external onlyDescriptor {
+        replaceTraitData(bodiesTrait, encodedCompressed, decompressedLength, imageCount);
+
+        emit BodiesUpdated(imageCount);
+    }
+
+    /**
+     * @notice Replace all pages of accessory images with new ones.
+     * @param encodedCompressed bytes created by taking a string array of RLE-encoded images, abi encoding it as a bytes array,
+     * and finally compressing it using deflate.
+     * @param decompressedLength the size in bytes the images bytes were prior to compression; required input for Inflate.
+     * @param imageCount the number of images in this batch; used when searching for images among batches.
+     * @dev This function can only be called by the descriptor.
+     */
+    function updateAccessories(
+        bytes calldata encodedCompressed,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) external onlyDescriptor {
+        replaceTraitData(accessoriesTrait, encodedCompressed, decompressedLength, imageCount);
+
+        emit AccessoriesUpdated(imageCount);
+    }
+
+    /**
+     * @notice Replace all pages of head images with new ones.
+     * @param encodedCompressed bytes created by taking a string array of RLE-encoded images, abi encoding it as a bytes array,
+     * and finally compressing it using deflate.
+     * @param decompressedLength the size in bytes the images bytes were prior to compression; required input for Inflate.
+     * @param imageCount the number of images in this batch; used when searching for images among batches.
+     * @dev This function can only be called by the descriptor.
+     */
+    function updateHeads(
+        bytes calldata encodedCompressed,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) external override onlyDescriptor {
+        replaceTraitData(headsTrait, encodedCompressed, decompressedLength, imageCount);
+
+        emit HeadsUpdated(imageCount);
+    }
+
+    /**
+     * @notice Replace all pages of glasses images with new ones.
+     * @param encodedCompressed bytes created by taking a string array of RLE-encoded images, abi encoding it as a bytes array,
+     * and finally compressing it using deflate.
+     * @param decompressedLength the size in bytes the images bytes were prior to compression; required input for Inflate.
+     * @param imageCount the number of images in this batch; used when searching for images among batches.
+     * @dev This function can only be called by the descriptor.
+     */
+    function updateGlasses(
+        bytes calldata encodedCompressed,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) external onlyDescriptor {
+        replaceTraitData(glassesTrait, encodedCompressed, decompressedLength, imageCount);
+
+        emit GlassesUpdated(imageCount);
+    }
+
+    /**
+     * @notice Replace all pages of body images with new ones from an existing storage contract.
+     * @param pointer the address of a contract where the image batch was stored using SSTORE2. The data
+     * format is expected to be like {encodedCompressed}: bytes created by taking a string array of
+     * RLE-encoded images, abi encoding it as a bytes array, and finally compressing it using deflate.
+     * @param decompressedLength the size in bytes the images bytes were prior to compression; required input for Inflate.
+     * @param imageCount the number of images in this batch; used when searching for images among batches.
+     * @dev This function can only be called by the descriptor.
+     */
+    function updateBodiesFromPointer(
+        address pointer,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) external onlyDescriptor {
+        replaceTraitData(bodiesTrait, pointer, decompressedLength, imageCount);
+
+        emit BodiesUpdated(imageCount);
+    }
+
+    /**
+     * @notice Replace all pages of accessory images with new ones from an existing storage contract.
+     * @param pointer the address of a contract where the image batch was stored using SSTORE2. The data
+     * format is expected to be like {encodedCompressed}: bytes created by taking a string array of
+     * RLE-encoded images, abi encoding it as a bytes array, and finally compressing it using deflate.
+     * @param decompressedLength the size in bytes the images bytes were prior to compression; required input for Inflate.
+     * @param imageCount the number of images in this batch; used when searching for images among batches.
+     * @dev This function can only be called by the descriptor.
+     */
+    function updateAccessoriesFromPointer(
+        address pointer,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) external onlyDescriptor {
+        replaceTraitData(accessoriesTrait, pointer, decompressedLength, imageCount);
+
+        emit AccessoriesUpdated(imageCount);
+    }
+
+    /**
+     * @notice Replace all pages of head images with new ones from an existing storage contract.
+     * @param pointer the address of a contract where the image batch was stored using SSTORE2. The data
+     * format is expected to be like {encodedCompressed}: bytes created by taking a string array of
+     * RLE-encoded images, abi encoding it as a bytes array, and finally compressing it using deflate.
+     * @param decompressedLength the size in bytes the images bytes were prior to compression; required input for Inflate.
+     * @param imageCount the number of images in this batch; used when searching for images among batches.
+     * @dev This function can only be called by the descriptor.
+     */
+    function updateHeadsFromPointer(
+        address pointer,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) external override onlyDescriptor {
+        replaceTraitData(headsTrait, pointer, decompressedLength, imageCount);
+
+        emit HeadsUpdated(imageCount);
+    }
+
+    /**
+     * @notice Replace all pages of glasses images with new ones from an existing storage contract.
+     * @param pointer the address of a contract where the image batch was stored using SSTORE2. The data
+     * format is expected to be like {encodedCompressed}: bytes created by taking a string array of
+     * RLE-encoded images, abi encoding it as a bytes array, and finally compressing it using deflate.
+     * @param decompressedLength the size in bytes the images bytes were prior to compression; required input for Inflate.
+     * @param imageCount the number of images in this batch; used when searching for images among batches.
+     * @dev This function can only be called by the descriptor.
+     */
+    function updateGlassesFromPointer(
+        address pointer,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) external onlyDescriptor {
+        replaceTraitData(glassesTrait, pointer, decompressedLength, imageCount);
+
+        emit GlassesUpdated(imageCount);
+    }
+
     /**
      * @notice Get the number of available Noun `backgrounds`.
      */
@@ -405,6 +553,39 @@ contract NounsArt is INounsArt {
         backgrounds.push(_background);
     }
 
+    function replaceTraitData(
+        Trait storage trait,
+        bytes calldata encodedCompressed,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) internal {
+        if (encodedCompressed.length == 0) {
+            revert EmptyBytes();
+        }
+        delete trait.storagePages;
+        delete trait.storedImagesCount;
+
+        addPage(trait, encodedCompressed, decompressedLength, imageCount);
+    }
+
+    function replaceTraitData(
+        Trait storage trait,
+        address pointer,
+        uint80 decompressedLength,
+        uint16 imageCount
+    ) internal {
+        if (decompressedLength == 0) {
+            revert BadDecompressedLength();
+        }
+        if (imageCount == 0) {
+            revert BadImageCount();
+        }
+        delete trait.storagePages;
+        delete trait.storedImagesCount;
+
+        addPage(trait, pointer, decompressedLength, imageCount);
+    }
+
     function addPage(
         Trait storage trait,
         bytes calldata encodedCompressed,