Skip to content
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.

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

Feat/V5 WIP #74

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
380da1a
chore: publish ddo v 5.0.0
AdriGeorge Oct 8, 2024
d25270d
chore: publish v5
AdriGeorge Oct 9, 2024
2cb6eb0
chore: asset v5
AdriGeorge Oct 10, 2024
36d0866
fix: fix
AdriGeorge Oct 10, 2024
a0d932f
chore: publish asset v5
AdriGeorge Oct 15, 2024
76b0190
chore: downalod
AdriGeorge Oct 16, 2024
0774825
chore: downalod
AdriGeorge Oct 16, 2024
7f91262
fix: removed unused file
AdriGeorge Oct 16, 2024
3944f79
fix: new ddo v5
AdriGeorge Oct 16, 2024
44fb7d2
fix: others commands
AdriGeorge Oct 17, 2024
e082cd0
fix: some fixs
AdriGeorge Oct 18, 2024
0a74e8b
fix: fix
AdriGeorge Oct 22, 2024
1de3e9e
fix: fix
AdriGeorge Oct 23, 2024
80006b8
wip
AdriGeorge Oct 24, 2024
93aa969
fix: fix
AdriGeorge Oct 25, 2024
acf4dad
add issuer in ddo
AdriGeorge Oct 28, 2024
db83d46
chore: handle new ddo object with header, payload and signature
AdriGeorge Nov 7, 2024
8fa017b
chore: verify web3 sign
AdriGeorge Nov 11, 2024
4d516c3
fix: pull from main
AdriGeorge Nov 11, 2024
7947f6d
fix: commented unused code
AdriGeorge Nov 11, 2024
b7dbe01
fix: tests
AdriGeorge Nov 11, 2024
e638bec
fix: tests
AdriGeorge Nov 11, 2024
26af8d3
fix: tests
AdriGeorge Nov 11, 2024
2d3efc5
fix: fix
AdriGeorge Nov 11, 2024
7c878b2
fix: v 4.7.0 in allowed versions
AdriGeorge Nov 11, 2024
363baa0
fix: removed unused file
AdriGeorge Nov 11, 2024
6447d3c
Update README.md
AdriGeorge Nov 11, 2024
e895f0e
fix: switch removed
AdriGeorge Nov 13, 2024
8ce39be
fix: removed swith
AdriGeorge Nov 13, 2024
85e2027
fix: context
AdriGeorge Nov 21, 2024
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
14 changes: 14 additions & 0 deletions enwiki-latest-abstract10.xml.gz-rss.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0"?>
<rss version="2.0">
<channel>
<title>abstract10.xml.gz</title>
<link>http://download.wikimedia.org/enwiki/20241001</link>
<description>Wikimedia dump updates for enwiki</description>
<item>
<title>http://download.wikimedia.org/enwiki/20241001</title>
<link>http://download.wikimedia.org/enwiki/20241001</link>
<description>&lt;a href="http://download.wikimedia.org/enwiki/20241001/enwiki-20241001-abstract10.xml.gz"&gt;enwiki-20241001-abstract10.xml.gz&lt;/a&gt;</description>
<pubDate>Sun, 06 Oct 2024 20:17:29 GMT</pubDate>
</item>
</channel>
</rss>
25 changes: 25 additions & 0 deletions metadata/downloadService.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"id": "ccb398c50d6abd5b456e8d7242bd856a1767a890b537c2f8c10ba8b8a10e6026",
"name": "Service 2",
"description": {
"@value": "Service 2 for accessing the dataset",
"@language": "en",
"@direction": "ltr"
},
"type": "access",
"datatokenAddress": "",
"files": {
"datatokenAddress": "",
"nftAddress": "",
"files": [
{
"type": "url",
"url": "https://dumps.wikimedia.org/enwiki/latest/enwiki-latest-abstract10.xml.gz-rss.xml",
"method": "GET"
}
]
},
"credentials": [],
"serviceEndpoint": "",
"timeout": 86400
}
88 changes: 88 additions & 0 deletions metadata/jsAlgoV5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"@context": ["https://w3id.org/did/v1"],
"version": "5.0.0",
"credentialSubject": {
"id": "",
"chainId": 8996,
"metadata": {
"created": "2023-08-01T17:09:39Z",
"updated": "2023-08-01T17:09:39Z",
"type": "algorithm",
"name": "avreage price real estate algo",
"symbol": "ALGOV5",
"description": {
"@value": "New algo published using ocean CLI tool with version 5.0.0",
"@language": "en",
"@direction": "ltr"
},
"author": "OPF",
"license": {
"name": "https://market.oceanprotocol.com/terms"
},
"additionalInformation": {
"termsAndConditions": true
},
"algorithm": {
"language": "",
"version": "0.1",
"container": {
"entrypoint": "node $ALGO",
"image": "node",
"tag": "latest",
"checksum": "sha256:1155995dda741e93afe4b1c6ced2d01734a6ec69865cc0997daf1f4db7259a36"
}
}
},
"services": [
{
"id": "1234567890",
"type": "compute",
"name": "Access Service",
"description": {
"@value": "Service for accessing the dataset",
"@language": "en",
"@direction": "ltr"
},
"files": {
"datatokenAddress": "0x0",
"nftAddress": "0x0",
"files": [
{
"hash": "QmQN9hWcqN7chF3qrAL5HpZSkfc9kvjSH7o4LaGVMxs9gu",
"type": "ipfs"
}
]
},
"timeout": 86400,
"compute": {
"allowRawAlgorithm": false,
"allowNetworkAccess": true,
"publisherTrustedAlgorithmPublishers": [],
"publisherTrustedAlgorithms": []
},
"credentials": []
}
],
"credentials": [],
"nftAddress": ""
},
"issuer": "did:op:issuer-did",
"type": ["VerifiableCredential"],
"additionalDdos": [],
"stats": {
"allocated": 0,
"orders": 0,
"price": {
"value": "0"
}
},
"nft": {
"address": "",
"name": "Ocean Data NFT",
"symbol": "OCEAN-NFT",
"state": 5,
"tokenURI": "",
"owner": "",
"created": ""
}
}
22 changes: 11 additions & 11 deletions metadata/simpleComputeDataset.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"@context": [
"https://w3id.org/did/v1"
],
"@context": ["https://w3id.org/did/v1"],
"id": "",
"nftAddress": "",
"version": "4.1.0",
Expand All @@ -12,9 +10,7 @@
"type": "dataset",
"name": "cli fixed asset",
"description": "asset published using ocean.js cli tool",
"tags": [
"test"
],
"tags": ["test"],
"author": "oceanprotocol",
"license": "https://market.oceanprotocol.com/terms",
"additionalInformation": {
Expand Down Expand Up @@ -43,12 +39,17 @@
"allowRawAlgorithm": false,
"allowNetworkAccess": true,
"publisherTrustedAlgorithmPublishers": [],
"publisherTrustedAlgorithms": []
"publisherTrustedAlgorithms": [
AdriGeorge marked this conversation as resolved.
Show resolved Hide resolved
{
"did": "did:op:e6708f459239520c870243727331703488c75f416a20a62dba57d7969399b032",
"filesChecksum": "sha256:1155995dda741e93afe4b1c6ced2d01734a6ec69865cc0997daf1f4db7259a36",
"containerSectionChecksum": ""
}
]
}
}
],
"event": {
},
"event": {},
"nft": {
"address": "",
"name": "Ocean Data NFT",
Expand All @@ -61,8 +62,7 @@
"purgatory": {
"state": false
},
"datatokens": [
],
"datatokens": [],
"stats": {
"allocated": 0,
"orders": 0,
Expand Down
80 changes: 80 additions & 0 deletions metadata/simpleComputeDatasetV5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"@context": ["https://w3id.org/did/v1"],
"version": "5.0.0",
"credentialSubject": {
"id": "",
"metadata": {
"created": "2021-12-20T14:35:20Z",
"updated": "2021-12-20T14:35:20Z",
"type": "dataset",
"name": "CLi fixed asset",
"description": {
"@value": "New asset published using ocean CLI tool with version 5.0.0",
"@language": "en",
"@direction": "ltr"
},
"tags": ["test"],
"author": "oceanprotocol",
"providedBy": "oceanprotocol",
"copyrightHolder": "copirightHolder",
"license": "https://market.oceanprotocol.com/terms",
"additionalInformation": {
"termsAndConditions": true
}
},
"services": [
{
"id": "ccb398c50d6abd5b456e8d7242bd856a1767a890b537c2f8c10ba8b8a10e6025",
"type": "compute",
"name": "service 1",
"files": {
"datatokenAddress": "0x0",
"nftAddress": "0x0",
"files": [
{
"type": "url",
"url": "https://raw.githubusercontent.com/oceanprotocol/c2d-examples/main/branin_and_gpr/branin.arff",
"method": "GET"
}
]
},
"datatokenAddress": "",
"serviceEndpoint": "http://10.84.128.6:8001",
"timeout": 86400,
"compute": {
"allowRawAlgorithm": false,
"allowNetworkAccess": true,
"publisherTrustedAlgorithmPublishers": [],
"publisherTrustedAlgorithms": []
},
"credentials": [],
"state": 0
}
],
"datatokens": [],
"credentials": [],
"chainId": 8996,
"nftAddress": ""
},
"issuer": "did:op:issuer-did",
"type": ["VerifiableCredential"],
"stats": {
"allocated": 0,
"orders": 0,
"price": {
"value": "0"
}
},
"nft": {
"address": "",
"name": "Ocean Data NFT",
"symbol": "OCEAN-NFT",
"state": 5,
"tokenURI": "",
"owner": "",
"created": ""
},
"purgatory": {
"state": false
}
}
20 changes: 7 additions & 13 deletions metadata/simpleDownloadDataset.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
{
"@context": [
"https://w3id.org/did/v1"
],
"@context": ["https://w3id.org/did/v1"],
"id": "",
"nftAddress": "",
"version": "4.1.0",
"chainId": 80001,
"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"
],
"tags": ["test"],
"author": "oceanprotocol",
"license": "https://market.oceanprotocol.com/terms",
"additionalInformation": {
Expand All @@ -41,8 +37,7 @@
"timeout": 86400
}
],
"event": {
},
"event": {},
"nft": {
"address": "",
"name": "Ocean Data NFT",
Expand All @@ -55,13 +50,12 @@
"purgatory": {
"state": false
},
"datatokens": [
],
"datatokens": [],
"stats": {
"allocated": 0,
"orders": 0,
"price": {
"value": "2"
"value": "0"
}
}
}
}
84 changes: 84 additions & 0 deletions metadata/simpleDownloadDatasetV5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"@context": ["http://schema.org/"],
"version": "5.0.0",
"credentialSubject": {
"id": "",
"metadata": {
"created": "2024-10-03T14:35:20Z",
"updated": "2024-10-03T14:35:20Z",
"type": "dataset",
"name": "DDO 5.0.0 Asset",
"description": {
"@value": "New asset published using ocean CLI tool with version 5.0.0",
"@language": "en",
"@direction": "ltr"
},
"copyrightHolder": "",
"providedBy": "",
"author": "oceanprotocol",
"license": {
"name": "https://market.oceanprotocol.com/terms"
},
"tags": ["version-5", "new-schema"],
"categories": ["data", "ocean-protocol"],
"additionalInformation": {
"termsAndConditions": true
}
},
"services": [
{
"id": "ccb398c50d6abd5b456e8d7242bd856a1767a890b537c2f8c10ba8b8a10e6025",
"type": "access",
"name": "Access Service",
"description": {
"@value": "Service for accessing the dataset",
"@language": "en",
"@direction": "ltr"
},
"datatokenAddress": "0x0",
"nftAddress": "",
"serviceEndpoint": "https://v4.provider.oceanprotocol.com",
"files": {
"datatokenAddress": "0x0",
"nftAddress": "0x0",
"files": [
{
"type": "url",
"url": "https://dumps.wikimedia.org/enwiki/latest/enwiki-latest-abstract10.xml.gz-rss.xml",
"method": "GET"
}
]
},
"timeout": 86400,
"compute": {
"allowRawAlgorithm": false,
"allowNetworkAccess": true
},
"state": 0,
"credentials": []
}
],
"credentials": [],
"chainId": 8996,
"nftAddress": ""
},
"issuer": "did:op:issuer-did",
"type": ["VerifiableCredential"],
"nft": {
"address": "",
"name": "Ocean Data NFT",
"symbol": "OCEAN-NFT",
"state": 5,
"tokenURI": "",
"owner": "",
"created": ""
},
"stats": {
"allocated": 0,
"orders": 0,
"price": {
"value": "0"
}
},
"additionalsDdos": []
}
Loading
Loading