From 692e50e3ae99c390467341dac8421efb23561304 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 22 Aug 2020 00:58:08 +0200 Subject: [PATCH] package updates, move to @oceanprotocol/contracts --- package-lock.json | 46 +++++++++++------------------------ package.json | 6 ++--- src/renderer/store/helpers.js | 2 +- 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1cef58..59dab39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6023,10 +6023,10 @@ "fastq": "^1.6.0" } }, - "@oceanprotocol/keeper-contracts": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.13.2.tgz", - "integrity": "sha512-915dcnzCHEuvsmRKqVj0RxHT3T386lSJh8WREe4dsnrXHsi1ULNYxX0Ts/cvalv6bRL+aqyaZ6gN3l3nkfwEDg==" + "@oceanprotocol/contracts": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.3.5.tgz", + "integrity": "sha512-z7ziNbRwsPrJi+zGyokgUEKivD90a5/9jjV+WLj1q5U96g60rd5rxox4EKNPNGlHx/m5rWBJhHBV4rseJjtFjg==" }, "@octokit/auth-token": { "version": "2.4.2", @@ -7590,11 +7590,11 @@ "dev": true }, "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz", + "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==", "requires": { - "follow-redirects": "1.5.10" + "follow-redirects": "^1.10.0" } }, "babel-core": { @@ -9948,21 +9948,6 @@ } } }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", @@ -12210,12 +12195,9 @@ } }, "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - } + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", + "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==" }, "for-in": { "version": "1.0.2", @@ -23072,9 +23054,9 @@ } }, "swr": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/swr/-/swr-0.3.0.tgz", - "integrity": "sha512-3p0p5TWH0qiaKAph5wBkMwqe2WjNseITfjmdVoNzjqRZGn/gnpRi6whMDjhMVb/vp/yyDtKWPlyjid8QZH+UhA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/swr/-/swr-0.3.1.tgz", + "integrity": "sha512-g9JrXXMo54CSc+DU+KS0S8+5r6cpeBmBmVLhCu23ifQL9u0KKirkJpNX3Za3eOttmUuRQLXA8N1YPpoc8ejdpA==", "requires": { "fast-deep-equal": "2.0.1" }, diff --git a/package.json b/package.json index 4c2dd44..e173a04 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "license": "MIT", "dependencies": { "@coingecko/cryptoformat": "^0.3.8", - "@oceanprotocol/keeper-contracts": "^0.13.2", - "axios": "^0.19.2", + "@oceanprotocol/contracts": "^0.3.5", + "axios": "^0.20.0", "electron-is-dev": "^1.2.0", "electron-next": "^3.1.5", "electron-store": "^6.0.0", @@ -39,7 +39,7 @@ "ethjs": "^0.4.0", "ms": "^2.1.2", "shortid": "^2.2.15", - "swr": "^0.3.0" + "swr": "^0.3.1" }, "devDependencies": { "@babel/core": "^7.11.1", diff --git a/src/renderer/store/helpers.js b/src/renderer/store/helpers.js index dfd59b0..8646821 100644 --- a/src/renderer/store/helpers.js +++ b/src/renderer/store/helpers.js @@ -1,7 +1,7 @@ import Store from 'electron-store' import Eth from 'ethjs' import { oceanTokenContract, conversions } from '../../config' -import { abi } from '@oceanprotocol/keeper-contracts/artifacts/OceanToken.pacific.json' +import { abi } from '@oceanprotocol/contracts/artifacts/ERC20.json' export async function convertPrices(data, prices) { let newPrices = new Map(prices) // make a shallow copy of the Map