@dpa-oss/dpa 1.0.0 → 1.0.2

package/contracts/DPA.sol

@@ -26,8 +26,8 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
     /// @notice The orchestrator address (only this address can mint/revise)
     address public orchestrator;
 
-    /// @dev Token ID -> Token URI
-    mapping(uint256 => string) private _tokenURIs;
+    /// @dev Token ID -> Token CID (Content Identifier)
+    mapping(uint256 => string) private _tokenCIDs;
 
     /// @dev Token ID -> Token content (encoded bytes, decoded by implementers)
     mapping(uint256 => bytes) private _tokenContents;
@@ -47,10 +47,13 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
     /// @dev Counter for total unique digital public assets (origin tokens only)
     uint256 private _totalAssets;
 
+    /// @dev Base URI for token metadata (used when individual URI is not set)
+    string private _baseTokenURI;
+
     // ============ Events ============
 
     /// @notice Emitted when a new token is minted
-    event TokenMinted(uint256 indexed tokenId, address indexed to, string uri);
+    event TokenMinted(uint256 indexed tokenId, address indexed to, string cid);
 
     /// @notice Emitted when tokens are batch minted
     event BatchMinted(
@@ -73,6 +76,9 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         address indexed newOrchestrator
     );
 
+    /// @notice Emitted when base URI is updated
+    event BaseURIUpdated(string previousURI, string newURI);
+
     /// @notice Emitted when a DPA contract is linked to a token
     event DPALinked(
         uint256 indexed tokenId,
@@ -156,18 +162,36 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         _unpause();
     }
 
+    /**
+     * @notice Sets the base URI for token metadata
+     * @param baseURI_ New base URI (can be empty to disable)
+     */
+    function setBaseURI(string calldata baseURI_) external onlyOwner {
+        string memory previous = _baseTokenURI;
+        _baseTokenURI = baseURI_;
+        emit BaseURIUpdated(previous, baseURI_);
+    }
+
+    /**
+     * @notice Returns the current base URI
+     * @return The base URI string
+     */
+    function baseURI() external view returns (string memory) {
+        return _baseTokenURI;
+    }
+
     // ============ Minting Functions ============
 
     /**
-     * @notice Mints a single token with URI and content
+     * @notice Mints a single token with CID and content
      * @param to Recipient address
-     * @param uri Token URI (metadata location)
+     * @param cid Token CID (metadata CID)
      * @param content Encoded content data (decoded by derived contract)
      * @return tokenId The minted token ID
      */
     function mint(
         address to,
-        string calldata uri,
+        string calldata cid,
         bytes calldata content
     )
         external
@@ -184,8 +208,8 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         // Mint the token
         _mint(to, 1);
 
-        // Store URI and content
-        _tokenURIs[tokenId] = uri;
+        // Store CID and content
+        _tokenCIDs[tokenId] = cid;
         _tokenContents[tokenId] = content;
 
         // Create initial revision record (no parent, version 1)
@@ -201,21 +225,21 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         // Increment total unique assets counter
         _totalAssets++;
 
-        emit TokenMinted(tokenId, to, uri);
+        emit TokenMinted(tokenId, to, cid);
     }
 
     /**
      * @notice Mints a single token with explicit owner specification
      * @param to Recipient address
      * @param owner_ Token owner for record
-     * @param uri Token URI
+     * @param cid Token CID (metadata CID)
      * @param content Encoded content data
      * @return tokenId The minted token ID
      */
     function mintWithOwner(
         address to,
         address owner_,
-        string calldata uri,
+        string calldata cid,
         bytes calldata content
     )
         external
@@ -229,7 +253,7 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         _validateContent(content);
         _mint(to, 1);
 
-        _tokenURIs[tokenId] = uri;
+        _tokenCIDs[tokenId] = cid;
         _tokenContents[tokenId] = content;
 
         _revisions[tokenId] = Types.RevisionRecord({
@@ -244,19 +268,19 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         // Increment total unique assets counter
         _totalAssets++;
 
-        emit TokenMinted(tokenId, to, uri);
+        emit TokenMinted(tokenId, to, cid);
     }
 
     /**
      * @notice Batch mints tokens with URIs and contents
      * @param to Recipient address (same for all tokens in batch)
-     * @param uris Array of token URIs
+     * @param cids Array of token CIDs
      * @param contents Array of encoded content data
      * @return startTokenId The first token ID in the batch
      */
     function batchMint(
         address to,
-        string[] calldata uris,
+        string[] calldata cids,
         bytes[] calldata contents
     )
         external
@@ -265,7 +289,7 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         nonReentrant
         returns (uint256 startTokenId)
     {
-        uint256 quantity = uris.length;
+        uint256 quantity = cids.length;
 
         if (quantity != contents.length) {
             revert Errors.ArrayLengthMismatch();
@@ -287,7 +311,7 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         // Store URIs, contents, and create revision records
         for (uint256 i = 0; i < quantity; i++) {
             uint256 tokenId = startTokenId + i;
-            _tokenURIs[tokenId] = uris[i];
+            _tokenCIDs[tokenId] = cids[i];
             _tokenContents[tokenId] = contents[i];
 
             _revisions[tokenId] = Types.RevisionRecord({
@@ -299,7 +323,7 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
                 actor: msg.sender
             });
 
-            emit TokenMinted(tokenId, to, uris[i]);
+            emit TokenMinted(tokenId, to, cids[i]);
         }
 
         // Increment total unique assets counter by batch size
@@ -313,14 +337,14 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
     /**
      * @notice Creates a new revision of an existing token (protocol-enforced)
      * @param parentTokenId The token being revised (must be latest version)
-     * @param uri New token URI
+     * @param cid New token CID
      * @param content New encoded content
      * @param reason Human-readable reason (stored as hash, emitted in full)
      * @return newTokenId The newly minted revision token
      */
     function revise(
         uint256 parentTokenId,
-        string calldata uri,
+        string calldata cid,
         bytes calldata content,
         string calldata reason
     )
@@ -330,7 +354,7 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         nonReentrant
         returns (uint256 newTokenId)
     {
-        newTokenId = _revise(parentTokenId, uri, content, reason);
+        newTokenId = _revise(parentTokenId, cid, content, reason);
     }
 
     /**
@@ -338,7 +362,7 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
      */
     function _revise(
         uint256 parentTokenId,
-        string calldata uri,
+        string calldata cid,
         bytes calldata content,
         string calldata reason
     ) internal onlyLatestVersion(parentTokenId) returns (uint256 newTokenId) {
@@ -353,7 +377,7 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         _mint(parentOwner, 1);
 
         // Store new token data
-        _tokenURIs[newTokenId] = uri;
+        _tokenCIDs[newTokenId] = cid;
         _tokenContents[newTokenId] = content;
 
         // Find origin token (root of chain)
@@ -394,7 +418,17 @@ abstract contract DPA is ERC721A, Ownable, Pausable, ReentrancyGuard {
         if (!_exists(tokenId)) {
             revert Errors.InvalidTokenId();
         }
-        return _tokenURIs[tokenId];
+
+        string memory _tokenCID = _tokenCIDs[tokenId];
+        string memory base = _baseTokenURI;
+
+        // If base URI is set, concatenate with token path/CID
+        if (bytes(base).length > 0 && bytes(_tokenCID).length > 0) {
+            return string(abi.encodePacked(base, _tokenCID));
+        }
+
+        // Return token CID as-is (full URI or path)
+        return _tokenCID;
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpa-oss/dpa",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "scripts": {
     "compile": "hardhat compile",
     "test": "hardhat test",