Use createAsset function from SDK. #73

mariacarmina · 2024-11-07T15:05:07Z

Fixes # .

Changes proposed in this PR:

use createAsset function from SDK
replace all hardcoded chain IDs value with null, because the chain ID will be automatically & correctly filled in by SDK

src/helpers.ts

paulo-ocean · 2024-11-19T14:48:37Z

btw, just published an asset on ganache from this branch... all good on my side

> [email protected] cli
> TS_NODE_PROJECT='./tsconfig.json' ./node_modules/ts-node/dist/bin.js src/index.ts publish metadata/simpleDownloadDataset.json

Using RPC: http://127.0.0.1:8545
Using account: 0x6c957a45C801035d3297d43d0Ce83a237Ec5E0d1
Using Provider : http://localhost:8001
Using Aquarius : http://localhost:8001
start publishing
No config found for given network 'undefined'
No config found for given network 'undefined'
did:  did:op:fadce5db248397ccccc43d4ea36a727ef000c0d4c5dd0e45d0f430c9d1cf2432
Asset published. ID:  did:op:fadce5db248397ccccc43d4ea36a727ef000c0d4c5dd0e45d0f430c9d1cf2432
paulo@paulo-VivoBook-ASUSLaptop-X515EA-F515EA:~/workspace/OCEAN/ocean-cli$ npm run cli getDDO did:op:fadce5db248397ccccc43d4ea36a727ef000c0d4c5dd0e45d0f430c9d1cf2432 

> [email protected] cli
> TS_NODE_PROJECT='./tsconfig.json' ./node_modules/ts-node/dist/bin.js src/index.ts getDDO did:op:fadce5db248397ccccc43d4ea36a727ef000c0d4c5dd0e45d0f430c9d1cf2432

Using RPC: http://127.0.0.1:8545
Using account: 0x6c957a45C801035d3297d43d0Ce83a237Ec5E0d1
Using Provider : http://localhost:8001
Using Aquarius : http://localhost:8001
Resolving Asset with DID: did:op:fadce5db248397ccccc43d4ea36a727ef000c0d4c5dd0e45d0f430c9d1cf2432
{
  '@context': [ 'https://w3id.org/did/v1' ],
  id: 'did:op:fadce5db248397ccccc43d4ea36a727ef000c0d4c5dd0e45d0f430c9d1cf2432',
  nftAddress: '0x53d1456E80AE480E6C38b7d057EdAddB53D8583f',
  version: '4.1.0',
  chainId: 8996,
  metadata: {
    created: '2021-12-20T14:35:20Z',
    updated: '2021-12-20T14:35:20Z',
    type: 'dataset',
    name: 'ocean-cli demo asset',
    description: 'asset published using ocean cli tool',
    tags: [ 'test' ],
    author: 'oceanprotocol',
    license: 'https://market.oceanprotocol.com/terms',
    additionalInformation: { termsAndConditions: true }
  },
  services: [
    {
      id: 'ccb398c50d6abd5b456e8d7242bd856a1767a890b537c2f8c10ba8b8a10e6025',
      type: 'access',
      files: '0x040000f7cdc53f2ca20b4e407bedb5a345cd54f1ccd4541f6008821a7d9831d96793d2115db8c252d5652ccba9af1363b2e6bd5a48480ac72e6645015ef34b77ad84006c82a889e2b78263602f7f6c514d1a0062e5d9ad8efd704ea046c14136ef7521e08b74f7c0ef9bf5a31ec03efa9ce6b6863ae1607de6f00304cefd170f80c14a86adf1a65ae1737bf993a0a41d4d7da793bdad66732977ae3bb27d0bdc50b495498bd367d6dcc0de3988c771957cd63cf1e82b59ba0800aefebc78fac394d828121fab0c0afb8e1e6b82b1c163caa56725bd0816f5f2d0bf8d8b8e9ecc5a12e4b6440bb5fcba5fa07efd1b5afdc1272bb7de6a37969479ee377c8adbb15cf8a28d781f1440e72a77607d751cc44490c8809c690666c99c1c3d2ffeaf3122a4a473b730b65604823234279cca31fd2316b79bafa27056d3d0e71b759e52c79681781b0f306ec3b23b93299882e23e5005553033816093e1ab85e7af',
      datatokenAddress: '0x0c6aEB6238BAB5FB328Aca29dc7B8b2dBEc49768',
      serviceEndpoint: 'http://localhost:8001',
      timeout: 86400
    }
  ],
  event: {
    tx: '0xd7c4eeb718767c75da379d7cdbb884dd28412e5ba1b3ffacb567203f985e7082',
    from: '0x6c957a45C801035d3297d43d0Ce83a237Ec5E0d1',
    contract: '0x53d1456E80AE480E6C38b7d057EdAddB53D8583f',
    block: 1061,
    datetime: '2024-11-19T14:45:53.000Z'
  },
  nft: {
    state: 0,
    address: '0x53d1456E80AE480E6C38b7d057EdAddB53D8583f',
    name: 'Ocean Data NFT',
    symbol: 'OCEAN-NFT',
    owner: '0x6c957a45C801035d3297d43d0Ce83a237Ec5E0d1',
    created: '2024-11-19T14:45:53Z',
    tokenURI: 'aaa'
  },
  purgatory: { state: false },
  datatokens: [
    {
      address: '0x0c6aEB6238BAB5FB328Aca29dc7B8b2dBEc49768',
      name: 'Datatoken',
      symbol: 'DT1',
      serviceId: 'ccb398c50d6abd5b456e8d7242bd856a1767a890b537c2f8c10ba8b8a10e6025'
    }
  ],
  stats: { allocated: 0, orders: 0, price: { value: '2' } }
}

