Issue 1841 pub flow - createAsset Fn

.github/workflows/ci.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -35,11 +35,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -71,21 +71,21 @@ jobs:
           ls -la "$HOME/.ocean/ocean-contracts/artifacts/"
       - run: npm run build:metadata
       - run: npm run test:unit:cover
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: coverage
+          name: coverage-unit
           path: coverage/
 
   test_integration:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -143,9 +143,9 @@ jobs:
         run: docker logs ocean_aquarius_1 && docker logs ocean_provider_1 && docker logs ocean_provider2_1 && docker logs ocean_computetodata_1
         if: ${{ failure() }}
       - name: Upload coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: coverage
+          name: coverage-integration
           path: coverage/
 
   build:
@@ -159,11 +159,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -180,9 +180,12 @@ jobs:
     if: ${{ success() && github.actor != 'dependabot[bot]' }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
-          name: coverage
+          name: coverage-unit
+      - uses: actions/download-artifact@v4
+        with:
+          name: coverage-integration
 
       - uses: paambaati/codeclimate-action@v2.7.5
         env:
@@ -197,7 +200,7 @@ jobs:
     needs: [test_unit, test_integration]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
 

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
       NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
           registry-url: https://registry.npmjs.org/

package.json

@@ -53,7 +53,7 @@
     "web3": "^1.8.0"
   },
   "dependencies": {
-    "@oceanprotocol/contracts": "^2.0.3",
+    "@oceanprotocol/contracts": "^2.2.0",
     "cross-fetch": "^4.0.0",
     "crypto-js": "^4.1.1",
     "decimal.js": "^10.4.1",

src/@types/Datatoken.ts

@@ -10,6 +10,10 @@ export interface DatatokenCreateParams {
   cap: string
   name?: string
   symbol?: string
+  filesObject?: any // file object for template 4
+  accessListFactory?: string // access list factory address
+  allowAccessList?: string //  Allow List Contract (if any)
+  denyAccessList?: string // Deny List Contract (if any)
 }
 
 export interface ConsumeMarketFee {

src/config/Config.ts

@@ -179,4 +179,8 @@ export class Config {
   DFRewards?: string
   DFStrategyV1?: string
   veFeeEstimate?: string
+
+  // is confidential evm
+  confidentialEVM?: boolean
+  accessListFactory?: string
 }

src/config/ConfigHelper.ts

@@ -156,6 +156,16 @@ export const configHelperNetworks: Config[] = [
     explorerUri: 'https://explorer.oasis.io/mainnet/sapphire/',
     gasFeeMultiplier: 1
   },
+  {
+    ...configHelperNetworksBase,
+    chainId: 23295,
+    network: 'oasis_sapphire_testnet',
+    nodeUri: 'https://testnet.sapphire.oasis.dev',
+    subgraphUri:
+      'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
+    explorerUri: 'https://explorer.oasis.io/testnet/sapphire/',
+    gasFeeMultiplier: 1
+  },
   {
     ...configHelperNetworksBase,
     chainId: 32456,
@@ -168,6 +178,11 @@ export const configHelperNetworks: Config[] = [
   }
 ]
 
+export const KNOWN_CONFIDENTIAL_EVMS = [
+  23294, // oasis_sapphire
+  23295 // oasis_sapphire_testnet
+]
+
 export class ConfigHelper {
   /* Load contract addresses from env ADDRESS_FILE (generated by ocean-contracts) */
   public getAddressesFromEnv(network: string, customAddresses?: any): Partial<Config> {
@@ -190,7 +205,8 @@ export class ConfigHelper {
         veDelegationProxy,
         DFRewards,
         DFStrategyV1,
-        veFeeEstimate
+        veFeeEstimate,
+        AccessListFactory
       } = customAddresses[network]
       configAddresses = {
         nftFactoryAddress: ERC721Factory,
@@ -208,6 +224,7 @@ export class ConfigHelper {
         DFRewards,
         DFStrategyV1,
         veFeeEstimate,
+        accessListFactory: AccessListFactory,
         ...(process.env.AQUARIUS_URL && { metadataCacheUri: process.env.AQUARIUS_URL }),
         ...(process.env.PROVIDER_URL && { providerUri: process.env.PROVIDER_URL })
       }
@@ -229,7 +246,8 @@ export class ConfigHelper {
           veDelegationProxy,
           DFRewards,
           DFStrategyV1,
-          veFeeEstimate
+          veFeeEstimate,
+          AccessListFactory
         } = DefaultContractsAddresses[network]
         configAddresses = {
           nftFactoryAddress: ERC721Factory,
@@ -247,6 +265,7 @@ export class ConfigHelper {
           DFRewards,
           DFStrategyV1,
           veFeeEstimate,
+          accessListFactory: AccessListFactory,
           ...(process.env.AQUARIUS_URL && { metadataCacheUri: process.env.AQUARIUS_URL }),
           ...(process.env.PROVIDER_URL && { providerUri: process.env.PROVIDER_URL })
         }
@@ -263,6 +282,7 @@ export class ConfigHelper {
    */
   public getConfig(network: string | number, infuraProjectId?: string): Config {
     const filterBy = typeof network === 'string' ? 'network' : 'chainId'
+
     let config = configHelperNetworks.find((c) => c[filterBy] === network)
 
     if (!config) {
@@ -282,7 +302,23 @@ export class ConfigHelper {
       console.log(e)
       addresses = null
     }
-    const contractAddressesConfig = this.getAddressesFromEnv(config.network, addresses)
+
+    let contractAddressesConfig = this.getAddressesFromEnv(config.network, addresses)
+    // check oasis network name typos on addresses.json
+    if (!contractAddressesConfig && KNOWN_CONFIDENTIAL_EVMS.includes(config.chainId)) {
+      contractAddressesConfig = this.getAddressesFromEnv(
+        config.network.replace('sapph', 'saph'),
+        addresses
+      )
+    }
+    config.confidentialEVM =
+      filterBy === 'chainId'
+        ? KNOWN_CONFIDENTIAL_EVMS.includes(Number(network))
+        : network.toString().includes('oasis_sap')
+    if (config.confidentialEVM) {
+      config.accessListFactory = contractAddressesConfig.accessListFactory
+    }
+
     config = { ...config, ...contractAddressesConfig }
 
     const nodeUri = infuraProjectId

src/contracts/NFTFactory.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from 'ethers'
+import { BigNumber, ethers } from 'ethers'
 import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
 import {
   generateDtName,
@@ -570,20 +570,39 @@ export class NftFactory extends SmartContractWithAddress {
       }
     }
 
+    // common stuff for other templates
+    const addresses = [
+      dtParams.minter,
+      dtParams.paymentCollector,
+      dtParams.mpFeeAddress,
+      dtParams.feeToken
+    ]
+
+    if (dtParams.filesObject) {
+      // template 4 only, ignored for others
+      if (dtParams.accessListFactory) {
+        addresses.push(dtParams.accessListFactory)
+      }
+      if (dtParams.allowAccessList) {
+        addresses.push(dtParams.allowAccessList)
+      }
+
+      if (dtParams.denyAccessList) {
+        addresses.push(dtParams.denyAccessList)
+      }
+    }
+
     return {
       templateIndex: dtParams.templateIndex,
       strings: [dtParams.name || name, dtParams.symbol || symbol],
-      addresses: [
-        dtParams.minter,
-        dtParams.paymentCollector,
-        dtParams.mpFeeAddress,
-        dtParams.feeToken
-      ],
+      addresses,
       uints: [
         await this.amountToUnits(null, dtParams.cap, 18),
         await this.amountToUnits(null, dtParams.feeAmount, feeTokenDecimals)
       ],
-      bytess: []
+      bytess: dtParams.filesObject
+        ? [ethers.utils.toUtf8Bytes(JSON.stringify(dtParams.filesObject))]
+        : []
     }
   }
 

src/services/Provider.ts

@@ -510,7 +510,7 @@ export class Provider {
       )) + 1
     ).toString()
 
-    const signature = await this.signProviderRequest(signer, did + nonce)
+    const signature = await this.signProviderRequest(signer, did + nonce) // did + nonce
     let consumeUrl = downloadUrl
     consumeUrl += `?fileIndex=${fileIndex}`
     consumeUrl += `&documentId=${did}`