forge fmt, add Redeemed boolean trait to test script

ProjectOpenSea · Oct 25, 2023 · f3df598 · f3df598
1 parent 0ba0308
commit f3df598
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/script/EmitDynamicTraitsTestEvents.s.sol b/script/EmitDynamicTraitsTestEvents.s.sol
@@ -56,9 +56,14 @@ contract EmitDynamicTraitTestEvents is Script {
     bytes32 birthdayValue4 = bytes32(uint256(765417860));
     bytes32[] birthdayValues = Solarray.bytes32s(birthdayValue1, birthdayValue2, birthdayValue3, birthdayValue4);
 
+    bytes32 redeemedKey = keccak256("redeemed");
+    bytes32 redeemedValue1 = bytes32(0);
+    bytes32 redeemedValue2 = bytes32(uint256(1));
+    bytes32[] redeemedValues = Solarray.bytes32s(redeemedValue1, redeemedValue2);
+
     function run() public {
         vm.startBroadcast();
-        
+
         token = new ERC721DynamicTraitsMultiUpdate();
 
         // Emit TraitUpdated
@@ -87,6 +92,7 @@ contract EmitDynamicTraitTestEvents is Script {
 
         // Emit TraitUpdatedListUniformValue
         token.setTraitsList(tokenIds, pointsKey, pointsValue1);
+        token.setTraitsList(tokenIds, redeemedKey, redeemedValue1);
 
         // Emit TraitMetadataURIUpdated
         // file: dynamic-traits-test-metadata.json

diff --git a/script/dynamic-traits-test-metadata.json b/script/dynamic-traits-test-metadata.json
@@ -64,6 +64,16 @@
           "0x0": null
         }
       }
+    },
+    "redeemed": {
+      "displayName": "Redeemed",
+      "dataType": {
+        "type": "boolean",
+        "valueMappings": {
+          "0x0": "No",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "Yes"
+        }
+      }
     }
   }
 }
diff --git a/src/dynamic-traits/interfaces/IERC7496.sol b/src/dynamic-traits/interfaces/IERC7496.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 interface IERC7496 {
     /* Events */
-    event TraitUpdated(bytes32 indexed traitKey, uint256 tokenId, bytes32 trait);
+    event TraitUpdated(bytes32 indexed traitKey, uint256 tokenId, bytes32 traitValue);
     event TraitUpdatedRange(bytes32 indexed traitKey, uint256 fromTokenId, uint256 toTokenId);
     event TraitUpdatedRangeUniformValue(
         bytes32 indexed traitKey, uint256 fromTokenId, uint256 toTokenId, bytes32 traitValue
@@ -21,7 +21,7 @@ interface IERC7496 {
     function getTraitMetadataURI() external view returns (string memory uri);
 
     /* Setters */
-    function setTrait(uint256 tokenId, bytes32 traitKey, bytes32 value) external;
+    function setTrait(uint256 tokenId, bytes32 traitKey, bytes32 traitValue) external;
 
     /* Errors */
     error TraitValueUnchanged();