1
0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00

Merge remote-tracking branch 'origin/feature/keeper-0.13' into feature/keeper-0.13

# Conflicts:
#	.travis.yml
#	library.json
#	package-lock.json
#	package.json
This commit is contained in:
ssallam 2020-01-15 15:42:35 +01:00
commit dd81540d80
4 changed files with 652 additions and 445 deletions

View File

@ -22,9 +22,9 @@ before_script:
- git clone https://github.com/oceanprotocol/barge - git clone https://github.com/oceanprotocol/barge
- cd barge - cd barge
- export AQUARIUS_VERSION=v1.0.5 - export AQUARIUS_VERSION=v1.0.5
- export BRIZO_VERSION=v0.7.2 - export BRIZO_VERSION=v0.8.0
- export KEEPER_VERSION=v0.13.1 - export KEEPER_VERSION=v0.13.2
- export EVENTS_HANDLER_VERSION=v0.3.4 - export EVENTS_HANDLER_VERSION=v0.4.0
- export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260" - export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
- rm -rf "${HOME}/.ocean/keeper-contracts/artifacts" - rm -rf "${HOME}/.ocean/keeper-contracts/artifacts"
- bash -x start_ocean.sh --no-commons --no-dashboard 2>&1 > start_ocean.log & - bash -x start_ocean.sh --no-commons --no-dashboard 2>&1 > start_ocean.log &

View File

@ -7,11 +7,11 @@
"dependencies": [ "dependencies": [
{ {
"name": "keeper-contracts", "name": "keeper-contracts",
"version": "~0.13.1" "version": "~0.13.2"
}, },
{ {
"name": "brizo", "name": "brizo",
"version": "~0.7.2" "version": "~0.8.0"
}, },
{ {
"name": "aquarius", "name": "aquarius",
@ -19,7 +19,7 @@
}, },
{ {
"name": "events-handler", "name": "events-handler",
"version": "~0.3.4" "version": "~0.4.0"
} }
] ]
} }

1077
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -52,7 +52,7 @@
"web3": "^1.2.3" "web3": "^1.2.3"
}, },
"dependencies": { "dependencies": {
"@oceanprotocol/keeper-contracts": "^0.13.1", "@oceanprotocol/keeper-contracts": "^0.13.2",
"@oceanprotocol/secret-store-client": "^0.0.15", "@oceanprotocol/secret-store-client": "^0.0.15",
"bignumber.js": "^9.0.0", "bignumber.js": "^9.0.0",
"deprecated-decorator": "^0.1.6", "deprecated-decorator": "^0.1.6",
@ -60,7 +60,7 @@
"save-file": "^2.3.1", "save-file": "^2.3.1",
"uuid": "^3.3.3", "uuid": "^3.3.3",
"web3": "^1.2.4", "web3": "^1.2.4",
"whatwg-url": "^7.1.0" "whatwg-url": "^8.0.0"
}, },
"devDependencies": { "devDependencies": {
"@release-it/bumper": "^1.0.5", "@release-it/bumper": "^1.0.5",
@ -68,7 +68,7 @@
"@types/chai": "^4.2.7", "@types/chai": "^4.2.7",
"@types/chai-spies": "^1.0.1", "@types/chai-spies": "^1.0.1",
"@types/mocha": "^5.2.7", "@types/mocha": "^5.2.7",
"@types/node": "^12.12.18", "@types/node": "^13.1.0",
"@types/node-fetch": "^2.5.4", "@types/node-fetch": "^2.5.4",
"@typescript-eslint/eslint-plugin": "^2.12.0", "@typescript-eslint/eslint-plugin": "^2.12.0",
"@typescript-eslint/parser": "^2.12.0", "@typescript-eslint/parser": "^2.12.0",
@ -83,7 +83,7 @@
"lcov-result-merger": "^3.1.0", "lcov-result-merger": "^3.1.0",
"mocha": "^6.2.2", "mocha": "^6.2.2",
"mock-local-storage": "^1.1.11", "mock-local-storage": "^1.1.11",
"nyc": "^14.1.1", "nyc": "^15.0.0",
"ora": "^4.0.2", "ora": "^4.0.2",
"prettier": "^1.19.1", "prettier": "^1.19.1",
"source-map-support": "^0.5.16", "source-map-support": "^0.5.16",