feat: update to support 2 subscription addresses

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/sdk",
-  "version": "3.0.17",
+  "version": "3.0.18-rc0",
   "description": "Javascript SDK for connecting with Nevermined Data Platform ",
   "main": "./dist/node/sdk.js",
   "typings": "./dist/node/sdk.d.ts",

src/nevermined/NvmApp.ts

@@ -1,7 +1,7 @@
+import { SmartAccountSigner } from 'permissionless/accounts'
 import { NETWORK_FEE_DENOMINATOR } from '../constants/AssetConstants'
 import { DDO } from '../ddo/DDO'
 import { Web3Error } from '../errors/NeverminedErrors'
-import { ContractHandler } from '../keeper/ContractHandler'
 import { AssetPrice } from '../models/AssetPrice'
 import { NFTAttributes } from '../models/NFTAttributes'
 import { NeverminedOptions } from '../models/NeverminedOptions'
@@ -28,7 +28,6 @@ import { CreateProgressStep, OrderProgressStep, UpdateProgressStep } from './Pro
 import { SearchApi } from './api/SearchApi'
 import { ServicesApi } from './api/ServicesApi'
 import { createKernelClient, isValidAddress } from './utils/BlockchainViemUtils'
-import { SmartAccountSigner } from 'permissionless/accounts'
 
 export enum NVMAppEnvironments {
   Staging = 'staging',
@@ -71,7 +70,8 @@ export class NvmApp {
   private zeroDevSignerAccount: SmartAccountSigner<'custom', `0x${string}`> | undefined
   public assetProviders: string[] = []
   private loginCredentials: string | undefined
-  private subscriptionNFTContractAddress: string | undefined
+  private subscriptionNFTContractTimeAddress: string | undefined
+  private subscriptionNFTContractCredtisAddress: string | undefined
   private networkFeeReceiver: string | undefined
   private networkFee: bigint | undefined
 
@@ -184,21 +184,17 @@ export class NvmApp {
     const nodeInfo = await this.fullSDK.services.node.getNeverminedNodeInfo()
     this.assetProviders = [nodeInfo['provider-address']]
 
-    if (!isValidAddress(this.configNVM.nftContractAddress as string)) {
-      const contractABI = await ContractHandler.getABIArtifact(
-        'NFT1155SubscriptionUpgradeable',
-        this.configNVM.artifactsFolder,
-        await this.fullSDK.keeper.getNetworkName(),
-        this.configNVM.chainId,
-      )
-      this.subscriptionNFTContractAddress = contractABI.address
-    } else {
-      this.subscriptionNFTContractAddress = this.configNVM.nftContractAddress
+    this.subscriptionNFTContractTimeAddress = this.configNVM.nftContractTimeAddress
+    this.subscriptionNFTContractCredtisAddress = this.configNVM.nftContractCreditsAddress
+
+    if (!isValidAddress(this.subscriptionNFTContractTimeAddress as string)) {
+      throw new Web3Error('Invalid Subscription NFT contract time address')
     }
-    if (!isValidAddress(this.subscriptionNFTContractAddress as string)) {
-      throw new Web3Error('Invalid Subscription NFT contract address')
+    if (!isValidAddress(this.subscriptionNFTContractCredtisAddress as string)) {
+      throw new Web3Error('Invalid Subscription NFT contract credits address')
     }
-    this.sdk.contracts.loadNft1155(this.subscriptionNFTContractAddress as string)
+    this.sdk.contracts.loadNft1155(this.subscriptionNFTContractTimeAddress as string)
+    this.sdk.contracts.loadNft1155(this.subscriptionNFTContractCredtisAddress as string)
     this.networkFeeReceiver = await this.fullSDK.keeper.nvmConfig.getFeeReceiver()
     this.networkFee = await this.fullSDK.keeper.nvmConfig.getNetworkFee()
     return {
@@ -325,7 +321,7 @@ export class NvmApp {
         },
       ],
       providers: this.assetProviders,
-      nftContractAddress: this.subscriptionNFTContractAddress,
+      nftContractAddress: this.subscriptionNFTContractTimeAddress,
       preMint: false,
     })
 
@@ -397,7 +393,7 @@ export class NvmApp {
         },
       ],
       providers: this.assetProviders,
-      nftContractAddress: this.subscriptionNFTContractAddress,
+      nftContractAddress: this.subscriptionNFTContractCredtisAddress,
       preMint: false,
     })
 
@@ -714,7 +710,6 @@ export class NvmApp {
         },
       ],
       providers: this.assetProviders,
-      nftContractAddress: this.subscriptionNFTContractAddress,
       preMint: false,
     })
 
@@ -782,7 +777,6 @@ export class NvmApp {
         },
       ],
       providers: this.assetProviders,
-      nftContractAddress: this.subscriptionNFTContractAddress,
       preMint: false,
     })
 

src/nevermined/resources/AppNetworks.ts

@@ -2,7 +2,8 @@ import { NeverminedOptions } from '../../models'
 
 export class NeverminedAppOptions extends NeverminedOptions {
   instanceName: string
-  nftContractAddress?: string
+  nftContractTimeAddress?: string
+  nftContractCreditsAddress?: string
   tokenAddress?: string // ERC-20 token address or zero address (0x000..) for native token
 }
 
@@ -18,7 +19,8 @@ export class AppDeploymentLocal extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 0
   gasPriceMultiplier = 0
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
 }
 
 export class AppDeploymentStaging extends NeverminedAppOptions {
@@ -33,7 +35,8 @@ export class AppDeploymentStaging extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 0
   gasPriceMultiplier = 0
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
   tokenAddress = '0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d'
 }
 
@@ -49,7 +52,8 @@ export class AppDeploymentTesting extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 0
   gasPriceMultiplier = 0
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
   tokenAddress = '0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d'
 }
 
@@ -65,7 +69,8 @@ export class AppDeploymentArbitrum extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 0
   gasPriceMultiplier = 0
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
   tokenAddress = '0xaf88d065e77c8cC2239327C5EDb3A432268e5831'
 }
 
@@ -81,7 +86,8 @@ export class AppDeploymentGnosis extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 0
   gasPriceMultiplier = 0
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
   tokenAddress = '0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83'
 }
 
@@ -97,7 +103,8 @@ export class AppDeploymentMatic extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 1.2
   gasPriceMultiplier = 1.2
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
   tokenAddress = '0x2791bca1f2de4661ed88a30c99a7a9449aa84174'
 }
 
@@ -113,7 +120,8 @@ export class AppDeploymentBase extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 0
   gasPriceMultiplier = 0
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
   tokenAddress = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'
 }
 
@@ -129,7 +137,8 @@ export class AppDeploymentCelo extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 0
   gasPriceMultiplier = 0
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
   tokenAddress = '0xef4229c8c3250C675F21BCefa42f58EfbfF6002a'
 }
 
@@ -145,6 +154,7 @@ export class AppDeploymentOptimism extends NeverminedAppOptions {
   verbose = true
   gasMultiplier = 0
   gasPriceMultiplier = 0
-  nftContractAddress = undefined
+  nftContractTimeAddress = undefined
+  nftContractCreditsAddress = undefined
   tokenAddress = '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85'
 }