oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

change erc721Address to nftAddress

Browse Source
This commit is contained in:
Miquel A. Cabot 2022-06-10 10:14:37 +02:00
parent eaf9414adf
commit e49d957022
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/DdoHelpers.ts
View File

@ -2,9 +2,9 @@ import sha256 from 'crypto-js/sha256'
import Web3 from 'web3' import Web3 from 'web3'
import { LoggerInstance } from '.' import { LoggerInstance } from '.'
export function generateDid(erc721Address: string, chainId: number): string { export function generateDid(nftAddress: string, chainId: number): string {
erc721Address = Web3.utils.toChecksumAddress(erc721Address) nftAddress = Web3.utils.toChecksumAddress(nftAddress)
const checksum = sha256(erc721Address + chainId.toString(10)) const checksum = sha256(nftAddress + chainId.toString(10))
return `did:op:${checksum.toString()}` return `did:op:${checksum.toString()}`
} }

9
test/integration/ComputeFlow.test.ts
View File

@ -244,7 +244,7 @@ async function createAsset(
const result = await Factory.createNftWithErc20(owner, nftParamsAsset, erc20ParamsAsset) const result = await Factory.createNftWithErc20(owner, nftParamsAsset, erc20ParamsAsset)
const erc721AddressAsset = result.events.NFTCreated.returnValues[0] const nftAddress = result.events.NFTCreated.returnValues[0]
const datatokenAddressAsset = result.events.TokenCreated.returnValues[0] const datatokenAddressAsset = result.events.TokenCreated.returnValues[0]
// create the files encrypted string // create the files encrypted string
let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl) let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl)
@ -252,16 +252,15 @@ async function createAsset(
ddo.services[0].datatokenAddress = datatokenAddressAsset ddo.services[0].datatokenAddress = datatokenAddressAsset
ddo.services[0].serviceEndpoint = providerUrl ddo.services[0].serviceEndpoint = providerUrl
// update ddo and set the right did // update ddo and set the right did
ddo.nftAddress = web3.utils.toChecksumAddress(erc721AddressAsset) ddo.nftAddress = web3.utils.toChecksumAddress(nftAddress)
ddo.id = ddo.id =
'did:op:' + 'did:op:' + SHA256(web3.utils.toChecksumAddress(nftAddress) + chain.toString(10))
SHA256(web3.utils.toChecksumAddress(erc721AddressAsset) + chain.toString(10))
providerResponse = await ProviderInstance.encrypt(ddo, providerUrl) providerResponse = await ProviderInstance.encrypt(ddo, providerUrl)
const encryptedResponse = await providerResponse const encryptedResponse = await providerResponse
const validateResult = await aquarius.validate(ddo) const validateResult = await aquarius.validate(ddo)
assert(validateResult.valid, 'Could not validate metadata') assert(validateResult.valid, 'Could not validate metadata')
await nft.setMetadata( await nft.setMetadata(
erc721AddressAsset, nftAddress,
owner, owner,
0, 0,
providerUrl, providerUrl,

8
test/integration/SimplePublishConsumeFlow.test.ts
View File

@ -97,7 +97,7 @@ describe('Simple Publish & consume test', async () => {
} }
const tx = await Factory.createNftWithErc20(publisherAccount, nftParams, erc20Params) const tx = await Factory.createNftWithErc20(publisherAccount, nftParams, erc20Params)
const erc721Address = tx.events.NFTCreated.returnValues[0] const nftAddress = tx.events.NFTCreated.returnValues[0]
const datatokenAddress = tx.events.TokenCreated.returnValues[0] const datatokenAddress = tx.events.TokenCreated.returnValues[0]
// create the files encrypted string // create the files encrypted string
@ -105,16 +105,16 @@ describe('Simple Publish & consume test', async () => {
ddo.services[0].files = await providerResponse ddo.services[0].files = await providerResponse
ddo.services[0].datatokenAddress = datatokenAddress ddo.services[0].datatokenAddress = datatokenAddress
// update ddo and set the right did // update ddo and set the right did
ddo.nftAddress = erc721Address ddo.nftAddress = nftAddress
const chain = await web3.eth.getChainId() const chain = await web3.eth.getChainId()
ddo.id = ddo.id =
'did:op:' + SHA256(web3.utils.toChecksumAddress(erc721Address) + chain.toString(10)) 'did:op:' + SHA256(web3.utils.toChecksumAddress(nftAddress) + chain.toString(10))
providerResponse = await ProviderInstance.encrypt(ddo, providerUrl) providerResponse = await ProviderInstance.encrypt(ddo, providerUrl)
const encryptedResponse = await providerResponse const encryptedResponse = await providerResponse
const metadataHash = getHash(JSON.stringify(ddo)) const metadataHash = getHash(JSON.stringify(ddo))
await nft.setMetadata( await nft.setMetadata(
erc721Address, nftAddress,
publisherAccount, publisherAccount,
0, 0,
providerUrl, providerUrl,