Add confidential EVM flag when creating a datatoken 4 in NFT class

CodeExamples.md

@@ -289,7 +289,11 @@ you need to mint oceans to mentioned accounts only if you are using barge to tes
 
   ### 6.1 Publish a dataset (create NFT + Datatoken) with a fixed rate exchange
 ```Typescript
-    const factory = new NftFactory(addresses.ERC721Factory, publisherAccount)
+    const factory = new NftFactory(
+      addresses.ERC721Factory,
+      publisherAccount,
+      await publisherAccount.getChainId()
+    )
 
     const nftParams: NftCreateData = {
       name: FRE_NFT_NAME,
@@ -409,7 +413,11 @@ Now let's console log the DID to check everything is working
 
   ### 6.3 Marketplace displays fixed rate asset for sale
 ```Typescript
-    const fixedRate = new FixedRateExchange(freAddress, publisherAccount)
+    const fixedRate = new FixedRateExchange(
+      freAddress,
+      publisherAccount,
+      await publisherAccount.getChainId()
+    )
     const oceanAmount = await (
       await fixedRate.calcBaseInGivenDatatokensOut(freId, '1')
     ).baseTokenAmount
@@ -424,7 +432,7 @@ Now that the market has fetched those values it can display the asset on the fro
 
   ### 7.1 Consumer buys a fixed rate asset data asset, and downloads it
 ```Typescript
-    datatoken = new Datatoken(publisherAccount)
+    datatoken = new Datatoken(publisherAccount, await publisherAccount.getChainId())
     const DATATOKEN_AMOUNT = '10000'
 
     await datatoken.mint(
@@ -473,7 +481,11 @@ Before we call the contract we have to call `approve` so that the contract can m
       DATATOKEN_AMOUNT
     )
 
-    const fixedRate = new FixedRateExchange(freAddress, consumerAccount)
+    const fixedRate = new FixedRateExchange(
+      freAddress,
+      consumerAccount,
+      await consumerAccount.getChainId()
+    )
 ```
 Now we can make the contract call
 ```Typescript
@@ -517,7 +529,7 @@ Next, we need to initialize the provider
       validUntil: initializeData.providerFee.validUntil
     }
 
-    datatoken = new Datatoken(consumerAccount)
+    datatoken = new Datatoken(consumerAccount, await consumerAccount.getChainId())
 
 ```
 Lets now make the payment
@@ -574,7 +586,11 @@ Lets check that the download URL was successfully received
 
   ### 8.1 Publish a dataset (create NFT + Datatoken) with a dispenser
 ```Typescript
-    const factory = new NftFactory(addresses.ERC721Factory, publisherAccount)
+    const factory = new NftFactory(
+      addresses.ERC721Factory,
+      publisherAccount,
+      await publisherAccount.getChainId()
+    )
 
     const nftParams: NftCreateData = {
       name: DISP_NFT_NAME,
@@ -679,8 +695,12 @@ Now we need to encrypt file(s) using provider
 
   ### 9.1 Consumer gets a dispenser data asset, and downloads it
 ```Typescript
