From 4bcb1d93483e4f4600e8de0d60a864353b584e75 Mon Sep 17 00:00:00 2001
From: paulo-ocean <paulo@oceanprotocol.com>
Date: Fri, 13 Sep 2024 09:09:16 +0100
Subject: [PATCH] some fixes + cleaning

---
 src/config/ConfigHelper.ts            |  2 +-
 src/utils/Assets.ts                   | 10 ++--------
 test/integration/PublishFlows.test.ts |  5 ++---
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index 9598a0fe..546592c4 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -307,7 +307,7 @@ export class ConfigHelper {
     // check oasis network name typos on addresses.json
     if (!contractAddressesConfig && KNOWN_CONFIDENTIAL_EVMS.includes(config.chainId)) {
       contractAddressesConfig = this.getAddressesFromEnv(
-        config.network.replaceAll('sapp', 'sap'),
+        config.network.replace('sapph', 'saph'),
         addresses
       )
     }
diff --git a/src/utils/Assets.ts b/src/utils/Assets.ts
index 9882a0e3..779e4f52 100644
--- a/src/utils/Assets.ts
+++ b/src/utils/Assets.ts
@@ -125,7 +125,6 @@ export async function calculateActiveTemplateIndex(
  * @param encryptDDO encrypt or not?
  * @param providerUrl the provider URL
  * @param providerFeeToken the provider fee token
- * @param nftContractAddress the nft contract address
  * @param aquariusInstance aquarius, could be node instance url
  * @param allowAccessList?: string,
  * @param denyAccessList?: string
@@ -142,7 +141,6 @@ export async function createAsset(
   providerUrl: string,
   providerFeeToken: string,
   aquariusInstance: Aquarius,
-  nftContractAddress?: string, // addresses.ERC721Factory,
   accessListFactory?: string, // access list factory address
   allowAccessList?: string, // allow list address
   denyAccessList?: string // deny list address
@@ -156,13 +154,9 @@ export async function createAsset(
 
   const config = new ConfigHelper().getConfig(parseInt(String(chainID)))
 
-  if (!nftContractAddress) {
-    nftContractAddress = config.nftFactoryAddress
-  }
-
   let templateIndex = await calculateActiveTemplateIndex(
     owner,
-    nftContractAddress,
+    config.nftFactoryAddress,
     templateIDorAddress
   )
 
@@ -175,7 +169,7 @@ export async function createAsset(
 
   const nft = new Nft(owner, chainID)
 
-  const nftFactory = new NftFactory(nftContractAddress, owner)
+  const nftFactory = new NftFactory(config.nftFactoryAddress, owner)
 
   // get nft owner
   const account = await owner.getAddress()
diff --git a/test/integration/PublishFlows.test.ts b/test/integration/PublishFlows.test.ts
index c5b0b5c9..39b95a27 100644
--- a/test/integration/PublishFlows.test.ts
+++ b/test/integration/PublishFlows.test.ts
@@ -207,13 +207,12 @@ describe('Publish tests', async () => {
       'TEST',
       ownerAddress,
       assetUrl,
-      '0x13a9813e7CE3fdc867C23Ef9c084570B7F2abdeC', // template 1 on dev network
+      1, // template 1 on dev network
       fixedPriceDdo,
       true, // encrypted ddo
       providerUrl,
       ZERO_ADDRESS, // provider fee token
-      aquarius,
-      addresses.ERC721Factory // nft template factory
+      aquarius
     )
 
     console.log('Published asset, ddo id:', asset)