Skip to content

Use createAsset function from SDK. #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariacarmina merged 32 commits into from
Jan 28, 2025
Merged

Use createAsset function from SDK. #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
55b9eaa
Use createAsset function from SDK.
mariacarmina Nov 7, 2024
9eb253e
Fix lint.
mariacarmina Nov 7, 2024
db00782
Fix exported function.
mariacarmina Nov 7, 2024
5e2aac6
Fix indent.
mariacarmina Nov 18, 2024
7fee679
Remove reinforce type for DDO.
mariacarmina Nov 18, 2024
eabaa24
Increase timeout.
mariacarmina Nov 18, 2024
d1efb18
debug and reinforce ddo type.
mariacarmina Nov 18, 2024
478df75
Print did.
mariacarmina Nov 18, 2024
7681750
Add more logs into the tests.
mariacarmina Nov 19, 2024
bca4cb1
Updated chain id from samples.
mariacarmina Nov 20, 2024
cb94b1d
Adding try/catch at the algo side.
mariacarmina Nov 20, 2024
5a9de65
Updated chain id.
mariacarmina Nov 20, 2024
022e47e
cleanup console.logs.
mariacarmina Nov 20, 2024
a381328
Delete chain id from all samples.
mariacarmina Nov 20, 2024
a792f83
Use latest version of ocean-lib.
mariacarmina Nov 20, 2024
3182f0d
Add chain id key with empty string.
mariacarmina Nov 20, 2024
a2ec4d2
replace with null.
mariacarmina Nov 20, 2024
e451ffa
rename template index with template id.
mariacarmina Nov 21, 2024
0ed52a7
Fix workflow.
mariacarmina Nov 21, 2024
3b24717
Merge branch 'main' into utilize-create-asset-function
mariacarmina Nov 25, 2024
bfccdc7
Add sdk check.
mariacarmina Nov 25, 2024
ebdba17
Fix conflicts.
mariacarmina Jan 22, 2025
f2139f6
fix package.json
mariacarmina Jan 23, 2025
8a63675
Call util function from sdk to calculate templateindex.
mariacarmina Jan 23, 2025
1407779
update ci.
mariacarmina Jan 23, 2025
8cb4a38
Add oasis dep.
mariacarmina Jan 23, 2025
36e2af9
Duplicate function for calculating dynamically the template index.
mariacarmina Jan 23, 2025
c757315
update docker images in ci.
mariacarmina Jan 23, 2025
b3e4175
remove debian:10.
mariacarmina Jan 23, 2025
d257f72
Add -f option to docker rm.
mariacarmina Jan 23, 2025
4b1a968
Add util function for signer. fix review.
mariacarmina Jan 25, 2025
fb5dcaf
tweaks.
mariacarmina Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ jobs:
- run: docker image ls
- name: Delete default runner images
run: |
docker image rm node:20
docker image rm node:20-alpine
docker image rm node:18
docker image rm node:18-alpine
docker image rm debian:10
docker image rm debian:11
docker image rm ubuntu:22.04
docker image rm ubuntu:20.04
docker image rm moby/buildkit:latest
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/

- name: Wait for contracts deployment and C2D cluster to be ready
Expand Down
2 changes: 1 addition & 1 deletion metadata/jsAlgo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "",
"nftAddress": "",
"version": "4.1.0",
"chainId": 137,
"chainId": null,
"metadata": {
"created": "2023-08-01T17:09:39Z",
"updated": "2023-08-01T17:09:39Z",
Expand Down
2 changes: 1 addition & 1 deletion metadata/jsIPFSAlgo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "",
"nftAddress": "",
"version": "4.1.0",
"chainId": 8996,
"chainId": null,
"metadata": {
"created": "2023-08-01T17:09:39Z",
"updated": "2023-08-01T17:09:39Z",
Expand Down
2 changes: 1 addition & 1 deletion metadata/pythonAlgo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "",
"nftAddress": "",
"version": "4.1.0",
"chainId": 8996,
"chainId": null,
"metadata": {
"created": "2023-08-01T17:09:39Z",
"updated": "2023-08-01T17:09:39Z",
Expand Down
2 changes: 1 addition & 1 deletion metadata/simpleComputeDataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "",
"nftAddress": "",
"version": "4.1.0",
"chainId": 8996,
"chainId": null,
"metadata": {
"created": "2021-12-20T14:35:20Z",
"updated": "2021-12-20T14:35:20Z",
Expand Down
2 changes: 1 addition & 1 deletion metadata/simpleDownloadDataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "",
"nftAddress": "",
"version": "4.1.0",
"chainId": 80001,
"chainId": null,
"metadata": {
"created": "2021-12-20T14:35:20Z",
"updated": "2021-12-20T14:35:20Z",
Expand Down
2 changes: 1 addition & 1 deletion metadata/simpleIPFSComputeDataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "",
"nftAddress": "",
"version": "4.1.0",
"chainId": 8996,
"chainId": null,
"metadata": {
"created": "2021-12-20T14:35:20Z",
"updated": "2021-12-20T14:35:20Z",
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"typescript-eslint": "^7.12.0"
},
"dependencies": {
"@oasisprotocol/sapphire-paratime": "^1.3.2",
"@oceanprotocol/contracts": "^2.0.4",
"@oceanprotocol/lib": "^3.4.6",
"cross-fetch": "^3.1.5",
Expand Down
41 changes: 22 additions & 19 deletions src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import fs from "fs";
import os from "os";
import util from "util";
import {
createAsset,
createAssetUtil,
handleComputeOrder,
updateAssetMetadata,
downloadFile,
Expand Down Expand Up @@ -97,17 +97,15 @@ export class Commands {
const encryptDDO = args[2] === "false" ? false : true;
try {
// add some more checks
const urlAssetId = await createAsset(
const urlAssetId = await createAssetUtil(
asset.nft.name,
asset.nft.symbol,
this.signer,
asset.services[0].files,
asset,
this.providerUrl,
this.providerUrl || this.macOsProviderUrl,
this.config,
this.aquarius,
1,
this.macOsProviderUrl,
encryptDDO
);
console.log("Asset published. ID: " + urlAssetId);
Expand All @@ -129,21 +127,26 @@ export class Commands {
}
const encryptDDO = args[2] === "false" ? false : true;
// add some more checks
const algoDid = await createAsset(
algoAsset.nft.name,
algoAsset.nft.symbol,
this.signer,
algoAsset.services[0].files,
algoAsset,
this.providerUrl,
this.config,
this.aquarius,
1,
this.macOsProviderUrl,
encryptDDO
);
// add some more checks
try{
const algoDid = await createAssetUtil(
algoAsset.nft.name,
algoAsset.nft.symbol,
this.signer,
algoAsset.services[0].files,
algoAsset,
this.providerUrl || this.macOsProviderUrl,
this.config,
this.aquarius,
encryptDDO
);
// add some more checks
console.log("Algorithm published. DID: " + algoDid);
} catch (e) {
console.error("Error when publishing dataset from file: " + args[1]);
console.error(e);
return;
}

}

public async editAsset(args: string[]) {
Expand Down
Loading
Loading