paulo-ocean · 2024-11-19T17:16:54Z

@mariacarmina Check the chain id on the tests.
I think you're victim of you own code :-)
https://github.com/oceanprotocol/ocean.js/blob/6e0d0e85a656850b3d2d1899244269be733652ce/src/utils/Assets.ts#L157
The test fails because the chain id of simpleComputeDataset.json is not the expected one.. That's why i was against these "check chain" changes, its easy to get confusing...

better also use a try/catch on the caller side... so we know whats happening (as we throw errors)

mariacarmina · 2024-11-20T13:21:30Z

@mariacarmina Check the chain id on the tests. I think you're victim of you own code :-) https://github.com/oceanprotocol/ocean.js/blob/6e0d0e85a656850b3d2d1899244269be733652ce/src/utils/Assets.ts#L157 The test fails because the chain id of simpleComputeDataset.json is not the expected one.. That's why i was against these "check chain" changes, its easy to get confusing...

better also use a try/catch on the caller side... so we know whats happening (as we throw errors)

Hello @paulo-ocean, if you tested on barge, the chain id from simpleComputeDataset.json is set correctly, maybe the issue was on simpleDownloadDataset.json which is the mumbai chain id, I updated in the code the chain id to see if the tests pass.
Btw, when you did the test with successfully publsihed the ddo, did you also update the chain id in the sample before publishing?

mariacarmina · 2024-11-20T13:28:11Z

better also use a try/catch on the caller side... so we know whats happening (as we throw errors)

I've seen that within the commands and publish.ts file there are try/catch blocks and they print the errors when they are raised, one spot was missing when publishing the algo, I've added right now, is there any other place that you were referring to?

mariacarmina · 2024-11-20T13:29:01Z

@mariacarmina Check the chain id on the tests. I think you're victim of you own code :-) https://github.com/oceanprotocol/ocean.js/blob/6e0d0e85a656850b3d2d1899244269be733652ce/src/utils/Assets.ts#L157 The test fails because the chain id of simpleComputeDataset.json is not the expected one.. That's why i was against these "check chain" changes, its easy to get confusing...
better also use a try/catch on the caller side... so we know whats happening (as we throw errors)

Hello @paulo-ocean, if you tested on barge, the chain id from simpleComputeDataset.json is set correctly, maybe the issue was on simpleDownloadDataset.json which is the mumbai chain id, I updated in the code the chain id to see if the tests pass. Btw, when you did the test with successfully publsihed the ddo, did you also update the chain id in the sample before publishing?

The test are still failing can you share how did you receive the chain id error? the tests from CI indicate another type of error.

mariacarmina · 2024-11-20T13:35:05Z

@paulo-ocean I have updated the chain ids, now it helped to advance the tests suite, PR to fix the check on ocean.js is merged, I think we need to do a minor release for ocean.js. Thank you!

paulo-ocean · 2024-11-20T13:43:00Z

simpleDownloadDataset

Yes, the wrong one was simpleDownloadDataset

paulo-ocean · 2024-11-20T13:44:32Z

The test are still failing can you share how did you receive the chain id error? the tests from CI indicate another type of error.

We don't get any errors when we code like "throw new Error()" and don't use try/catch :-)

mariacarmina · 2024-11-25T13:00:35Z

