oceanprotocol
/
ocean-subgraph
mirror of https://github.com/oceanprotocol/ocean-subgraph.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated @ocean/lib with multichain version.

This commit is contained in:
Maria Carmina 2023-03-22 15:56:25 +02:00
parent 67066df45f
commit f1ad2344fe
5 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -10,7 +10,7 @@
"license": "Apache-2.0",
"dependencies": {
"@oceanprotocol/contracts": "^1.1.12",
"@oceanprotocol/lib": "^2.6.3",
"@oceanprotocol/lib": "^2.7.0",
"cross-fetch": "^3.1.4"
},
"devDependencies": {
@ -968,9 +968,9 @@
"integrity": "sha512-kvMLH4nOKvkqsNmob00yqVi2kD9xiYLoobw2ioezOA1p6wRPDFLzZd+w8+NZP2hMDFVITUY4YCdO/dRGKTihOA=="
},
"node_modules/@oceanprotocol/lib": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-2.6.3.tgz",
"integrity": "sha512-Xzmc/1wogOa7AJnFvqmFMJaS1IV5OzoY2HXH4wGi6wOPL3hrWKPUiY4L+/PXmuIMaLEUm5bCZnpLHBidYrb2vg==",
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-2.7.0.tgz",
"integrity": "sha512-mSisB8mOVQLg6CJ4Fjp2oa6NAr/zc+yh/2x8fdjSzzZPN23WlmpPkluHeCIKN5rQDqDIGHXCntfyCaVp5hGMnw==",
"dependencies": {
"@oceanprotocol/contracts": "^1.1.8",
"bignumber.js": "^9.1.0",
@ -15102,9 +15102,9 @@
"integrity": "sha512-kvMLH4nOKvkqsNmob00yqVi2kD9xiYLoobw2ioezOA1p6wRPDFLzZd+w8+NZP2hMDFVITUY4YCdO/dRGKTihOA=="
},
"@oceanprotocol/lib": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-2.6.3.tgz",
"integrity": "sha512-Xzmc/1wogOa7AJnFvqmFMJaS1IV5OzoY2HXH4wGi6wOPL3hrWKPUiY4L+/PXmuIMaLEUm5bCZnpLHBidYrb2vg==",
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-2.7.0.tgz",
"integrity": "sha512-mSisB8mOVQLg6CJ4Fjp2oa6NAr/zc+yh/2x8fdjSzzZPN23WlmpPkluHeCIKN5rQDqDIGHXCntfyCaVp5hGMnw==",
"requires": {
"@oceanprotocol/contracts": "^1.1.8",
"bignumber.js": "^9.1.0",

2
package.json
View File

@ -73,7 +73,7 @@
},
"dependencies": {
"@oceanprotocol/contracts": "^1.1.12",
"@oceanprotocol/lib": "^2.6.3",
"@oceanprotocol/lib": "^2.7.0",
"cross-fetch": "^3.1.4"
},
"repository": {

10
test/integration/Datatoken.test.ts
View File

@ -222,18 +222,22 @@ describe('Datatoken tests', async () => {
})
it('Correct Datatoken fields after updating metadata', async () => {
const chain = await web3.eth.getChainId()
// create the files encrypted string
let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl)
let providerResponse = await ProviderInstance.encrypt(
assetUrl,
chain,
providerUrl
)
ddo.services[0].files = await providerResponse
ddo.services[0].datatokenAddress = datatokenAddress
// update ddo and set the right did
ddo.nftAddress = erc721Address
const chain = await web3.eth.getChainId()
ddo.id =
'did:op:' +
SHA256(web3.utils.toChecksumAddress(erc721Address) + chain.toString(10))
providerResponse = await ProviderInstance.encrypt(ddo, providerUrl)
providerResponse = await ProviderInstance.encrypt(ddo, chain, providerUrl)
const encryptedResponse = await providerResponse
const metadataHash = getHash(JSON.stringify(ddo))
await nft.setMetadata(

10
test/integration/Nft.test.ts
View File

@ -190,18 +190,22 @@ describe('NFT tests', async () => {
})
it('Update metadata', async () => {
const chain = await web3.eth.getChainId()
// create the files encrypted string
let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl)
let providerResponse = await ProviderInstance.encrypt(
assetUrl,
chain,
providerUrl
)
ddo.services[0].files = await providerResponse
ddo.services[0].datatokenAddress = datatokenAddress
// update ddo and set the right did
ddo.nftAddress = erc721Address
const chain = await web3.eth.getChainId()
ddo.id =
'did:op:' +
SHA256(web3.utils.toChecksumAddress(erc721Address) + chain.toString(10))
providerResponse = await ProviderInstance.encrypt(ddo, providerUrl)
providerResponse = await ProviderInstance.encrypt(ddo, chain, providerUrl)
const encryptedResponse = await providerResponse
const metadataHash = getHash(JSON.stringify(ddo))
await nft.setMetadata(

20
test/integration/SimplePublishConsume.test.ts
View File

@ -123,17 +123,21 @@ describe('Simple Publish & consume test', async () => {
datatokenAddress = result.events.TokenCreated.returnValues[0]
// create the files encrypted string
let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl)
const chain = await web3.eth.getChainId()
let providerResponse = await ProviderInstance.encrypt(
assetUrl,
chain,
providerUrl
)
ddo.services[0].files = await providerResponse
ddo.services[0].datatokenAddress = datatokenAddress
// update ddo and set the right did
ddo.nftAddress = erc721Address
const chain = await web3.eth.getChainId()
ddo.id =
'did:op:' +
SHA256(web3.utils.toChecksumAddress(erc721Address) + chain.toString(10))
providerResponse = await ProviderInstance.encrypt(ddo, providerUrl)
providerResponse = await ProviderInstance.encrypt(ddo, chain, providerUrl)
const encryptedResponse = await providerResponse
const metadataHash = getHash(JSON.stringify(ddo))
await nft.setMetadata(
@ -217,17 +221,21 @@ describe('Simple Publish & consume test', async () => {
)
// create the files encrypted string
let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl)
const chain = await web3.eth.getChainId()
let providerResponse = await ProviderInstance.encrypt(
assetUrl,
chain,
providerUrl
)
ddo.services[0].files = await providerResponse
ddo.services[0].datatokenAddress = datatokenAddress
// update ddo and set the right did
ddo.nftAddress = erc721Address
const chain = await web3.eth.getChainId()
ddo.id =
'did:op:' +
SHA256(web3.utils.toChecksumAddress(erc721Address) + chain.toString(10))
providerResponse = await ProviderInstance.encrypt(ddo, providerUrl)
providerResponse = await ProviderInstance.encrypt(ddo, chain, providerUrl)
const encryptedResponse = await providerResponse
const metadataHash = getHash(JSON.stringify(ddo))
await nft.setMetadata(