From 56cfa278c8f00a7468cd035a816f5d2c65c4d7c2 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 10 Feb 2021 12:59:36 +0200 Subject: [PATCH 1/8] Removed pinning from new entries, up dependencies --- packages/concordia-app/package.json | 4 +- .../components/InitializationScreen/index.jsx | 4 +- .../src/components/PostCreate/index.jsx | 2 +- .../GeneralTab/EditInformationModal/index.jsx | 2 +- .../PersonalInformationStep/index.jsx | 2 +- .../src/views/Topic/TopicCreate/index.jsx | 4 +- packages/concordia-pinner/package.json | 6 +- packages/concordia-rendezvous/package.json | 2 +- yarn.lock | 948 +++++++++++------- 9 files changed, 571 insertions(+), 403 deletions(-) diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index 5931f0f..61ba424 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -24,8 +24,8 @@ ] }, "dependencies": { - "@ezerous/breeze": "~0.4.0", - "@ezerous/drizzle": "~0.4.1", + "@ezerous/breeze": "~0.5.0", + "@ezerous/drizzle": "~0.4.2", "@ezerous/eth-identity-provider": "~0.1.2", "@reduxjs/toolkit": "~1.4.0", "@welldone-software/why-did-you-render": "^6.0.0-rc.1", diff --git a/packages/concordia-app/src/components/InitializationScreen/index.jsx b/packages/concordia-app/src/components/InitializationScreen/index.jsx index 6ada2b8..55a7d46 100644 --- a/packages/concordia-app/src/components/InitializationScreen/index.jsx +++ b/packages/concordia-app/src/components/InitializationScreen/index.jsx @@ -94,7 +94,7 @@ const InitializationLoader = ({ children }) => { ); } - if (ipfsStatus === breezeConstants.STATUS_INITIALIZING) { + if (ipfsStatus === breezeConstants.STATUS_UNINITIALIZED || ipfsStatus === breezeConstants.STATUS_INITIALIZING) { return ( { ); } - if (orbitStatus === breezeConstants.STATUS_INITIALIZING) { + if (orbitStatus === breezeConstants.STATUS_UNINITIALIZED || orbitStatus === breezeConstants.STATUS_INITIALIZING) { const message = process.env.NODE_ENV === 'development' ? 'If needed, please sign the transaction in MetaMask to create the databases.' : 'Please sign the transaction in MetaMask to create the databases.'; diff --git a/packages/concordia-app/src/components/PostCreate/index.jsx b/packages/concordia-app/src/components/PostCreate/index.jsx index 32d2915..6dd5180 100644 --- a/packages/concordia-app/src/components/PostCreate/index.jsx +++ b/packages/concordia-app/src/components/PostCreate/index.jsx @@ -87,7 +87,7 @@ const PostCreate = (props) => { postsDb .put(contractPostId, { [POST_CONTENT]: postContent, - }, { pin: true }) + }) .then(() => { setPostContent(''); setPosting(false); diff --git a/packages/concordia-app/src/views/Profile/GeneralTab/EditInformationModal/index.jsx b/packages/concordia-app/src/views/Profile/GeneralTab/EditInformationModal/index.jsx index 12c9837..310e98b 100644 --- a/packages/concordia-app/src/views/Profile/GeneralTab/EditInformationModal/index.jsx +++ b/packages/concordia-app/src/views/Profile/GeneralTab/EditInformationModal/index.jsx @@ -112,7 +112,7 @@ const EditInformationModal = (props) => { .map((keyValueToStore) => { if (keyValueToStore.value !== '') { return userDb - .put(keyValueToStore.key, keyValueToStore.value, { pin: true }); + .put(keyValueToStore.key, keyValueToStore.value); } return userDb.del(keyValueToStore.key); diff --git a/packages/concordia-app/src/views/Register/PersonalInformationStep/index.jsx b/packages/concordia-app/src/views/Register/PersonalInformationStep/index.jsx index cefb47f..31259ce 100644 --- a/packages/concordia-app/src/views/Register/PersonalInformationStep/index.jsx +++ b/packages/concordia-app/src/views/Register/PersonalInformationStep/index.jsx @@ -90,7 +90,7 @@ const PersonalInformationStep = (props) => { keyValuesToStore .reduce((acc, keyValueToStore) => acc .then(() => userDb - .put(keyValueToStore.key, keyValueToStore.value, { pin: true })), + .put(keyValueToStore.key, keyValueToStore.value)), Promise.resolve()) .then(() => pushNextStep()) .catch((reason) => { diff --git a/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx b/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx index a156ff3..565d99d 100644 --- a/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx +++ b/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx @@ -71,11 +71,11 @@ const TopicCreate = (props) => { const postsDb = Object.values(stores).find((store) => store.dbname === POSTS_DATABASE); topicsDb - .put(topicId, { [TOPIC_SUBJECT]: subjectInput }, { pin: true }) + .put(topicId, { [TOPIC_SUBJECT]: subjectInput }) .then(() => postsDb .put(postId, { [POST_CONTENT]: contentInput, - }, { pin: true })) + })) .then(() => { history.push(`/topics/${topicId}`); }) diff --git a/packages/concordia-pinner/package.json b/packages/concordia-pinner/package.json index 964198a..c1c0016 100644 --- a/packages/concordia-pinner/package.json +++ b/packages/concordia-pinner/package.json @@ -16,18 +16,18 @@ "concordia-shared": "~0.1.0", "esm": "~3.2.25", "express": "^4.17.1", - "ipfs": "~0.52.1", + "ipfs": "~0.54.2", "is-reachable": "^5.0.0", "level": "~6.0.1", "libp2p": "~0.30.0", - "libp2p-bootstrap": "~0.12.1", + "libp2p-bootstrap": "~0.12.2", "libp2p-gossipsub": "~0.8.0", "libp2p-kad-dht": "~0.20.1", "libp2p-mdns": "~0.15.0", "libp2p-mplex": "~0.10.0", "libp2p-noise": "~2.0.1", "libp2p-tcp": "~0.15.1", - "libp2p-webrtc-star": "~0.20.2", + "libp2p-webrtc-star": "~0.21.1", "lodash": "^4.17.20", "orbit-db": "~0.26.0", "orbit-db-identity-provider": "~0.3.1", diff --git a/packages/concordia-rendezvous/package.json b/packages/concordia-rendezvous/package.json index 9558701..40e709a 100644 --- a/packages/concordia-rendezvous/package.json +++ b/packages/concordia-rendezvous/package.json @@ -7,6 +7,6 @@ "start": "star-signal --port=9090 --host=127.0.0.1" }, "dependencies": { - "libp2p-webrtc-star": "~0.20.5" + "libp2p-webrtc-star": "~0.21.1" } } diff --git a/yarn.lock b/yarn.lock index e114f6c..53bf2eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1499,28 +1499,28 @@ "@ethersproject/properties" "^5.0.7" "@ethersproject/strings" "^5.0.8" -"@ezerous/breeze@~0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@ezerous/breeze/-/breeze-0.4.0.tgz#f20f37eee3fe447e2af989863c416fb76994542f" - integrity sha512-TGYwiWvOfaPio64QrFQ+bzYawadcr6dopU9a252ui/YHUIBb4sDaZiofZiALd+soW3D3BrCCKJBeqkiwFggnpw== +"@ezerous/breeze@~0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@ezerous/breeze/-/breeze-0.5.0.tgz#472c9d1a28edac9d38ea56f3501c846f1e191a7e" + integrity sha512-HK7jncn/sxxCT/wbocHtFGcGkceWMHZSOyKnRYZ6ukbpKPicaerIYbg8G6t2jBTLrFwvkxLHVe2bAWkmQEf9VQ== dependencies: deepmerge "~4.2.2" - ipfs "~0.52.0" + ipfs "~0.54.2" is-plain-object "~5.0.0" orbit-db "~0.26.0" orbit-db-identity-provider "~0.3.1" redux-saga "~1.1.3" -"@ezerous/drizzle@~0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@ezerous/drizzle/-/drizzle-0.4.1.tgz#a504178e89a68c86e5cafe62d6df45af7fd0cef5" - integrity sha512-F1nfgczSI9hkd0sZaey0C5rC9KALEavHxnuRueDdXPJaF4sfx41YPdVB09Ejywf7EwaqNv92zdcI/wAwft6WvA== +"@ezerous/drizzle@~0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@ezerous/drizzle/-/drizzle-0.4.2.tgz#2e575d0709cc29c77b984d96562b8749d8f477c9" + integrity sha512-oTJ77+yGdgg2KPIeIvRczFnPrBg8aXdNisHfM0ztjd7T/Ui8+Nw1HNhMVaw2xTuR53pio3SD8FBU1JrEUKOABQ== dependencies: deepmerge "~4.2.2" is-plain-object "~5.0.0" redux "~4.0.5" redux-saga "~1.1.3" - web3 "~1.3.0" + web3 "~1.3.4" "@ezerous/eth-identity-provider@~0.1.2": version "0.1.2" @@ -1545,6 +1545,15 @@ "@babel/runtime" "^7.10.4" react-is "^16.6.3" +"@grpc/grpc-js@^1.1.8": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.2.6.tgz#579c433ab9b9dda8a62080db1ac0c86dce58bbaa" + integrity sha512-wfYwFy7CvVEmBKzeDX1kQQYrv5NBpe8Z+VwXipFvqof3lCXKch7k+4T3grKtptaH5GQ5KP9iKwPr9hMDSynIUw== + dependencies: + "@types/node" ">=12.12.47" + google-auth-library "^6.1.1" + semver "^6.2.0" + "@hapi/accept@^5.0.1": version "5.0.2" resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.2.tgz#ab7043b037e68b722f93f376afb05e85c0699523" @@ -2386,6 +2395,21 @@ "@types/node" "*" "@types/responselike" "*" +"@types/component-emitter@^1.2.10": + version "1.2.10" + resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea" + integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg== + +"@types/cookie@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108" + integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg== + +"@types/cors@^2.8.8": + version "2.8.9" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.9.tgz#4bd1fcac72eca8d5bec93e76c7fdcbdc1bc2cd4a" + integrity sha512-zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg== + "@types/debug@^4.1.5": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" @@ -2463,7 +2487,7 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*": +"@types/node@*", "@types/node@>=12.12.47", "@types/node@^14.14.10": version "14.14.25" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.25.tgz#15967a7b577ff81383f9b888aa6705d43fbbae93" integrity sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ== @@ -2885,7 +2909,14 @@ after@0.8.2: resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= -aggregate-error@^3.0.0, aggregate-error@^3.0.1, aggregate-error@^3.1.0: +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +aggregate-error@^3.0.0, aggregate-error@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== @@ -3013,7 +3044,7 @@ any-signal@^1.1.0: dependencies: abort-controller "^3.0.0" -any-signal@^2.0.0, any-signal@^2.1.0, any-signal@^2.1.1: +any-signal@^2.1.0, any-signal@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/any-signal/-/any-signal-2.1.1.tgz#6458f7ce08cfdd8df21953016ae03ca129b07e35" integrity sha512-kjyMTtHQsB3yZAVDZlLVucPJnmnrXhamB/rm3Td3jse5Q+16FXXolP4elWU0yLFDyrxTkjjDXtIdjSPiEznf3w== @@ -3021,6 +3052,14 @@ any-signal@^2.0.0, any-signal@^2.1.0, any-signal@^2.1.1: abort-controller "^3.0.0" native-abort-controller "0.0.3" +any-signal@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/any-signal/-/any-signal-2.1.2.tgz#8d48270de0605f8b218cf9abe8e9c6a0e7418102" + integrity sha512-B+rDnWasMi/eWcajPcCWSlYc7muXOrcYrqgyzcdKisl2H/WTlQ0gip1KyQfr0ZlxJdsuWCj/LWwQm7fhyhRfIQ== + dependencies: + abort-controller "^3.0.0" + native-abort-controller "^1.0.3" + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -3149,10 +3188,10 @@ array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2: get-intrinsic "^1.0.1" is-string "^1.0.5" -array-shuffle@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-shuffle/-/array-shuffle-1.0.1.tgz#7ea4882a356b4bca5f545e0b6e52eaf6d971557a" - integrity sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo= +array-shuffle@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/array-shuffle/-/array-shuffle-2.0.0.tgz#fd36437cd7997d557055283c946e46379a7cd343" + integrity sha512-rJTchCppiO6QsQnN51KDH1cgMYm13B+ybxFS5GgdBdTTHpZcrq3M7SOBgzp+L9fqqnjkFDiwdEVcX1wINgl9DQ== array-union@^1.0.1: version "1.0.2" @@ -3211,7 +3250,7 @@ arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= -arrify@^2.0.1: +arrify@^2.0.0, arrify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== @@ -3523,7 +3562,7 @@ babylon@^6.18.0: resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== -backo2@1.0.2: +backo2@1.0.2, backo2@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= @@ -3555,12 +3594,12 @@ base64-arraybuffer@0.1.4: resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= -base64-js@^1.0.2, base64-js@^1.3.1: +base64-js@^1.0.2, base64-js@^1.3.0, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64id@2.0.0: +base64id@2.0.0, base64id@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -3928,6 +3967,11 @@ btoa@^1.2.1: resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73" integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g== +buffer-equal-constant-time@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" + integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= + buffer-from@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" @@ -4146,7 +4190,7 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camel-case@^4.1.1: +camel-case@^4.1.1, camel-case@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== @@ -4184,6 +4228,15 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, can resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz#3482a407d261da04393e2f0d61eefbc53be43b95" integrity sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg== +capital-case@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" + integrity sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + upper-case-first "^2.0.2" + capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" @@ -4201,14 +4254,6 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -cbor@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.2.0.tgz#4cca67783ccd6de7b50ab4ed62636712f287a67c" - integrity sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A== - dependencies: - bignumber.js "^9.0.1" - nofilter "^1.0.4" - cbor@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/cbor/-/cbor-6.0.1.tgz#f559abb1b986f54fb9cb1a6855085847bcc1cd61" @@ -4262,6 +4307,24 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +change-case@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz#fedfc5f136045e2398c0410ee441f95704641e12" + integrity sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A== + dependencies: + camel-case "^4.1.2" + capital-case "^1.0.4" + constant-case "^3.0.4" + dot-case "^3.0.4" + header-case "^2.0.4" + no-case "^3.0.4" + param-case "^3.0.4" + pascal-case "^3.1.2" + path-case "^3.0.4" + sentence-case "^3.0.4" + snake-case "^3.0.4" + tslib "^2.0.3" + character-entities-legacy@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" @@ -4534,6 +4597,11 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= +coercer@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/coercer/-/coercer-1.1.2.tgz#eaea4459511f73f9f36ade04a98107ce75824b70" + integrity sha1-6upEWVEfc/nzat4EqYEHznWCS3A= + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -4720,6 +4788,15 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= +constant-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1" + integrity sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + upper-case "^2.0.2" + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -4828,7 +4905,7 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cors@^2.8.1, cors@^2.8.5: +cors@^2.8.1, cors@^2.8.5, cors@~2.8.5: version "2.8.5" resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== @@ -5204,15 +5281,6 @@ data-urls@^1.0.0, data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -datastore-core@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/datastore-core/-/datastore-core-2.0.1.tgz#604065d0d2f3128d33498da3c019489375ea41a1" - integrity sha512-er9DVcug5aM/qJFaG7pFmYah1f5XvUsHZ5nf9+MOFUKB3pCLlQIrClSu+Nl9hfROS9yiou6i5dFZu9PL9IQ+gQ== - dependencies: - debug "^4.1.1" - interface-datastore "^2.0.0" - ipfs-utils "^4.0.1" - datastore-core@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/datastore-core/-/datastore-core-3.0.0.tgz#35cc097c607acbfaa2337279c73c2b48004fbdfd" @@ -5232,14 +5300,14 @@ datastore-fs@^3.0.0: it-glob "0.0.10" mkdirp "^1.0.4" -datastore-level@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/datastore-level/-/datastore-level-3.0.0.tgz#8502de255a87410b5ac3dc203c1b727a952828f0" - integrity sha512-4dwXIuZpEFJTwtLvwFudYluMKQRnFDGILetF0ufvq1yAotkZcD2fsyWSC49cCsbBCKZNXq24UsvyWcnFrqTuiw== +datastore-level@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/datastore-level/-/datastore-level-4.0.0.tgz#d91bf9a0d13c11f70ea4342b2a4509f67d0c6fde" + integrity sha512-tesQaHDCHsZCTSI64ld9GJJnghcU3iZMVdXkQtr4LO88B5A5VAQPuRD0ZJAgcnqvMVM9QRm8CH1UEQgxpWvwaA== dependencies: datastore-core "^3.0.0" interface-datastore "^3.0.3" - level "^5.0.1" + level "^6.0.1" datastore-pubsub@^0.4.1: version "0.4.2" @@ -5263,6 +5331,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" +debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@~4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + debug@4.1.1, debug@~4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" @@ -5277,13 +5352,6 @@ debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - debug@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" @@ -5432,7 +5500,7 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" -delay@^4.3.0, delay@^4.4.0: +delay@^4.4.0: version "4.4.1" resolved "https://registry.yarnpkg.com/delay/-/delay-4.4.1.tgz#6e02d02946a1b6ab98b39262ced965acba2ac4d1" integrity sha512-aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ== @@ -5763,6 +5831,13 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf" + integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ== + dependencies: + safe-buffer "^5.0.1" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -5884,6 +5959,22 @@ engine.io-client@~3.5.0: xmlhttprequest-ssl "~1.5.4" yeast "0.1.2" +engine.io-client@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-4.1.1.tgz#109942705079f15a4fcf1090bc86d3a1341c0a61" + integrity sha512-iYasV/EttP/2pLrdowe9G3zwlNIFhwny8VSIh+vPlMnYZqSzLsTzSLa9hFy015OrH1s4fzoYxeHjVkO8hSFKwg== + dependencies: + base64-arraybuffer "0.1.4" + component-emitter "~1.3.0" + debug "~4.3.1" + engine.io-parser "~4.0.1" + has-cors "1.1.0" + parseqs "0.0.6" + parseuri "0.0.6" + ws "~7.4.2" + xmlhttprequest-ssl "~1.5.4" + yeast "0.1.2" + engine.io-parser@~2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7" @@ -5895,6 +5986,13 @@ engine.io-parser@~2.2.0: blob "0.0.5" has-binary2 "~1.0.2" +engine.io-parser@~4.0.0, engine.io-parser@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e" + integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg== + dependencies: + base64-arraybuffer "0.1.4" + engine.io@~3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" @@ -5907,6 +6005,19 @@ engine.io@~3.5.0: engine.io-parser "~2.2.0" ws "~7.4.2" +engine.io@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.1.tgz#9a8f8a5ac5a5ea316183c489bf7f5b6cf91ace5b" + integrity sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w== + dependencies: + accepts "~1.3.4" + base64id "2.0.0" + cookie "~0.4.1" + cors "~2.8.5" + debug "~4.3.1" + engine.io-parser "~4.0.0" + ws "~7.4.2" + enhanced-resolve@^4.1.0: version "4.5.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" @@ -6657,7 +6768,7 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.4: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.0.0, events@^3.1.0, events@^3.2.0: +events@^3.0.0, events@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== @@ -6808,7 +6919,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@^3.0.0, extend@~3.0.2: +extend@^3.0.0, extend@^3.0.2, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -6893,6 +7004,11 @@ fast-safe-stringify@^2.0.7: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== +fast-text-encoding@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz#ec02ac8e01ab8a319af182dae2681213cfe9ce53" + integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig== + fast-write-atomic@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/fast-write-atomic/-/fast-write-atomic-0.2.1.tgz#7ee8ef0ce3c1f531043c09ae8e5143361ab17ede" @@ -7375,6 +7491,17 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" +gaxios@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.1.0.tgz#e8ad466db5a4383c70b9d63bfd14dfaa87eb0099" + integrity sha512-vb0to8xzGnA2qcgywAjtshOKKVDf2eQhJoiL6fHhgW5tVN7wNk7egnYIO9zotfn3lQ3De1VPdf7V5/BWfCtCmg== + dependencies: + abort-controller "^3.0.0" + extend "^3.0.2" + https-proxy-agent "^5.0.0" + is-stream "^2.0.0" + node-fetch "^2.3.0" + gc-stats@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/gc-stats/-/gc-stats-1.4.0.tgz#66cd194c5a8eae1138407300bc6cb42c2f6f3cd6" @@ -7383,6 +7510,14 @@ gc-stats@^1.4.0: nan "^2.13.2" node-pre-gyp "^0.13.0" +gcp-metadata@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.2.1.tgz#31849fbcf9025ef34c2297c32a89a1e7e9f2cd62" + integrity sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw== + dependencies: + gaxios "^4.0.0" + json-bigint "^1.0.0" + gensync@^1.0.0-beta.1: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -7572,6 +7707,28 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" +google-auth-library@^6.1.1: + version "6.1.6" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-6.1.6.tgz#deacdcdb883d9ed6bac78bb5d79a078877fdf572" + integrity sha512-Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ== + dependencies: + arrify "^2.0.0" + base64-js "^1.3.0" + ecdsa-sig-formatter "^1.0.11" + fast-text-encoding "^1.0.0" + gaxios "^4.0.0" + gcp-metadata "^4.2.0" + gtoken "^5.0.4" + jws "^4.0.0" + lru-cache "^6.0.0" + +google-p12-pem@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.0.3.tgz#673ac3a75d3903a87f05878f3c75e06fc151669e" + integrity sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA== + dependencies: + node-forge "^0.10.0" + got@9.6.0, got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -7641,6 +7798,15 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= +gtoken@^5.0.4: + version "5.2.1" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.2.1.tgz#4dae1fea17270f457954b4a45234bba5fc796d16" + integrity sha512-OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw== + dependencies: + gaxios "^4.0.0" + google-p12-pem "^3.0.3" + jws "^4.0.0" + gzip-size@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" @@ -7830,6 +7996,14 @@ he@1.2.0, he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== +header-case@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/header-case/-/header-case-2.0.4.tgz#5a42e63b55177349cf405beb8d775acabb92c063" + integrity sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q== + dependencies: + capital-case "^1.0.4" + tslib "^2.0.3" + heap@~0.2.6: version "0.2.6" resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.6.tgz#087e1f10b046932fc8594dd9e6d378afc9d1e5ac" @@ -8083,6 +8257,14 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" @@ -8439,7 +8621,7 @@ ipaddr.js@1.9.1, ipaddr.js@^1.9.0: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -ipfs-bitswap@^4.0.0: +ipfs-bitswap@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/ipfs-bitswap/-/ipfs-bitswap-4.0.2.tgz#3c091b3b4b3f99b12ad6ee93eb0f90fb4959d97d" integrity sha512-9fYoCL7G0Qu3z4r99j2xVWLbYnB9kK+JdTSEt1XNquPW8tA89U44ZfLxaq2C/LuxbQLkV0/C26WZtrCd1QYllQ== @@ -8470,25 +8652,25 @@ ipfs-block-service@^0.18.0: err-code "^2.0.0" streaming-iterables "^5.0.2" -ipfs-cli@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/ipfs-cli/-/ipfs-cli-0.2.3.tgz#3bb9dd72100f9f41e9380c005d4d6b2898e753c1" - integrity sha512-3DGUh/V9INVPG5dv0bT1DQpjVM5diKEVrVYSMtk/h5enVPbNHTZ+Dz4zOwjRsob5QQNkdVQWdHnhCcRHNyWFCA== +ipfs-cli@^0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/ipfs-cli/-/ipfs-cli-0.4.2.tgz#bccb313cd4cc0a44bf2e3a9880babc520797509f" + integrity sha512-xntxRn+T5Mk52he1moukOgNru+qlzzbfd4YbJC4XOdKp/RJzHZpIqgTM0kUthhROkiCp8uZF1ZwOY35DRxq/0A== dependencies: bignumber.js "^9.0.0" byteman "^1.3.5" cid-tool "^1.0.0" - cids "^1.0.0" + cids "^1.1.5" debug "^4.1.1" err-code "^2.0.3" execa "^5.0.0" get-folder-size "^2.0.1" - ipfs-core "^0.3.1" - ipfs-core-utils "^0.5.4" - ipfs-daemon "^0.3.2" - ipfs-http-client "^48.1.3" - ipfs-repo "^7.0.0" - ipfs-utils "^5.0.0" + ipfs-core "^0.5.2" + ipfs-core-utils "^0.7.1" + ipfs-daemon "^0.5.2" + ipfs-http-client "^49.0.2" + ipfs-repo "^8.0.0" + ipfs-utils "^6.0.1" ipld-dag-cbor "^0.17.0" ipld-dag-pb "^0.20.0" it-all "^1.0.4" @@ -8497,7 +8679,7 @@ ipfs-cli@^0.2.3: it-glob "0.0.10" it-pipe "^1.1.0" jsondiffpatch "^0.4.1" - libp2p-crypto "^0.18.0" + libp2p-crypto "^0.19.0" mafmt "^8.0.0" multiaddr "^8.0.0" multiaddr-to-uri "^6.0.0" @@ -8509,13 +8691,13 @@ ipfs-cli@^0.2.3: progress "^2.0.3" stream-to-it "^0.2.2" streaming-iterables "^5.0.2" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" yargs "^16.0.3" -ipfs-core-types@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ipfs-core-types/-/ipfs-core-types-0.2.1.tgz#460bf2116477ce621995468c962c685dbdc4ac6f" - integrity sha512-q93+93qSybku6woZaajE9mCrHeVoMzNtZ7S5m/zx0+xHRhnoLlg8QNnGGsb5/+uFQt/RiBArsIw/Q61K9Jwkzw== +ipfs-core-types@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/ipfs-core-types/-/ipfs-core-types-0.3.0.tgz#244ce1db49ba60b88f505de6cc8e2565d4c534ab" + integrity sha512-vsPS2uxEvIKSbslmC02CDoniaKAzjOtj4e4LK8KNHEPCCa2T1vSFlgNLeqX7G2dCcH8LYPVPO3G8TVYytWgioA== dependencies: cids "^1.1.5" multiaddr "^8.0.0" @@ -8536,38 +8718,18 @@ ipfs-core-utils@^0.4.0: it-peekable "0.0.1" uint8arrays "^1.1.0" -ipfs-core-utils@^0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.5.4.tgz#c7fa508562086be65cebb51feb13c58abbbd3d8d" - integrity sha512-V+OHCkqf/263jHU0Fc9Rx/uDuwlz3PHxl3qu6a5ka/mNi6gucbFuI53jWsevCrOOY9giWMLB29RINGmCV5dFeQ== - dependencies: - any-signal "^2.0.0" - blob-to-it "^1.0.1" - browser-readablestream-to-it "^1.0.1" - cids "^1.0.0" - err-code "^2.0.3" - ipfs-utils "^5.0.0" - it-all "^1.0.4" - it-map "^1.0.4" - it-peekable "^1.0.1" - multiaddr "^8.0.0" - multiaddr-to-uri "^6.0.0" - parse-duration "^0.4.4" - timeout-abort-controller "^1.1.1" - uint8arrays "^1.1.0" - -ipfs-core-utils@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.6.1.tgz#59d1ca9ff4a33bbf6497c4abe024573c3fd7d784" - integrity sha512-UFIklwE3CFcsNIhYFDuz0qB7E2QtdFauRfc76kskgiqhGWcjqqiDeND5zBCrAy0u8UMaDqAbFl02f/mIq1yKXw== +ipfs-core-utils@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.7.1.tgz#c7f5e9976ea21c0dddf2d64a80811c3f01a667c4" + integrity sha512-FC8g9NqGqjCCGG/xqVfZicygqa9tI8dNuDXY3va367UjZ9tLS8uKv1xxmSlGSxgG3G2dqow3wFUu6Eezyv6BQQ== dependencies: - any-signal "^2.0.0" + any-signal "^2.1.2" blob-to-it "^1.0.1" browser-readablestream-to-it "^1.0.1" cids "^1.1.5" err-code "^2.0.3" - ipfs-core-types "^0.2.1" - ipfs-utils "^5.0.0" + ipfs-core-types "^0.3.0" + ipfs-utils "^6.0.1" it-all "^1.0.4" it-map "^1.0.4" it-peekable "^1.0.1" @@ -8575,35 +8737,37 @@ ipfs-core-utils@^0.6.1: multiaddr-to-uri "^6.0.0" parse-duration "^0.4.4" timeout-abort-controller "^1.1.1" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" -ipfs-core@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ipfs-core/-/ipfs-core-0.3.1.tgz#059bca87fa50f5a26f007e11526c530b9e7abbf9" - integrity sha512-d94i8Bvhm+0a38rZG2q7EcQXcVT4cTkjCZAu7ZZ4HOWyB0EevqrxH6D7VK3zv6fe+iOC6iv4qrB+Wtt1pE6NVw== +ipfs-core@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/ipfs-core/-/ipfs-core-0.5.2.tgz#f3a95c47476fe36b982151373953946e1f26dd53" + integrity sha512-gSfaNMhq0vFnNC2THPZixpfCoCfuVukvtZetejp84+NNd0L9CYbiDQe+V6FrK3sIdOR60jR0OQRw6MixCfK4jg== dependencies: - array-shuffle "^1.0.1" + abort-controller "^3.0.0" + array-shuffle "^2.0.0" bignumber.js "^9.0.0" - cbor "^5.1.0" - cids "^1.0.0" + cbor "^6.0.1" + cids "^1.1.5" class-is "^1.1.0" dag-cbor-links "^2.0.0" - datastore-core "^2.0.0" + datastore-core "^3.0.0" datastore-pubsub "^0.4.1" debug "^4.1.1" dlv "^1.1.3" err-code "^2.0.3" hamt-sharding "^1.0.0" hashlru "^2.3.0" - interface-datastore "^2.0.0" - ipfs-bitswap "^4.0.0" + interface-datastore "^3.0.3" + ipfs-bitswap "^4.0.2" ipfs-block-service "^0.18.0" - ipfs-core-utils "^0.5.4" - ipfs-repo "^7.0.0" + ipfs-core-types "^0.3.0" + ipfs-core-utils "^0.7.1" + ipfs-repo "^8.0.0" ipfs-unixfs "^2.0.3" ipfs-unixfs-exporter "^3.0.4" ipfs-unixfs-importer "^5.0.0" - ipfs-utils "^5.0.0" + ipfs-utils "^6.0.1" ipld "^0.28.0" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" @@ -8616,56 +8780,80 @@ ipfs-core@^0.3.1: it-first "^1.0.4" it-last "^1.0.4" it-pipe "^1.1.0" - libp2p "^0.29.3" + libp2p "^0.30.7" libp2p-bootstrap "^0.12.1" - libp2p-crypto "^0.18.0" - libp2p-floodsub "^0.23.1" - libp2p-gossipsub "^0.6.1" + libp2p-crypto "^0.19.0" + libp2p-floodsub "^0.24.1" + libp2p-gossipsub "^0.8.0" libp2p-kad-dht "^0.20.1" libp2p-mdns "^0.15.0" libp2p-mplex "^0.10.0" libp2p-noise "^2.0.1" libp2p-record "^0.9.0" libp2p-tcp "^0.15.1" - libp2p-webrtc-star "^0.20.1" - libp2p-websockets "^0.14.0" + libp2p-webrtc-star "^0.21.0" + libp2p-websockets "^0.15.0" mafmt "^8.0.0" - merge-options "^2.0.0" + merge-options "^3.0.4" mortice "^2.0.0" multiaddr "^8.0.0" multiaddr-to-uri "^6.0.0" multibase "^3.0.0" multicodec "^2.0.1" multihashing-async "^2.0.1" - native-abort-controller "~0.0.3" + native-abort-controller "^1.0.3" p-queue "^6.6.1" parse-duration "^0.4.4" peer-id "^0.14.1" streaming-iterables "^5.0.2" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" -ipfs-daemon@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/ipfs-daemon/-/ipfs-daemon-0.3.2.tgz#e2c10b98d248f38f7ecde39fa3e546ba43e3cdf6" - integrity sha512-MBpwB0zpYU17/ZZ4jGMGNvOHx6SYOOZyTfViw+dy/P3JZmeTZBzhPJQOZ0vwwnJI7OIwWscEakJWV4q4c6hrJw== +ipfs-daemon@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/ipfs-daemon/-/ipfs-daemon-0.5.2.tgz#e35580342b52adc005e6470f6187a925d796f7be" + integrity sha512-t22nkkW2oqlIbY4pbmBhnJA82Rd8Aqe6SXMochUuzIQeIV8eYpdocr7C1OcxWB4caFbUsNGejkKdZoI36kgqbw== dependencies: debug "^4.1.1" dlv "^1.1.3" - ipfs-core "^0.3.1" - ipfs-http-client "^48.1.3" - ipfs-http-gateway "^0.1.4" - ipfs-http-server "^0.1.4" - ipfs-utils "^5.0.0" + ipfs-core "^0.5.2" + ipfs-grpc-server "^0.2.2" + ipfs-http-client "^49.0.2" + ipfs-http-gateway "^0.3.1" + ipfs-http-server "^0.3.2" + ipfs-utils "^6.0.1" just-safe-set "^2.1.0" - libp2p "^0.29.3" - libp2p-delegated-content-routing "^0.8.0" + libp2p "^0.30.7" + libp2p-delegated-content-routing "^0.9.0" libp2p-delegated-peer-routing "^0.8.0" - libp2p-webrtc-star "^0.20.1" + libp2p-webrtc-star "^0.21.0" multiaddr "^8.0.0" optionalDependencies: prom-client "^12.0.0" prometheus-gc-stats "^0.6.0" +ipfs-grpc-protocol@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/ipfs-grpc-protocol/-/ipfs-grpc-protocol-0.2.0.tgz#16d5e25798c0cc790710b99b230816a954fa8f6b" + integrity sha512-XQB67HO8ti36HhGxompsoZxKfareIE6jetOAWVrfbKyPVi75JtUjQ7euhNxbxw2xS3/H8Jd8bsIU/qwKe1tVig== + +ipfs-grpc-server@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/ipfs-grpc-server/-/ipfs-grpc-server-0.2.2.tgz#c3ea3ca5d0c5e8b50acb2a64a973f0c1bddca8b1" + integrity sha512-WbxYcO+/KuGoNE2ZL35KXiyjRBObqKiXCW7Re83BLv6wF/a9DlIojS46eJxtlwOAh7saOpq4mteRFNxx5ACRMg== + dependencies: + "@grpc/grpc-js" "^1.1.8" + change-case "^4.1.1" + coercer "^1.1.2" + debug "^4.1.1" + ipfs-grpc-protocol "^0.2.0" + it-first "^1.0.4" + it-map "^1.0.4" + it-peekable "^1.0.1" + it-pipe "^1.1.0" + it-pushable "^1.4.0" + protobufjs "^6.10.2" + ws "^7.3.1" + ipfs-http-client@^47.0.1: version "47.0.1" resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-47.0.1.tgz#509c6c742ab405bc2a7e6e0fe373e19e9b85633b" @@ -8701,19 +8889,20 @@ ipfs-http-client@^47.0.1: stream-to-it "^0.2.1" uint8arrays "^1.1.0" -ipfs-http-client@^48.1.3: - version "48.2.2" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.2.2.tgz#b570fb99866f94df1c394a6101a2eb750ff46599" - integrity sha512-f3ppfWe913SJLvunm0UgqdA1dxVZSGQJPaEVJtqgjxPa5x0fPDiBDdo60g2MgkW1W6bhF9RGlxvHHIE9sv/tdg== +ipfs-http-client@^49.0.2: + version "49.0.2" + resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-49.0.2.tgz#b74c2fd24f2395a40a9eaf4b8e5906157605eb9d" + integrity sha512-Q7OOFO2laqL2hZCDGVSF+ObQ/xptO6L/qbe0WkXfM1OZypw2Bah1BbChPTjmDTrXeicNYgua85EbQqtv1C/WSw== dependencies: - any-signal "^2.0.0" + abort-controller "^3.0.0" + any-signal "^2.1.2" bignumber.js "^9.0.0" cids "^1.1.5" debug "^4.1.1" form-data "^3.0.0" - ipfs-core-types "^0.2.1" - ipfs-core-utils "^0.6.1" - ipfs-utils "^5.0.0" + ipfs-core-types "^0.3.0" + ipfs-core-utils "^0.7.1" + ipfs-utils "^6.0.1" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" ipld-dag-pb "^0.20.0" @@ -8722,36 +8911,36 @@ ipfs-http-client@^48.1.3: it-map "^1.0.4" it-tar "^1.2.2" it-to-stream "^0.1.2" - merge-options "^2.0.0" + merge-options "^3.0.4" multiaddr "^8.0.0" multibase "^3.0.0" multicodec "^2.0.1" multihashes "^3.0.1" nanoid "^3.1.12" - native-abort-controller "~0.0.3" + native-abort-controller "^1.0.3" parse-duration "^0.4.4" stream-to-it "^0.2.2" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" -ipfs-http-gateway@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/ipfs-http-gateway/-/ipfs-http-gateway-0.1.4.tgz#b91e88484b5b3ffddf9cc8359ecd6452aa350744" - integrity sha512-/WuCFC5k31DiIIplGatyJnMmJ74YLnv12xU5DR1rr3E7abKLdyyvaca4cQz3iz2hFcTKvnD3+rRelbXH785JiA== +ipfs-http-gateway@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/ipfs-http-gateway/-/ipfs-http-gateway-0.3.1.tgz#19be6d48225067a34dfc1bd07c5f96283cd58f0e" + integrity sha512-nHvEZrvVlPRU241w+NfIMrYlg/y6wRgeEtaiCNGTJAcaVYkowZJEGyBAWjkliFd/5bOMUCmtkPEKCLUcINldcg== dependencies: "@hapi/ammo" "^5.0.1" "@hapi/boom" "^9.1.0" "@hapi/hapi" "^20.0.0" - cids "^1.0.0" + cids "^1.1.5" debug "^4.1.1" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.4" + ipfs-core-utils "^0.7.1" ipfs-http-response "^0.6.0" is-ipfs "^2.0.0" it-last "^1.0.4" it-to-stream "^0.1.2" joi "^17.2.1" multibase "^3.0.0" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" uri-to-multiaddr "^4.0.0" ipfs-http-response@^0.6.0: @@ -8770,21 +8959,22 @@ ipfs-http-response@^0.6.0: multihashes "^3.0.1" p-try-each "^1.0.1" -ipfs-http-server@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/ipfs-http-server/-/ipfs-http-server-0.1.4.tgz#fef174c86a09514bbeef7bd8e11dd12448f4da39" - integrity sha512-EyGqwvYpOJHIW6eJ5te2UjjMA073JwabL7oNfCvITFb5ZcRKd76+ox0TDSHlkKUeWN8JP7T/00wYRj+8km2Oyg== +ipfs-http-server@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/ipfs-http-server/-/ipfs-http-server-0.3.2.tgz#6a97074fb97360fe07c488c9ae9738d8a4ffc483" + integrity sha512-IBFeFQkLwAoK9rR5A8iO7tyLifN1YdR8oY3+2Dw79N4tF7HMvYN1Tps/tOlShNxpx+3ftIIVkU4jRntFSqA8Wg== dependencies: "@hapi/boom" "^9.1.0" "@hapi/content" "^5.0.2" "@hapi/hapi" "^20.0.0" - cids "^1.0.0" + abort-controller "^3.0.0" + cids "^1.1.5" debug "^4.1.1" dlv "^1.1.3" err-code "^2.0.3" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.4" - ipfs-http-gateway "^0.1.4" + ipfs-core-utils "^0.7.1" + ipfs-http-gateway "^0.3.1" ipfs-unixfs "^2.0.3" ipld-dag-pb "^0.20.0" it-all "^1.0.4" @@ -8803,11 +8993,11 @@ ipfs-http-server@^0.1.4: multibase "^3.0.0" multicodec "^2.0.1" multihashing-async "^2.0.1" - native-abort-controller "~0.0.3" + native-abort-controller "^1.0.3" parse-duration "^0.4.4" stream-to-it "^0.2.2" streaming-iterables "^5.0.2" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" uri-to-multiaddr "^4.0.0" optionalDependencies: prom-client "^12.0.0" @@ -8842,10 +9032,10 @@ ipfs-pubsub-peer-monitor@~0.0.5: dependencies: p-forever "^2.1.0" -ipfs-repo-migrations@^5.0.3: - version "5.0.6" - resolved "https://registry.yarnpkg.com/ipfs-repo-migrations/-/ipfs-repo-migrations-5.0.6.tgz#6c0ee4d474f8e23945bf6a04c944384eb0c54843" - integrity sha512-5AN8fLP+43LGztbmtq52Ig9lL/v+cRr2esQltis/c7/b309bmkj0lqK2wQblaOw03RmUMLBrB9IGKsgd8ztW4w== +ipfs-repo-migrations@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/ipfs-repo-migrations/-/ipfs-repo-migrations-6.0.0.tgz#a325352904efb2b1b1df945399fae916b9b9b768" + integrity sha512-kX+ddMtN4aCxZNfMbxlt48Go+9eu4Mkbsv/feLI3XwL/yjlfkqU2lSG7DiqBLCZ0rSrpOTRXhxg/zUYXzLC7cA== dependencies: cbor "^6.0.1" cids "^1.0.0" @@ -8863,21 +9053,21 @@ ipfs-repo-migrations@^5.0.3: uint8arrays "^2.0.5" varint "^6.0.0" -ipfs-repo@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/ipfs-repo/-/ipfs-repo-7.0.1.tgz#167bb4e44f22af4650d51c7a00ce5f8fd31b6b0c" - integrity sha512-kkw3AoRnDppb2dcZUp6ofZC+7i/Kw1L7luvT/R7mCZWPSr4CiVf3RAQtSzvrfAO5MLFMwWsQM2ricK2dHN4rug== +ipfs-repo@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/ipfs-repo/-/ipfs-repo-8.0.0.tgz#327ba6ddc658b21f96cd884510b4dbc6bfcfd963" + integrity sha512-NFdoVFYbhIn48JGJEbMq6890RTbdgXnfKKnBTO5sE1Dk0ByR3ncGDKmUtiTsfbZbBbpmmeKmfdLNTBzUYFXIfg== dependencies: bignumber.js "^9.0.0" bytes "^3.1.0" cids "^1.0.0" datastore-core "^3.0.0" datastore-fs "^3.0.0" - datastore-level "^3.0.0" + datastore-level "^4.0.0" debug "^4.1.0" err-code "^2.0.0" interface-datastore "^3.0.3" - ipfs-repo-migrations "^5.0.3" + ipfs-repo-migrations "^6.0.0" ipfs-utils "^6.0.0" ipld-block "^0.11.0" it-map "^1.0.2" @@ -8931,25 +9121,6 @@ ipfs-unixfs@^2.0.3, ipfs-unixfs@^2.0.4: err-code "^2.0.0" protons "^2.0.0" -ipfs-utils@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-2.4.0.tgz#113db5f5625b1bf0411a6d6dbd5317dfff5287f9" - integrity sha512-0RH8rMIEhrXyrbh87V8SQC6E6/5EJs+YionqZGAXnVoTzkpFhxC3x3FlsxwZ9s72yaieGP1Mx1tRYgfCFM/mJg== - dependencies: - abort-controller "^3.0.0" - any-signal "^1.1.0" - buffer "^5.6.0" - err-code "^2.0.0" - fs-extra "^9.0.1" - is-electron "^2.2.0" - iso-url "^0.4.7" - it-glob "0.0.8" - it-to-stream "^0.1.2" - merge-options "^2.0.0" - nanoid "^3.1.3" - node-fetch "^2.6.0" - stream-to-it "^0.2.0" - ipfs-utils@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-3.0.0.tgz#58f8345ff26c4ae6b4a8e3a2366bd25de3e1460e" @@ -9034,15 +9205,38 @@ ipfs-utils@^6.0.0: stream-to-it "^0.2.2" web-encoding "^1.0.6" -ipfs@~0.52.0, ipfs@~0.52.1: - version "0.52.3" - resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.3.tgz#4a1e1651da197fb8dfdcd01abd20308198059b66" - integrity sha512-zCd2Ziq1GYDJizXdoAj5nof325i3mx2kzOhG6E+xdEK6FcK6kQwKendaBlQHwTbzHLqLI7ITxsepQzFWNopI2g== +ipfs-utils@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-6.0.1.tgz#1c1d2b5da5600d00407ad2262ce59a9f58a0f9d1" + integrity sha512-u6fJDi/LpCEj96JM//cdDWJV44YR7jLdxQ6I0d8Hj/BCPIQPTWsjQeSppKxudMjYRpX4kzdv9WxrNM8dc4rtlQ== + dependencies: + abort-controller "^3.0.0" + any-signal "^2.1.0" + buffer "^6.0.1" + electron-fetch "^1.7.2" + err-code "^2.0.3" + fs-extra "^9.0.1" + is-electron "^2.2.0" + iso-url "^1.0.0" + it-glob "0.0.10" + it-to-stream "^0.1.2" + merge-options "^3.0.4" + nanoid "^3.1.20" + native-abort-controller "^1.0.3" + native-fetch "2.0.1" + node-fetch "^2.6.1" + stream-to-it "^0.2.2" + web-encoding "^1.0.6" + +ipfs@~0.54.2: + version "0.54.2" + resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.54.2.tgz#c8694a304d6ed8ee9084c27c134fbdd2fd834ab4" + integrity sha512-hcgYW160LxvL+fGriDrvQRRYMTDiR/q8XOu6Jdylz8QHJ+/QF9lYnYLWA70sfUiwrq14lafxQCm5nKx2D1SRlA== dependencies: debug "^4.1.1" - ipfs-cli "^0.2.3" - ipfs-core "^0.3.1" - ipfs-repo "^7.0.0" + ipfs-cli "^0.4.2" + ipfs-core "^0.5.2" + ipfs-repo "^8.0.0" semver "^7.3.2" update-notifier "^5.0.0" @@ -9754,7 +9948,7 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" -it-all@^1.0.0, it-all@^1.0.1, it-all@^1.0.2, it-all@^1.0.4: +it-all@^1.0.1, it-all@^1.0.2, it-all@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/it-all/-/it-all-1.0.4.tgz#5a1aac996e2516c0d030911a631190b330afdb6d" integrity sha512-7K+gjHHzZ7t+bCkrtulYiow35k3UgqH7miC+iUa9RGiyDRXJ6hVDeFsDrnWrlscjrkLFOJRKHxNOke4FNoQnhw== @@ -9810,14 +10004,14 @@ it-glob@0.0.8: fs-extra "^8.1.0" minimatch "^3.0.4" -it-goodbye@^2.0.1, it-goodbye@^2.0.2: +it-goodbye@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/it-goodbye/-/it-goodbye-2.0.2.tgz#b18de8f2eac4506e8a7aca62f70ca0cb3b64b97a" integrity sha512-k56lqArpxkIU0yyhnPhvnyOBpzRQn+4VEyd+dUBWhN5kvCgPBeC0XMuHiA71iU98sDpCrJrT/X+81ajT0AOQtQ== dependencies: buffer "^5.6.0" -it-handshake@^1.0.1, it-handshake@^1.0.2: +it-handshake@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/it-handshake/-/it-handshake-1.0.2.tgz#64804d42621f6825f550c89cdcbd30d1bf978204" integrity sha512-uutOim5xF1eyDQD3u8qd3TxbWKwxqGMlbvacZsRsPdjO1BD9lnPTVci0jSMGsvMOu+5Y3W/QQ4hPQb87qPmPVQ== @@ -9831,7 +10025,7 @@ it-last@^1.0.1, it-last@^1.0.2, it-last@^1.0.4: resolved "https://registry.yarnpkg.com/it-last/-/it-last-1.0.4.tgz#4009aac79ee76e3417443c6c1dfb64cd380e9e5b" integrity sha512-h0aV43BaD+1nubAKwStWcda6vlbejPSTQKfOrQvyNrrceluWfoq8DrBXnL0PSz6RkyHSiVSHtAEaqUijYMPo8Q== -it-length-prefixed@^3.0.0, it-length-prefixed@^3.0.1, it-length-prefixed@^3.1.0: +it-length-prefixed@^3.0.0, it-length-prefixed@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/it-length-prefixed/-/it-length-prefixed-3.1.0.tgz#f9226967e0d4e3823bb25e6b7867764509ae70e8" integrity sha512-E5GwT6qfZEwh3/XThyYwgjKJ4/hxvTC9kdbj3gxXDeUDKtC7+K2T647sPeX7xDEWqunsnoQyvOrjoHPegaT3uw== @@ -9963,7 +10157,7 @@ it-to-stream@^0.1.1, it-to-stream@^0.1.2: p-fifo "^1.0.0" readable-stream "^3.6.0" -it-ws@^3.0.0: +it-ws@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/it-ws/-/it-ws-3.0.2.tgz#65223b7bfbe8f8239b75edef4d4a3cd7e330b693" integrity sha512-INZhCXNjd5Xr7mYWtNZQb9y5i6XIsf4CKD4XUXeCD3tbaoIya1bPVtJNP1lN5UVGo6Ql9rAn3WVre/8IKtKShw== @@ -10536,6 +10730,13 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +json-bigint@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1" + integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ== + dependencies: + bignumber.js "^9.0.0" + json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" @@ -10694,6 +10895,23 @@ just-safe-set@^2.1.0: resolved "https://registry.yarnpkg.com/just-safe-set/-/just-safe-set-2.1.0.tgz#237234e681a4f330b5dfa71a5251f34962813ef9" integrity sha512-wSTg/2bQpzyivBYbWPqQgafdfxW0tr3hX9qYGDRS2ws+AXwc7tvn8ABqkp8iPQHChjj4F5JvL3t0FQLbcNuKig== +jwa@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc" + integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA== + dependencies: + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.11" + safe-buffer "^5.0.1" + +jws@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4" + integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg== + dependencies: + jwa "^2.0.0" + safe-buffer "^5.0.1" + k-bucket@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/k-bucket/-/k-bucket-5.1.0.tgz#db2c9e72bd168b432e3f3e8fc092e2ccb61bff89" @@ -10897,7 +11115,7 @@ level@^5.0.1, level@~5.0.1: leveldown "^5.0.0" opencollective-postinstall "^2.0.0" -level@~6.0.1: +level@^6.0.1, level@~6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/level/-/level-6.0.1.tgz#dc34c5edb81846a6de5079eac15706334b0d7cd6" integrity sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw== @@ -10978,7 +11196,7 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -libp2p-bootstrap@^0.12.1, libp2p-bootstrap@~0.12.1: +libp2p-bootstrap@^0.12.1: version "0.12.1" resolved "https://registry.yarnpkg.com/libp2p-bootstrap/-/libp2p-bootstrap-0.12.1.tgz#216322e2d682935c8ee1c7b672acf69241178c3c" integrity sha512-atHXxfxE8isHb+XKHsJ5UgFMteqfi0Xal94h+2EAJmobXcIq1mBMUeIgmkHMsaZZNwJwQxq6MKFthJngWJ8vEw== @@ -10988,6 +11206,16 @@ libp2p-bootstrap@^0.12.1, libp2p-bootstrap@~0.12.1: multiaddr "^8.0.0" peer-id "^0.14.0" +libp2p-bootstrap@~0.12.2: + version "0.12.2" + resolved "https://registry.yarnpkg.com/libp2p-bootstrap/-/libp2p-bootstrap-0.12.2.tgz#63bd7f3541fd2e62478c798fe06e1f146e05a282" + integrity sha512-ICRv0oertc7mZ1AOTq5Uw28YR9clcYd2ADYJFIBdpiIk7SRpqWCP4pn4fY5nSRntAjdcG6KrGoyZ4YpQ8J/x1w== + dependencies: + debug "^4.1.1" + mafmt "^8.0.0" + multiaddr "^8.0.0" + peer-id "^0.14.0" + libp2p-crypto-secp256k1@^0.3.0, libp2p-crypto-secp256k1@~0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.3.1.tgz#4cbeb857f5cfe5fefb1253e6b2994420c0ca166e" @@ -11022,25 +11250,6 @@ libp2p-crypto@^0.16.0: tweetnacl "^1.0.0" ursa-optional "~0.10.0" -libp2p-crypto@^0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/libp2p-crypto/-/libp2p-crypto-0.18.0.tgz#b467c68e48cb62342c897e5615ae4addbf41dfe2" - integrity sha512-zNMHDwf2J4t1LRjrBPMiSa4+14u0SfZRu66FyIVZtOnBGo3V/8imbJsOp8RPT8IgeHRN7EVIUt9lp8dcgXHMOw== - dependencies: - err-code "^2.0.0" - is-typedarray "^1.0.0" - iso-random-stream "^1.1.0" - keypair "^1.0.1" - multibase "^3.0.0" - multicodec "^2.0.0" - multihashing-async "^2.0.1" - node-forge "^0.9.1" - pem-jwk "^2.0.0" - protons "^2.0.0" - secp256k1 "^4.0.0" - uint8arrays "^1.1.0" - ursa-optional "^0.10.1" - libp2p-crypto@^0.19.0: version "0.19.0" resolved "https://registry.yarnpkg.com/libp2p-crypto/-/libp2p-crypto-0.19.0.tgz#321a5901e2a559edf3a3dbf848b13778ec69ed2d" @@ -11060,13 +11269,13 @@ libp2p-crypto@^0.19.0: uint8arrays "^1.1.0" ursa-optional "^0.10.1" -libp2p-delegated-content-routing@^0.8.0: - version "0.8.2" - resolved "https://registry.yarnpkg.com/libp2p-delegated-content-routing/-/libp2p-delegated-content-routing-0.8.2.tgz#c7508ef3c4f1c3aece2f54922e976d80ca032737" - integrity sha512-3xfrNaX31VB+sj7/u5ZGjhSzbm7l5jCCzlYktEpQyET7JMI8d1ef8FAP3DiWEhbiSfivMMqlfCzfPEMsLxZG7g== +libp2p-delegated-content-routing@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/libp2p-delegated-content-routing/-/libp2p-delegated-content-routing-0.9.0.tgz#98f765bdf972740d34f2eaee25dbc9635b072e32" + integrity sha512-7elrRRg+eLKCGvztCMj3+jhfg6nkH0qdNSM07jQYDnTcT2OtixOA9pdaFhGqxCag3pLSVW96S5inYzJj/Di6dQ== dependencies: debug "^4.1.1" - it-all "^1.0.0" + it-drain "^1.0.3" multiaddr "^8.0.0" p-defer "^3.0.0" p-queue "^6.2.1" @@ -11082,33 +11291,17 @@ libp2p-delegated-peer-routing@^0.8.0: p-queue "^6.3.0" peer-id "^0.14.0" -libp2p-floodsub@^0.23.1: - version "0.23.1" - resolved "https://registry.yarnpkg.com/libp2p-floodsub/-/libp2p-floodsub-0.23.1.tgz#b2cd15516b22e019c40dc2711ac8a70db92cec6b" - integrity sha512-d5Hl055SV3bkJ2u+bsRp+iWBsg1rVq2CehW2TYq4zoIp/bCGQyY/oQF6NzqnysKloElgRACfWOa/oQBRaSZFng== - dependencies: - debug "^4.1.1" - libp2p-interfaces "^0.5.1" - time-cache "^0.3.0" - uint8arrays "^1.1.0" - -libp2p-gossipsub@^0.6.1: - version "0.6.6" - resolved "https://registry.yarnpkg.com/libp2p-gossipsub/-/libp2p-gossipsub-0.6.6.tgz#24f24fc26ff5f41303c662fbf48f6b37389b5735" - integrity sha512-oW/d7Y099RmxJ8KKWSlzuh3giuKb94d/VpKCxTqUJlsuA3SHjiOiKCO3oadrK5pkYgFMBXxYEnbZ84tft3MtRQ== +libp2p-floodsub@^0.24.1: + version "0.24.1" + resolved "https://registry.yarnpkg.com/libp2p-floodsub/-/libp2p-floodsub-0.24.1.tgz#d3b8988107048b115d1cb6ba4ad855327a63da3e" + integrity sha512-szI/5GtuiwIAWyBxAfobLw5Qe3EBkxWH6snExG3bXz98cLmW25q8WdTWHHJ0oqzzDZ3YOMsTlRrGpRE4AzR26w== dependencies: - "@types/debug" "^4.1.5" - debug "^4.1.1" - denque "^1.4.1" - err-code "^2.0.0" - it-pipe "^1.0.1" - libp2p-interfaces "^0.6.0" - peer-id "^0.14.0" - protons "^2.0.0" + debug "^4.2.0" + libp2p-interfaces "^0.8.1" time-cache "^0.3.0" uint8arrays "^1.1.0" -libp2p-gossipsub@~0.8.0: +libp2p-gossipsub@^0.8.0, libp2p-gossipsub@~0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/libp2p-gossipsub/-/libp2p-gossipsub-0.8.0.tgz#b9c961560dc02afa079790f44882854a19a94abf" integrity sha512-nR5XGN6E5n2ukPR9aa/rtegwluxiK+vT9j5Oulp+P1h6T9vEqDvFAEe9cqA3FiT7apI5gk44SE0aZFTMpxz6EA== @@ -11124,72 +11317,6 @@ libp2p-gossipsub@~0.8.0: time-cache "^0.3.0" uint8arrays "^1.1.0" -libp2p-interfaces@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/libp2p-interfaces/-/libp2p-interfaces-0.5.2.tgz#8794f0753b26c98270d03d63d753f456c5d0a766" - integrity sha512-jnf7D2tJ0eemfQp0j+u4s9fRlILduqXuanCpXt0QSxwqj8LVXUvglQddqoHjH6LGzxBvWXdOAk/ZXEUCcH4ZTw== - dependencies: - abort-controller "^3.0.0" - abortable-iterator "^3.0.0" - chai "^4.2.0" - chai-checkmark "^1.0.1" - class-is "^1.1.0" - debug "^4.1.1" - delay "^4.3.0" - detect-node "^2.0.4" - dirty-chai "^2.0.1" - err-code "^2.0.0" - it-goodbye "^2.0.1" - it-length-prefixed "^3.1.0" - it-pair "^1.0.0" - it-pipe "^1.1.0" - it-pushable "^1.4.0" - libp2p-crypto "^0.18.0" - libp2p-tcp "^0.15.0" - multiaddr "^8.0.0" - multibase "^3.0.0" - p-defer "^3.0.0" - p-limit "^2.3.0" - p-wait-for "^3.1.0" - peer-id "^0.14.0" - protons "^2.0.0" - sinon "^9.0.2" - streaming-iterables "^5.0.2" - uint8arrays "^1.1.0" - -libp2p-interfaces@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/libp2p-interfaces/-/libp2p-interfaces-0.6.0.tgz#323c931f1229ce742e43198f83f15a02f15dc68b" - integrity sha512-KJV+eaExDviPKGRY/UWFSQ186As0VUWy0+MjmbGOA9yGzze8lcZ+4iuR5EM7RMd+ZfuZOX63Nkt0v8BIxBhq+Q== - dependencies: - abort-controller "^3.0.0" - abortable-iterator "^3.0.0" - chai "^4.2.0" - chai-checkmark "^1.0.1" - class-is "^1.1.0" - debug "^4.1.1" - delay "^4.3.0" - detect-node "^2.0.4" - dirty-chai "^2.0.1" - err-code "^2.0.0" - it-goodbye "^2.0.1" - it-length-prefixed "^3.1.0" - it-pair "^1.0.0" - it-pipe "^1.1.0" - it-pushable "^1.4.0" - libp2p-crypto "^0.18.0" - libp2p-tcp "^0.15.0" - multiaddr "^8.0.0" - multibase "^3.0.0" - p-defer "^3.0.0" - p-limit "^2.3.0" - p-wait-for "^3.1.0" - peer-id "^0.14.0" - protons "^2.0.0" - sinon "^9.0.2" - streaming-iterables "^5.0.2" - uint8arrays "^1.1.0" - libp2p-interfaces@^0.8.0, libp2p-interfaces@^0.8.1, libp2p-interfaces@^0.8.2, libp2p-interfaces@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/libp2p-interfaces/-/libp2p-interfaces-0.8.3.tgz#6f8ec391f9f5129be4d470a58bb88e556890d2ba" @@ -11351,10 +11478,10 @@ libp2p-webrtc-peer@^10.0.1: randombytes "^2.0.3" readable-stream "^3.4.0" -libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.2, libp2p-webrtc-star@~0.20.5: - version "0.20.8" - resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.8.tgz#57a599e236704177b709580dcc429ae8f6055c54" - integrity sha512-SvcPu4be/EfMXPbR3I+SemIuGNWmQiAAtUsire5M5Bomb2aSp7yeO1DKvl8+rZbhjn3YsSr8GlB+Wk9vRDm7tA== +libp2p-webrtc-star@^0.21.0, libp2p-webrtc-star@~0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.21.1.tgz#94c05804e405b8b21199ae13cb57304de4f3645b" + integrity sha512-d6RvNbYjpSj/upWaRqcHHTx8mGQcZrvx4SwzdEpYJybyW6sNCdONWc4D5uzDWiKB8iv93M6XXYPlNw6cIgBR/Q== dependencies: "@hapi/hapi" "^20.0.0" "@hapi/inert" "^6.0.3" @@ -11374,72 +11501,30 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.2, libp2p-webrtc-star@~0.20 peer-id "^0.14.2" prom-client "^13.0.0" socket.io "^2.3.0" - socket.io-client "^2.3.0" + socket.io-client-next "npm:socket.io-client@^3.0.4" + socket.io-next "npm:socket.io@^3.0.4" stream-to-it "^0.2.2" streaming-iterables "^5.0.3" -libp2p-websockets@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/libp2p-websockets/-/libp2p-websockets-0.14.0.tgz#e1c48d1787e88dee85db740598b9a6a687fe225c" - integrity sha512-UeI0uqw2xYXFhImJucewG7fuL6hOR2tnSwlSAAxilyK0Z3Yya+GeVkqy7Vufj9ax3EWFx6lPO8mC3uBl30TkpA== +libp2p-websockets@^0.15.0: + version "0.15.2" + resolved "https://registry.yarnpkg.com/libp2p-websockets/-/libp2p-websockets-0.15.2.tgz#799c4f58fc4dfc3af2f7fc606184ba9bba833fe9" + integrity sha512-KpX9r69l3RJHrzJJ8lf3BYBsQBYAKDTYXHOwhpRPijt+/M+63B5nUjUljzoTxcSQK27Rl/ZWBIZ0JR3LajOWZw== dependencies: abortable-iterator "^3.0.0" class-is "^1.1.0" - debug "^4.1.1" - err-code "^2.0.0" - it-ws "^3.0.0" - libp2p-utils "^0.2.0" - mafmt "^8.0.0" - multiaddr "^8.0.0" + debug "^4.2.0" + err-code "^2.0.3" + ipfs-utils "^4.0.1" + it-ws "^3.0.2" + libp2p-utils "^0.2.1" + mafmt "^8.0.1" + multiaddr "^8.1.1" multiaddr-to-uri "^6.0.0" + p-defer "^3.0.0" p-timeout "^3.2.0" -libp2p@^0.29.3: - version "0.29.4" - resolved "https://registry.yarnpkg.com/libp2p/-/libp2p-0.29.4.tgz#95247793185badb603ef82c36f21455ec6943dfb" - integrity sha512-RACD3rvhgBTcLDtILwN8lE2z3GV5OCR1Se/wQ9UPYArSImsoikKjGQMvW0vZl9W3adUqmJOUs7CJWTUvdTAOpw== - dependencies: - abort-controller "^3.0.0" - aggregate-error "^3.0.1" - any-signal "^1.1.0" - bignumber.js "^9.0.0" - class-is "^1.1.0" - debug "^4.1.1" - err-code "^2.0.0" - events "^3.1.0" - hashlru "^2.3.0" - interface-datastore "^2.0.0" - ipfs-utils "^2.2.0" - it-all "^1.0.1" - it-buffer "^0.1.2" - it-handshake "^1.0.1" - it-length-prefixed "^3.0.1" - it-pipe "^1.1.0" - it-protocol-buffers "^0.2.0" - libp2p-crypto "^0.18.0" - libp2p-interfaces "^0.5.1" - libp2p-utils "^0.2.0" - mafmt "^8.0.0" - merge-options "^2.0.0" - moving-average "^1.0.0" - multiaddr "^8.1.0" - multicodec "^2.0.0" - multistream-select "^1.0.0" - mutable-proxy "^1.0.0" - node-forge "^0.9.1" - p-any "^3.0.0" - p-fifo "^1.0.0" - p-settle "^4.0.1" - peer-id "^0.14.2" - protons "^2.0.0" - retimer "^2.0.0" - sanitize-filename "^1.6.3" - streaming-iterables "^5.0.2" - timeout-abort-controller "^1.1.1" - varint "^5.0.0" - xsalsa20 "^1.0.2" - -libp2p@~0.30.0: +libp2p@^0.30.7, libp2p@~0.30.0: version "0.30.7" resolved "https://registry.yarnpkg.com/libp2p/-/libp2p-0.30.7.tgz#965fe05a9045b7614d268c4050918182d8ca81f3" integrity sha512-W+uaMY7K9KJh9L9LFw/D2NjH63TS6skjlNRqzhG99b//IJqdNQoVWeGNGsjgMPqKu+BMngtMn+iH3+Jjz2Bk2w== @@ -11772,7 +11857,7 @@ ltgt@^2.1.2: resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" integrity sha1-81ypHEk/e3PaDgdJUwTxezH4fuU= -mafmt@^8.0.0: +mafmt@^8.0.0, mafmt@^8.0.1: version "8.0.4" resolved "https://registry.yarnpkg.com/mafmt/-/mafmt-8.0.4.tgz#5b158a28bd800fb8d0e5c28bd9ee15120bed2a61" integrity sha512-wwZ5+PU0vQw10kwQRyZin1Z0dqVOp0BnYlX1xvXHS2fmLwrrQCfU1+3tlW5MRcihUwGz1virnVhbRAU1biKfiw== @@ -12284,7 +12369,7 @@ multiaddr-to-uri@^6.0.0: dependencies: multiaddr "^8.0.0" -multiaddr@^8.0.0, multiaddr@^8.1.0, multiaddr@^8.1.2: +multiaddr@^8.0.0, multiaddr@^8.1.0, multiaddr@^8.1.1, multiaddr@^8.1.2: version "8.1.2" resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-8.1.2.tgz#74060ff8636ba1c01b2cf0ffd53950b852fa9b1f" integrity sha512-r13IzW8+Sv9zab9Gt8RPMIN2WkptIPq99EpAzg4IbJ/zTELhiEwXWr9bAmEatSCI4j/LSA6ESJzvz95JZ+ZYXQ== @@ -12518,13 +12603,18 @@ napi-macros@~2.0.0: resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" integrity sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg== -native-abort-controller@0.0.3, native-abort-controller@~0.0.3: +native-abort-controller@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/native-abort-controller/-/native-abort-controller-0.0.3.tgz#4c528a6c9c7d3eafefdc2c196ac9deb1a5edf2f8" integrity sha512-YIxU5nWqSHG1Xbu3eOu3pdFRD882ivQpIcu6AiPVe2oSVoRbfYW63DVkZm3g1gHiMtZSvZzF6THSzTGEBYl8YA== dependencies: globalthis "^1.0.1" +native-abort-controller@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/native-abort-controller/-/native-abort-controller-1.0.3.tgz#35974a2e189c0d91399c8767a989a5bf058c1435" + integrity sha512-fd5LY5q06mHKZPD5FmMrn7Lkd2H018oBGKNOAdLpctBDEPFKsfJ1nX9ke+XRa8PEJJpjqrpQkGjq2IZ27QNmYA== + native-fetch@2.0.1, native-fetch@^2.0.0, native-fetch@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-2.0.1.tgz#319d53741a7040def92d5dc8ea5fe9416b1fad89" @@ -12595,7 +12685,7 @@ node-addon-api@^2.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== -node-fetch@2.6.1, node-fetch@^2.6.0, node-fetch@^2.6.1: +node-fetch@2.6.1, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -12605,7 +12695,7 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-forge@^0.9.1, node-forge@~0.9.1: +node-forge@~0.9.1: version "0.9.2" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.2.tgz#b35a44c28889b2ea55cabf8c79e3563f9676190a" integrity sha512-naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw== @@ -13484,7 +13574,7 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -p-wait-for@^3.1.0, p-wait-for@^3.2.0: +p-wait-for@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-3.2.0.tgz#640429bcabf3b0dd9f492c31539c5718cb6a3f1f" integrity sha512-wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA== @@ -13520,7 +13610,7 @@ parallel-transform@^1.1.0: inherits "^2.0.3" readable-stream "^2.1.5" -param-case@^3.0.3: +param-case@^3.0.3, param-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== @@ -13654,6 +13744,14 @@ path-browserify@0.0.1: resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== +path-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f" + integrity sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg== + dependencies: + dot-case "^3.0.4" + tslib "^2.0.3" + path-dirname@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" @@ -14764,7 +14862,7 @@ proper-lockfile@^4.0.0, proper-lockfile@^4.1.1: retry "^0.12.0" signal-exit "^3.0.2" -protobufjs@^6.10.1: +protobufjs@^6.10.1, protobufjs@^6.10.2: version "6.10.2" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.2.tgz#b9cb6bd8ec8f87514592ba3fdfd28e93f33a469b" integrity sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ== @@ -16042,6 +16140,15 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" +sentence-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f" + integrity sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + upper-case-first "^2.0.2" + serialize-javascript@4.0.0, serialize-javascript@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" @@ -16234,7 +16341,7 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -sinon@^9.0.2, sinon@^9.2.4: +sinon@^9.2.4: version "9.2.4" resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.4.tgz#e55af4d3b174a4443a8762fa8421c2976683752b" integrity sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg== @@ -16284,6 +16391,11 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +snake-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c" + integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg== + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -16319,7 +16431,25 @@ socket.io-adapter@~1.1.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-client@2.4.0, socket.io-client@^2.3.0: +socket.io-adapter@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527" + integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg== + +"socket.io-client-next@npm:socket.io-client@^3.0.4": + version "3.1.1" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-3.1.1.tgz#43dfc3feddbb675b274a724f685d6b6af319b3e3" + integrity sha512-BLgIuCjI7Sf3mDHunKddX9zKR/pbkP7IACM3sJS3jha+zJ6/pGKRV6Fz5XSBHCfUs9YzT8kYIqNwOOuFNLtnYA== + dependencies: + "@types/component-emitter" "^1.2.10" + backo2 "~1.0.2" + component-emitter "~1.3.0" + debug "~4.3.1" + engine.io-client "~4.1.0" + parseuri "0.0.6" + socket.io-parser "~4.0.4" + +socket.io-client@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== @@ -16336,6 +16466,21 @@ socket.io-client@2.4.0, socket.io-client@^2.3.0: socket.io-parser "~3.3.0" to-array "0.1.4" +"socket.io-next@npm:socket.io@^3.0.4": + version "3.1.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.1.tgz#905e3d4a3b37d8e7970e67a4a6eb81110a5778ba" + integrity sha512-7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA== + dependencies: + "@types/cookie" "^0.4.0" + "@types/cors" "^2.8.8" + "@types/node" "^14.14.10" + accepts "~1.3.4" + base64id "~2.0.0" + debug "~4.3.1" + engine.io "~4.1.0" + socket.io-adapter "~2.1.0" + socket.io-parser "~4.0.3" + socket.io-parser@~3.3.0: version "3.3.2" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" @@ -16354,6 +16499,15 @@ socket.io-parser@~3.4.0: debug "~4.1.0" isarray "2.0.1" +socket.io-parser@~4.0.3, socket.io-parser@~4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" + integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== + dependencies: + "@types/component-emitter" "^1.2.10" + component-emitter "~1.3.0" + debug "~4.3.1" + socket.io@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" @@ -17640,6 +17794,20 @@ update-notifier@^5.0.0: semver-diff "^3.1.1" xdg-basedir "^4.0.0" +upper-case-first@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324" + integrity sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg== + dependencies: + tslib "^2.0.3" + +upper-case@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz#d89810823faab1df1549b7d97a76f8662bae6f7a" + integrity sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg== + dependencies: + tslib "^2.0.3" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -18188,7 +18356,7 @@ web3-utils@1.3.4: underscore "1.9.1" utf8 "3.0.0" -web3@~1.3.0, web3@~1.3.3: +web3@~1.3.0, web3@~1.3.3, web3@~1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.4.tgz#31e014873360aa5840eb17f9f171190c967cffb7" integrity sha512-D6cMb2EtTMLHgdGbkTPGl/Qi7DAfczR+Lp7iFX3bcu/bsD9V8fZW69hA8v5cRPNGzXUwVQebk3bS17WKR4cD2w== From 69619e483277eca389529bf1c76567dd1029168f Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 10 Feb 2021 14:05:10 +0200 Subject: [PATCH 2/8] fix: minor ui fixes --- packages/concordia-app/package.json | 3 +-- .../concordia-app/src/assets/css/index.css | 6 ++--- .../CustomLoader/index.jsx | 22 +++++++++++-------- .../CustomLoader/style.css} | 17 ++++++-------- .../components/InitializationScreen/index.jsx | 3 --- .../src/layouts/MainLayout/styles.css | 7 ++++-- .../src/views/Home/Board/styles.css | 1 + yarn.lock | 17 +++----------- 8 files changed, 32 insertions(+), 44 deletions(-) rename packages/concordia-app/src/{assets/css/loading-component.css => components/InitializationScreen/CustomLoader/style.css} (61%) diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index 61ba424..fd71045 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -25,10 +25,9 @@ }, "dependencies": { "@ezerous/breeze": "~0.5.0", - "@ezerous/drizzle": "~0.4.2", "@ezerous/eth-identity-provider": "~0.1.2", "@reduxjs/toolkit": "~1.4.0", - "@welldone-software/why-did-you-render": "^6.0.0-rc.1", + "@welldone-software/why-did-you-render": "~6.0.5", "concordia-contracts": "~0.1.0", "concordia-shared": "~0.1.0", "i18next": "^19.8.3", diff --git a/packages/concordia-app/src/assets/css/index.css b/packages/concordia-app/src/assets/css/index.css index cd7fb04..8e38ba2 100644 --- a/packages/concordia-app/src/assets/css/index.css +++ b/packages/concordia-app/src/assets/css/index.css @@ -5,12 +5,10 @@ --secondary-color-highlighted: #061A30; } -body.app { - height: auto; - padding-bottom: 4rem; +body { overflow: auto; margin: 0; - background: #E6E6E6; + background: white; } div { diff --git a/packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx b/packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx index d97d214..c44eba4 100644 --- a/packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx +++ b/packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react'; +import React from 'react'; import PropTypes from 'prop-types'; import { Container, Progress } from 'semantic-ui-react'; @@ -10,11 +10,9 @@ import ipfsLogo from '../../../assets/images/ipfs_logo.svg'; import orbitdbLogo from '../../../assets/images/orbitdb_logo.svg'; import appLogo from '../../../assets/images/app_logo_circle.svg'; -const LoadingComponent = (props) => { - useEffect(() => function cleanup() { - document.body.classList.add('app'); - }, []); +import './style.css'; +const LoadingComponent = (props) => { const { imageType, messageList, progressType, title, message, progress, } = props; @@ -48,14 +46,20 @@ const LoadingComponent = (props) => { const list = messageList ?
    {listItems}
: ''; return ( -
- - {imageAlt} +
+ + {imageAlt}

{title}

{message}

{list} - +
); }; diff --git a/packages/concordia-app/src/assets/css/loading-component.css b/packages/concordia-app/src/components/InitializationScreen/CustomLoader/style.css similarity index 61% rename from packages/concordia-app/src/assets/css/loading-component.css rename to packages/concordia-app/src/components/InitializationScreen/CustomLoader/style.css index 5ed41f8..6ea1586 100644 --- a/packages/concordia-app/src/assets/css/loading-component.css +++ b/packages/concordia-app/src/components/InitializationScreen/CustomLoader/style.css @@ -1,27 +1,24 @@ -body { - overflow: hidden; -} - -.loading-screen { - margin-top: 12em; +#loading-screen { + padding-top: 12em; text-align: center; font-size: large; + height: 100%; } -.loading-screen ul { +#loading-screen ul { list-style-position: inside; } -.loading-img { +#loading-img { margin-bottom: 3em; height: 12em; } -.ui.container { +#loading-screen-container { height: 26em; } -.ui.progress { +#loading-screen-progress { width: 40vw; margin-left: auto !important; margin-right: auto !important; diff --git a/packages/concordia-app/src/components/InitializationScreen/index.jsx b/packages/concordia-app/src/components/InitializationScreen/index.jsx index 55a7d46..21cbf11 100644 --- a/packages/concordia-app/src/components/InitializationScreen/index.jsx +++ b/packages/concordia-app/src/components/InitializationScreen/index.jsx @@ -4,9 +4,6 @@ import { useSelector } from 'react-redux'; import { FORUM_CONTRACT } from 'concordia-shared/src/constants/contracts/ContractNames'; import CustomLoader from './CustomLoader'; -// CSS -import '../../assets/css/loading-component.css'; - const InitializationLoader = ({ children }) => { const initializing = useSelector((state) => state.drizzleStatus.initializing); const failed = useSelector((state) => state.drizzleStatus.failed); diff --git a/packages/concordia-app/src/layouts/MainLayout/styles.css b/packages/concordia-app/src/layouts/MainLayout/styles.css index 042b794..23c7a72 100644 --- a/packages/concordia-app/src/layouts/MainLayout/styles.css +++ b/packages/concordia-app/src/layouts/MainLayout/styles.css @@ -1,3 +1,6 @@ #main-layout { - height: 100%; -} \ No newline at end of file + height: auto; + min-height: 100%; + background-color: #E6E6E6; + padding-bottom: 4rem; +} diff --git a/packages/concordia-app/src/views/Home/Board/styles.css b/packages/concordia-app/src/views/Home/Board/styles.css index 631aa1d..80fe97e 100644 --- a/packages/concordia-app/src/views/Home/Board/styles.css +++ b/packages/concordia-app/src/views/Home/Board/styles.css @@ -6,4 +6,5 @@ #new-topic-button{ float:right; margin-bottom: 2em; + margin-right: 0; } diff --git a/yarn.lock b/yarn.lock index 53bf2eb..effe837 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1511,17 +1511,6 @@ orbit-db-identity-provider "~0.3.1" redux-saga "~1.1.3" -"@ezerous/drizzle@~0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@ezerous/drizzle/-/drizzle-0.4.2.tgz#2e575d0709cc29c77b984d96562b8749d8f477c9" - integrity sha512-oTJ77+yGdgg2KPIeIvRczFnPrBg8aXdNisHfM0ztjd7T/Ui8+Nw1HNhMVaw2xTuR53pio3SD8FBU1JrEUKOABQ== - dependencies: - deepmerge "~4.2.2" - is-plain-object "~5.0.0" - redux "~4.0.5" - redux-saga "~1.1.3" - web3 "~1.3.4" - "@ezerous/eth-identity-provider@~0.1.2": version "0.1.2" resolved "https://registry.yarnpkg.com/@ezerous/eth-identity-provider/-/eth-identity-provider-0.1.2.tgz#c1489a8d3ef5aec93ee53e7d96363a67409b3ada" @@ -2757,7 +2746,7 @@ "@webassemblyjs/wast-parser" "1.8.5" "@xtuc/long" "4.2.2" -"@welldone-software/why-did-you-render@^6.0.0-rc.1": +"@welldone-software/why-did-you-render@~6.0.5": version "6.0.5" resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-6.0.5.tgz#a8df3509ed612770bb21b5fa0ad61634acc61f38" integrity sha512-8fWib+bKoAmnJHZPU8/qpEXKG8piB3oaoKj78fXNAdYd3x8ryde1pC7D5tKff5Mart2iOJUvYNxxcYlbtT9tow== @@ -15484,7 +15473,7 @@ redux-thunk@^2.3.0: resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw== -redux@^4.0.0, redux@^4.0.4, redux@~4.0.5: +redux@^4.0.0, redux@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== @@ -18356,7 +18345,7 @@ web3-utils@1.3.4: underscore "1.9.1" utf8 "3.0.0" -web3@~1.3.0, web3@~1.3.3, web3@~1.3.4: +web3@~1.3.0, web3@~1.3.3: version "1.3.4" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.4.tgz#31e014873360aa5840eb17f9f171190c967cffb7" integrity sha512-D6cMb2EtTMLHgdGbkTPGl/Qi7DAfczR+Lp7iFX3bcu/bsD9V8fZW69hA8v5cRPNGzXUwVQebk3bS17WKR4cD2w== From 5a4523131d59b7b75a38ba8e3678b5652239a895 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 10 Feb 2021 20:16:33 +0200 Subject: [PATCH 3/8] feat: add pinner logs upon peer connection/ disconnection --- packages/concordia-pinner/.eslintrc.js | 1 + packages/concordia-pinner/src/app.js | 1 - packages/concordia-pinner/src/index.js | 8 ++++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/concordia-pinner/.eslintrc.js b/packages/concordia-pinner/.eslintrc.js index 9625123..d6c80de 100755 --- a/packages/concordia-pinner/.eslintrc.js +++ b/packages/concordia-pinner/.eslintrc.js @@ -44,6 +44,7 @@ module.exports = { 'no-console': 'off', 'no-shadow': 'warn', 'no-multi-str': 'warn', + 'no-underscore-dangle': 0, 'jsx-a11y/label-has-associated-control': [2, { labelAttributes: ['label'], controlComponents: ['Input'], diff --git a/packages/concordia-pinner/src/app.js b/packages/concordia-pinner/src/app.js index 690e450..c2fa553 100644 --- a/packages/concordia-pinner/src/app.js +++ b/packages/concordia-pinner/src/app.js @@ -19,7 +19,6 @@ const responseBody = { async function getStats(orbit) { try { - // eslint-disable-next-line no-underscore-dangle const ipfs = orbit._ipfs; const { id } = await ipfs.id(); const peers = await ipfs.swarm.peers(); diff --git a/packages/concordia-pinner/src/index.js b/packages/concordia-pinner/src/index.js index aa5dbb2..0d3c803 100644 --- a/packages/concordia-pinner/src/index.js +++ b/packages/concordia-pinner/src/index.js @@ -84,6 +84,14 @@ const main = async () => { topics: [eventJsonInterface.signature], }, handleWeb3LogEvent(web3, eventJsonInterface, orbit)); + orbit._ipfs.libp2p.connectionManager.on( + 'peer:connect', + (peerInfo) => console.log('Peer connected: ', peerInfo.remotePeer.toB58String()), + ); + orbit._ipfs.libp2p.connectionManager.on( + 'peer:disconnect', + (peerInfo) => console.log('Peer disconnected: ', peerInfo.remotePeer.toB58String()), + ); startAPI(orbit); }))); }; From ae4baf6065ee6b6a4cb8c5cbc2b74034a859d2ce Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 10 Feb 2021 20:52:01 +0200 Subject: [PATCH 4/8] fix: missing dependency --- packages/concordia-app/package.json | 1 + yarn.lock | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index fd71045..39686ed 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -25,6 +25,7 @@ }, "dependencies": { "@ezerous/breeze": "~0.5.0", + "@ezerous/drizzle": "~0.4.2", "@ezerous/eth-identity-provider": "~0.1.2", "@reduxjs/toolkit": "~1.4.0", "@welldone-software/why-did-you-render": "~6.0.5", diff --git a/yarn.lock b/yarn.lock index effe837..3e29ec9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1511,6 +1511,17 @@ orbit-db-identity-provider "~0.3.1" redux-saga "~1.1.3" +"@ezerous/drizzle@~0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@ezerous/drizzle/-/drizzle-0.4.2.tgz#2e575d0709cc29c77b984d96562b8749d8f477c9" + integrity sha512-oTJ77+yGdgg2KPIeIvRczFnPrBg8aXdNisHfM0ztjd7T/Ui8+Nw1HNhMVaw2xTuR53pio3SD8FBU1JrEUKOABQ== + dependencies: + deepmerge "~4.2.2" + is-plain-object "~5.0.0" + redux "~4.0.5" + redux-saga "~1.1.3" + web3 "~1.3.4" + "@ezerous/eth-identity-provider@~0.1.2": version "0.1.2" resolved "https://registry.yarnpkg.com/@ezerous/eth-identity-provider/-/eth-identity-provider-0.1.2.tgz#c1489a8d3ef5aec93ee53e7d96363a67409b3ada" @@ -15473,7 +15484,7 @@ redux-thunk@^2.3.0: resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw== -redux@^4.0.0, redux@^4.0.4: +redux@^4.0.0, redux@^4.0.4, redux@~4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== @@ -18345,7 +18356,7 @@ web3-utils@1.3.4: underscore "1.9.1" utf8 "3.0.0" -web3@~1.3.0, web3@~1.3.3: +web3@~1.3.0, web3@~1.3.3, web3@~1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.4.tgz#31e014873360aa5840eb17f9f171190c967cffb7" integrity sha512-D6cMb2EtTMLHgdGbkTPGl/Qi7DAfczR+Lp7iFX3bcu/bsD9V8fZW69hA8v5cRPNGzXUwVQebk3bS17WKR4cD2w== From 1a64b84f812ede98a510371686d2363963c941da Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 10 Feb 2021 21:50:29 +0200 Subject: [PATCH 5/8] Up breeze --- packages/concordia-app/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index 39686ed..a9677a8 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -24,7 +24,7 @@ ] }, "dependencies": { - "@ezerous/breeze": "~0.5.0", + "@ezerous/breeze": "~0.6.0", "@ezerous/drizzle": "~0.4.2", "@ezerous/eth-identity-provider": "~0.1.2", "@reduxjs/toolkit": "~1.4.0", diff --git a/yarn.lock b/yarn.lock index 3e29ec9..d2baa45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1499,10 +1499,10 @@ "@ethersproject/properties" "^5.0.7" "@ethersproject/strings" "^5.0.8" -"@ezerous/breeze@~0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@ezerous/breeze/-/breeze-0.5.0.tgz#472c9d1a28edac9d38ea56f3501c846f1e191a7e" - integrity sha512-HK7jncn/sxxCT/wbocHtFGcGkceWMHZSOyKnRYZ6ukbpKPicaerIYbg8G6t2jBTLrFwvkxLHVe2bAWkmQEf9VQ== +"@ezerous/breeze@~0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@ezerous/breeze/-/breeze-0.6.0.tgz#95c602da137c098f8f6984b4ba85ad99d495ec55" + integrity sha512-8M7hg2nYvWjJcL4h3dNHglTyzx/9GbnS2HZ+3deFV1+WUdO0wIjWgssQi383ys/xygjNlNSo1nQAkUwy9cKM1g== dependencies: deepmerge "~4.2.2" ipfs "~0.54.2" From 953c361ecbfd09ccd680ef99176b2e5156d3c5cf Mon Sep 17 00:00:00 2001 From: Ezerous Date: Thu, 11 Feb 2021 13:08:28 +0200 Subject: [PATCH 6/8] feat: add IPFS Stats view --- packages/concordia-app/package.json | 1 + .../TopicList/TopicListRow/styles.css | 4 +- .../MainLayout/MainLayoutIPFSStats/index.jsx | 62 +++++++++++++++++++ .../MainLayout/MainLayoutIPFSStats/styles.css | 12 ++++ .../src/layouts/MainLayout/index.jsx | 13 +++- .../src/layouts/MainLayout/styles.css | 5 ++ .../concordia-app/src/views/About/index.jsx | 28 +++++---- .../concordia-app/src/views/About/styles.css | 6 +- .../src/views/Home/Board/styles.css | 1 + yarn.lock | 22 ++++++- 10 files changed, 136 insertions(+), 18 deletions(-) create mode 100644 packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/index.jsx create mode 100644 packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index a9677a8..0f6999e 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -38,6 +38,7 @@ "prop-types": "~15.7.2", "react": "~16.13.1", "react-avatar": "~3.9.7", + "react-copy-to-clipboard": "^5.0.3", "react-dom": "~16.13.1", "react-i18next": "^11.7.3", "react-markdown": "^5.0.3", diff --git a/packages/concordia-app/src/components/TopicList/TopicListRow/styles.css b/packages/concordia-app/src/components/TopicList/TopicListRow/styles.css index 2a7dda0..6b19c2a 100644 --- a/packages/concordia-app/src/components/TopicList/TopicListRow/styles.css +++ b/packages/concordia-app/src/components/TopicList/TopicListRow/styles.css @@ -26,7 +26,7 @@ .topic-row-avatar { margin: auto; - padding-left: 1rem !important; + padding-left: 1.4rem !important; padding-right: 0 !important; font-size: 2rem; color: red; @@ -37,7 +37,7 @@ } .topic-row-content { - padding-left: 2rem !important; + padding-left: 3rem !important; } .topic-row-subject { diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/index.jsx new file mode 100644 index 0000000..00b6865 --- /dev/null +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/index.jsx @@ -0,0 +1,62 @@ +import React, { useMemo } from 'react'; +import { useSelector } from 'react-redux'; +import { CopyToClipboard } from 'react-copy-to-clipboard'; +import { + Header, Image, List, Segment, Table, Transition, +} from 'semantic-ui-react'; + +import ipfsLogo from '../../../assets/images/ipfs_logo.svg'; +import './styles.css'; + +const MainLayoutIPFSStats = () => { + const ipfsId = useSelector((state) => state.ipfs.id); + const peerIds = useSelector((state) => state.ipfs.peers); + const peers = useMemo(() => peerIds + .map((peerId) => ( + + + {peerId} + + + + )), [peerIds]); + + return ( + +
+ + IPFS Stats +
+ + + + ID + + + {ipfsId} + + + + + Peers + + + {peers} + + + + +
+ + ); +}; + +export default MainLayoutIPFSStats; diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css new file mode 100644 index 0000000..f9426c1 --- /dev/null +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css @@ -0,0 +1,12 @@ +.stat-key { + width: 13% +} + +.stat-value { + font-size: 0.9rem; + cursor: pointer; +} + +.stat-value:hover { + color: grey; +} diff --git a/packages/concordia-app/src/layouts/MainLayout/index.jsx b/packages/concordia-app/src/layouts/MainLayout/index.jsx index 597ca73..f9a5f5b 100644 --- a/packages/concordia-app/src/layouts/MainLayout/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/index.jsx @@ -1,6 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { Grid } from 'semantic-ui-react'; import MainLayoutMenu from './MainLayoutMenu'; +import MainLayoutIPFSStats from './MainLayoutIPFSStats'; import './styles.css'; const MainLayout = (props) => { @@ -9,7 +11,16 @@ const MainLayout = (props) => { return (
- {children} + + + + {children} + + + + + +
); }; diff --git a/packages/concordia-app/src/layouts/MainLayout/styles.css b/packages/concordia-app/src/layouts/MainLayout/styles.css index 23c7a72..494a844 100644 --- a/packages/concordia-app/src/layouts/MainLayout/styles.css +++ b/packages/concordia-app/src/layouts/MainLayout/styles.css @@ -4,3 +4,8 @@ background-color: #E6E6E6; padding-bottom: 4rem; } + +#main-layout-grid{ + margin-right: 0; + margin-left: 0; +} diff --git a/packages/concordia-app/src/views/About/index.jsx b/packages/concordia-app/src/views/About/index.jsx index 2698047..52ed3c9 100644 --- a/packages/concordia-app/src/views/About/index.jsx +++ b/packages/concordia-app/src/views/About/index.jsx @@ -2,7 +2,7 @@ import React, { memo, useEffect, useState, } from 'react'; import ReactMarkdown from 'react-markdown'; -import { Container, Image } from 'semantic-ui-react'; +import { Container, Image, Segment } from 'semantic-ui-react'; import AboutMd from '../../assets/About.md'; import appLogo from '../../assets/images/app_logo_circle.svg'; @@ -26,18 +26,20 @@ const About = () => { }, []); return ( - -
- - {`v${process.env.REACT_APP_VERSION}`} -
- + + +
+ + {`v${process.env.REACT_APP_VERSION}`} +
+ + ); }; diff --git a/packages/concordia-app/src/views/About/styles.css b/packages/concordia-app/src/views/About/styles.css index 855a143..4509c39 100644 --- a/packages/concordia-app/src/views/About/styles.css +++ b/packages/concordia-app/src/views/About/styles.css @@ -1,3 +1,7 @@ -#app-logo{ +#about-segment{ + padding: 3rem; +} + +#about-app-logo{ margin-bottom: 1rem; } diff --git a/packages/concordia-app/src/views/Home/Board/styles.css b/packages/concordia-app/src/views/Home/Board/styles.css index 80fe97e..e2d23b0 100644 --- a/packages/concordia-app/src/views/Home/Board/styles.css +++ b/packages/concordia-app/src/views/Home/Board/styles.css @@ -5,6 +5,7 @@ #new-topic-button{ float:right; + margin-top: 1px; margin-bottom: 2em; margin-right: 0; } diff --git a/yarn.lock b/yarn.lock index d2baa45..a4c2b97 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4877,6 +4877,13 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= +copy-to-clipboard@^3: + version "3.3.1" + resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae" + integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw== + dependencies: + toggle-selection "^1.0.6" + core-js-compat@^3.6.2, core-js-compat@^3.8.0: version "3.8.3" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f" @@ -14844,7 +14851,7 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15.6.2, prop-types@^15.7.2, prop-types@~15.7.2: +prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@~15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -15140,6 +15147,14 @@ react-avatar@~3.9.7: is-retina "^1.0.3" md5 "^2.0.0" +react-copy-to-clipboard@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.3.tgz#2a0623b1115a1d8c84144e9434d3342b5af41ab4" + integrity sha512-9S3j+m+UxDZOM0Qb8mhnT/rMR0NGSrj9A/073yz2DSxPMYhmYFBMYIdI2X4o8AjOjyFsSNxDRnCX6s/gRxpriw== + dependencies: + copy-to-clipboard "^3" + prop-types "^15.5.8" + react-dev-utils@^10.2.1: version "10.2.1" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19" @@ -17381,6 +17396,11 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" +toggle-selection@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" + integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI= + toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" From 3e6346ed0bf7efc5701d55a4fe7bc05ca643baf4 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Thu, 11 Feb 2021 19:32:06 +0200 Subject: [PATCH 7/8] feat: distinguish bootstrap peers (IPFS Stats view) --- packages/concordia-app/package.json | 2 +- .../MainLayout/MainLayoutIPFSStats/index.jsx | 65 +++++++++++++------ .../MainLayout/MainLayoutIPFSStats/styles.css | 5 +- yarn.lock | 8 +-- 4 files changed, 52 insertions(+), 28 deletions(-) diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index 0f6999e..ec3fa75 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -24,7 +24,7 @@ ] }, "dependencies": { - "@ezerous/breeze": "~0.6.0", + "@ezerous/breeze": "~0.7.0", "@ezerous/drizzle": "~0.4.2", "@ezerous/eth-identity-provider": "~0.1.2", "@reduxjs/toolkit": "~1.4.0", diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/index.jsx index 00b6865..2433cb0 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/index.jsx @@ -2,7 +2,7 @@ import React, { useMemo } from 'react'; import { useSelector } from 'react-redux'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import { - Header, Image, List, Segment, Table, Transition, + Header, Image, Segment, Table, } from 'semantic-ui-react'; import ipfsLogo from '../../../assets/images/ipfs_logo.svg'; @@ -11,29 +11,43 @@ import './styles.css'; const MainLayoutIPFSStats = () => { const ipfsId = useSelector((state) => state.ipfs.id); const peerIds = useSelector((state) => state.ipfs.peers); + const bootstrapPeerIds = useSelector((state) => state.ipfs.bootstrapPeers); const peers = useMemo(() => peerIds .map((peerId) => ( - - - {peerId} - - + + + + {peerId} + + + )), [peerIds]); + const bootstrapPeers = useMemo(() => bootstrapPeerIds + .map((bootstrapPeerId) => ( + + + + {bootstrapPeerId} + + + + + )), [bootstrapPeerIds]); + return ( - +
IPFS Stats
- +
- ID + Peer ID + + @@ -43,16 +57,25 @@ const MainLayoutIPFSStats = () => { - Peers - - - {peers} - - + Peers + + {peers.length === 0 + ? ( + + - + + ) : null} + {peers} + + Bootstrap Peers + {bootstrapPeers.length === 0 + ? ( + + - + + ) : null} + {bootstrapPeers}
diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css index f9426c1..b9f723c 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css @@ -1,9 +1,10 @@ .stat-key { - width: 13% + background: rgba(0,0,0,.1); + font-weight: 700; } .stat-value { - font-size: 0.9rem; + font-size: 0.95rem; cursor: pointer; } diff --git a/yarn.lock b/yarn.lock index a4c2b97..61f3509 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1499,10 +1499,10 @@ "@ethersproject/properties" "^5.0.7" "@ethersproject/strings" "^5.0.8" -"@ezerous/breeze@~0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@ezerous/breeze/-/breeze-0.6.0.tgz#95c602da137c098f8f6984b4ba85ad99d495ec55" - integrity sha512-8M7hg2nYvWjJcL4h3dNHglTyzx/9GbnS2HZ+3deFV1+WUdO0wIjWgssQi383ys/xygjNlNSo1nQAkUwy9cKM1g== +"@ezerous/breeze@~0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@ezerous/breeze/-/breeze-0.7.0.tgz#b275dc0e92040e9fa7171d945562b716e133b4d7" + integrity sha512-CMgrQ4b/hdl3OVGXiNpdoW3T8D1K+OAnOP3KlAtxCYW5uQZzp41xUq2MxpdVi5nj8YH6MZa8ditmSDEE7xnFFA== dependencies: deepmerge "~4.2.2" ipfs "~0.54.2" From b414609a655902d77cca732cc909adc84c89b976 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Fri, 12 Feb 2021 14:52:59 +0200 Subject: [PATCH 8/8] Minor UI fixes/ refactoring --- .../public/locales/en/translation.json | 5 +++-- .../components/ClearDatabasesModal/index.jsx | 8 +++---- .../src/components/TopicList/styles.css | 4 +--- .../MainLayout/MainLayoutIPFSStats/styles.css | 13 ----------- .../index.jsx | 22 +++++++++---------- .../MainLayoutIPFSStatus/styles.css | 18 +++++++++++++++ .../MainLayout/MainLayoutMenu/index.jsx | 2 +- .../MainLayout/MainLayoutMenu/styles.css | 3 ++- .../src/layouts/MainLayout/index.jsx | 4 ++-- .../src/redux/sagas/peerDbReplicationSaga.js | 4 +--- 10 files changed, 43 insertions(+), 40 deletions(-) delete mode 100644 packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStats/styles.css rename packages/concordia-app/src/layouts/MainLayout/{MainLayoutIPFSStats => MainLayoutIPFSStatus}/index.jsx (79%) create mode 100644 packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStatus/styles.css diff --git a/packages/concordia-app/public/locales/en/translation.json b/packages/concordia-app/public/locales/en/translation.json index d37376c..d4661ce 100644 --- a/packages/concordia-app/public/locales/en/translation.json +++ b/packages/concordia-app/public/locales/en/translation.json @@ -7,8 +7,9 @@ "clear.databases.modal.clearing.progress.message": "This might take a minute...", "clear.databases.modal.clearing.progress.title": "Clearing all Concordia databases", "clear.databases.modal.description.body.user": "Although this action is generally recoverable some of your topics and posts may be permanently lost.", - "clear.databases.modal.description.pre": "You are about to clear the Concordia databases stored locally in your browser.", - "clear.databases.modal.form.username.label.guest": "Please type concordia to confirm.", + "clear.databases.modal.description.pre.guest": "You are about to clear the Concordia databases stored locally in your browser.", + "clear.databases.modal.description.pre.user": "Be careful, {{username}}! You are about to clear the Concordia databases stored locally in your browser.", + "clear.databases.modal.form.username.label.guest": "Please type Concordia to confirm.", "clear.databases.modal.form.username.label.user": "Please type your username to confirm.", "clear.databases.modal.title": "Clear all Concordia databases. Are you sure?", "custom.loading.tab.pane.default.generic.message": "Magic in the background", diff --git a/packages/concordia-app/src/components/ClearDatabasesModal/index.jsx b/packages/concordia-app/src/components/ClearDatabasesModal/index.jsx index db2aa72..922dc54 100644 --- a/packages/concordia-app/src/components/ClearDatabasesModal/index.jsx +++ b/packages/concordia-app/src/components/ClearDatabasesModal/index.jsx @@ -23,7 +23,7 @@ const ClearDatabasesModal = (props) => { useEffect(() => { if (user.hasSignedUp && confirmationInput === user.username) { setUserConfirmed(true); - } else if (!user.hasSignedUp && confirmationInput === 'concordia') { + } else if (!user.hasSignedUp && confirmationInput === 'Concordia') { setUserConfirmed(true); } else { setUserConfirmed(false); @@ -63,7 +63,7 @@ const ClearDatabasesModal = (props) => { return ( <>

- {t('clear.databases.modal.description.pre')} + {t('clear.databases.modal.description.pre.user', { username: user.username })}

{t('clear.databases.modal.description.body.user')} @@ -88,7 +88,7 @@ const ClearDatabasesModal = (props) => { return ( <>

- {t('clear.databases.modal.description.pre')} + {t('clear.databases.modal.description.pre.guest')}

@@ -105,7 +105,7 @@ const ClearDatabasesModal = (props) => { ); - }, [confirmationInput, isClearing, t, user.hasSignedUp]); + }, [confirmationInput, isClearing, t, user.hasSignedUp, user.username]); return useMemo(() => ( { +const MainLayoutIPFSStatus = () => { const ipfsId = useSelector((state) => state.ipfs.id); const peerIds = useSelector((state) => state.ipfs.peers); const bootstrapPeerIds = useSelector((state) => state.ipfs.bootstrapPeers); const peers = useMemo(() => peerIds .map((peerId) => ( - + {peerId} @@ -26,7 +26,7 @@ const MainLayoutIPFSStats = () => { const bootstrapPeers = useMemo(() => bootstrapPeerIds .map((bootstrapPeerId) => ( - + {bootstrapPeerId} @@ -39,17 +39,17 @@ const MainLayoutIPFSStats = () => { return (
- - IPFS Stats + + IPFS Status
- +
- Peer ID + Peer ID {ipfsId} @@ -57,7 +57,7 @@ const MainLayoutIPFSStats = () => { - Peers + Peers {peers.length === 0 ? ( @@ -67,7 +67,7 @@ const MainLayoutIPFSStats = () => { ) : null} {peers} - Bootstrap Peers + Bootstrap Peers {bootstrapPeers.length === 0 ? ( @@ -82,4 +82,4 @@ const MainLayoutIPFSStats = () => { ); }; -export default MainLayoutIPFSStats; +export default MainLayoutIPFSStatus; diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStatus/styles.css b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStatus/styles.css new file mode 100644 index 0000000..abfeccd --- /dev/null +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutIPFSStatus/styles.css @@ -0,0 +1,18 @@ +.status-table { + border: 1px solid var(--secondary-color) !important; +} + +.status-key { + background-color: var(--secondary-color); + color: white; + font-weight: 700; +} + +.status-value { + font-size: 0.95rem; + cursor: pointer; +} + +.status-value:hover { + color: grey; +} diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx index 012fad6..1f0c0f7 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx @@ -31,7 +31,7 @@ const MainLayoutMenu = () => { return ( {() => ( - + { @@ -17,7 +17,7 @@ const MainLayout = (props) => { {children} - + diff --git a/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js b/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js index 969195d..251a283 100644 --- a/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js +++ b/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js @@ -104,9 +104,7 @@ function* updateReduxState({ database }) { function* peerDbReplicationSaga() { yield takeEvery(FETCH_USER_DATABASE, fetchUserDb); - yield takeEvery(ORBIT_DB_REPLICATED, updateReduxState); - yield takeEvery(ORBIT_DB_READY, updateReduxState); - yield takeEvery(ORBIT_DB_WRITE, updateReduxState); + yield takeEvery([ORBIT_DB_READY, ORBIT_DB_REPLICATED, ORBIT_DB_WRITE], updateReduxState); } export default peerDbReplicationSaga;