-    datatoken = new Datatoken(publisherAccount)
-    const dispenser = new Dispenser(addresses.Dispenser, consumerAccount)
+    datatoken = new Datatoken(publisherAccount, await publisherAccount.getChainId())
+    const dispenser = new Dispenser(
+      addresses.Dispenser,
+      consumerAccount,
+      await consumerAccount.getChainId()
+    )
 
     let consumerDTBalance = await balance(
       consumerAccount,
@@ -709,7 +729,7 @@ Now we need to encrypt file(s) using provider
     const resolvedDDO = await aquarius.waitForAqua(fixedDDO.id)
     assert(resolvedDDO, 'Cannot fetch DDO from Aquarius')
 
-    datatoken = new Datatoken(consumerAccount)
+    datatoken = new Datatoken(consumerAccount, await consumerAccount.getChainId())
 
 ```
 At this point we need to encrypt file(s) using provider
@@ -791,7 +811,7 @@ Here are the steps:
   ### 10.1 Add key-value pair to data NFT
 Let's start by using the `setData` method to update the nft key value store with some data
 ```Typescript
-    const nft = new Nft(publisherAccount)
+    const nft = new Nft(publisherAccount, await publisherAccount.getChainId())
     const data = 'SomeData'
     try {
       await nft.setData(

ComputeExamples.md

@@ -293,7 +293,11 @@ async function createAsset(
 ) {
   const nft = new Nft(owner, (await owner.provider.getNetwork()).chainId)
 
-  const nftFactory = new NftFactory(addresses.ERC721Factory, owner)
+  const nftFactory = new NftFactory(
+    addresses.ERC721Factory,
+    owner,
+    await owner.getChainId()
+  )
 
   const chain = (await owner.provider.getNetwork()).chainId
 

src/config/Config.ts

@@ -1,6 +1,8 @@
 import { AbiItem } from '../@types'
 import { LogLevel } from '../utils'
 
+type SDK = 'evm' | 'oasis'
+
 export class Config {
   /**
    * Ethereum node URL.
@@ -187,6 +189,6 @@ export class Config {
   veFeeEstimate?: string
 
   // is confidential evm
-  confidentialEVM?: boolean
+  sdk?: SDK
   accessListFactory?: string
 }

src/config/ConfigHelper.ts

@@ -35,11 +35,12 @@ export const configHelperNetworks: Config[] = [
     // comment th following configs if running on macOS
     metadataCacheUri: 'http://172.15.0.5:5000',
     providerUri: 'http://172.15.0.4:8030',
-    subgraphUri: 'https://172.15.0.15:8000'
+    subgraphUri: 'https://172.15.0.15:8000',
     // uncomment the following configs if running on macOS
     // metadataCacheUri: 'http://127.0.0.1:5000',
     // providerUri: 'http://127.0.0.1:8030/',
     // subgraphUri: 'http://127.0.0.1:9000/'
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -48,7 +49,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://sepolia.infura.io/v3',
     subgraphUri: 'https://v4.subgraph.sepolia.oceanprotocol.com',
     explorerUri: 'https://sepolia.etherscan.io',
-    gasFeeMultiplier: 1.1
+    gasFeeMultiplier: 1.1,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -61,7 +63,8 @@ export const configHelperNetworks: Config[] = [
     transactionBlockTimeout: 150,
     transactionConfirmationBlocks: 5,
     transactionPollingTimeout: 1750,
-    gasFeeMultiplier: 1.05
+    gasFeeMultiplier: 1.05,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -71,7 +74,8 @@ export const configHelperNetworks: Config[] = [
     subgraphUri: 'https://v4.subgraph.polygon.oceanprotocol.com',
     explorerUri: 'https://polygonscan.com',
     oceanTokenSymbol: 'mOCEAN',
-    gasFeeMultiplier: 1.6
+    gasFeeMultiplier: 1.6,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -80,7 +84,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://rpc.gaiaxtestnet.oceanprotocol.com',
     providerUri: 'https://v4.provider.gaiaxtestnet.oceanprotocol.com',
     subgraphUri: 'https://v4.subgraph.gaiaxtestnet.oceanprotocol.com',
-    explorerUri: 'https://blockscout.gaiaxtestnet.oceanprotocol.com'
+    explorerUri: 'https://blockscout.gaiaxtestnet.oceanprotocol.com',
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -89,7 +94,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://polygon-mumbai.infura.io/v3',
     subgraphUri: 'https://v4.subgraph.mumbai.oceanprotocol.com',
     explorerUri: 'https://mumbai.polygonscan.com',
-    gasFeeMultiplier: 1.1
+    gasFeeMultiplier: 1.1,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -98,7 +104,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://bsc-dataseed.binance.org',
     subgraphUri: 'https://v4.subgraph.bsc.oceanprotocol.com',
     explorerUri: 'https://bscscan.com/',
-    gasFeeMultiplier: 1.05
+    gasFeeMultiplier: 1.05,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -107,7 +114,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://rpc.energyweb.org',
     subgraphUri: 'https://v4.subgraph.energyweb.oceanprotocol.com',
     explorerUri: 'https://explorer.energyweb.org',
-    gasFeeMultiplier: 1.05
+    gasFeeMultiplier: 1.05,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -116,7 +124,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://moonriver.api.onfinality.io/public',
     subgraphUri: 'https://v4.subgraph.moonriver.oceanprotocol.com',
     explorerUri: 'https://moonriver.moonscan.io/',
-    gasFeeMultiplier: 1.05
+    gasFeeMultiplier: 1.05,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -127,7 +136,8 @@ export const configHelperNetworks: Config[] = [
     providerUri: 'https://provider.v4.genx.delta-dao.com',
     subgraphUri: 'https://subgraph.v4.genx.minimal-gaia-x.eu',
     explorerUri: 'https://explorer.genx.minimal-gaia-x.eu/',
-    gasFeeMultiplier: 1
+    gasFeeMultiplier: 1,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -136,7 +146,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://mainnet.optimism.io',
     subgraphUri: 'https://v4.subgraph.optimism.oceanprotocol.com',
     explorerUri: 'https://optimistic.etherscan.io/',
-    gasFeeMultiplier: 1.1
+    gasFeeMultiplier: 1.1,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -145,7 +156,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://sepolia.optimism.io',
     subgraphUri: 'https://v4.subgraph.optimism-sepolia.oceanprotocol.com',
     explorerUri: 'https://sepolia-optimism.etherscan.io/',
-    gasFeeMultiplier: 1.1
+    gasFeeMultiplier: 1.1,
+    sdk: 'evm'
   },
   {
     ...configHelperNetworksBase,
@@ -154,7 +166,8 @@ export const configHelperNetworks: Config[] = [
     nodeUri: 'https://sapphire.oasis.io',
     subgraphUri: 'https://v4.subgraph.sapphire-mainnet.oceanprotocol.com/',
     explorerUri: 'https://explorer.oasis.io/mainnet/sapphire/',
-    gasFeeMultiplier: 1
+    gasFeeMultiplier: 1,
+    sdk: 'oasis'
   },
   {
     ...configHelperNetworksBase,
@@ -164,7 +177,8 @@ export const configHelperNetworks: Config[] = [
     subgraphUri:
       'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
     explorerUri: 'https://explorer.oasis.io/testnet/sapphire/',
-    gasFeeMultiplier: 1
+    gasFeeMultiplier: 1,
+    sdk: 'oasis'
   },
   {
     ...configHelperNetworksBase,
@@ -174,7 +188,8 @@ export const configHelperNetworks: Config[] = [
     metadataCacheUri: 'https://aquarius.dev.pontus-x.eu',
     providerUri: 'https://provider.dev.pontus-x.eu',
     subgraphUri: 'https://subgraph.dev.pontus-x.eu',
-    explorerUri: 'https://explorer.dev.pontus-x.eu/testnet/pontusx'
+    explorerUri: 'https://explorer.dev.pontus-x.eu/testnet/pontusx',
+    sdk: 'evm'
   }
 ]
 
@@ -315,14 +330,17 @@ export class ConfigHelper {
         addresses
       )
     }
-    config.confidentialEVM =
-      filterBy === 'chainId'
-        ? KNOWN_CONFIDENTIAL_EVMS.includes(Number(network))
-        : network.toString().includes('oasis_sap')
-    if (config.confidentialEVM) {
-      config.accessListFactory = contractAddressesConfig.accessListFactory
+
+    if (!('sdk' in config) || config.sdk === null) {
+      if (KNOWN_CONFIDENTIAL_EVMS.includes(config.chainId)) {
+        config.sdk = 'oasis'
+      } else {
+        config.sdk = 'evm'
+      }
     }
 
+    config.accessListFactory = contractAddressesConfig.accessListFactory
+
     config = { ...config, ...contractAddressesConfig }
 
     const nodeUri = infuraProjectId

src/contracts/AccessList.ts

@@ -96,10 +96,9 @@ export class AccessListContract extends SmartContractWithAddress {
   ): Promise<ReceiptOrEstimate<G>> {
     const estGas = await this.contract.estimateGas.mint(user, tokenUri)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
-
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      this.getSignerAccordingSdk(),
       this.config?.gasFeeMultiplier,
       this.contract.mint,
       user,
@@ -122,10 +121,9 @@ export class AccessListContract extends SmartContractWithAddress {
   ): Promise<ReceiptOrEstimate<G>> {
     const estGas = await this.contract.estimateGas.batchMint(users, tokenUris)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
-
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      this.getSignerAccordingSdk(),
       this.config?.gasFeeMultiplier,
       this.contract.batchMint,
       users,
@@ -146,10 +144,9 @@ export class AccessListContract extends SmartContractWithAddress {
   ): Promise<ReceiptOrEstimate<G>> {
     const estGas = await this.contract.estimateGas.burn(tokenId)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
-
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      this.getSignerAccordingSdk(),
       this.config?.gasFeeMultiplier,
       this.contract.burn,
       tokenId
@@ -169,10 +166,9 @@ export class AccessListContract extends SmartContractWithAddress {
   ): Promise<ReceiptOrEstimate<G>> {
     const estGas = await this.contract.estimateGas.transferOwnership(newOwner)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
-
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      this.getSignerAccordingSdk(),
       this.config?.gasFeeMultiplier,
       this.contract.transferOwnership,
       newOwner
@@ -190,10 +186,9 @@ export class AccessListContract extends SmartContractWithAddress {
   ): Promise<ReceiptOrEstimate<G>> {
     const estGas = await this.contract.estimateGas.renounceOwnership()
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
-
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      this.getSignerAccordingSdk(),
       this.config?.gasFeeMultiplier,
       this.contract.renounceOwnership
     )

src/contracts/AccessListFactory.ts

@@ -70,7 +70,7 @@ export class AccesslistFactory extends SmartContractWithAddress {
     try {
       const tx = await sendTx(
         estGas,
-        this.signer,
+        this.getSignerAccordingSdk(),
         this.config?.gasFeeMultiplier,
         this.contract.deployAccessListContract,
         nameAccessList,
@@ -144,10 +144,9 @@ export class AccesslistFactory extends SmartContractWithAddress {
 
     const estGas = await this.contract.estimateGas.changeTemplateAddress(templateAddress)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
-
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      this.getSignerAccordingSdk(),
       this.config?.gasFeeMultiplier,
       this.contract.functions.changeTemplateAddress,
       templateAddress