i'm still not sure this is enough.. the template id = 4 could be used on any other network..
if(templateId === 4){
		// Wrap the signer for Sapphire
		const wrappedSigner = sapphire.wrap(owner);
We're assuming that every time we have template 4 is sapphire network wich might not always be true (i have no idea of what happens if we wrap the signer for any other network using sapphire SDK)

Right, we also need to check the sdk part, I'm fixing it right now.

src/commands.ts

src/publishAsset.ts

jamiehewitt15 · 2025-01-22T12:25:28Z

Do you know why the tests are failing?

src/helpers.ts

paulo-ocean · 2025-01-23T10:55:55Z

Do you know why the tests are failing?

we need to fix node modules and package-lock
it fails on npm run ci
npm ERR! Invalid: lock file's @oceanprotocol/[email protected] does not satisfy @oceanprotocol/[email protected]
we have to delete the node modules and the package-lock.json .. install everything and commit the updated package-lock
(+ adding the missing shappire deps mentioned above)

paulo-ocean · 2025-01-23T11:59:03Z

better update the ci.yml workflow as well, add the -f flag on the docker image removal commands

- name: Delete default runner images
        run: |
          docker image rm -f node:20
          docker image rm -f node:20-alpine
          docker image rm -f node:18
          docker image rm -f node:18-alpine
          docker image rm -f debian:10
          docker image rm -f debian:11
          docker image rm -f ubuntu:22.04
          docker image rm -f ubuntu:20.04
          docker image rm -f moby/buildkit:latest
          rm -rf /usr/share/swift/

paulo-ocean · 2025-01-23T13:51:11Z

@mariacarmina if you can duplicate the calculateActiveTemplateIndex here, and update the ci.yml the issues should be gone
Again, on the ci.yml its about adding the '-f' flag.... not removing image entries

- name: Delete default runner images
        run: |
          docker image rm -f node:20
          docker image rm -f node:20-alpine
          docker image rm -f node:18
          docker image rm -f node:18-alpine
          docker image rm -f debian:10
          docker image rm -f debian:11
          docker image rm -f ubuntu:22.04
          docker image rm -f ubuntu:20.04
          docker image rm -f moby/buildkit:latest
          rm -rf /usr/share/swift/

mariacarmina · 2025-01-23T13:53:43Z

@mariacarmina if you can duplicate the calculateActiveTemplateIndex here, and update the ci.yml the issues should be gone Again, on the ci.yml its about adding the '-f' flag.... not removing image entries
- name: Delete default runner images
        run: |
          docker image rm -f node:20
          docker image rm -f node:20-alpine
          docker image rm -f node:18
          docker image rm -f node:18-alpine
          docker image rm -f debian:10
          docker image rm -f debian:11
          docker image rm -f ubuntu:22.04
          docker image rm -f ubuntu:20.04
          docker image rm -f moby/buildkit:latest
          rm -rf /usr/share/swift/

If those images do not exists in dockerhub, then we should maintain them up to date, we used to remove those docker images to not load runner resources and to have enough resources to run barge.

paulo-ocean · 2025-01-23T13:58:55Z

@mariacarmina if you can duplicate the calculateActiveTemplateIndex here, and update the ci.yml the issues should be gone Again, on the ci.yml its about adding the '-f' flag.... not removing image entries
- name: Delete default runner images
        run: |
          docker image rm -f node:20
          docker image rm -f node:20-alpine
          docker image rm -f node:18
          docker image rm -f node:18-alpine
          docker image rm -f debian:10
          docker image rm -f debian:11
          docker image rm -f ubuntu:22.04
          docker image rm -f ubuntu:20.04
          docker image rm -f moby/buildkit:latest
          rm -rf /usr/share/swift/
If those images do not exists in dockerhub, then we should maintain them up to date, we used to remove those docker images to not load runner resources and to have enough resources to run barge.

Its not about that... the images exist. Take a break, listen :-)...

src/helpers.ts

paulo-ocean

lgtm

Use createAsset function from SDK.

55b9eaa

mariacarmina self-assigned this Nov 7, 2024

mariacarmina requested review from alexcos20, bogdanfazakas, jamiehewitt15 and paulo-ocean as code owners November 7, 2024 15:05

mariacarmina added 2 commits November 7, 2024 17:18

Fix lint.

9eb253e

Fix exported function.

db00782

paulo-ocean mentioned this pull request Nov 11, 2024

Feat/V5 WIP #74

Open

mariacarmina added 3 commits November 18, 2024 14:32

Fix indent.

5e2aac6

Remove reinforce type for DDO.

7fee679

Increase timeout.

eabaa24

mariacarmina marked this pull request as draft November 18, 2024 13:21

mariacarmina added 3 commits November 18, 2024 15:30

debug and reinforce ddo type.

d1efb18

Print did.

478df75

Add more logs into the tests.

7681750

paulo-ocean reviewed Nov 19, 2024

