Merge branch 'main' into confidential-evm-nft-class

.github/workflows/ci.yml

@@ -224,7 +224,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: '16'
 

CHANGELOG.md

@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.4.1](https://github.com/oceanprotocol/ocean.js/compare/v3.4.0...v3.4.1)
+
+- Updating oasis exports [`#1860`](https://github.com/oceanprotocol/ocean.js/pull/1860)
+- Fix ipfs CID. [`#1851`](https://github.com/oceanprotocol/ocean.js/pull/1851)
+- chore: get router factory address from config [`#1858`](https://github.com/oceanprotocol/ocean.js/pull/1858)
+
 #### [v3.4.0](https://github.com/oceanprotocol/ocean.js/compare/v3.3.4-next.0...v3.4.0)
 
+> 7 October 2024
+
 - Issue 1841 pub flow - createAsset Fn [`#1843`](https://github.com/oceanprotocol/ocean.js/pull/1843)
 - add credentials to service type [`#1855`](https://github.com/oceanprotocol/ocean.js/pull/1855)
 - Integrate contracts v2.2.0 [`#1845`](https://github.com/oceanprotocol/ocean.js/pull/1845)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",

src/contracts/index.ts

@@ -15,3 +15,6 @@ export * from './ve/VeFeeEstimate'
 export * from './ve/VeAllocate'
 export * from './df/DfRewards'
 export * from './df/DfStrategyV1'
+export * from './Datatoken4'
+export * from './AccessList'
+export * from './AccessListFactory'

src/services/Provider.ts

@@ -394,7 +394,7 @@ export class Provider {
       LoggerInstance.error(e)
       throw new Error(`Provider initialize failed url: ${initializeUrl} `)
     }
-    if (response?.ok) {
+    if (response?.status === 200) {
       const results: ProviderInitialize = await response.json()
       return results
     }

test/integration/PublishEditConsume.test.ts

@@ -72,17 +72,6 @@ const arweaveFile: Files = {
   ]
 }
 
-const ifpsFile: Files = {
-  datatokenAddress: '0x0',
-  nftAddress: '0x0',
-  files: [
-    {
-      type: 'ipfs',
-      hash: 'QmRhsp7eghZtW4PktPC2wAHdKoy2LiF1n6UXMKmAhqQJUA'
-    }
-  ]
-}
-
 const onchainFile: Files = {
   datatokenAddress: '0x0',
   nftAddress: '0x0',
@@ -146,6 +135,29 @@ function delay(interval: number) {
   }).timeout(interval + 100)
 }
 
+function uploadToIpfs(data: any): Promise<string> {
+  return new Promise((resolve, reject) => {
+    fetch('http://172.15.0.16:5001/api/v0/add', {
+      method: 'POST',
+      headers: {
+        'Content-Type':
+          'multipart/form-data; boundary=------------------------a28d68b1c872c96f'
+      },
+      body:
+        '--------------------------a28d68b1c872c96f\r\nContent-Disposition: form-data; name="file"; filename="ddo.json"\r\nContent-Type: application/octet-stream\r\n\r\n' +
+        data +
+        '\r\n--------------------------a28d68b1c872c96f--\r\n'
+    })
+      .then(function (response: any) {
+        const resp = response.json()
+        resolve(resp.Hash)
+      })
+      .catch(function (error: any) {
+        reject(error)
+      })
+  })
+}
+
 describe('Publish consume test', async () => {
   before(async () => {
     publisherAccount = (await provider.getSigner(0)) as Signer
@@ -210,33 +222,42 @@ describe('Publish consume test', async () => {
     )
     assert(urlAssetId, 'Failed to publish url DDO')
   })
-
-  it('Should publish ipfs asset', async () => {
-    ipfsAssetId = await createAsset(
-      'IpfsDatatoken',
-      'IPFSDT',
+  it('Should publish arweave asset', async () => {
+    arweaveAssetId = await createAsset(
+      'ArwaveDatatoken',
+      'ARWAVEDT',
       publisherAccount,
-      ifpsFile,
+      arweaveFile,
       assetDdo,
       providerUrl,
       addresses.ERC721Factory,
       aquarius
     )
-    assert(ipfsAssetId, 'Failed to publish ipfs DDO')
+    assert(arweaveAssetId, 'Failed to arwave publish DDO')
   })
-
-  it('Should publish arwave asset', async () => {
-    arweaveAssetId = await createAsset(
-      'ArweaveDatatoken',
-      'ARWEAVEDT',
+  it('Should publish ipfs asset', async () => {
+    const ipfsCID = await uploadToIpfs(JSON.stringify(assetDdo))
+    const ipfsFile: Files = {
+      datatokenAddress: '0x0',
+      nftAddress: '0x0',
+      files: [
+        {
+          type: 'ipfs',
+          hash: ipfsCID
+        }
+      ]
+    }
+    ipfsAssetId = await createAsset(
+      'IpfsDatatoken',
+      'IPFSDT',
       publisherAccount,
-      arweaveFile,
+      ipfsFile,
       assetDdo,
       providerUrl,
       addresses.ERC721Factory,
       aquarius
     )
-    assert(arweaveAssetId, 'Failed to publish ipfs DDO')
+    assert(ipfsAssetId, 'Failed to publish ipfs DDO')
   })
 
   it('Should publish onchain asset', async () => {