oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

some fixes + cleaning

Browse Source
This commit is contained in:
paulo-ocean 2024-09-13 09:09:16 +01:00
parent 442eef760f
commit 4bcb1d9348
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/ConfigHelper.ts
View File

@ -307,7 +307,7 @@ export class ConfigHelper {
// check oasis network name typos on addresses.json // check oasis network name typos on addresses.json
if (!contractAddressesConfig && KNOWN_CONFIDENTIAL_EVMS.includes(config.chainId)) { if (!contractAddressesConfig && KNOWN_CONFIDENTIAL_EVMS.includes(config.chainId)) {
contractAddressesConfig = this.getAddressesFromEnv( contractAddressesConfig = this.getAddressesFromEnv(
config.network.replaceAll('sapp', 'sap'), config.network.replace('sapph', 'saph'),
addresses addresses
) )
} }

10
src/utils/Assets.ts
View File

@ -125,7 +125,6 @@ export async function calculateActiveTemplateIndex(
* @param encryptDDO encrypt or not? * @param encryptDDO encrypt or not?
* @param providerUrl the provider URL * @param providerUrl the provider URL
* @param providerFeeToken the provider fee token * @param providerFeeToken the provider fee token
* @param nftContractAddress the nft contract address
* @param aquariusInstance aquarius, could be node instance url * @param aquariusInstance aquarius, could be node instance url
* @param allowAccessList?: string, * @param allowAccessList?: string,
* @param denyAccessList?: string * @param denyAccessList?: string
@ -142,7 +141,6 @@ export async function createAsset(
providerUrl: string, providerUrl: string,
providerFeeToken: string, providerFeeToken: string,
aquariusInstance: Aquarius, aquariusInstance: Aquarius,
nftContractAddress?: string, // addresses.ERC721Factory,
accessListFactory?: string, // access list factory address accessListFactory?: string, // access list factory address
allowAccessList?: string, // allow list address allowAccessList?: string, // allow list address
denyAccessList?: string // deny list address denyAccessList?: string // deny list address
@ -156,13 +154,9 @@ export async function createAsset(
const config = new ConfigHelper().getConfig(parseInt(String(chainID))) const config = new ConfigHelper().getConfig(parseInt(String(chainID)))
if (!nftContractAddress) {
nftContractAddress = config.nftFactoryAddress
}
let templateIndex = await calculateActiveTemplateIndex( let templateIndex = await calculateActiveTemplateIndex(
owner, owner,
nftContractAddress, config.nftFactoryAddress,
templateIDorAddress templateIDorAddress
) )
@ -175,7 +169,7 @@ export async function createAsset(
const nft = new Nft(owner, chainID) const nft = new Nft(owner, chainID)
const nftFactory = new NftFactory(nftContractAddress, owner) const nftFactory = new NftFactory(config.nftFactoryAddress, owner)
// get nft owner // get nft owner
const account = await owner.getAddress() const account = await owner.getAddress()

5
test/integration/PublishFlows.test.ts
View File

@ -207,13 +207,12 @@ describe('Publish tests', async () => {
'TEST', 'TEST',
ownerAddress, ownerAddress,
assetUrl, assetUrl,
'0x13a9813e7CE3fdc867C23Ef9c084570B7F2abdeC', // template 1 on dev network 1, // template 1 on dev network
fixedPriceDdo, fixedPriceDdo,
true, // encrypted ddo true, // encrypted ddo
providerUrl, providerUrl,
ZERO_ADDRESS, // provider fee token ZERO_ADDRESS, // provider fee token
aquarius, aquarius
addresses.ERC721Factory // nft template factory
) )
console.log('Published asset, ddo id:', asset) console.log('Published asset, ddo id:', asset)