View reviewed changes

src/helpers.ts Show resolved Hide resolved

paulo-ocean reviewed Nov 19, 2024

View reviewed changes

src/helpers.ts Outdated Show resolved Hide resolved

Updated chain id from samples.

bca4cb1

Adding try/catch at the algo side.

cb94b1d

Updated chain id.

5a9de65

mariacarmina marked this pull request as ready for review November 20, 2024 13:36

mariacarmina added 2 commits November 25, 2024 15:09

Merge branch 'main' into utilize-create-asset-function

3b24717

Add sdk check.

bfccdc7

mariacarmina requested a review from paulo-ocean November 28, 2024 13:59

giancu4 assigned paulo-ocean Dec 16, 2024

paulo-ocean reviewed Dec 19, 2024

View reviewed changes

src/commands.ts Show resolved Hide resolved

paulo-ocean reviewed Dec 19, 2024

View reviewed changes

src/publishAsset.ts Outdated Show resolved Hide resolved

Fix conflicts.

ebdba17

paulo-ocean reviewed Jan 23, 2025

View reviewed changes

src/helpers.ts Show resolved Hide resolved

fix package.json

f2139f6

mariacarmina added 4 commits January 23, 2025 14:00

Call util function from sdk to calculate templateindex.

8a63675

update ci.

1407779

Add oasis dep.

8cb4a38

Duplicate function for calculating dynamically the template index.

36e2af9

update docker images in ci.

c757315

remove debian:10.

b3e4175

Add -f option to docker rm.

d257f72

paulo-ocean reviewed Jan 24, 2025

View reviewed changes

src/helpers.ts Outdated Show resolved Hide resolved

paulo-ocean reviewed Jan 24, 2025

View reviewed changes

src/helpers.ts Outdated Show resolved Hide resolved

mariacarmina added 2 commits January 25, 2025 09:38

Add util function for signer. fix review.

4b1a968

tweaks.

fb5dcaf

paulo-ocean approved these changes Jan 27, 2025

View reviewed changes

mariacarmina merged commit 72c2f05 into main Jan 28, 2025
3 checks passed

mariacarmina deleted the utilize-create-asset-function branch January 28, 2025 20:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use createAsset function from SDK. #73

Use createAsset function from SDK. #73

mariacarmina commented Nov 7, 2024 •

edited

Loading

paulo-ocean commented Nov 19, 2024 •

edited

Loading

paulo-ocean commented Nov 19, 2024 •

edited

Loading

mariacarmina commented Nov 20, 2024

mariacarmina commented Nov 20, 2024

mariacarmina commented Nov 20, 2024

mariacarmina commented Nov 20, 2024

paulo-ocean commented Nov 20, 2024

paulo-ocean commented Nov 20, 2024

mariacarmina commented Nov 25, 2024 •

edited

Loading

jamiehewitt15 commented Jan 22, 2025

paulo-ocean commented Jan 23, 2025 •

edited

Loading

paulo-ocean commented Jan 23, 2025

paulo-ocean commented Jan 23, 2025 •

edited

Loading

mariacarmina commented Jan 23, 2025

paulo-ocean commented Jan 23, 2025

paulo-ocean left a comment

Use createAsset function from SDK. #73

Use createAsset function from SDK. #73

Conversation

mariacarmina commented Nov 7, 2024 • edited Loading

paulo-ocean commented Nov 19, 2024 • edited Loading

paulo-ocean commented Nov 19, 2024 • edited Loading

mariacarmina commented Nov 20, 2024

mariacarmina commented Nov 20, 2024

mariacarmina commented Nov 20, 2024

mariacarmina commented Nov 20, 2024

paulo-ocean commented Nov 20, 2024

paulo-ocean commented Nov 20, 2024

mariacarmina commented Nov 25, 2024 • edited Loading

jamiehewitt15 commented Jan 22, 2025

paulo-ocean commented Jan 23, 2025 • edited Loading

paulo-ocean commented Jan 23, 2025

paulo-ocean commented Jan 23, 2025 • edited Loading

mariacarmina commented Jan 23, 2025

paulo-ocean commented Jan 23, 2025

paulo-ocean left a comment

Choose a reason for hiding this comment

mariacarmina commented Nov 7, 2024 •

edited

Loading

paulo-ocean commented Nov 19, 2024 •

edited

Loading

paulo-ocean commented Nov 19, 2024 •

edited

Loading

mariacarmina commented Nov 25, 2024 •

edited

Loading

paulo-ocean commented Jan 23, 2025 •

edited

Loading

paulo-ocean commented Jan 23, 2025 •

edited

Loading