Cha0s/dfd 262 simple artifacts

eth/contracts/DFDiamond.sol

@@ -13,9 +13,9 @@ import {ERC165, IERC165, ERC165Storage} from "@solidstate/contracts/introspectio
 import {DiamondBase, DiamondBaseStorage} from "@solidstate/contracts/proxy/diamond/base/DiamondBase.sol";
 import {DiamondReadable, IDiamondReadable} from "@solidstate/contracts/proxy/diamond/readable/DiamondReadable.sol";
 import {DiamondWritable, IDiamondWritable} from "@solidstate/contracts/proxy/diamond/writable/DiamondWritable.sol";
-import {IERC721} from "@solidstate/contracts/token/ERC721/IERC721.sol";
-import {IERC721Metadata} from "@solidstate/contracts/token/ERC721/metadata/IERC721Metadata.sol";
-import {IERC721Enumerable} from "@solidstate/contracts/token/ERC721/enumerable/IERC721Enumerable.sol";
+import {IERC1155} from "@solidstate/contracts/token/ERC1155/IERC1155.sol";
+import {IERC1155Metadata} from "@solidstate/contracts/token/ERC1155/metadata/IERC1155Metadata.sol";
+import {IERC1155Enumerable} from "@solidstate/contracts/token/ERC1155/enumerable/IERC1155Enumerable.sol";
 
 /**
  * @title SolidState "Diamond" proxy reference implementation
@@ -58,9 +58,9 @@ contract DFDiamond is DiamondBase, DiamondReadable, DiamondWritable, Ownable, ER
         erc165.setSupportedInterface(type(IERC173).interfaceId, true);
 
         // Store ERC721 interface
-        erc165.setSupportedInterface(type(IERC721).interfaceId, true);
-        erc165.setSupportedInterface(type(IERC721Metadata).interfaceId, true);
-        erc165.setSupportedInterface(type(IERC721Enumerable).interfaceId, true);
+        erc165.setSupportedInterface(type(IERC1155).interfaceId, true);
+        erc165.setSupportedInterface(type(IERC1155Metadata).interfaceId, true);
+        erc165.setSupportedInterface(type(IERC1155Enumerable).interfaceId, true);
 
         // register Diamond
 

eth/contracts/DFInitialize.sol

@@ -21,7 +21,7 @@ pragma solidity ^0.8.0;
 // Interface imports
 
 // Inherited storage
-import {ERC721MetadataStorage} from "@solidstate/contracts/token/ERC721/metadata/ERC721MetadataStorage.sol";
+import {ERC1155MetadataStorage} from "@solidstate/contracts/token/ERC1155/metadata/ERC1155MetadataStorage.sol";
 
 // Library imports
 import {WithStorage, SpaceshipConstants} from "./libraries/LibStorage.sol";
@@ -99,7 +99,7 @@ struct InitArgs {
 }
 
 contract DFInitialize is WithStorage {
-    using ERC721MetadataStorage for ERC721MetadataStorage.Layout;
+    using ERC1155MetadataStorage for ERC1155MetadataStorage.Layout;
 
     // You can add parameters to this function in order to pass in
     // data to set initialize state variables
@@ -108,11 +108,8 @@ contract DFInitialize is WithStorage {
         string memory artifactBaseURI,
         InitArgs memory initArgs
     ) external {
-        // Setup the ERC721 metadata
-        // TODO(#1925): Add name and symbol for the artifact tokens
-        ERC721MetadataStorage.layout().name = "";
-        ERC721MetadataStorage.layout().symbol = "";
-        ERC721MetadataStorage.layout().baseURI = artifactBaseURI;
+        // Setup the ERC1155 metadata
+        ERC1155MetadataStorage.layout().baseURI = artifactBaseURI;
 
         gs().diamondAddress = address(this);
 

eth/contracts/DFTypes.sol

@@ -71,6 +71,12 @@ struct Planet {
     uint256 invadeStartBlock;
     address capturer;
     uint256 locationId;
+    // Token stuff
+    uint256[] artifacts;
+    uint256[] spaceships;
+    uint256 activeArtifact;
+    uint256 wormholeTo;
+    uint256 artifactActivationTime;
 }
 
 struct RevealedCoords {
@@ -205,7 +211,11 @@ enum ArtifactType {
     PlanetaryShield,
     PhotoidCannon,
     BloomFilter,
-    BlackDomain,
+    BlackDomain
+}
+
+enum SpaceshipType {
+    Unknown,
     ShipMothership,
     ShipCrescent,
     ShipWhale,
@@ -222,33 +232,6 @@ enum ArtifactRarity {
     Mythic
 }
 
-// for NFTs
-struct Artifact {
-    bool isInitialized;
-    uint256 id;
-    uint256 planetDiscoveredOn;
-    ArtifactRarity rarity;
-    Biome planetBiome;
-    uint256 mintedAtTimestamp;
-    address discoverer;
-    ArtifactType artifactType;
-    // an artifact is 'activated' iff lastActivated > lastDeactivated
-    uint256 activations;
-    uint256 lastActivated;
-    uint256 lastDeactivated;
-    uint256 wormholeTo; // location id
-    address controller; // space ships can be controlled regardless of which planet they're on
-}
-
-// for artifact getters
-struct ArtifactWithMetadata {
-    Artifact artifact;
-    Upgrade upgrade;
-    Upgrade timeDelayedUpgrade; // for photoid canons specifically.
-    address owner;
-    uint256 locationId; // 0 if planet is not deposited into contract or is on a voyage
-    uint256 voyageId; // 0 is planet is not deposited into contract or is on a planet
-}
 
 enum Biome {
     Unknown,
@@ -263,3 +246,44 @@ enum Biome {
     Lava,
     Corrupted
 }
+
+enum TokenType {
+    Unknown,
+    Artifact,
+    Spaceship,
+    Silver
+}
+
+enum ArtifactInfo {
+    Unknown,
+    TokenType,
+    ArtifactRarity,
+    ArtifactType,
+    Biome
+}
+
+struct Artifact {
+    uint256 id;
+    TokenType tokenType;
+    ArtifactRarity rarity;
+    ArtifactType artifactType;
+    Biome planetBiome;
+}
+
+// Used for accessing properties of spaceship tokenId
+enum SpaceshipInfo {
+    Unknown,
+    TokenType,
+    SpaceshipType
+}
+
+struct Spaceship {
+    uint256 id;
+    TokenType tokenType;
+    SpaceshipType spaceshipType;
+}
+
+enum SilverInfo {
+    Unknown,
+    TokenType
+}