Updates master from dev

.env.example

@@ -5,7 +5,7 @@ MUMBAI_URL=
 BASE_GOERLI_URL=
 BASE_SEPOLIA_URL=
 SHIBUYA_URL=
-ZKATANA_URL=
+ZKYOTO_URL=
 IMMUTABLE_TEST_URL=
 
 # Mainnet networks
@@ -15,6 +15,7 @@ ETHEREUM_URL=
 POLYGON_URL=
 BASE_URL=
 ASTAR_URL=
+ASTAR_ZK_URL=
 BSC_URL=
 
 # To verify contracts
@@ -23,7 +24,8 @@ MOONSCAN_APIKEY=ABC123
 POLYGONSCAN_API_KEY=ABC123
 BASESCAN_API_KEY=ABC123
 ASTAR_BLOCKSCOUT_API_KEY=ABC123
-ZKATANA_BLOCKSCOUT_API_KEY=ABC123
+ASTAR_ZK_API_KEY=
+ZKYOTO_BLOCKSCOUT_API_KEY=ABC123
 BSCSCAN_API_KEY=ABC123
 IMMUTABLE_BLOCKSCOUT_API_KEY=ABC123
 

CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.5.6] - 2024-06-17
+
+### Added
+
+  - RMRKMinifiedEquippableChildAutoAcceptMock. Which bypasses accepting children.
+
+## [2.5.5] - 2024-04-10
+
+### Changed
+
+  - getAssetMetadata core implementation is now virtual.
+  - RMRKTokenHolder methods are made public instead of external.
+
+## [2.5.4] - 2024-03-21
+
+### Changed
+
+  - getAssetMetadata core implementation can now return the metadata disregarding tokenId by setting it to 0.
+
 ## [2.5.3] - 2024-03-19
 
 ### Changed

contracts/RMRK/core/RMRKCore.sol

@@ -9,7 +9,7 @@ pragma solidity ^0.8.21;
  * @dev This is currently just a passthrough contract which allows for granular editing of base-level ERC721 functions.
  */
 contract RMRKCore {
-    string private constant _VERSION = "2.5.3";
+    string private constant _VERSION = "2.5.6";
     bytes4 private constant _RMRK_INTERFACE = 0x524D524B; // "RMRK" in ASCII hex
 
     /**

contracts/RMRK/equippable/RMRKMinifiedEquippable.sol

@@ -1280,8 +1280,10 @@
     function getAssetMetadata(
         uint256 tokenId,
         uint64 assetId
-    ) public view virtual returns (string memory metadata) {
-        if (!_tokenAssets[tokenId][assetId]) revert RMRKTokenDoesNotHaveAsset();
+    ) public view virtual override returns (string memory metadata) {
+        // Allow to get the asset metadata without a token having it:
+        if (tokenId != 0 && !_tokenAssets[tokenId][assetId])
+            revert RMRKTokenDoesNotHaveAsset();
         metadata = _assets[assetId];
     }