@etherisc/gif-next 0.0.2-e9148e0-933 → 0.0.2-e94f4c7-084

package/contracts/instance/service/ProductService.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.19;
 import {IRegistry} from "../../registry/IRegistry.sol";
 import {IProductComponent} from "../../components/IProductComponent.sol";
 import {Product} from "../../components/Product.sol";
+import {IComponent} from "../../components/IComponent.sol";
 import {IPoolComponent} from "../../components/IPoolComponent.sol";
 import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IInstance} from "../IInstance.sol";
@@ -22,30 +23,28 @@ import {Versionable} from "../../shared/Versionable.sol";
 import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
 import {UFixed, UFixedLib} from "../../types/UFixed.sol";
 import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
-import {ObjectType, INSTANCE, PRODUCT, POLICY} from "../../types/ObjectType.sol";
-import {APPLIED, UNDERWRITTEN, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
+import {ObjectType, PRODUCT, POOL, POLICY} from "../../types/ObjectType.sol";
+import {APPLIED, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
 import {ReferralId} from "../../types/Referral.sol";
 import {RiskId} from "../../types/RiskId.sol";
 import {StateId} from "../../types/StateId.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
+import {RoleId, PRODUCT_OWNER_ROLE} from "../../types/RoleId.sol";
 
 import {IService} from "../../shared/IService.sol";
 import {Service} from "../../shared/Service.sol";
-import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
+import {ComponentService} from "../base/ComponentService.sol";
 import {IProductService} from "./IProductService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
-
-string constant PRODUCT_SERVICE_NAME = "ProductService";
+import {IPoolService} from "./PoolService.sol";
 
 // TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
-contract ProductService is ComponentServiceBase, IProductService {
+contract ProductService is ComponentService, IProductService {
     using NftIdLib for NftId;
 
-    string public constant NAME = "ProductService";
-
-    address internal _registryAddress;
+    IPoolService internal _poolService;
 
     event LogProductServiceSender(address sender);
 
@@ -57,26 +56,97 @@ contract ProductService is ComponentServiceBase, IProductService {
         initializer
         virtual override
     {
-        address initialOwner = address(0);
-        (_registryAddress, initialOwner) = abi.decode(data, (address, address));
+        address registryAddress;
+        address initialOwner;
+        (registryAddress, initialOwner) = abi.decode(data, (address, address));
 
-        _initializeService(_registryAddress, owner);
+        initializeService(registryAddress, address(0), owner);
 
-        _registerInterface(type(IService).interfaceId);
-        _registerInterface(type(IProductService).interfaceId);
+        _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
+
+        registerInterface(type(IProductService).interfaceId);
     }
 
 
-    function getName() public pure override(IService, Service) returns(string memory name) {
-        return NAME;
+    function register(address productAddress) 
+        external
+        returns(NftId productNftId)
+    {
+        (
+            IComponent component,
+            address owner,
+            IInstance instance,
+            NftId instanceNftId
+        ) = _checkComponentForRegistration(
+            productAddress,
+            PRODUCT(),
+            PRODUCT_OWNER_ROLE());
+
+        IProductComponent product = IProductComponent(productAddress);
+        IRegistry.ObjectInfo memory productInfo = getRegistryService().registerProduct(product, owner);
+        productNftId = productInfo.nftId;
+        _createProductSetup(
+            instance, 
+            product, 
+            productNftId);
+    }
+
+
+    function _createProductSetup(
+        IInstance instance, 
+        IProductComponent product, 
+        NftId productNftId 
+    )
+        internal
+        returns (string memory name)
+    {
+        // wire distribution and pool components to product component
+        ISetup.ProductSetupInfo memory setup = product.getSetupInfo();
+        IComponent distribution = IComponent(getRegistry().getObjectInfo(setup.distributionNftId).objectAddress);
+        IComponent pool = IComponent(getRegistry().getObjectInfo(setup.poolNftId).objectAddress);
+
+        distribution.setProductNftId(productNftId);
+        pool.setProductNftId(productNftId);
+        product.setProductNftId(productNftId);
+        product.linkToRegisteredNftId();
+
+        // create product setup in instance
+        instance.createProductSetup(productNftId, product.getSetupInfo());
+
+        bytes4[][] memory selectors = new bytes4[][](1);
+        selectors[0] = new bytes4[](1);
+        selectors[0][0] = IProductComponent.setFees.selector;
+
+        RoleId[] memory roles = new RoleId[](1);
+        roles[0] = PRODUCT_OWNER_ROLE();
+
+        // create target for instane access manager
+        getInstanceService().createGifTarget(
+            getRegistry().getNftId(address(instance)), 
+            address(product), 
+            product.getName(),
+            selectors,
+            roles);
+    }
+
+    function getDomain() public pure override returns(ObjectType) {
+        return PRODUCT();
     }
 
-    function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal override {
-        ISetup.ProductSetupInfo memory initialSetup = abi.decode(
-            initialObjData,
-            (ISetup.ProductSetupInfo)
+
+    function _decodeAndVerifyProductData(bytes memory data) 
+        internal 
+        returns(string memory name, ISetup.ProductSetupInfo memory setup)
+    {
+        (name, setup) = abi.decode(
+            data,
+            (string, ISetup.ProductSetupInfo)
         );
-        instance.createProductSetup(componentNftId, initialSetup);
+
+        // TODO add checks
+        // if(wallet == address(0)) {
+        //     revert WalletIsZero();
+        // }
     }
 
     function setFees(
@@ -84,465 +154,57 @@ contract ProductService is ComponentServiceBase, IProductService {
         Fee memory processingFee
     )
         external
-        override
     {
-        (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        // TODO check args 
+
+        (NftId productNftId, IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
-        NftId productNftId = productInfo.nftId;
 
         ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
+
         productSetupInfo.productFee = productFee;
         productSetupInfo.processingFee = processingFee;
         
         instance.updateProductSetup(productNftId, productSetupInfo, KEEP_STATE());
     }
 
-    // FIXME: this
     function createRisk(
         RiskId riskId,
         bytes memory data
-    ) external override {
-    //     (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-    //     NftId productNftId = productInfo.nftId;
-    //     instance.createRisk(
-    //         riskId,
-    //         productNftId,
-    //         data
-    //     );
-    }
-
-    // FIXME: this
-    function setRiskInfo(
-        RiskId riskId,
-        IRisk.RiskInfo memory info
-    ) external {
-    //     (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-    //     instance.setRiskInfo(
-    //         riskId,
-    //         info
-    //     );
-    }
-
-    // FIXME: this
-    function updateRiskState(
-        RiskId riskId,
-        StateId state
-    ) external {
-    //     (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-    //     instance.updateRiskState(
-    //         riskId,
-    //         state
-    //     );
-    }
-
-    function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
-        IRegistry.ObjectInfo memory productInfo;
-        (productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        product = Product(productInfo.objectAddress);
-    }
-
-    function calculatePremium(
-        RiskId riskId,
-        uint256 sumInsuredAmount,
-        uint256 lifetime,
-        bytes memory applicationData,
-        NftId bundleNftId,
-        ReferralId referralId
     )
-        public
-        view 
+        external 
         override
-        returns (
-            uint256 premiumAmount,
-            uint256 productFeeAmount,
-            uint256 poolFeeAmount,
-            uint256 bundleFeeAmount,
-            uint256 distributionFeeAmount
-        )
-    {
-        Product product = _getAndVerifyInstanceAndProduct();
-        uint256 netPremiumAmount = product.calculateNetPremium(
-            sumInsuredAmount,
-            riskId,
-            lifetime,
-            applicationData
-        );
-
-        (
-            productFeeAmount,
-            poolFeeAmount,
-            bundleFeeAmount,
-            distributionFeeAmount
-        ) = _calculateFeeAmounts(
-            netPremiumAmount,
-            product,
-            bundleNftId,
-            referralId
-        );
-
-        premiumAmount = netPremiumAmount + productFeeAmount;
-        premiumAmount += poolFeeAmount + bundleFeeAmount;
-        premiumAmount += distributionFeeAmount;
-    }
-
-    function _calculateFeeAmounts(
-        uint256 netPremiumAmount,
-        Product product,
-        NftId bundleNftId,
-        ReferralId referralId
-    )
-        internal
-        view
-        returns (
-            uint256 productFeeAmount,
-            uint256 poolFeeAmount,
-            uint256 bundleFeeAmount,
-            uint256 distributionFeeAmount
-        )
     {
-        IInstance instance = product.getInstance();
-        // FIXME: this
-        // ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(product.getNftId());
-        // IBundle.BundleInfo memory bundleInfo = instance.getBundleInfo(bundleNftId);
-        // require(bundleInfo.poolNftId == treasuryInfo.poolNftId,"ERROR:PRS-035:BUNDLE_POOL_MISMATCH");
-
-        // (productFeeAmount,) = FeeLib.calculateFee(treasuryInfo.productFee, netPremiumAmount);
-        // (poolFeeAmount,) = FeeLib.calculateFee(treasuryInfo.poolFee, netPremiumAmount);
-        // (bundleFeeAmount,) = FeeLib.calculateFee(bundleInfo.fee, netPremiumAmount);
-
-        // IRegistry.ObjectInfo memory distributionInfo = getRegistry().getObjectInfo(treasuryInfo.distributionNftId);
-        // IDistributionComponent distribution = IDistributionComponent(distributionInfo.objectAddress);
-        // distributionFeeAmount = distribution.calculateFeeAmount(referralId, netPremiumAmount);
-    }
-
+        (NftId productNftId, IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo(productNftId, data);
 
-    function createApplication(
-        address applicationOwner,
-        RiskId riskId,
-        uint256 sumInsuredAmount,
-        uint256 lifetime,
-        bytes memory applicationData,
-        NftId bundleNftId,
-        ReferralId referralId
-    ) external override returns (NftId policyNftId) {
-        (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        // TODO add validations (see create bundle in pool service)
-
-        policyNftId = getRegistryService().registerPolicy(
-            IRegistry.ObjectInfo(
-                zeroNftId(),
-                productInfo.nftId,
-                POLICY(),
-                false, // intercepting property for policies is defined on product
-                address(0),
-                applicationOwner,
-                ""
-            )
-        );
-
-        (uint256 premiumAmount,,,,) = calculatePremium(
+        instance.createRisk(
             riskId,
-            sumInsuredAmount,
-            lifetime,
-            applicationData,
-            bundleNftId,
-            referralId
+            riskInfo
         );
-
-        // FIXME: this
-        // instance.createPolicyInfo(
-        //     policyNftId,
-        //     productInfo.nftId,
-        //     referralId,
-        //     riskId,
-        //     sumInsuredAmount,
-        //     premiumAmount,
-        //     lifetime,
-        //     bundleNftId
-        // );
-
-        // TODO add logging
     }
 
-    function _getAndVerifyUnderwritingSetup(
-        IInstance instance,
-        IPolicy.PolicyInfo memory policyInfo
-    )
-        internal
-        view
-        returns (
-            ITreasury.TreasuryInfo memory treasuryInfo,
-            NftId bundleNftId,
-            IBundle.BundleInfo memory bundleInfo,
-            uint256 collateralAmount
-        )
-    {
-        // FIXME: this
-        // check match between policy and bundle (via pool)
-        // treasuryInfo = instance.getTreasuryInfo(policyInfo.productNftId);
-        // bundleNftId = policyInfo.bundleNftId;
-        // bundleInfo = instance.getBundleInfo(bundleNftId);
-        // require(bundleInfo.poolNftId == treasuryInfo.poolNftId, "POLICY_BUNDLE_MISMATCH");
-
-        // // calculate required collateral
-        // NftId poolNftId = treasuryInfo.poolNftId;
-        // ISetup.PoolSetupInfo memory poolInfo = instance.getPoolInfo(poolNftId);
-
-        // // obtain remaining return values
-        // collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
-    }
-
-    function _lockCollateralInBundle(
-        IInstance instance,
-        NftId bundleNftId, 
-        IBundle.BundleInfo memory bundleInfo,
-        NftId policyNftId, 
-        uint256 collateralAmount
-    )
-        internal
-        returns (IBundle.BundleInfo memory)
-    {
-        bundleInfo.lockedAmount += collateralAmount;
-        // FIXME: this
-        // instance.collateralizePolicy(bundleNftId, policyNftId, collateralAmount);
-        return bundleInfo;
-    }
-
-    function _underwriteByPool(
-        ITreasury.TreasuryInfo memory treasuryInfo,
-        NftId policyNftId,
-        IPolicy.PolicyInfo memory policyInfo,
-        bytes memory bundleFilter,
-        uint256 collateralAmount
-    )
-        internal
-    {
-        address poolAddress = getRegistry().getObjectInfo(treasuryInfo.poolNftId).objectAddress;
-        IPoolComponent pool = IPoolComponent(poolAddress);
-        pool.underwrite(
-            policyNftId, 
-            policyInfo.applicationData, 
-            bundleFilter,
-            collateralAmount);
-    }
-
-
-    function revoke(
-        NftId policyNftId
+    function updateRisk(
+        RiskId riskId,
+        bytes memory data
     )
         external
-        override
-    {
-        require(false, "ERROR:PRS-234:NOT_YET_IMPLEMENTED");
-    }
-
-
-    function underwrite(
-        NftId policyNftId,
-        bool requirePremiumPayment,
-        Timestamp activateAt
-    )
-        external 
-        override
-    {
-        // check caller is registered product
-        (
-            IRegistry.ObjectInfo memory productInfo, 
-            IInstance instance
-        ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-
-        // check match between policy and calling product
-        NftId productNftId = productInfo.nftId;
-        // FIXME: this
-        // IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
-        // require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
-        // require(instance.getState(policyNftId.toKey32(POLICY())) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
-
-        // ITreasury.TreasuryInfo memory treasuryInfo;
-        // NftId bundleNftId;
-        // IBundle.BundleInfo memory bundleInfo;
-        // uint256 collateralAmount;
-
-        // (
-        //     treasuryInfo,
-        //     bundleNftId,
-        //     bundleInfo,
-        //     collateralAmount
-        // ) = _getAndVerifyUnderwritingSetup(
-        //     instance,
-        //     policyInfo
-        // );
-
-        // // lock bundle collateral
-        // bundleInfo = _lockCollateralInBundle(
-        //     instance,
-        //     bundleNftId,
-        //     bundleInfo,
-        //     policyNftId, 
-        //     collateralAmount);
-
-        // // set policy state to underwritten
-        // instance.updatePolicyState(policyNftId, UNDERWRITTEN());
-
-        // // optional activation of policy
-        // if(activateAt > zeroTimestamp()) {
-        //     policyInfo.activatedAt = activateAt;
-        //     policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
-
-        //     instance.updatePolicyState(policyNftId, ACTIVE());
-        // }
-
-        // // optional collection of premium
-        // if(requirePremiumPayment) {
-        //     uint256 netPremiumAmount = _processPremiumByTreasury(
-        //         instance, 
-        //         productInfo.nftId,
-        //         treasuryInfo, 
-        //         policyNftId, 
-        //         policyInfo.premiumAmount);
-
-        //     policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
-        //     bundleInfo.balanceAmount += netPremiumAmount;
-        // }
-
-        // instance.setPolicyInfo(policyNftId, policyInfo);
-        // instance.setBundleInfo(bundleNftId, bundleInfo);
-
-        // // involve pool if necessary
-        // {
-        //     NftId poolNftId = treasuryInfo.poolNftId;
-        //     ISetup.PoolSetupInfo memory poolInfo = instance.getPoolInfo(poolNftId);
-
-        //     if(poolInfo.isVerifying) {
-        //         _underwriteByPool(
-        //             treasuryInfo,
-        //             policyNftId,
-        //             policyInfo,
-        //             bundleInfo.filter,
-        //             collateralAmount
-        //         );
-        //     }
-        // }
-
-        // TODO add logging
-    }
-
-    function calculateRequiredCollateral(UFixed collateralizationLevel, uint256 sumInsuredAmount) public pure override returns(uint256 collateralAmount) {
-        UFixed sumInsuredUFixed = UFixedLib.toUFixed(sumInsuredAmount);
-        UFixed collateralUFixed =  collateralizationLevel * sumInsuredUFixed;
-        return collateralUFixed.toInt();
-    } 
-
-    function collectPremium(NftId policyNftId, Timestamp activateAt) external override {
-        // check caller is registered product
-        (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-
-        // perform actual token transfers
-        // FIXME: this
-        // IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
-        // ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productInfo.nftId);
-
-        // uint256 premiumAmount = policyInfo.premiumAmount;
-        // _processPremiumByTreasury(instance, productInfo.nftId, treasuryInfo, policyNftId, premiumAmount);
-
-        // // policy level book keeping for premium paid
-        // policyInfo.premiumPaidAmount += premiumAmount;
-
-        // // optional activation of policy
-        // if(activateAt > zeroTimestamp()) {
-        //     require(
-        //         policyInfo.activatedAt.eqz(),
-        //         "ERROR:PRS-030:ALREADY_ACTIVATED");
-
-        //     policyInfo.activatedAt = activateAt;
-        //     policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
-
-        //     instance.updatePolicyState(policyNftId, ACTIVE());
-        // }
-
-        // instance.setPolicyInfo(policyNftId, policyInfo);
-
-        // TODO add logging
-    }
-
-    // FIXME: this
-    function activate(NftId policyNftId, Timestamp activateAt) external override {
-        // check caller is registered product
-        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-
-        // IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
-
-        // require(
-        //     policyInfo.activatedAt.eqz(),
-        //     "ERROR:PRS-020:ALREADY_ACTIVATED");
-
-        // policyInfo.activatedAt = activateAt;
-        // policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
-
-        // instance.setPolicyInfo(policyNftId, policyInfo);
-        // instance.updatePolicyState(policyNftId, ACTIVE());
-
-        // TODO add logging
-    }
-
-    function close(
-        NftId policyNftId
-    ) external override // solhint-disable-next-line no-empty-blocks
     {
+        (,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
 
+        IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
+        riskInfo.data = data;
+        instance.updateRisk(riskId, riskInfo, KEEP_STATE());
     }
 
-    function _getPoolNftId(
-        IInstance instance,
-        NftId productNftId
-    )
-        internal
-        view
-        returns (NftId poolNftid)
-    {
-        // FIXME: this
-        // return instance.getTreasuryInfo(productNftId).poolNftId;
-    }
-
-
-    function _processPremiumByTreasury(
-        IInstance instance,
-        NftId productNftId,
-        ITreasury.TreasuryInfo memory treasuryInfo,
-        NftId policyNftId,
-        uint256 premiumAmount
+    function updateRiskState(
+        RiskId riskId,
+        StateId state
     )
-        internal
-        returns (uint256 netPremiumAmount)
+        external
     {
-        // process token transfer(s)
-        if(premiumAmount > 0) {
-            // FIXME: this
-            // TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
-            // address policyOwner = getRegistry().ownerOf(policyNftId);
-            // address poolWallet = instance.getComponentWallet(treasuryInfo.poolNftId);
-            // netPremiumAmount = premiumAmount;
-            // Fee memory productFee = treasuryInfo.productFee;
-
-            // if (FeeLib.feeIsZero(productFee)) {
-            //     tokenHandler.transfer(
-            //         policyOwner,
-            //         poolWallet,
-            //         premiumAmount
-            //     );
-            // } else {
-            //     (uint256 feeAmount, uint256 netAmount) = instance.calculateFeeAmount(
-            //         premiumAmount,
-            //         productFee
-            //     );
-
-            //     address productWallet = instance.getComponentWallet(productNftId);
-            //     tokenHandler.transfer(policyOwner, productWallet, feeAmount);
-            //     tokenHandler.transfer(policyOwner, poolWallet, netAmount);
-            //     netPremiumAmount = netAmount;
-            // }
-        }
-
-        // TODO add logging
+        (,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        instance.updateRiskState(riskId, state);
     }
 }

package/contracts/instance/service/ProductServiceManager.sol

@@ -16,7 +16,7 @@ contract ProductServiceManager is ProxyManager {
     constructor(
         address registryAddress
     )
-        ProxyManager()
+        ProxyManager(registryAddress)
     {
         ProductService svc = new ProductService();
         bytes memory data = abi.encode(registryAddress, address(this));
@@ -39,7 +39,7 @@ contract ProductServiceManager is ProxyManager {
         //    address(_productService));
 
         // implies that after this constructor call only upgrade functionality is available
-        _isDeployed = true;
+        // _isDeployed = true;
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/registry/ChainNft.sol

@@ -59,7 +59,7 @@ contract ChainNft is ERC721Enumerable {
         }
 
         _chainIdMultiplier = 10 ** _chainIdDigits;
-        _idNext = 4;
+        _idNext = 3;
     }
 
     /**
@@ -95,6 +95,10 @@ contract ChainNft is ERC721Enumerable {
 
         _totalMinted++;
         _safeMint(to, tokenId);
+
+        if(interceptor != address(0)) {
+            ITransferInterceptor(interceptor).nftMint(to, tokenId);
+        }
     }
 
 
@@ -195,6 +199,10 @@ contract ChainNft is ERC721Enumerable {
             _chainIdDigits;
     }
 
+    function getNextTokenId() external view returns (uint256) {
+        return calculateTokenId(_idNext);
+    }
+
     function _getNextTokenId() private returns (uint256 id) {
         id = calculateTokenId(_idNext);
         _idNext++;