oceanprotocol/commons
1
0
Fork 0
mirror of https://github.com/oceanprotocol/commons.git synced 2023-03-15 18:03:00 +01:00
Code Releases Activity

Merge pull request #218 from oceanprotocol/feature/squid-v2

Browse Source 
bump to squid.js v2 beta
This commit is contained in:
Matthias Kretschmann 2020-02-20 16:36:42 +01:00 committed by GitHub
commit 456ad15ddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -33,10 +33,10 @@ env:
- IPFS_GATEWAY_URI="https://ipfs.oceanprotocol.com" - IPFS_GATEWAY_URI="https://ipfs.oceanprotocol.com"
# start Barge with these versions # start Barge with these versions
- BRIZO_VERSION=v0.8.1 - BRIZO_VERSION=v0.9.3
- AQUARIUS_VERSION=v1.0.5 - AQUARIUS_VERSION=v1.0.7
- KEEPER_VERSION=v0.13.2 - KEEPER_VERSION=v0.13.2
- EVENTS_HANDLER_VERSION=v0.4.4 - EVENTS_HANDLER_VERSION=v0.4.5
- KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260" - KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
- FAUCET_TIMESPAN=0 - FAUCET_TIMESPAN=0

12
client/package-lock.json generated
View File

@ -1845,9 +1845,9 @@
} }
}, },
"@oceanprotocol/squid": { "@oceanprotocol/squid": {
"version": "1.3.0", "version": "2.0.0-beta.3",
"resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-1.3.0.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-2.0.0-beta.3.tgz",
"integrity": "sha512-1/k1W5yMGIlsmN7O3mTkQ5VMB7qD4w9VnkoiTd/cIuGks73KsHRuHH5dEn99PUigacc6WwX5BBl8Osr3Nv5T8g==", "integrity": "sha512-ms/keYZs6GaZQlsiFkAlNHnA0OC6ksap8yKeTXQfc7/6MXLpRibrG3KKOkxKYzOYUnoEbbNHA5LZ43SAYkyAUA==",
"requires": { "requires": {
"@ethereum-navigator/navigator": "^0.4.1", "@ethereum-navigator/navigator": "^0.4.1",
"@oceanprotocol/keeper-contracts": "^0.13.2", "@oceanprotocol/keeper-contracts": "^0.13.2",
@ -20910,9 +20910,9 @@
} }
}, },
"tr46": { "tr46": {
"version": "2.0.0", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.0.tgz", "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
"integrity": "sha512-LrErSqfhdUw73AC/eXV2fEmNkvgSYxfm5lvxnLvuVgoVDknvD28Pa5FeDGc8RuVouDxUD3GnHHFv7xnBp7As5w==", "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
"requires": { "requires": {
"punycode": "^2.1.1" "punycode": "^2.1.1"
} }

2
client/package.json
View File

@ -14,7 +14,7 @@
}, },
"dependencies": { "dependencies": {
"@oceanprotocol/art": "^2.2.0", "@oceanprotocol/art": "^2.2.0",
"@oceanprotocol/squid": "^1.3.0", "@oceanprotocol/squid": "next",
"@oceanprotocol/typographies": "^0.1.0", "@oceanprotocol/typographies": "^0.1.0",
"@sindresorhus/slugify": "^0.10.0", "@sindresorhus/slugify": "^0.10.0",
"@truffle/hdwallet-provider": "^1.0.30", "@truffle/hdwallet-provider": "^1.0.30",

5
client/src/components/templates/Asset/AssetFile.tsx
View File

@ -59,8 +59,6 @@ export default class AssetFile extends PureComponent<
try { try {
const accounts = await ocean.accounts.list() const accounts = await ocean.accounts.list()
const service = ddo.findServiceByType('access')
const agreements = await ocean.keeper.conditions.accessSecretStoreCondition.getGrantedDidByConsumer( const agreements = await ocean.keeper.conditions.accessSecretStoreCondition.getGrantedDidByConsumer(
accounts[0].id accounts[0].id
) )
@ -74,7 +72,7 @@ export default class AssetFile extends PureComponent<
;({ agreementId } = agreement) ;({ agreementId } = agreement)
} else { } else {
agreementId = await ocean.assets agreementId = await ocean.assets
.order(ddo.id, service.index, accounts[0]) .order(ddo.id, accounts[0])
.next((step: number) => this.setState({ step })) .next((step: number) => this.setState({ step }))
} }
@ -84,7 +82,6 @@ export default class AssetFile extends PureComponent<
const path = await ocean.assets.consume( const path = await ocean.assets.consume(
agreementId, agreementId,
ddo.id, ddo.id,
service.index,
accounts[0], accounts[0],
'', '',
index index