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

package-locks, web3 import

Browse Source
This commit is contained in:
Jernej Pregelj 2019-04-18 10:52:31 +02:00 committed by Matthias Kretschmann
parent c36ed8dbe6
commit 92cfc80bec
Signed by: m
GPG Key ID: 606EEEF3C479A91F
4 changed files with 9037 additions and 1310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8507
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

27
package-lock.json generated
View File

@ -271,9 +271,15 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
<<<<<<< HEAD
"version": "11.13.7", "version": "11.13.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.7.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.7.tgz",
"integrity": "sha512-suFHr6hcA9mp8vFrZTgrmqW2ZU3mbWsryQtQlY/QvwTISCw7nw/j+bCQPPohqmskhmqa5wLNuMHTTsc+xf1MQg==", "integrity": "sha512-suFHr6hcA9mp8vFrZTgrmqW2ZU3mbWsryQtQlY/QvwTISCw7nw/j+bCQPPohqmskhmqa5wLNuMHTTsc+xf1MQg==",
=======
"version": "11.13.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.5.tgz",
"integrity": "sha512-/OMMBnjVtDuwX1tg2pkYVSqRIDSmNTnvVvmvP/2xiMAAWf4a5+JozrApCrO4WCAILmXVxfNoQ3E+0HJbNpFVGg==",
>>>>>>> package-locks, web3 import
"dev": true "dev": true
}, },
"@types/unist": { "@types/unist": {
@ -835,9 +841,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30000959", "version": "1.0.30000960",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000959.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz",
"integrity": "sha512-6BvqmS0VLmY4sJCz6AbIJRQfcns8McDxi424y+3kmtisJeA9/5qslP+K8sqremDau7UU4WSsqdRP032JrqZY8Q==", "integrity": "sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA==",
"dev": true "dev": true
}, },
"capture-stack-trace": { "capture-stack-trace": {
@ -2599,9 +2605,9 @@
} }
}, },
"eslint-plugin-import": { "eslint-plugin-import": {
"version": "2.17.1", "version": "2.17.2",
"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.17.1.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz",
"integrity": "sha512-lzD9uvRvW4MsHzIOMJEDSb5MOV9LzgxRPBaovvOhJqzgxRHYfGy9QOrMuwHIh5ehKFJ7Z3DcrcGKDQ0IbP0EdQ==", "integrity": "sha512-m+cSVxM7oLsIpmwNn2WXTJoReOF9f/CtLMo7qOVmKd1KntBy0hEcuNZ3erTmWjx+DxRO0Zcrm5KwAvI9wHcV5g==",
"dev": true, "dev": true,
"requires": { "requires": {
"array-includes": "^3.0.3", "array-includes": "^3.0.3",
@ -2659,9 +2665,9 @@
}, },
"dependencies": { "dependencies": {
"ignore": { "ignore": {
"version": "5.1.0", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.0.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.1.tgz",
"integrity": "sha512-dJEmMwloo0gq40chdtDmE4tMp67ZGwN7MFTgjNqWi2VHEi5Ya6JkuvPWasjcAIm7lg+2if8xxn5R199wspcplg==", "integrity": "sha512-DWjnQIFLenVrwyRCKZT+7a7/U4Cqgar4WG8V++K3hw+lrW1hc/SIwdiGmtxKCVACmHULTuGeBbHJmbwW7/sAvA==",
"dev": true "dev": true
} }
} }
@ -7764,6 +7770,7 @@
"caniuse-lite": "^1.0.30000960", "caniuse-lite": "^1.0.30000960",
"electron-to-chromium": "^1.3.124", "electron-to-chromium": "^1.3.124",
"node-releases": "^1.1.14" "node-releases": "^1.1.14"
<<<<<<< HEAD
}, },
"dependencies": { "dependencies": {
"caniuse-lite": { "caniuse-lite": {
@ -7772,6 +7779,8 @@
"integrity": "sha512-WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA==", "integrity": "sha512-WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA==",
"dev": true "dev": true
} }
=======
>>>>>>> package-locks, web3 import
} }
}, },
"camelcase": { "camelcase": {

1811
server/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
server/src/utils.ts
View File

@ -1,4 +1,4 @@
import Web3 from 'web3' import * as Web3 from 'web3'
import { Ocean } from '@oceanprotocol/squid' import { Ocean } from '@oceanprotocol/squid'
import config from './config/config' import config from './config/config'