From e7b3ea37f6d63c6ed990a00e82b0bad7f8688ba7 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Mon, 16 Nov 2020 13:13:39 +0200 Subject: [PATCH 01/37] Voting contract init --- .../concordia-contracts/contracts/Forum.sol | 23 +++-- .../contracts/Migrations.sol | 5 +- .../concordia-contracts/contracts/Voting.sol | 90 +++++++++++++++++++ .../migrations/2_deploy_contracts.js | 3 +- .../concordia-contracts/truffle-config.js | 2 +- 5 files changed, 110 insertions(+), 13 deletions(-) create mode 100644 packages/concordia-contracts/contracts/Voting.sol diff --git a/packages/concordia-contracts/contracts/Forum.sol b/packages/concordia-contracts/contracts/Forum.sol index 13ad2ea..ae6ec07 100644 --- a/packages/concordia-contracts/contracts/Forum.sol +++ b/packages/concordia-contracts/contracts/Forum.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.1; +pragma solidity 0.7.4; contract Forum { @@ -133,10 +133,10 @@ contract Forum { function getTopic(uint topicID) public view returns (address, string memory, uint, uint[] memory) { require(topicID uint) voters; + uint[] voteCounts; // First element will hold total count + uint timestamp; + } + + mapping (uint => Poll) polls; + + event PollCreated(uint topicID); + event UserVoted(address userAddress); + + function createPoll(uint topicID, uint numOptions, string memory dataHash) public returns (uint) { + require(forum.hasUserSignedUp(msg.sender)); // Only registered users can create polls + require(topicID 0 && option <= poll.numOptions); // Verify that this option exists + address voter = msg.sender; + uint currentVote = poll.voters[voter]; + if(currentVote == option) + return; + if(currentVote == 0) // Voter hadn't voted before + poll.voteCounts[0]++; + else + poll.voteCounts[currentVote]--; + poll.voteCounts[option]++; + poll.voters[voter] = option; + emit UserVoted(voter); + } +} diff --git a/packages/concordia-contracts/migrations/2_deploy_contracts.js b/packages/concordia-contracts/migrations/2_deploy_contracts.js index ec5722e..3e81c0e 100644 --- a/packages/concordia-contracts/migrations/2_deploy_contracts.js +++ b/packages/concordia-contracts/migrations/2_deploy_contracts.js @@ -1,6 +1,7 @@ const Forum = artifacts.require('Forum'); +const Voting = artifacts.require('Voting'); // eslint-disable-next-line func-names module.exports = function (deployer) { - deployer.deploy(Forum); + deployer.deploy(Forum).then((forum) => deployer.deploy(Voting, forum.address)); }; diff --git a/packages/concordia-contracts/truffle-config.js b/packages/concordia-contracts/truffle-config.js index 3ef72a1..d66ff67 100644 --- a/packages/concordia-contracts/truffle-config.js +++ b/packages/concordia-contracts/truffle-config.js @@ -8,7 +8,7 @@ module.exports = { // to customize your Truffle configuration! compilers: { solc: { - version: '0.7.1', + version: '0.7.4', }, }, contracts_build_directory: path.join(__dirname, 'build/'), From a1a4aaf00b9d7948082a36672dc51b3777f6e3a0 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Tue, 17 Nov 2020 20:42:51 +0200 Subject: [PATCH 02/37] Add functions --- .../concordia-contracts/contracts/Voting.sol | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/concordia-contracts/contracts/Voting.sol b/packages/concordia-contracts/contracts/Voting.sol index debf752..030a1c5 100644 --- a/packages/concordia-contracts/contracts/Voting.sol +++ b/packages/concordia-contracts/contracts/Voting.sol @@ -14,9 +14,9 @@ contract Voting { uint topicID; uint numOptions; string dataHash; - mapping (address => uint) voters; + mapping (address => uint) votes; uint[] voteCounts; // First element will hold total count - uint timestamp; + uint timestamp; // Timestamp of creation } mapping (uint => Poll) polls; @@ -50,11 +50,16 @@ contract Voting { function hasVoted(uint topicID, address voter) public view returns (bool) { require(isPollExistent(topicID)); - if (polls[topicID].voters[voter] != 0) + if (polls[topicID].votes[voter] != 0) return true; return false; } + function getVote(uint topicID, address voter) public view returns (uint) { + require(hasVoted(topicID, voter)); + return polls[topicID].votes[voter]; + } + function getPollInfo(uint topicID) public view returns (uint, string memory, uint, uint) { require(isPollExistent(topicID)); return ( @@ -71,12 +76,16 @@ contract Voting { return (polls[topicID].voteCounts[option]); } + function getTotalVotes(uint topicID) public view returns (uint) { + return getVoteCount(topicID, 0); + } + function vote(uint topicID, uint option) public { require(isPollExistent(topicID)); Poll storage poll = polls[topicID]; require(option > 0 && option <= poll.numOptions); // Verify that this option exists address voter = msg.sender; - uint currentVote = poll.voters[voter]; + uint currentVote = poll.votes[voter]; if(currentVote == option) return; if(currentVote == 0) // Voter hadn't voted before @@ -84,7 +93,7 @@ contract Voting { else poll.voteCounts[currentVote]--; poll.voteCounts[option]++; - poll.voters[voter] = option; + poll.votes[voter] = option; emit UserVoted(voter); } } From 59823fb5330ec12814c4524b01553be1f7c36faa Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 18 Nov 2020 19:24:58 +0200 Subject: [PATCH 03/37] Merged Apostolof's changes --- .../concordia-contracts/contracts/Voting.sol | 113 +++++--- .../concordia-contracts/test/TestVoting.sol | 112 ++++++++ .../concordia-contracts/truffle-config.js | 2 +- yarn.lock | 256 ++++++++++-------- 4 files changed, 333 insertions(+), 150 deletions(-) create mode 100644 packages/concordia-contracts/test/TestVoting.sol diff --git a/packages/concordia-contracts/contracts/Voting.sol b/packages/concordia-contracts/contracts/Voting.sol index 030a1c5..a11047e 100644 --- a/packages/concordia-contracts/contracts/Voting.sol +++ b/packages/concordia-contracts/contracts/Voting.sol @@ -15,8 +15,9 @@ contract Voting { uint numOptions; string dataHash; mapping (address => uint) votes; - uint[] voteCounts; // First element will hold total count - uint timestamp; // Timestamp of creation + mapping (uint => address[]) voters; + bool enableVoteChanges; + uint timestamp; } mapping (uint => Poll) polls; @@ -24,26 +25,46 @@ contract Voting { event PollCreated(uint topicID); event UserVoted(address userAddress); - function createPoll(uint topicID, uint numOptions, string memory dataHash) public returns (uint) { + // Verify that poll exists + function isPollExistent(uint topicID) public view returns (bool) { + if (polls[topicID].timestamp != 0) + return true; + return false; + } + + function createPoll(uint topicID, uint numOptions, string memory dataHash, bool enableVoteChanges) public returns (uint) { require(forum.hasUserSignedUp(msg.sender)); // Only registered users can create polls require(topicID 0 && option <= poll.numOptions); // Verify that this option exists address voter = msg.sender; - uint currentVote = poll.votes[voter]; - if(currentVote == option) + uint prevOption = poll.votes[voter]; + if(prevOption == option) return; - if(currentVote == 0) // Voter hadn't voted before - poll.voteCounts[0]++; - else - poll.voteCounts[currentVote]--; - poll.voteCounts[option]++; - poll.votes[voter] = option; - emit UserVoted(voter); + + // Voter hadn't voted before + if(prevOption == 0){ + poll.voters[option].push(voter); + poll.votes[voter] = option; + emit UserVoted(voter); + } + else if (poll.enableVoteChanges){ + uint voterIndex = getVoterIndex(topicID, voter); + // Swap with last voter address and delete vote + poll.voters[prevOption][voterIndex] = poll.voters[prevOption][poll.voters[prevOption].length - 1]; + poll.voters[prevOption].pop(); + if(option != 0) + poll.voters[option].push(voter); + poll.votes[voter] = option; + emit UserVoted(voter); + } } } diff --git a/packages/concordia-contracts/test/TestVoting.sol b/packages/concordia-contracts/test/TestVoting.sol new file mode 100644 index 0000000..074abd6 --- /dev/null +++ b/packages/concordia-contracts/test/TestVoting.sol @@ -0,0 +1,112 @@ +//SPDX-License-Identifier: MIT +pragma solidity 0.7.4; + +import "truffle/Assert.sol"; +import "truffle/DeployedAddresses.sol"; +import "../contracts/Forum.sol"; +import "../contracts/Voting.sol"; + +contract TestVoting { + Forum forum; + uint firstTopicId; + + function beforeAll() public { + forum = Forum(DeployedAddresses.Forum()); + + forum.signUp('testAccount'); + (firstTopicId,) = forum.createTopic(); + } + + function testIsPollExistent() public { + Voting voting = Voting(DeployedAddresses.Voting()); + + bool actual = voting.isPollExistent(firstTopicId); + + Assert.equal(actual, false, "Poll should not exist"); + } + + function testCreatePoll() public { + Voting voting = Voting(DeployedAddresses.Voting()); + + uint actual = voting.createPoll(firstTopicId, 3, 'asdf', false); + + Assert.equal(actual, firstTopicId, "Topic Id should be 1"); + } + + function testGetTotalVotes() public { + Voting voting = Voting(DeployedAddresses.Voting()); + + uint actual = voting.getTotalVotes(firstTopicId); + + Assert.equal(actual, 0, "Topic Id should be 0"); + } + + function testGetPollInfo() public { + Voting voting = Voting(DeployedAddresses.Voting()); + + (uint actualNumberOfOptions, string memory actualDataHash, , uint actualNumberOfVotes) = voting.getPollInfo(firstTopicId); + + Assert.equal(actualNumberOfOptions, 3, "Number of votes should be 0"); + Assert.equal(actualDataHash, 'asdf', "Number of votes should be 0"); + Assert.equal(actualNumberOfVotes, 0, "Number of votes should be 0"); + } + + function testVote() public { + Voting voting = Voting(DeployedAddresses.Voting()); + + voting.vote(firstTopicId, 1); + uint votesActual = voting.getTotalVotes(firstTopicId); + + Assert.equal(votesActual, 1, "Number of votes should be 1"); + } + + function testGetVoteCount() public { + Voting voting = Voting(DeployedAddresses.Voting()); + + uint actualVotesOption0 = voting.getVoteCount(firstTopicId, 1); + uint actualVotesOption1 = voting.getVoteCount(firstTopicId, 2); + uint actualVotesOption2 = voting.getVoteCount(firstTopicId, 3); + + Assert.equal(actualVotesOption0, 1, "Vote count is not correct"); + Assert.equal(actualVotesOption1, 0, "Vote count is not correct"); + Assert.equal(actualVotesOption2, 0, "Vote count is not correct"); + } + + function testChangeVoteWhenDisabled() public { + Voting voting = Voting(DeployedAddresses.Voting()); + + (uint topicId,) = forum.createTopic(); + voting.createPoll(topicId, 3, 'asdf', false); + + voting.vote(topicId, 1); + uint actualVotesOption0 = voting.getVoteCount(topicId, 1); + uint actualVotesOption1 = voting.getVoteCount(topicId, 2); + voting.vote(topicId, 2); + uint actualVotesOption2 = voting.getVoteCount(topicId, 1); + uint actualVotesOption3 = voting.getVoteCount(topicId, 2); + + Assert.equal(actualVotesOption0, 1, "Number of votes should be 1"); + Assert.equal(actualVotesOption1, 0, "Number of votes should be 0"); + Assert.equal(actualVotesOption2, 1, "Number of votes should be 1"); + Assert.equal(actualVotesOption3, 0, "Number of votes should be 0"); + } + + function testChangeVoteWhenEnabled() public { + Voting voting = Voting(DeployedAddresses.Voting()); + + (uint topicId,) = forum.createTopic(); + voting.createPoll(topicId, 3, 'asdf', true); + + voting.vote(topicId, 1); + uint actualVotesOption0 = voting.getVoteCount(topicId, 1); + uint actualVotesOption1 = voting.getVoteCount(topicId, 2); + voting.vote(topicId, 2); + uint actualVotesOption2 = voting.getVoteCount(topicId, 1); + uint actualVotesOption3 = voting.getVoteCount(topicId, 2); + + Assert.equal(actualVotesOption0, 1, "Number of votes should be 1"); + Assert.equal(actualVotesOption1, 0, "Number of votes should be 0"); + Assert.equal(actualVotesOption2, 0, "Number of votes should be 0"); + Assert.equal(actualVotesOption3, 1, "Number of votes should be 1"); + } +} diff --git a/packages/concordia-contracts/truffle-config.js b/packages/concordia-contracts/truffle-config.js index d66ff67..017d737 100644 --- a/packages/concordia-contracts/truffle-config.js +++ b/packages/concordia-contracts/truffle-config.js @@ -20,7 +20,7 @@ module.exports = { }, test: { host: GANACHE_HOST || '127.0.0.1', - port: GANACHE_PORT || '8546', + port: GANACHE_PORT || '8545', network_id: '*', }, }, diff --git a/yarn.lock b/yarn.lock index af511d6..c356e49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2200,9 +2200,9 @@ "@sinonjs/samsam" "^5.0.2" "@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.2.0": - version "5.2.0" - resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.2.0.tgz#fcff83ab86f83b5498f4a967869c079408d9b5eb" - integrity sha512-CaIcyX5cDsjcW/ab7HposFWzV1kC++4HNsfnEdFJa7cP1QIuILAKV+BgfeqRXhcnSAc76r/Rh/O5C+300BwUIw== + version "5.3.0" + resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz#1d2f0743dc54bf13fe9d508baefacdffa25d4329" + integrity sha512-hXpcfx3aq+ETVBwPlRFICld5EnrkexXuXDwqUNhDdr5L8VjvMeSRwyOa0qL7XFmR+jVWR4rUZtnxlG7RX72sBg== dependencies: "@sinonjs/commons" "^1.6.0" lodash.get "^4.4.2" @@ -2439,19 +2439,19 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.14.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d" - integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg== + version "14.14.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz#2127bd81949a95c8b7d3240f3254352d72563aec" + integrity sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA== "@types/node@^12.12.6": - version "12.19.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.4.tgz#cdfbb62e26c7435ed9aab9c941393cc3598e9b46" - integrity sha512-o3oj1bETk8kBwzz1WlO6JWL/AfAA3Vm6J1B3C9CsdxHYp7XgPiH7OEXPUbZTndHlRaIElrANkQfe6ZmfJb3H2w== + version "12.19.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.5.tgz#9be3946136e818597c71c62d04240d0602c645d4" + integrity sha512-Wgdl27uw/jUYUFyajUGKSjDNGxmJrZi9sjeG6UJImgUtKbJoO9aldx+1XODN1EpNDX9DirvbvHHmTsNlb8GwMA== "@types/node@^13.7.0": - version "13.13.30" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.30.tgz#1ed6e01e4ca576d5aec9cc802cc3bcf94c274192" - integrity sha512-HmqFpNzp3TSELxU/bUuRK+xzarVOAsR00hzcvM0TXrMlt/+wcSLa5q6YhTb6/cA6wqDCZLDcfd8fSL95x5h7AA== + version "13.13.31" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.31.tgz#b8fc04d46bc22959a99fbdba71b15f37a48da3ec" + integrity sha512-gBk54XbcRj8EKTi7Syo4JU4purbRJaZpkvMVs7+t+b9JaOtwsGo7vCbXdVJN3gH/wu/GyZGD8lAKo0qpQuNjOw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -3100,20 +3100,22 @@ array-unique@^0.3.2: integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" - integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" + integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" array.prototype.flatmap@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443" - integrity sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg== + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" + integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" function-bind "^1.1.1" array.prototype.map@^1.0.1: @@ -3267,9 +3269,9 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axe-core@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.0.2.tgz#c7cf7378378a51fcd272d3c09668002a4990b1cb" - integrity sha512-arU1h31OGFu+LPrOLGZ7nB45v940NMDMEJeNmbutu57P+UFDVnkZg3e+J1I2HJRZ9hT7gO8J91dn/PMrAiKakA== + version "4.1.0" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.0.tgz#93d395e6262ecdde5cb52a5d06533d0a0c7bb4cd" + integrity sha512-9atDIOTDLsWL+1GbBec6omflaT5Cxh88J0GtJtGfCVIXpI02rXHkju59W5mMqWa7eiC5OR168v3TK3kUKBW98g== axobject-query@^2.0.2, axobject-query@^2.2.0: version "2.2.0" @@ -4064,9 +4066,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157: - version "1.0.30001157" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab" - integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA== + version "1.0.30001159" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20" + integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA== capture-exit@^2.0.0: version "2.0.0" @@ -4897,11 +4899,11 @@ css-tree@1.0.0-alpha.37: source-map "^0.6.1" css-tree@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz#7726678dfe2a57993a018d9dce519bf1760e3b6d" - integrity sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.0.tgz#9b8559e0169c0f678f49a6e045e2c3101f7aa36f" + integrity sha512-SKwwAnwRPotiopzQBpK4o+W6Uu8PA759iWdJ1EXy3zkj+sSUcsdhnhvdv4dy5AtjcX0OGXxS7h73YAMXu8QXBw== dependencies: - mdn-data "2.0.12" + mdn-data "2.0.14" source-map "^0.6.1" css-what@2.1: @@ -5008,9 +5010,9 @@ cssnano@^4.1.10: postcss "^7.0.0" csso@^4.0.2: - version "4.1.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz#1d31193efa99b87aa6bad6c0cef155e543d09e8b" - integrity sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg== + version "4.1.1" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz#e0cb02d6eb3af1df719222048e4359efd662af13" + integrity sha512-Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA== dependencies: css-tree "^1.0.0" @@ -5581,9 +5583,9 @@ ejs@^3.1.5: jake "^10.6.1" electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.591: - version "1.3.595" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.595.tgz#e8a9e7c6919963419f892ea981d7b3438ccb834d" - integrity sha512-JpaBIhdBkF9FLG7x06ONfe0f5bxPrxRcq0X+Sc8vsCt+OPWIzxOD+qM71NEHLGbDfN9Q6hbtHRv4/dnvcOxo6g== + version "1.3.598" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz#8f757018902ab6190323a8c5f6124d854893a35b" + integrity sha512-G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A== elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: version "6.5.3" @@ -5834,7 +5836,7 @@ escape-html@^1.0.3, escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@2.0.0: +escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== @@ -7795,9 +7797,9 @@ immer@1.10.0: integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg== immer@^7.0.3: - version "7.0.14" - resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.14.tgz#3e605f8584b15a9520d2f2f3fda9441cc9170d25" - integrity sha512-BxCs6pJwhgSEUEOZjywW7OA8DXVzfHjkBelSEl0A+nEu0+zS4cFVdNOONvt55N4WOm8Pu4xqSPYxhm1Lv2iBBA== + version "7.0.15" + resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.15.tgz#dc3bc6db87401659d2e737c67a21b227c484a4ad" + integrity sha512-yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA== import-cwd@^2.0.0: version "2.1.0" @@ -8053,10 +8055,10 @@ ipfs-block-service@^0.18.0: err-code "^2.0.0" streaming-iterables "^5.0.2" -ipfs-cli@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/ipfs-cli/-/ipfs-cli-0.2.0.tgz#fd0fb5f32227a3757e68098957b809255cd0f84e" - integrity sha512-Wn908CBbVRG9QHIYrgT1IJgmPoZXWMW+i/Sd/t9OBf+V4+Vvof2uj+GlVCAWFSsb1UjN5Jlc6Kjk8838KK5hNA== +ipfs-cli@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ipfs-cli/-/ipfs-cli-0.2.1.tgz#96cc82870c8ef87f5d5e80cca90f634f2ce46fc1" + integrity sha512-uOsk/4R4/hFWJBpgtJ/16rBVvtFKqiz8udjcCShissRN9YjjzwRevVHgEHSriY9nTBBGHX7ZZe+Q9mqTDr+qKw== dependencies: bignumber.js "^9.0.0" byteman "^1.3.5" @@ -8067,13 +8069,13 @@ ipfs-cli@^0.2.0: err-code "^2.0.3" execa "^4.0.3" get-folder-size "^2.0.1" - ipfs-core "^0.2.0" - ipfs-core-utils "^0.5.1" - ipfs-http-client "^48.1.0" - ipfs-http-gateway "^0.1.1" - ipfs-http-server "^0.1.1" + ipfs-core "^0.2.1" + ipfs-core-utils "^0.5.2" + ipfs-http-client "^48.1.1" + ipfs-http-gateway "^0.1.2" + ipfs-http-server "^0.1.2" ipfs-repo "^7.0.0" - ipfs-utils "^4.0.0" + ipfs-utils "^5.0.0" ipld-dag-cbor "^0.17.0" ipld-dag-pb "^0.20.0" it-all "^1.0.4" @@ -8120,25 +8122,27 @@ ipfs-core-utils@^0.4.0: it-peekable "0.0.1" uint8arrays "^1.1.0" -ipfs-core-utils@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.5.1.tgz#2721717606727113ba6552488c289a9a13fad9b2" - integrity sha512-Roj59glxZMNcmWB0vwaVxyvhqSX0heTmY3LpoUKRyukB1eDWg4kUNpfxPbXMpdkCHiZkwyB4kIWJsbB9xHZo+Q== +ipfs-core-utils@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.5.2.tgz#001ccadd5e0f50476b3c743b69698d5e96f4558d" + integrity sha512-Cfz4hRa1HUBZGexwfYKjROiam8GQ6V+tA7kA17/bdCea0rxep4OZ64qUw+HwBTGNWEKg8SwKNEFs/V7LLPM6kg== dependencies: blob-to-it "^1.0.1" browser-readablestream-to-it "^1.0.1" cids "^1.0.0" err-code "^2.0.3" - ipfs-utils "^4.0.0" + 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" uint8arrays "^1.1.0" -ipfs-core@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/ipfs-core/-/ipfs-core-0.2.0.tgz#0a6ac8ea9fe024463fee3a9b77c68e70b81ede88" - integrity sha512-JEi6/5blvUDn5aWRmprFIWQMgZTQJDf2Nm4exKtMbJTciJ4z2zcCO128C/W2mha66t5wMnCNTiUL3K2mfaWq3w== +ipfs-core@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ipfs-core/-/ipfs-core-0.2.1.tgz#d13f0b037e7d07cc9fc4c4efee2bd44c807fc5a7" + integrity sha512-XMceB4MyDqn87dK0kZu4zSIHDTbpDZMC19M3NHYSTlTOPyKXW5hY9BxVH2esdW/Ny1+Kl38hxINKQg5FNeajNQ== dependencies: any-signal "^2.0.0" array-shuffle "^1.0.1" @@ -8157,12 +8161,12 @@ ipfs-core@^0.2.0: interface-datastore "^2.0.0" ipfs-bitswap "^4.0.0" ipfs-block-service "^0.18.0" - ipfs-core-utils "^0.5.1" + ipfs-core-utils "^0.5.2" ipfs-repo "^7.0.0" ipfs-unixfs "^2.0.3" ipfs-unixfs-exporter "^3.0.4" ipfs-unixfs-importer "^4.0.0" - ipfs-utils "^4.0.0" + ipfs-utils "^5.0.0" ipld "^0.28.0" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" @@ -8172,7 +8176,6 @@ ipfs-core@^0.2.0: is-domain-name "^1.0.1" is-ipfs "^2.0.0" it-all "^1.0.4" - it-concat "^1.0.1" it-first "^1.0.4" it-last "^1.0.4" it-pipe "^1.1.0" @@ -8205,9 +8208,6 @@ ipfs-core@^0.2.0: streaming-iterables "^5.0.2" timeout-abort-controller "^1.1.1" uint8arrays "^1.1.0" - optionalDependencies: - prom-client "^12.0.0" - prometheus-gc-stats "^0.6.0" ipfs-http-client@^47.0.1: version "47.0.1" @@ -8244,31 +8244,28 @@ ipfs-http-client@^47.0.1: stream-to-it "^0.2.1" uint8arrays "^1.1.0" -ipfs-http-client@^48.1.0: - version "48.1.0" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.0.tgz#09748f2f4dadb579a9cfbe4457077b10ee5441e8" - integrity sha512-sbF480doYitcJYmMvpIE0kmXpCLNxMfmuvefQdVWsqs2Q+nwjoI/1cAo1OS6byGOQdSFGoBO9ybKo0yIvksMpA== +ipfs-http-client@^48.1.1: + version "48.1.1" + resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.1.tgz#a8134ab186bc6ff88e91dd575bb3d0600acc506c" + integrity sha512-DZVm6EvB3zCxuvEwW5blDKigKtvAWWzPSIQEIUeWr04qzVThEe5eYK+Siu1qxrpthnBK1fYxS3okK2WI4kmluA== dependencies: any-signal "^2.0.0" bignumber.js "^9.0.0" cids "^1.0.0" debug "^4.1.1" form-data "^3.0.0" - ipfs-core-utils "^0.5.1" - ipfs-utils "^4.0.0" + ipfs-core-utils "^0.5.2" + ipfs-utils "^5.0.0" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" ipld-dag-pb "^0.20.0" ipld-raw "^6.0.0" - iso-url "^1.0.0" it-last "^1.0.4" it-map "^1.0.4" it-tar "^1.2.2" - it-to-buffer "^1.0.2" it-to-stream "^0.1.2" merge-options "^2.0.0" multiaddr "^8.0.0" - multiaddr-to-uri "^6.0.0" multibase "^3.0.0" multicodec "^2.0.1" multihashes "^3.0.1" @@ -8278,10 +8275,10 @@ ipfs-http-client@^48.1.0: stream-to-it "^0.2.2" uint8arrays "^1.1.0" -ipfs-http-gateway@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ipfs-http-gateway/-/ipfs-http-gateway-0.1.1.tgz#3787fbee253b81b11dee1fa443630862a52664dc" - integrity sha512-dMzs+IVL6USHKcS4N3c3PfzgDcRHiMiut7meDc/BXvFy/zS35vi3rCPxuRfwNlH6JhffT90CPl3dTDoXxwUk8w== +ipfs-http-gateway@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ipfs-http-gateway/-/ipfs-http-gateway-0.1.2.tgz#5c0eda7b16af0a160cf70cfb8ebc1d7e53366c55" + integrity sha512-9HP3VWacY8io8HGP8A+xjxHulfbUC4/37pYhX2VLa3R8CdCUm9O6caNhex9Y9WoBhi332OR9rcr/1rRpI9rNXg== dependencies: "@hapi/ammo" "^5.0.1" "@hapi/boom" "^9.1.0" @@ -8289,10 +8286,9 @@ ipfs-http-gateway@^0.1.1: cids "^1.0.0" debug "^4.1.1" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.1" + ipfs-core-utils "^0.5.2" ipfs-http-response "^0.6.0" is-ipfs "^2.0.0" - it-all "^1.0.4" it-last "^1.0.4" it-to-stream "^0.1.2" joi "^17.2.1" @@ -8316,10 +8312,10 @@ ipfs-http-response@^0.6.0: multihashes "^3.0.1" p-try-each "^1.0.1" -ipfs-http-server@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ipfs-http-server/-/ipfs-http-server-0.1.1.tgz#afaf3fbae759b8df0038af016dd9f32a7deefda8" - integrity sha512-Wmz6hkduiwOhi8l0ro4leTeaETdBnJcGjzcsTsZuERmvsZ3xQ4ysvoMm2eu4QGi0aKiLb+NCgOzOfCImZ5RcEQ== +ipfs-http-server@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ipfs-http-server/-/ipfs-http-server-0.1.2.tgz#d0435382b61ee63af7c226885f316c3abe80364b" + integrity sha512-QKAhfNWlX3BK8K/nthArHF2sRGOJAU5ySZO9T4khPqAFDQ3czLOYViRVkplBxzmVSk6Wz6sXB3P12wyyRhL1gg== dependencies: "@hapi/boom" "^9.1.0" "@hapi/content" "^5.0.2" @@ -8329,8 +8325,8 @@ ipfs-http-server@^0.1.1: dlv "^1.1.3" err-code "^2.0.3" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.1" - ipfs-http-gateway "^0.1.1" + ipfs-core-utils "^0.5.2" + ipfs-http-gateway "^0.1.2" ipfs-unixfs "^2.0.3" ipld-dag-pb "^0.20.0" it-all "^1.0.4" @@ -8534,14 +8530,36 @@ ipfs-utils@^4.0.0, ipfs-utils@^4.0.1: node-fetch "^2.6.0" stream-to-it "^0.2.0" +ipfs-utils@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-5.0.0.tgz#918bb439a8302a629131402e8cc60dab1ca9b62a" + integrity sha512-sD7UXxGvePXEPVO9hoyBFyq7Tww9mpShOQrxaF1GZtIvSxDpqUvly8XM/8m9XDoQYYXEUQ8eJIb2puKIJTd3tQ== + dependencies: + "@achingbrain/electron-fetch" "^1.7.2" + abort-controller "^3.0.0" + any-signal "^2.1.0" + buffer "^6.0.1" + err-code "^2.0.0" + 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 "^2.0.0" + nanoid "^3.1.3" + native-abort-controller "0.0.3" + native-fetch "^2.0.0" + node-fetch "^2.6.0" + stream-to-it "^0.2.0" + ipfs@~0.52.0: - version "0.52.0" - resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.0.tgz#a68b3386981e07cdd7162f4277909f53ffac5300" - integrity sha512-Wf1aXjZEtcE1bmrv9kxizuTQkh1xFwPAen/IQScp50mWsUPCUGpoejnQAV9qLaggibqVC8kPDXdNBC6cOJlIwQ== + version "0.52.1" + resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.1.tgz#b1cf465f3f0b9b75cc747a5788fdda72ce4480fb" + integrity sha512-L7QOSOIscgRS4qSpq8ewQo1FmCbyl6OM/EB+XsO0+UbN/bGamkTtW7K+noRs/1f++PZfqNTN2+c5dDxx2WfXzg== dependencies: debug "^4.1.1" - ipfs-cli "^0.2.0" - ipfs-core "^0.2.0" + ipfs-cli "^0.2.1" + ipfs-core "^0.2.1" ipfs-repo "^7.0.0" semver "^7.3.2" update-notifier "^5.0.0" @@ -9361,7 +9379,7 @@ it-tar@^1.2.2: it-reader "^2.0.0" p-defer "^3.0.0" -it-to-buffer@^1.0.0, it-to-buffer@^1.0.2: +it-to-buffer@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/it-to-buffer/-/it-to-buffer-1.0.4.tgz#4fcbd34c9c503e607744c0fdbeaff30008429703" integrity sha512-wycpGeAdQ8WH8eSBkMHN/HMNiQ0Y88XEXo6s6LGJbQZjf9K7ppVzUfCXn7OnxFfUPN0HTWZr+uhthwtrwMTTfw== @@ -10703,9 +10721,9 @@ libp2p-tcp@^0.15.0, libp2p-tcp@^0.15.1: stream-to-it "^0.2.2" libp2p-utils@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/libp2p-utils/-/libp2p-utils-0.2.1.tgz#56e22d58f99de20a80cac085a1a45232d42165f6" - integrity sha512-oaPUhYZrg3iW8+V7/PJsMHbLsFiOaNKM+D3WzNkne8mP7CCM4+0B4TIid5nEvrUT8Z432Nb64nFaqie/Wif5GA== + version "0.2.2" + resolved "https://registry.yarnpkg.com/libp2p-utils/-/libp2p-utils-0.2.2.tgz#4b2ad2f416f994b5bc2ce4e54d88511f4d3fbf7c" + integrity sha512-1V8M6iKcKqdUdLLcBbTTRl7whoa5KEHD7t5URiJ8gD2uvrkY5mp8nVo+DE3JxdNOxYRkA/02r02FYa7tbLeWCA== dependencies: abortable-iterator "^3.0.0" debug "^4.2.0" @@ -11135,10 +11153,10 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" -mdn-data@2.0.12: - version "2.0.12" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844" - integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q== +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== mdn-data@2.0.4: version "2.0.4" @@ -11696,7 +11714,7 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@^2.12.1, nan@^2.13.2, nan@^2.14.0: +nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.14.2: version "2.14.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== @@ -11907,9 +11925,9 @@ node-pre-gyp@^0.13.0: tar "^4" node-releases@^1.1.52, node-releases@^1.1.66: - version "1.1.66" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814" - integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg== + version "1.1.67" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12" + integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg== nodeify@^1.0.1: version "1.0.1" @@ -13950,9 +13968,9 @@ proper-lockfile@^4.0.0, proper-lockfile@^4.1.1: signal-exit "^3.0.2" protobufjs@^6.10.1: - version "6.10.1" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.1.tgz#e6a484dd8f04b29629e9053344e3970cccf13cd2" - integrity sha512-pb8kTchL+1Ceg4lFd5XUpK8PdWacbvV5SK2ULH2ebrYtl4GjJmS24m6CKME67jzV53tbJxHlnNOSqQHbTsR9JQ== + version "6.10.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.2.tgz#b9cb6bd8ec8f87514592ba3fdfd28e93f33a469b" + integrity sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -15697,9 +15715,11 @@ stable@^0.1.8: integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== stack-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" - integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.3.tgz#db7a475733b5b8bf6521907b18891d29006f7751" + integrity sha512-WldO+YmqhEpjp23eHZRhOT1NQF51STsbxZ+/AdpFD+EhheFxAe5d0WoK4DQVJkSHacPrJJX3OqRAl9CgHf78pg== + dependencies: + escape-string-regexp "^2.0.0" static-extend@^0.1.1: version "0.1.2" @@ -16703,12 +16723,12 @@ url@^0.11.0: querystring "0.2.0" ursa-optional@^0.10.1, ursa-optional@~0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/ursa-optional/-/ursa-optional-0.10.1.tgz#847b9e40a358c41f2264a04d52bba1e92f159adc" - integrity sha512-/pgpBXVJut57dHNrdGF+1/qXi+5B7JrlmZDWPSyoivEcbwFWRZJBJGkWb6ivknMBA3bnFA7lqsb6iHiFfp79QQ== + version "0.10.2" + resolved "https://registry.yarnpkg.com/ursa-optional/-/ursa-optional-0.10.2.tgz#bd74e7d60289c22ac2a69a3c8dea5eb2817f9681" + integrity sha512-TKdwuLboBn7M34RcvVTuQyhvrA8gYKapuVdm0nBP0mnBc7oECOfUQZrY91cefL3/nm64ZyrejSRrhTVdX7NG/A== dependencies: bindings "^1.5.0" - nan "^2.14.0" + nan "^2.14.2" use@^3.1.0: version "3.1.1" @@ -17709,7 +17729,7 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -y18n@^5.0.2: +y18n@^5.0.5: version "5.0.5" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== @@ -17825,16 +17845,16 @@ yargs@^15.0.2, yargs@^15.4.1: yargs-parser "^18.1.2" yargs@^16.0.3: - version "16.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.1.0.tgz#fc333fe4791660eace5a894b39d42f851cd48f2a" - integrity sha512-upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g== + version "16.1.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.1.1.tgz#5a4a095bd1ca806b0a50d0c03611d38034d219a1" + integrity sha512-hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w== dependencies: cliui "^7.0.2" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" string-width "^4.2.0" - y18n "^5.0.2" + y18n "^5.0.5" yargs-parser "^20.2.2" yeast@0.1.2: From e0dda66d45fd16524f5ef4e5a8fd78b8bb3a25bb Mon Sep 17 00:00:00 2001 From: Ezerous Date: Thu, 19 Nov 2020 15:48:22 +0200 Subject: [PATCH 04/37] Add events to drizzle, bump solc --- packages/concordia-app/src/options/drizzleOptions.js | 1 + packages/concordia-contracts/contracts/Forum.sol | 2 +- packages/concordia-contracts/contracts/Migrations.sol | 2 +- packages/concordia-contracts/contracts/Voting.sol | 2 +- packages/concordia-contracts/test/TestVoting.sol | 2 +- packages/concordia-contracts/truffle-config.js | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/concordia-app/src/options/drizzleOptions.js b/packages/concordia-app/src/options/drizzleOptions.js index aa563f7..0f9f761 100644 --- a/packages/concordia-app/src/options/drizzleOptions.js +++ b/packages/concordia-app/src/options/drizzleOptions.js @@ -9,6 +9,7 @@ const drizzleOptions = { contracts, events: { Forum: ['UserSignedUp', 'UsernameUpdated', 'TopicCreated', 'PostCreated'], + Voting: ['PollCreated', 'UserVoted'], }, reloadWindowOnNetworkChange: true, reloadWindowOnAccountChange: true, // We need it to reinitialize breeze and create new Orbit databases diff --git a/packages/concordia-contracts/contracts/Forum.sol b/packages/concordia-contracts/contracts/Forum.sol index ae6ec07..ab258ad 100644 --- a/packages/concordia-contracts/contracts/Forum.sol +++ b/packages/concordia-contracts/contracts/Forum.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.4; +pragma solidity 0.7.5; contract Forum { diff --git a/packages/concordia-contracts/contracts/Migrations.sol b/packages/concordia-contracts/contracts/Migrations.sol index 503020e..b370d17 100644 --- a/packages/concordia-contracts/contracts/Migrations.sol +++ b/packages/concordia-contracts/contracts/Migrations.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.4; +pragma solidity 0.7.5; contract Migrations { address public owner; diff --git a/packages/concordia-contracts/contracts/Voting.sol b/packages/concordia-contracts/contracts/Voting.sol index a11047e..8b17903 100644 --- a/packages/concordia-contracts/contracts/Voting.sol +++ b/packages/concordia-contracts/contracts/Voting.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.4; +pragma solidity 0.7.5; import "./Forum.sol"; diff --git a/packages/concordia-contracts/test/TestVoting.sol b/packages/concordia-contracts/test/TestVoting.sol index 074abd6..c62998f 100644 --- a/packages/concordia-contracts/test/TestVoting.sol +++ b/packages/concordia-contracts/test/TestVoting.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.4; +pragma solidity 0.7.5; import "truffle/Assert.sol"; import "truffle/DeployedAddresses.sol"; diff --git a/packages/concordia-contracts/truffle-config.js b/packages/concordia-contracts/truffle-config.js index 017d737..3a678d2 100644 --- a/packages/concordia-contracts/truffle-config.js +++ b/packages/concordia-contracts/truffle-config.js @@ -8,7 +8,7 @@ module.exports = { // to customize your Truffle configuration! compilers: { solc: { - version: '0.7.4', + version: '0.7.5', }, }, contracts_build_directory: path.join(__dirname, 'build/'), @@ -20,7 +20,7 @@ module.exports = { }, test: { host: GANACHE_HOST || '127.0.0.1', - port: GANACHE_PORT || '8545', + port: GANACHE_PORT || '8546', network_id: '*', }, }, From 072b6eb35f5617cae6f3a1abd2bf99495dcbe675 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Tue, 1 Dec 2020 15:24:46 +0200 Subject: [PATCH 05/37] PostVoting init --- .../src/options/drizzleOptions.js | 3 +- .../concordia-contracts/contracts/Forum.sol | 40 ++++-- .../contracts/PostVoting.sol | 115 ++++++++++++++++++ .../concordia-contracts/contracts/Voting.sol | 38 +++--- .../migrations/2_deploy_contracts.js | 6 +- 5 files changed, 168 insertions(+), 34 deletions(-) create mode 100644 packages/concordia-contracts/contracts/PostVoting.sol diff --git a/packages/concordia-app/src/options/drizzleOptions.js b/packages/concordia-app/src/options/drizzleOptions.js index 0f9f761..08ca927 100644 --- a/packages/concordia-app/src/options/drizzleOptions.js +++ b/packages/concordia-app/src/options/drizzleOptions.js @@ -9,7 +9,8 @@ const drizzleOptions = { contracts, events: { Forum: ['UserSignedUp', 'UsernameUpdated', 'TopicCreated', 'PostCreated'], - Voting: ['PollCreated', 'UserVoted'], + Voting: ['PollCreated', 'UserVotedPoll'], + PostVoting: ['UserVotedPost'], }, reloadWindowOnNetworkChange: true, reloadWindowOnAccountChange: true, // We need it to reinitialize breeze and create new Orbit databases diff --git a/packages/concordia-contracts/contracts/Forum.sol b/packages/concordia-contracts/contracts/Forum.sol index ab258ad..bd94ce7 100644 --- a/packages/concordia-contracts/contracts/Forum.sol +++ b/packages/concordia-contracts/contracts/Forum.sol @@ -117,7 +117,7 @@ contract Forum { function createPost(uint topicID) public returns (uint) { require(hasUserSignedUp(msg.sender)); // Only registered users can create posts - require(topicID 0, UP -> 1, DOWN -> 2 + + Option constant defaultOption = Option.NONE; + + function getDefaultChoice() public pure returns (uint) { + return uint(defaultOption); + } + + struct PostBallot { + mapping (address => Option) votes; + mapping (Option => address[]) voters; + } + + mapping (uint => PostBallot) postBallots; + + event UserVotedPost(address userAddress, uint postID, Option option); + + function getVote(uint postID, address voter) public view returns (Option) { + require(forum.postExists(postID)); + return postBallots[postID].votes[voter]; + } + + // Gets vote count for a specific option (Option.UP/ Option.DOWN) + function getVoteCount(uint postID, Option option) private view returns (uint) { + require(forum.postExists(postID)); + return (postBallots[postID].voters[option].length); + } + + function getUpvoteCount(uint postID) public view returns (uint) { + return (getVoteCount(postID, Option.UP)); + } + + function getDownvoteCount(uint postID) public view returns (uint) { + return (getVoteCount(postID, Option.DOWN)); + } + + // Gets voters for a specific option (Option.UP/ Option.DOWN) + function getVoters(uint postID, Option option) private view returns (address[] memory) { + require(forum.postExists(postID)); + return (postBallots[postID].voters[option]); + } + + function getUpvoters(uint postID) public view returns (address[] memory) { + return (getVoters(postID, Option.UP)); + } + + function getDownvoters(uint postID) public view returns (address[] memory) { + return (getVoters(postID, Option.DOWN)); + } + + function getVoterIndex(uint postID, address voter) private view returns (uint) { + require(forum.hasUserSignedUp(voter)); + require(forum.postExists(postID)); + + PostBallot storage postBallot = postBallots[postID]; + Option votedOption = getVote(postID, voter); + address[] storage optionVoters = postBallot.voters[votedOption]; + + for (uint voterIndex = 0; voterIndex < optionVoters.length; voterIndex++) + if (optionVoters[voterIndex] == voter) + return voterIndex; + + revert("Couldn't find voter's index!"); + } + + function vote(uint postID, Option option) private { + require(forum.hasUserSignedUp(msg.sender)); + require(forum.postExists(postID)); // Only allow voting if post exists + + PostBallot storage postBallot = postBallots[postID]; + address voter = msg.sender; + Option prevOption = postBallot.votes[voter]; + + if(prevOption == option) + return; + + // Remove previous vote if exists + if(prevOption != Option.NONE){ + uint voterIndex = getVoterIndex(postID, voter); + // Swap with last voter address and delete vote + postBallot.voters[prevOption][voterIndex] = postBallot.voters[prevOption][postBallot.voters[prevOption].length - 1]; + postBallot.voters[prevOption].pop(); + } + + // Add new vote + if(option != Option.NONE) + postBallot.voters[option].push(voter); + postBallot.votes[voter] = option; + emit UserVotedPost(voter, postID, option); + } + + function upvote(uint postID) public{ + vote(postID, Option.UP); + } + + function downvote(uint postID) public{ + vote(postID, Option.DOWN); + } + + function unvote(uint postID) public{ + vote(postID, Option.NONE); + } +} diff --git a/packages/concordia-contracts/contracts/Voting.sol b/packages/concordia-contracts/contracts/Voting.sol index 8b17903..cc5c655 100644 --- a/packages/concordia-contracts/contracts/Voting.sol +++ b/packages/concordia-contracts/contracts/Voting.sol @@ -23,10 +23,10 @@ contract Voting { mapping (uint => Poll) polls; event PollCreated(uint topicID); - event UserVoted(address userAddress); + event UserVotedPoll(address userAddress, uint topicID, uint vote); - // Verify that poll exists - function isPollExistent(uint topicID) public view returns (bool) { + // Verifies that a poll exists + function pollExists(uint topicID) public view returns (bool) { if (polls[topicID].timestamp != 0) return true; return false; @@ -34,9 +34,9 @@ contract Voting { function createPoll(uint topicID, uint numOptions, string memory dataHash, bool enableVoteChanges) public returns (uint) { require(forum.hasUserSignedUp(msg.sender)); // Only registered users can create polls - require(topicID deployer.deploy(Voting, forum.address)); + deployer.deploy(Forum).then((forum) => { + deployer.deploy(Voting, forum.address); + deployer.deploy(PostVoting, forum.address); + }); }; From ccd0c3ffd2885350548d880fc1c8861655eba127 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 2 Dec 2020 13:54:59 +0200 Subject: [PATCH 06/37] Fix deploy --- .../concordia-contracts/migrations/2_deploy_contracts.js | 6 +++--- packages/concordia-contracts/package.json | 2 +- packages/concordia-contracts/test/TestVoting.sol | 4 ++-- yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/concordia-contracts/migrations/2_deploy_contracts.js b/packages/concordia-contracts/migrations/2_deploy_contracts.js index df11216..7d1f449 100644 --- a/packages/concordia-contracts/migrations/2_deploy_contracts.js +++ b/packages/concordia-contracts/migrations/2_deploy_contracts.js @@ -4,8 +4,8 @@ const PostVoting = artifacts.require('PostVoting'); // eslint-disable-next-line func-names module.exports = function (deployer) { - deployer.deploy(Forum).then((forum) => { - deployer.deploy(Voting, forum.address); - deployer.deploy(PostVoting, forum.address); + deployer.deploy(Forum).then(async (forum) => { + await deployer.deploy(Voting, forum.address); + await deployer.deploy(PostVoting, forum.address); }); }; diff --git a/packages/concordia-contracts/package.json b/packages/concordia-contracts/package.json index aba8e5d..60bd035 100644 --- a/packages/concordia-contracts/package.json +++ b/packages/concordia-contracts/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@openzeppelin/contracts": "~3.2.0", - "truffle": "~5.1.45" + "truffle": "~5.1.55" }, "devDependencies": { "eslint": "^6.8.0", diff --git a/packages/concordia-contracts/test/TestVoting.sol b/packages/concordia-contracts/test/TestVoting.sol index c62998f..6925740 100644 --- a/packages/concordia-contracts/test/TestVoting.sol +++ b/packages/concordia-contracts/test/TestVoting.sol @@ -17,10 +17,10 @@ contract TestVoting { (firstTopicId,) = forum.createTopic(); } - function testIsPollExistent() public { + function testIfPollExists() public { Voting voting = Voting(DeployedAddresses.Voting()); - bool actual = voting.isPollExistent(firstTopicId); + bool actual = voting.pollExists(firstTopicId); Assert.equal(actual, false, "Poll should not exist"); } diff --git a/yarn.lock b/yarn.lock index c356e49..b320cea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16347,10 +16347,10 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -truffle@~5.1.45: - version "5.1.53" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.53.tgz#3c984317d092f230d84b7d138d69dace106b5c2b" - integrity sha512-JXuuhPOsh/K9K9PJTcZDRy6ByxreOrchMIM1SgEVRi85MF6XWQSZwwV1kXF+JRtP938lfRmmpgWQb1MzFBY7qw== +truffle@~5.1.55: + version "5.1.55" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.55.tgz#ec5e245213e4f0f42ef836308b50a8d79355a649" + integrity sha512-chZM43DOo7aCn+z1Pcj5f4ts9YqnHhKI31CZ+B6N93nbWKnIrBN/hBZeEXSi9s9FZ3nsmp+Iplr5Z4dnHAqDxA== dependencies: app-module-path "^2.2.0" mocha "8.1.2" From 9d32202d29dc9c023084916d9b3d1b10e87ba37e Mon Sep 17 00:00:00 2001 From: Ezerous Date: Sun, 6 Dec 2020 18:06:57 +0200 Subject: [PATCH 07/37] Refactoring, solhint --- packages/concordia-contracts/.solhint.json | 8 ++- .../concordia-contracts/contracts/Forum.sol | 67 +++++++++---------- .../contracts/Migrations.sol | 10 +-- .../contracts/PostVoting.sol | 36 +++++----- .../concordia-contracts/contracts/Voting.sol | 59 ++++++++-------- .../migrations/2_deploy_contracts.js | 9 +-- .../concordia-contracts/test/TestVoting.sol | 10 +-- 7 files changed, 99 insertions(+), 100 deletions(-) diff --git a/packages/concordia-contracts/.solhint.json b/packages/concordia-contracts/.solhint.json index d7c3de9..4f56664 100644 --- a/packages/concordia-contracts/.solhint.json +++ b/packages/concordia-contracts/.solhint.json @@ -1,3 +1,9 @@ { - "extends": "solhint:default" + "extends": "solhint:recommended", + "rules": { + "compiler-version": ["error","^0.7.5"], + "func-visibility": ["warn",{"ignoreConstructors" : true}], + "not-rely-on-time": "off", + "state-visibility": "off" + } } diff --git a/packages/concordia-contracts/contracts/Forum.sol b/packages/concordia-contracts/contracts/Forum.sol index bd94ce7..d1a0b5a 100644 --- a/packages/concordia-contracts/contracts/Forum.sol +++ b/packages/concordia-contracts/contracts/Forum.sol @@ -2,6 +2,11 @@ pragma solidity 0.7.5; contract Forum { + // Error messages for require() + string public constant USER_HAS_NOT_SIGNED_UP = "User hasn't signed up yet."; + string public constant USERNAME_TAKEN = "Username is already taken."; + string public constant TOPIC_DOES_NOT_EXIST = "Topic doesn't exist."; + string public constant POST_DOES_NOT_EXIST = "Post doesn't exist."; //----------------------------------------USER---------------------------------------- struct User { @@ -12,25 +17,24 @@ contract Forum { bool signedUp; // Helper variable for hasUserSignedUp() } - mapping (address => User) users; - mapping (string => address) userAddresses; + mapping(address => User) users; + mapping(string => address) userAddresses; event UserSignedUp(string username, address userAddress); event UsernameUpdated(string newName, string oldName,address userAddress); function signUp(string memory username) public returns (bool) { - require (!hasUserSignedUp(msg.sender), "User has already signed up."); - require(!isUserNameTaken(username), "Username is already taken."); - users[msg.sender] = User(username, - new uint[](0), new uint[](0), block.timestamp, true); + require (!hasUserSignedUp(msg.sender), USER_HAS_NOT_SIGNED_UP); + require(!isUserNameTaken(username), USERNAME_TAKEN); + users[msg.sender] = User(username, new uint[](0), new uint[](0), block.timestamp, true); userAddresses[username] = msg.sender; emit UserSignedUp(username, msg.sender); return true; } function updateUsername(string memory newUsername) public returns (bool) { - require (hasUserSignedUp(msg.sender), "User hasn't signed up yet."); - require(!isUserNameTaken(newUsername), "Username is already taken."); + require (hasUserSignedUp(msg.sender), USER_HAS_NOT_SIGNED_UP); + require(!isUserNameTaken(newUsername), USERNAME_TAKEN); string memory oldUsername = getUsername(msg.sender); delete userAddresses[users[msg.sender].username]; users[msg.sender].username = newUsername; @@ -40,7 +44,7 @@ contract Forum { } function getUsername(address userAddress) public view returns (string memory) { - require (hasUserSignedUp(userAddress), "User hasn't signed up yet."); + require (hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); return users[userAddress].username; } @@ -53,27 +57,26 @@ contract Forum { } function isUserNameTaken(string memory username) public view returns (bool) { - if (getUserAddress(username)!=address(0)) + if (getUserAddress(username) != address(0)) return true; return false; } function getUserTopics(address userAddress) public view returns (uint[] memory) { - require (hasUserSignedUp(userAddress), "User hasn't signed up yet."); + require (hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); return users[userAddress].topicIDs; } function getUserPosts(address userAddress) public view returns (uint[] memory) { - require (hasUserSignedUp(userAddress), "User hasn't signed up yet."); + require (hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); return users[userAddress].postIDs; } function getUserDateOfRegister(address userAddress) public view returns (uint) { - require (hasUserSignedUp(userAddress), "User hasn't signed up yet."); + require (hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); return users[userAddress].timestamp; } - //----------------------------------------POSTING---------------------------------------- struct Topic { uint topicID; @@ -89,17 +92,17 @@ contract Forum { uint topicID; } - uint numTopics; // Total number of topics - uint numPosts; // Total number of posts + uint public numTopics; // Total number of topics + uint public numPosts; // Total number of posts - mapping (uint => Topic) topics; - mapping (uint => Post) posts; + mapping(uint => Topic) topics; + mapping(uint => Post) posts; event TopicCreated(uint topicID, uint postID); event PostCreated(uint postID, uint topicID); function createTopic() public returns (uint, uint) { - require(hasUserSignedUp(msg.sender)); // Only registered users can create topics + require(hasUserSignedUp(msg.sender), USER_HAS_NOT_SIGNED_UP); //Creates topic uint topicID = numTopics++; topics[topicID] = Topic(topicID, msg.sender, block.timestamp, new uint[](0)); @@ -116,8 +119,8 @@ contract Forum { } function createPost(uint topicID) public returns (uint) { - require(hasUserSignedUp(msg.sender)); // Only registered users can create posts - require(topicExists(topicID)); // Only allow posting to a topic that exists + require(hasUserSignedUp(msg.sender), USER_HAS_NOT_SIGNED_UP); + require(topicExists(topicID), TOPIC_DOES_NOT_EXIST); uint postID = numPosts++; posts[postID] = Post(postID, msg.sender, block.timestamp, topicID); topics[topicID].postIDs.push(postID); @@ -126,26 +129,16 @@ contract Forum { return postID; } - // Verify that topic exists function topicExists(uint topicID) public view returns (bool) { - return topicID 0, UP -> 1, DOWN -> 2 - - Option constant defaultOption = Option.NONE; - - function getDefaultChoice() public pure returns (uint) { - return uint(defaultOption); - } + enum Option { DEFAULT, UP, DOWN } // DEFAULT -> 0, UP -> 1, DOWN -> 2 struct PostBallot { - mapping (address => Option) votes; - mapping (Option => address[]) voters; + mapping(address => Option) votes; + mapping(Option => address[]) voters; } - mapping (uint => PostBallot) postBallots; + mapping(uint => PostBallot) postBallots; event UserVotedPost(address userAddress, uint postID, Option option); function getVote(uint postID, address voter) public view returns (Option) { - require(forum.postExists(postID)); + require(forum.postExists(postID), forum.POST_DOES_NOT_EXIST()); return postBallots[postID].votes[voter]; } - // Gets vote count for a specific option (Option.UP/ Option.DOWN) + // Gets vote count for a specific option (Option.UP/ Option.DOWN only!) function getVoteCount(uint postID, Option option) private view returns (uint) { - require(forum.postExists(postID)); + require(forum.postExists(postID), forum.POST_DOES_NOT_EXIST()); return (postBallots[postID].voters[option].length); } @@ -48,7 +42,7 @@ contract PostVoting { // Gets voters for a specific option (Option.UP/ Option.DOWN) function getVoters(uint postID, Option option) private view returns (address[] memory) { - require(forum.postExists(postID)); + require(forum.postExists(postID), forum.POST_DOES_NOT_EXIST()); return (postBallots[postID].voters[option]); } @@ -61,8 +55,8 @@ contract PostVoting { } function getVoterIndex(uint postID, address voter) private view returns (uint) { - require(forum.hasUserSignedUp(voter)); - require(forum.postExists(postID)); + require(forum.hasUserSignedUp(voter), forum.USER_HAS_NOT_SIGNED_UP()); + require(forum.postExists(postID), forum.POST_DOES_NOT_EXIST()); PostBallot storage postBallot = postBallots[postID]; Option votedOption = getVote(postID, voter); @@ -76,8 +70,8 @@ contract PostVoting { } function vote(uint postID, Option option) private { - require(forum.hasUserSignedUp(msg.sender)); - require(forum.postExists(postID)); // Only allow voting if post exists + require(forum.hasUserSignedUp(msg.sender), forum.USER_HAS_NOT_SIGNED_UP()); + require(forum.postExists(postID), forum.POST_DOES_NOT_EXIST()); PostBallot storage postBallot = postBallots[postID]; address voter = msg.sender; @@ -87,7 +81,7 @@ contract PostVoting { return; // Remove previous vote if exists - if(prevOption != Option.NONE){ + if(prevOption != Option.DEFAULT){ uint voterIndex = getVoterIndex(postID, voter); // Swap with last voter address and delete vote postBallot.voters[prevOption][voterIndex] = postBallot.voters[prevOption][postBallot.voters[prevOption].length - 1]; @@ -95,7 +89,7 @@ contract PostVoting { } // Add new vote - if(option != Option.NONE) + if(option != Option.DEFAULT) postBallot.voters[option].push(voter); postBallot.votes[voter] = option; emit UserVotedPost(voter, postID, option); @@ -110,6 +104,6 @@ contract PostVoting { } function unvote(uint postID) public{ - vote(postID, Option.NONE); + vote(postID, Option.DEFAULT); } } diff --git a/packages/concordia-contracts/contracts/Voting.sol b/packages/concordia-contracts/contracts/Voting.sol index cc5c655..c264ffa 100644 --- a/packages/concordia-contracts/contracts/Voting.sol +++ b/packages/concordia-contracts/contracts/Voting.sol @@ -4,6 +4,13 @@ pragma solidity 0.7.5; import "./Forum.sol"; contract Voting { + // Error messages for require() + string constant TOPIC_POLL_DIFFERENT_CREATOR = "Only topic's author can create a poll."; + string constant POLL_EXISTS = "Poll already exists."; + string constant POLL_DOES_NOT_EXIST = "Poll does not exist."; + string constant INVALID_OPTION = "Invalid option."; + string constant USER_HAS_NOT_VOTED = "User hasn't voted."; + Forum public forum; constructor(Forum addr) { @@ -14,18 +21,17 @@ contract Voting { uint topicID; uint numOptions; string dataHash; - mapping (address => uint) votes; - mapping (uint => address[]) voters; + mapping(address => uint) votes; + mapping(uint => address[]) voters; bool enableVoteChanges; uint timestamp; } - mapping (uint => Poll) polls; + mapping(uint => Poll) polls; event PollCreated(uint topicID); event UserVotedPoll(address userAddress, uint topicID, uint vote); - // Verifies that a poll exists function pollExists(uint topicID) public view returns (bool) { if (polls[topicID].timestamp != 0) return true; @@ -33,10 +39,10 @@ contract Voting { } function createPoll(uint topicID, uint numOptions, string memory dataHash, bool enableVoteChanges) public returns (uint) { - require(forum.hasUserSignedUp(msg.sender)); // Only registered users can create polls - require(forum.topicExists(topicID)); // Only allow poll creation if topic exists - require (forum.getTopicAuthor(topicID) == msg.sender); // Only allow poll creation from the author of the topic - require(!pollExists(topicID)); // Only allow poll creation if it doesn't already exist + require(forum.hasUserSignedUp(msg.sender), forum.USER_HAS_NOT_SIGNED_UP()); + require(forum.topicExists(topicID), forum.TOPIC_DOES_NOT_EXIST()); + require (forum.getTopicAuthor(topicID) == msg.sender, TOPIC_POLL_DIFFERENT_CREATOR); + require(!pollExists(topicID), POLL_EXISTS); Poll storage poll = polls[topicID]; poll.topicID = topicID; @@ -50,46 +56,45 @@ contract Voting { } function getPollInfo(uint topicID) public view returns (uint, string memory, uint, uint) { - require(pollExists(topicID)); + require(pollExists(topicID), POLL_DOES_NOT_EXIST); uint totalVotes = getTotalVotes(topicID); return ( - polls[topicID].numOptions, - polls[topicID].dataHash, - polls[topicID].timestamp, - totalVotes + polls[topicID].numOptions, + polls[topicID].dataHash, + polls[topicID].timestamp, + totalVotes ); } function isOptionValid(uint topicID, uint option) public view returns (bool) { - require(pollExists(topicID)); + require(pollExists(topicID), POLL_DOES_NOT_EXIST); if (option <= polls[topicID].numOptions) // Option 0 is valid as well (no option chosen) return true; return false; } function hasVoted(uint topicID, address voter) public view returns (bool) { - require(pollExists(topicID)); + require(pollExists(topicID), POLL_DOES_NOT_EXIST); if (polls[topicID].votes[voter] != 0) return true; return false; } function getVote(uint topicID, address voter) public view returns (uint) { - require(hasVoted(topicID, voter)); + require(hasVoted(topicID, voter), USER_HAS_NOT_VOTED); return polls[topicID].votes[voter]; } - // Gets vote count for a specific option function getVoteCount(uint topicID, uint option) public view returns (uint) { - require(pollExists(topicID)); - require(isOptionValid(topicID, option)); + require(pollExists(topicID), POLL_DOES_NOT_EXIST); + require(isOptionValid(topicID, option), INVALID_OPTION); return (polls[topicID].voters[option].length); } function getTotalVotes(uint topicID) public view returns (uint) { - require(pollExists(topicID)); + require(pollExists(topicID), POLL_DOES_NOT_EXIST); Poll storage poll = polls[topicID]; uint totalVotes = 0; @@ -102,13 +107,13 @@ contract Voting { // Gets voters for a specific option function getVoters(uint topicID, uint option) public view returns (address[] memory) { - require(pollExists(topicID)); + require(pollExists(topicID), POLL_DOES_NOT_EXIST); return (polls[topicID].voters[option]); } function getVoterIndex(uint topicID, address voter) public view returns (uint) { - require(pollExists(topicID)); - require(hasVoted(topicID, voter)); + require(pollExists(topicID), POLL_DOES_NOT_EXIST); + require(hasVoted(topicID, voter), USER_HAS_NOT_VOTED); Poll storage poll = polls[topicID]; uint votedOption = getVote(topicID, voter); address[] storage optionVoters = poll.voters[votedOption]; @@ -121,16 +126,16 @@ contract Voting { } function vote(uint topicID, uint option) public { - require(forum.hasUserSignedUp(msg.sender)); - require(pollExists(topicID)); - require(isOptionValid(topicID, option)); + require(forum.hasUserSignedUp(msg.sender), forum.USER_HAS_NOT_SIGNED_UP()); + require(pollExists(topicID), POLL_DOES_NOT_EXIST); + require(isOptionValid(topicID, option), INVALID_OPTION); Poll storage poll = polls[topicID]; address voter = msg.sender; uint prevOption = poll.votes[voter]; if(prevOption == option) return; - // Voter hadn't voted before + // Voter hasn't voted before if(prevOption == 0){ poll.voters[option].push(voter); poll.votes[voter] = option; diff --git a/packages/concordia-contracts/migrations/2_deploy_contracts.js b/packages/concordia-contracts/migrations/2_deploy_contracts.js index 7d1f449..15daf19 100644 --- a/packages/concordia-contracts/migrations/2_deploy_contracts.js +++ b/packages/concordia-contracts/migrations/2_deploy_contracts.js @@ -4,8 +4,9 @@ const PostVoting = artifacts.require('PostVoting'); // eslint-disable-next-line func-names module.exports = function (deployer) { - deployer.deploy(Forum).then(async (forum) => { - await deployer.deploy(Voting, forum.address); - await deployer.deploy(PostVoting, forum.address); - }); + return deployer.deploy(Forum) + .then(async (forum) => Promise.all([ + deployer.deploy(Voting, forum.address), + deployer.deploy(PostVoting, forum.address), + ])); }; diff --git a/packages/concordia-contracts/test/TestVoting.sol b/packages/concordia-contracts/test/TestVoting.sol index 6925740..3c801a0 100644 --- a/packages/concordia-contracts/test/TestVoting.sol +++ b/packages/concordia-contracts/test/TestVoting.sol @@ -13,7 +13,7 @@ contract TestVoting { function beforeAll() public { forum = Forum(DeployedAddresses.Forum()); - forum.signUp('testAccount'); + forum.signUp("testAccount"); (firstTopicId,) = forum.createTopic(); } @@ -28,7 +28,7 @@ contract TestVoting { function testCreatePoll() public { Voting voting = Voting(DeployedAddresses.Voting()); - uint actual = voting.createPoll(firstTopicId, 3, 'asdf', false); + uint actual = voting.createPoll(firstTopicId, 3, "asdf", false); Assert.equal(actual, firstTopicId, "Topic Id should be 1"); } @@ -47,7 +47,7 @@ contract TestVoting { (uint actualNumberOfOptions, string memory actualDataHash, , uint actualNumberOfVotes) = voting.getPollInfo(firstTopicId); Assert.equal(actualNumberOfOptions, 3, "Number of votes should be 0"); - Assert.equal(actualDataHash, 'asdf', "Number of votes should be 0"); + Assert.equal(actualDataHash, "asdf", "Number of votes should be 0"); Assert.equal(actualNumberOfVotes, 0, "Number of votes should be 0"); } @@ -76,7 +76,7 @@ contract TestVoting { Voting voting = Voting(DeployedAddresses.Voting()); (uint topicId,) = forum.createTopic(); - voting.createPoll(topicId, 3, 'asdf', false); + voting.createPoll(topicId, 3, "asdf", false); voting.vote(topicId, 1); uint actualVotesOption0 = voting.getVoteCount(topicId, 1); @@ -95,7 +95,7 @@ contract TestVoting { Voting voting = Voting(DeployedAddresses.Voting()); (uint topicId,) = forum.createTopic(); - voting.createPoll(topicId, 3, 'asdf', true); + voting.createPoll(topicId, 3, "asdf", true); voting.vote(topicId, 1); uint actualVotesOption0 = voting.getVoteCount(topicId, 1); From 73985c27d4420c7c2668c72933191df9d97b7fec Mon Sep 17 00:00:00 2001 From: Apostolof Date: Fri, 11 Dec 2020 22:12:13 +0200 Subject: [PATCH 08/37] feat: add about menu item --- .../concordia-app/public/locales/en/translation.json | 1 + packages/concordia-app/src/Routes.jsx | 5 +++++ .../src/layouts/MainLayout/MainLayoutMenu/index.jsx | 8 ++++++++ packages/concordia-app/src/views/About/index.jsx | 12 ++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 packages/concordia-app/src/views/About/index.jsx diff --git a/packages/concordia-app/public/locales/en/translation.json b/packages/concordia-app/public/locales/en/translation.json index 74f1e18..33a1c4d 100644 --- a/packages/concordia-app/public/locales/en/translation.json +++ b/packages/concordia-app/public/locales/en/translation.json @@ -62,6 +62,7 @@ "register.form.sign.up.step.error.message.header": "Form contains errors", "register.form.sign.up.step.title": "Sign Up", "register.p.account.address": "Account address:", + "topbar.button.about": "About", "topbar.button.clear.databases": "Clear databases", "topbar.button.create.topic": "Create topic", "topbar.button.profile": "Profile", diff --git a/packages/concordia-app/src/Routes.jsx b/packages/concordia-app/src/Routes.jsx index 15a11b2..8a46785 100644 --- a/packages/concordia-app/src/Routes.jsx +++ b/packages/concordia-app/src/Routes.jsx @@ -39,6 +39,11 @@ const routesConfig = [ path: '/home', component: lazy(() => import('./views/Home')), }, + { + exact: true, + path: '/about', + component: lazy(() => import('./views/About')), + }, { exact: true, path: '/topics/:id(\\bnew\\b|\\d+)', diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx index d45b962..dac4043 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx @@ -83,6 +83,14 @@ const MainLayoutMenu = () => { > {t('topbar.button.clear.databases')} + { history.push('/about'); }} + > + {t('topbar.button.about')} + diff --git a/packages/concordia-app/src/views/About/index.jsx b/packages/concordia-app/src/views/About/index.jsx new file mode 100644 index 0000000..ec432c5 --- /dev/null +++ b/packages/concordia-app/src/views/About/index.jsx @@ -0,0 +1,12 @@ +import React, { + memo, useMemo, +} from 'react'; +import { Container } from 'semantic-ui-react'; + +const About = () => useMemo(() => ( + + TODO + +), []); + +export default memo(About); From 08854eb7378e688d5d6bff620f19ca38be7daf82 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Fri, 11 Dec 2020 23:29:12 +0200 Subject: [PATCH 09/37] refactor: implement about component --- packages/concordia-app/package.json | 3 +- packages/concordia-app/src/assets/About.md | 27 +++++++++++++ .../MainLayout/MainLayoutMenu/index.jsx | 2 - .../concordia-app/src/views/About/index.jsx | 38 ++++++++++++++++--- 4 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 packages/concordia-app/src/assets/About.md diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index 6645ee2..bbbcf92 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -38,13 +38,14 @@ "react": "~16.13.1", "react-dom": "~16.13.1", "react-i18next": "^11.7.3", + "react-markdown": "^5.0.3", "react-particles-js": "^3.4.0", "react-redux": "~7.2.1", "react-router": "^5.2.0", "react-router-dom": "^5.2.0", "react-scripts": "~3.4.3", - "redux-saga": "~1.1.3", "react-timeago": "~5.2.0", + "redux-saga": "~1.1.3", "semantic-ui-css": "~2.4.1", "semantic-ui-react": "~1.2.1", "web3": "1.3.0" diff --git a/packages/concordia-app/src/assets/About.md b/packages/concordia-app/src/assets/About.md new file mode 100644 index 0000000..40049cb --- /dev/null +++ b/packages/concordia-app/src/assets/About.md @@ -0,0 +1,27 @@ +# About Concordia + +## What + +Concordia is a forum platform (remember forums? 🤩) that focuses on user privacy and direct democratic voting. It is a +FOSS distributed via its Gitlab [repository][concordia-repository] and Docker [repository][concordia-docker-hub] under +the [MIT][concordia-license] license. + +## Why + +Values of privacy and freedom are diminishing in modern software. Even more so in social media software. Users are now +called to decide between being the product of companies that sell their personal information for gain and being shut out +of the modern, digital society. + +Concordia, much like other projects of this kind, provides an alternative to this predicament. + +## How + +TODO + +## Who + +TODO + +[concordia-repository]: https://gitlab.com/ecentrics/apella +[concordia-docker-hub]: https://hub.docker.com/repository/docker/ecentrics/apella-app +[concordia-license]: https://gitlab.com/ecentrics/apella/-/blob/master/LICENSE.md diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx index dac4043..328bf54 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx @@ -76,7 +76,6 @@ const MainLayoutMenu = () => { { {t('topbar.button.clear.databases')} { history.push('/about'); }} diff --git a/packages/concordia-app/src/views/About/index.jsx b/packages/concordia-app/src/views/About/index.jsx index ec432c5..fcd02ba 100644 --- a/packages/concordia-app/src/views/About/index.jsx +++ b/packages/concordia-app/src/views/About/index.jsx @@ -1,12 +1,38 @@ import React, { - memo, useMemo, + memo, useEffect, useState, } from 'react'; +import ReactMarkdown from 'react-markdown'; import { Container } from 'semantic-ui-react'; +import AboutMd from '../../assets/About.md'; -const About = () => useMemo(() => ( - - TODO - -), []); +const targetBlank = () => ({ href, children }) => ( + + {children} + +); + +const About = () => { + const [aboutMd, setAboutMd] = useState(''); + + useEffect(() => { + fetch(AboutMd) + .then((response) => response.text()) + .then((text) => { + setAboutMd(text); + }); + }, []); + + return ( + + + + ); +}; export default memo(About); From 1b795c269ee77311cb0cf9ace3257ef2c882365e Mon Sep 17 00:00:00 2001 From: Apostolof Date: Fri, 11 Dec 2020 23:29:26 +0200 Subject: [PATCH 10/37] chore: update yarn.lock --- yarn.lock | 864 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 508 insertions(+), 356 deletions(-) diff --git a/yarn.lock b/yarn.lock index 92bb359..6418314 100644 --- a/yarn.lock +++ b/yarn.lock @@ -56,42 +56,41 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.4.5": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" - integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" + integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" + "@babel/generator" "^7.12.10" "@babel/helper-module-transforms" "^7.12.1" "@babel/helpers" "^7.12.5" - "@babel/parser" "^7.12.7" + "@babel/parser" "^7.12.10" "@babel/template" "^7.12.7" - "@babel/traverse" "^7.12.9" - "@babel/types" "^7.12.7" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.10" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" json5 "^2.1.2" lodash "^4.17.19" - resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" - integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A== +"@babel/generator@^7.12.10", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460" + integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww== dependencies: - "@babel/types" "^7.12.5" + "@babel/types" "^7.12.10" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3" - integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA== +"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" + integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.10" "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": version "7.10.4" @@ -101,14 +100,14 @@ "@babel/helper-explode-assignable-expression" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-builder-react-jsx-experimental@^7.12.4": - version "7.12.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48" - integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og== +"@babel/helper-builder-react-jsx-experimental@^7.12.10", "@babel/helper-builder-react-jsx-experimental@^7.12.4": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.10.tgz#a58cb96a793dc0fcd5c9ed3bb36d62fdc60534c2" + integrity sha512-3Kcr2LGpL7CTRDTTYm1bzeor9qZbxbvU2AxsLA6mUG9gYarSfIKMK0UlU+azLWI+s0+BH768bwyaziWB2NOJlQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-module-imports" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/helper-annotate-as-pure" "^7.12.10" + "@babel/helper-module-imports" "^7.12.5" + "@babel/types" "^7.12.10" "@babel/helper-builder-react-jsx@^7.10.4": version "7.10.4" @@ -173,11 +172,11 @@ "@babel/types" "^7.10.4" "@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" - integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" + integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.10" "@babel/helper-hoist-variables@^7.10.4": version "7.10.4" @@ -216,11 +215,11 @@ lodash "^4.17.19" "@babel/helper-optimise-call-expression@^7.10.4": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c" - integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" + integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== dependencies: - "@babel/types" "^7.12.7" + "@babel/types" "^7.12.10" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.10.4" @@ -305,10 +304,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" - integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81" + integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA== "@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.12.1" @@ -792,27 +791,27 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" -"@babel/plugin-transform-react-jsx-self@^7.12.1", "@babel/plugin-transform-react-jsx-self@^7.9.0": +"@babel/plugin-transform-react-jsx-self@^7.9.0": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28" integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx-source@^7.12.1", "@babel/plugin-transform-react-jsx-source@^7.9.0": +"@babel/plugin-transform-react-jsx-source@^7.9.0": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b" integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx@^7.12.7", "@babel/plugin-transform-react-jsx@^7.9.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f" - integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ== +"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.9.1": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.10.tgz#a7af3097c73479123594c8c8fe39545abebd44e3" + integrity sha512-MM7/BC8QdHXM7Qc1wdnuk73R4gbuOpfrSUgfV/nODGc86sPY1tgmY2M9E9uAnf2e4DOIp8aKGWqgZfQxnTNGuw== dependencies: "@babel/helper-builder-react-jsx" "^7.10.4" - "@babel/helper-builder-react-jsx-experimental" "^7.12.4" + "@babel/helper-builder-react-jsx-experimental" "^7.12.10" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" @@ -877,10 +876,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.8.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a" - integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q== +"@babel/plugin-transform-typeof-symbol@^7.12.10", "@babel/plugin-transform-typeof-symbol@^7.8.4": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" + integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -975,9 +974,9 @@ semver "^5.5.0" "@babel/preset-env@^7.4.5": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55" - integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.10.tgz#ca981b95f641f2610531bd71948656306905e6ab" + integrity sha512-Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA== dependencies: "@babel/compat-data" "^7.12.7" "@babel/helper-compilation-targets" "^7.12.5" @@ -1038,12 +1037,12 @@ "@babel/plugin-transform-spread" "^7.12.1" "@babel/plugin-transform-sticky-regex" "^7.12.7" "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.1" + "@babel/plugin-transform-typeof-symbol" "^7.12.10" "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.7" - core-js-compat "^3.7.0" + "@babel/types" "^7.12.10" + core-js-compat "^3.8.0" semver "^5.5.0" "@babel/preset-modules@^0.1.3": @@ -1070,16 +1069,14 @@ "@babel/plugin-transform-react-jsx-source" "^7.9.0" "@babel/preset-react@^7.0.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b" - integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9" + integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-react-display-name" "^7.12.1" - "@babel/plugin-transform-react-jsx" "^7.12.7" + "@babel/plugin-transform-react-jsx" "^7.12.10" "@babel/plugin-transform-react-jsx-development" "^7.12.7" - "@babel/plugin-transform-react-jsx-self" "^7.12.1" - "@babel/plugin-transform-react-jsx-source" "^7.12.1" "@babel/plugin-transform-react-pure-annotations" "^7.12.1" "@babel/preset-typescript@7.9.0": @@ -1121,25 +1118,25 @@ "@babel/parser" "^7.12.7" "@babel/types" "^7.12.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f" - integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" + integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" + "@babel/generator" "^7.12.10" "@babel/helper-function-name" "^7.10.4" "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" + "@babel/parser" "^7.12.10" + "@babel/types" "^7.12.10" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" - integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260" + integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw== dependencies: "@babel/helper-validator-identifier" "^7.10.4" lodash "^4.17.19" @@ -1281,10 +1278,10 @@ "@ethersproject/logger" "^5.0.5" "@ethersproject/properties" "^5.0.3" -"@ethersproject/hash@5.0.8", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.8.tgz#368a60addc3c5cd18e28f78c80dc94e1bacb82d8" - integrity sha512-Qay01tcFyFreYjSMt82rOQGMfQDmLm1sj3iNNO1BhrVf840xgBZuJ7gBATERzAjTuTCHUHw9BuGwxErJUS95yg== +"@ethersproject/hash@5.0.9", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.9.tgz#81252a848185b584aa600db4a1a68cad9229a4d4" + integrity sha512-e8/i2ZDeGSgCxXT0vocL54+pMbw5oX5fNjb2E3bAIvdkh5kH29M7zz1jHu1QDZnptIuvCZepIbhUH8lxKE2/SQ== dependencies: "@ethersproject/abstract-signer" "^5.0.6" "@ethersproject/address" "^5.0.5" @@ -1537,10 +1534,10 @@ redux-saga "~1.1.3" web3 "~1.3.0" -"@ezerous/eth-identity-provider@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@ezerous/eth-identity-provider/-/eth-identity-provider-0.1.1.tgz#cc29d4554a177b98ed724cfd861ea86c8a87fc38" - integrity sha512-GeownhQwxFyKNFteCjSi+6HkmzvakTdRRHqD6kIoLwkAamhJ88mSOxFt2N4PMEmJySxdb6PZHPdovda5xENs8w== +"@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" + integrity sha512-VfKzG0Hxv7IBZ06tIidtPRp/B4u+33Ug8dthXwYh0gGNuMIfXY9K0dR2gOZKYc6saS+pzTIEp/tjf5pb9V737Q== dependencies: level "~6.0.1" orbit-db-identity-provider "~0.3.1" @@ -2189,7 +2186,7 @@ "@sinonjs/commons" "^1" "@sinonjs/samsam" "^5.0.2" -"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.2.0": +"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.3.0": version "5.3.0" resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz#1d2f0743dc54bf13fe9d508baefacdffa25d4329" integrity sha512-hXpcfx3aq+ETVBwPlRFICld5EnrkexXuXDwqUNhDdr5L8VjvMeSRwyOa0qL7XFmR+jVWR4rUZtnxlG7RX72sBg== @@ -2350,9 +2347,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.16" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7" - integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" + integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== dependencies: "@babel/types" "^7.3.0" @@ -2370,6 +2367,21 @@ dependencies: "@types/node" "*" +"@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" @@ -2423,15 +2435,22 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== +"@types/mdast@^3.0.0", "@types/mdast@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb" + integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw== + dependencies: + "@types/unist" "*" + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*": - version "14.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" - integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== +"@types/node@*", "@types/node@^14.14.7": + version "14.14.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.12.tgz#0b1d86f8c40141091285dea02e4940df73bba43f" + integrity sha512-ASH8OPHMNlkdjrEdmoILmzFfsJICvhBsFfAum4aKZ/9U4B6M6tTmTPh+f3ttWdD74CEGV5XvXWkbyfSdXaTd7g== "@types/node@^12.12.6": version "12.19.8" @@ -2439,9 +2458,9 @@ integrity sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg== "@types/node@^13.7.0": - version "13.13.34" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.34.tgz#c9300a1b6560d90817fb2bba650e250116a575f9" - integrity sha512-g8D1HF2dMDKYSDl5+79izRwRgNPsSynmWMbj50mj7GZ0b7Lv4p8EmZjbo3h0h+6iLr6YmVz9VnF6XVZ3O6V1Ug== + version "13.13.35" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.35.tgz#d417b48313d691f5c8ff9c52cbc19cdecd306b5e" + integrity sha512-q9aeOGwv+RRou/ca4aJVUM/jD5u7LBexu+rq9PkA/NhHNn8JifcMo94soKm0b6JGSfw/PSNdqtc428OscMvEYA== "@types/parse-json@^4.0.0": version "4.0.0" @@ -2472,6 +2491,11 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== +"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" + integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== + "@types/yargs-parser@*": version "15.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" @@ -2820,11 +2844,6 @@ aes-js@3.0.0: resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0= -after@0.8.2: - version "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: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -3121,11 +3140,6 @@ array.prototype.map@^1.0.1: es-array-method-boxes-properly "^1.0.0" is-string "^1.0.5" -arraybuffer.slice@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" - integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== - arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -3426,6 +3440,11 @@ backo2@1.0.2: resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= +bail@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -3448,17 +3467,12 @@ base64-arraybuffer@0.1.4: resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= -base64-arraybuffer@0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" - integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg= - base64-js@^1.0.2, 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== @@ -3501,13 +3515,6 @@ bech32@1.1.4: resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9" integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ== -better-assert@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" - integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI= - dependencies: - callsite "1.0.0" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -3575,11 +3582,6 @@ blob-to-it@^1.0.1: dependencies: browser-readablestream-to-it "^1.0.1" -blob@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" - integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== - bluebird@^3.5.0, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" @@ -3795,13 +3797,13 @@ browserslist@4.10.0: pkg-up "^3.1.0" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.15.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.15.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.15.0.tgz#3d48bbca6a3f378e86102ffd017d9a03f122bdb0" - integrity sha512-IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ== + version "4.16.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b" + integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ== dependencies: - caniuse-lite "^1.0.30001164" + caniuse-lite "^1.0.30001165" colorette "^1.2.1" - electron-to-chromium "^1.3.612" + electron-to-chromium "^1.3.621" escalade "^3.1.1" node-releases "^1.1.67" @@ -4015,11 +4017,6 @@ caller-path@^2.0.0: dependencies: caller-callsite "^2.0.0" -callsite@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" - integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA= - callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" @@ -4058,7 +4055,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001164: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001165: version "1.0.30001165" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz#32955490d2f60290bb186bb754f2981917fa744f" integrity sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA== @@ -4141,6 +4138,21 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +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" + integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== + +character-entities@^1.0.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== + +character-reference-invalid@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -4242,13 +4254,12 @@ cids@^0.7.1: multihashes "~0.4.15" cids@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cids/-/cids-1.0.2.tgz#04ebadd65e5600a07feb16db594160f087c6eab3" - integrity sha512-ohCcYyEHh0Z5Hl+O1IML4kt6Kx5GPho1ybxtqK4zyk6DeV5CvOLoT/mqDh0cgKcAvsls3vcVa9HjZc7RQr3geA== + version "1.1.2" + resolved "https://registry.yarnpkg.com/cids/-/cids-1.1.2.tgz#d96656806c3f493be2046832e37d5f1cf17228ff" + integrity sha512-yol0+pkvGwiIKyH4rsKS0MuV0b0ZkEXBrWLF693V7jYWXyT0kYJsOI9ArzbfGzx920fSxIsO1/HJqdoc5MMVug== dependencies: - class-is "^1.1.0" multibase "^3.0.1" - multicodec "^2.0.1" + multicodec "=2.0.4" multihashes "^3.0.1" uint8arrays "^1.1.0" @@ -4484,21 +4495,11 @@ component-bind@1.0.0: resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= -component-emitter@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= - component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -component-inherit@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" - integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= - compose-function@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f" @@ -4621,16 +4622,16 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= - cookie@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== + cookiejar@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" @@ -4653,7 +4654,7 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.6.2, core-js-compat@^3.7.0: +core-js-compat@^3.6.2, core-js-compat@^3.8.0: version "3.8.1" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e" integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ== @@ -4681,7 +4682,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.1, 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== @@ -5133,20 +5134,13 @@ debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: +debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: 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" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -5451,6 +5445,15 @@ dom-serializer@0: domelementtype "^2.0.1" entities "^2.0.0" +dom-serializer@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1" + integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.0.0" + entities "^2.0.0" + dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" @@ -5466,7 +5469,7 @@ domelementtype@1, domelementtype@^1.3.1: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domelementtype@^2.0.1: +domelementtype@^2.0.1, domelementtype@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== @@ -5485,6 +5488,20 @@ domhandler@^2.3.0: dependencies: domelementtype "1" +domhandler@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a" + integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA== + dependencies: + domelementtype "^2.0.1" + +domhandler@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e" + integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA== + dependencies: + domelementtype "^2.1.0" + domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -5501,6 +5518,15 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" +domutils@^2.4.2: + version "2.4.4" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3" + integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.0.1" + domhandler "^4.0.0" + dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -5582,10 +5608,10 @@ electron-fetch@^1.7.2: dependencies: encoding "^0.1.13" -electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.612: - version "1.3.616" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.616.tgz#de63d1c79bb8eb61168774df0c11c9e1af69f9e8" - integrity sha512-CI8L38UN2BEnqXw3/oRIQTmde0LiSeqWSRlPA42ZTYgJQ8fYenzAM2Z3ni+jtILTcrs5aiXZCGJ96Pm+3/yGyQ== +electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.621: + version "1.3.623" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.623.tgz#b61ba1d94b27031554ea2768bb9b823501a918a0" + integrity sha512-CgbWTyPmJ4f9pqtqR+HPL3O0ay6BRhnpFD52TqBB2K8kTAcmAar2e93Vo1q651E4vnCHuTDuZDdbj0sTMP2QQw== elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: version "6.5.3" @@ -5654,44 +5680,40 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -engine.io-client@~3.4.0: - version "3.4.4" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967" - integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ== +engine.io-client@~4.0.0: + version "4.0.5" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-4.0.5.tgz#e12b05a11a7a3cccec6d69f9af8435146e3d507e" + integrity sha512-1lkn0QdekHQPMTcxUh8LqIuxQHNtKV5GvqkQzmZ1rYKAvB6puMm13U7K1ps3OQZ4joE46asQiAKrcdL9weNEVw== dependencies: + base64-arraybuffer "0.1.4" component-emitter "~1.3.0" - component-inherit "0.0.3" - debug "~3.1.0" - engine.io-parser "~2.2.0" + debug "~4.1.0" + engine.io-parser "~4.0.1" has-cors "1.1.0" - indexof "0.0.1" parseqs "0.0.6" parseuri "0.0.6" - ws "~6.1.0" + ws "~7.2.1" 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" - integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg== +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: - after "0.8.2" - arraybuffer.slice "~0.0.7" base64-arraybuffer "0.1.4" - blob "0.0.5" - has-binary2 "~1.0.2" -engine.io@~3.4.0: - version "3.4.2" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c" - integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg== +engine.io@~4.0.0: + version "4.0.5" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.0.5.tgz#3ff6d5c72560ad93423c1ce1e807733206622a1c" + integrity sha512-Ri+whTNr2PKklxQkfbGjwEo+kCBUM4Qxk4wtLqLrhH+b1up2NFL9g9pjYWiCV/oazwB0rArnvF/ZmZN2ab5Hpg== dependencies: accepts "~1.3.4" base64id "2.0.0" - cookie "0.3.1" + cookie "~0.4.1" + cors "~2.8.5" debug "~4.1.0" - engine.io-parser "~2.2.0" + engine.io-parser "~4.0.0" ws "^7.1.2" enhanced-resolve@^4.1.0: @@ -6297,9 +6319,9 @@ ethereumjs-util@^6.0.0: rlp "^2.2.3" ethers@^5.0.8: - version "5.0.23" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.23.tgz#461a6e63c4906d5ea64126d53975ddf2ca81a979" - integrity sha512-f3pTcgYpMhtmMTMG9KO6pWHYjrCiGz7yVnvMsTQgAYfAVAeUxKy2H1cxQJyqyghRjtAvgVYJlnXQo8mMCD63BA== + version "5.0.24" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.24.tgz#fbb8e4d35070d134f2eb846c07500b8c0eaef6d3" + integrity sha512-77CEtVC88fJGEhxGXRvQqAEH6e2A+ZFiv2FBT6ikXndlty5sw6vMatAhg1v+w3CaaGZOf1CP81jl4Mc8Zrj08A== dependencies: "@ethersproject/abi" "5.0.9" "@ethersproject/abstract-provider" "5.0.7" @@ -6311,7 +6333,7 @@ ethers@^5.0.8: "@ethersproject/bytes" "5.0.8" "@ethersproject/constants" "5.0.7" "@ethersproject/contracts" "5.0.8" - "@ethersproject/hash" "5.0.8" + "@ethersproject/hash" "5.0.9" "@ethersproject/hdnode" "5.0.7" "@ethersproject/json-wallets" "5.0.9" "@ethersproject/keccak256" "5.0.6" @@ -6519,7 +6541,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.2: +extend@^3.0.0, 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== @@ -7351,13 +7373,6 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" -has-binary2@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" - integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== - dependencies: - isarray "2.0.1" - has-cors@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" @@ -7583,6 +7598,16 @@ html-parse-stringify2@2.0.1: dependencies: void-elements "^2.0.1" +html-to-react@^1.3.4: + version "1.4.5" + resolved "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.5.tgz#59091c11021d1ef315ef738460abb6a4a41fe1ce" + integrity sha512-KONZUDFPg5OodWaQu2ymfkDmU0JA7zB1iPfvyHehTmMUZnk0DS7/TyCMTzsLH6b4BvxX15g88qZCXFhJWktsmA== + dependencies: + domhandler "^3.3.0" + htmlparser2 "^5.0" + lodash.camelcase "^4.3.0" + ramda "^0.27.1" + html-webpack-plugin@4.0.0-beta.11: version "4.0.0-beta.11" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz#3059a69144b5aecef97708196ca32f9e68677715" @@ -7607,6 +7632,16 @@ htmlparser2@^3.3.0: inherits "^2.0.1" readable-stream "^3.1.1" +htmlparser2@^5.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-5.0.1.tgz#7daa6fc3e35d6107ac95a4fc08781f091664f6e7" + integrity sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ== + dependencies: + domelementtype "^2.0.1" + domhandler "^3.3.0" + domutils "^2.4.2" + entities "^2.0.0" + http-cache-semantics@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" @@ -7866,11 +7901,6 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= - infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" @@ -7900,9 +7930,9 @@ inherits@2.0.3: integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.5, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== inquirer@7.0.4: version "7.0.4" @@ -8363,12 +8393,13 @@ ipfs-http-server@^0.1.3: prom-client "^12.0.0" ipfs-log@~5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ipfs-log/-/ipfs-log-5.0.0.tgz#bd89edd9eabd22d22365184817b4eca6ad89bf43" - integrity sha512-I8ow4Y42fODdQAX0vtc4xWO5daNTzAQzrWWGd1p6tIdr/OI0IFpC3ifpEWPW3qgWXPg30E9TXYmtxRp0fkOSbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ipfs-log/-/ipfs-log-5.0.1.tgz#0335492ae404ab88bebbd682cecd9efcb8059838" + integrity sha512-n9Tf2rFqqK/r2rshQMAcS/COCwYNi8m2wCZN2ZLT9vhgXMsB1c1YEsCgZru7+cWCHTmuJwuBEjAJX9l9jQPSWw== dependencies: ipfs-http-client "^47.0.1" json-stringify-deterministic "^1.0.1" + multicodec "^2.0.1" multihashing-async "^2.0.1" orbit-db-identity-provider "~0.3.1" orbit-db-io "~0.3.0" @@ -8677,6 +8708,19 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-alphabetical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" + integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== + +is-alphanumerical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" + integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-arguments@^1.0.4: version "1.1.0" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" @@ -8713,7 +8757,7 @@ is-buffer@^1.0.2, is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.4, is-buffer@~2.0.3: +is-buffer@^2.0.0, is-buffer@^2.0.4, is-buffer@~2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== @@ -8773,6 +8817,11 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== +is-decimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== + is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -8879,6 +8928,11 @@ is-hex-prefixed@1.0.0: resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" integrity sha1-fY035q135dEnFIkTxXPggtd39VQ= +is-hexadecimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== + is-installed-globally@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" @@ -9108,11 +9162,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isarray@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" - integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= - isarray@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" @@ -9881,7 +9930,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@3.14.0, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: +js-yaml@3.14.0: version "3.14.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== @@ -9889,6 +9938,14 @@ js-yaml@3.14.0, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" @@ -10629,9 +10686,9 @@ libp2p-interfaces@^0.7.1: uint8arrays "^1.1.0" libp2p-kad-dht@^0.20.1: - version "0.20.2" - resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.2.tgz#8ba427985c763d92f907a7608f586c72d4709152" - integrity sha512-O6WK43kYjKXJWy+7tLyPScWt7ulBxMzmMKtvlKIv0z8GF7GboUWYAbcbLVEeZIaKkwwfjSMwadL9qFeImGTAOg== + version "0.20.3" + resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.3.tgz#8cc434358708c9c610e30b85bc0b5fcd6c42b39d" + integrity sha512-AHFasvp60xYRhyfSsjlP4O08MPt43TbtbtrOt7Yh9wuciYc7RL0p4mZ+bGLrU1WujFVulUQZULEpCPAz6k9Rqg== dependencies: abort-controller "^3.0.0" async "^2.6.2" @@ -10730,7 +10787,7 @@ libp2p-tcp@^0.15.0, libp2p-tcp@^0.15.1: multiaddr "^8.0.0" stream-to-it "^0.2.2" -libp2p-utils@^0.2.0, libp2p-utils@^0.2.1: +libp2p-utils@^0.2.0, libp2p-utils@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/libp2p-utils/-/libp2p-utils-0.2.3.tgz#4eb2a59a9eda342bed73cb94553c87a63c95848a" integrity sha512-9BoMCgvJF7LJ+JVMaHtqfCqhZN4i/sx0DrY6lf9U0Rq9uUgQ9qTai2O9LXcfr1LOS3OMMeRLsKk25MMgsf7W3w== @@ -10756,9 +10813,9 @@ libp2p-webrtc-peer@^10.0.1: readable-stream "^3.4.0" libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1: - version "0.20.2" - resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.2.tgz#9979e42d02c5f42fc78785b3c325b7f0fad50a35" - integrity sha512-P4oZ/v/bhhR0U/dpq8QfzRyKE2l5L4KFM6yrc3j1bj+gbQLBMH2P76/N3jlHqTVBdYavOwdCEifXwfG/qGp+3Q== + version "0.20.4" + resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.4.tgz#485b9fa9d0f76c1361813a88aa1882927e369092" + integrity sha512-t8mn+Wcdy+HLPSAfhHJWza8Ecp28ZmYvXtVZ4GKLTDe7aLB2S+VTwTNsSdETdnJXvetCftCJvaK2RSiniPeHSg== dependencies: "@hapi/hapi" "^20.0.0" "@hapi/inert" "^6.0.3" @@ -10768,7 +10825,7 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1: err-code "^2.0.3" ipfs-utils "^5.0.0" it-pipe "^1.1.0" - libp2p-utils "^0.2.1" + libp2p-utils "^0.2.3" libp2p-webrtc-peer "^10.0.1" mafmt "^8.0.0" menoetius "0.0.2" @@ -10777,8 +10834,8 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1: p-defer "^3.0.0" peer-id "^0.14.2" prom-client "^12.0.0" - socket.io "^2.3.0" - socket.io-client "^2.3.0" + socket.io "^3.0.4" + socket.io-client "^3.0.4" stream-to-it "^0.2.2" streaming-iterables "^5.0.3" @@ -10799,9 +10856,9 @@ libp2p-websockets@^0.14.0: p-timeout "^3.2.0" libp2p@^0.29.3: - version "0.29.3" - resolved "https://registry.yarnpkg.com/libp2p/-/libp2p-0.29.3.tgz#9cee0f44a300a5ac22f2805e5da57d98df442664" - integrity sha512-voILMLwpDqe/KafqaeH7CsmMNtOagV7ln6vNl0/2Lgq4zyY+vCmlzULRaStSagU+9V0QWoSoPmIgQdZ/Ydelhw== + 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" @@ -10966,6 +11023,11 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + lodash.find@4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" @@ -11163,6 +11225,29 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +mdast-add-list-metadata@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mdast-add-list-metadata/-/mdast-add-list-metadata-1.0.1.tgz#95e73640ce2fc1fa2dcb7ec443d09e2bfe7db4cf" + integrity sha512-fB/VP4MJ0LaRsog7hGPxgOrSL3gE/2uEdZyDuSEnKCv/8IkYHiDkIQSbChiJoHyxZZXZ9bzckyRk+vNxFzh8rA== + dependencies: + unist-util-visit-parents "1.1.2" + +mdast-util-from-markdown@^0.8.0: + version "0.8.4" + resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz#2882100c1b9fc967d3f83806802f303666682d32" + integrity sha512-jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw== + dependencies: + "@types/mdast" "^3.0.0" + mdast-util-to-string "^2.0.0" + micromark "~2.11.0" + parse-entities "^2.0.0" + unist-util-stringify-position "^2.0.0" + +mdast-util-to-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== + mdn-data@2.0.14: version "2.0.14" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" @@ -11249,6 +11334,14 @@ microevent.ts@~0.1.1: resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0" integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g== +micromark@~2.11.0: + version "2.11.2" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.2.tgz#e8b6a05f54697d2d3d27fc89600c6bc40dd05f35" + integrity sha512-IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ== + dependencies: + debug "^4.0.0" + parse-entities "^2.0.0" + micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -11538,11 +11631,16 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@2.1.2, ms@^2.1.1: +ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multiaddr-to-uri@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/multiaddr-to-uri/-/multiaddr-to-uri-6.0.0.tgz#8f08a75c6eeb2370d5d24b77b8413e3f0fa9bcc0" @@ -11551,9 +11649,9 @@ multiaddr-to-uri@^6.0.0: multiaddr "^8.0.0" multiaddr@^8.0.0, multiaddr@^8.1.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-8.1.1.tgz#d86315deed93752fa68b4199fee56f8b4a516a2b" - integrity sha512-Dyur7rWX44MlgKIqVA2dYPOZx/UwG60PVSffJ5S17uo6Pu31lftJXShMEfPtUDGHnyALAOWOuC3X/iPhDtw4Vg== + version "8.1.2" + resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-8.1.2.tgz#74060ff8636ba1c01b2cf0ffd53950b852fa9b1f" + integrity sha512-r13IzW8+Sv9zab9Gt8RPMIN2WkptIPq99EpAzg4IbJ/zTELhiEwXWr9bAmEatSCI4j/LSA6ESJzvz95JZ+ZYXQ== dependencies: cids "^1.0.0" class-is "^1.1.0" @@ -11609,6 +11707,14 @@ multicast-dns@^7.2.0: dns-packet "^4.0.0" thunky "^1.0.2" +multicodec@=2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.0.4.tgz#d83f9ade800fd224860977401b2e4b9293a98811" + integrity sha512-baVjBRYT8cqwlkUIUL4xYLQ0M9Cm1R6Nhn8WykEOhyG7bS81HXKr++o+8Nua/GRkVWfB/MTtDIvIdLwsZ2PuJg== + dependencies: + uint8arrays "1.1.0" + varint "^6.0.0" + multicodec@^0.5.5: version "0.5.7" resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-0.5.7.tgz#1fb3f9dd866a10a55d226e194abba2dcc1ee9ffd" @@ -11625,12 +11731,12 @@ multicodec@^1.0.0: varint "^5.0.0" multicodec@^2.0.0, multicodec@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.0.1.tgz#0971bbef83fcb354315c837c9a3f3e2e422af371" - integrity sha512-YDYeWn9iGa76hOHAyyZa0kbt3tr5FLg1ZXUHrZUJltjnxxdbTIbHnxWLd2zTcMOjdT3QyO+Xs4bQgJUcC2RWUA== + version "2.1.0" + resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.1.0.tgz#b66dff2184e91e74ac68981e0deba2591bbf1f87" + integrity sha512-7AYpK/avswOWvnqQ9/jOkQCS7Fp4aKxw5ojvn5gyK2VQTZz3YVXeLMzoIZDBy745JSfJMXkTS0ptnHci5Mt1mA== dependencies: - uint8arrays "1.0.0" - varint "^5.0.0" + uint8arrays "1.1.0" + varint "^6.0.0" multihashes@^0.4.15, multihashes@~0.4.13, multihashes@~0.4.15: version "0.4.21" @@ -12111,11 +12217,6 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1 resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-component@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" - integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE= - object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -12793,6 +12894,18 @@ parse-duration@^0.4.4: resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-0.4.4.tgz#11c0f51a689e97d06c57bd772f7fda7dc013243c" integrity sha512-KbAJuYGUhZkB9gotDiKLnZ7Z3VTacK3fgwmDdB6ZVDtJbMBT6MfLga0WJaYpPDu0mzqT0NgHtHDt5PY4l0nidg== +parse-entities@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" + integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" + parse-headers@^2.0.0, parse-headers@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515" @@ -12833,25 +12946,11 @@ parse5@5.1.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== -parseqs@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" - integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0= - dependencies: - better-assert "~1.0.0" - parseqs@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== -parseuri@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" - integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo= - dependencies: - better-assert "~1.0.0" - parseuri@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" @@ -13082,9 +13181,9 @@ pino-std-serializers@^2.4.2: integrity sha512-wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg== pino@^6.0.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-6.7.0.tgz#d5d96b7004fed78816b5694fda3eab02b5ca6d23" - integrity sha512-vPXJ4P9rWCwzlTJt+f0Ni4THc3DWyt8iDDCO4edQ8narTu6hnpzdXu8FqeSJCGndl1W6lfbYQUQihUO54y66Lw== + version "6.8.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-6.8.0.tgz#d242f9936f2e65217fde75c0af5d5d8b4d3d3fde" + integrity sha512-nxq+6Jr7m0cMjYFBoTRw3bco14omZ/SQCheAHz9GVwdkbUrzKhgT+gSI/ql2Mnsca0QQKgpB/ACWhjxE4JsX3Q== dependencies: fast-redact "^3.0.0" fast-safe-stringify "^2.0.7" @@ -14193,6 +14292,11 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" +ramda@^0.27.1: + version "0.27.1" + resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9" + integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw== + randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.3, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -14291,9 +14395,9 @@ react-error-overlay@^6.0.7: integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw== react-i18next@^11.7.3: - version "11.7.4" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.7.4.tgz#6c0142e15652d8dd80cd7d857e36efe2e9d4d09a" - integrity sha512-Aq0+QVW7NMYuAtk0Stcwp4jWeNTd1p5XefAfBPcjs/4c/2duG3v3G3zdtn8fC8L4EyA/coKLwdULHI+lYTbF8w== + version "11.8.3" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.3.tgz#d365586a537f759a1bff75e01054f6a5fc71e4f5" + integrity sha512-E5LjGmM3Kgje4M0oSkHFNAxiU1BM+P1J9QPfF7+Agm4sa1YS18GhQNJCZD3o9ofZLjq8ocQfGUuYweYGfrj0RQ== dependencies: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" @@ -14303,6 +14407,22 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-i resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +react-markdown@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-5.0.3.tgz#41040ea7a9324b564b328fb81dd6c04f2a5373ac" + integrity sha512-jDWOc1AvWn0WahpjW6NK64mtx6cwjM4iSsLHJPNBqoAgGOVoIdJMqaKX4++plhOtdd4JksdqzlDibgPx6B/M2w== + dependencies: + "@types/mdast" "^3.0.3" + "@types/unist" "^2.0.3" + html-to-react "^1.3.4" + mdast-add-list-metadata "1.0.1" + prop-types "^15.7.2" + react-is "^16.8.6" + remark-parse "^9.0.0" + unified "^9.0.0" + unist-util-visit "^2.0.0" + xtend "^4.0.1" + react-particles-js@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/react-particles-js/-/react-particles-js-3.4.1.tgz#e0f17ae1ddb07d01ce911448db76cd59726fe666" @@ -14671,6 +14791,13 @@ relative-url@^1.0.2: resolved "https://registry.yarnpkg.com/relative-url/-/relative-url-1.0.2.tgz#d21c52a72d6061018bcee9f9c9fc106bf7d65287" integrity sha1-0hxSpy1gYQGLzun5yfwQa/fWUoc= +remark-parse@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640" + integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw== + dependencies: + mdast-util-from-markdown "^0.8.0" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -15362,14 +15489,14 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sinon@^9.0.2: - version "9.2.1" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.1.tgz#64cc88beac718557055bd8caa526b34a2231be6d" - integrity sha512-naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w== + version "9.2.2" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.2.tgz#b83cf5d43838f99cfa3644453f4c7db23e7bd535" + integrity sha512-9Owi+RisvCZpB0bdOVFfL314I6I4YoRlz6Isi4+fr8q8YQsDPoCe5UnmNtKHRThX3negz2bXHWIuiPa42vM8EQ== dependencies: "@sinonjs/commons" "^1.8.1" "@sinonjs/fake-timers" "^6.0.1" "@sinonjs/formatio" "^5.0.1" - "@sinonjs/samsam" "^5.2.0" + "@sinonjs/samsam" "^5.3.0" diff "^4.0.2" nise "^4.0.4" supports-color "^7.1.0" @@ -15433,77 +15560,48 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -socket.io-adapter@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" - integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== +socket.io-adapter@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz#372b7cde7a535fc4f4f0d5ac7f73952a3062d438" + integrity sha512-2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ== -socket.io-client@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4" - integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA== - dependencies: - backo2 "1.0.2" - base64-arraybuffer "0.1.5" - component-bind "1.0.0" - component-emitter "1.2.1" - debug "~4.1.0" - engine.io-client "~3.4.0" - has-binary2 "~1.0.2" - has-cors "1.1.0" - indexof "0.0.1" - object-component "0.0.3" - parseqs "0.0.5" - parseuri "0.0.5" - socket.io-parser "~3.3.0" - to-array "0.1.4" - -socket.io-client@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz#91a4038ef4d03c19967bb3c646fec6e0eaa78cff" - integrity sha512-YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ== +socket.io-client@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-3.0.4.tgz#c0203419a9f71e1360ef92a31301e80260e94bb9" + integrity sha512-qMvBuS+W9JIN2mkfAWDCxuIt+jpIKDf8C0604zEqx1JrPaPSS6cN0F3B2GYWC83TqBeVJXW66GFxWV3KD88n0Q== dependencies: + "@types/component-emitter" "^1.2.10" backo2 "1.0.2" component-bind "1.0.0" component-emitter "~1.3.0" - debug "~3.1.0" - engine.io-client "~3.4.0" - has-binary2 "~1.0.2" - indexof "0.0.1" - parseqs "0.0.6" + debug "~4.1.0" + engine.io-client "~4.0.0" parseuri "0.0.6" - socket.io-parser "~3.3.0" - to-array "0.1.4" + socket.io-parser "~4.0.1" -socket.io-parser@~3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199" - integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ== +socket.io-parser@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.2.tgz#3d021a9c86671bb079e7c6c806db6a1d9b1bc780" + integrity sha512-Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g== dependencies: + "@types/component-emitter" "^1.2.10" component-emitter "~1.3.0" - debug "~3.1.0" - isarray "2.0.1" - -socket.io-parser@~3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" - integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== - dependencies: - component-emitter "1.2.1" debug "~4.1.0" - isarray "2.0.1" -socket.io@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb" - integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg== +socket.io@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.0.4.tgz#20130a80b57e48dadb671f22e3776047cc7f9d53" + integrity sha512-Vj1jUoO75WGc9txWd311ZJJqS9Dr8QtNJJ7gk2r7dcM/yGe9sit7qOijQl3GAwhpBOz/W8CwkD7R6yob07nLbA== dependencies: + "@types/cookie" "^0.4.0" + "@types/cors" "^2.8.8" + "@types/node" "^14.14.7" + accepts "~1.3.4" + base64id "~2.0.0" debug "~4.1.0" - engine.io "~3.4.0" - has-binary2 "~1.0.2" - socket.io-adapter "~1.1.0" - socket.io-client "2.3.0" - socket.io-parser "~3.4.0" + engine.io "~4.0.0" + socket.io-adapter "~2.0.3" + socket.io-parser "~4.0.1" sockjs-client@1.4.0: version "1.4.0" @@ -16299,11 +16397,6 @@ tmpl@1.0.x: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= -to-array@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" - integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= - to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -16379,10 +16472,15 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" +trough@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" + integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== + truffle@~5.1.45: - version "5.1.56" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.56.tgz#8453e9487bca3d300fe936168a8069ce1274bc84" - integrity sha512-hmRcHZqrOF5vlc0s4CoM72mRMRgP/jObK57ixfDAri+oLRgHgIKBf98R7nsy0ruq+WHCAdq1jslmrF026lUxAw== + version "5.1.57" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.57.tgz#0afbce669d879aeec2bcc6f77ba8fb228353a4ed" + integrity sha512-HBRM0EkhgsBYTSW+825NlW473ohjAOiHqg/NSfkL4LCN39gmnspirugR0DHTzj1KsEUGCE/arckgJO4Ay71pYQ== dependencies: app-module-path "^2.2.0" mocha "8.1.2" @@ -16542,15 +16640,7 @@ typical@^6.0.0: resolved "https://registry.yarnpkg.com/typical/-/typical-6.0.1.tgz#89bd1a6aa5e5e96fa907fb6b7579223bff558a06" integrity sha512-+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A== -uint8arrays@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-1.0.0.tgz#9cf979517f85c32d6ef54adf824e3499bb715331" - integrity sha512-14tqEVujDREW7YwonSZZwLvo7aFDfX7b6ubvM/U7XvZol+CC/LbhaX/550VlWmhddAL9Wou1sxp0Of3tGqXigg== - dependencies: - multibase "^3.0.0" - web-encoding "^1.0.2" - -uint8arrays@^1.0.0, uint8arrays@^1.1.0: +uint8arrays@1.1.0, uint8arrays@^1.0.0, uint8arrays@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-1.1.0.tgz#d034aa65399a9fd213a1579e323f0b29f67d0ed2" integrity sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA== @@ -16591,6 +16681,18 @@ unicode-property-aliases-ecmascript@^1.0.4: resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== +unified@^9.0.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg== + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-buffer "^2.0.0" + is-plain-obj "^2.0.0" + trough "^1.0.0" + vfile "^4.0.0" + union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" @@ -16632,6 +16734,40 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" +unist-util-is@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz#3e9e8de6af2eb0039a59f50c9b3e99698a924f50" + integrity sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA== + +unist-util-stringify-position@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== + dependencies: + "@types/unist" "^2.0.2" + +unist-util-visit-parents@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-1.1.2.tgz#f6e3afee8bdbf961c0e6f028ea3c0480028c3d06" + integrity sha512-yvo+MMLjEwdc3RhhPYSximset7rwjMrdt9E41Smmvg25UQIenzrN83cRnF1JMzoMi9zZOQeYXHSDf7p+IQkW3Q== + +unist-util-visit-parents@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" + integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + +unist-util-visit@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit-parents "^3.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -16900,6 +17036,24 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vfile-message@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^2.0.0" + +vfile@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" + integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + unist-util-stringify-position "^2.0.0" + vfile-message "^2.0.0" + vm-browserify@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" @@ -17341,9 +17495,9 @@ websocket-extensions@>=0.1.1: integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== websocket@^1.0.32: - version "1.0.32" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.32.tgz#1f16ddab3a21a2d929dec1687ab21cfdc6d3dbb1" - integrity sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q== + version "1.0.33" + resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.33.tgz#407f763fc58e74a3fa41ca3ae5d78d3f5e3b82a5" + integrity sha512-XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA== dependencies: bufferutil "^4.0.1" debug "^2.2.0" @@ -17675,12 +17829,10 @@ ws@^7.1.2, ws@^7.3.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ== -ws@~6.1.0: - version "6.1.4" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9" - integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA== - dependencies: - async-limiter "~1.0.0" +ws@~7.2.1: + version "7.2.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d" + integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA== xdg-basedir@^4.0.0: version "4.0.0" @@ -17745,9 +17897,9 @@ xor-distance@^2.0.0: integrity sha512-AsAqZfPAuWx7qB/0kyRDUEvoU3QKsHWzHU9smFlkaiprEpGfJ/NBbLze2Uq0rdkxCxkNM9uOLvz/KoNBCbZiLQ== xregexp@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.0.tgz#29660f5d6567cd2ef981dd4a50cb05d22c10719d" - integrity sha512-83y4aa8o8o4NZe+L+46wpa+F1cWR/wCGOWI3tzqUso0w3/KAvXy0+Di7Oe/cbNMixDR4Jmi7NEybWU6ps25Wkg== + version "4.4.1" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.1.tgz#c84a88fa79e9ab18ca543959712094492185fe65" + integrity sha512-2u9HwfadaJaY9zHtRRnH6BY6CQVNQKkYm3oLtC9gJXXzfsbACg5X5e4EZZGVAH+YIfa+QA9lsFQTTe3HURF3ag== dependencies: "@babel/runtime-corejs3" "^7.12.1" @@ -17756,7 +17908,7 @@ xsalsa20@^1.0.2: resolved "https://registry.yarnpkg.com/xsalsa20/-/xsalsa20-1.1.0.tgz#bee27174af1913aaec0fe677d8ba161ec12bf87d" integrity sha512-zd3ytX2cm+tcSndRU+krm0eL4TMMpZE7evs5hLRAoOy6gviqLfe3qOlkjF3i5SeAkQUCeJk0lJZrEU56kHRfWw== -xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From 10a56570e550da00daa0ed7e09d4949439ae37bc Mon Sep 17 00:00:00 2001 From: Apostolof Date: Mon, 14 Dec 2020 20:36:34 +0200 Subject: [PATCH 11/37] refactor: move about menu item out of dropdown --- .../MainLayout/MainLayoutMenu/index.jsx | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx index 328bf54..480b219 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx @@ -35,7 +35,7 @@ const MainLayoutMenu = () => { link name="home" key="home" - onClick={() => { history.push('/'); }} + onClick={() => history.push('/')} > app_logo @@ -45,7 +45,7 @@ const MainLayoutMenu = () => { link name="create-topic" key="create-topic" - onClick={() => { history.push('/topics/new'); }} + onClick={() => history.push('/topics/new')} position="right" > {t('topbar.button.create.topic')} @@ -57,7 +57,7 @@ const MainLayoutMenu = () => { link name="profile" key="profile" - onClick={() => { history.push('/profile'); }} + onClick={() => history.push('/profile')} > {t('topbar.button.profile')} @@ -67,11 +67,19 @@ const MainLayoutMenu = () => { link name="register" key="register" - onClick={() => { history.push('/auth/register'); }} + onClick={() => history.push('/auth/register')} > {t('topbar.button.register')} )} + history.push('/about')} + > + {t('topbar.button.about')} + @@ -82,13 +90,6 @@ const MainLayoutMenu = () => { > {t('topbar.button.clear.databases')} - { history.push('/about'); }} - > - {t('topbar.button.about')} - From 81a2e0ac2d3acda4d857cc30a82cc276b42488ff Mon Sep 17 00:00:00 2001 From: Apostolof Date: Mon, 14 Dec 2020 23:02:49 +0200 Subject: [PATCH 12/37] refactor: add developers section to about, fix spelling errors --- docker/README.md | 10 +++++----- packages/concordia-app/src/assets/About.md | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docker/README.md b/docker/README.md index 8f0d350..b069dd7 100644 --- a/docker/README.md +++ b/docker/README.md @@ -36,7 +36,7 @@ Furthermore, we provide an image that builds the contracts and handles their mig ### Ganache The Dockerfile is provided in the path `./ganache`. The image makes use of the environment variables described -bellow. +below. | Environment variable | Default value | Usage | | --- | --- | --- | @@ -66,7 +66,7 @@ This is a provision system that compiles and deploys the contracts to any Ethere A Dockerfile is provided in the path `./concordia-contracts` that will build the contracts used by Concordia and handle their deployment to any Ethereum network defined using env-vars upon container run. Dockerfile contains three -useful stages, described in the table bellow. +useful stages, described in the table below. | Stage name | Entrypoint | Usage | | --- | --- | --- | @@ -74,7 +74,7 @@ useful stages, described in the table bellow. | test | Runs contract tests | Compiles contracts and runs tests using blockchain defined by env vars | | runtime | Migrates contracts | Compiles contracts and migrates to the blockchain defined by env vars. Does **not** run tests | -The image makes use of the environment variables described bellow. +The image makes use of the environment variables described below. | Environment variable | Default value | Usage | | --- | --- | --- | @@ -92,7 +92,7 @@ the image. ### Application The Dockerfile provided in the path `./concordia-application` builds the application for production and serves -the resulting build using an nginx server. Dockerfile contains two useful stages, described in the table bellow. +the resulting build using an nginx server. Dockerfile contains two useful stages, described in the table below. | Stage name | Entrypoint | Usage | | --- | --- | --- | @@ -100,7 +100,7 @@ the resulting build using an nginx server. Dockerfile contains two useful stages | runtime | Serves application | Builds for production and serves it through nginx | -The image makes use of the environment variables described bellow. +The image makes use of the environment variables described below. | Environment variable | Default value | Usage | | --- | --- | --- | diff --git a/packages/concordia-app/src/assets/About.md b/packages/concordia-app/src/assets/About.md index 40049cb..d5e73aa 100644 --- a/packages/concordia-app/src/assets/About.md +++ b/packages/concordia-app/src/assets/About.md @@ -18,10 +18,12 @@ Concordia, much like other projects of this kind, provides an alternative to thi TODO -## Who +--- -TODO +Developed by [apostolof][devs-apostolof-profile], [ezerous][devs-ezerous-profile] [concordia-repository]: https://gitlab.com/ecentrics/apella [concordia-docker-hub]: https://hub.docker.com/repository/docker/ecentrics/apella-app [concordia-license]: https://gitlab.com/ecentrics/apella/-/blob/master/LICENSE.md +[devs-apostolof-profile]: https://gitlab.com/Apostolof +[devs-ezerous-profile]: https://gitlab.com/Ezerous \ No newline at end of file From aad4d470cba7aa543233e326582d8d582c4c40d3 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Thu, 17 Dec 2020 21:02:39 +0200 Subject: [PATCH 13/37] Expose new contracts in index.js --- packages/concordia-contracts/.eslintrc.js | 4 +++- packages/concordia-contracts/index.js | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/concordia-contracts/.eslintrc.js b/packages/concordia-contracts/.eslintrc.js index 3b8b151..f4fd0dd 100644 --- a/packages/concordia-contracts/.eslintrc.js +++ b/packages/concordia-contracts/.eslintrc.js @@ -31,7 +31,9 @@ module.exports = { 'no-unused-vars': 'warn', 'no-console': 'warn', 'no-shadow': 'warn', - "no-multi-str": "warn" + 'no-multi-str': 'warn', + 'one-var': ["error", { "uninitialized": "always" }], + 'one-var-declaration-per-line': ['error', 'initializations'] }, 'settings': { 'import/resolver': { diff --git a/packages/concordia-contracts/index.js b/packages/concordia-contracts/index.js index 0ab0aa9..bc231ce 100644 --- a/packages/concordia-contracts/index.js +++ b/packages/concordia-contracts/index.js @@ -1,14 +1,16 @@ -let Forum; +let Forum, Voting, PostVoting; +/* eslint-disable global-require */ try { - // eslint-disable-next-line global-require Forum = require('./build/Forum.json'); + Voting = require('./build/Voting.json'); + PostVoting = require('./build/PostVoting.json'); } catch (e) { // eslint-disable-next-line no-console console.error("Could not require contract artifacts. Haven't you run compile yet?"); } module.exports = { - contracts: [Forum], + contracts: [Forum, Voting, PostVoting], forumContract: Forum, }; From d5eeec2a0b87917c334b693704a837566a1136f0 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Thu, 17 Dec 2020 21:34:34 +0200 Subject: [PATCH 14/37] refactor: add app version to about --- .dockerignore | 1 + packages/concordia-app/.env.development.example | 1 - packages/concordia-app/src/views/About/index.jsx | 6 ++++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 9735aca..46f9cac 100644 --- a/.dockerignore +++ b/.dockerignore @@ -13,6 +13,7 @@ docker/ packages/*/node_modules packages/*/dist packages/*/coverage +packages/*/*.env* # TO-NEVER-DO: exclude the build folder of the contracts package, it's needed for building the application image. packages/concordia-app/build diff --git a/packages/concordia-app/.env.development.example b/packages/concordia-app/.env.development.example index eeeb884..4565811 100644 --- a/packages/concordia-app/.env.development.example +++ b/packages/concordia-app/.env.development.example @@ -7,6 +7,5 @@ HOST=localhost PORT=7000 # Variables needed in runtime (in browser) -# Carefull, IPFS won't accept localhost as a valid hostname REACT_APP_RENDEZVOUS_HOST=127.0.0.1 REACT_APP_RENDEZVOUS_PORT=9090 diff --git a/packages/concordia-app/src/views/About/index.jsx b/packages/concordia-app/src/views/About/index.jsx index fcd02ba..12ed27f 100644 --- a/packages/concordia-app/src/views/About/index.jsx +++ b/packages/concordia-app/src/views/About/index.jsx @@ -24,6 +24,12 @@ const About = () => { return ( +
+ {/* TODO: add logo */} + LOGO +
+ {`v${process.env.REACT_APP_VERSION}`} +
Date: Thu, 17 Dec 2020 21:57:35 +0200 Subject: [PATCH 15/37] refactor: add npm package version env var --- packages/concordia-app/package.json | 7 +- yarn.lock | 718 ++++++++++++++++------------ 2 files changed, 428 insertions(+), 297 deletions(-) diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index bbbcf92..ef95c96 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -3,9 +3,9 @@ "version": "0.1.0", "private": true, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test", + "start": "cross-env REACT_APP_VERSION=$npm_package_version REACT_APP_NAME=$npm_package_name react-scripts start", + "build": "cross-env REACT_APP_VERSION=$npm_package_version REACT_APP_NAME=$npm_package_name react-scripts build", + "test": "cross-env REACT_APP_VERSION=$npm_package_version REACT_APP_NAME=$npm_package_name react-scripts test", "eject": "react-scripts eject", "postinstall": "patch-package", "analyze": "react-scripts build && source-map-explorer 'build/static/js/*.js' --gzip", @@ -51,6 +51,7 @@ "web3": "1.3.0" }, "devDependencies": { + "cross-env": "^7.0.3", "eslint": "^6.8.0", "eslint-config-airbnb": "^18.1.0", "eslint-plugin-import": "^2.20.2", diff --git a/yarn.lock b/yarn.lock index 6418314..1c0ea9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,9 +22,9 @@ "@babel/highlight" "^7.8.3" "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" - integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: "@babel/highlight" "^7.10.4" @@ -77,11 +77,11 @@ source-map "^0.5.0" "@babel/generator@^7.12.10", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460" - integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" + integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== dependencies: - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.11" jsesc "^2.5.1" source-map "^0.5.0" @@ -100,14 +100,14 @@ "@babel/helper-explode-assignable-expression" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-builder-react-jsx-experimental@^7.12.10", "@babel/helper-builder-react-jsx-experimental@^7.12.4": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.10.tgz#a58cb96a793dc0fcd5c9ed3bb36d62fdc60534c2" - integrity sha512-3Kcr2LGpL7CTRDTTYm1bzeor9qZbxbvU2AxsLA6mUG9gYarSfIKMK0UlU+azLWI+s0+BH768bwyaziWB2NOJlQ== +"@babel/helper-builder-react-jsx-experimental@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.11.tgz#a39616d7e4cf8f9da1f82b5fc3ee1f7406beeb11" + integrity sha512-4oGVOekPI8dh9JphkPXC68iIuP6qp/RPbaPmorRmEFbRAHZjSqxPjqHudn18GVDPgCuFM/KdFXc63C17Ygfa9w== dependencies: "@babel/helper-annotate-as-pure" "^7.12.10" "@babel/helper-module-imports" "^7.12.5" - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.11" "@babel/helper-builder-react-jsx@^7.10.4": version "7.10.4" @@ -163,15 +163,15 @@ "@babel/types" "^7.12.1" "@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" + integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-get-function-arity" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/types" "^7.12.11" -"@babel/helper-get-function-arity@^7.10.4": +"@babel/helper-get-function-arity@^7.12.10": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== @@ -185,7 +185,7 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-member-expression-to-functions@^7.12.1": +"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== @@ -214,7 +214,7 @@ "@babel/types" "^7.12.1" lodash "^4.17.19" -"@babel/helper-optimise-call-expression@^7.10.4": +"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== @@ -236,14 +236,14 @@ "@babel/types" "^7.12.1" "@babel/helper-replace-supers@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9" - integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" + integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/helper-member-expression-to-functions" "^7.12.7" + "@babel/helper-optimise-call-expression" "^7.12.10" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.11" "@babel/helper-simple-access@^7.12.1": version "7.12.1" @@ -260,21 +260,21 @@ "@babel/types" "^7.12.1" "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" - integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" + integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== dependencies: - "@babel/types" "^7.11.0" + "@babel/types" "^7.12.11" -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== +"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9" - integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A== +"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f" + integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw== "@babel/helper-wrap-function@^7.10.4": version "7.12.3" @@ -305,9 +305,9 @@ js-tokens "^4.0.0" "@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81" - integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" + integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== "@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.12.1" @@ -592,10 +592,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1" - integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w== +"@babel/plugin-transform-block-scoping@^7.12.11", "@babel/plugin-transform-block-scoping@^7.8.3": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.11.tgz#83ae92a104dbb93a7d6c6dd1844f351083c46b4f" + integrity sha512-atR1Rxc3hM+VPg/NvNvfYw0npQEAcHuJ+MGZnFn6h3bo+1U3BWXMdFMlvVRApBTWKQMX7SOwRJZA5FBF/JQbvA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -783,11 +783,11 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08" - integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.11.tgz#078aa7e1f5f75a68ee9598ebed90000fcb11092f" + integrity sha512-5MvsGschXeXJsbzQGR/BH89ATMzCsM7rx95n+R7/852cGoK2JgMbacDw/A9Pmrfex4tArdMab0L5SBV4SB/Nxg== dependencies: - "@babel/helper-builder-react-jsx-experimental" "^7.12.4" + "@babel/helper-builder-react-jsx-experimental" "^7.12.11" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" @@ -806,12 +806,12 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.9.1": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.10.tgz#a7af3097c73479123594c8c8fe39545abebd44e3" - integrity sha512-MM7/BC8QdHXM7Qc1wdnuk73R4gbuOpfrSUgfV/nODGc86sPY1tgmY2M9E9uAnf2e4DOIp8aKGWqgZfQxnTNGuw== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.11.tgz#09a7319195946b0ddc09f9a5f01346f2cb80dfdd" + integrity sha512-5nWOw6mTylaFU72BdZfa0dP1HsGdY3IMExpxn8LBE8dNmkQjB+W+sR+JwIdtbzkPvVuFviT3zyNbSUkuVTVxbw== dependencies: "@babel/helper-builder-react-jsx" "^7.10.4" - "@babel/helper-builder-react-jsx-experimental" "^7.12.10" + "@babel/helper-builder-react-jsx-experimental" "^7.12.11" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" @@ -974,15 +974,15 @@ semver "^5.5.0" "@babel/preset-env@^7.4.5": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.10.tgz#ca981b95f641f2610531bd71948656306905e6ab" - integrity sha512-Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" + integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== dependencies: "@babel/compat-data" "^7.12.7" "@babel/helper-compilation-targets" "^7.12.5" "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.1" + "@babel/helper-validator-option" "^7.12.11" "@babel/plugin-proposal-async-generator-functions" "^7.12.1" "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-dynamic-import" "^7.12.1" @@ -1011,7 +1011,7 @@ "@babel/plugin-transform-arrow-functions" "^7.12.1" "@babel/plugin-transform-async-to-generator" "^7.12.1" "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.11" "@babel/plugin-transform-classes" "^7.12.1" "@babel/plugin-transform-computed-properties" "^7.12.1" "@babel/plugin-transform-destructuring" "^7.12.1" @@ -1041,7 +1041,7 @@ "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.11" core-js-compat "^3.8.0" semver "^5.5.0" @@ -1133,12 +1133,12 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260" - integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw== +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce" + integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" to-fast-properties "^2.0.0" @@ -1585,9 +1585,9 @@ "@hapi/hoek" "9.x.x" "@hapi/boom@9.x.x", "@hapi/boom@^9.1.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz#0d9517657a56ff1e0b42d0aca9da1b37706fec56" - integrity sha512-4nZmpp4tXbm162LaZT45P7F7sgiem8dwAh2vHWT6XX24dozNjGMg6BvKCRvtCUcmcXqeMIUqWN8Rc5X8yKuROQ== + version "9.1.1" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.1.tgz#89e6f0e01637c2a4228da0d113e8157c93677b04" + integrity sha512-VNR8eDbBrOxBgbkddRYIe7+8DZ+vSbV6qlmaN2x7eWjsUjy2VmQgChkOKcVZIeupEZYj+I0dqNg430OhwzagjA== dependencies: "@hapi/hoek" "9.x.x" @@ -2367,21 +2367,6 @@ dependencies: "@types/node" "*" -"@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" @@ -2447,20 +2432,20 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*", "@types/node@^14.14.7": - version "14.14.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.12.tgz#0b1d86f8c40141091285dea02e4940df73bba43f" - integrity sha512-ASH8OPHMNlkdjrEdmoILmzFfsJICvhBsFfAum4aKZ/9U4B6M6tTmTPh+f3ttWdD74CEGV5XvXWkbyfSdXaTd7g== +"@types/node@*": + version "14.14.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae" + integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ== "@types/node@^12.12.6": - version "12.19.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.8.tgz#efd6d1a90525519fc608c9db16c8a78f7693a978" - integrity sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg== + version "12.19.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679" + integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q== "@types/node@^13.7.0": - version "13.13.35" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.35.tgz#d417b48313d691f5c8ff9c52cbc19cdecd306b5e" - integrity sha512-q9aeOGwv+RRou/ca4aJVUM/jD5u7LBexu+rq9PkA/NhHNn8JifcMo94soKm0b6JGSfw/PSNdqtc428OscMvEYA== + version "13.13.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.36.tgz#0c4d3c4e365396c84b1c595524e2faff7dd45b26" + integrity sha512-ctzZJ+XsmHQwe3xp07gFUq4JxBaRSYzKHPgblR76//UanGST7vfFNF0+ty5eEbgTqsENopzoDK090xlha9dccQ== "@types/parse-json@^4.0.0": version "4.0.0" @@ -2844,6 +2829,11 @@ aes-js@3.0.0: resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0= +after@0.8.2: + version "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: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -3077,7 +3067,7 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.0.3, array-includes@^3.1.1: +array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8" integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw== @@ -3140,6 +3130,11 @@ array.prototype.map@^1.0.1: es-array-method-boxes-properly "^1.0.0" is-string "^1.0.5" +arraybuffer.slice@~0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" + integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -3467,12 +3462,17 @@ base64-arraybuffer@0.1.4: resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= +base64-arraybuffer@0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" + integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg= + base64-js@^1.0.2, 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== @@ -3515,6 +3515,13 @@ bech32@1.1.4: resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9" integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ== +better-assert@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" + integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI= + dependencies: + callsite "1.0.0" + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -3582,6 +3589,11 @@ blob-to-it@^1.0.1: dependencies: browser-readablestream-to-it "^1.0.1" +blob@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" + integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== + bluebird@^3.5.0, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" @@ -4017,6 +4029,11 @@ caller-path@^2.0.0: dependencies: caller-callsite "^2.0.0" +callsite@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" + integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA= + callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" @@ -4056,9 +4073,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001165: - version "1.0.30001165" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz#32955490d2f60290bb186bb754f2981917fa744f" - integrity sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA== + version "1.0.30001168" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001168.tgz#6fcd098c139d003b9bd484cbb9ca26cb89907f9a" + integrity sha512-P2zmX7swIXKu+GMMR01TWa4csIKELTNnZKc+f1CjebmZJQtTAEXmpQSoKVJVVcvPGAA0TEYTOUp3VehavZSFPQ== capture-exit@^2.0.0: version "2.0.0" @@ -4254,12 +4271,12 @@ cids@^0.7.1: multihashes "~0.4.15" cids@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/cids/-/cids-1.1.2.tgz#d96656806c3f493be2046832e37d5f1cf17228ff" - integrity sha512-yol0+pkvGwiIKyH4rsKS0MuV0b0ZkEXBrWLF693V7jYWXyT0kYJsOI9ArzbfGzx920fSxIsO1/HJqdoc5MMVug== + version "1.1.4" + resolved "https://registry.yarnpkg.com/cids/-/cids-1.1.4.tgz#d2aa4343fef971ef896b032fa0b99a66755d0f98" + integrity sha512-mo0IWZKcaQZsret8cP39MzDnPVT9NhhQEVaIKwWnBFaLtj2slTFckYMnbk15ptewNkb22qRBLfuBK+qiWYW/Mg== dependencies: multibase "^3.0.1" - multicodec "=2.0.4" + multicodec "^2.1.0" multihashes "^3.0.1" uint8arrays "^1.1.0" @@ -4495,11 +4512,21 @@ component-bind@1.0.0: resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= +component-emitter@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== +component-inherit@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" + integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= + compose-function@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f" @@ -4622,16 +4649,16 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= +cookie@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= + cookie@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -cookie@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" - integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== - cookiejar@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" @@ -4682,7 +4709,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: version "2.8.5" resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== @@ -4755,6 +4782,13 @@ create-react-context@^0.3.0: gud "^1.0.0" warning "^4.0.3" +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + cross-spawn@7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" @@ -4775,7 +4809,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0: +cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -5141,6 +5175,13 @@ debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: 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" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -5609,9 +5650,9 @@ electron-fetch@^1.7.2: encoding "^0.1.13" electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.621: - version "1.3.623" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.623.tgz#b61ba1d94b27031554ea2768bb9b823501a918a0" - integrity sha512-CgbWTyPmJ4f9pqtqR+HPL3O0ay6BRhnpFD52TqBB2K8kTAcmAar2e93Vo1q651E4vnCHuTDuZDdbj0sTMP2QQw== + version "1.3.629" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.629.tgz#a08d13b64d90e3c77ec5b9bffa3efbc5b4a00969" + integrity sha512-iSPPJtPvHrMAvYOt+9cdbDmTasPqwnwz4lkP8Dn200gDNUBQOLQ96xUsWXBwXslAo5XxdoXAoQQ3RAy4uao9IQ== elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: version "6.5.3" @@ -5680,40 +5721,44 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -engine.io-client@~4.0.0: - version "4.0.5" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-4.0.5.tgz#e12b05a11a7a3cccec6d69f9af8435146e3d507e" - integrity sha512-1lkn0QdekHQPMTcxUh8LqIuxQHNtKV5GvqkQzmZ1rYKAvB6puMm13U7K1ps3OQZ4joE46asQiAKrcdL9weNEVw== +engine.io-client@~3.4.0: + version "3.4.4" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967" + integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ== dependencies: - base64-arraybuffer "0.1.4" component-emitter "~1.3.0" - debug "~4.1.0" - engine.io-parser "~4.0.1" + component-inherit "0.0.3" + debug "~3.1.0" + engine.io-parser "~2.2.0" has-cors "1.1.0" + indexof "0.0.1" parseqs "0.0.6" parseuri "0.0.6" - ws "~7.2.1" + ws "~6.1.0" xmlhttprequest-ssl "~1.5.4" yeast "0.1.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== +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" + integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg== dependencies: + after "0.8.2" + arraybuffer.slice "~0.0.7" base64-arraybuffer "0.1.4" + blob "0.0.5" + has-binary2 "~1.0.2" -engine.io@~4.0.0: - version "4.0.5" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.0.5.tgz#3ff6d5c72560ad93423c1ce1e807733206622a1c" - integrity sha512-Ri+whTNr2PKklxQkfbGjwEo+kCBUM4Qxk4wtLqLrhH+b1up2NFL9g9pjYWiCV/oazwB0rArnvF/ZmZN2ab5Hpg== +engine.io@~3.4.0: + version "3.4.2" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c" + integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg== dependencies: accepts "~1.3.4" base64id "2.0.0" - cookie "~0.4.1" - cors "~2.8.5" + cookie "0.3.1" debug "~4.1.0" - engine.io-parser "~4.0.0" + engine.io-parser "~2.2.0" ws "^7.1.2" enhanced-resolve@^4.1.0: @@ -5741,9 +5786,9 @@ err-code@^2.0.0, err-code@^2.0.1, err-code@^2.0.3: integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" + integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== dependencies: prr "~1.0.1" @@ -6428,19 +6473,19 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== +execa@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376" + integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" is-stream "^2.0.0" merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" strip-final-newline "^2.0.0" exenv@^1.2.2: @@ -6866,9 +6911,9 @@ fnv1a@^1.0.1: integrity sha1-kV4tbQI8Q9UiStn20qPEFW9XEvU= follow-redirects@^1.0.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" - integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== + version "1.13.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" + integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== for-in@^0.1.3: version "0.1.8" @@ -7129,13 +7174,18 @@ get-stream@^4.0.0, get-stream@^4.1.0: dependencies: pump "^3.0.0" -get-stream@^5.0.0, get-stream@^5.1.0: +get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" +get-stream@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718" + integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -7181,11 +7231,11 @@ glob@7.1.6, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glo path-is-absolute "^1.0.0" global-dirs@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201" - integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A== + version "2.1.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" + integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ== dependencies: - ini "^1.3.5" + ini "1.3.7" global-modules@2.0.0: version "2.0.0" @@ -7373,6 +7423,13 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-binary2@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" + integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== + dependencies: + isarray "2.0.1" + has-cors@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" @@ -7569,9 +7626,9 @@ html-encoding-sniffer@^1.0.2: whatwg-encoding "^1.0.1" html-entities@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" - integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== + version "1.3.3" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.3.tgz#3dca638a43ee7de316fc23067398491152ad4736" + integrity sha512-/VulV3SYni1taM7a4RMdceqzJWR39gpZHjBwUnsCFKWV/GJkD14CJ5F7eWcZozmHJK0/f/H5U3b3SiPkuvxMgg== html-escaper@^2.0.0: version "2.0.2" @@ -7727,10 +7784,10 @@ 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= -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== humble-localstorage@^1.4.2: version "1.4.2" @@ -7901,6 +7958,11 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= +indexof@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" + integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= + infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" @@ -7929,6 +7991,11 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +ini@1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== + ini@^1.3.5, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" @@ -8092,25 +8159,23 @@ ipfs-block-service@^0.18.0: err-code "^2.0.0" streaming-iterables "^5.0.2" -ipfs-cli@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/ipfs-cli/-/ipfs-cli-0.2.2.tgz#24223ba5f414e2f85ad2908cd8c1399e47192fef" - integrity sha512-9DhIdTd8P/uvBv+IdhGjHEl2lpeXm8x2sj30PLddBHFo9PHOWUfqwo7FYHYIzn6MiakL0XWph4HAKX9Jw0iHJA== +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== dependencies: bignumber.js "^9.0.0" byteman "^1.3.5" cid-tool "^1.0.0" cids "^1.0.0" debug "^4.1.1" - dlv "^1.1.3" err-code "^2.0.3" - execa "^4.0.3" + execa "^5.0.0" get-folder-size "^2.0.1" - ipfs-core "^0.3.0" - ipfs-core-utils "^0.5.3" - ipfs-http-client "^48.1.2" - ipfs-http-gateway "^0.1.3" - ipfs-http-server "^0.1.3" + 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" ipld-dag-cbor "^0.17.0" @@ -8121,12 +8186,7 @@ ipfs-cli@^0.2.2: it-glob "0.0.10" it-pipe "^1.1.0" jsondiffpatch "^0.4.1" - just-safe-set "^2.1.0" - libp2p "^0.29.3" libp2p-crypto "^0.18.0" - libp2p-delegated-content-routing "^0.8.0" - libp2p-delegated-peer-routing "^0.8.0" - libp2p-webrtc-star "^0.20.1" mafmt "^8.0.0" multiaddr "^8.0.0" multiaddr-to-uri "^6.0.0" @@ -8140,9 +8200,6 @@ ipfs-cli@^0.2.2: streaming-iterables "^5.0.2" uint8arrays "^1.1.0" yargs "^16.0.3" - optionalDependencies: - prom-client "^12.0.0" - prometheus-gc-stats "^0.6.0" ipfs-core-utils@^0.4.0: version "0.4.0" @@ -8159,10 +8216,10 @@ ipfs-core-utils@^0.4.0: it-peekable "0.0.1" uint8arrays "^1.1.0" -ipfs-core-utils@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.5.3.tgz#1590301675cb7f0d5103f49c6543b1dfd9a4c04d" - integrity sha512-JuJz+sp+9+g7U5j0+M6+biBnVtbJnlRNuBrqku/RcwoH4IIMTX99PctGGyo8AjCo5ZK+j0om1Pp2cWTZrlSdAQ== +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" @@ -8179,10 +8236,10 @@ ipfs-core-utils@^0.5.3: timeout-abort-controller "^1.1.1" uint8arrays "^1.1.0" -ipfs-core@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ipfs-core/-/ipfs-core-0.3.0.tgz#eb2f4a62d5adb2575e0ba3a43508e4f9d17818db" - integrity sha512-uBcYGsIM8lb8dixDvZ09OrMM5nBsvMQX9tUFS3+oo24JRhGKMWtDVV3umn26mXygobdQfGCTZFqjVMxoLssVEA== +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== dependencies: array-shuffle "^1.0.1" bignumber.js "^9.0.0" @@ -8200,11 +8257,11 @@ ipfs-core@^0.3.0: interface-datastore "^2.0.0" ipfs-bitswap "^4.0.0" ipfs-block-service "^0.18.0" - ipfs-core-utils "^0.5.3" + ipfs-core-utils "^0.5.4" ipfs-repo "^7.0.0" ipfs-unixfs "^2.0.3" ipfs-unixfs-exporter "^3.0.4" - ipfs-unixfs-importer "^4.0.0" + ipfs-unixfs-importer "^5.0.0" ipfs-utils "^5.0.0" ipld "^0.28.0" ipld-block "^0.11.0" @@ -8240,13 +8297,34 @@ ipfs-core@^0.3.0: multicodec "^2.0.1" multihashing-async "^2.0.1" native-abort-controller "~0.0.3" - p-defer "^3.0.0" p-queue "^6.6.1" parse-duration "^0.4.4" peer-id "^0.14.1" streaming-iterables "^5.0.2" uint8arrays "^1.1.0" +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== + 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" + just-safe-set "^2.1.0" + libp2p "^0.29.3" + libp2p-delegated-content-routing "^0.8.0" + libp2p-delegated-peer-routing "^0.8.0" + libp2p-webrtc-star "^0.20.1" + multiaddr "^8.0.0" + optionalDependencies: + prom-client "^12.0.0" + prometheus-gc-stats "^0.6.0" + 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" @@ -8282,17 +8360,17 @@ ipfs-http-client@^47.0.1: stream-to-it "^0.2.1" uint8arrays "^1.1.0" -ipfs-http-client@^48.1.2: - version "48.1.2" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.2.tgz#7cdb731e792e4d235be1e19726ccaf12e55ff0b6" - integrity sha512-eeqHhjYUgPNBKxkS29xYS7Mtc9JxzLKI9Bua2nphB5vG1l6W2hjDTntfVl4ddY07XqZogDu6yTL3UsFj0WJFeg== +ipfs-http-client@^48.1.3: + version "48.1.3" + resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.3.tgz#d9b91b1f65d54730de92290d3be5a11ef124b400" + integrity sha512-+JV4cdMaTvYN3vd4r6+mcVxV3LkJXzc4kn2ToVbObpVpdqmG34ePf1KlvFF8A9gjcel84WpiP5xCEV/IrisPBA== dependencies: any-signal "^2.0.0" bignumber.js "^9.0.0" cids "^1.0.0" debug "^4.1.1" form-data "^3.0.0" - ipfs-core-utils "^0.5.3" + ipfs-core-utils "^0.5.4" ipfs-utils "^5.0.0" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" @@ -8313,10 +8391,10 @@ ipfs-http-client@^48.1.2: stream-to-it "^0.2.2" uint8arrays "^1.1.0" -ipfs-http-gateway@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/ipfs-http-gateway/-/ipfs-http-gateway-0.1.3.tgz#0a5689d692bd802cea72a3a5866396f2636be846" - integrity sha512-SwBRSvwwXxlYEUBlDOBngmKFifnCFjs7HM90mgJnRjahDZzGV8YKAZpVLys0szLybz+pqGKK7LxSo7+ALS2hKQ== +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== dependencies: "@hapi/ammo" "^5.0.1" "@hapi/boom" "^9.1.0" @@ -8324,7 +8402,7 @@ ipfs-http-gateway@^0.1.3: cids "^1.0.0" debug "^4.1.1" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.3" + ipfs-core-utils "^0.5.4" ipfs-http-response "^0.6.0" is-ipfs "^2.0.0" it-last "^1.0.4" @@ -8350,10 +8428,10 @@ ipfs-http-response@^0.6.0: multihashes "^3.0.1" p-try-each "^1.0.1" -ipfs-http-server@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/ipfs-http-server/-/ipfs-http-server-0.1.3.tgz#5f5c06c12a3d29d27eff56c806d7ca893c428789" - integrity sha512-Hn7mEgfifHSVL1DFO1mIIytYiOW3Zlav+t6yQjdU+mgTzyH/4C7vwbz7V6ib5IfShROrfmeE6ahkt4IvEb9wxA== +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== dependencies: "@hapi/boom" "^9.1.0" "@hapi/content" "^5.0.2" @@ -8363,8 +8441,8 @@ ipfs-http-server@^0.1.3: dlv "^1.1.3" err-code "^2.0.3" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.3" - ipfs-http-gateway "^0.1.3" + ipfs-core-utils "^0.5.4" + ipfs-http-gateway "^0.1.4" ipfs-unixfs "^2.0.3" ipld-dag-pb "^0.20.0" it-all "^1.0.4" @@ -8483,16 +8561,16 @@ ipfs-unixfs-exporter@^3.0.4: it-last "^1.0.1" multihashing-async "^2.0.0" -ipfs-unixfs-importer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ipfs-unixfs-importer/-/ipfs-unixfs-importer-4.0.0.tgz#da9906225fbe0eb9d3ebed05c6ed4a41b5812376" - integrity sha512-ybTcgjNBaB6azQz8jJYESweATJFoc6D+Xo8USM0GahRx9xlFS+4qjnmGbC6H9RcFFt81amcP/P1zX9v83wo3cA== +ipfs-unixfs-importer@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ipfs-unixfs-importer/-/ipfs-unixfs-importer-5.0.0.tgz#f87bc69f99b08ef5d904ecdcd2fc74e9360122ca" + integrity sha512-bvdnCXwwCj72w/FQ7o6XcvrcbCUgXrruK0UZOfhl/mf44Nv0DWyn1Y4hQF/u63rJvYLQdAMlqniAAtFQpHQhcg== dependencies: bl "^4.0.0" err-code "^2.0.0" hamt-sharding "^1.0.0" ipfs-unixfs "^2.0.4" - ipfs-utils "^4.0.0" + ipfs-utils "^5.0.0" ipld-dag-pb "^0.20.0" it-all "^1.0.1" it-batch "^1.0.3" @@ -8592,13 +8670,13 @@ ipfs-utils@^5.0.0: stream-to-it "^0.2.0" ipfs@~0.52.0: - version "0.52.2" - resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.2.tgz#e568d6b5818e3c2deddf7e7230ce7b87fb3b8537" - integrity sha512-2OZe6HyHGzSfdv55RFuw89n43zj+hPGLfmsz0h2LL4OH7ERtQVCH/5foDEoV6NJsXnBnps8w6adCtyrZeze9IQ== + version "0.52.3" + resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.3.tgz#4a1e1651da197fb8dfdcd01abd20308198059b66" + integrity sha512-zCd2Ziq1GYDJizXdoAj5nof325i3mx2kzOhG6E+xdEK6FcK6kQwKendaBlQHwTbzHLqLI7ITxsepQzFWNopI2g== dependencies: debug "^4.1.1" - ipfs-cli "^0.2.2" - ipfs-core "^0.3.0" + ipfs-cli "^0.2.3" + ipfs-core "^0.3.1" ipfs-repo "^7.0.0" semver "^7.3.2" update-notifier "^5.0.0" @@ -8967,9 +9045,9 @@ is-loopback-addr@^1.0.0: integrity sha512-DhWU/kqY7X2F6KrrVTu7mHlbd2Pbo4D1YkAzasBMjQs6lJAoefxaA6m6CpSX0K6pjt9D0b9PNFI5zduy/vzOYw== is-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" - integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" + integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== is-negative-zero@^2.0.0: version "2.0.1" @@ -9092,9 +9170,9 @@ is-root@2.1.0: integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== is-set@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" - integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" + integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== is-stream@^1.0.0, is-stream@^1.1.0: version "1.1.0" @@ -9162,6 +9240,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isarray@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" + integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= + isarray@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" @@ -10151,12 +10234,12 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: object.assign "^4.1.0" "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz#642f1d7b88aa6d7eb9d8f2210e166478444fa891" - integrity sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82" + integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q== dependencies: - array-includes "^3.1.1" - object.assign "^4.1.1" + array-includes "^3.1.2" + object.assign "^4.1.2" just-debounce-it@^1.1.0: version "1.1.0" @@ -10686,9 +10769,9 @@ libp2p-interfaces@^0.7.1: uint8arrays "^1.1.0" libp2p-kad-dht@^0.20.1: - version "0.20.3" - resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.3.tgz#8cc434358708c9c610e30b85bc0b5fcd6c42b39d" - integrity sha512-AHFasvp60xYRhyfSsjlP4O08MPt43TbtbtrOt7Yh9wuciYc7RL0p4mZ+bGLrU1WujFVulUQZULEpCPAz6k9Rqg== + version "0.20.4" + resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.4.tgz#2a1f61e86a10942ef16a7553a91ff96e598c55a0" + integrity sha512-7v4+3bdcoGUyR/8Y5G/Ok9UyhuqghpXFZq5VpW3oph5WtR348snTaBTPkI/8xkQmBxvLIAMxuomp7cMrQaTUyw== dependencies: abort-controller "^3.0.0" async "^2.6.2" @@ -10787,7 +10870,7 @@ libp2p-tcp@^0.15.0, libp2p-tcp@^0.15.1: multiaddr "^8.0.0" stream-to-it "^0.2.2" -libp2p-utils@^0.2.0, libp2p-utils@^0.2.3: +libp2p-utils@^0.2.0, libp2p-utils@^0.2.1: version "0.2.3" resolved "https://registry.yarnpkg.com/libp2p-utils/-/libp2p-utils-0.2.3.tgz#4eb2a59a9eda342bed73cb94553c87a63c95848a" integrity sha512-9BoMCgvJF7LJ+JVMaHtqfCqhZN4i/sx0DrY6lf9U0Rq9uUgQ9qTai2O9LXcfr1LOS3OMMeRLsKk25MMgsf7W3w== @@ -10813,9 +10896,9 @@ libp2p-webrtc-peer@^10.0.1: readable-stream "^3.4.0" libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1: - version "0.20.4" - resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.4.tgz#485b9fa9d0f76c1361813a88aa1882927e369092" - integrity sha512-t8mn+Wcdy+HLPSAfhHJWza8Ecp28ZmYvXtVZ4GKLTDe7aLB2S+VTwTNsSdETdnJXvetCftCJvaK2RSiniPeHSg== + version "0.20.5" + resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.5.tgz#c52364dfbe59fd8e5da0e32feeaca374d3a79f9a" + integrity sha512-Tny1+q0EY192WgrkNCV7360ifI3RXjMoao91qwLhNwx7ArsqVMzrZvBnK3MTMmYQaGE1W0n/CLlw/Nn344iv2Q== dependencies: "@hapi/hapi" "^20.0.0" "@hapi/inert" "^6.0.3" @@ -10825,7 +10908,7 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1: err-code "^2.0.3" ipfs-utils "^5.0.0" it-pipe "^1.1.0" - libp2p-utils "^0.2.3" + libp2p-utils "^0.2.1" libp2p-webrtc-peer "^10.0.1" mafmt "^8.0.0" menoetius "0.0.2" @@ -10834,8 +10917,8 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1: p-defer "^3.0.0" peer-id "^0.14.2" prom-client "^12.0.0" - socket.io "^3.0.4" - socket.io-client "^3.0.4" + socket.io "^2.3.0" + socket.io-client "^2.3.0" stream-to-it "^0.2.2" streaming-iterables "^5.0.3" @@ -11392,9 +11475,9 @@ mime@1.6.0: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4: - version "2.4.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" - integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + version "2.4.7" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" + integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== mimic-fn@^1.0.0: version "1.2.0" @@ -11707,14 +11790,6 @@ multicast-dns@^7.2.0: dns-packet "^4.0.0" thunky "^1.0.2" -multicodec@=2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.0.4.tgz#d83f9ade800fd224860977401b2e4b9293a98811" - integrity sha512-baVjBRYT8cqwlkUIUL4xYLQ0M9Cm1R6Nhn8WykEOhyG7bS81HXKr++o+8Nua/GRkVWfB/MTtDIvIdLwsZ2PuJg== - dependencies: - uint8arrays "1.1.0" - varint "^6.0.0" - multicodec@^0.5.5: version "0.5.7" resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-0.5.7.tgz#1fb3f9dd866a10a55d226e194abba2dcc1ee9ffd" @@ -11730,7 +11805,7 @@ multicodec@^1.0.0: buffer "^5.6.0" varint "^5.0.0" -multicodec@^2.0.0, multicodec@^2.0.1: +multicodec@^2.0.0, multicodec@^2.0.1, multicodec@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.1.0.tgz#b66dff2184e91e74ac68981e0deba2591bbf1f87" integrity sha512-7AYpK/avswOWvnqQ9/jOkQCS7Fp4aKxw5ojvn5gyK2VQTZz3YVXeLMzoIZDBy745JSfJMXkTS0ptnHci5Mt1mA== @@ -12155,7 +12230,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^4.0.0: +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -12217,6 +12292,11 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1 resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= +object-component@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" + integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE= + object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -12365,7 +12445,7 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -onetime@^5.1.0: +onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -12946,11 +13026,25 @@ parse5@5.1.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== +parseqs@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" + integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0= + dependencies: + better-assert "~1.0.0" + parseqs@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== +parseuri@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" + integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo= + dependencies: + better-assert "~1.0.0" + parseuri@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" @@ -14395,9 +14489,9 @@ react-error-overlay@^6.0.7: integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw== react-i18next@^11.7.3: - version "11.8.3" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.3.tgz#d365586a537f759a1bff75e01054f6a5fc71e4f5" - integrity sha512-E5LjGmM3Kgje4M0oSkHFNAxiU1BM+P1J9QPfF7+Agm4sa1YS18GhQNJCZD3o9ofZLjq8ocQfGUuYweYGfrj0RQ== + version "11.8.4" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.4.tgz#5407d2edcaa704c38e4034e7ac06413914ed6e6d" + integrity sha512-QlPJfX+Roi+jEQ6frBSsLHHH+VWbUoCl6wZDT8XHMd6PsSgepjgD2sZf/h7F46JnHeuy0U+SxY3TtrJF+aDIyg== dependencies: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" @@ -15455,7 +15549,7 @@ side-channel@^1.0.2, side-channel@^1.0.3: es-abstract "^1.18.0-next.0" object-inspect "^1.8.0" -signal-exit@^3.0.0, signal-exit@^3.0.2: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== @@ -15560,48 +15654,77 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -socket.io-adapter@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz#372b7cde7a535fc4f4f0d5ac7f73952a3062d438" - integrity sha512-2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ== +socket.io-adapter@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" + integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-client@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-3.0.4.tgz#c0203419a9f71e1360ef92a31301e80260e94bb9" - integrity sha512-qMvBuS+W9JIN2mkfAWDCxuIt+jpIKDf8C0604zEqx1JrPaPSS6cN0F3B2GYWC83TqBeVJXW66GFxWV3KD88n0Q== +socket.io-client@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4" + integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA== dependencies: - "@types/component-emitter" "^1.2.10" backo2 "1.0.2" + base64-arraybuffer "0.1.5" component-bind "1.0.0" - component-emitter "~1.3.0" + component-emitter "1.2.1" debug "~4.1.0" - engine.io-client "~4.0.0" + engine.io-client "~3.4.0" + has-binary2 "~1.0.2" + has-cors "1.1.0" + indexof "0.0.1" + object-component "0.0.3" + parseqs "0.0.5" + parseuri "0.0.5" + socket.io-parser "~3.3.0" + to-array "0.1.4" + +socket.io-client@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz#91a4038ef4d03c19967bb3c646fec6e0eaa78cff" + integrity sha512-YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ== + dependencies: + backo2 "1.0.2" + component-bind "1.0.0" + component-emitter "~1.3.0" + debug "~3.1.0" + engine.io-client "~3.4.0" + has-binary2 "~1.0.2" + indexof "0.0.1" + parseqs "0.0.6" parseuri "0.0.6" - socket.io-parser "~4.0.1" + socket.io-parser "~3.3.0" + to-array "0.1.4" -socket.io-parser@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.2.tgz#3d021a9c86671bb079e7c6c806db6a1d9b1bc780" - integrity sha512-Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g== +socket.io-parser@~3.3.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199" + integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ== dependencies: - "@types/component-emitter" "^1.2.10" component-emitter "~1.3.0" + debug "~3.1.0" + isarray "2.0.1" + +socket.io-parser@~3.4.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" + integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== + dependencies: + component-emitter "1.2.1" debug "~4.1.0" + isarray "2.0.1" -socket.io@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.0.4.tgz#20130a80b57e48dadb671f22e3776047cc7f9d53" - integrity sha512-Vj1jUoO75WGc9txWd311ZJJqS9Dr8QtNJJ7gk2r7dcM/yGe9sit7qOijQl3GAwhpBOz/W8CwkD7R6yob07nLbA== +socket.io@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb" + integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg== dependencies: - "@types/cookie" "^0.4.0" - "@types/cors" "^2.8.8" - "@types/node" "^14.14.7" - accepts "~1.3.4" - base64id "~2.0.0" debug "~4.1.0" - engine.io "~4.0.0" - socket.io-adapter "~2.0.3" - socket.io-parser "~4.0.1" + engine.io "~3.4.0" + has-binary2 "~1.0.2" + socket.io-adapter "~1.1.0" + socket.io-client "2.3.0" + socket.io-parser "~3.4.0" sockjs-client@1.4.0: version "1.4.0" @@ -16397,6 +16520,11 @@ tmpl@1.0.x: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= +to-array@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" + integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= + to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -17120,9 +17248,9 @@ wbuf@^1.1.0, wbuf@^1.7.3: minimalistic-assert "^1.0.0" web-encoding@^1.0.2, web-encoding@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.4.tgz#0398d39ce2cbef5ed2617080750ed874e6153aea" - integrity sha512-DcXs2lbVPzuJmn2kuDEwul2oZg7p4YMa5J2f0YzsOBHaAnBYGPNUB/rJ74DTjTKpw7F0+lSsVM8sFHE2UyBixg== + version "1.0.6" + resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.6.tgz#ec631356ee523b4474ecbcae680440bd1e79416a" + integrity sha512-26wEnRPEFAc5d5lmH1Q/DuvWEYsRF1D2alX2jlKpdmqv7cj+BbANL7Xlcl9r4s72Eg9kItZa9RWVbBMC9dMv4w== web3-bzz@1.3.0: version "1.3.0" @@ -17369,9 +17497,9 @@ webidl-conversions@^4.0.2: integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== webpack-dev-middleware@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" - integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw== + version "3.7.3" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5" + integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ== dependencies: memory-fs "^0.4.1" mime "^2.4.4" @@ -17829,10 +17957,12 @@ ws@^7.1.2, ws@^7.3.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ== -ws@~7.2.1: - version "7.2.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d" - integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA== +ws@~6.1.0: + version "6.1.4" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9" + integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA== + dependencies: + async-limiter "~1.0.0" xdg-basedir@^4.0.0: version "4.0.0" From c9afa098ac894580f0427ad44e72c0182c4b368a Mon Sep 17 00:00:00 2001 From: Ezerous Date: Fri, 18 Dec 2020 12:13:21 +0200 Subject: [PATCH 16/37] Bump solc --- packages/concordia-contracts/.solhint.json | 2 +- packages/concordia-contracts/contracts/Forum.sol | 3 +-- packages/concordia-contracts/contracts/Migrations.sol | 2 +- packages/concordia-contracts/contracts/PostVoting.sol | 2 +- packages/concordia-contracts/contracts/Voting.sol | 2 +- packages/concordia-contracts/test/TestVoting.sol | 2 +- packages/concordia-contracts/truffle-config.js | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/concordia-contracts/.solhint.json b/packages/concordia-contracts/.solhint.json index 4f56664..c610645 100644 --- a/packages/concordia-contracts/.solhint.json +++ b/packages/concordia-contracts/.solhint.json @@ -1,7 +1,7 @@ { "extends": "solhint:recommended", "rules": { - "compiler-version": ["error","^0.7.5"], + "compiler-version": ["error","~0.8.0"], "func-visibility": ["warn",{"ignoreConstructors" : true}], "not-rely-on-time": "off", "state-visibility": "off" diff --git a/packages/concordia-contracts/contracts/Forum.sol b/packages/concordia-contracts/contracts/Forum.sol index b450565..233300c 100644 --- a/packages/concordia-contracts/contracts/Forum.sol +++ b/packages/concordia-contracts/contracts/Forum.sol @@ -1,6 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.5; -pragma experimental ABIEncoderV2; +pragma solidity 0.8.0; contract Forum { // Error messages for require() diff --git a/packages/concordia-contracts/contracts/Migrations.sol b/packages/concordia-contracts/contracts/Migrations.sol index 3382b16..d90faf7 100644 --- a/packages/concordia-contracts/contracts/Migrations.sol +++ b/packages/concordia-contracts/contracts/Migrations.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.5; +pragma solidity 0.8.0; contract Migrations { address public owner; diff --git a/packages/concordia-contracts/contracts/PostVoting.sol b/packages/concordia-contracts/contracts/PostVoting.sol index ac129a0..3d1b073 100644 --- a/packages/concordia-contracts/contracts/PostVoting.sol +++ b/packages/concordia-contracts/contracts/PostVoting.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.5; +pragma solidity 0.8.0; import "./Forum.sol"; diff --git a/packages/concordia-contracts/contracts/Voting.sol b/packages/concordia-contracts/contracts/Voting.sol index c264ffa..83e9c0e 100644 --- a/packages/concordia-contracts/contracts/Voting.sol +++ b/packages/concordia-contracts/contracts/Voting.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.5; +pragma solidity 0.8.0; import "./Forum.sol"; diff --git a/packages/concordia-contracts/test/TestVoting.sol b/packages/concordia-contracts/test/TestVoting.sol index 3c801a0..dd0c3a4 100644 --- a/packages/concordia-contracts/test/TestVoting.sol +++ b/packages/concordia-contracts/test/TestVoting.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.5; +pragma solidity 0.8.0; import "truffle/Assert.sol"; import "truffle/DeployedAddresses.sol"; diff --git a/packages/concordia-contracts/truffle-config.js b/packages/concordia-contracts/truffle-config.js index 6af6811..6d07a9f 100644 --- a/packages/concordia-contracts/truffle-config.js +++ b/packages/concordia-contracts/truffle-config.js @@ -10,7 +10,7 @@ module.exports = { // to customize your Truffle configuration! compilers: { solc: { - version: '0.7.5', + version: '0.8.0', }, }, contracts_build_directory: path.join(__dirname, 'build/'), From b9de63207013c2967a706b96c466f04af4cef437 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Fri, 18 Dec 2020 12:26:37 +0200 Subject: [PATCH 17/37] Up yarn.lock --- yarn.lock | 1973 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 1178 insertions(+), 795 deletions(-) diff --git a/yarn.lock b/yarn.lock index b320cea..fd9c1ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,16 +22,16 @@ "@babel/highlight" "^7.8.3" "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" - integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: "@babel/highlight" "^7.10.4" -"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.9.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9" - integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg== +"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7", "@babel/compat-data@^7.9.0": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" + integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== "@babel/core@7.9.0": version "7.9.0" @@ -56,42 +56,41 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.4.5": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" - integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" + integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.1" + "@babel/generator" "^7.12.10" "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.1" - "@babel/parser" "^7.12.3" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/helpers" "^7.12.5" + "@babel/parser" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.10" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" json5 "^2.1.2" lodash "^4.17.19" - resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" - integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A== +"@babel/generator@^7.12.10", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" + integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== dependencies: - "@babel/types" "^7.12.5" + "@babel/types" "^7.12.11" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3" - integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA== +"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" + integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.10" "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": version "7.10.4" @@ -101,14 +100,14 @@ "@babel/helper-explode-assignable-expression" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-builder-react-jsx-experimental@^7.12.1": - version "7.12.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48" - integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og== +"@babel/helper-builder-react-jsx-experimental@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.11.tgz#a39616d7e4cf8f9da1f82b5fc3ee1f7406beeb11" + integrity sha512-4oGVOekPI8dh9JphkPXC68iIuP6qp/RPbaPmorRmEFbRAHZjSqxPjqHudn18GVDPgCuFM/KdFXc63C17Ygfa9w== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-module-imports" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/helper-annotate-as-pure" "^7.12.10" + "@babel/helper-module-imports" "^7.12.5" + "@babel/types" "^7.12.11" "@babel/helper-builder-react-jsx@^7.10.4": version "7.10.4" @@ -118,7 +117,7 @@ "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.8.7": +"@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.8.7": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== @@ -140,12 +139,11 @@ "@babel/helper-split-export-declaration" "^7.10.4" "@babel/helper-create-regexp-features-plugin@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8" - integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA== + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f" + integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ== dependencies: "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-regex" "^7.10.4" regexpu-core "^4.7.1" "@babel/helper-define-map@^7.10.4": @@ -165,20 +163,20 @@ "@babel/types" "^7.12.1" "@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" + integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-get-function-arity" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/types" "^7.12.11" -"@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" - integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== +"@babel/helper-get-function-arity@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" + integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.10" "@babel/helper-hoist-variables@^7.10.4": version "7.10.4" @@ -187,14 +185,14 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-member-expression-to-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c" - integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ== +"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" + integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.7" -"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.8.3": +"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5", "@babel/helper-module-imports@^7.8.3": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== @@ -216,25 +214,18 @@ "@babel/types" "^7.12.1" lodash "^4.17.19" -"@babel/helper-optimise-call-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" - integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== +"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" + integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.10" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== -"@babel/helper-regex@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0" - integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg== - dependencies: - lodash "^4.17.19" - "@babel/helper-remap-async-to-generator@^7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd" @@ -245,14 +236,14 @@ "@babel/types" "^7.12.1" "@babel/helper-replace-supers@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9" - integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" + integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/helper-member-expression-to-functions" "^7.12.7" + "@babel/helper-optimise-call-expression" "^7.12.10" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.11" "@babel/helper-simple-access@^7.12.1": version "7.12.1" @@ -269,21 +260,21 @@ "@babel/types" "^7.12.1" "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" - integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" + integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== dependencies: - "@babel/types" "^7.11.0" + "@babel/types" "^7.12.11" -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== +"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9" - integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A== +"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f" + integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw== "@babel/helper-wrap-function@^7.10.4": version "7.12.3" @@ -295,7 +286,7 @@ "@babel/traverse" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helpers@^7.12.1", "@babel/helpers@^7.9.0": +"@babel/helpers@^7.12.5", "@babel/helpers@^7.9.0": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== @@ -313,10 +304,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0" - integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" + integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== "@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.12.1" @@ -408,10 +399,10 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-numeric-separator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@^7.8.3": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz#b1ce757156d40ed79d59d467cb2b154a5c4149ba" - integrity sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g== +"@babel/plugin-proposal-numeric-separator@^7.12.7", "@babel/plugin-proposal-numeric-separator@^7.8.3": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b" + integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" @@ -441,10 +432,10 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797" - integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw== +"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.9.0": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" + integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" @@ -601,10 +592,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1" - integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w== +"@babel/plugin-transform-block-scoping@^7.12.11", "@babel/plugin-transform-block-scoping@^7.8.3": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.11.tgz#83ae92a104dbb93a7d6c6dd1844f351083c46b4f" + integrity sha512-atR1Rxc3hM+VPg/NvNvfYw0npQEAcHuJ+MGZnFn6h3bo+1U3BWXMdFMlvVRApBTWKQMX7SOwRJZA5FBF/JQbvA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -791,36 +782,36 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx-development@^7.12.5", "@babel/plugin-transform-react-jsx-development@^7.9.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz#677de5b96da310430d6cfb7fee16a1603afa3d56" - integrity sha512-1JJusg3iPgsZDthyWiCr3KQiGs31ikU/mSf2N2dSYEAO0GEImmVUbWf0VoSDGDFTAn5Dj4DUiR6SdIXHY7tELA== +"@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.11.tgz#078aa7e1f5f75a68ee9598ebed90000fcb11092f" + integrity sha512-5MvsGschXeXJsbzQGR/BH89ATMzCsM7rx95n+R7/852cGoK2JgMbacDw/A9Pmrfex4tArdMab0L5SBV4SB/Nxg== dependencies: - "@babel/helper-builder-react-jsx-experimental" "^7.12.1" + "@babel/helper-builder-react-jsx-experimental" "^7.12.11" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" -"@babel/plugin-transform-react-jsx-self@^7.12.1", "@babel/plugin-transform-react-jsx-self@^7.9.0": +"@babel/plugin-transform-react-jsx-self@^7.9.0": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28" integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx-source@^7.12.1", "@babel/plugin-transform-react-jsx-source@^7.9.0": +"@babel/plugin-transform-react-jsx-source@^7.9.0": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b" integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx@^7.12.5", "@babel/plugin-transform-react-jsx@^7.9.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz#39ede0e30159770561b6963be143e40af3bde00c" - integrity sha512-2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ== +"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.9.1": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.11.tgz#09a7319195946b0ddc09f9a5f01346f2cb80dfdd" + integrity sha512-5nWOw6mTylaFU72BdZfa0dP1HsGdY3IMExpxn8LBE8dNmkQjB+W+sR+JwIdtbzkPvVuFviT3zyNbSUkuVTVxbw== dependencies: "@babel/helper-builder-react-jsx" "^7.10.4" - "@babel/helper-builder-react-jsx-experimental" "^7.12.1" + "@babel/helper-builder-react-jsx-experimental" "^7.12.11" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" @@ -871,13 +862,12 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" -"@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf" - integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ== +"@babel/plugin-transform-sticky-regex@^7.12.7", "@babel/plugin-transform-sticky-regex@^7.8.3": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad" + integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg== dependencies: "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-regex" "^7.10.4" "@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.8.3": version "7.12.1" @@ -886,10 +876,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.8.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a" - integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q== +"@babel/plugin-transform-typeof-symbol@^7.12.10", "@babel/plugin-transform-typeof-symbol@^7.8.4": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" + integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -984,15 +974,15 @@ semver "^5.5.0" "@babel/preset-env@^7.4.5": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" - integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" + integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== dependencies: - "@babel/compat-data" "^7.12.1" - "@babel/helper-compilation-targets" "^7.12.1" - "@babel/helper-module-imports" "^7.12.1" + "@babel/compat-data" "^7.12.7" + "@babel/helper-compilation-targets" "^7.12.5" + "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.1" + "@babel/helper-validator-option" "^7.12.11" "@babel/plugin-proposal-async-generator-functions" "^7.12.1" "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-dynamic-import" "^7.12.1" @@ -1000,10 +990,10 @@ "@babel/plugin-proposal-json-strings" "^7.12.1" "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.1" + "@babel/plugin-proposal-numeric-separator" "^7.12.7" "@babel/plugin-proposal-object-rest-spread" "^7.12.1" "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" "@babel/plugin-proposal-private-methods" "^7.12.1" "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" @@ -1021,7 +1011,7 @@ "@babel/plugin-transform-arrow-functions" "^7.12.1" "@babel/plugin-transform-async-to-generator" "^7.12.1" "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.11" "@babel/plugin-transform-classes" "^7.12.1" "@babel/plugin-transform-computed-properties" "^7.12.1" "@babel/plugin-transform-destructuring" "^7.12.1" @@ -1045,14 +1035,14 @@ "@babel/plugin-transform-reserved-words" "^7.12.1" "@babel/plugin-transform-shorthand-properties" "^7.12.1" "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.1" + "@babel/plugin-transform-sticky-regex" "^7.12.7" "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.1" + "@babel/plugin-transform-typeof-symbol" "^7.12.10" "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.1" - core-js-compat "^3.6.2" + "@babel/types" "^7.12.11" + core-js-compat "^3.8.0" semver "^5.5.0" "@babel/preset-modules@^0.1.3": @@ -1079,16 +1069,14 @@ "@babel/plugin-transform-react-jsx-source" "^7.9.0" "@babel/preset-react@^7.0.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz#d45625f65d53612078a43867c5c6750e78772c56" - integrity sha512-jcs++VPrgyFehkMezHtezS2BpnUlR7tQFAyesJn1vGTO9aTFZrgIQrA5YydlTwxbcjMwkFY6i04flCigRRr3GA== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9" + integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-react-display-name" "^7.12.1" - "@babel/plugin-transform-react-jsx" "^7.12.5" - "@babel/plugin-transform-react-jsx-development" "^7.12.5" - "@babel/plugin-transform-react-jsx-self" "^7.12.1" - "@babel/plugin-transform-react-jsx-source" "^7.12.1" + "@babel/plugin-transform-react-jsx" "^7.12.10" + "@babel/plugin-transform-react-jsx-development" "^7.12.7" "@babel/plugin-transform-react-pure-annotations" "^7.12.1" "@babel/preset-typescript@7.9.0": @@ -1121,36 +1109,36 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.10.4", "@babel/template@^7.4.0", "@babel/template@^7.8.6": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" - integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== +"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.4.0", "@babel/template@^7.8.6": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" + integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095" - integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" + integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" + "@babel/generator" "^7.12.10" "@babel/helper-function-name" "^7.10.4" "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/parser" "^7.12.10" + "@babel/types" "^7.12.10" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.12.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96" - integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA== +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce" + integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" to-fast-properties "^2.0.0" @@ -1187,7 +1175,7 @@ "@ethersproject/properties" ">=5.0.0-beta.131" "@ethersproject/strings" ">=5.0.0-beta.130" -"@ethersproject/abi@5.0.7", "@ethersproject/abi@^5.0.5": +"@ethersproject/abi@5.0.7": version "5.0.7" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b" integrity sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw== @@ -1202,10 +1190,25 @@ "@ethersproject/properties" "^5.0.3" "@ethersproject/strings" "^5.0.4" -"@ethersproject/abstract-provider@5.0.5", "@ethersproject/abstract-provider@^5.0.4": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.5.tgz#797a32a8707830af1ad8f833e9c228994d5572b9" - integrity sha512-i/CjElAkzV7vQBAeoz+IpjGfcFYEP9eD7j3fzZ0fzTq03DO7PPnR+xkEZ1IoDXGwDS+55aLM1xvLDwB/Lx6IOQ== +"@ethersproject/abi@5.0.9", "@ethersproject/abi@^5.0.5": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.9.tgz#738c1c557e56d8f395a5a27caef9b0449bc85a10" + integrity sha512-ily2OufA2DTrxkiHQw5GqbkMSnNKuwZBqKsajtT0ERhZy1r9w2CpW1bmtRMIGzaqQxCdn/GEoFogexk72cBBZQ== + dependencies: + "@ethersproject/address" "^5.0.4" + "@ethersproject/bignumber" "^5.0.7" + "@ethersproject/bytes" "^5.0.4" + "@ethersproject/constants" "^5.0.4" + "@ethersproject/hash" "^5.0.4" + "@ethersproject/keccak256" "^5.0.3" + "@ethersproject/logger" "^5.0.5" + "@ethersproject/properties" "^5.0.3" + "@ethersproject/strings" "^5.0.4" + +"@ethersproject/abstract-provider@5.0.7", "@ethersproject/abstract-provider@^5.0.4": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.7.tgz#04ee3bfe43323384e7fecf6c774975b8dec4bdc9" + integrity sha512-NF16JGn6M0zZP5ZS8KtDL2Rh7yHxZbUjBIHLNHMm/0X0BephhjUWy8jqs/Zks6kDJRzNthgmPVy41Ec0RYWPYA== dependencies: "@ethersproject/bignumber" "^5.0.7" "@ethersproject/bytes" "^5.0.4" @@ -1215,10 +1218,10 @@ "@ethersproject/transactions" "^5.0.5" "@ethersproject/web" "^5.0.6" -"@ethersproject/abstract-signer@5.0.7", "@ethersproject/abstract-signer@^5.0.4", "@ethersproject/abstract-signer@^5.0.6": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.7.tgz#cdbd3bd479edf77c71b7f6a6156b0275b1176ded" - integrity sha512-8W8gy/QutEL60EoMEpvxZ8MFAEWs/JvH5nmZ6xeLXoZvmBCasGmxqHdYjo2cxg0nevkPkq9SeenSsBBZSCx+SQ== +"@ethersproject/abstract-signer@5.0.9", "@ethersproject/abstract-signer@^5.0.4", "@ethersproject/abstract-signer@^5.0.6": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.9.tgz#238ddc06031aeb9dfceee2add965292d7dd1acbf" + integrity sha512-CM5UNmXQaA03MyYARFDDRjHWBxujO41tVle7glf5kHcQsDDULgqSVpkliLJMtPzZjOKFeCVZBHybTZDEZg5zzg== dependencies: "@ethersproject/abstract-provider" "^5.0.4" "@ethersproject/bignumber" "^5.0.7" @@ -1226,60 +1229,59 @@ "@ethersproject/logger" "^5.0.5" "@ethersproject/properties" "^5.0.3" -"@ethersproject/address@5.0.5", "@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.5": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.5.tgz#2caa65f6b7125015395b1b54c985ee0b27059cc7" - integrity sha512-DpkQ6rwk9jTefrRsJzEm6nhRiJd9pvhn1xN0rw5N/jswXG5r7BLk/GVA0mMAVWAsYfvi2xSc5L41FMox43RYEA== +"@ethersproject/address@5.0.8", "@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.5": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.8.tgz#0c551659144a5a7643c6bea337149d410825298f" + integrity sha512-V87DHiZMZR6hmFYmoGaHex0D53UEbZpW75uj8AqPbjYUmi65RB4N2LPRcJXuWuN2R0Y2CxkvW6ArijWychr5FA== dependencies: - "@ethersproject/bignumber" "^5.0.7" + "@ethersproject/bignumber" "^5.0.10" "@ethersproject/bytes" "^5.0.4" "@ethersproject/keccak256" "^5.0.3" "@ethersproject/logger" "^5.0.5" "@ethersproject/rlp" "^5.0.3" - bn.js "^4.4.0" -"@ethersproject/base64@5.0.4", "@ethersproject/base64@^5.0.3": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.4.tgz#b0d8fdbf3dda977cf546dcd35725a7b1d5256caa" - integrity sha512-4KRykQ7BQMeOXfvio1YITwHjxwBzh92UoXIdzxDE1p53CK28bbHPdsPNYo0wl0El7lJAMpT2SOdL0hhbWRnyIA== +"@ethersproject/base64@5.0.6", "@ethersproject/base64@^5.0.3": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.6.tgz#26311ebf29ea3d0b9c300ccf3e1fdc44b7481516" + integrity sha512-HwrGn8YMiUf7bcdVvB4NJ+eWT0BtEFpDtrYxVXEbR7p/XBSJjwiR7DEggIiRvxbualMKg+EZijQWJ3az2li0uw== dependencies: "@ethersproject/bytes" "^5.0.4" -"@ethersproject/basex@5.0.4", "@ethersproject/basex@^5.0.3": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.0.4.tgz#93e1cd11f9a47281da2389de24f88e13e9d90847" - integrity sha512-ixIr/kKiAoSzOnSc777AGIOAhKai5Ivqr4HO/Gz+YG+xkfv6kqD6AW4ga9vM20Wwb0QBhh3LoRWTu4V1K+x9Ew== +"@ethersproject/basex@5.0.6", "@ethersproject/basex@^5.0.3": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.0.6.tgz#ab95c32e48288a3d868726463506641cb1e9fb6b" + integrity sha512-Y/8dowRxBF3bsKkqEp7XN4kcFFQ0o5xxP1YyopfqkXejaOEGiD7ToQdQ0pIZpAJ5GreW56oFOTDDSO6ZcUCNYg== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/properties" "^5.0.3" -"@ethersproject/bignumber@5.0.8", "@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.8.tgz#cee33bd8eb0266176def0d371b45274b1d2c4ec0" - integrity sha512-KXFVAFKS1jdTXYN8BE5Oj+ZfPMh28iRdFeNGBVT6cUFdtiPVqeXqc0ggvBqA3A1VoFFGgM7oAeaagA393aORHA== +"@ethersproject/bignumber@5.0.12", "@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.10", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.0.8": + version "5.0.12" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.12.tgz#fe4a78667d7cb01790f75131147e82d6ea7e7cba" + integrity sha512-mbFZjwthx6vFlHG9owXP/C5QkNvsA+xHpDCkPPPdG2n1dS9AmZAL5DI0InNLid60rQWL3MXpEl19tFmtL7Q9jw== dependencies: - "@ethersproject/bytes" "^5.0.4" + "@ethersproject/bytes" "^5.0.8" "@ethersproject/logger" "^5.0.5" bn.js "^4.4.0" -"@ethersproject/bytes@5.0.5", "@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.5.tgz#688b70000e550de0c97a151a21f15b87d7f97d7c" - integrity sha512-IEj9HpZB+ACS6cZ+QQMTqmu/cnUK2fYNE6ms/PVxjoBjoxc6HCraLpam1KuRvreMy0i523PLmjN8OYeikRdcUQ== +"@ethersproject/bytes@5.0.8", "@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.8.tgz#cf1246a6a386086e590063a4602b1ffb6cc43db1" + integrity sha512-O+sJNVGzzuy51g+EMK8BegomqNIg+C2RO6vOt0XP6ac4o4saiq69FnjlsrNslaiMFVO7qcEHBsWJ9hx1tj1lMw== dependencies: "@ethersproject/logger" "^5.0.5" -"@ethersproject/constants@5.0.5", "@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.5.tgz#0ed19b002e8404bdf6d135234dc86a7d9bcf9b71" - integrity sha512-foaQVmxp2+ik9FrLUCtVrLZCj4M3Ibgkqvh+Xw/vFRSerkjVSYePApaVE5essxhoSlF1U9oXfWY09QI2AXtgKA== +"@ethersproject/constants@5.0.7", "@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.7.tgz#44ff979e5781b17c8c6901266896c3ee745f4e7e" + integrity sha512-cbQK1UpE4hamB52Eg6DLhJoXeQ1plSzekh5Ujir1xdREdwdsZPPXKczkrWqBBR0KyywJZHN/o/hj0w8j7scSGg== dependencies: "@ethersproject/bignumber" "^5.0.7" -"@ethersproject/contracts@5.0.5": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.0.5.tgz#64831a341ec8ca225e83ff3e9437c26b970fd5d7" - integrity sha512-tFI255lFbmbqMkgnuyhDWHl3yWqttPlReplYuVvDCT/SuvBjLR4ad2uipBlh1fh5X1ipK9ettAoV4S0HKim4Kw== +"@ethersproject/contracts@5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.0.8.tgz#71d3ba16853a1555be2e161a6741df186f81c73b" + integrity sha512-PecBL4vnsrpuks2lzzkRsOts8csJy338HNDKDIivbFmx92BVzh3ohOOv3XsoYPSXIHQvobF959W+aSk3RCZL/g== dependencies: "@ethersproject/abi" "^5.0.5" "@ethersproject/abstract-provider" "^5.0.4" @@ -1291,10 +1293,10 @@ "@ethersproject/logger" "^5.0.5" "@ethersproject/properties" "^5.0.3" -"@ethersproject/hash@5.0.6", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.6.tgz#2a2e8a1470685421217e9e86e9971ca636e609ce" - integrity sha512-Gvh57v6BWhwnud6l7tMfQm32PRQ2DYx2WaAAQmAxAfYvmzUkpQCBstnGeNMXIL8/2wdkvcB2u+WZRWaZtsFuUQ== +"@ethersproject/hash@5.0.9", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.9.tgz#81252a848185b584aa600db4a1a68cad9229a4d4" + integrity sha512-e8/i2ZDeGSgCxXT0vocL54+pMbw5oX5fNjb2E3bAIvdkh5kH29M7zz1jHu1QDZnptIuvCZepIbhUH8lxKE2/SQ== dependencies: "@ethersproject/abstract-signer" "^5.0.6" "@ethersproject/address" "^5.0.5" @@ -1305,10 +1307,10 @@ "@ethersproject/properties" "^5.0.4" "@ethersproject/strings" "^5.0.4" -"@ethersproject/hdnode@5.0.5", "@ethersproject/hdnode@^5.0.4": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.0.5.tgz#1f89aad0a5ba9dfae3a85a36e0669f8bc7a74781" - integrity sha512-Ho4HZaK+KijE5adayvjAGusWMnT0mgwGa5hGMBofBOgX9nqiKf6Wxx68SXBGI1/L3rmKo6mlAjxUd8gefs0teQ== +"@ethersproject/hdnode@5.0.7", "@ethersproject/hdnode@^5.0.4": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.0.7.tgz#c7bce94a337ea65e37c46bab09a83e1c1a555d99" + integrity sha512-89tphqlji4y/LNE1cSaMQ3hrBtJ4lO1qWGi2hn54LiHym85DTw+zAKbA8QgmdSdJDLGR/kc9VHaIPQ+vZQ2LkQ== dependencies: "@ethersproject/abstract-signer" "^5.0.4" "@ethersproject/basex" "^5.0.3" @@ -1323,10 +1325,10 @@ "@ethersproject/transactions" "^5.0.5" "@ethersproject/wordlists" "^5.0.4" -"@ethersproject/json-wallets@5.0.7", "@ethersproject/json-wallets@^5.0.6": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.0.7.tgz#4c48753b38ce7bce23a55f25c23f24617cf560e5" - integrity sha512-dgOn9JtGgjT28mDXs4LYY2rT4CzS6bG/rxoYuPq3TLHIf6nmvBcr33Fee6RrM/y8UAx4gyIkf6wb2cXsOctvQQ== +"@ethersproject/json-wallets@5.0.9", "@ethersproject/json-wallets@^5.0.6": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.0.9.tgz#2e1708c2854c4ab764e35920bd1f44c948b95434" + integrity sha512-EWuFvJd8nu90dkmJwmJddxOYCvFvMkKBsZi8rxTme2XEZsHKOFnybVkoL23u7ZtApuEfTKmVcR2PTwgZwqDsKw== dependencies: "@ethersproject/abstract-signer" "^5.0.4" "@ethersproject/address" "^5.0.4" @@ -1342,45 +1344,45 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/keccak256@5.0.4", "@ethersproject/keccak256@>=5.0.0-beta.127", "@ethersproject/keccak256@^5.0.3": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.4.tgz#36ca0a7d1ae2a272da5654cb886776d0c680ef3a" - integrity sha512-GNpiOUm9PGUxFNqOxYKDQBM0u68bG9XC9iOulEQ8I0tOx/4qUpgVzvgXL6ugxr0RY554Gz/NQsVqknqPzUcxpQ== +"@ethersproject/keccak256@5.0.6", "@ethersproject/keccak256@>=5.0.0-beta.127", "@ethersproject/keccak256@^5.0.3": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.6.tgz#5b5ba715ef1be86efde5c271f896fa0daf0e1efe" + integrity sha512-eJ4Id/i2rwrf5JXEA7a12bG1phuxjj47mPZgDUbttuNBodhSuZF2nEO5QdpaRjmlphQ8Kt9PNqY/z7lhtJptZg== dependencies: "@ethersproject/bytes" "^5.0.4" js-sha3 "0.5.7" -"@ethersproject/logger@5.0.6", "@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.6.tgz#faa484203e86e08be9e07fef826afeef7183fe88" - integrity sha512-FrX0Vnb3JZ1md/7GIZfmJ06XOAA8r3q9Uqt9O5orr4ZiksnbpXKlyDzQtlZ5Yv18RS8CAUbiKH9vwidJg1BPmQ== +"@ethersproject/logger@5.0.8", "@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.8.tgz#135c1903d35c878265f3cbf2b287042c4c20d5d4" + integrity sha512-SkJCTaVTnaZ3/ieLF5pVftxGEFX56pTH+f2Slrpv7cU0TNpUZNib84QQdukd++sWUp/S7j5t5NW+WegbXd4U/A== -"@ethersproject/networks@5.0.4", "@ethersproject/networks@^5.0.3": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.4.tgz#6d320a5e15a0cda804f5da88be0ba846156f6eec" - integrity sha512-/wHDTRms5mpJ09BoDrbNdFWINzONe05wZRgohCXvEv39rrH/Gd/yAnct8wC0RsW3tmFOgjgQxuBvypIxuUynTw== +"@ethersproject/networks@5.0.6", "@ethersproject/networks@^5.0.3": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.6.tgz#4d6586bbebfde1c027504ebf6dfb783b29c3803a" + integrity sha512-2Cg1N5109zzFOBfkyuPj+FfF7ioqAsRffmybJ2lrsiB5skphIAE72XNSCs4fqktlf+rwSh/5o/UXRjXxvSktZw== dependencies: "@ethersproject/logger" "^5.0.5" -"@ethersproject/pbkdf2@5.0.4", "@ethersproject/pbkdf2@^5.0.3": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.0.4.tgz#a0841d53f5ce9a2b52a65a349d2dc15910b0a767" - integrity sha512-9jVBjHXQKfr9+3bkCg01a8Cd1H9e+7Kw3ZMIvAxD0lZtuzrXsJxm1hVwY9KA+PRUvgS/9tTP4viXQYwLAax7zg== +"@ethersproject/pbkdf2@5.0.6", "@ethersproject/pbkdf2@^5.0.3": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.0.6.tgz#105dbfb08cd5fcf33869b42bfdc35a3ebd978cbd" + integrity sha512-CUYciSxR/AaCoKMJk3WUW+BDhR41G3C+O9lOeZ4bR1wDhLKL2Z8p0ciF5XDEiVbmI4CToW6boVKybeVMdngRrg== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/sha2" "^5.0.3" -"@ethersproject/properties@5.0.4", "@ethersproject/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.4.tgz#a67a1f5a52c30850b5062c861631e73d131f666e" - integrity sha512-UdyX3GqBxFt15B0uSESdDNmhvEbK3ACdDXl2soshoPcneXuTswHDeA0LoPlnaZzhbgk4p6jqb4GMms5C26Qu6A== +"@ethersproject/properties@5.0.6", "@ethersproject/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.4": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.6.tgz#44d82aaa294816fd63333e7def42426cf0e87b3b" + integrity sha512-a9DUMizYhJ0TbtuDkO9iYlb2CDlpSKqGPDr+amvlZhRspQ6jbl5Eq8jfu4SCcGlcfaTbguJmqGnyOGn1EFt6xA== dependencies: "@ethersproject/logger" "^5.0.5" -"@ethersproject/providers@5.0.14": - version "5.0.14" - resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.0.14.tgz#751ccb14b4a8c8e9e4be171818c23f4601be90ba" - integrity sha512-K9QRRkkHWyprm3g4L8U9aPx5uyivznL4RYemkN2shCQumyGqFJ5SO+OtQrgebVm0JpGwFAUGugnhRUh49sjErw== +"@ethersproject/providers@5.0.17": + version "5.0.17" + resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.0.17.tgz#f380e7831149e24e7a1c6c9b5fb1d6dfc729d024" + integrity sha512-bJnvs5X7ttU5x2ekGJYG7R3Z+spZawLFfR0IDsbaMDLiCwZOyrgk+VTBU7amSFLT0WUhWFv8WwSUB+AryCQG1Q== dependencies: "@ethersproject/abstract-provider" "^5.0.4" "@ethersproject/abstract-signer" "^5.0.4" @@ -1402,45 +1404,45 @@ bech32 "1.1.4" ws "7.2.3" -"@ethersproject/random@5.0.4", "@ethersproject/random@^5.0.3": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.0.4.tgz#98f7cf65b0e588cec39ef24843e391ed5004556f" - integrity sha512-AIZJhqs6Ba4/+U3lOjt3QZbP6b/kuuGLJUYFUonAgWmkTHwqsCwYnFvnHKQSUuHbXHvErp7WFXFlztx+yMn3kQ== +"@ethersproject/random@5.0.6", "@ethersproject/random@^5.0.3": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.0.6.tgz#9be80a1065f2b8e6f321dccb3ebeb4886cac9ea4" + integrity sha512-8nsVNaZvZ9OD5NXfzE4mmz8IH/1DYJbAR95xpRxZkIuNmfn6QlMp49ccJYZWGhs6m0Zj2+FXjx3pzXfYlo9/dA== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/logger" "^5.0.5" -"@ethersproject/rlp@5.0.4", "@ethersproject/rlp@^5.0.3": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.4.tgz#0090a0271e84ea803016a112a79f5cfd80271a77" - integrity sha512-5qrrZad7VTjofxSsm7Zg/7Dr4ZOln4S2CqiDdOuTv6MBKnXj0CiBojXyuDy52M8O3wxH0CyE924hXWTDV1PQWQ== +"@ethersproject/rlp@5.0.6", "@ethersproject/rlp@^5.0.3": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.6.tgz#29f9097348a3c330811997433b7df89ab51cd644" + integrity sha512-M223MTaydfmQSsvqAl0FJZDYFlSqt6cgbhnssLDwqCKYegAHE16vrFyo+eiOapYlt32XAIJm0BXlqSunULzZuQ== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/logger" "^5.0.5" -"@ethersproject/sha2@5.0.4", "@ethersproject/sha2@^5.0.3": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.0.4.tgz#40f639721a27dbe034b3dee021ba20b054586fec" - integrity sha512-0yFhf1mspxAfWdXXoPtK94adUeu1R7/FzAa+DfEiZTc76sz/vHXf0LSIazoR3znYKFny6haBxME+usbvvEcF3A== +"@ethersproject/sha2@5.0.6", "@ethersproject/sha2@^5.0.3": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.0.6.tgz#175116dc10b866a0a381f6316d094bcc510bee3c" + integrity sha512-30gypDLkfkP5gE3llqi0jEuRV8m4/nvzeqmqMxiihZ7veFQHqDaGpyFeHzFim+qGeH9fq0lgYjavLvwW69+Fkw== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/logger" "^5.0.5" hash.js "1.1.3" -"@ethersproject/signing-key@5.0.5", "@ethersproject/signing-key@^5.0.4": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.5.tgz#acfd06fc05a14180df7e027688bbd23fc4baf782" - integrity sha512-Z1wY7JC1HVO4CvQWY2TyTTuAr8xK3bJijZw1a9G92JEmKdv1j255R/0YLBBcFTl2J65LUjtXynNJ2GbArPGi5g== +"@ethersproject/signing-key@5.0.7", "@ethersproject/signing-key@^5.0.4": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.7.tgz#d03bfc5f565efb962bafebf8e6965e70d1c46d31" + integrity sha512-JYndnhFPKH0daPcIjyhi+GMcw3srIHkQ40hGRe6DA0CdGrpMfgyfSYDQ2D8HL2lgR+Xm4SHfEB0qba6+sCyrvg== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/logger" "^5.0.5" "@ethersproject/properties" "^5.0.3" elliptic "6.5.3" -"@ethersproject/solidity@5.0.5": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.0.5.tgz#97a7d8a67f2d944f208c948fed0d565512bcc2be" - integrity sha512-DMFQ0ouXmNVoKWbGEUFGi8Urli4SJip9jXafQyFHWPRr5oJUqDVkNfwcyC37k+mhBG93k7qrYXCH2xJnGEOxHg== +"@ethersproject/solidity@5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.0.7.tgz#72a3455f47a454db2dcf363992d42e9045dc7fce" + integrity sha512-dUevKUZ06p/VMLP/+cz4QUV+lA17NixucDJfm0ioWF0B3R0Lf+6wqwPchcqiAXlxkNFGIax7WNLgGMh4CkQ8iw== dependencies: "@ethersproject/bignumber" "^5.0.7" "@ethersproject/bytes" "^5.0.4" @@ -1448,19 +1450,19 @@ "@ethersproject/sha2" "^5.0.3" "@ethersproject/strings" "^5.0.4" -"@ethersproject/strings@5.0.5", "@ethersproject/strings@>=5.0.0-beta.130", "@ethersproject/strings@^5.0.4": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.5.tgz#ed7e99a282a02f40757691b04a24cd83f3752195" - integrity sha512-JED6WaIV00xM/gvj8vSnd+0VWtDYdidTmavFRCTQakqfz+4tDo6Jz5LHgG+dd45h7ah7ykCHW0C7ZXWEDROCXQ== +"@ethersproject/strings@5.0.7", "@ethersproject/strings@>=5.0.0-beta.130", "@ethersproject/strings@^5.0.4": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.7.tgz#8dc68f794c9e2901f3b75e53b2afbcb6b6c15037" + integrity sha512-a+6T80LvmXGMOOWQTZHtGGQEg1z4v8rm8oX70KNs55YtPXI/5J3LBbVf5pyqCKSlmiBw5IaepPvs5XGalRUSZQ== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/constants" "^5.0.4" "@ethersproject/logger" "^5.0.5" -"@ethersproject/transactions@5.0.6", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.5": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.6.tgz#b8b27938be6e9ed671dbdd35fe98af8b14d0df7c" - integrity sha512-htsFhOD+NMBxx676A8ehSuwVV49iqpSB+CkjPZ02tpNew0K6p8g0CZ46Z1ZP946gIHAU80xQ0NACHYrjIUaCFA== +"@ethersproject/transactions@5.0.8", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.5": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.8.tgz#3b4d7041e13b957a9c4f131e0aea9dae7b6f5a23" + integrity sha512-i7NtOXVzUe+YSU6QufzlRrI2WzHaTmULAKHJv4duIZMLqzehCBXGA9lTpFgFdqGYcQJ7vOtNFC2BB2mSjmuXqg== dependencies: "@ethersproject/address" "^5.0.4" "@ethersproject/bignumber" "^5.0.7" @@ -1472,19 +1474,19 @@ "@ethersproject/rlp" "^5.0.3" "@ethersproject/signing-key" "^5.0.4" -"@ethersproject/units@5.0.6": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.0.6.tgz#e1169ecffb7e8d5eab84e1481a4e35df19045708" - integrity sha512-tsJuy4mipppdmooukRfhXt8fGx9nxvfvG6Xdy0RDm7LzHsjghjwQ69m2bCpId6SDSR1Uq1cQ9irPiUBSyWolUA== +"@ethersproject/units@5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.0.8.tgz#563325b20fe1eceff7b61857711d5e2b3f38fd09" + integrity sha512-3O4MaNHFs05vC5v2ZGqVFVWtO1WyqFejO78M7Qh16njo282aoMlENtVI6cn2B36zOLFXRvYt2pYx6xCG53qKzg== dependencies: "@ethersproject/bignumber" "^5.0.7" "@ethersproject/constants" "^5.0.4" "@ethersproject/logger" "^5.0.5" -"@ethersproject/wallet@5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.0.7.tgz#9d4540f97d534e3d61548ace30f15857209b3f02" - integrity sha512-n2GX1+2Tc0qV8dguUcLkjNugINKvZY7u/5fEsn0skW9rz5+jHTR5IKMV6jSfXA+WjQT8UCNMvkI3CNcdhaPbTQ== +"@ethersproject/wallet@5.0.9": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.0.9.tgz#976c7d950489c40308d676869d24e59ab7b82ad1" + integrity sha512-GfpQF56PO/945SJq7Wdg5F5U6wkxaDgkAzcgGbCW6Joz8oW8MzKItkvYCzMh+j/8gJMzFncsuqX4zg2gq3J6nQ== dependencies: "@ethersproject/abstract-provider" "^5.0.4" "@ethersproject/abstract-signer" "^5.0.4" @@ -1502,10 +1504,10 @@ "@ethersproject/transactions" "^5.0.5" "@ethersproject/wordlists" "^5.0.4" -"@ethersproject/web@5.0.9", "@ethersproject/web@^5.0.6": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.9.tgz#b08f8295f4bfd4777c8723fe9572f5453b9f03cb" - integrity sha512-//QNlv1MSkOII1hv3+HQwWoiVFS+BMVGI0KYeUww4cyrEktnx1QIez5bTSab9s9fWTFaWKNmQNBwMbxAqPuYDw== +"@ethersproject/web@5.0.11", "@ethersproject/web@^5.0.6": + version "5.0.11" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.11.tgz#d47da612b958b4439e415782a53c8f8461522d68" + integrity sha512-x03ihbPoN1S8Gsh9WSwxkYxUIumLi02ZEKJku1C43sxBfe+mdprWyvujzYlpuoRNfWRgNhdRDKMP8JbG6MwNGA== dependencies: "@ethersproject/base64" "^5.0.3" "@ethersproject/bytes" "^5.0.4" @@ -1513,10 +1515,10 @@ "@ethersproject/properties" "^5.0.3" "@ethersproject/strings" "^5.0.4" -"@ethersproject/wordlists@5.0.5", "@ethersproject/wordlists@^5.0.4": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.0.5.tgz#a935b7fdb86c96b44ea8391fed94b3fa2f33c606" - integrity sha512-XA3ycFltVrCTQt04w5nHu3Xq5Z6HjqWsXaAYQHFdqtugyUsIumaO9S5MOwFFuUYTNkZUoT3jCRa/OBS+K4tLfA== +"@ethersproject/wordlists@5.0.7", "@ethersproject/wordlists@^5.0.4": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.0.7.tgz#4e5ad38cfbef746b196a3290c0d41696eb7ab468" + integrity sha512-ZjQtYxm41FmHfYgpkdQG++EDcBPQWv9O6FfP6NndYRVaXaQZh6eq3sy7HQP8zCZ8dznKgy6ZyKECS8qdvnGHwA== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/hash" "^5.0.4" @@ -1536,10 +1538,10 @@ orbit-db-identity-provider "~0.3.1" redux-saga "~1.1.3" -"@ezerous/drizzle@~0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@ezerous/drizzle/-/drizzle-0.4.0.tgz#12a6cf0f2dd318891c48b72f006893a593b4fd0d" - integrity sha512-hfWdFNiIedPOdNX3giMgjNunz6ovQitSx6mpKcf5MflMlG2AtXFVFZbyQtw5CKLzZGIdS6OeKCSQutxx937TkA== +"@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== dependencies: deepmerge "~4.2.2" is-plain-object "~5.0.0" @@ -1547,25 +1549,25 @@ redux-saga "~1.1.3" web3 "~1.3.0" -"@ezerous/eth-identity-provider@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@ezerous/eth-identity-provider/-/eth-identity-provider-0.1.0.tgz#061bdffe9835dd3a9424799fe36e609e57cee162" - integrity sha512-2RwxzMGdimvxoqzpPJJCpzX3kaDzUn7reJOOlclKNtpTOp8X8RK1rooUDRZDObo6I5mdntoYyL8gEXV2ypzJIQ== +"@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" + integrity sha512-VfKzG0Hxv7IBZ06tIidtPRp/B4u+33Ug8dthXwYh0gGNuMIfXY9K0dR2gOZKYc6saS+pzTIEp/tjf5pb9V737Q== dependencies: level "~6.0.1" orbit-db-identity-provider "~0.3.1" "@fluentui/react-component-event-listener@~0.51.0": - version "0.51.2" - resolved "https://registry.yarnpkg.com/@fluentui/react-component-event-listener/-/react-component-event-listener-0.51.2.tgz#bb403c96acfa9fb4ea338f3f2bf66e672085a4c7" - integrity sha512-myfDuwU/MRGH5hqldLmwfMAn7FoXCCspdknWg+A0Tyf+mjUsgWlqRewLapon8mJqprZzrH1obPxONV/lVI3Quw== + version "0.51.3" + resolved "https://registry.yarnpkg.com/@fluentui/react-component-event-listener/-/react-component-event-listener-0.51.3.tgz#c1e64244eefb1802930eb6e74cc046775d257315" + integrity sha512-ngRG5XUgX5tsN79Rkwaxaon8U79bUO8GRKnN1bc3WQl6cYVrL6XFdgc09/a/ISK53/sS6oa2wZ/csNTwvkDO4Q== dependencies: "@babel/runtime" "^7.10.4" "@fluentui/react-component-ref@~0.51.0": - version "0.51.2" - resolved "https://registry.yarnpkg.com/@fluentui/react-component-ref/-/react-component-ref-0.51.2.tgz#17d27ce4da914e162a9ac4f3f4a7810d1ade658a" - integrity sha512-LE3NXMHJ5K2ZgTf+p/l4cDRYwmfXTw1XhjZLBI0sZaggbaUxMgrfvr0DHvkcZrbr3aLMaILYoQrTjP9Y1w0veA== + version "0.51.3" + resolved "https://registry.yarnpkg.com/@fluentui/react-component-ref/-/react-component-ref-0.51.3.tgz#d8a2d87e5830d8da048072d7c615a94364bb5dca" + integrity sha512-6+DhceCb+4ua3WVoOW99aniEaFlfrlBs9kuCs6BJEcAeqYMoa2VFzxkPWXH/35a73LKIeLsHwoLXyOsILuYRRw== dependencies: "@babel/runtime" "^7.10.4" react-is "^16.6.3" @@ -1598,9 +1600,9 @@ "@hapi/hoek" "9.x.x" "@hapi/boom@9.x.x", "@hapi/boom@^9.1.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz#0d9517657a56ff1e0b42d0aca9da1b37706fec56" - integrity sha512-4nZmpp4tXbm162LaZT45P7F7sgiem8dwAh2vHWT6XX24dozNjGMg6BvKCRvtCUcmcXqeMIUqWN8Rc5X8yKuROQ== + version "9.1.1" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.1.tgz#89e6f0e01637c2a4228da0d113e8157c93677b04" + integrity sha512-VNR8eDbBrOxBgbkddRYIe7+8DZ+vSbV6qlmaN2x7eWjsUjy2VmQgChkOKcVZIeupEZYj+I0dqNg430OhwzagjA== dependencies: "@hapi/hoek" "9.x.x" @@ -1668,9 +1670,9 @@ integrity sha512-WSrlgpvEqgPWkI18kkGELEZfXr0bYLtr16iIN4Krh9sRnzBZN6nnWxHFxtsnP684wueEySBbXPDg/WfA9xJdBQ== "@hapi/hapi@^20.0.0": - version "20.0.2" - resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.0.2.tgz#654315d2e1a25cf41d0f8cb6a306e82bc74710d1" - integrity sha512-F59cZOZhEXpOL+o7RT76M/QDUwSn3u+RBkB+9l2NqTPEA11+inaiEZ0Z2DrRoo9g5EzWVU/gygdP4uo5aXQNHg== + version "20.0.3" + resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.0.3.tgz#e72cad460394e6d2c15f9c57abb5d3332dea27e3" + integrity sha512-aqJVHVjoY3phiZsgsGjDRG15CoUNIs1azScqLZDOCZUSKYGTbzPi+K0QP+RUjUJ0m8L9dRuTZ27c8HKxG3wEhA== dependencies: "@hapi/accept" "^5.0.1" "@hapi/ammo" "^5.0.1" @@ -1710,7 +1712,7 @@ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz#6c9eafc78c1529248f8f4d92b0799a712b6052c6" integrity sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw== -"@hapi/inert@^6.0.2": +"@hapi/inert@^6.0.3": version "6.0.3" resolved "https://registry.yarnpkg.com/@hapi/inert/-/inert-6.0.3.tgz#57af5d912893fabcb57eb4b956f84f6cd8020fe1" integrity sha512-Z6Pi0Wsn2pJex5CmBaq+Dky9q40LGzXLUIUFrYpDtReuMkmfy9UuUeYc4064jQ1Xe9uuw7kbwE6Fq6rqKAdjAg== @@ -1856,9 +1858,9 @@ "@hapi/hoek" "9.x.x" "@hapi/wreck@17.x.x": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@hapi/wreck/-/wreck-17.0.0.tgz#8ab0ca286e937c3f7a82f67e4be4348c824b743c" - integrity sha512-d8lqCinbKyDByn7GzJDRDbitddhIEydNm44UcAMejfhEH3o4IYvKYq6K8cAqXbilXPuvZc0ErlUOg9SDdgRtMw== + version "17.1.0" + resolved "https://registry.yarnpkg.com/@hapi/wreck/-/wreck-17.1.0.tgz#fbdc380c6f3fa1f8052dc612b2d3b6ce3e88dbec" + integrity sha512-nx6sFyfqOpJ+EFrHX+XWwJAxs3ju4iHdbB/bwR8yTNZOiYmuhA8eCe7lYPtYmb4j7vyK/SlbaQsmTtUrMvPEBw== dependencies: "@hapi/boom" "9.x.x" "@hapi/bourne" "2.x.x" @@ -2199,7 +2201,7 @@ "@sinonjs/commons" "^1" "@sinonjs/samsam" "^5.0.2" -"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.2.0": +"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.3.0": version "5.3.0" resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz#1d2f0743dc54bf13fe9d508baefacdffa25d4329" integrity sha512-hXpcfx3aq+ETVBwPlRFICld5EnrkexXuXDwqUNhDdr5L8VjvMeSRwyOa0qL7XFmR+jVWR4rUZtnxlG7RX72sBg== @@ -2360,9 +2362,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.15" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03" - integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" + integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== dependencies: "@babel/types" "^7.3.0" @@ -2439,19 +2441,19 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.14.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz#2127bd81949a95c8b7d3240f3254352d72563aec" - integrity sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA== + version "14.14.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae" + integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ== "@types/node@^12.12.6": - version "12.19.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.5.tgz#9be3946136e818597c71c62d04240d0602c645d4" - integrity sha512-Wgdl27uw/jUYUFyajUGKSjDNGxmJrZi9sjeG6UJImgUtKbJoO9aldx+1XODN1EpNDX9DirvbvHHmTsNlb8GwMA== + version "12.19.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679" + integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q== "@types/node@^13.7.0": - version "13.13.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.31.tgz#b8fc04d46bc22959a99fbdba71b15f37a48da3ec" - integrity sha512-gBk54XbcRj8EKTi7Syo4JU4purbRJaZpkvMVs7+t+b9JaOtwsGo7vCbXdVJN3gH/wu/GyZGD8lAKo0qpQuNjOw== + version "13.13.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.36.tgz#0c4d3c4e365396c84b1c595524e2faff7dd45b26" + integrity sha512-ctzZJ+XsmHQwe3xp07gFUq4JxBaRSYzKHPgblR76//UanGST7vfFNF0+ty5eEbgTqsENopzoDK090xlha9dccQ== "@types/parse-json@^4.0.0": version "4.0.0" @@ -2684,9 +2686,9 @@ "@xtuc/long" "4.2.2" "@welldone-software/why-did-you-render@^6.0.0-rc.1": - version "6.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-6.0.0-rc.1.tgz#b0e92edb2e34e7af695cca1822844f02018d9814" - integrity sha512-qQe5w89tYnYtwRqlhdF33ivWjsQlGXkan5lFzNwpAoMEUFIbDuwvFiBUAbE76Lfz63GabSaf1vyuCusgJ7Rtqg== + version "6.0.3" + resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-6.0.3.tgz#99c58ea8e3f2ea8c042fb1d58ebf147d345fff26" + integrity sha512-9HskvqZrCVEnKur2WIZ2Jm36u+1bCbb1c+iHa8QljjHmEVOA2US1qKq3HeUcwsjgKZRo5xucV6td2FeJP8agmQ== dependencies: lodash "^4" @@ -3058,6 +3060,11 @@ array-equal@^1.0.0: resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= +array-filter@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" + integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -3068,13 +3075,15 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.0.3, array-includes@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" - integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== +array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8" + integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0" + es-abstract "^1.18.0-next.1" + get-intrinsic "^1.0.1" is-string "^1.0.5" array-shuffle@^1.0.1: @@ -3119,14 +3128,15 @@ array.prototype.flatmap@^1.2.3: function-bind "^1.1.1" array.prototype.map@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.2.tgz#9a4159f416458a23e9483078de1106b2ef68f8ec" - integrity sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.3.tgz#1609623618d3d84134a37d4a220030c2bd18420b" + integrity sha512-nNcb30v0wfDyIe26Yif3PcV1JXQp4zEeEfupG7L4SRjnD6HLbO5b2a7eVSba53bOx4YCHYMBHt+Fp4vYstneRA== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" es-array-method-boxes-properly "^1.0.0" - is-string "^1.0.4" + is-string "^1.0.5" arraybuffer.slice@~0.0.7: version "0.0.7" @@ -3258,6 +3268,13 @@ autoprefixer@^9.6.1: postcss "^7.0.32" postcss-value-parser "^4.1.0" +available-typed-arrays@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" + integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== + dependencies: + array-filter "^1.0.0" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -3269,9 +3286,9 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axe-core@^4.0.2: - version "4.1.0" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.0.tgz#93d395e6262ecdde5cb52a5d06533d0a0c7bb4cd" - integrity sha512-9atDIOTDLsWL+1GbBec6omflaT5Cxh88J0GtJtGfCVIXpI02rXHkju59W5mMqWa7eiC5OR168v3TK3kUKBW98g== + version "4.1.1" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.1.tgz#70a7855888e287f7add66002211a423937063eaf" + integrity sha512-5Kgy8Cz6LPC9DJcNb3yjAXTu3XihQgEdnIg50c//zOC/MyLP0Clg+Y8Sh9ZjjnvBrDZU4DgXS9C3T9r4/scGZQ== axobject-query@^2.0.2, axobject-query@^2.2.0: version "2.2.0" @@ -3801,16 +3818,16 @@ browserslist@4.10.0: node-releases "^1.1.52" pkg-up "^3.1.0" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.14.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6" - integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.15.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: + version "4.16.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b" + integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ== dependencies: - caniuse-lite "^1.0.30001157" + caniuse-lite "^1.0.30001165" colorette "^1.2.1" - electron-to-chromium "^1.3.591" + electron-to-chromium "^1.3.621" escalade "^3.1.1" - node-releases "^1.1.66" + node-releases "^1.1.67" bs58@^4.0.0, bs58@^4.0.1: version "4.0.1" @@ -3883,9 +3900,9 @@ buffer@^5.0.5, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: ieee754 "^1.1.13" buffer@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.2.tgz#ca9ab87dffd0e864977f541f09844f06a60a8acd" - integrity sha512-XeXCUm+F7uY7fIzq4pKy+BLbZk4SgYS5xwlZOFYD3UEcAD+PwOoTaFr/SaXvhR1yRa8SKyPSZ7LNX4N65w7h8A== + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== dependencies: base64-js "^1.3.1" ieee754 "^1.2.1" @@ -4038,12 +4055,12 @@ callsites@^3.0.0: integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== camel-case@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547" - integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q== + version "4.1.2" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== dependencies: - pascal-case "^3.1.1" - tslib "^1.10.0" + pascal-case "^3.1.2" + tslib "^2.0.3" camelcase@5.0.0: version "5.0.0" @@ -4065,10 +4082,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157: - version "1.0.30001159" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20" - integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001165: + version "1.0.30001168" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001168.tgz#6fcd098c139d003b9bd484cbb9ca26cb89907f9a" + integrity sha512-P2zmX7swIXKu+GMMR01TWa4csIKELTNnZKc+f1CjebmZJQtTAEXmpQSoKVJVVcvPGAA0TEYTOUp3VehavZSFPQ== capture-exit@^2.0.0: version "2.0.0" @@ -4249,13 +4266,12 @@ cids@^0.7.1: multihashes "~0.4.15" cids@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cids/-/cids-1.0.2.tgz#04ebadd65e5600a07feb16db594160f087c6eab3" - integrity sha512-ohCcYyEHh0Z5Hl+O1IML4kt6Kx5GPho1ybxtqK4zyk6DeV5CvOLoT/mqDh0cgKcAvsls3vcVa9HjZc7RQr3geA== + version "1.1.4" + resolved "https://registry.yarnpkg.com/cids/-/cids-1.1.4.tgz#d2aa4343fef971ef896b032fa0b99a66755d0f98" + integrity sha512-mo0IWZKcaQZsret8cP39MzDnPVT9NhhQEVaIKwWnBFaLtj2slTFckYMnbk15ptewNkb22qRBLfuBK+qiWYW/Mg== dependencies: - class-is "^1.1.0" multibase "^3.0.1" - multicodec "^2.0.1" + multicodec "^2.1.0" multihashes "^3.0.1" uint8arrays "^1.1.0" @@ -4660,28 +4676,28 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.6.2: - version "3.7.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed" - integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg== +core-js-compat@^3.6.2, core-js-compat@^3.8.0: + version "3.8.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e" + integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ== dependencies: - browserslist "^4.14.6" + browserslist "^4.15.0" semver "7.0.0" core-js-pure@^3.0.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz#28a57c861d5698e053f0ff36905f7a3301b4191e" - integrity sha512-EZD2ckZysv8MMt4J6HSvS9K2GdtlZtdBncKAmF9lr2n0c9dJUaUN88PSTjvgwCgQPWKTkERXITgS6JJRAnljtg== + version "3.8.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.1.tgz#23f84048f366fdfcf52d3fd1c68fec349177d119" + integrity sha512-Se+LaxqXlVXGvmexKGPvnUIYC1jwXu1H6Pkyb3uBM5d8/NELMYCHs/4/roD7721NxrTLyv7e5nXd5/QLBO+10g== core-js@^2.4.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.5.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f" - integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA== + version "3.8.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47" + integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -4781,7 +4797,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0: +cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4898,10 +4914,10 @@ css-tree@1.0.0-alpha.37: mdn-data "2.0.4" source-map "^0.6.1" -css-tree@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.0.tgz#9b8559e0169c0f678f49a6e045e2c3101f7aa36f" - integrity sha512-SKwwAnwRPotiopzQBpK4o+W6Uu8PA759iWdJ1EXy3zkj+sSUcsdhnhvdv4dy5AtjcX0OGXxS7h73YAMXu8QXBw== +css-tree@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5" + integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ== dependencies: mdn-data "2.0.14" source-map "^0.6.1" @@ -5010,11 +5026,11 @@ cssnano@^4.1.10: postcss "^7.0.0" csso@^4.0.2: - version "4.1.1" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz#e0cb02d6eb3af1df719222048e4359efd662af13" - integrity sha512-Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA== + version "4.2.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== dependencies: - css-tree "^1.0.0" + css-tree "^1.1.2" cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4: version "0.3.8" @@ -5134,16 +5150,16 @@ debug@4.1.1, debug@~4.1.0: ms "^2.1.1" debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" @@ -5474,9 +5490,9 @@ domelementtype@1, domelementtype@^1.3.1: integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== domelementtype@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971" - integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA== + version "2.1.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" + integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== domexception@^1.0.1: version "1.0.1" @@ -5508,13 +5524,13 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" -dot-case@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa" - integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA== +dot-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== dependencies: - no-case "^3.0.3" - tslib "^1.10.0" + no-case "^3.0.4" + tslib "^2.0.3" dot-prop@^5.2.0: version "5.3.0" @@ -5547,7 +5563,7 @@ duplexer3@^0.1.4: resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= -duplexer@^0.1.1: +duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== @@ -5582,10 +5598,17 @@ ejs@^3.1.5: dependencies: jake "^10.6.1" -electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.591: - version "1.3.598" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz#8f757018902ab6190323a8c5f6124d854893a35b" - integrity sha512-G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A== +electron-fetch@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/electron-fetch/-/electron-fetch-1.7.2.tgz#7ecc63629715a5de286957a8aceb35272c5d0b02" + integrity sha512-J7D136rhxIhPwYJsnHPpKgbyd4NUCGnKM1CuXLhmVWZdc8f6+LBiJqUOTngtSacj+xvGWgaDWOAuCXnhqiMTCw== + dependencies: + encoding "^0.1.13" + +electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.621: + version "1.3.629" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.629.tgz#a08d13b64d90e3c77ec5b9bffa3efbc5b4a00969" + integrity sha512-iSPPJtPvHrMAvYOt+9cdbDmTasPqwnwz4lkP8Dn200gDNUBQOLQ96xUsWXBwXslAo5XxdoXAoQQ3RAy4uao9IQ== elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: version "6.5.3" @@ -5719,9 +5742,9 @@ err-code@^2.0.0, err-code@^2.0.1, err-code@^2.0.3: integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" + integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== dependencies: prr "~1.0.1" @@ -5732,7 +5755,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5: +es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== @@ -6297,40 +6320,40 @@ ethereumjs-util@^6.0.0: rlp "^2.2.3" ethers@^5.0.8: - version "5.0.19" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.19.tgz#a4636f62a180135b13fd1f0a393477beafd535b7" - integrity sha512-0AZnUgZh98q888WAd1oI3aLeI+iyDtrupjANVtPPS7O63lVopkR/No8A1NqSkgl/rU+b2iuu2mUZor6GD4RG2w== - dependencies: - "@ethersproject/abi" "5.0.7" - "@ethersproject/abstract-provider" "5.0.5" - "@ethersproject/abstract-signer" "5.0.7" - "@ethersproject/address" "5.0.5" - "@ethersproject/base64" "5.0.4" - "@ethersproject/basex" "5.0.4" - "@ethersproject/bignumber" "5.0.8" - "@ethersproject/bytes" "5.0.5" - "@ethersproject/constants" "5.0.5" - "@ethersproject/contracts" "5.0.5" - "@ethersproject/hash" "5.0.6" - "@ethersproject/hdnode" "5.0.5" - "@ethersproject/json-wallets" "5.0.7" - "@ethersproject/keccak256" "5.0.4" - "@ethersproject/logger" "5.0.6" - "@ethersproject/networks" "5.0.4" - "@ethersproject/pbkdf2" "5.0.4" - "@ethersproject/properties" "5.0.4" - "@ethersproject/providers" "5.0.14" - "@ethersproject/random" "5.0.4" - "@ethersproject/rlp" "5.0.4" - "@ethersproject/sha2" "5.0.4" - "@ethersproject/signing-key" "5.0.5" - "@ethersproject/solidity" "5.0.5" - "@ethersproject/strings" "5.0.5" - "@ethersproject/transactions" "5.0.6" - "@ethersproject/units" "5.0.6" - "@ethersproject/wallet" "5.0.7" - "@ethersproject/web" "5.0.9" - "@ethersproject/wordlists" "5.0.5" + version "5.0.24" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.24.tgz#fbb8e4d35070d134f2eb846c07500b8c0eaef6d3" + integrity sha512-77CEtVC88fJGEhxGXRvQqAEH6e2A+ZFiv2FBT6ikXndlty5sw6vMatAhg1v+w3CaaGZOf1CP81jl4Mc8Zrj08A== + dependencies: + "@ethersproject/abi" "5.0.9" + "@ethersproject/abstract-provider" "5.0.7" + "@ethersproject/abstract-signer" "5.0.9" + "@ethersproject/address" "5.0.8" + "@ethersproject/base64" "5.0.6" + "@ethersproject/basex" "5.0.6" + "@ethersproject/bignumber" "5.0.12" + "@ethersproject/bytes" "5.0.8" + "@ethersproject/constants" "5.0.7" + "@ethersproject/contracts" "5.0.8" + "@ethersproject/hash" "5.0.9" + "@ethersproject/hdnode" "5.0.7" + "@ethersproject/json-wallets" "5.0.9" + "@ethersproject/keccak256" "5.0.6" + "@ethersproject/logger" "5.0.8" + "@ethersproject/networks" "5.0.6" + "@ethersproject/pbkdf2" "5.0.6" + "@ethersproject/properties" "5.0.6" + "@ethersproject/providers" "5.0.17" + "@ethersproject/random" "5.0.6" + "@ethersproject/rlp" "5.0.6" + "@ethersproject/sha2" "5.0.6" + "@ethersproject/signing-key" "5.0.7" + "@ethersproject/solidity" "5.0.7" + "@ethersproject/strings" "5.0.7" + "@ethersproject/transactions" "5.0.8" + "@ethersproject/units" "5.0.8" + "@ethersproject/wallet" "5.0.9" + "@ethersproject/web" "5.0.11" + "@ethersproject/wordlists" "5.0.7" ethjs-unit@0.1.6: version "0.1.6" @@ -6406,19 +6429,19 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== +execa@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376" + integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" is-stream "^2.0.0" merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" strip-final-newline "^2.0.0" exenv@^1.2.2: @@ -6844,9 +6867,9 @@ fnv1a@^1.0.1: integrity sha1-kV4tbQI8Q9UiStn20qPEFW9XEvU= follow-redirects@^1.0.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" - integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== + version "1.13.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" + integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== for-in@^0.1.3: version "0.1.8" @@ -6865,6 +6888,11 @@ for-own@^0.1.3: dependencies: for-in "^1.0.1" +foreach@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -7054,9 +7082,9 @@ gensync@^1.0.0-beta.1: integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== get-browser-rtc@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz#bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9" - integrity sha1-u81AyEUaftTvXDc7gWmkCd0dEdk= + version "1.1.0" + resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz#d1494e299b00f33fc8e9d6d3343ba4ba99711a2c" + integrity sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ== get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" @@ -7077,9 +7105,9 @@ get-func-name@^2.0.0: integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= get-intrinsic@^1.0.0, get-intrinsic@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be" - integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" + integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -7107,13 +7135,18 @@ get-stream@^4.0.0, get-stream@^4.1.0: dependencies: pump "^3.0.0" -get-stream@^5.0.0, get-stream@^5.1.0: +get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" +get-stream@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718" + integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -7159,11 +7192,11 @@ glob@7.1.6, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glo path-is-absolute "^1.0.0" global-dirs@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201" - integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A== + version "2.1.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" + integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ== dependencies: - ini "^1.3.5" + ini "1.3.7" global-modules@2.0.0: version "2.0.0" @@ -7181,13 +7214,13 @@ global-prefix@^3.0.0: kind-of "^6.0.2" which "^1.3.1" -global@~4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" - integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8= +global@~4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" + integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== dependencies: min-document "^2.19.0" - process "~0.5.1" + process "^0.11.10" globals@^11.1.0, globals@^11.7.0: version "11.12.0" @@ -7289,7 +7322,7 @@ gud@^1.0.0: resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== -gzip-size@5.1.1, gzip-size@^5.1.1: +gzip-size@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== @@ -7297,6 +7330,13 @@ gzip-size@5.1.1, gzip-size@^5.1.1: duplexer "^0.1.1" pify "^4.0.1" +gzip-size@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" + integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== + dependencies: + duplexer "^0.1.2" + hamt-sharding@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hamt-sharding/-/hamt-sharding-1.0.0.tgz#8c7cccb068cd871d721c21e6f09219e5e66383d1" @@ -7547,9 +7587,9 @@ html-encoding-sniffer@^1.0.2: whatwg-encoding "^1.0.1" html-entities@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" - integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== + version "1.3.3" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.3.tgz#3dca638a43ee7de316fc23067398491152ad4736" + integrity sha512-/VulV3SYni1taM7a4RMdceqzJWR39gpZHjBwUnsCFKWV/GJkD14CJ5F7eWcZozmHJK0/f/H5U3b3SiPkuvxMgg== html-escaper@^2.0.0: version "2.0.2" @@ -7685,10 +7725,10 @@ 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= -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== humble-localstorage@^1.4.2: version "1.4.2" @@ -7713,9 +7753,9 @@ i18next-http-backend@^1.0.21: node-fetch "2.6.1" i18next@^19.8.3: - version "19.8.3" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.3.tgz#10df7222db8c23389b13bceb9ba67a5e20a0241e" - integrity sha512-eVrqAw2gGGYYJaJMYw4VM1FNFawLD4b84IsoTZMVXeWHaxAM2gyTa34j2Sip15UkBz/LrSxdFJj0Jhlrz7EvHA== + version "19.8.4" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.4.tgz#447718f2a26319b8debdbcc6fbc1a9761be7316b" + integrity sha512-FfVPNWv+felJObeZ6DSXZkj9QM1Ivvh7NcFCgA8XPtJWHz0iXVa9BUy+QY8EPrCLE+vWgDfV/sc96BgXVo6HAA== dependencies: "@babel/runtime" "^7.12.0" @@ -7892,10 +7932,15 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +ini@1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== + ini@^1.3.5, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== inquirer@7.0.4: version "7.0.4" @@ -8055,25 +8100,23 @@ ipfs-block-service@^0.18.0: err-code "^2.0.0" streaming-iterables "^5.0.2" -ipfs-cli@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ipfs-cli/-/ipfs-cli-0.2.1.tgz#96cc82870c8ef87f5d5e80cca90f634f2ce46fc1" - integrity sha512-uOsk/4R4/hFWJBpgtJ/16rBVvtFKqiz8udjcCShissRN9YjjzwRevVHgEHSriY9nTBBGHX7ZZe+Q9mqTDr+qKw== +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== dependencies: bignumber.js "^9.0.0" byteman "^1.3.5" cid-tool "^1.0.0" cids "^1.0.0" debug "^4.1.1" - dlv "^1.1.3" err-code "^2.0.3" - execa "^4.0.3" + execa "^5.0.0" get-folder-size "^2.0.1" - ipfs-core "^0.2.1" - ipfs-core-utils "^0.5.2" - ipfs-http-client "^48.1.1" - ipfs-http-gateway "^0.1.2" - ipfs-http-server "^0.1.2" + 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" ipld-dag-cbor "^0.17.0" @@ -8084,12 +8127,7 @@ ipfs-cli@^0.2.1: it-glob "0.0.10" it-pipe "^1.1.0" jsondiffpatch "^0.4.1" - just-safe-set "^2.1.0" - libp2p "^0.29.3" libp2p-crypto "^0.18.0" - libp2p-delegated-content-routing "^0.8.0" - libp2p-delegated-peer-routing "^0.8.0" - libp2p-webrtc-star "^0.20.1" mafmt "^8.0.0" multiaddr "^8.0.0" multiaddr-to-uri "^6.0.0" @@ -8103,9 +8141,6 @@ ipfs-cli@^0.2.1: streaming-iterables "^5.0.2" uint8arrays "^1.1.0" yargs "^16.0.3" - optionalDependencies: - prom-client "^12.0.0" - prometheus-gc-stats "^0.6.0" ipfs-core-utils@^0.4.0: version "0.4.0" @@ -8122,11 +8157,12 @@ ipfs-core-utils@^0.4.0: it-peekable "0.0.1" uint8arrays "^1.1.0" -ipfs-core-utils@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.5.2.tgz#001ccadd5e0f50476b3c743b69698d5e96f4558d" - integrity sha512-Cfz4hRa1HUBZGexwfYKjROiam8GQ6V+tA7kA17/bdCea0rxep4OZ64qUw+HwBTGNWEKg8SwKNEFs/V7LLPM6kg== +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" @@ -8137,14 +8173,15 @@ ipfs-core-utils@^0.5.2: 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@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ipfs-core/-/ipfs-core-0.2.1.tgz#d13f0b037e7d07cc9fc4c4efee2bd44c807fc5a7" - integrity sha512-XMceB4MyDqn87dK0kZu4zSIHDTbpDZMC19M3NHYSTlTOPyKXW5hY9BxVH2esdW/Ny1+Kl38hxINKQg5FNeajNQ== +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== dependencies: - any-signal "^2.0.0" array-shuffle "^1.0.1" bignumber.js "^9.0.0" cbor "^5.1.0" @@ -8161,11 +8198,11 @@ ipfs-core@^0.2.1: interface-datastore "^2.0.0" ipfs-bitswap "^4.0.0" ipfs-block-service "^0.18.0" - ipfs-core-utils "^0.5.2" + ipfs-core-utils "^0.5.4" ipfs-repo "^7.0.0" ipfs-unixfs "^2.0.3" ipfs-unixfs-exporter "^3.0.4" - ipfs-unixfs-importer "^4.0.0" + ipfs-unixfs-importer "^5.0.0" ipfs-utils "^5.0.0" ipld "^0.28.0" ipld-block "^0.11.0" @@ -8201,14 +8238,34 @@ ipfs-core@^0.2.1: multicodec "^2.0.1" multihashing-async "^2.0.1" native-abort-controller "~0.0.3" - p-defer "^3.0.0" p-queue "^6.6.1" parse-duration "^0.4.4" peer-id "^0.14.1" streaming-iterables "^5.0.2" - timeout-abort-controller "^1.1.1" uint8arrays "^1.1.0" +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== + 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" + just-safe-set "^2.1.0" + libp2p "^0.29.3" + libp2p-delegated-content-routing "^0.8.0" + libp2p-delegated-peer-routing "^0.8.0" + libp2p-webrtc-star "^0.20.1" + multiaddr "^8.0.0" + optionalDependencies: + prom-client "^12.0.0" + prometheus-gc-stats "^0.6.0" + 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" @@ -8244,17 +8301,17 @@ ipfs-http-client@^47.0.1: stream-to-it "^0.2.1" uint8arrays "^1.1.0" -ipfs-http-client@^48.1.1: - version "48.1.1" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.1.tgz#a8134ab186bc6ff88e91dd575bb3d0600acc506c" - integrity sha512-DZVm6EvB3zCxuvEwW5blDKigKtvAWWzPSIQEIUeWr04qzVThEe5eYK+Siu1qxrpthnBK1fYxS3okK2WI4kmluA== +ipfs-http-client@^48.1.3: + version "48.1.3" + resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.3.tgz#d9b91b1f65d54730de92290d3be5a11ef124b400" + integrity sha512-+JV4cdMaTvYN3vd4r6+mcVxV3LkJXzc4kn2ToVbObpVpdqmG34ePf1KlvFF8A9gjcel84WpiP5xCEV/IrisPBA== dependencies: any-signal "^2.0.0" bignumber.js "^9.0.0" cids "^1.0.0" debug "^4.1.1" form-data "^3.0.0" - ipfs-core-utils "^0.5.2" + ipfs-core-utils "^0.5.4" ipfs-utils "^5.0.0" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" @@ -8275,10 +8332,10 @@ ipfs-http-client@^48.1.1: stream-to-it "^0.2.2" uint8arrays "^1.1.0" -ipfs-http-gateway@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ipfs-http-gateway/-/ipfs-http-gateway-0.1.2.tgz#5c0eda7b16af0a160cf70cfb8ebc1d7e53366c55" - integrity sha512-9HP3VWacY8io8HGP8A+xjxHulfbUC4/37pYhX2VLa3R8CdCUm9O6caNhex9Y9WoBhi332OR9rcr/1rRpI9rNXg== +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== dependencies: "@hapi/ammo" "^5.0.1" "@hapi/boom" "^9.1.0" @@ -8286,7 +8343,7 @@ ipfs-http-gateway@^0.1.2: cids "^1.0.0" debug "^4.1.1" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.2" + ipfs-core-utils "^0.5.4" ipfs-http-response "^0.6.0" is-ipfs "^2.0.0" it-last "^1.0.4" @@ -8312,10 +8369,10 @@ ipfs-http-response@^0.6.0: multihashes "^3.0.1" p-try-each "^1.0.1" -ipfs-http-server@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ipfs-http-server/-/ipfs-http-server-0.1.2.tgz#d0435382b61ee63af7c226885f316c3abe80364b" - integrity sha512-QKAhfNWlX3BK8K/nthArHF2sRGOJAU5ySZO9T4khPqAFDQ3czLOYViRVkplBxzmVSk6Wz6sXB3P12wyyRhL1gg== +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== dependencies: "@hapi/boom" "^9.1.0" "@hapi/content" "^5.0.2" @@ -8325,8 +8382,8 @@ ipfs-http-server@^0.1.2: dlv "^1.1.3" err-code "^2.0.3" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.2" - ipfs-http-gateway "^0.1.2" + ipfs-core-utils "^0.5.4" + ipfs-http-gateway "^0.1.4" ipfs-unixfs "^2.0.3" ipld-dag-pb "^0.20.0" it-all "^1.0.4" @@ -8355,12 +8412,13 @@ ipfs-http-server@^0.1.2: prom-client "^12.0.0" ipfs-log@~5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ipfs-log/-/ipfs-log-5.0.0.tgz#bd89edd9eabd22d22365184817b4eca6ad89bf43" - integrity sha512-I8ow4Y42fODdQAX0vtc4xWO5daNTzAQzrWWGd1p6tIdr/OI0IFpC3ifpEWPW3qgWXPg30E9TXYmtxRp0fkOSbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ipfs-log/-/ipfs-log-5.0.1.tgz#0335492ae404ab88bebbd682cecd9efcb8059838" + integrity sha512-n9Tf2rFqqK/r2rshQMAcS/COCwYNi8m2wCZN2ZLT9vhgXMsB1c1YEsCgZru7+cWCHTmuJwuBEjAJX9l9jQPSWw== dependencies: ipfs-http-client "^47.0.1" json-stringify-deterministic "^1.0.1" + multicodec "^2.0.1" multihashing-async "^2.0.1" orbit-db-identity-provider "~0.3.1" orbit-db-io "~0.3.0" @@ -8432,28 +8490,28 @@ ipfs-repo@^7.0.0: uint8arrays "^1.0.0" ipfs-unixfs-exporter@^3.0.4: - version "3.0.6" - resolved "https://registry.yarnpkg.com/ipfs-unixfs-exporter/-/ipfs-unixfs-exporter-3.0.6.tgz#089251078502468340bb1b9cb6834a6ebb607abb" - integrity sha512-dalY2lZxTjyLJB2qXKzVTbMY6TOFAcLRVFMJ0+9ORuEKNV4zUViL0eTKSOaJuaFuRzhc8yFFkfB7FnCqfXamIg== + version "3.0.7" + resolved "https://registry.yarnpkg.com/ipfs-unixfs-exporter/-/ipfs-unixfs-exporter-3.0.7.tgz#e706f3ec0db5ecbe1a69e1ef2292aa61eccd264a" + integrity sha512-ZYpE8SVLcvxDVb9+aKwthf7a4gRFSHqbEJaVrvVOpeXKSG66WTrI0KQR14sIk0v4SYOaUSWrWVXsSjUbONrVHg== dependencies: cids "^1.0.0" err-code "^2.0.0" hamt-sharding "^1.0.0" ipfs-unixfs "^2.0.4" - ipfs-utils "^4.0.0" + ipfs-utils "^5.0.0" it-last "^1.0.1" multihashing-async "^2.0.0" -ipfs-unixfs-importer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ipfs-unixfs-importer/-/ipfs-unixfs-importer-4.0.0.tgz#da9906225fbe0eb9d3ebed05c6ed4a41b5812376" - integrity sha512-ybTcgjNBaB6azQz8jJYESweATJFoc6D+Xo8USM0GahRx9xlFS+4qjnmGbC6H9RcFFt81amcP/P1zX9v83wo3cA== +ipfs-unixfs-importer@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ipfs-unixfs-importer/-/ipfs-unixfs-importer-5.0.0.tgz#f87bc69f99b08ef5d904ecdcd2fc74e9360122ca" + integrity sha512-bvdnCXwwCj72w/FQ7o6XcvrcbCUgXrruK0UZOfhl/mf44Nv0DWyn1Y4hQF/u63rJvYLQdAMlqniAAtFQpHQhcg== dependencies: bl "^4.0.0" err-code "^2.0.0" hamt-sharding "^1.0.0" ipfs-unixfs "^2.0.4" - ipfs-utils "^4.0.0" + ipfs-utils "^5.0.0" ipld-dag-pb "^0.20.0" it-all "^1.0.1" it-batch "^1.0.3" @@ -8531,14 +8589,14 @@ ipfs-utils@^4.0.0, ipfs-utils@^4.0.1: stream-to-it "^0.2.0" ipfs-utils@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-5.0.0.tgz#918bb439a8302a629131402e8cc60dab1ca9b62a" - integrity sha512-sD7UXxGvePXEPVO9hoyBFyq7Tww9mpShOQrxaF1GZtIvSxDpqUvly8XM/8m9XDoQYYXEUQ8eJIb2puKIJTd3tQ== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-5.0.1.tgz#7c0053d5e77686f45577257a73905d4523e6b4f7" + integrity sha512-28KZPgO4Uf5duT2ORLAYfboUp98iUshDD7yRAfbNxNAR8Dtidfn6o20rZfoXnkri2zKBVIPlJkuCPmPJB+6erg== dependencies: - "@achingbrain/electron-fetch" "^1.7.2" abort-controller "^3.0.0" any-signal "^2.1.0" buffer "^6.0.1" + electron-fetch "^1.7.2" err-code "^2.0.0" fs-extra "^9.0.1" is-electron "^2.2.0" @@ -8553,13 +8611,13 @@ ipfs-utils@^5.0.0: stream-to-it "^0.2.0" ipfs@~0.52.0: - version "0.52.1" - resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.1.tgz#b1cf465f3f0b9b75cc747a5788fdda72ce4480fb" - integrity sha512-L7QOSOIscgRS4qSpq8ewQo1FmCbyl6OM/EB+XsO0+UbN/bGamkTtW7K+noRs/1f++PZfqNTN2+c5dDxx2WfXzg== + version "0.52.3" + resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.3.tgz#4a1e1651da197fb8dfdcd01abd20308198059b66" + integrity sha512-zCd2Ziq1GYDJizXdoAj5nof325i3mx2kzOhG6E+xdEK6FcK6kQwKendaBlQHwTbzHLqLI7ITxsepQzFWNopI2g== dependencies: debug "^4.1.1" - ipfs-cli "^0.2.1" - ipfs-core "^0.2.1" + ipfs-cli "^0.2.3" + ipfs-core "^0.3.1" ipfs-repo "^7.0.0" semver "^7.3.2" update-notifier "^5.0.0" @@ -8670,9 +8728,11 @@ is-accessor-descriptor@^1.0.0: kind-of "^6.0.0" is-arguments@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" - integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" + integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== + dependencies: + call-bind "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" @@ -8738,9 +8798,9 @@ is-color-stop@^1.0.0: rgba-regex "^1.0.0" is-core-module@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946" - integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" + integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== dependencies: has "^1.0.3" @@ -8850,6 +8910,11 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== +is-generator-function@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b" + integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ== + is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -8903,14 +8968,14 @@ is-loopback-addr@^1.0.0: integrity sha512-DhWU/kqY7X2F6KrrVTu7mHlbd2Pbo4D1YkAzasBMjQs6lJAoefxaA6m6CpSX0K6pjt9D0b9PNFI5zduy/vzOYw== is-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" - integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" + integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== is-negative-zero@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" - integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-node@^1.0.2: version "1.0.2" @@ -8945,9 +9010,9 @@ is-obj@^2.0.0: integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== is-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" - integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA= + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" + integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== is-path-cwd@^2.0.0: version "2.2.0" @@ -9028,9 +9093,9 @@ is-root@2.1.0: integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== is-set@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" - integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" + integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== is-stream@^1.0.0, is-stream@^1.1.0: version "1.1.0" @@ -9042,7 +9107,7 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-string@^1.0.4, is-string@^1.0.5: +is-string@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== @@ -9061,6 +9126,17 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.1" +is-typed-array@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.4.tgz#1f66f34a283a3c94a4335434661ca53fff801120" + integrity sha512-ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA== + dependencies: + available-typed-arrays "^1.0.2" + call-bind "^1.0.0" + es-abstract "^1.18.0-next.1" + foreach "^2.0.5" + has-symbols "^1.0.1" + is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -9871,7 +9947,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@3.14.0, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: +js-yaml@3.14.0: version "3.14.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== @@ -9879,6 +9955,14 @@ js-yaml@3.14.0, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" @@ -10084,12 +10168,12 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: object.assign "^4.1.0" "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz#642f1d7b88aa6d7eb9d8f2210e166478444fa891" - integrity sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82" + integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q== dependencies: - array-includes "^3.1.1" - object.assign "^4.1.1" + array-includes "^3.1.2" + object.assign "^4.1.2" just-debounce-it@^1.1.0: version "1.1.0" @@ -10444,9 +10528,9 @@ libp2p-crypto@^0.18.0: ursa-optional "^0.10.1" libp2p-delegated-content-routing@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/libp2p-delegated-content-routing/-/libp2p-delegated-content-routing-0.8.0.tgz#790d768aa96ecc49ed66deb7ca03332b3e1a0bf2" - integrity sha512-E5Wc5RZnohe9EEa5DMuhJgrTmWYDBuLihZCVpBeiFEzzeqJUDZwbu6jwyMEf7e1AzYlmWIGz6VvCkn0RnYR7UA== + 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== dependencies: debug "^4.1.1" it-all "^1.0.0" @@ -10455,9 +10539,9 @@ libp2p-delegated-content-routing@^0.8.0: p-queue "^6.2.1" libp2p-delegated-peer-routing@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/libp2p-delegated-peer-routing/-/libp2p-delegated-peer-routing-0.8.0.tgz#2c1bd96fed6d99d2a97f4202a6bf5ceb36d9eced" - integrity sha512-kqbC+P2c+XaQWMtQmQiRV0eQUWVW/T1P6ckbuKf3Tw3KZBkOmsLeAJ5ByG2/vFVzUUAuZiW46T1y2qOoq84Wsg== + version "0.8.2" + resolved "https://registry.yarnpkg.com/libp2p-delegated-peer-routing/-/libp2p-delegated-peer-routing-0.8.2.tgz#6dd4f0ccda33daa0cfed59b77f7ebcd6341fde38" + integrity sha512-q49zSTE7wpagt3FDY6S2e2Rr59kPoTMJAwlPeenZ1ajJLbKXRP26RfraK8RaUUw7mHw0BPo47VQcH7ieDkSO+A== dependencies: cids "^1.0.0" debug "^4.1.1" @@ -10619,9 +10703,9 @@ libp2p-interfaces@^0.7.1: uint8arrays "^1.1.0" libp2p-kad-dht@^0.20.1: - version "0.20.1" - resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.1.tgz#fa72ded6dcc18fccd4a4a891849de88cd06ddc00" - integrity sha512-khffe6L6O6oU53LO8BrI3bULH4i6FLibvFEyV+7FAPXnFYhTKHa9TsIifkL/MEAfLI0hI9QN4NwMf0DpOLMvDA== + version "0.20.4" + resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.4.tgz#2a1f61e86a10942ef16a7553a91ff96e598c55a0" + integrity sha512-7v4+3bdcoGUyR/8Y5G/Ok9UyhuqghpXFZq5VpW3oph5WtR348snTaBTPkI/8xkQmBxvLIAMxuomp7cMrQaTUyw== dependencies: abort-controller "^3.0.0" async "^2.6.2" @@ -10720,10 +10804,10 @@ libp2p-tcp@^0.15.0, libp2p-tcp@^0.15.1: multiaddr "^8.0.0" stream-to-it "^0.2.2" -libp2p-utils@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/libp2p-utils/-/libp2p-utils-0.2.2.tgz#4b2ad2f416f994b5bc2ce4e54d88511f4d3fbf7c" - integrity sha512-1V8M6iKcKqdUdLLcBbTTRl7whoa5KEHD7t5URiJ8gD2uvrkY5mp8nVo+DE3JxdNOxYRkA/02r02FYa7tbLeWCA== +libp2p-utils@^0.2.0, libp2p-utils@^0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/libp2p-utils/-/libp2p-utils-0.2.3.tgz#4eb2a59a9eda342bed73cb94553c87a63c95848a" + integrity sha512-9BoMCgvJF7LJ+JVMaHtqfCqhZN4i/sx0DrY6lf9U0Rq9uUgQ9qTai2O9LXcfr1LOS3OMMeRLsKk25MMgsf7W3w== dependencies: abortable-iterator "^3.0.0" debug "^4.2.0" @@ -10731,7 +10815,7 @@ libp2p-utils@^0.2.0: ip-address "^6.1.0" is-loopback-addr "^1.0.0" multiaddr "^8.0.0" - private-ip "^1.0.5" + private-ip "^2.1.1" libp2p-webrtc-peer@^10.0.1: version "10.0.1" @@ -10745,32 +10829,32 @@ 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.1: - version "0.20.1" - resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.1.tgz#9c49e1cc26bd4cd0f508f3b16dff058154e4b1c4" - integrity sha512-VQNL24A3rN1/9U0fTO8MqUx3+6d99iz/HvPI3p+IzHb6MgBe7er+rgbvRep7uheZ2894IxiJI848Vs0ZNypn2w== +libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.5: + version "0.20.5" + resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.5.tgz#c52364dfbe59fd8e5da0e32feeaca374d3a79f9a" + integrity sha512-Tny1+q0EY192WgrkNCV7360ifI3RXjMoao91qwLhNwx7ArsqVMzrZvBnK3MTMmYQaGE1W0n/CLlw/Nn344iv2Q== dependencies: "@hapi/hapi" "^20.0.0" - "@hapi/inert" "^6.0.2" + "@hapi/inert" "^6.0.3" abortable-iterator "^3.0.0" class-is "^1.1.0" - debug "^4.1.1" - err-code "^2.0.0" - ipfs-utils "^3.0.0" - it-pipe "^1.0.1" - libp2p-utils "^0.2.0" + debug "^4.2.0" + err-code "^2.0.3" + ipfs-utils "^5.0.0" + it-pipe "^1.1.0" + libp2p-utils "^0.2.1" libp2p-webrtc-peer "^10.0.1" mafmt "^8.0.0" menoetius "0.0.2" - minimist "^1.2.0" + minimist "^1.2.5" multiaddr "^8.0.0" p-defer "^3.0.0" - peer-id "^0.14.0" + peer-id "^0.14.2" prom-client "^12.0.0" socket.io "^2.3.0" socket.io-client "^2.3.0" stream-to-it "^0.2.2" - streaming-iterables "^5.0.2" + streaming-iterables "^5.0.3" libp2p-websockets@^0.14.0: version "0.14.0" @@ -10789,9 +10873,9 @@ libp2p-websockets@^0.14.0: p-timeout "^3.2.0" libp2p@^0.29.3: - version "0.29.3" - resolved "https://registry.yarnpkg.com/libp2p/-/libp2p-0.29.3.tgz#9cee0f44a300a5ac22f2805e5da57d98df442664" - integrity sha512-voILMLwpDqe/KafqaeH7CsmMNtOagV7ln6vNl0/2Lgq4zyY+vCmlzULRaStSagU+9V0QWoSoPmIgQdZ/Ydelhw== + 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" @@ -11034,9 +11118,9 @@ log-symbols@4.0.0: chalk "^4.0.0" loglevel@^1.6.8: - version "1.7.0" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0" - integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ== + version "1.7.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" + integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== logplease@^1.2.14, logplease@~1.2.14, logplease@~1.2.15: version "1.2.15" @@ -11055,12 +11139,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3 dependencies: js-tokens "^3.0.0 || ^4.0.0" -lower-case@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7" - integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ== +lower-case@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== dependencies: - tslib "^1.10.0" + tslib "^2.0.3" lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" @@ -11213,9 +11297,9 @@ merge-options@^2.0.0: is-plain-obj "^2.0.0" merge-options@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.3.tgz#802b401f0de8dfae00d2a1e2dab9759b3dd98fe4" - integrity sha512-jytfjQxL5mVrtD9O24zOXU4neV3uVbQdn1F0o1pzSa1yH9LTEUOtfwpWSsyAxrrrXqAFTxaU4ynqkmekHLvYew== + version "3.0.4" + resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" + integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== dependencies: is-plain-obj "^2.1.0" @@ -11289,9 +11373,9 @@ mime@1.6.0: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4: - version "2.4.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" - integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + version "2.4.7" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" + integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== mimic-fn@^1.0.0: version "1.2.0" @@ -11528,11 +11612,16 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@2.1.2, ms@^2.1.1: +ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multiaddr-to-uri@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/multiaddr-to-uri/-/multiaddr-to-uri-6.0.0.tgz#8f08a75c6eeb2370d5d24b77b8413e3f0fa9bcc0" @@ -11541,9 +11630,9 @@ multiaddr-to-uri@^6.0.0: multiaddr "^8.0.0" multiaddr@^8.0.0, multiaddr@^8.1.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-8.1.1.tgz#d86315deed93752fa68b4199fee56f8b4a516a2b" - integrity sha512-Dyur7rWX44MlgKIqVA2dYPOZx/UwG60PVSffJ5S17uo6Pu31lftJXShMEfPtUDGHnyALAOWOuC3X/iPhDtw4Vg== + version "8.1.2" + resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-8.1.2.tgz#74060ff8636ba1c01b2cf0ffd53950b852fa9b1f" + integrity sha512-r13IzW8+Sv9zab9Gt8RPMIN2WkptIPq99EpAzg4IbJ/zTELhiEwXWr9bAmEatSCI4j/LSA6ESJzvz95JZ+ZYXQ== dependencies: cids "^1.0.0" class-is "^1.1.0" @@ -11562,13 +11651,13 @@ multibase@^0.7.0: base-x "^3.0.8" buffer "^5.5.0" -multibase@^3.0.0, multibase@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/multibase/-/multibase-3.0.1.tgz#31e8b0de5b2fd5f7dc9f04dddf0a4fcc667284bf" - integrity sha512-MRU5WpnSg81/vYO977MweoeUAxBdXl7+F5Af2Es+X6Vcgfk/g/EjIqXTgm3kb+xO3m1Kzr+aIV14oRX7nv5Z9w== +multibase@^3.0.0, multibase@^3.0.1, multibase@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/multibase/-/multibase-3.1.0.tgz#2999aebbd34b3fa85cd5a9d42babc6031aeccafe" + integrity sha512-Z+pThrpbS7ckQ2DwW5mPiwCGe1a94f8DWi/OxmbyeRednVOyUKmLSE+60kL/WHFYwWnaD1OakXGk3PYI1NkMFw== dependencies: "@multiformats/base-x" "^4.0.1" - web-encoding "^1.0.2" + web-encoding "^1.0.4" multibase@~0.6.0: version "0.6.1" @@ -11614,13 +11703,13 @@ multicodec@^1.0.0: buffer "^5.6.0" varint "^5.0.0" -multicodec@^2.0.0, multicodec@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.0.1.tgz#0971bbef83fcb354315c837c9a3f3e2e422af371" - integrity sha512-YDYeWn9iGa76hOHAyyZa0kbt3tr5FLg1ZXUHrZUJltjnxxdbTIbHnxWLd2zTcMOjdT3QyO+Xs4bQgJUcC2RWUA== +multicodec@^2.0.0, multicodec@^2.0.1, multicodec@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.1.0.tgz#b66dff2184e91e74ac68981e0deba2591bbf1f87" + integrity sha512-7AYpK/avswOWvnqQ9/jOkQCS7Fp4aKxw5ojvn5gyK2VQTZz3YVXeLMzoIZDBy745JSfJMXkTS0ptnHci5Mt1mA== dependencies: - uint8arrays "1.0.0" - varint "^5.0.0" + uint8arrays "1.1.0" + varint "^6.0.0" multihashes@^0.4.15, multihashes@~0.4.13, multihashes@~0.4.15: version "0.4.21" @@ -11631,7 +11720,16 @@ multihashes@^0.4.15, multihashes@~0.4.13, multihashes@~0.4.15: multibase "^0.7.0" varint "^5.0.0" -multihashes@^3.0.1, multihashes@~3.0.1: +multihashes@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-3.1.0.tgz#aada18fc55169ae044c3455e2264024bd00f5690" + integrity sha512-snU+w6aZy5bTrrqIHW3wkT0MfHmxcpOsaVNJt0NzUnseksbjFDVUZjSmhDMAVOVnIdLMS7xHjo55pKlBIGmC3g== + dependencies: + multibase "^3.1.0" + uint8arrays "^1.0.0" + varint "^6.0.0" + +multihashes@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-3.0.1.tgz#607c243d5e04ec022ac76c9c114e08416216f019" integrity sha512-fFY67WOtb0359IjDZxaCU3gJILlkwkFbxbwrK9Bej5+NqNaYztzLOj8/NgMNMg/InxmhK+Uu8S/U4EcqsHzB7Q== @@ -11730,9 +11828,9 @@ nanoid@^2.1.0: integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== nanoid@^3.0.2, nanoid@^3.1.12, nanoid@^3.1.3: - version "3.1.16" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.16.tgz#b21f0a7d031196faf75314d7c65d36352beeef64" - integrity sha512-+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w== + version "3.1.20" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" + integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== nanomatch@^1.2.9: version "1.2.13" @@ -11799,6 +11897,11 @@ neo-async@^2.5.0, neo-async@^2.6.1: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== +netmask@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35" + integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU= + next-tick@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" @@ -11820,13 +11923,13 @@ nise@^4.0.4: just-extend "^4.0.2" path-to-regexp "^1.7.0" -no-case@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8" - integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw== +no-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== dependencies: - lower-case "^2.0.1" - tslib "^1.10.0" + lower-case "^2.0.2" + tslib "^2.0.3" node-addon-api@^2.0.0: version "2.0.2" @@ -11924,7 +12027,7 @@ node-pre-gyp@^0.13.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.52, node-releases@^1.1.66: +node-releases@^1.1.52, node-releases@^1.1.67: version "1.1.67" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12" integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg== @@ -12025,7 +12128,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^4.0.0: +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -12107,17 +12210,17 @@ object-hash@^2.0.1: integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg== object-inspect@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" - integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== + version "1.9.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" + integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== object-is@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81" - integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg== + version "1.1.4" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068" + integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -12152,31 +12255,33 @@ object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2: object-keys "^1.1.1" object.entries@^1.1.0, object.entries@^1.1.1, object.entries@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add" - integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" + integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.5" + es-abstract "^1.18.0-next.1" has "^1.0.3" object.fromentries@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" - integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== + version "2.0.3" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072" + integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.1" has "^1.0.3" object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" - integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== + version "2.1.1" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544" + integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" object.pick@^1.3.0: version "1.3.0" @@ -12186,13 +12291,13 @@ object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.1.0, object.values@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" - integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + version "1.1.2" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731" + integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.1" has "^1.0.3" oboe@2.1.5: @@ -12238,14 +12343,14 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -onetime@^5.1.0: +onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" -open@^7.0.2, open@^7.1.0: +open@^7.0.2, open@^7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== @@ -12506,9 +12611,9 @@ p-each-series@^1.0.0: p-reduce "^1.0.0" p-each-series@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" - integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" + integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== p-fifo@^1.0.0: version "1.0.0" @@ -12550,11 +12655,11 @@ p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2, p-limit@^2.3.0: p-try "^2.0.0" p-limit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe" - integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== dependencies: - p-try "^2.0.0" + yocto-queue "^0.1.0" p-locate@^2.0.0: version "2.0.0" @@ -12737,12 +12842,12 @@ parallel-transform@^1.1.0: readable-stream "^2.1.5" param-case@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238" - integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== dependencies: - dot-case "^3.0.3" - tslib "^1.10.0" + dot-case "^3.0.4" + tslib "^2.0.3" parent-module@^1.0.0: version "1.0.1" @@ -12836,13 +12941,13 @@ parseurl@~1.3.2, parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascal-case@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f" - integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA== +pascal-case@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" + integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== dependencies: - no-case "^3.0.3" - tslib "^1.10.0" + no-case "^3.0.4" + tslib "^2.0.3" pascalcase@^0.1.1: version "0.1.1" @@ -13056,9 +13161,9 @@ pino-std-serializers@^2.4.2: integrity sha512-wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg== pino@^6.0.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-6.7.0.tgz#d5d96b7004fed78816b5694fda3eab02b5ca6d23" - integrity sha512-vPXJ4P9rWCwzlTJt+f0Ni4THc3DWyt8iDDCO4edQ8narTu6hnpzdXu8FqeSJCGndl1W6lfbYQUQihUO54y66Lw== + version "6.8.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-6.8.0.tgz#d242f9936f2e65217fde75c0af5d5d8b4d3d3fde" + integrity sha512-nxq+6Jr7m0cMjYFBoTRw3bco14omZ/SQCheAHz9GVwdkbUrzKhgT+gSI/ql2Mnsca0QQKgpB/ACWhjxE4JsX3Q== dependencies: fast-redact "^3.0.0" fast-safe-stringify "^2.0.7" @@ -13711,9 +13816,9 @@ postcss-selector-matches@^4.0.0: postcss "^7.0.2" postcss-selector-not@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz#c68ff7ba96527499e832724a2674d65603b645c0" - integrity sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ== + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz#263016eef1cf219e0ade9a913780fc1f48204cbf" + integrity sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ== dependencies: balanced-match "^1.0.0" postcss "^7.0.2" @@ -13850,10 +13955,13 @@ pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -private-ip@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/private-ip/-/private-ip-1.0.5.tgz#22d0183fba09d0ec1a2a4e0f46feb771563d1449" - integrity sha1-ItAYP7oJ0OwaKk4PRv63cVY9FEk= +private-ip@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/private-ip/-/private-ip-2.1.1.tgz#cd4ac7481099991e211706f411aede9725c1712f" + integrity sha512-csxTtREJ7254nnUF14hjOrnd/vZH78vTS5opec6IDVZRwY3omKDcNL/r+vfxFZnCRsrBWVA8B0Q95lgMGrFuZQ== + dependencies: + is-ip "^3.1.0" + netmask "^1.0.6" process-nextick-args@~2.0.0: version "2.0.1" @@ -13865,11 +13973,6 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= -process@~0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" - integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8= - progress@^2.0.0, progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" @@ -14141,9 +14244,9 @@ querystringify@^2.1.1: integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== queue-microtask@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.0.tgz#f27d002cbfac741072afa0e9af3a119b0e8724a3" - integrity sha512-J95OVUiS4b8qqmpqhCodN8yPpHG2mpZUPQ8tDGyIY0VhM+kBHszOuvsMJVGNQ1OH2BnTFbqz45i+2jGpDw9H0w== + version "1.2.2" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" + integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg== quick-format-unescaped@^4.0.1: version "4.0.1" @@ -14267,9 +14370,9 @@ react-error-overlay@^6.0.7: integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw== react-i18next@^11.7.3: - version "11.7.3" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.7.3.tgz#256461c46baf5b3208c3c6860ca4e569fc7ed053" - integrity sha512-7sYZqVZgdaS9Z0ZH6nuJFErCD0zz5wK3jR4/xCrWjZcxHHF3GRu7BXdicbSPprZV4ZYz7LJzxxMHO7dg5Qb70A== + version "11.8.4" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.4.tgz#5407d2edcaa704c38e4034e7ac06413914ed6e6d" + integrity sha512-QlPJfX+Roi+jEQ6frBSsLHHH+VWbUoCl6wZDT8XHMd6PsSgepjgD2sZf/h7F46JnHeuy0U+SxY3TtrJF+aDIyg== dependencies: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" @@ -14400,6 +14503,11 @@ react-scripts@~3.4.3: optionalDependencies: fsevents "2.1.2" +react-timeago@~5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-timeago/-/react-timeago-5.2.0.tgz#d655d40aa55e4fe08a92234481a6aea7f656ab5d" + integrity sha512-wCEEDGQHMdFh/PLp+Hj5vk9ZoC4KjQ5u0u6+KrrY9rny5LqJ2gZvNNEAS4mhSZDV1i7JLgQI5VQTAux7f+vj2w== + react@~16.13.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" @@ -15119,9 +15227,11 @@ semver@7.0.0: integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" send@0.17.1: version "0.17.1" @@ -15289,7 +15399,7 @@ shortid@^2.2.8: dependencies: nanoid "^2.1.0" -side-channel@^1.0.2: +side-channel@^1.0.2, side-channel@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3" integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g== @@ -15297,7 +15407,7 @@ side-channel@^1.0.2: es-abstract "^1.18.0-next.0" object-inspect "^1.8.0" -signal-exit@^3.0.0, signal-exit@^3.0.2: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== @@ -15331,14 +15441,14 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sinon@^9.0.2: - version "9.2.1" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.1.tgz#64cc88beac718557055bd8caa526b34a2231be6d" - integrity sha512-naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w== + version "9.2.2" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.2.tgz#b83cf5d43838f99cfa3644453f4c7db23e7bd535" + integrity sha512-9Owi+RisvCZpB0bdOVFfL314I6I4YoRlz6Isi4+fr8q8YQsDPoCe5UnmNtKHRThX3negz2bXHWIuiPa42vM8EQ== dependencies: "@sinonjs/commons" "^1.8.1" "@sinonjs/fake-timers" "^6.0.1" "@sinonjs/formatio" "^5.0.1" - "@sinonjs/samsam" "^5.2.0" + "@sinonjs/samsam" "^5.3.0" diff "^4.0.2" nise "^4.0.4" supports-color "^7.1.0" @@ -15545,9 +15655,9 @@ source-list-map@^2.0.0: integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== source-map-explorer@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.0.tgz#42e12c76743e8a0ca0579d472ea5ba623e0d0498" - integrity sha512-kWhlt0celEwwuULIY+sRoZKibc/8/Ec4ckcKThDMQW3hT7KxReYW1XktwFJIbZ2VF9Yf/hA74bcoIZOSXXQIgQ== + version "2.5.1" + resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.1.tgz#35ca7ba3574f0002ac347343f1894e04860c827f" + integrity sha512-sg60PIva7pOkvTqbLRGOB3Cp84I1pial0J6tUNs/bNGIz+0+WNw37oLXEDFHTDJhFh24rto8rESv4wCB7w9HVQ== dependencies: btoa "^1.2.1" chalk "^4.1.0" @@ -15555,12 +15665,12 @@ source-map-explorer@~2.5.0: ejs "^3.1.5" escape-html "^1.0.3" glob "^7.1.6" - gzip-size "^5.1.1" + gzip-size "^6.0.0" lodash "^4.17.20" - open "^7.1.0" + open "^7.3.0" source-map "^0.7.3" - temp "^0.9.1" - yargs "^15.4.1" + temp "^0.9.4" + yargs "^16.1.1" source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" @@ -15628,9 +15738,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.6" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce" - integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw== + version "3.0.7" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" + integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== spdy-transport@^3.0.0: version "3.0.0" @@ -15715,9 +15825,9 @@ stable@^0.1.8: integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== stack-utils@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.3.tgz#db7a475733b5b8bf6521907b18891d29006f7751" - integrity sha512-WldO+YmqhEpjp23eHZRhOT1NQF51STsbxZ+/AdpFD+EhheFxAe5d0WoK4DQVJkSHacPrJJX3OqRAl9CgHf78pg== + version "1.0.4" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8" + integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w== dependencies: escape-string-regexp "^2.0.0" @@ -15778,7 +15888,7 @@ stream-to-it@^0.2.0, stream-to-it@^0.2.1, stream-to-it@^0.2.2: dependencies: get-iterator "^1.0.2" -streaming-iterables@^5.0.2: +streaming-iterables@^5.0.2, streaming-iterables@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/streaming-iterables/-/streaming-iterables-5.0.3.tgz#a988de42d55e1c0b28f92769101ef69723816918" integrity sha512-1AgrKjHTvaaK+iA+N3BuTXQWVb7Adyb6+v8yIW3SCTwlBVYEbm76mF8Mf0/IVo+DOk7hoeELOURBKTCMhe/qow== @@ -15840,32 +15950,33 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: strip-ansi "^6.0.0" string.prototype.matchall@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" - integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg== + version "4.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz#24243399bc31b0a49d19e2b74171a15653ec996a" + integrity sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0" + es-abstract "^1.18.0-next.1" has-symbols "^1.0.1" internal-slot "^1.0.2" regexp.prototype.flags "^1.3.0" - side-channel "^1.0.2" + side-channel "^1.0.3" string.prototype.trimend@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46" - integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" + integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" string.prototype.trimstart@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7" - integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" + integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@^1.2.0: version "1.3.0" @@ -16108,7 +16219,7 @@ tdigest@^0.1.1: dependencies: bintrees "1.0.1" -temp@^0.9.1: +temp@^0.9.4: version "0.9.4" resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620" integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA== @@ -16348,9 +16459,9 @@ tr46@^1.0.1: punycode "^2.1.0" truffle@~5.1.55: - version "5.1.55" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.55.tgz#ec5e245213e4f0f42ef836308b50a8d79355a649" - integrity sha512-chZM43DOo7aCn+z1Pcj5f4ts9YqnHhKI31CZ+B6N93nbWKnIrBN/hBZeEXSi9s9FZ3nsmp+Iplr5Z4dnHAqDxA== + version "5.1.58" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.58.tgz#3202bc080ef71c811fe9181bfc47fff944afab62" + integrity sha512-BnMSq9+0vUj6B8OODs/U/cV7MiyNrKOKmeO1fhn2LOvN6XpOd06Qitw0V15lNxlCL+datx2WEZ9AnYql689bnQ== dependencies: app-module-path "^2.2.0" mocha "8.1.2" @@ -16383,11 +16494,16 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" + integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== + tsparticles@^1.18.10: version "1.18.11" resolved "https://registry.yarnpkg.com/tsparticles/-/tsparticles-1.18.11.tgz#924d74cf40656727f5df047b53c4761463a4f6e7" @@ -16505,15 +16621,7 @@ typical@^6.0.0: resolved "https://registry.yarnpkg.com/typical/-/typical-6.0.1.tgz#89bd1a6aa5e5e96fa907fb6b7579223bff558a06" integrity sha512-+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A== -uint8arrays@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-1.0.0.tgz#9cf979517f85c32d6ef54adf824e3499bb715331" - integrity sha512-14tqEVujDREW7YwonSZZwLvo7aFDfX7b6ubvM/U7XvZol+CC/LbhaX/550VlWmhddAL9Wou1sxp0Of3tGqXigg== - dependencies: - multibase "^3.0.0" - web-encoding "^1.0.2" - -uint8arrays@^1.0.0, uint8arrays@^1.1.0: +uint8arrays@1.1.0, uint8arrays@^1.0.0, uint8arrays@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-1.1.0.tgz#d034aa65399a9fd213a1579e323f0b29f67d0ed2" integrity sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA== @@ -16789,6 +16897,18 @@ util@^0.11.0: dependencies: inherits "2.0.3" +util@^0.12.0: + version "0.12.3" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" + integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== + dependencies: + inherits "^2.0.3" + is-arguments "^1.0.4" + is-generator-function "^1.0.7" + is-typed-array "^1.1.3" + safe-buffer "^5.1.2" + which-typed-array "^1.1.2" + utila@~0.4: version "0.4.0" resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" @@ -16839,6 +16959,11 @@ varint@^5.0.0, varint@~5.0.0: resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4" integrity sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow== +varint@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" + integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -16923,10 +17048,10 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web-encoding@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.4.tgz#0398d39ce2cbef5ed2617080750ed874e6153aea" - integrity sha512-DcXs2lbVPzuJmn2kuDEwul2oZg7p4YMa5J2f0YzsOBHaAnBYGPNUB/rJ74DTjTKpw7F0+lSsVM8sFHE2UyBixg== +web-encoding@^1.0.2, web-encoding@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.6.tgz#ec631356ee523b4474ecbcae680440bd1e79416a" + integrity sha512-26wEnRPEFAc5d5lmH1Q/DuvWEYsRF1D2alX2jlKpdmqv7cj+BbANL7Xlcl9r4s72Eg9kItZa9RWVbBMC9dMv4w== web3-bzz@1.3.0: version "1.3.0" @@ -16938,6 +17063,16 @@ web3-bzz@1.3.0: swarm-js "^0.1.40" underscore "1.9.1" +web3-bzz@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.1.tgz#c7e13e5fbbbe4634b0d883e5440069fc58e58044" + integrity sha512-MN726zFpFpwhs3NMC35diJGkwTVUj+8LM/VWqooGX/MOjgYzNrJ7Wr8EzxoaTCy87edYNBprtxBkd0HzzLmung== + dependencies: + "@types/node" "^12.12.6" + got "9.6.0" + swarm-js "^0.1.40" + underscore "1.9.1" + web3-core-helpers@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.0.tgz#697cc3246a7eaaaac64ea506828d861c981c3f31" @@ -16947,6 +17082,15 @@ web3-core-helpers@1.3.0: web3-eth-iban "1.3.0" web3-utils "1.3.0" +web3-core-helpers@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.1.tgz#ffd6f47c1b54a8523f00760a8d713f44d0f97e97" + integrity sha512-tMVU0ScyQUJd/HFWfZrvGf+QmPCodPyKQw1gQ+n9We/H3vPPbUxDjNeYnd4BbYy5O9ox+0XG6i3+JlwiSkgDkA== + dependencies: + underscore "1.9.1" + web3-eth-iban "1.3.1" + web3-utils "1.3.1" + web3-core-method@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.0.tgz#a71387af842aec7dbad5dbbd1130c14cc6c8beb3" @@ -16959,6 +17103,18 @@ web3-core-method@1.3.0: web3-core-subscriptions "1.3.0" web3-utils "1.3.0" +web3-core-method@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.1.tgz#c1d8bf1e2104a8d625c99caf94218ad2dc948c92" + integrity sha512-dA38tNVZWTxBFMlLFunLD5Az1AWRi5HqM+AtQrTIhxWCzg7rJSHuaYOZ6A5MHKGPWpdykLhzlna0SsNv5AVs8w== + dependencies: + "@ethersproject/transactions" "^5.0.0-beta.135" + underscore "1.9.1" + web3-core-helpers "1.3.1" + web3-core-promievent "1.3.1" + web3-core-subscriptions "1.3.1" + web3-utils "1.3.1" + web3-core-promievent@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.0.tgz#e0442dd0a8989b6bdce09293976cee6d9237a484" @@ -16966,6 +17122,13 @@ web3-core-promievent@1.3.0: dependencies: eventemitter3 "4.0.4" +web3-core-promievent@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.1.tgz#b4da4b34cd9681e22fcda25994d7629280a1e046" + integrity sha512-jGu7TkwUqIHlvWd72AlIRpsJqdHBQnHMeMktrows2148gg5PBPgpJ10cPFmCCzKT6lDOVh9B7pZMf9eckMDmiA== + dependencies: + eventemitter3 "4.0.4" + web3-core-requestmanager@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.0.tgz#c5b9a0304504c0e6cce6c90bc1a3bff82732aa1f" @@ -16977,6 +17140,18 @@ web3-core-requestmanager@1.3.0: web3-providers-ipc "1.3.0" web3-providers-ws "1.3.0" +web3-core-requestmanager@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.1.tgz#6dd2b5161ba778dfffe68994a4accff2decc54fe" + integrity sha512-9WTaN2SoyJX1amRyTzX2FtbVXsyWBI2Wef2Q3gPiWaEo/VRVm3e4Bq8MwxNTUMIJMO8RLGHjtdgsoDKPwfL73Q== + dependencies: + underscore "1.9.1" + util "^0.12.0" + web3-core-helpers "1.3.1" + web3-providers-http "1.3.1" + web3-providers-ipc "1.3.1" + web3-providers-ws "1.3.1" + web3-core-subscriptions@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.0.tgz#c2622ccd2b84f4687475398ff966b579dba0847e" @@ -16986,6 +17161,15 @@ web3-core-subscriptions@1.3.0: underscore "1.9.1" web3-core-helpers "1.3.0" +web3-core-subscriptions@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.1.tgz#be1103259f91b7fc7f4c6a867aa34dea70a636f7" + integrity sha512-eX3N5diKmrxshc6ZBZ8EJxxAhCxdYPbYXuF2EfgdIyHmxwmYqIVvKepzO8388Bx8JD3D0Id/pKE0dC/FnDIHTQ== + dependencies: + eventemitter3 "4.0.4" + underscore "1.9.1" + web3-core-helpers "1.3.1" + web3-core@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.0.tgz#b818903738461c1cca0163339e1d6d3fa51242cf" @@ -16999,6 +17183,19 @@ web3-core@1.3.0: web3-core-requestmanager "1.3.0" web3-utils "1.3.0" +web3-core@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.1.tgz#fb0fc5d952a7f3d580a7e6155d2f28be064e64cb" + integrity sha512-QlBwSyjl2pqYUBE7lH9PfLxa8j6AzzAtvLUqkgoaaFJYLP/+XavW1n6dhVCTq+U3L3eNc+bMp9GLjGDJNXMnGg== + dependencies: + "@types/bn.js" "^4.11.5" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-core-requestmanager "1.3.1" + web3-utils "1.3.1" + web3-eth-abi@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.0.tgz#387b7ea9b38be69ad8856bc7b4e9a6a69bb4d22b" @@ -17008,6 +17205,15 @@ web3-eth-abi@1.3.0: underscore "1.9.1" web3-utils "1.3.0" +web3-eth-abi@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.1.tgz#d60fe5f15c7a3a426c553fdaa4199d07f1ad899c" + integrity sha512-ds4aTeKDUEqTXgncAtxvcfMpPiei9ey7+s2ZZ+OazK2CK5jWhFiJuuj9Q68kOT+hID7E1oSDVsNmJWFD/7lbMw== + dependencies: + "@ethersproject/abi" "5.0.7" + underscore "1.9.1" + web3-utils "1.3.1" + web3-eth-accounts@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.0.tgz#010acf389b2bee6d5e1aecb2fe78bfa5c8f26c7a" @@ -17025,6 +17231,23 @@ web3-eth-accounts@1.3.0: web3-core-method "1.3.0" web3-utils "1.3.0" +web3-eth-accounts@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.1.tgz#63b247461f1ae0ae46f9a5d5aa896ea80237143e" + integrity sha512-wsV3/0Pbn5+pI8PiCD1CYw7I1dkQujcP//aJ+ZH8PoaHQoG6HnJ7nTp7foqa0r/X5lizImz/g5S8D76t3Z9tHA== + dependencies: + crypto-browserify "3.12.0" + eth-lib "0.2.8" + ethereumjs-common "^1.3.2" + ethereumjs-tx "^2.1.1" + scrypt-js "^3.0.1" + underscore "1.9.1" + uuid "3.3.2" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-utils "1.3.1" + web3-eth-contract@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.0.tgz#c758340ac800788e29fa29edc8b0c0ac957b741c" @@ -17040,6 +17263,21 @@ web3-eth-contract@1.3.0: web3-eth-abi "1.3.0" web3-utils "1.3.0" +web3-eth-contract@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.1.tgz#05cb77bd2a671c5480897d20de487f3bae82e113" + integrity sha512-cHu9X1iGrK+Zbrj4wYKwHI1BtVGn/9O0JRsZqd9qcFGLwwAmaCJYy0sDn7PKCKDSL3qB+MDILoyI7FaDTWWTHg== + dependencies: + "@types/bn.js" "^4.11.5" + underscore "1.9.1" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-core-promievent "1.3.1" + web3-core-subscriptions "1.3.1" + web3-eth-abi "1.3.1" + web3-utils "1.3.1" + web3-eth-ens@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.0.tgz#0887ba38473c104cf5fb8a715828b3b354fa02a2" @@ -17055,6 +17293,21 @@ web3-eth-ens@1.3.0: web3-eth-contract "1.3.0" web3-utils "1.3.0" +web3-eth-ens@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.1.tgz#ccfd621ddc1fecb44096bc8e60689499a9eb4421" + integrity sha512-MUQvYgUYQ5gAwbZyHwI7y+NTT6j98qG3MVhGCUf58inF5Gxmn9OlLJRw8Tofgf0K87Tk9Kqw1/2QxUE4PEZMMA== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + underscore "1.9.1" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-promievent "1.3.1" + web3-eth-abi "1.3.1" + web3-eth-contract "1.3.1" + web3-utils "1.3.1" + web3-eth-iban@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.0.tgz#15b782dfaf273ebc4e3f389f1367f4e88ddce4a5" @@ -17063,6 +17316,14 @@ web3-eth-iban@1.3.0: bn.js "^4.11.9" web3-utils "1.3.0" +web3-eth-iban@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.1.tgz#4351e1a658efa5f3218357f0a38d6d8cad82481e" + integrity sha512-RCQLfR9Z+DNfpw7oUauYHg1HcVoEljzhwxKn3vi15gK0ssWnTwRGqUiIyVTeSb836G6oakOd5zh7XYqy7pn+nw== + dependencies: + bn.js "^4.11.9" + web3-utils "1.3.1" + web3-eth-personal@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.0.tgz#d376e03dc737d961ff1f8d1aca866efad8477135" @@ -17075,6 +17336,18 @@ web3-eth-personal@1.3.0: web3-net "1.3.0" web3-utils "1.3.0" +web3-eth-personal@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.1.tgz#cfe8af01588870d195dabf0a8d9e34956fb8856d" + integrity sha512-/vZEQpXJfBfYoy9KT911ItfoscEfF0Q2j8tsXzC2xmmasSZ6YvAUuPhflVmAo0IHQSX9rmxq0q1p3sbnE3x2pQ== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-net "1.3.1" + web3-utils "1.3.1" + web3-eth@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.0.tgz#898e5f5a8827f9bc6844e267a52eb388916a6771" @@ -17094,6 +17367,25 @@ web3-eth@1.3.0: web3-net "1.3.0" web3-utils "1.3.0" +web3-eth@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.1.tgz#60ac4b58e5fd17b8dbbb8378abd63b02e8326727" + integrity sha512-e4iL8ovj0zNxzbv4LTHEv9VS03FxKlAZD+95MolwAqtVoUnKC2H9X6dli0w6eyXP0aKw+mwY0g0CWQHzqZvtXw== + dependencies: + underscore "1.9.1" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-core-subscriptions "1.3.1" + web3-eth-abi "1.3.1" + web3-eth-accounts "1.3.1" + web3-eth-contract "1.3.1" + web3-eth-ens "1.3.1" + web3-eth-iban "1.3.1" + web3-eth-personal "1.3.1" + web3-net "1.3.1" + web3-utils "1.3.1" + web3-net@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.0.tgz#b69068cccffab58911c2f08ca4abfbefb0f948c6" @@ -17103,6 +17395,15 @@ web3-net@1.3.0: web3-core-method "1.3.0" web3-utils "1.3.0" +web3-net@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.1.tgz#79374b1df37429b0839b83b0abc4440ac6181568" + integrity sha512-vuMMWMk+NWHlrNfszGp3qRjH/64eFLiNIwUi0kO8JXQ896SP3Ma0su5sBfSPxNCig047E9GQimrL9wvYAJSO5A== + dependencies: + web3-core "1.3.1" + web3-core-method "1.3.1" + web3-utils "1.3.1" + web3-providers-http@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.0.tgz#88227f64c88b32abed4359383c2663616e0dc531" @@ -17111,6 +17412,14 @@ web3-providers-http@1.3.0: web3-core-helpers "1.3.0" xhr2-cookies "1.1.0" +web3-providers-http@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.1.tgz#becbea61706b2fa52e15aca6fe519ee108a8fab9" + integrity sha512-DOujG6Ts7/hAMj0PW5p9/1vwxAIr+1CJ6ZWHshtfOq1v1KnMphVTGOrjcTTUvPT33/DA/so2pgGoPMrgaEIIvQ== + dependencies: + web3-core-helpers "1.3.1" + xhr2-cookies "1.1.0" + web3-providers-ipc@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.0.tgz#d7c2b203733b46f7b4e7b15633d891648cf9a293" @@ -17120,6 +17429,15 @@ web3-providers-ipc@1.3.0: underscore "1.9.1" web3-core-helpers "1.3.0" +web3-providers-ipc@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.1.tgz#3cb2572fc5286ab2f3117e0a2dce917816c3dedb" + integrity sha512-BNPscLbvwo+u/tYJrLvPnl/g/SQVSnqP/TjEsB033n4IXqTC4iZ9Of8EDmI0U6ds/9nwNqOBx3KsxbinL46UZA== + dependencies: + oboe "2.1.5" + underscore "1.9.1" + web3-core-helpers "1.3.1" + web3-providers-ws@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.0.tgz#84adeff65acd4624d7f5bb43c5b2b22d8f0f63a4" @@ -17130,6 +17448,16 @@ web3-providers-ws@1.3.0: web3-core-helpers "1.3.0" websocket "^1.0.32" +web3-providers-ws@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.1.tgz#a70140811d138a1a5cf3f0c39d11887c8e341c83" + integrity sha512-DAbVbiizv0Hr/bLKjyyKMHc/66ccVkudan3eRsf+R/PXWCqfXb7q6Lwodj4llvC047pEuLKR521ZKr5wbfk1KQ== + dependencies: + eventemitter3 "4.0.4" + underscore "1.9.1" + web3-core-helpers "1.3.1" + websocket "^1.0.32" + web3-shh@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.0.tgz#62d15297da8fb5f733dd1b98f9ade300590f4d49" @@ -17140,6 +17468,16 @@ web3-shh@1.3.0: web3-core-subscriptions "1.3.0" web3-net "1.3.0" +web3-shh@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.1.tgz#42294d684358c22aa48616cb9a3eb2e9c1e6362f" + integrity sha512-57FTQvOW1Zm3wqfZpIEqL4apEQIR5JAxjqA4RM4eL0jbdr+Zj5Y4J93xisaEVl6/jMtZNlsqYKTVswx8mHu1xw== + dependencies: + web3-core "1.3.1" + web3-core-method "1.3.1" + web3-core-subscriptions "1.3.1" + web3-net "1.3.1" + web3-utils@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.0.tgz#5bac16e5e0ec9fe7bdcfadb621655e8aa3cf14e1" @@ -17154,7 +17492,21 @@ web3-utils@1.3.0: underscore "1.9.1" utf8 "3.0.0" -web3@1.3.0, web3@~1.3.0: +web3-utils@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.1.tgz#9aa880dd8c9463fe5c099107889f86a085370c2e" + integrity sha512-9gPwFm8SXtIJuzdrZ37PRlalu40fufXxo+H2PiCwaO6RpKGAvlUlWU0qQbyToFNXg7W2H8djEgoAVac8NLMCKQ== + dependencies: + bn.js "^4.11.9" + eth-lib "0.2.8" + ethereum-bloom-filters "^1.0.6" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + underscore "1.9.1" + utf8 "3.0.0" + +web3@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.0.tgz#8fe4cd6e2a21c91904f343ba75717ee4c76bb349" integrity sha512-4q9dna0RecnrlgD/bD1C5S+81Untbd6Z/TBD7rb+D5Bvvc0Wxjr4OP70x+LlnwuRDjDtzBwJbNUblh2grlVArw== @@ -17167,15 +17519,28 @@ web3@1.3.0, web3@~1.3.0: web3-shh "1.3.0" web3-utils "1.3.0" +web3@~1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.1.tgz#f780138c92ae3c42ea45e1a3c6ae8844e0aa5054" + integrity sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog== + dependencies: + web3-bzz "1.3.1" + web3-core "1.3.1" + web3-eth "1.3.1" + web3-eth-personal "1.3.1" + web3-net "1.3.1" + web3-shh "1.3.1" + web3-utils "1.3.1" + webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== webpack-dev-middleware@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" - integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw== + version "3.7.3" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5" + integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ== dependencies: memory-fs "^0.4.1" mime "^2.4.4" @@ -17299,9 +17664,9 @@ websocket-extensions@>=0.1.1: integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== websocket@^1.0.32: - version "1.0.32" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.32.tgz#1f16ddab3a21a2d929dec1687ab21cfdc6d3dbb1" - integrity sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q== + version "1.0.33" + resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.33.tgz#407f763fc58e74a3fa41ca3ae5d78d3f5e3b82a5" + integrity sha512-XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA== dependencies: bufferutil "^4.0.1" debug "^2.2.0" @@ -17350,6 +17715,19 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-typed-array@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff" + integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA== + dependencies: + available-typed-arrays "^1.0.2" + call-bind "^1.0.0" + es-abstract "^1.18.0-next.1" + foreach "^2.0.5" + function-bind "^1.1.1" + has-symbols "^1.0.1" + is-typed-array "^1.1.3" + which@2.0.2, which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -17629,9 +18007,9 @@ ws@^6.1.2, ws@^6.2.1: async-limiter "~1.0.0" ws@^7.1.2, ws@^7.3.1: - version "7.4.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7" - integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ== + version "7.4.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" + integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ== ws@~6.1.0: version "6.1.4" @@ -17673,11 +18051,11 @@ xhr2-cookies@1.1.0: cookiejar "^2.1.1" xhr@^2.0.4, xhr@^2.3.3: - version "2.5.0" - resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz#bed8d1676d5ca36108667692b74b316c496e49dd" - integrity sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ== + version "2.6.0" + resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d" + integrity sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA== dependencies: - global "~4.3.0" + global "~4.4.0" is-function "^1.0.1" parse-headers "^2.0.0" xtend "^4.0.0" @@ -17703,9 +18081,9 @@ xor-distance@^2.0.0: integrity sha512-AsAqZfPAuWx7qB/0kyRDUEvoU3QKsHWzHU9smFlkaiprEpGfJ/NBbLze2Uq0rdkxCxkNM9uOLvz/KoNBCbZiLQ== xregexp@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.0.tgz#29660f5d6567cd2ef981dd4a50cb05d22c10719d" - integrity sha512-83y4aa8o8o4NZe+L+46wpa+F1cWR/wCGOWI3tzqUso0w3/KAvXy0+Di7Oe/cbNMixDR4Jmi7NEybWU6ps25Wkg== + version "4.4.1" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.1.tgz#c84a88fa79e9ab18ca543959712094492185fe65" + integrity sha512-2u9HwfadaJaY9zHtRRnH6BY6CQVNQKkYm3oLtC9gJXXzfsbACg5X5e4EZZGVAH+YIfa+QA9lsFQTTe3HURF3ag== dependencies: "@babel/runtime-corejs3" "^7.12.1" @@ -17725,9 +18103,9 @@ xtend@~3.0.0: integrity sha1-XM50B7r2Qsunvs2laBEcST9ZZlo= y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + version "4.0.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" + integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== y18n@^5.0.5: version "5.0.5" @@ -17827,7 +18205,7 @@ yargs@^14.2.3: y18n "^4.0.0" yargs-parser "^15.0.1" -yargs@^15.0.2, yargs@^15.4.1: +yargs@^15.0.2: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== @@ -17844,10 +18222,10 @@ yargs@^15.0.2, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.0.3: - version "16.1.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.1.1.tgz#5a4a095bd1ca806b0a50d0c03611d38034d219a1" - integrity sha512-hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w== +yargs@^16.0.3, yargs@^16.1.1: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== dependencies: cliui "^7.0.2" escalade "^3.1.1" @@ -17861,3 +18239,8 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From c3f3ca343a78ae08b156ac30234b7dc53a135b9f Mon Sep 17 00:00:00 2001 From: Ezerous Date: Mon, 21 Dec 2020 16:21:25 +0200 Subject: [PATCH 18/37] Fix for removed contract function --- packages/concordia-app/src/views/Home/index.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/concordia-app/src/views/Home/index.jsx b/packages/concordia-app/src/views/Home/index.jsx index 69305ba..989d684 100644 --- a/packages/concordia-app/src/views/Home/index.jsx +++ b/packages/concordia-app/src/views/Home/index.jsx @@ -8,20 +8,20 @@ import './styles.css'; import { drizzle } from '../../redux/store'; import { FORUM_CONTRACT } from '../../constants/contracts/ContractNames'; -const { contracts: { [FORUM_CONTRACT]: { methods: { getNumberOfTopics } } } } = drizzle; +const { contracts: { [FORUM_CONTRACT]: { methods: { numTopics } } } } = drizzle; const Home = () => { const [numberOfTopicsCallHash, setNumberOfTopicsCallHash] = useState(''); - const getNumberOfTopicsResults = useSelector((state) => state.contracts[FORUM_CONTRACT].getNumberOfTopics); + const numTopicsResults = useSelector((state) => state.contracts[FORUM_CONTRACT].numTopics); useEffect(() => { - setNumberOfTopicsCallHash(getNumberOfTopics.cacheCall()); + setNumberOfTopicsCallHash(numTopics.cacheCall()); }, []); - const numberOfTopics = useMemo(() => (getNumberOfTopicsResults[numberOfTopicsCallHash] !== undefined - ? parseInt(getNumberOfTopicsResults[numberOfTopicsCallHash].value, 10) + const numberOfTopics = useMemo(() => (numTopicsResults[numberOfTopicsCallHash] !== undefined + ? parseInt(numTopicsResults[numberOfTopicsCallHash].value, 10) : null), - [getNumberOfTopicsResults, numberOfTopicsCallHash]); + [numTopicsResults, numberOfTopicsCallHash]); return useMemo(() => ( From 00510656f1836ad2e5384461c62725d6ac66c92a Mon Sep 17 00:00:00 2001 From: Ezerous Date: Tue, 22 Dec 2020 13:09:31 +0200 Subject: [PATCH 19/37] Minor reformatting --- packages/concordia-contracts/contracts/Forum.sol | 12 ++++++------ .../concordia-contracts/contracts/PostVoting.sol | 12 ++++++------ packages/concordia-contracts/contracts/Voting.sol | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/concordia-contracts/contracts/Forum.sol b/packages/concordia-contracts/contracts/Forum.sol index 233300c..05d6031 100644 --- a/packages/concordia-contracts/contracts/Forum.sol +++ b/packages/concordia-contracts/contracts/Forum.sol @@ -24,7 +24,7 @@ contract Forum { event UsernameUpdated(string newName, string oldName, address userAddress); function signUp(string memory username) public returns (bool) { - require (!hasUserSignedUp(msg.sender), USER_HAS_NOT_SIGNED_UP); + require(!hasUserSignedUp(msg.sender), USER_HAS_NOT_SIGNED_UP); require(!isUserNameTaken(username), USERNAME_TAKEN); users[msg.sender] = User(username, new uint[](0), new uint[](0), block.timestamp, true); userAddresses[username] = msg.sender; @@ -33,7 +33,7 @@ contract Forum { } function updateUsername(string memory newUsername) public returns (bool) { - require (hasUserSignedUp(msg.sender), USER_HAS_NOT_SIGNED_UP); + require(hasUserSignedUp(msg.sender), USER_HAS_NOT_SIGNED_UP); require(!isUserNameTaken(newUsername), USERNAME_TAKEN); string memory oldUsername = getUsername(msg.sender); delete userAddresses[users[msg.sender].username]; @@ -44,7 +44,7 @@ contract Forum { } function getUsername(address userAddress) public view returns (string memory) { - require (hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); + require(hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); return users[userAddress].username; } @@ -63,17 +63,17 @@ contract Forum { } function getUserTopics(address userAddress) public view returns (uint[] memory) { - require (hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); + require(hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); return users[userAddress].topicIDs; } function getUserPosts(address userAddress) public view returns (uint[] memory) { - require (hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); + require(hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); return users[userAddress].postIDs; } function getUserDateOfRegister(address userAddress) public view returns (uint) { - require (hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); + require(hasUserSignedUp(userAddress), USER_HAS_NOT_SIGNED_UP); return users[userAddress].timestamp; } diff --git a/packages/concordia-contracts/contracts/PostVoting.sol b/packages/concordia-contracts/contracts/PostVoting.sol index 3d1b073..c6183c7 100644 --- a/packages/concordia-contracts/contracts/PostVoting.sol +++ b/packages/concordia-contracts/contracts/PostVoting.sol @@ -77,11 +77,11 @@ contract PostVoting { address voter = msg.sender; Option prevOption = postBallot.votes[voter]; - if(prevOption == option) + if (prevOption == option) return; // Remove previous vote if exists - if(prevOption != Option.DEFAULT){ + if (prevOption != Option.DEFAULT) { uint voterIndex = getVoterIndex(postID, voter); // Swap with last voter address and delete vote postBallot.voters[prevOption][voterIndex] = postBallot.voters[prevOption][postBallot.voters[prevOption].length - 1]; @@ -89,21 +89,21 @@ contract PostVoting { } // Add new vote - if(option != Option.DEFAULT) + if (option != Option.DEFAULT) postBallot.voters[option].push(voter); postBallot.votes[voter] = option; emit UserVotedPost(voter, postID, option); } - function upvote(uint postID) public{ + function upvote(uint postID) public { vote(postID, Option.UP); } - function downvote(uint postID) public{ + function downvote(uint postID) public { vote(postID, Option.DOWN); } - function unvote(uint postID) public{ + function unvote(uint postID) public { vote(postID, Option.DEFAULT); } } diff --git a/packages/concordia-contracts/contracts/Voting.sol b/packages/concordia-contracts/contracts/Voting.sol index 83e9c0e..2ce5a6a 100644 --- a/packages/concordia-contracts/contracts/Voting.sol +++ b/packages/concordia-contracts/contracts/Voting.sol @@ -41,7 +41,7 @@ contract Voting { function createPoll(uint topicID, uint numOptions, string memory dataHash, bool enableVoteChanges) public returns (uint) { require(forum.hasUserSignedUp(msg.sender), forum.USER_HAS_NOT_SIGNED_UP()); require(forum.topicExists(topicID), forum.TOPIC_DOES_NOT_EXIST()); - require (forum.getTopicAuthor(topicID) == msg.sender, TOPIC_POLL_DIFFERENT_CREATOR); + require(forum.getTopicAuthor(topicID) == msg.sender, TOPIC_POLL_DIFFERENT_CREATOR); require(!pollExists(topicID), POLL_EXISTS); Poll storage poll = polls[topicID]; @@ -132,21 +132,21 @@ contract Voting { Poll storage poll = polls[topicID]; address voter = msg.sender; uint prevOption = poll.votes[voter]; - if(prevOption == option) + if (prevOption == option) return; // Voter hasn't voted before - if(prevOption == 0){ + if (prevOption == 0) { poll.voters[option].push(voter); poll.votes[voter] = option; emit UserVotedPoll(voter, topicID, option); } - else if (poll.enableVoteChanges){ + else if (poll.enableVoteChanges) { uint voterIndex = getVoterIndex(topicID, voter); // Swap with last voter address and delete vote poll.voters[prevOption][voterIndex] = poll.voters[prevOption][poll.voters[prevOption].length - 1]; poll.voters[prevOption].pop(); - if(option != 0) + if (option != 0) poll.voters[option].push(voter); poll.votes[voter] = option; emit UserVotedPoll(voter, topicID, option); From 9867846874fb1795a9e79df19926cdf9df689032 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Tue, 12 Jan 2021 15:45:53 +0200 Subject: [PATCH 20/37] Add logo --- packages/concordia-app/public/favicon.ico | Bin 3870 -> 15086 bytes .../concordia-app/src/assets/css/index.css | 4 ++++ .../src/assets/images/app_logo.png | Bin 221292 -> 0 bytes .../src/assets/images/app_logo.svg | 1 + .../CustomLoader/index.jsx | 2 +- .../MainLayout/MainLayoutMenu/index.jsx | 4 ++-- 6 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 packages/concordia-app/src/assets/images/app_logo.png create mode 100644 packages/concordia-app/src/assets/images/app_logo.svg diff --git a/packages/concordia-app/public/favicon.ico b/packages/concordia-app/public/favicon.ico index a11777cc471a4344702741ab1c8a588998b1311a..e246a5745bf4e3795f2982e6e7364ecc6ab2392e 100644 GIT binary patch literal 15086 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 X*E`%Gm=6bqxi2R-ecSYVXY=?!5znak literal 3870 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 baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@ diff --git a/packages/concordia-app/src/assets/css/index.css b/packages/concordia-app/src/assets/css/index.css index 2a2d849..09e53ea 100644 --- a/packages/concordia-app/src/assets/css/index.css +++ b/packages/concordia-app/src/assets/css/index.css @@ -15,3 +15,7 @@ body.app { color: gray; font-style: italic; } + +.ui.inverted.menu { + background: #0B2540; +} diff --git a/packages/concordia-app/src/assets/images/app_logo.png b/packages/concordia-app/src/assets/images/app_logo.png deleted file mode 100644 index eb521701f2faf5ffddf586aa58883eb3cd15602b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221292 zcmbTdbx@m8*Y1rKr??e&cXtc!Qrz9$inmyBm!d6Bad$256fFtv-r(LZeV+5af1We* zC6i&;H)Qs`ZLRgYt~*9UO&$aF11by*42GftKnn&2DeT_|84(5sR=+er19}0$PD)h@ z2Bski?Zx69^mjx{WqAP1-+%9KJ>_Z878G{{125<|to-}HN;BsALmQF26;)-CcHZG) z(Gu;p_Ef;YP{Jqzq;&k(&hi7ZNo_Lz&Q=x_jFWwl9HjG9){}?(@&#D6<>_I9r=dIE z2={pr#Dk5cp$PNZ!F|;EWxNv(hd(WZ#dsxyG4@NRztq5F5hXRkuO+Z_J1uxTf|f^Y z{qizNh4ZsYSyk7@kNcXZkOI3xJ328Rq07gDOQEHuj{s<|{;#h&^mr_1=`qR3$8J1! zOG51R;H35h<64|2O#D8hOw@asek>P|63UM#c@_x62 z4r`~@-O7+{!}ZpScfqibd8o!be2Ro)ITu*nimyQZgg{DUIo3=v+k27Hwjb@uF_QPK zPXjPolraMg17W*0#hs3Csn8q#xEB2|723DR@CM6i&SL_WOu@NqBZ0-w}Umw%`Ug}P6f zc~Sx}-W=w`UXr+%!~>z02pMj&uB=xXZ3y7bo&{`<6#=zrwoD+i=gr_37pzCoE+2M%;(ztTA{!?y?Azh6?Mhg^~psdmLgEl zc7b`|M)_6X*1SFE<%fImQup7`J4iuKF@fihKR?s_%P;H-Y27j&{rMSVAZ>t~{>eHU zp{denE|^`DED6QMA=^t)h9n;q={=1pZt~!MMQS-21cms8ni}HTtcflbS4f5gYZRpz z!ym-TjDn5%cbW?uzqkRB4Puu2YTjeDeu~9uuLq;1<5HhI@YklsW@ChlEWPxl!L+}K zGzcYsfTY`x*F%nKgHawP*$2t?$Ujc9)=^Ye%f7|m0SXLEK}TUzI-yVzB_eNtpd;%dP<3@m(;tZ~j87So|1(9dY$ zqbn1%LkD1%DwCmv!qz4XP~mqmoZjpZ257VGtA7hu?0Lz@AuLW#f;5UscuMo+uvJP+ zWFmcLQy>u>VrHCxDz*6igd-sWIyb`x+ns>DSNC#~_Na7!e*mNvBIefHO#6`BB4w2W z4-1bw^sLmi1xc#o6>95Wbx^gm2 z4+BR}UDT-8Ugpq{CcIXyTeoH}d)Lz=k8vzWZoK#ifROq+ z8SiT9CrYL#5$ZLOy#sQ)BBb=9O-9|mJ6XtQw)=$%uFOnP@ltTl<%eoc1avvvUdQKh z{b%N);Fx1tdU~qxJNW=Rdp>Nsr#uIBT@D9fZWS~tbI!pa5@Weoc4$}k27q(r6tv9{sIHH+Ry_}WGSYMer+La60h)n5E>Y+Dwn{Ovp!MeHt-k7M>G~5ZVM3 zYmjV)S6#KQ?ClqiYT1c*c~2};DwCy$hKE50?N@G{*}u2;{0o4-4KAOJ6diN>e%ap# z%^Eg)UYW1-Pae!pdY5v5uc^$Hs{+CwFS7z7H;+^fs$>0gL99qwxC@c)`{!0e`T8T% z+Oc-yS{4S`5)kX#CN}V}58G##IO_!`bN01P4V_wsods1UeR^b}?M+uiJ?V;fbIx|u0KvV0u=0xut31~m%0eb))U3@*Wrht5 zaj#DPOf4H-;-c#`AM6)n*zNI>kXTEdVJ6EJDnBN9d&hkKbONLsure%S!(~hy!V0P9 zKI{KdY{lh15)hKmRjpc%L~pJYa>950!s9&lirIR#VT^0L>6_o& z>du^7f5+8+U#!*s4%cgm5s9Gj37-1a10HT3nTy(cjnP!wVZWhS8j+6)+&yB&9N)^$ zu-V=1r48`fI#hEh+UG|Vbg*%r`#jijew?tQ7-R}m;hjwE z>4j}iOZ4Kct(Du?Uk)YAQ=dOIdV(1#gt#2!lLAbPUN=@9n8v@>#R?LcSR;Mk*pM2^PCKX5Cbh$(ZKK|!f{=p?qV8BxS2N{?J=q?g&R z>%=geFN&{T6`J}?2~HY}tyq`e+ei3+dVUJX_VV5#s6(moG(N1{eMr|@^ccwDNV@Cz z{7&1=)dtiV0hSi^v?kU(@NN2ZG?cLzd&F<#X3bf8;zmH&)X6(kSmSmelYhNZAqWIjGWc27Zo? z(S}XwxvnIB!Bt%NyuHpry(jEhZrL@IvR14nUmtkZpr#p$X72eOLjq9jgVg%y=%rhi zp6eez+Gt>$Gytac-YBoGaN*eK~1ql<_Mj>M` z%H<+dKae6Y@A)g?9Y=oCMc}$gsFaYJuxo=+*lv^o&?-mDBI~lS8~40-;T_7dCN=D> zQA^kBHp{eqnHiD%#NAFEd(NoU6vKFB*3TQbFEGP0lz&~==jT398=cc#TWY{^0uKT#>`-Q=}e)*1eb#+*z+4I8X z;x3GKh@^3>f)Qc)%PF`3b;U)q8vxk97+g?AY0uXU$c`y%QLsolEL%Wzg4DMhLH1(T zjhxAnFgrFv)fUD$wb+GgUNp1AFU~)HeHs8%p)GwH$k9#{y=c$NAOA!jJLK}k@9R9b z9>*`b4b69?kw86Y#Bu2|Z`cFHyqnSF^O?@ovdbG_%x$t z{27;9qo8_9jWyY&1MyX8<~4!QQ?}L2eoaJefZm2w8gW*>;nH?yGlnHQH==*VU~2^4 zt;3%ZEMurYbP3o9;dbg-*RmtY&!|g?n)S*O93oNb*KFndsrMtnSc3`71$w&d_-?#P z0V%|BP@YJT@kSLo<1cRiu&z`~{CuksAw+gSiW^)XNGhG^_#EtYAIPk@QpvXZI;$yi zbk1|X@X^mjAppS=)?qm*~R)DRdeQqH%^kU@mDHO7OjHh%w;5YKmBH{MI(+- zYfr&xX?1TaiaEcT3q5->qF&=$9K+J;c0p&Tit%?$qqtZb2|&lvWUZrLy2X%VJvYeH z%fz40=yji6`7J)W&b$TyLy)^>poxmfNXC$%h(|sk{P>UH-7w&A`JzIX za-*5~y<3YwoKonZ-M%%ykKm6LTrykXT4xZu*SN;yq4~H;?K+FGKjXR&3)cy;F3pX3 z)*=l&MRlO(_y&`liB12p?M7;f60K+*2T2(P1_3?HWqpkj!P((?3ZqBe69(m*KLHc! zbwEzg2emGmI46?}U$;-!FJ@QaE`$7EY|MYnLBfzb%+RB4)3t%bxPo_cT?EY<%FKkLEhUb6W+E7*g} zn-_Jb1s*(>g5|_OAWf()%d30uk>6s!Zw(}bLoBX$CRo|^9t8P(R zpF6X26RxQzP|I_L6h$H`LcCc*_s09()VnjPpmDWX>>C9f;(6zv=H&>0*BXeYaDBq8 z<(69r2DV&hsG;?jeLj`Bc_om_^k2Pi`LA=GnlC0~)UJ;cEjzdkj9Bie`nMmH4Vd$O zoopu3{_^ehO)VWvI%f_$iJJ~-rVala5rz?M5G>A8bJIGsmg&#toNrV4a9h@*c4L6N z>TVh2QsF^8ljA=xZ6tmFYio;@RV!T$9U|S2m>_gBU(Komw*2BxwIzrUq?1X&!mcUR zjpc59R?zZpa^Jsm<~%7de^ip-UsGnwyHk;-KSWHOM%v2P8C5eZ=>NIUoii+(Mt84( zk!!-CJgiKKf-ETa@U@!Vc+u+z-i7}dEL@^NpLb{`AqO+|ZV^609u<}!iFbrH`LTa@sI>c6fsHi)L0a;L%QOhjazlp~3;DwD!{KW-2K5QFoZJSNa z+&|yGs8TrJHT`1ALxY8{$?Ld@;qnl&?ioljXO9Y#@~#z3c3R{wnLdX_$jiv=;HhB~ z2@B)8bam^+Wp8_ie@6xHb2VKxVkt{$j!{w8heoh(UVuNyCef|;yz{Y2VAH~9=~Luq z-^F#kp^s3vevPSt13_b|m0$p~*$8;x(0c z?|V2zxt6JY*ZV`z^F3o?(;kwT1F+*$om^y?3*H5fW{kkZtV^4eUNaG4JEb{`iP}%d z8F`j}F&^Y#w{TbQUVyOx9;-gsCD}(J8kbw2@FSPQ?Mtcq*A5RA1fE0Ba8xTOG}>`r zXAF@H)$1CrI-7p@nC{AI%^5LBL6OI;Nz~)7*_ocWn{@SncuhhN=6wFPk^=9(b-=6{ zekX9d8kIk850UFxpIKY=X&-xs)Y=J$M!X2D_&L(b;RqSVI-TlpJ9y_T!;+Jk`PVI9 zYjn}`zSrqj`vq40eq3dhjSBZ~QDRoxB696nmdTySFdBWGd@pjI(C#yQ*A}5#;a!S* zLz#YE+FV0gSx8<9&hI^1T<-R0;QKfxp1-OA7k#cRf3ITiaYg!6jf|GJQXiT_ zq1zb&GOcD25vHAL%}=N2c9~CBRd%i^6GXK&6}NgYgu`vWnk?@S{0#WvR=S6%&hz-- zDT6x#D$v(zPkeXy$I{U&Pb-lT$q$;SMajN;9(NFyb8jH}iaCVbYtx%LeoP%mh&@^y z!UR4-kY4NXHaGgvhZKp|90)vQA zBA3}*8fLY?#N!crF(m4`wmc9YpcsO4L^9PH?TX|&@yU1zmU}1D_=y>QCA|E@;d80` zW&-0d?V0BvI?Egxz%$N5@Z#2_O=UfL3he(Ci2pw?77ui#0LRh>^s(?h`l_eHu&nqU&RD1RDQHq#fbSwpZ8jpE|3czlcOPzKp;cr4eT#r&65 zr^B-*Y&bb;Sw&UUHe5&|lI#h(8D3p{mwHs5s95+&Mx1NENb{evQAs6=Eq&M6LEU%m`msB#znoj~Mk+ zMB=r_$?Z;Rfgb{s&w3P|EBl32c$hZ*79*jKUL!+>x9|+ZiPv~1ka#DdAQgR?rKq7b zb`^2E)eCy!p(2ouQlk=!$^bMs>LEFJ7m55a0_+XeABW!CBzJ0u+L1n|46f7c0Demy zzH4S|V~d=8;6fr5{J13G_!;15oN);BcfQQyhD5@H3>&g%)Ezf9J5!TC z=j`fjlBxcZr!i$RR#WPxpL)b{M^6{KpD0P9V#XFxT3=D4mdh9_Yo0W4{#`=|1y6km zqhu{4473|Q*2nzO1Z9IRGL~u?heV9S=%uBx+?`p4?G8G5yCC+1 zc--xQ{~^k|d_D<3gMKDQ2??f|(R>B#p5j3Mgu0zJhT9<#Fh_u~LX@Ol; z*ut`N(JK#T%$GyWdOo=5C1 z^IK4S5hh<@L}USa>!M3+RwybosPs$UgS;(j{$Puo3Y#Fq!Y=@V0@vc?bRGsxppjCH z_yr2IJ%A?B1a#i5arq?bA~K&#B*GR-^KZoir6YA`ZVRvo@f~drYo8E_pin!Uc3negl=y{5JFNaw70`%eERB0X>J%t;Po8Dqq1C zr$0Y_oX~2B0vkSdWDw+5U>LM&&I1Rf@D47e_(Ff-pzRfYDjycP8bAkG-?o6$bDDqL%9_t88VTxftj=)#mT+q8PUJ{OqM)7i`#iF7DoKndxEJR zDAh;TV%(VCi(2+=z49xlCbd>FR#yH}wwWcXl#d1*zB>2%umZ&Zt=>pPxPOP!iI}1< z?1c+TciLQLV-oT9ZvSGX2Edu>}ykr|h+Z7Bt+2kpVMbl?#c| zoEEu1HT~p&H*^zw1I|w-#;PZq*{q-vG{Pw3{WPR61%_@GX%l(CE_RII@N{2V(H~fo zbFUfA%YJm{ZFH5P&v=oRx^_B~X+AOr?Yo?R%ceg6G!goEaqxFGEd!GivYs5pW~*wo z**&9{kE#DlTfbntDD&zQUKpMTr|TXJ3>+fNMI6D0bDpr|CaNu!xJ-wyS}#3sF;*en zP|V)yN+jeoKQSJjA3mB^tfp|kz_7q%8)cs&sgD-8GWY<`HokQjd!(-u3KaD9;GAX) zbfrMZTi(++0kegsE>CcQM5Ce7SR`=pl|X-m z72=4425OtK{CvZ!bZo5`e`^?vPbw>ZC^9Tbw|)(fIc_K68N86pP>EBIf>xxEza6)8 z%THTBu)-8l0~9AZaPyRL5-|#f8zb-tjR)RMHzo^J4JL3ulpzaBxJ?HGPS!!sDlXeP z{5Gm-vB5bJQwI31I#L2s|H!rsMfiKFQL?ySsV4;!npM9twJqFtaB3?F>1Lql-E;Er zV~BUaY9H~GTQ=4)%8mGcwISC95Izl>eDji^88#g|!2~Xjy0}z{c(a;@Hxn!omb&{q}uF{r6#NZ$paSXTgjo)UUN?q!Ibqjr9ISQ zHfE2UT+qe$)I2m1k@ijfLF&=W0?jsof@FgxHP%mkB{*&Ta}pyX%OWS>tH{8Q>7aj6 zCo#z7wmY8|zS?Vsk{U|yBrvZZo9gJ8z+e8y3t%cvHF2F;@Z39;cQ|njPmkQ#Qg`%2 zf-59~SiFtVZOUOEoJTv9J1e5C(p}HPNx$hP^GxIes%lEu&{55Umw6lTm~Wmn{*})o zFeQHE!(^-rXrrUDWN?KjZD0N4uR+E|@jH$ciXY7?4=`=q2k_oEt#g9j3rMJiGR9`d zU0rEhYFx=mjkK`$x~l_!*hh~GFw`O}ud^osR;#{CBZl(N2g{(I{mH(=byE@in|jO> zr1NQ``hfI&=VMTV&1QJ-B=7yYmIjoD#|Mapqm_YieJS#-pRVya#uU&c@4v2izv zXEoGAW1I;1V;bFOV-0ECu-$7@0;!$Yyzm~1{?KSA)sX2e?+nu2n;6Vw=(aT0NFM++ zkDamWsB?;~x->T^L{c?`59^3uGbMGsnnyUKu~~}LZA*g_^@m=IXZjs{OwHO?PF7vr zI0P&OUuNS^nm4o8?jHHB`91=iAi)!YY>sw={O|H^?MQMp`n^pdH8p`}`E$`qZ|y(XiO65uyVgiKN2zvezl?bQ9J)*p(LERo zp-rRXSq0097@*-{&!-Aqm^Ef|LMO9(b8IgX&5b#JsHaAVlQWY(w7XyNYz2={ZE{%0 z438ay&73OSNG9k_XsWLLsWv>pq#M3yZVf%i5;(L@M%6?@=1TTXAYWG>WC*HcS6Fz8 z;6hSI3@I}@(#_*7^ef9=6mQaEa02~}bb7dW=u-w&rwfP&Zv7^(3rzAdOS(P3K zE>Ess(5SgxYRY`Yvk*bSy>_mM8P=afpXski&;4V)<>XYjc@v?adhzOjJohHON2yUW zkVF2Svl~*ZVqYkqGx~M93-MsQ|Ab`~dK6Kgbyb^^&HP+W6~<7{kC(Ln%O-ZeSdr*- zorIv$5yq!A0MzQ&>~msa5$bp}Cc}kuV~Z8Xzoq}DL}2A8dPi&<9nEokqsHMT8q=zm zTiu8q6SlLp)b-0IYMVCsTzTPCRoVPZnq?=K+7X2Y3qJ*=Wo>09S^n%az6N-VP6GfAN^VeAuZEf2HdHME==7^WKhMZ`c0R= z)~oGp^qGye{suMiPgO$mo?=yKSIvuO&g-}HbL-4rdNk$faaHbaKRtt~0oyB&Ap%3} z*UEhObJGu`&K_!YF@c|RoYh;5Z}qY+!4x}!e{t+^%D*RPTL1AD>1gN~ok?UgH*1e> z@tR9OTz6BV!`qL(NBzpHt*TN0mG?%7+=-A{3dWY=ihU_b3~gl>XS{mM);6r{$kwHx zY0E!G8Y7nit@d~8kOm9t^2NW`uJj^lnI$PVE7r*<>h=)~b17_JboYe%c_Vu8{Nt&u zw7#zPE{C}@63wT#tRZLTAJ*)qFT`)-Z6!cZvL31g(1;axk$LapX>vP^JS6htF0X=r z@hk>~c+m=@j3OeS(sL6m;{<9a|Fgsis_p#iplu~pB{vz7y_p)Q6I%#g_e{#k@>neH-b#6gSDMk|KKr|IG6R2J;2 zJ4F-I`E~Xv8$fd)ogEVqr47C2f#4A zk6wmdst;oPCZR4mQf=*hsQq|BzkRh{wwGaLD18|HaBRUPVWR{pn~c0JG;;wrwG=rQ z*AF&(^9D~2>= zW;$H4mKdHgGF{L-^{)`fOV|@Bv5MKXHmu0Fr{Zy9XzjpE*4u{HRluhCf#GUs&Nfai zeOT7+ZBazH03*ez?zo#B_qJnXgMS1+f^&3ENwU~GI}vT!xWBqr3hztO~lud zwJ<=3rxIAP7YapH@m%vhU6i~c_-Nmu3Y3+SI5edOGfci?t?X7aR-mWz0{2O%DpSQl zGtpEY%{dDtn5fI{99v!LA0#D=Gjidg+yxY8%2fL$3S`)ps>|5({!KH6>rAo`dzuf0 z%{tz=KU@h+1Sh;&eb%YA(x+l;LR2lFC(z*AboYlY%!0a-cH+${7)_nO-abf!RO3FV1`AK~+aLEcc zqz#WaAyt(+DE>}_`n|XwZ**|qWF5(F^Xnvb$(9c^9D9=@v!w`XMY@R@_*mc|U(k0b z5nv?yb-!od{rpu-rv^`EAnLH`MG<=al5|gEq!Sk7dL0=kEds*Y-_mZ}dlNu#hM_a) z(dP@5*c`EC5d^p(ylS;i_q?S$2r=dS-m`O~rapa_*O7Y+a%oZGe)zOn&i2JNe@SSK zaN)9@wfBgAK z)zSVsad=pUA*jDm8CU{Zxw*DDNE)RZ(j5l1H1N;g2tspstexF1seVPWZY|8RN?FFh zNTXeMZK`nHO|fc%d>${dC~{;$<}!2g4W;bj-ogqfHC@~x^Ve!`w}ldb1Zwg9sZ#Z` zb`vxg2onB7FBFn(dR}Lp3pj6O&fkoCB6|B_W3F>N&aU^0?+Y|`LS%;c{+aI+G0hWO#(eu_jEwW0v+wG~1qNO9wfgTEol9nRFFlf@7 z>N~}2YC+DdCGHXg86<(8vh&UQu9pp+Se!t^b{1;vx*e~ow?b4CQR!3sSxu4wL*qqNR!4t6l5>F_ z9X5}O4K>_oq@$4E;tD}M16GEgf5jHLmHbTl#iP!wElXh|&9jg-QSi)1lE^nBnA`n^ z8GBudx*q%SY-`%D z$zGN`pbTi%UOY@E(dxRHX6v=rR@oJ;qg^3|<7e1jR@_!Y@2P{@gNA}KYQ4DV<|EL_ zX{lXyql!kzd$S?Vq>*$k>e~@vGOYCsRps23BrP1M*T*(>?pAA-BwCAUL0rXs>js2y zGv9z|LpKPx`zNwPC)`5>aLXhAwf1__62{U(`?sw6kB)joL7k+NsVr=YOHB{IJ#G_y z>S$)L-01;%%Mn-q_0{Ri^jG3}=$g_VJPtHe9~}Y(5b{v5?H)106oFQOyCJR9Fl)6+RiNem~c{_!TIC^s2->=GP-W*%-hSwVjCRG@68T3de_L@J| zbVwC4`gOHQX4ce7`4FT%v7^!>fcfb{hv$`q`bZl_(w-R1@Iu2BhPf`P{Ux|UGqN$s z-_#|N3s|s-|DO!{|MwqYVZ>vFoqJqOPl_M?|FC_pir3KW>Q{t%ZPjy zs%Ee68E_7fcKwgLv6>T|h)8W5Ga$Wa_^YtPFvEn__Ne|V>sOb3Md}R}r^AGCB1H7L z*IczeybIb0*vI^}g0w~KUdA_qlrUI$Jo<%7#cf||^s&=Le0TZaX3_EoTmT#*y2dx> z@h6*KUUpPii2Ghb{^{9wGPH*9S!EW`BX`F5Y3y@{+(jJ_AvSA?ad@zf9}9Vp8=c7f zp8hS8@w`7B>MLO+sqyK$_o&XnyR} zu<(d3?*AF#+e0KA(FkECai*!+AW?&_(?jCe`f44S*8P1(incQUOsYfS;w>@qWO zMD;fQjZfnAx6edP+lRlr{!(R9yFAKBYpnjV=!`x3WY(_zifK#(eY3BWs?x%*M&`LW>HpMZog``=j7s~7#`K+$G+M0E4s50?CrfD!TIiREk(mrkW%+059i61J@Wis@49gJDur{@nUM z0bSBT$Gq?9pS%p(qq9l7E=n`*c|W|!^Ky@Wf3^_ev>@UH{ubm8DxPDeUcY1R+8DA)9`=!ZEV*~O2V@KAAH^)n|`&}5{?!IW6d!WXmE;`Nkq z%CYBvH z^JvzZ;ZTKGG8vcWV|YI=VG5)_eWl7DMzR_2K{K#b*u~pTyM#d(blNe5&M*w1J)wmO z=^l4sfSy!&)pjC}A+|C@3-4Zz|GOfRTPZx10t4qJvZcP~W@(QmszKO4EA=KQa8ct7 zgA7#!COd55UsR8SN}G&fcmKQnt|mUN|6<8h<=$u(dqvac41<-?z)J5py%)w#n0(2A z+ao!7XOCk11@YVMAm2s_3a_rtxl1GOwT-n@H7{^Xiii^y-n*G{gm1VR&3m8lzv7{+ zHy6}NE)?QJsP)0IrKpaobDSidQ9?MsT~l@3A=nJ{K23k!yD0sMDvFE9z0AC{`Gs67 z6U;%?iAdz(@Kl@|ms6w7Rb~QX-ha$%UPKI(9x1aV=5@~IHSdP$4}(?6#TEeo2J1q; zrgtvZ|EyBpE+WsKU9jE)^+-BxB?`mr@LSgX!DliizZXtYeA368zb|noK5#;cJt6_Z zp%cN((Vx=)sa2$a$K5_)&PC6D48?j!#0m2aBLY3W_=EaaPu8EC>hM1ePVh}7@qWRx zi@;(v{U#2u7Y%a8RNN*9X28K9qQk@sn7+s2);O!6ne>YFv)YG&9vd*b3D`?pT@mPi z(rBUGhtap~4sl0fdeSibfK0>%1D*T$gM=0Qva^^uPD`Gni@>4bbw0AF)kn>0<25T%&5Bx4V;x%4P(P`AZ*w6wHr~V`9fm^GY@%@N zYAFo&xqlHvTc@DpOhvKz1^)r=!Wxe_E#3dda z!3QEQsS%lI#jG8dv0e4TKOlJQ%AiQ1j^5%!V&V%{9RTmwJJ%eTE!Dh`SNL5KC##iG zixV;jv;P)fL!aKkrs;zAu;5hsDSvFOoXV1cZmn-YK-W`S?D9u?&I}xEO=#J*yHS_? z`N|p}GZp%5R-UMGzy|iwDtnqR(maO4`~3+*%O2w&dGM;)$h)pE*^7Q22Ew8}J${ZI zhLu2x_#=8Gb}9I5Hzn6b$NOw(;YGx?iK{n-KVKNMO&*0#n*VX(uHtyLmIKv~vNJoZ zDL&HUZWR@oFMo* zvWjTmVC1?=#&&5E^@3jTt!>U0vEZPK6+-ORarJYxd?Ph5rF5DK*UMPo<{aqYKZLmd zQS}rm>k*OVJ66T-W z(9$iRDN;ZydLFM7a?4t}SfuYa@t75Xo(!&OXiEM(co`+NCiNwkH~%=>oLhGY@Xu{E zL(|>Lmaudp?)YcFQAaRc_G|2)xv55I-+lrP-JG2!R2d*$^sKxbdPM%5dU-pPA1 zT}x5N&ku4&k!a7tBl|K8Ly3nAwQlk)sW@a&t@-OV9(Y6=ruf(Dy=TRX|@W8fWAuJG_0z#{N-}fYC%B)TUC;_de4Cg?0^i9E_loy zs=iEi&%oU3n+dFJ`c#0*q6P9?_NUlBD`v?Cso0zL$MA^Kiflje?|-yV#K^(Mdm_I z9a7P!?Vo-w7NL6|*Icnsiz|gTl_qAC?r_k!&Dq>q%ATC+k82vxMLzpRz#_f~KpqB2 zOULAyornJ_Y`>w=Q-`%A9f2n@egYrKtFM;#paRQfZr5`Fk-IP8jS`zIY*AnmIMdU( z#`iMiIIWGf&Zc~kqW>wo9_28ukh)j4urLGa*&}ifKzPN&-mdMzzRsVyihMRhshcm1 zIWox(h!H-JxR=s>al*(ADQR^-dCRo-6~aC*j11~uF)9AAm^C^0%8b5>BWm!<58c<5 zPV!WPbcd>Yhc&gDtZoduN-o>!#Mw~-e&2$MSn)&9uUl-)?Wg_>$D^XJX5(wJzBtnK zpp+;6k%hE%zRMlEx8&TMJ|GFCs%6V_jJ&g&Na@6Ll{cJG#m+xOyJw~@O0B+O-cjZh z?GGzf0gp1e^c`xeNoAHvbiQ8KzJ)0Si(Y#HS`3ccQy$w2XN)*+-;XX6xf`;tFluEz7CpQ(iUhHX#Zhe3Y|KMgg?IPL%s^%4 z{{a30_QDt5y@cceH{g*1ZjywoIul9i;PlTh9_LOI5+__jXkDH!>+wkw)sN5w0(EQ? z$a>>U34FRHE9-*}8Eq~vzP##OzC7 zRSAnGB=~aKd&Vd@j5>hxc(>jGHIXOlgG%&28~?X;>>LM)Bh6g$a}=J|^)MG66WJFb zGrZo6>Y^EpzDuqy`x?uCew~1JA%^D3C++szB%RX3v=b~q)`3R{pVS@Y4l_3n#QlJ zC<3+D92fet@vS748*-zY!d5e`_<&w0BBs9Z|CRV%=|3XtF~7M;2)9n!;Q7=O9#-VH zg+Iah-w}g2u*q_6nX-XL|Egb1sP5?;P+&71gxl+Bp(-j=_N`A1u&d${QsPe5h^HNi zalIt)`kp;|Q1r4R|N5*O2A5xAGXlMUvZ$v8&%Nw=vLKLdSv6Yd$85SR#L)?3b#bfg zSn8$7IGC{EsY$Wn%VVN>@3r2hRIE5&BrGnr&x{$aL!J{Ze|+giFu!5dJDKbE3vNv< z)t=~Ff2oxVEN;o_sG`8KT6o&e{z^3v-4hi9X493tFmkc5_V3R#rcS-o4@SrWZ0dMX z9lwKOfSv57V%kfO-x-s9CeL|zn&)h}q8`hf!s3Jv@|MGF&V9TT(M+JcqvXi5Mow-K zT5Qy+mUVrtC|hE~&>F>40h}Tcsu2Ipl(tAA&b1sAP6~&5)_&(gs-_m(Jl(~)f+y2= zVikjupP$!HnWMFbSA1|QfMLLaD%x@tJHZrO|Emhr*+?J~j z)bPJ{Q?TeA-x}XCrdPU1bYFT1W1W65$(HaiR5@6k&QdgCj+|8J-$Ur!r)$|34SO7E z1$-mKceM`MHqEGzufGP>pSlgL2OT{W{fB*J zJ1v?@(WF#EM)+P&a=!dL14TIqMtxYG`<-4y5Ouhho8_l=GK)E6$^cZqmfbE>Ko<KiAR-Qf$9k(Qp<#ZwLtSnETRCb@D zgEiaXD^t!btt`Jg>~~F9T!7P- zw5_-|&6KverwG@*3_D+H(N(0 zCiv`CL#xLbEQM4DRp!0Ng&}-u11@B^^cIT>X!JX)h2QR$QS_T06QQ0}%7&ebqPR`| zyH)dEx9?D~oc_!74M2Q-*6i9XJHn!usQ~yD_`@Sdbo4hYW#!y?`BIQ-P6*dKPz}c7 z_~PMDlDht2D>#A>cj8oLTr%=RS@^QAZi}GU9nq$j`ox3qp(f2rtwKyU=V!O9Z}=t= zmT^N9osX@SIFFCBb+HOre!r7tf@aWgzhSVUk7;cq>Qvqw{yabdQLWwV(PnetpryH0 zoma2%%@Nk{UNU8pQhnQ!vgA=+I zi#}T#qyvI#=eO)$cmPZE|CgUwGQ0Vm9*p!Cm8Ki=3^%m2x7S;G=;=O8c;`H0Z zLRtm~4&*oF(x3zS@L0r&wQxzQE7Tsb%v!K}yB@ zB&?3!wk`wa-y6&=TwUY~z172m^ijtd7S^irZKaxtsWSP%H^c5!q#4zo>t=l`Jw)~P zS77#j2IUx9^qw2jajpb~lP^HGCpR%PZK=L!=YjOOz4qZ62YG+OY8wAk{|Qy?8J>X` zaFGjD+D*;7A1AiV@aOf=-|taC{i<<6N~#H9#z+xg9r(l!dkOZ)E($G4y_Cuj)s&~A z<534^9^d&%k&*K5|WFdUe;TRdq}C!Mp?3*tllcLA`_-Qhrrt(w!hiD_WC?c4*L>RJOI$>n{lP z3Ws8ewa=Hh!@RM|xDE6%`Ke`=lj2YWRBO_4y|lb9oZo6O#ro^NunulPP^C$R*vYSF z{9X)F)1{fLoBzXHsE9Ec<&H>ZuadW|J-aiunyrAmwQOx6DrgZFW3ARG^E^wAH6LOr zt!H(v1e`qOQL^&o(}Lm-31dA|sYs2PE8%ZOA;v;HNtc8BAmH%0sU^4OShY|qXG~er z_XgF>Gp#o1?MB46c9p^=XdLOZ$wK9pVCsO+Z6Rn+{l98S*iv1MnT^C(wBLohq-O_ptT3EX$bNi zP?ar8V$G!m2A4%q-&$xom^y0H3%f$uZgtkUB5Kn6%#ArEUae@b=z0wPEJl#}b?}QS zrm{DbTewlSUrgHUS1rAVM?J0sk@Nq6uOL&VrsVE2l z7^m^DrOSJj*kA|FKuBJt@xBn-KO$klU4k)SAa6YqD-9t}U^AP-EuA=Ccdx~&8=JxC z4d#_IPMK3Eab$dRP`($Ok(q9uC(gr)b2+tiny>f|=8qL2kD+~lq`usWREclsyiRFF z8DE@`@`1}KCQoNGcn9%AvDE?2a9#p4{lm;(FYvPhRaeA9f~E&ab)J+h7qAC*Eha=% zYoX(_>In!?DR@HA8f0V2s(L(NmsW&)n?yo73wlf+87#^BzM5kSr=%?F|WM?3Hc8eG`jt zLnyYkk$L45Bdn$bQ6Pe%=GTGi8#_u#m{VZG@ddGoc)lD`=M-RXfJlMJ`X9Q*;*N==2IcoT{R|Sy~dXV2ybJ z2OFrw%r1<#HuQh7+CP{u(BbJN-vqbOH`uQoF5^r}0pUp>pDsU~%Ee*Bjp5N@1oLs{ zue-rR+)1O^1G9F?!`i39d0A8B7x^C>X&;qa=5)J)k3a$f?A(GqQS2yAYi%>hZ9_Mg ztQYl7-;6h(|d#G>%N%IMz905^6ZmQcp>_=+=fDznc?B6-l=9pRv)tNNI}j?3!D9~ zGAjDk;5*Emf615`ooDpUxG!k$ag9dY+nN0z2YZg9bA{Vy&KmyH)}}l>B+p)_0?PFh zT1Qg0R0zZ@6-Ha-KjUPg1wN4b;)tvIAsEN}&lV{1aZZ@g8DC0bPh?&}W}Xz!Mlz2@ z?iUYt%?+T144iW~-F_Q^a@1cO#+ot?@a1QHRX^q2Y!k|9)fLIqgu9Be5CWjigRG zhDCL#d#j}$%HTmMR<3bsKW7M^q>-B+Nae{rv5z+sXi)9Xlx{fsv! zw-GLdH^q7VE>%a4^q=4@?i++ML%}XC&MV$U!h+K6-lnze`Z7 zjvh2}jvm#diy=G^OrnM=xaoGfmACt||BHukubG$K44A@|n~u*9;?%|V)2Jx7k4krB zUkbR)1Y{^E5tu1@o}N%w7=X@VH4t`5#Fm$&f`W=7U~V&DMT943K~G=?J|sA=b}NRh z*P#as3@swbf`Xd(+*(E=fjt84T$jl8^r=a--$|ziyx0B$hrG~ZRd0OJdhco#NC=q~ zHr)B_BLEIojLGeK)+j;qJP)`pzYUy6^X&YyMHde`(KqyMcyw zMRRh%M3gyi#((aK>^<>J2XqXI%RQsw{Zgc5edR3P`T!H3;yI0}nL)bEYz6~h*$m8^ zqHyb!S&9iiiT>l^9_ze#U!0|dclMsGGEKmz0;Sf!p_`8dlg z2e1I*@33t0=om|hG6~$(w+Yp*P&Djp3%LqSzZJ6oD0E4EW-We+lWrwdu@=47AIuJ< z&9`MXNEJFKLxq_zXcLFMB(D7X#F};!S6=)4?>28MqTl^U;W?GXubyq{%nv{>_0ClT z41P{W?EsY(qvL?Wjd)9q5%_)(;`GE01@q?_1Tk6h1 z)9#nQj1fobd9!CKwYAmPp+I_?e9PVt!~|NF3vxKJpzBUPD)>_$g|v5~dVL(ngF~Oe zPw@@GbXbw(g|1W{l;r3*Z&0bbHcPAKfFb z;rk#M*eJ5J5}mFbSJod1A(5SC6iJxQFd5S>hGi^oNe(N~=;k5wClyQ^j6%(0(3<<_ zZGTg^1gsufj@u#Ms%&@^O`pa z;iWV5yLboS`J);8#2-YP!gvbL0`*&7_~5%<4L`+ob$&9C-+b<2P`6K0Zg-9`S9glE109?&A* zb&7o>hhl;D{a7%6&yT%DiSgM!_DL^Xd7IEHBlu^)uL~FmuA*AgH3NUCh=YDdhIRs~ zB>G5_QxGJ!>UKfD2Q--cSYx4nk&mtoghV0RnnNnmt7>qUR7KN)7%(G_5|QO^Np1D8 z%p@3=g4m_%pChP^r`5P1yjvAnB=#fJ6c61hlfRolR*0#(*L$Tm<}&JiC5HjmR? zkRFF>kau&&^q>^RyH-GQ)$iAw2-qzNYrO2lSb>2rWv31ba;_uubH;!2q2DM?e^c&* z$iv5b}Nr{_5vU6RGhZ@RW`fGEG) zT?q-GJG+KWo~p3jdN4VGSkv!9&-eq1iu)E~H%qC8X9YUXz-9)P{jgBr_cd< z(&25F^+-tlkvrQ_CimsjIRBuzjC>DB#K5DRX5*%7qu$u3c<)&BDm>m)fuE#GhwL%| zrINJ4Lm0JOT;t}?*~|1lO<&`JNyqJoY!3jkMic<>u)tTXJU6pr({U7ZqMq0GIWydr znv~d_NTUnh*Ytx!yuo+N11iA1{DrCWomZ6et}Ma%5uR?PeOk3ZmnA9w!$6j&yV^au?YJz9)Pz~A`j@&Be`W) zS~t4&VF3jQUIs+tH$~F~?&&*mQDJKQl>&%@1XUKix;b#KBts3}M~+u=MHcnr_ENun zx<{#IXx58HO;?1fOO-B-TF(E+2fxngi~l0uB2*L70H=pC-3>IjcodcL{jHyaH!XTP zb^ap=nJ33&(E(Nz$Lo2nBQ^Q@gD*2tSmy?@o`P^{xR6_oCJg^ed1fIji=N)0YKs5a z41sb3ZwVLepsWT461W*4w889Kj^Z3^|E68!5uK$exG&DSb~m>XB3*&J04!_TyjM7 zY~6&vEolfxf(aGMWh#94k&aInp!7yiaUh+_M42)Jx7KV`u)j6cUD+%1dOxDn#q(3x=vQOmJ=20{QHcL4-2 zI?I`BN?u72kjaunSmQ;+59_{ibW6RoMYZ)V z0A^GI3lY2>?mX$a!hk_M52&)~*O$=iAj3+138sjt?iw)K?qf}e{Ee#6_G@-Q=9zGg z&?9n)_Y1&9`OW%3`^G9ocXDG-x@(53W86Mu+0dz>)(kDGGpDn>d4;r<{s*a4`T!Br zeDN@=_$fDT(H%ATE*-##@rx0XJ`afGZV2SqD5V3c8vhRx2zY5n0LDt!MC+fQ2T&z% z3akaT>!H6w5?80O#-}?|_RM`|*@GipzZCx47{bt_!obl=C!mWMqySS{rV^m9zr!g$ zJJGFdML`2viAzpYtu%#Sp7F&r=*6Tz1W^aLX%N?bUw=@fa%=t1?$&UUA@_BX{8m~p#KuGS?!faa>=#HETYIjCHWiUlLz zZ1eg*<1r|pu>zoBR7P*fKrcuXlLF>6b4_uhNxTs01ex2ZAvXe)7fRqWV~7oIGm^0e z3DzzkK$cbInVnR4&tR0H*H-#Fr4JUFj0cPg)tI71-d@PCGL4Ra$0E{MB?Em6)JxdE zA^Z{a;}{pJ;uL&y|4V*vnzE~eGjnkcgs2IqHE}GY+}uBus=jBUR9D``d@Onyzo*N+ z^xT0dMttJ$-j8g;VX9k4c0<91ZoaP@#!_y0q(D~Mv8ol#(GsV~%UUxz);vwSfPE8> zO(vX?VeDW8xg0EgOK#XtNo+Wrpb!i>8=dC|Z5Zn&_;h~wYb@;qbt&)toAusP>z7HR zscIp&Zr&rrG%@qS3qu2ffG7TCAbO>pqG=SEPd4iL@*jdM9RC|QSV3V{l=fOjd zQMN)W+L_wfz6%$1{$+~F9vb5TUCmX>_5VP+`JjUTXp1!a0I4VaHo-O7>GRzGJm{>O zk_PWFa4dDPusQ9Mdp{Iyl;`e|jY5tiw?dz`y_j;>+_tvHz01lI#1xgfNDzxaTXgR_xQel5Jy|7q6Q!L51+F zrLDcI<6}6{cfTWHyAb`rilXO;KD1h&@qUVZ}u&)#& zI)zcYT;4FsFOLOi9$Ab;KV^-HG^EKV)vSJ5E!I&V9!dXl*i}UvSM@Q5hWR^JnOaDb zeoI^u%QW$neZ*%ce`sGu#U26-PI4K`K8VUgN_G@~I7$fLvC%p8Cps+}7(V(QBg08p z1OjugMY`XKy_2?_xPZq+^zLNwr67oAnt@7Snv~agM70T0fJ28)%pwiV{DG!2tN;2M z;Ys2Ew`?@}r;L|6ugmBx&J=T+>3U4S(1I&g`-d$FT;!|YwHfk70S-yb7yw5b1mSD# z3Q=w-NeJh#|8kGKtOogKbeB=MOW*1f^8-t%2c8lO5E1qjaL)GsynlH&-fHe)@RL%# zpsLr;9~lR$b-aPEPf1E|SjGI;ZFG+}Av!J&bK2r4NYw3rV;=yF&ExFY7zc z0o0``Oh26}j{iza+$MvRDGB|@8vLP?VMso6Lxq{OSyK^$n${|Ym!@O8LfDf{spUJFrxVJ;~*w4qU4)$Ol0eC%{DkzPD1<6oEsHb`jaP|fd;jC z-%m#$4~E2rnLAvLUYD8$+=KdDr1jvwLAs$5Oo&va2mGD~hanJuWJTx)a@-D#4XlHVcm`ui$(Kq!;l+x;BOi0zl#BU~I(3gVeOz11 zkbAfaXmz}HY~4A(1SOVVA)<~rU)GF&Vw!b4u6rM0jpnc4Awp-V{Y|4`-LE5gZx;)( z7}@POar)Zi+klyWf)&@cP`2b<-n>y(-oxb=Xt43^))L$yP=Q62#pg7UpOAqU)*nq{nl>813pw$nIX1s0 zWmI$}Yfw@|uyH>Fg1(CK;%;L&F%ATfVb2=;MSG6l5g2ShC;^kE>-^68%-C` z+2e)v*~PbXm)?K)x6K7x#&4G@S0Yt!Xl{mYc&krV36Mj$nn)T1{4%@&VN1>PyBkm< za~5s*hI-&3-RTTk1`~3FZLj(vs(hdhlA|Ge6iE5-8BS~Ht`xtRRz0GOdsdgTgS8F$ zGAu#_`^*<{5f;fdCnT+>3?TlN@Z=Ymg`|&g&!k(cvDs9g6O%uP%E2Uww6+(?5-cCoB_yScaR7VHc+*0xs1`i5L8wCegiudotd1>WCkQ}qH&wUaX z#iS!TG$6agD?oVc#Y*KnGhF=fDuc)!ILRLJ@0d>Ukf&^2X%z)n#AjqqHY%2g@VYKc z%_bR%W4R4asO&jlbZdkt5EX!s*@0h`rGb!Z#gB5=_BX9`sA@Jfsw0)SG`xF2Y_6=@ zq~MoMcPy?8cIv0K<%tgONoa0V_K#{Hvrj*~&>SZb04$Mg5dpKqn=l}+Ev1+`>cKxS zlL?FmH1NoH7G;WGqmXb!mUiRqXH-Mq0c|*(7)~a%^ke;B*Pe)9b_cYfu)rVtDs^|? zse0ch*${)rJ}DzcWI_WW7rMXCr`NWtrTC@yb_;megt;(zCmEvMNoRaw<#PHC00hA8 z4b$ySIOCp9mG#kK7YYi`MwX@1n-E1;4Ht8gwPEX9b>q5TT^2U);wuPl#YV08f%mqzzt! z$BF*&VDLvJyosOs60pXnLJH78$N`93a(Uy!pdI}<7ZaGj2im-0{c*}s#_2|yN?uJhg|Z`mgR@lE2}AG7gJ_Rc=L zGs%nq6dGT3#m-;giTnxJyC%|4;WT~hN}5@#xiRY?gy{f;WJT>l#kX_?g%V`dyAQ-bU%aaV8BCdFFpDd<{hR=8`5qXN5CrL*|eDd7xBCS3*5 z*&wB#emw0TRZJ7hpj!cV=`WN?7%1cg>4aJ5T0F`7$<<6NfxFMw?GTeazftw!vpN7@ zz$naTe*tD~0Gmlf^eR|*V(YlkKEq0YHrF%d{iVmzU9X_Biw_`+5*Pte2QXN@BVPpO zF_f~9J5I%w{Xr2zt1|uGQ4|(fGs}8tS_A|&W$}I+Ry^+aNqKOY@7p~Dv##$1fkf<3 z6}N<9xHhy@-AE=m9iGSpH#GdWu>8ACZc8tEW z&ThJy0@$}4ViZT46&Q0OigYG-9gv8_|7lV%N54zV=`ZVBE)f9@KAg2BXA2a&Fk=Wt z7tDRWqZB6sqThiKJuBIf2)8+}!yW#Y;3H^d)T2nXsTm;(9_X+*W9?-5!U^g8xe4Jd z+WwdmEV@rOm6go}af*`yQFRraCj2WgPwWiA5nk4AUEaP29v_&qpUmQkrXYCZg^B`P zSI*2c$OH;J4n+EkiMvul3xcq(^h&TKaHf7oExF_P&+?Xc<;17#OEt2S6C>o$9ZKJF z5Cuj3w-!f}AQ=zEzi)@wXwsRs#_6X(xkdUF1#xDOW1Bmva7e)l#ljK>9J0mcU2;)& zW*0x*pI9+*sSfvg*VQddrr>ioK~jz%yjS_9ffDo*DKX+9z|ZI6S{-5XNUINEyc$5 zm<=Rw?7$gt0uIfsk8P2%&sA9%YhcTv;{p$r0%6tf@>*F@IPFf-BT^hi)DU8VjG?&6 ztuO=*R~BCp7YzV~X~bh&(P!Z*(y=yl$O>o(qV9&&n=}5X|4#*j55=dKfdit(shqG` zAw{3ul$@MA`&QRJB(WErbpZMFSO^^Is|EDsbXiA`EV*~AKX_-L7YCln09$vQr`)B_ z`Fi5MfpU#71>9B4sFjlV-utxVAlya;t*e27-6bybNZbi%m`E_WGO8j?9{mF&>IDnF z1%kwMqRGQg&tXqd)=>n3TP97b{KmS`R#%5j{0|@TSWLbMG+sfejlE(_>wJNs>Y-A* zI`SOVu+@0*Uxd@S^!(nW+ipYI1;jPx0WE#MZ2R3-Y||nd#&iV4L4^Ub<>;}6*HWK<*$w3FZToo0^fBq`BU zVbOk>9Nin*7?x)9`A>EexP9y(R$#>-4?~}17)Zcdr3YOWA z03~!xmmC^^^nKV_^f#9O{$ZnZtjwffiOoH0>#zyK**68T&%xOLiX&6$?B$y&}fNDPQ>N($@jU*5U^$ zI#=9SxQ=gWkvjTSABw&^$#lOX`U&(EC=~PDX4cyMr)H&d`fX5n<5b$a0I;ctR5QNl z$fybhwJ#FIhxC@o0i8FPEI3~5EpY??U;$2C_K4TEg+(Gq+3CN{9f}`H8#q#75X*^EW(5EFv9+pZ5KF3|%^8!MPoC2ii%DP%U>CTKDIOlA4|TdnO6 zGsflY7lY#WLvIZ#{;mG!p+vj>Uw@W|YgZiNV$XDe3LncJ~ep@e*Ge!8lR>u`x#LDP2|37k<{ z&6Z1YVYsB2v+r`yye>wmM-s**oJ?R~!0bY+YfZ4a?0@G;C`kFQSe~{^ocGC{f=2mC zN3$>QzT|WZr#Lxa^?T%lxW@~VaP3CgvN29PVq%B!4VW8i@-`BBWGl=kM=6wNn)}z` z*V(vQ%2__Y+C?0iruF)P^j6W3kG1z$C5cC2m}sH_%;=M21EOKe7{)h`4CG?(FD0sK zjVb8oezaNRH&;<4R%VCGZVF7}GMg>LeAF44`Rvg3t6i2n0HO&ofKbDP#DSpT_F> zhq`z-GX#q7s;S1_1i}?4gcA1Cs%(U# z?^^$Khd>U@2ZY43B}R*YkFeFo!at?8!D`1^!i z)5`3`SEUP|GiPvm+ymxR&^>r^=l0BHdfX)mW7NpSB!b6dJUb7y%Sz<;+e%V$A$!J5 zdyx-fWWj+~F`-wb@~K^22ME*w;%Y)wg^$|8D~GtPm(KTS4xI-$W_)Mn_P5cq`FRYd2cpqP&`oNjPnzxu58OsSY9%SoBuz32u~MKv@7Wv>a_{k^fL!7m8q8i@~qx&YLIR z&!wgSa7Es6zPa6B8XE!z`h^dx31?}^(j#yiy|$z(duj#GWyFyp>R_Wblu!)BH{2|Q@ zCyFA6^76yePiNC@uMHpk+-eRaN5m}&>pVxpp_8BRXbjToUX(6lcZ^8K%?YdRTuLXm zN=?cveg6o%^*(M~CuMzR2Lu~XiCdfo1`i>HLMgGvrkr~1TR|6jNzCk{z)evoKQHK= zeJvx9>tx3BIBPTC(wXogs++EOfW&R;od!2Eq`@x{B7nXUd?#-{-r{?NPYwgD)6j%` zcV9s|x|nOZj5ZRy0@}PD^kA$%L8sAOJ1E6XP)NRYwZ)OWPH$J409 zp#iWQ2i$rF7wzr#l#S01r_%lC z^})SwWKOZJ#;A7^%=f_Z?-baWe3GppdtbynG|#X zaMQ6?F_=Ng^O$Lne9>oWRB{)?R~|3pVK{wMAM{pD$CL#IEpa5NBK=4JFe$I~^Q<{c z-@eO0Ao1huu^O@inSl>u2N~nA@p}E=>9d1a1L<_BsrnQ6svGvx79Cfj^~%)<>1~~$ zy!rK#g3L;wykv@aXIL*UCXwR!YJUz$7GoTD=iDol4frMk{C{C*0qeh<%`3>B9g_BL zf4HQ+4D4-LoVX_MIhkujD{8lC9w#^NjeEX`$>3lU94P2z{G#Wz&F!lep0kl;&;s?I zapr8?=g|gM9)}57Os}Au$RC(@>2_}Yl*jRE_ri5SI4DzpO5Wc=MaIw6_vg5#Au75yosKmI0S1R!9JB#P)f76W=3OBwQ7kZ0Xb- z=7pI}Mr^&M_UyWiYRc8!n#KOnV3Lt3kG^j*DTR;N)jmH;pPw6dQzHmS=(Kd^yAG^H zIvvJG#%Ka}yu`TlfMLz()0uS5V*qwIj|JJxid7K&dW!&lJvNccn-QpgZ2LA=nb<$t zdfDIK*7Py`{+LU%S$7(UUVnOr^lqg|cHrB`QX?P-vPS$_$%?ckY~;6lSxXh3W_Z!i zin=ScC|JzkX2j?=Hw;l$d_O>McwapqgJ(RJ z$!aFl@g=wEE)mq7^?b#6y|NtSDexptq}5mgil)311Tjv1nnJAJuamMH2AoNw6>rt( zk-$qyMw5NCt=>OnHyGBmxJKrle>$RPPZxpKi|HpilFH73IfD0av+P`m$d-?R{KrH- z7^{chgcIiO1EaBsS7{(BD^#DBkSDSkp=qy0eQqx@3g4mC9I51t$#1%vUG}|lof@L< zPSa_|mxr>FF)40xytNKwt(LPiYwJLv_^I>~?FM1M8|7PU@m`*TBBy{Ii7J$t7Yuvm z>HI+HBf)@0-C!`2%r=^001_92B&_o8TWJ}SWQ_a|VW5LwPi@d^x7+=v+PqC24u&6^ zDXG(D`9hh>H1BFU#8^}c9{F5X$a~W$q@{@aXJHrzlcXQ0hh!9PI)lfSl!eL8V>t}G zsp139+SeqAXl*|o=Dtoo?ZgYs-Vf&)TjckOhqnB_#&7-9X}fNHxq^E-7>oc&LO&ar zfU(rXy%akAbVGW*1vQ@K39@S6TDdM`$iw~V>w@bE#wEw{D7V<3l|VK}ZiEu`vcmQk z-rwX{A8th?o^%n?otA$eQ?|@{b>yI0`}MIeP{#C@HL_e2dTq8!&i|GdoJNZ!Evqd*B2(*{ zyV8YU-i#!lUvxe_elO#_`Ju15TXrW|*Q6%|vzW;$v$ey3;nz+O4V~U%vdEKA-n#Mz z4AyC1GWOTDSuJrcUhQjW3+(C=ARj$hIClD8jpZAvr3{}25(MxkS_S)zC(f+u8ui-f%P%vb}vBrvr0f>L! z_#x@Z!9LZalKuH6#iVimE!HapIJ~BHalZQ9M*2^zwJ8P(QZ7_C;kH({10|yY}^@&ba84a!uouMh#ZQa4Aq|TEd3^knnEA?`f!{-#KmZ$e!hH`RYI4UiO_4 zx=n&>K!XM#1n`S;hN0TUc!FXO*E@b1o1{2K0vpkgW75zK1%ZaOu+w?ZZYTnS33?tl zow;@vw#5;tEFzLW-{C{oJwB_MrY#fqI26EV{PbZVRJR2BF7Mwmg?D+I{%6}|i$p+jlVRpMxVwQ<8J@)pUN zM?UtxcAsZW!6SVAhYLQMwORNGywii@w&obJKk8)vcW@}w8IPqY6;2v>L5-Ck6lt8K z*ssU?6f3mJAHSwJbCB9jV^`G;I6?7NY6UvJNJg6#~oNc^o zK??o-Ynh`bZKT>2bvzIFpcp!Bn~M;clzxqM%)s>tXUcs~=uLf*duQm`O#z+pmW%ai zn?$jfu%)Z|VfC<29Jzel?zglf?_v(knm%E`{LH!}=SD_HPQ%!1`R0wd_&08=0Tri% z5VlKDd%jYl@!ujh$~WEj8${vyuo_&i(h~YafJ!BO-tITi>yQ(pee)}KF>BJ?;Wye) zLgd{uQ|`Ya;5I_pWT`U66J(qRIy@D3@g;Vzr&~v&`rD}s(y;c5ypc9Jy)B_75zIjC^=6=(3S%s&9rG_F+NG3AkB{EsBTK{U2qbx1mX$#j{5HN zf6;f@9zP8?AP8MIX;Z~{ZEZiVJpNeVCY-)~|4zvrcr_~PO5cjfAcTpWx>>u-O|`% zK9#|h(0^&AYnR^?P{w|RF(cFo#aJyVhp|#NB)2uB@Gtf<{k+q{AF{+be&SiVfi-Pf z9y;c<`PGFY4nsC}~=JDVb$~lj~2<*r>QK2@7HFPR2Z~Gf#LMisJxEZ2z$#^v_;B zC1i4hOSYRUTr(4)D0vVl>1sTCGiSX8@za9IIi`@Ozg^u4_6cMEEq&D*?ZNGj-JX6R zZlpPd;R5a>3%z}J%pdD~b{hJ5GWJ9%rlDtTxiWHB?Ph5EcaL=MLPCWrPv4Q3<4l3xkJh2R8*Y6hUl-Q&Ifxd$m)mQ|_42X0SdsqfL!mAFXNd(; z;H3rlLdBto|Ar{&g4qdd8Ity#jQ_QM2)t8R8kx$Le0?#OzI}vCD{*H-?_G|pof?pv z9gcRF=$5(JJr`B`PMZ}J@I&xv7Y>=F`S2o78w+baI7)_5C9Uv!AM9p1=bdX)8(%0I z(2BQhl(?$F`j1~;H$W1UB;Q=S+qhaz84Opjs-A{#IC~x4gpdsvZH5jr?mH_mi zF@VOfA%-$|Vc<_N_9P8slnrc_iFZtM`OcqG9FARw_CM_Mvlxm<>;>G@(ekhR#Bf>w z26@nq+GO>xNj-|^MCNl&PS~Uu*=dz}$5sFZEHt_2SI*vP^;Z}j2jz=KDyE-Thwf+r zLQzAf@3Wb|Oum40b$}C7m?F4JeE>q%vfywcfIlVj~Ev@SP39QGpX%t!jnL#I6XjF4(|z58NN&8%PRgk#5|-)yUT z70NjO$!NiNiF0R9NSIWKBtmY z^_)8fA`qPT~k8xzXg|1C*G}5jnh4MQHyc?y}l@70`noH+l@w_pfh#DF{7d6 z`|=k*ek+J<%$gZ`|1~!Iv~M59{@C|Cz2_=beAF2Vg#nGlCgu!`onBvi2yIlI41O4t z^V%NQ!ASOOz3d}=RjSOpE^Jo;a3_ zbD}Bt)AZGZW(cQrzY5Y`wo#!QaNpaK2H06@R`>`E~Kt0I( zwTJ5ZIeT1(m8nduwAsSKq`P5mH|!CV<>o?ML~)%?AeRG^QN_8-|2M#~1CHT&(-(Z@ zN{L|lW8zPDHW;xYldZXxkC74OQhXJXB8`mXvXS&tNP-fP9>z%FvWzACvF`zP{j<<)a@zSD^g- zTXy@c5wZwylR-=&jg8dspG9|*e|ln{Du~fe1!`a9Qe0j2YA=&*uVoIOEFSLiUT~XS z8ka-RWmxU!{#BZ$%%R1Rq}kjSr)qq@?*339k92+bim%ru7VJyjZaJjHK{rZB()w^+ z+lD+(@w66DCzVz#iIX%XEhHL1A5-_tgPN7F_nknjlBP<4ztDX&Bla>`wPxy0B`ka9 zEOM9Yz*Xb9K5Unt0fy;~gr>Wmjb-oU5)BBB?c%meYTV%|qxn<8tq)IlU8K!7HsqM& zwihiS>lrb zxms1o(B6FFhW=+<-oe+oxG|kH{EB0`n!wymKXF|&qdV{wJB;L%H6T?W_skOlN#oGd zl0?KW!bhUVBIIDIbqxNoaT@2!Cc8@~C2$1G{%6DMjMfTs`2?UW9z)cXv7HyE){j=? z74U01WTIWzp8V;UH$LUH0>q%>AzVu)Qj)m%a9F~=#}mU^tU_EVb@sPtvoE!~I|WNE z2-TJ(ifXd`+zT>o#3k3$loFb+Gt398+iYRV3`PYB`-UJbh1J4W&A*L`J+>taB&5K| zE~>12uq&9{=(h&PPVLhKz6%nEg_kUUd#fkY$!FCp%)ni~}vGI$a z6e}*5BH2ndyvYo+Ny~U7f%o;1aDs|EeQ+MoSsV&)^68YcuLBjW3>ePRH$NPQP4!Lx z7v2#`>vmcX$8(cDsr#Xrkn_fa-Jogck&8<|IgICp!njx1f#kJEA|iAq-TR>CGv2jJ zSiJIpT?s(W&DPK)-nXy|p{sndC1Jn8H343|A`X^pegCakVpYR~VYTjWW((c?CJS-t zBT*W1m=36l%PU^&@hHHO&EO|ULbgAj<8i;`6rfF)bbFBf+&E?FJVuV)TgZ$GfDA9+ zR5n+(_iuhYf#?wnh0(e~c3g10@KPub<@BL{YLRWzb$VaNvfs(>RPV(jaBr>f(KC_u zCLbR_?Wq1GmmWyATwGs|uJ;xxnu_zbsCnHI$`grpm`$^qH}@jo7ip<-pH4PmGsVjW zn*Iv2)8QrQ3vTC}BP8UWJdm4IfHso-0Hr2KgrW!_Xsd7*4 zW#yFa1EUx`>z%9KeFyP(f7JxH0cQ^A*{~Nr*{&Vndy+7N#&hK3=x*xAa4s1usjlqq?qR9CaCTg7!fwMv z>CyeuseX<1;ObbXf7LSUJ);9ZT75_XK*+VFD6`Z;oL9-&ZB7~RX=eTXCoDoV6Gnzz z`2@XlqE_DDIRc=xMs)cZ9(c7R9sw>7$LKg3Ub^)Pl;PU2q0K!x8FWZjJW$+*`bV5_ z#J)1M=QW2b$p%d~2VP^Q0{YpL`GOhl&157M2c}u`k#PO$Wm5anp?EOTw8e+ysTOCt zl@wa$WH8ZJOT1!kU)fow=$9IGwj=^W&Ri{Bt3X#3?IXh$cimI!U{lg{a>tNFx6GPIpdQ!qiq=i##7S_OY*9<5}oJTc%ZP z|3Ud2*+z)mD287Zi zlm(uWUH_LwC6D1tcv_?n$TF_w^74^G8A9h=b`f?K`3L(nBkk0}zE2LzT;5~8Dyuulq&e*6kdxvC z3Cknj`Q>i;LrWL{RWj4K+K)u*D>qfWA&#oL@=Oefg3rpT^gjzzMNX5w7lc!@?=j>-p_xy_!w`!%ED33h(cWlG$gv=O~%{HrY$q<(7) zOqs6(=Ml;cq~89W?u0u1cGo@iYh>ebIb66)bDpBM-6e&J7#JaBEeY7E$(b&jVKHNb z5z2D8&B;w1sS~y{zh%~QRQ5a^1Ot{Kx0KgQa+=0JWCeedN=!-r4c_MfHOcP%kC?7D zX*#l|d&s!TU$MSqG}^^j4fucTz2#q&-S-AMbjQ#s-QC@dgdm`VFw!C&g5=QMAR#T? zCEXz1sURKFjWnEle7?W)C!AM@H~N{mW6$1eue`3ck%ru! z7FuoWBWKwHsk@c6jM9%Vy;*l+abuXoI(4BOa)#ROjp zB{i>-6*!VoPC!(-pX`UfE)2#%W++noCIaazNyg+~1w&x-hos!s!})maR3 z?!{x|?%hV6pF`dYet4mGLZ=;SKIJW;FA<`$9HX^@s34Wt;iY4CEeY{~2kKxz6)UID zl4&HR;KVqb6ZNh5ac4@;T*ogcSFZ_Mp5H*RJ!i@(&otL>I2uUT3B>YGqS#j6qAGKZ z?*3tM?{Hnjbx)AYx0ptzUbeJd{-}+473W@J5=TKi1Yf2XuHVWv(B++`P7@5aeHkT% z{Xa_ZnaS1Pv~UVo`6P8S$r}fHs;9>nD-=qmqwhKB_y5$vCOsbmWjAH55DNTN3M~rMsWYY9^kEfkO zqDmT|5zKM0&YC;#fhuh^+e4yruWK77ln| z`3>wK=U}|~ny91}Ij7?oST@TUbJ85pR$3x%1T1$1>*}V4cGrqP;G6?=a{OrN%><@I zVjwg9RAH{*r={kn74fB3J67;Irr6kh_*jwiasz2SpTbF|#5z07gAD&jQ~o)`-W+gG58>t9`oS$Nbc+e2Ddj4dM*Woo?jJC`O)RI^N@i0B5B>MsUxnj z*ojZwRZ6&IzLzgRx-zie&cIXje$HnYp4;oQ;Za0^$}r4-29k1#-@QSTaDj;NzUyDq zfrCmaU#OS+!n=X09XGsD@yVWAT^Sw0`ODR2%C9hKk7nuraT0}M;9QIz&GVa@*a{hbuQq~Y|EwrHKFmKL|I_?NuAJa()bF(bxinGv9q*chb@#m3fwM=$ zEZn(;;P>ZI7uusw`xw>Y_Kl3Bf8DUxb7lWOd z0AQ)6B=)cQ_FJ$m%VtAN4leQS%Oe)qdk5OvNzpC2xA>qdKd2a}2R12&b z_$u5!aa z^}(7pfDpjw4H^+2`toaS4nxtHym3AXmKP%@kSsZGvjMCVOlfDvjMGhZnqCtF+YUDT z7hko)CViPo04_v2m(l$tiG<6S4m7v>BA~wg^3;{;O02Z?S7AI;*+5*O zJH8rolx<$t2qg-zf20xG={!5iHkZD>qB(b`R$ zxZ%Ji1gQz51sd8_-~P4G_nO2}eUAx)5~l`+X#gWz3U|JdD*UiEa>`1pdbnK=^91Fy z&=eMGU2=e?*L@=+aga5{o_5c6945pWAsAk5KItA-V+Rh?MLc363`H;WhzS0MVn8 zab4_{k``@JB6*j z2l;NUC&iiE8g^!2_DzZEmQCc4u!c07=n^EYDEia-nKXc`LTnfu2-%h$hLh5%9uLBQ zR(BCbP7k@=aEHxLf3MCnrVbSCfLEKQcY$1n9QX`^ianYQMg3G;8QiGZ9pr^_=8%G` zl@~h-;8nYzM>12b)B%~ly=C7M^1Mqr{cs^0GGTi}^_jOVA?&XPf4K0zv^)~55qZMi zjrg@Ut*WQyk{(U(lF)TZUEnFcnyW!i@K!rzU4);aJPgW8ErL&EPnPXKu{ompVMdBz z+ai%p!JWR+|HKzH9%d?_{A$8ytCECgNaQCBKEnbp8|Y$6qa9Cx!N7q^$iRtr-G}4D z_sT5Cr12(L7eKEHm>kpOg;5d62n5{1dSv9}4qe#^;RPd4hSM69ZZ)kYi$*ZLGyBUc^^X3rJ-Z*Z zNE}lw_M-{~1z|2HCJ81Ey)r^vmKQEqA+4FF&`Qwz8dIB*_A2QGf*w9V-Xg)Qdh`La zl9=}Nj9D<01G(N9us}YM_IO!(6oelbMc{h@)_QbS5{sS;e=q46?qO&$5rQ5%GA3|5 zKxS51E}R<4Le@Ll0sWEzw1ia%BG6?cn05}(2rRFOWFFKo= zuQAp4R|I92n^%wiFjIh%%;Z%Uw41v-VE+ql*oKeV{>u_3&`vCh>9BKD7zbtbbgd;H z{u|h|KtpobBNpN|sPa9~Bq)v7Q%KOhQl!?CRQG~0fs-?&H-VZYO8A^#kp~)wY{<{9 zUe0=w(@M=&ntWj4CUF7Ku<3@EdJ|D9xAUixJ}~UlxX(eD&!u5p+=uCq9+-R#*5A&D zSxd=PVZm5PBv7^VD%w0oj7so7$$P!?aqN48n_eMg7H~wYk~`(#Q>#j5>3r3a$|y-B zfW7cbZYmm==D@7{=e|-)xi^hmc^o3ZW-^?0xvh=a`~o=FGRv1|=2zcni!Ik@VvbH* zVcaG)Ac6tV7f!#e4BaIt_X~kCR3~?dS_L-}z90m1_~oY{fPn(xj<}&Mj;qvS$-B0^ zS~(43_|ZHzwhD!PB}hjN*CPMU6~NH~$Kfz4ihWLJ4gZGHuX>scZ zBv-bR(=*p@|M)_p0L!35#*d29e>J$S`@2a-12POpUX5-N@-b~zefI$l*p&ybI)MPH z0V%m=Qm^xjInPcz`o%^pKu$$70BQ>)T5te0hs@bWJsTLkC;l_~{(i2Gb`07(lZp~a zLEK;yFgOj;lfP@^+Ix3uu^kDsbEf$|FqqpW|pZ!OYBHd#pSN$K z@I{@nRE&bLt0uo3mNv=+`;!A5lla#SoPBKm00id^@f~FRV?O$e)j)d>hzGB@{zA=W z3=g+Q_4icLHdT4CKEJna?D@+!0bWtzg{jUGqOH0tzuV%H73971SQKLOtW~KCb#TMK zmg(+_7DKT~tj*_&;lISF4S~phc&~~oIVo0hHMWW%Z?Y>0VUjg;srn z)mbp&Mf+Z=Sx3Zf=!bTCi|G-4dHLa7s$B9FVL{h4F7PNof?3%~w5jPxD<^wW360Ao zYj0V!noU(w#|KaVcPaH3SjqoZP?oqf1#wG!^t6=Vkb$vWv&L-2(2aurRUt%Pl;;w;iKUBsI z^?8Eh9_nqtX?sO`nzU-|9av^9$je-Sy?r-?lTC-k<+S|K=6vz5zzZ*@=P)F*J`AUq$ zaTBUEx#RXSd+PH8z{Iwq);el`-zsf3)_6R7JsNP^5nrEnL$&h>?0s^lnNm7qH?QA# zi-%7nB7=gdwkvE~9`qPi+u8L0|eAap}#{G?zD_%Zp_$K+Dtk zGZV=OOnai|5yP*?G}4M7tzYF^$J}lz`XzR>QlZP6y?wFpB_{ooko`rh`}T$gjZz*h_%RsKKu;Irq*AUa8WdHJ*F* zCV~Wzp&WVVF7GMeC>uP%^Du(rjyM@Z%;(53MLD!~BpjH#n97YuEKR}mb&3l};JgT` zMi38Zz)~;?K|KS`Y%qg#un>rqI^Zya>ngcTT)U*bu5sTVnxZ{pv!L5e(!BE~UC9rN z3B}_f5CFU%Jf8RBJ>;Tg1&(K8`JZ{BS3}=-04fY$F%LfMV;?{8HhMOCmOjDVP@~n- z9hmXX0YZ3ct!@vv4KW&n)~per8gV59>nxHGa0cHeyg}Xtjn9comDW46xGASi4N=BAedIMv*y&?0vVqx=oSbrxS4r4mXn7*b6yCQ?&43o`$d3J(){ke z<>9FM4L_260G_NZOANx~ko=eW=@SE3ezPK1r8Xn5)cfNYCly6l4+4o6cNqNaey{|j z4Ip`Cj<3zAUCNCZU3>4f62HHc#l1sIvpSjs#2 zBgX5DQ3R8g{W2av6HqitV8H_UTLU<07df^^Zi)zwTY1Q+e|$b=2CJ)Y{)SnQe_^vC zVAIG*OhQsv^P17*eQmyxR>!@y)WSPs8oCYyfh zjR+^Y6uIStk#Izr(RlfoM6*aVoA2TyX5Y(SzR<2m0UycB11GDCFjle__>zl^A7vV^ zYcT`)k^lei|HB!83~~caG+}>EYwqGaSuQ>&uT?2?!WhA4S!(q~wCPRB5v~kiu)<}8 z>D<^T8?&}1zQ_o{4DXLi$D%hLU~~k~BnSaiPd7aG7`BI)w>u->)=HBy_fo!-@rTsN z+_xV`E)iVs^MML!zop|mY02JeeZDtSaQ#4yjspR3jn+W$asuSrjTrAj z-XV?Wyp>a1U?zM=7{)TfvjKuCDkY`7kUca~mRI8cSy9FCgXtx}y#%^@@&kPfMv2A$ zwOV1Gau95ze`Dz8d!K;-fK)(n(HSPUczhjc<4IJ(nJ-YUZIt0alj`Uh$o= zQc0&Y+QCiA>pya$i|8+@kw6f$`OY4S$MCSfP_j>XVT%asYqwMt+3e(1H#(pnWn0^-N+D1VR!Q=u@_E@Fy>qL`j91N=zX{K;$#o$@fI!!wYT zIBz(-?1Y{)!40D38HvQDQc=^Q*zi-7W~8w@`?up$v_27eKJYvR@GPLoSk#_K!2Y~~$E*VH zYy$aYBw5%3Li<_rhDRhdC>|+Pp{e=+>#ss+bn!x08LsQ}3}6N8PgUh2PWo?7`cl^Y z?vz1;Ek>MvbsnE`s#3n=bubVFMPVIq11U(NVz`97|6GB9e^W_q7@UkrH!2dx3geTl z2wppZ~)GOtn@9yLSK< zmQ@*!jFl-RMV&FG^c6gbeyZ5M+_wG?uUtgf?bUUY3Aq92UC0DZEV#iKxrl?b9heT< z@&j^c5Hz4B@_7&h6NSSM-hqxUSVYNHK`-?=gT=tSAj7ndx7&(Um9T1-G!}#dFo*zS zn?LBEm|6;T-pmu5V-}6y!%~ydXb|2yv0k5VVJ|}PsLhh^sDP$Vh%_KziJ(pyp1R*H zj+DP+t3uVj?T$>lR|VmAA^t~Y1jZw(-BkPwwwO?nuz#HeRiXVryBie12_uq)ntxq! zgv0+XgEnamX{CovFhuc!t?U{&o-#+ilXQnvTZf_W&08%8`O9>Cks~cmGC9>~(`|m9 z8RH0De*$&Jydn8|wxBxa^0V|8lfN!kdgQbH@%sPxuWHFleWLAPtDInz|2!0P$WK`k z7E7m)ZQ~kFxAOsJED*_I6R2Eri}gl3kfSy)Ow`cRV7vte%q{#(2}|7SXxv6v3xcEN z`N7jr{qP5z~egSPR!KpA| zr{3FX%<`$*9w}hXu=vp3FRM3UTIc{oiMTZ-KVC5_Y&dA5#=}<>B z3f%qlbl$5}8_$%lr=oo))|t@rNMde1+Z;0Y_3DqC4NhCnP+xhD;wK4;PDBKl!dvdw zr^_oW|E*c+pz8wDk|e(>2oK)6>DA%C1Kd|})cCUped7ikr%N2>+>&2}oW2TF8QE4= zSU5lUfL#avh7J?P4Z)FZ`Fad86Yjc;A+WmEk*~s~aWS}#Md5M^U>YyHq7`#tAf7W0 z#jDY?_xtq;i^}=xL-30*aAc#BesQQsUi(Ph@&I?xG>u=!$ z5nU;rVyO~-S+;ceO|jT5&%Z6r{C?9LH3de+r$r{nW&%?9xUy8_l764Z|K4{=cK_2& z(PM_?UwSB`r_^F#spQlZutaQP9?vVYpKZYD4A{IRS#1B?M3{~11voEPA0>j6X+kWT z0>b*2ym0_IKZ415*Cf!sVP?*tV(Hz>5;+8|Hk@y1oG|X;!dJym`FfOD5)JVS3xDRE zA>JSuWa$FH86}a3f@e@fC9XAJ^P+_x236NMD362p5b0nC?X$lW=`*LpM368C(5z^PpzpnkOqV+Sw!}O#- zktY>xp%;7m1JGXW8+XK)0SKlYYb zfFR8};Gm&j>O~MtexThXSrwW-H9vKcKLG7bmON+D?P(XWZ7|#1J|401zgL*0+3BKA z${!5GL*Oi|97PS=usXI#p#9 z#ZtwrN6!B%-Q<$f_vQbbU&g5g#lL_=0OZ%0TMe`~UeZ zE`iNJu<<`VDl6}SFEC74YCqHYWYZhSQC!G3Lv(7^~eEBWBnERk&=U`T=S)RUq1VKX!d&|}W;5-5!l7nS#G`0D$ zRB?Hx=799TUqK)98(MI5u;?sZuoyfq=%Wkei}HVxk*cG{d{=$BylS=u9Rpftxu$r& zo^fWD>Faxbm47P129Dn_1FR8(Ea>24r1Q3-sbu$;1Arnf1e!)%{Qw7nv-XuCvWB&= zs9*0ci(7vuKU-ZEmv>vBtKGC@rUzx8x-0k6e)DlI9l0qhmXkK`HIH-7R2NrQ&U$Li zX-($2kI2`*QQj&M&sHa+n_H~ISI=!lRzuh_5ZN9O+TIM!``2HxX@Mi*$^tNuiK)$7 zJQ>*o(9v=h*bq3`@#SR#()RYz&~g}?sGGi_1{e_#B*l&H(c>b^GS*s7Twa!}Qei3& z3chroC=s2wc6n~=*Lfey`u%8rUMMXE`n-W`RI&YjX1iHHD z%EV3M6r|~+e7H8FFPk?u`Zsw<{w-#4(2+)$Q4wDW1`A?1K34O?lDOH6nu7LR50vjk zOzzHG${B0q5Lr~3cvG3)+|R(nn>IzH`?Uxoy}3?~7 zLXNYjaIXE?IFP5yA1^=l+ZL}VD&%c=jj3g-EUVF={))K=wJjwy#Qbpt19wvN%N0i{ zWOrE242cQb1U-Z@6saHd`&DXt!gsybDLAM1RE)OG6!7IsrZ!i?bZq}=21Uz-W9&Op zP?3}&M0G-_cqjqo)KXf>n8OjWh;i9$cLwv~)_OS)KZmQY!r|iyiK|MRDq=BE_wmqW zs4SN!b1lyqDr!Yfn?Vo0p9k-x;0k>h++LL<{BL&h3|%>k(1R{B75HKngPv_;S3uAZ z58NQyf%>9EzaqS#rfA}H98gn=DlRbk!8qDD6D=fJIxU+*MV*d8wDY!;-dWGZW+)FLi@P5^qO#GK#MM4UQsylP6RYmUs1|u zJYm3k&We0vsBt^+8ckO9nDrUaEEJ9rcBhgGL0O^n;b(-l)AC;9wPLWgL2Yzm%W3vW zkh*O!u2IFzQ$ZA}?6AO((M`d3t;)bGuuRee?NF?|OQliaplVC!bY>jTZU*&>Y+-1; zv~rqF%!?DJQfX!Wb#e&aw*XD=u2(3srfM?}$zFtI5nO!updY2B0;(u)rCMIKZqC;cKxWl#JM#W^%!h!1)w$8oRTCFlMq4pII2Bk8nG_YSd0v=@U<(LfW8=7nf zL8w@#xNMTJqd*gu$$r$^)Iqp_6o(a%kaWN?(qs1v5sPC6nicm!&KVe)DM=7+%`_NR zl@x#{0n1}*A|sSQjEB3yNt)R?+hsHq{h~k)@>I5fYURvYQUY8ATk~?3t?D#Z+>M+w zI}B{V@U1anTL|>%7X-4aP0)z)xd{*g*8wk8zSP%5Lv;$>i&Qrq4e`dYb707HoO`W` zQhcJu=rPOzTt&WKl1eX0(k2TA1i2tEi--JNLdVp4w|s&)8M{~txZ(iVv3OL^Y#za@ z!1&tF#t>4~7-(hkuJ`jT3~pbup!_!`+8~k(-XNk>T()S3hE3-%?@U$sgkIxzQI(Da z-Jvq(|6P^`{j>f4<~ucwVEp{Z07jctiTouG_ZwD9BbMA*EAqsNS71CVUc0h=%$sBo zO?*9K60{FV<|nYvYC_+vvQ9r3SOrPU{Av|QkGmO1V4+YWL=9*3Mo=@Av#!n{&q1r{ zxsk-m$x?kQ6{85XsvDMyvx&PQg`A+S&)Eja;{i)>#?xgSt?K}_YTyzJ`lh%cujtNy z-67(-@-Xi%X@~`hzF-8U=D0$5MQ=qO;geTe%kPOZTBiU9C|Wox&59;CtPT*W-w1(;Mkht6lG*C_Qimg} zbHmrhUd(F`HwRrLshwLo`8P&68FamMW;YG^|B(}{I{*76w4v1u~!7D(Zi_32LJ@Be6khR@T zsO&-W!*(Rxyoen&ru}PCZtjq!yl@{>Np&!4IOlJ8b>;kpS1zK^A36a)WflKCe}Kd| zdK>%FlxYiLTaY^sS0VhC;xX7hr*S>a*L$KL=QIT~86-{lj;+)3cLl{UJE1dB3&zb; zDxqy@4Rm^WDYHpwyL-x%PL))v^L3^N)FpO$!=P_M_WU1Y{TFp^4Y+;vDI5)3p^uFN@*B$sYiD#YSijXT|09m==Az z(Q>PPSzZ-hd+S4Ix3}fs)rs>|F=CeI3en-bp|qk7r%f|jDLwIXkf3YM0(J#*c3#2_ z;ZZXrfuy{CuqL~b@5zor1dkLU;av+({vA@v{cgB-6GvwKqB1L`EgbjgwiEgfv0@2{ z=ES-LdCQgU0F?Kqp9~jAC<*CfU^fRRtNj}|U23Nw2dIkC=LkI9X{C!Ygw5L9 zieGxIv5`C1(YsN8t7V3iV-n+^v`+&`C)AVFs zKeVGqU;XWyL+RbSabnp|NR86?rbzuo$oY8rZq=g}7ly01wgO`(WxJ#G#NW@6kQbU3 z2TXO(ERr#dx2*BccWPxT3sLDSVYAIaN+}MwDGl}RkGtk`2{ZYF@pKkxICi%P(N-Dl z8j280E8TsAm`i(?4NC+}_r|q>ew`1Q*dETH}i7_`dUN2e64&xfHxZBxq zjd20K5`D;)&T#1r4wj>&Qgl)Ru~R!rURj%rhT)C zJE^l}QOfv0%X2)f(bLxbNYDx=0k3RnSTe`~GmR`kxmM+Eoow&NY7hYhS&|)sR!5hdiA@xPaB^ zYw)_i+4^$%Rn7j^k96~~d+J!CAXzH@+h~S9nGm~vri!3*Qh1$9&)OT&O}`{y2Vw%| z7T&hLq~^nN_eRuZ5%+=9+(RW*W_jLig}A}3Dej9u=70LkZv;~>*#;~xK2a9$ok^?9 z-Y|yuWz~;o({j82)Pp*24IZcd>NpIOPrWHh%;ei4%2df5(u$Ejs|wTrp|t4J3|+g4 zs?zX@1G){Vf)Pcq56$V}! z-P)w!mjxvJGgevU-K*w@1rhVDG4n;exhtZ>Z_8}_3TI;q{QAy|_4XCs{_*9Jk6u?R zYcV4t)8?TWUq_z%3jY$d)1GuPA_Dpp6+~ST_!_BcxlnKhGwvwzGNuS5@^k9A0=`-b zsztG<{Dy$5dkqPc`0j}Ig7cT;iSs=l4WLRLY05~hGKb_{>VhbmJ^1P#hu()*R|l)& zYL^VFaL(>+xe?H=@N*1O8L+1l5((U@R6M8vVMP;Cdff9YKU9}7uTFBpA!XCZd(5Oc zWxD%$>H$ytebjBtwEs{&#~-vUp2D~M?uNRXLF-IFaL}eo$UwdIJsp`UWX(7-ebnoL zUBTjw8WGn6m)U4Iv<+XnGkcg=D?cs>b31+gb6FBL^7%I|=~H6RH97thPf?+`nn1-C z?pLy}b{XfI*rYU7J%HcXHkJCe0c)|#o4!c9b7xQ&Siep=L@HdfrxDNzy!$M!ENkKo zl>n_Ds7H!owt44zZ0zJHmzl7Vu=du4W=AnH;<2@E_!*=W6ZZz#ssU+T`px%3f;J;5)G(kGNXH*>AN(jzcR*#66w;c6rV4fY$ zpm4Fe=tQdAxIj__uTd^g8*fV&rCE?|3N{)|mCH`gfZ{wsh(mqJnE0HN7q1;#3{SYD zC}yD<$S@L(2B;IX&@>_Bva>Lj9ve+^JFzjqjdx0#w0_R7QN@@?gW29%L)#_fqr3US zv?I;qOy*D7aPfR_6ceZnL2=5p$jFTZ_&*GZ_$mH!g?uTc*Mh9GA)vsC0rL1E?q1D${qcZs8{K$2n2Ps8LnxMW2VoWu1`9`>^SseQ10wREpNOkZc(osaSapz-C|2#<1_-`@_m|;{13nL+ z!_9LZ67X<=EBlD%W630gS#fJWHc14;NkBFmyMXCK4QKlOq&9dA6TrVgYYY*v+vAGO zsHyV)d0f2A5!w=fI|4j`et%2n++D{%Zn>8OFX%A9mD8h>qz*OCNhc8Ybpr%?;Ig-s zLftdb^zY4HI)XQ}hzm}V|6YGK{R~HvR>GI~<`u?2*C^l3x3bGfo&lAH@a;Qy-%rqA zKm3TJmVc~LAyCW6pwVor>z`NQ{@4={CtVL&ZG zRX|7_FPW89m4U4~-G^nTJZWD92>l$jIV!hD?D);K7V3tE8o5@pw=xYXDQ{zq`D5|c zpPPo%Nl@a?Z?)YE)Hle<)bwQ5+b-(V$CVS)--aXY+0d+ zi)0T<{~kKUObduTZe6Ns9C|@H3S>0FG|%%XASB$7?e?oxLzNn1kLg-M`tNf!Q~Q8t z%r$u{QS;GT(ZoC70zW%Z;x?10G`PXNwUVWLURQ$l{YEb9)EnLcYW}YL2jngSs(|jd zr826@aNJV7(jPSnj$_SpGcfFfyZ=zCJ~RU1J+fSEUnY>C2=Bkp6PYde^Zoof(zN$K zS7NMz6qg?^b$FMK!T9Hw-FiQ=VBoptukzivO`wddGRQId1QupXOc!N=_Mo|AOqF#G zSjMfNk!ESkrKmxEsjZa`5Ws6{b>wpe5YUlj2!s~BCf8i=Cj=Xyd6D_z7pf29Ck`N+ zV&px!4G$vjg?3)gzBY!UIfwUJqj{;g_kX+ws^D&`*&bOue}q?NRWJSa*3|vuzc~>y zm;$F}dYK@p$0fDEdaJT8{TB0wTkZt1NzhuWPQYQ%6}-#4*f%b^1)X)#=>Kmt$2_xI z0;G#D?PUMf3rae1=MPiPSUV<;-~8!!VxKU&`8k+=3^swLR>70>?lOwK{}$x@wt?ps zvmghK5j$bNI}_eJN;Pg_ZK>-WVHag2^~UIRjiRG9=TX(hAl`JW_}b(#4qO8e_y&Ay zk@%OX5}&p$z%y?Zz~3p)P~`yp=dM29^c^XqcjaVt1kwpMam%Am85;KyvbJw7?SVKX z`RSAfg$9ACBCr$Pk>bL??snxBQtcn@A)_qa5=&MY1hqVC4}7yPGLFo1)a+qzG10b6 z^pnLCz8R3&Si1X6cm0k*H90elx~|Onc-@)(P1gqhw^NdIMzh~6bw)=(9Z1UJsNn1Opb z0ZEddLkG5JlS0izs%j}yH2g$w{tpWvw{=i?sZ^BsBBgJA>O^%LXZtQ4EYX z7>;mOxtSzum4N3|2*^Q=;@-mq=mL%PJ>fGqs#IgEoIEUNgJAUDaA037F?`1oZ8_Wh zICVAeO-2*Ys;Eeq14U!*@Q*$5U`ge59XBgQ_|Dl^k&RIXF|JYd*BS+jMlY)Bk5g&l zzS@0sH(8l3vmJOteQr0dy0nv-5%+osr34YHdS=wtx$?_vg7)+YKxZ@w zY6QoREUiy_epX%Ma4(P&?`}mLH5RKS`$>{=eExNfH+9X(5eHMlIbSUH!#35?;amM? zF$_S3NUeG8@wIHyBBYI^*&tni*zOGFodk)=09h&WK?@z)T1EHoLE*1q9vRDar{~`u z!h2%$_bF~Rpg&tl&j=`yvty(xQ}PL()wIr<4Nx00iv(r7taN2>b$!fQ0LHD#y&Igy?4)G`9J;CUPp zf@iU!LR*LoKeeFEcI>BoY7Y2QqurN1e4*b3^S`+Gri74mJo>bkbB^J~^45wdFYAKb@M5MXsF}FSPuR2!LW&G~B@KGL}r zD-S&Z*4As0 zNU_k^U)2_M!2!=YMLq`_g;G{4`!&nomyQt}h55Q(LFR3eMWLdTpp+mr!>6NuKJmP^ z9tEi=Z#}Domqxpzqkow~8G3q%Fup!T>G`&+W7!XG7kT!xyU|NX<>;Qv7Y0t_ZB|S; zaDEBs`Hi4Go11|LxC(7-Z$>H>hF3=lkuTOSCKKmJl)O%#%%P1uG&)I~72a72@<1-j z6X;Z~!N96R2O|EHw7TI;m5hB1f2wtl%p|U5RVWS_kp1}Q(?uquB~SKP;cF?&Pt4zM zk312%+50?8SoJ8Iwp)C%3-I_&E7R(tjt9xYY8}R|5=8kv2ajCPz--*w;~WS-m6Ek5 z(cm_b83F55W6$ShBU%haD*igORqU&VFD`A37e;T2Y0I`L2w z*g<3Wkw#~keL2%QZ%ffFdkQ%wt52B z1XVqx=s>E3j1O}zqipnR1Tn7=TUH;>qOoS zaF`~2{>{u^@Zl*P{G&8l&{tA>cDQPze3$B<^JQ!J6Al%}i*?!CSI6q1aT?TGGgyw; z72EkTE~h<@;>Xb_L)eh*sTS&SZS@{7RWzMq-uc#<7|J7# ze>#qySyta$z1t&!K1)gb#4RQ;UJ7nm%%sktK;?B886Q9$=CP>OU-LMM;@ z;!Xm1f)au)7^|7^3dj#yUSdZa%gYuvjH^}V6IkdMXNLw84`OVw=_j|@3=%aqJoxwX zWpegOCw1n!1gDEks0%3);rP(JA3w+vvo{{gs8lB2{f#a`|Iwcf}ER%kh9i;|2!+(9Hl2IB~fg<>?Q=g)(ZEJKOKEvfmO22-vx%;nI@9d(X94X zQ$RNfMM@+x+fr09wP?pV{h0b%vlTQ<>d`xpyM^9TCv<#Wt=xvHC_v&L=Ni7WES!L1 z?+n*Ut34*aoT%-ZBkF!36>?WAK909a-9$FGX}U_g{JLYg>GmQOhgvwv=F;o^eTl|> z(KHALuDz)HF-_~IJ7&H}Q9{b=aMUyiWjQ=#v)!+AcKG>iFn+Ch66- zRo{>27bd8Y6Ng-}XT%>H!_$+ldIO58sk|W) z5&EjJ(iavRS2c)~*hd|UnnC&={I&jEX$thl)M*e&%D=ma#KmWWB~wF#EaIrN?=fJ2 zZFqfKl3;A{|m44$MJXpZbs4?6rjx{X$*o$7TrC38>c2bwa zIfCSDHG?BRcaG;jNz>S>){eY}pBQ#v9c~VOxd*|Ag6E0-vu>>$Xs*~4JsGC6WdM<4 z2N4GUZM!`>IY55gsLT%UX38ty9$(auGnz^t7!Jg9=kGpWu{Ar_v`9V7bH1HaRByWa zC7J&9q-4K5dlCskRaz5Tf+j*!lz;=QfG_wba!v@%_m{BRhccVaoQF zru*?Adz*q)Vf!E|SJj>mUHs=(o9cQm`{ni4yKK5=A`c=2Hv|0^{9$&Hqx%`MJz!0sR zV0n(@?_BCFdPwGL*WyoZ<%?~%dxV4PgSjABxTSiLMAS^k6vXHaJ%A5qRYl1JVdvvHXn>qc#_6jH;Z}Gc4Iq+!)X$ld z)W2b_Mh?Ll&9{qHUT%}<&5h%*+wJxkLjHCwfkYpHXo0%c4$N+MT1iaJPmQzcWUu^X z_>6deH=k?4S0o^GWR1?d$@VyEH#iL^Ms0b-&v!c@-ry#C^tNE%s%bC~53GO;y|L6p zkj+Nez9oK3$zW6{1)C&cdxGfMZ9TQvI&DCl1B<tZFgCOI|0g(PY)DP5G(ZuH2mt{(Unavf7hTK0Y!!_GfnwNAcs zP_*AxJNby&>am=g%fps89s6WYTG?T}jJA%l-aZ)HsNIz z6Xk;#6h!BM$jFZW%=SE!-O8Dmc|S48hV!@u3pqPdH5>Wviw>uW!RvOXRXZ)JI_-9( zLNKSk`V}Iy*GQ;)emiEe6mJ!u=lWy$!MI%qucSdqbH~)44pIv~l~t-n|ck-`G9=cvt9H^2N81r-^~j|BqCY7njifaRjDJpVWR!(C`p00MpLwPudXS1}pAoj@m*d4}*w- zT_O#z^;SK(p{yH^3w-wlN28~C#WA~uITsY^oHyc^E8go}+>n*@DLCNSm9we0ZY!0@ zJj~QoyFEfO4R~yk`;oPptd9bXz4tOi7Nw4&3BAz=x5?AW)Jh zP*QK-kT2@?hMCyB7ZVaXTd>&L7Ux2dgpp;c`jZQeY`8dK4>56 zpnMXa8RUeJS(;M1BbT+QPg#7~t`<>W5TXcz_PUb}%H{BY=}zIgZb(q0lth3dM(uYM zr0WWrj+}s=ev12(zP`kL6vf6AEn1l6SA|tsLI+;XOyky8)v{GSt(aiz(V}aXLz^1p z&O+%#=y~N@SL~tSInia^hHWZ;oeSH5AFxtj!-`jJTi5o;$9v8vJv2Bj6kfQ7?Fw;mG9 z08-K&!HB>H%5Ly9PxCLsD|6ye4Y1IabgmzOF$$i$(<-887J(z9z!ja%M^V%_^O&hx zySld0*W%hn%~%Fw6}TQ`-*Pn2ae?&}Pw=p|DADQ8Ma!vjuZ%MLdvBi>(t6bDI$dgjKO2SwF~<%os&v%QNzKbuoLQADm#uX5MKyINE+am> z@tw;u&4&+RMYP|>smDTv;cZKg7qd(#&l~y(;efdAe)Pb9j*)(Jwl77)VXvt)`8YxA zO6nLA1dhx_FHiVemifHWCfdI5eMzjaIzO{x;@6_nhtg?Cm9*pg5ri=RfF1UJI#ceY zLqK2) z_z8xAOnh$)mBxKt}?kkuVmam3dL^UsyYoV-g#dE+ik5P9h)p9 zQ-IjFsYQH~F|Nw18vp6{w%_OZK2I;ijTG>6lj_UMPslzP79N*AkaZr0Kg+lEvC{2V zg-{dxXy9Z`wyrC*H#zCnt>-0jCLiH|cFT(g1F2YCkJulp%I~XfcpbWc@-71Ctn7nJ zx2JAV{GKxWCS+s<*i`=)-|5(O!hxr2&0>*?@By(1!Wr^Msb<4KE{%zEm7(s@GqqY; zSM0=)f7^5V0rDyt-qBOpS$Z|b)2SP(#>7v$-KZQ!L7d`YRIK7@GQqc5Oao3D`o12? zGZqbiIbLd4pELNad{tZYfZp@-Us%|>`c&|iq1d~2k=VK>S-Uz6Fe$FWbJ)5%Hi@i- zBW6YpG`8I=cxsIzpsK^9t~EK+bT`SlcjTQ5lGr|GrgScl!&>;T^1RaHz5mgMssWBu zmK;5&WKgcFa3U(5i0%W~tEv`QV?DfI>VAJ5U@H^ z`wW(dWZi7~8(~CqaVB8Lq>}(YqnQz8KoXSXKh{* zK7%uPn)Ezg_k-EWKxFyrK4mm(_j+;PEuP*Ruu=jYYHM{bK}r&TlF`f3BoEu%0?wob zQE41{oxRogdlQ-T!DJ=BP`{mDTP(ej1nw7EV0+{l5hsfdTg;tc|1KCyG3Dr!yZPyu zQ8`#Hy`A9ACwq>X_FfEIV#PEgRm=2hSQH>TtmHwQmSz7r&>6bsYo+8*YKZ;i;297?AW|4Uz!3@W4n?&>c+JRhgTwyV2mP>^`Z84#lB zMqMsAG|fadkOT=~!ZHk2mQmvQse4~(tf$H_VZhrCLgNBN#M3E|a4FPd>kpirua|Ae zl0r^##Vpf04u82GebaTdek#*=h2z;m@7^hzMeku3E##!vFHDT3g|{_7{%UL>J0U_P zCK`7XmNT(Ric$O$qD;Bq&s=K{g}iXvXcDhlf{!dJy7%Y5&JsA6jJP z{pi7ibYI%_&pK11orYCV_}a~{^ecD)A+nyCBI=iBv!8-Uu$ zq@EiM%`eQ!Wn4l~PRcV^v0L$aPpdw>_=0poB%O)2L&pQIBQ?h*Dmj_dfLblY=SF`B zoDGdOM6D~DAR-b^aXN3I_YXAPK*9A1QhWtc`KzW2g+>k8+zH+S%bm|GWO+kQ1$*5* zJM&?M7Vj-gbrvIE(+`?ZRzGsMWbS-*;IrE3|nBK>N1M-o4y^0++`sD_hTL^Y6M3!ZwhM^-j@y!0mNw$%k8p(HAH?Je- zTV2Dt!a%?%O}V$Afp={`WW(xwjF=J6Tgil^{A7(s+HV}8_&mbTbKQi#_o3jDH%ab) zIFfL7tG~S4Ene!W4sVr%P{1zWaBP}6+4F0J$sP-G3ex}1Z44=Ut`ILV^h3v4WM~6@ zLv?xS7{Vu(G+bQhyI7;`B^jF5<`-tw(aHMYiQW(Bn$1-XqMFl6O{m@R9Q6%GPV>=R zgr7K~`T4gj&xDUgwxy!TNhs9aBh>E{>h1{j&O}j(NNh(mnwM@F0PrI8y##MD@I83- znWg%Qg3~ev)0I^v&fj4{h@Syu>12B(Fgo&+s>(O-ip;4Vwe%QFT+GDx&F* zgkEupb_E`r%{Up~rz0;FpR-iXd-L!?ge3kfU2@o&`lOSSF~etrv60n_ zG()W>+;$F@orgX}+B2;-qc8TBrskvlM`M4FtAhc)Ym{~%`Pu0HhBtR@05W1YYJ5DL z4rh0xzFy}ab+RAbyLYDD9TmZu%tt^HwXGec$i{6yw~E)m;i#+3Ic7MDv|M^uYaqyZ z#U)(+jW;6vnWY<>w(Tk7y}r;xwB@@P}~_T)S-qB$1fP|#rum)&{~))}6>q&{PuuI;c5X{xPU#9G zl+8^8rLdJTQ22(l69rv86EG;R=_)f6sd4k#_}GI7`oOtOMu-9{mD{?jRh!X@q3uLx zTfr&3G-9!BLo%N;o-xuW(6^h`xzmy|U#aD#f zcgd$^920{4f-iJ(TscniefgxUqc0!@WxIugZ8~5LQ!zpxr}?6^PF)RSYOp14R36SI z!EjWk+8@x3K&d-N$4`M#gGfl+sUO_8@o}v3Hw(pVH1n6B_}UH*J?HyOkz1=4Unw=0 zG+2#SzmE~@D%_^WnAnfC&l->nw0cw|u2(BVwd*@v+8{}P(mmL43L+!X8dz?Pcf_IP{Zmj@3oGKYcY-27u8`5SzyRQLo%-s7$Fff+n1hW?LuNdd>zA-E+Fvgcp$_i?7saVtvTn7EbZ{t!2+Wuy$FE+TG_5H4wS z)Rb{0)JUhWx^qhz`d2B!3cd8EA`uaq9;uiB%%f)~Qy+*gbl%pybnNZY2OBU!R3ufn z%-#_99Dy*}I|mmSv2D6dOiichwjbk9lUkdWr{>ba=Q9Vt^=aYzwq6p-o_tWIh9>zU z%<#%#{w|EwrM~6cuT_E#wY~OF^$s4l`j?c@L)(5xpmu+$>S{sf{km8a%~6IBcfB zn!+~E^aT?RtE_ZRAyk`OXs3?nw2Fw?Qy0~2*P$kavOrH82-ti+YE6KqpX^qN^MADD zzTWOmYtyQHAr-t@0TC3!9K-sFsLPqP1`~%RfG2SsdVb_U z>1${L2GmpdZgL9~EscVqzqbM`Ms$13S@m`P-pRxt`BOWgI}+|SlnqbRh&^E-Gc;Dm z3`R=50f{MxdQph0jy$tdv@M{HHgy3Vq!*s@CsWy}mDpG;}9z=UTj9{3~FWm_nlT3ZNpR@q1PpCJ7TMP~ORJ@HtZtZb+Cf~yt zI|V$IWTs@2d~g9cG6)WJaC;^J1yIo>VIqP`wf2V}CVRy{aaVW^XQNb`|Ek`nU;udT z%8=IFiFjPVY3WOk9-{JO?dfIs7LV8qy%n91c$&nM0}N(}A}R6vs^_iTR3Ly66ki*u zoVl{KepDo(@9j;wMEmy*`q96~#9{sMyf1VTH(ltc9Qu-~XXQzWtx?6e-&uGHo2FZd z%hnTs{Ko&IWD;;Hkr%CU+4c+SeQ7uHd66EwT8^oD=oi@#KF2ulLwdHhNS(;-k zHFl{^2(zoc{Il{+(z#>ki^m()qc?R9cn5OX$d2^ zdUc?@QA4aTFEy?*6qF6pb4|)?-J5%km%5I8!?EY~z}ck{5ewwKR?WmMky0@d1nU6H zv|k~qWvR>8D~zdFyg0RS18Si6?0r-^L&cNr&(Gvazb#(=bcCt&Czpt%@-uC3z18ay z7fQe#pzgb3XnaJVpnh>P0GKfLO7dyYoOtQ@aLiNJ`CG4C)e*T7bE5c$xY&`<}(un17 z&`UY%OBDzd1K+Wk{mOO$gVSzkN(%(xX`)(#8rJqyYs2;Yqu5K z|HlRR8`^=TIz@AMXqVF)p-;=unK56s>__})8zPvWiRMvjzGoG*hMW9?7%^7*wXpuxs0Ee^_X!#{ zD@;uyO;n@6$i^&=g`Ag{h_>Tzlx2bcI%M@T{h?9CQ)~^JXx;qF6o@GF>j275MxgoK zD-x?n=-|U%!vW2Z~GHT9!8aLmar9X6u zG9)838q-}P0mY!(NHBpdqmQ%ZD#AZF2l#g1%o{hy_&LC@Ky-tzLTQgVJ_cjtED=Q6 zU$G9klBV*4Z}@aKEI-nT;#K#H@u0rzT@e%h!U{qqbNBmXneSq7^Mo57X?pG(b9?uS z?)vlSln}h9%h+cXK&(j=X>7Z4@t)X8cb>XXu}FC_qY}5}sVI_Jy1c#{o(gbc>?4%< zUHOhSouK)_hS$X6Dq4*%KOCwTLA?fqlYYF8O9Fw)>DPh(t5Wy>u^vYGMFTME4Ca6H zd#84@u}X?(l`fihk#;wc;piWnCfS~hVC)na$;~5y%3XX22P-C|;P^ops>z}xa-$p% z0;|F&_f$~r!RFAmOV_)8lHaRY#t0;+&xSZCU#nP>%72}IznxD=9(Leyg(>1&l(jY3 z+k+Zd$z?5Jy}O=gY2D(30(YKlvHgdZZgZ$@G5J}0%Q{PE3?eHsV_JxQWbxCzu8(-+ znul|T7nL)Ur#f?N?_xCHi8iDp;RRm6f8|cX;9t?AwBEf>6h%sB<;5t3rDKJTFIc`U z{(s+v5NF6fdZY`!)Gh4!4eB$E4)7Hwt{dCu*8bBWG)5<@eJWf^Lq&Se)-U57P3iV(y$7>ZgJBbeo1DL{))4P@*bPaP-N#a=lL0LLA&Mu*jx2A!z+j% ztpATag$|O3J2U)G9}slvYxsjQf2wC4qCJu1B8VNb`E$_|qf)4g{*kg30yF#aJ|p46 z=0uHkjnvCYce&#(E!#&AQJt)1`&KbkD8dtU&Yj%M7RPm4OXM+~=I^gUB*(Q~`}8vm z+?Go|@(F4@_ar{!Q_%6n|AMJR30%ZhR0Ws1nq0Kzh!px1INAa%n@cbUdN2{sT)CxWTaes7MP{?0~jpO1nL;K_LLS`6;#WX*tsPV?G9N z=!;-Gd1xSnm$08E)CMSML~gOw>-yX?>8I*=Z=V*eon4O#Q#1KkpzPU-^WW2RFHfWo zG->k@#cTVPVF@XIS$Dt*+dlH<2tqKRmZ|2~%+dV>a8&v}OiJxl!Hfj5by<~Ty0?<} zE~vNdSo<*RW@EI4x&Cv(;Xg^DTW#<&UW)WI{LNrZ%#B1Bm?wz#{cap1(_>>#C2J*~$#{X;D zf3M*@S_gE&w9Wsw5xGU5mGD!zv|U5lKoldPvP z%jC)@)%RM;ti~st5k2#{Glc;N?-t!o?q@xb#MA!P;vka(9JaZ%aW;!J#Ei)vKsizb z#BpL>oZXM~2|M@|Pi{t7;b!#~FESy2!wWmh7y0wV8Uc+4_vKNlW4I8*tEs^VMv%HL z63)n=lbnPjgA%qFNEO5V6#syU}xW^}PU8E~DSB=k3uvb4;;D86X(#hDnQRzGz zXayu6>;E>8%Q>xi`M0%JeQ>UI>~AD|_eyKm5!w(eCUxIw;r53}ko5QeM8Bty)ts{- zV;<2B5HHcD>Yp_>DvU>N!YxBT+Uxz}t&tM^^!Ds@x{|1y9cWZDBLwLGJY3bY5_$~d zrC;p>M$c414T@&UCF>iLXzxbOPsvs7s<(5r^}lMfr}amTOKY|4!r#AvtsZ)4k?aZA zkr89-7J5bspop|6~y~h^c7L+>oGOrH8oszPr`ZynFofRC$lT)tR=snxeOcqV;F9 z%@QoKyJ;NmiZyuB5_+Kfoh|8N<*^q%eG|^j zLFEA98Lq!)|BneI`W3y`J@?Ct3=ufV|+ zPYUA~OsHn^CndU9g9Kls8-+MiO%>zz%m#)&!T-kw2r7rrbu&FXEVX15mBQ+Q2~4u( zWRhO+6$NfMz(V8X_rBj4-uRDZzvD+ z$`^~6QoGF>;IhehEY804AC|;V32vjh*6_Jy%3+CpFzU74iw*0w=tTL>avRyCRXqLs z=pHSn9#4X@C@yVxN5!JEl``t9_JX6I%Ps^jWjc4K%?U(oGw)pD6Z`)jzsBNvstVqZ zXd#Zlml7dwD7t*A;sfg(xCPQ4J(1clDuK?C58fhZUX=kG~7;dcNby7(XS`|FW7keRV+W32cc- zvw~9C`r`8SnnZYe?FCT-iGIt7Sz6u9&$5LOZ?|dH{@wk#!V}O!@=duk@syPOKSJp` z&YZOTQN1@)9YS_(&mKv0qErI$_E zu8_AM=O_?*$}N_xBd=FRVczv_;Nc{B<{91EcQMDj6D?Wyc$CJ}qA3kifwO9{S~sRk z%X6^7^@-+T8d3GAGAmotQAD){cwnLtTyMmD{pAq@5UM^7z56r2uyI^CH8em`Gqvh0 zDy{SSg~MgT6-Xg?Up_x=uXR*jGTyQxFTMT(h%_r)+S2BFupytSFzrc^sSF8=`0#P_ zl+<V0fheL>f<9}Yj#%u#7HKo@c81p;!5)4qI& zQvufHtoKRqNQ4mN#bTmlSFuat z#LIqsL%k14kVM$o|K)u6(O@bM!D$l2>mb*|>A2K%2(i_|$?&1UQvC)Nso|wV?vco$ z_js4lH>E5En-105G6#a;Lr1WhMK=CNmX9p(0x` zfDp=}0Al(>7wmR#V?!HISSx<(cJL!{u4RLe>7JmDNR|<$y7$^D-V33dx|BIz`bq;~ zG#E&VU+`C9QkJWW-LD67&2H_f5VkXO_T}_Xn~_5v{}FCOW*9Q1_#A%kM};H*s6-OR zYcP*$h853wVb|Fc1QT6=7A0o7!|SC+vr*Z)g_D7{BwI`=K-nM;b6Y7xQip%rR{tQQ ztJ1?i-{IUE^w>I)oMzeZxZ-fy!r}}3S@%}r92ib?B!1H_yA)3U;@RcPkQ^h_I8l9X(0)D-x;20e zm(o&i<&B2rf;CcyI{_Ifg${{6zN)CX6210B{63<^LmCju==`VJA1Mz?NnW>MQCK+Lt&=%jW?()V9v`FVJWy)<)vZ5++S$3V)!-NpfLljtky zpHP_jy{X@fg8BLV;Q%TNn$u=D-9$+ECnb3~mT=aY`Qwdb%s?`^@pN?6kS?B95#>Nt zm3Y?1CCBkO8*QiyDDM3To$tkm{O!B9DAK~BT{iu4uQXo}0P8}HSS)0NU;SXYP?7c=LcYmR9BYIl z+epfR>DxYN@;3eY<~X?JvzH+pY=B)l;)^sc#XoE+DX}AYq?Za({z(lhTr$oDD@S-_&0+jK4Z*L0tJ$?!DO#s~Vb;5x|vRDSK-{u{&=B z^|K3y36~{J5-d&kX}lm_8BEUzj6{5(b?(J{&!0&A$xljL*h;j+_*aqkf&71A8wnX8 z{f?gmTjQrx@hCmh&zioTH%ApnTc1nj?*lD`vMsjq8KeO5!yo++$H7F%mISGo9;NHj z;5Y6%`xpV23UdFs%hVlGLA4hg{Ld8jSJ??K=?`EGA^wf86ULe+wug z5a_W$b2Vnfe~t1s+3AX80ZGAWf{^X=dCluDscgO?&`4U@>_U8VzDZIHH+tU?nukdJ zp&eS!npW^3Fjm=t(v>O@5F#kb94|gmpxI+561VxQ9kiRSZTrD6afNS5!~d?|k!Q(l z2?lqYVvbZy1Oz3+rZk&}@P0;$B~n7T%*wYqE%qLG#p=TMw4Wq=Z^Xy6#a)(T_jZ%V2?C~Ke0KI;u^J61+2zjZGORN>dm8!-bmsqe*|X6C`q36C zQX8=c@fe>30DXl&GU@LX%Lpy&BTlwAx>tS%e)I${$1)cfUF=OfbhX~I0R?dW=YqB0 zYWDpBEnj?)?{|}sqtwU~dI1|6Q@`o4{7EbP&k$@N5{U~2K+d7DbJPSo^*Wz*Hu#TX zR)&ETf#ne1_QXEe#Oo{_=+)sKLrG=_fjq!+C~+XH%P^a|J&Of&l!>pkf4KoKjgpP> zgVqGuB?4XK^fU_g>EB4yhBUsSXS& z_PM1J|AqTN4`|h0HD^BJ7)-4L`I6H+e)qp&&q%9(_aZhNAfgQNW8lxDD;n&kDvZhJ zl@S4{U3u=^%mEzey#%{Nz@mi@FCVkBOW>sQTb|-tM9GydfcxFbp?Lk@S-zKiA2KZ$ zHE_FOg1PyF?4Aob>hFGhNP1jXFueSq5*or{SYWPlc5l#jn|a$A^ayVWED1Vw{PtxEd<= zqxL}f;uP@s7)`bfa*xSM@NeQkfqhTASLyRH0U=t!;>4_ML?Td|p5W!d3L zpwyXl4=dnx-L|p{?#6c;UO)ISzk*+Nd!ZWfdl+!yva~)7Y-N> zE7#oQXig*l^&f(he9MPSVHBi+X#}8shY-aB69F&1EX_Z0>6c=Q!5uU(PvTpn9*Kk! zpfyffdSFo&W-St+g_R)622%h(2!U~!+j|At&;aZD(fwoTk_za#1PrJCD>lLBO;ZXR zaWTUG)%Tx%H5;fM6hpqr)34Lte?uWXtt_!?I(~K94Q%qxF4k8IQV$O<2^ihgvSe^IXX8+7smr}7 zNC|GBGAgxyBa$)T*kTM*$fk|IJyiK9DPw+A=Gb7v8qH!e~1HJZep}6(^OM+@lu@M?d~m4{a%N>KRJDo z%oQLBK(5l5A4Sf+U0xXN*#eho9VYwL~_R`_}+wzb`=hUnQvKLaDe`kHlSUf zK^a)h_D|QcL8o~u_sK$zGqcAlg=_#mi%g+}_&i`j8t~+Od&(~tRV(-S>ZmqOPC_m? zMg;{u#SVd^peUkhdr`k}_$T*w>6fAF)l}+`=Fd;6PHN7Bo(_pO)rfwS)6TN+q*k>d zmBrET`=G+$zCsJL%t8c!Anjt_59t>ky*$Sj3)-dpzLvSuzH#l+87CU=L@TYb{%~qu z+Dd?z)1Y(6$Uc(WnR$8Xv{b$E(ch}>24VuW84B5Aa2Fxn3uo%q?Vz@?bwPDlH~IQT z``Lc>#h25~diVFyCrOH1KF|N-{-(4c<oM*!(bjOeF&F%wvGFA?>l5Y9GuZ;|@DH%JGuE>1emtSTk z-Ej_y>oT(6J`Lo;1oKH#_iNEfXdGLtjBbNYK~Oz;PaK1DXL+7ZN3Vp9X6vPx9T!!s z16^a%MWJn@ptQ5kjH?#yEiE%4R$BEN#l|7fWNh*nFnHM@sBuGcs4P_T@X?}F4fEOE z@u!yjEa_Hlt>SA>5`U}!0Gz9)4mO0`X6>mW;&nZS zqh-l?-M0ZO{(0bB!GUiR&O%ed1&l4Uq-$Pg^yi0T9B5!QyNu za8kgaN*l^bn-45>gj(1CW67P~)1IVjY#` zBbAxzR_#xhp51~d4Zf0`cTx%4_ML8h_7OtiiUzit!19nca}iR${EWp@v~G7;0{U(!h?=pqN#*^2+T-sSUZ6blAtIMOh_nqA}yRPD?!E+}}# zYErfZp?!gXMN?3lms0Asxl!39Z1i&G82&q${$2Z!&PtCV{^R(jX4mItUY%ZnuG=eZ z`v{Lg=49x`ekx`*EPN_gEFJcetgVhNo)mwMa2<_wfvY_kRI;`C$3v>eq4mu9adBIG zP3$JSQpNh9XE>M7I{63z{=D7Pe2m`TB$lPY{ikQVJ4Dvn*L>;oFvX5E@)8lUjpN%5 zPXq^;2@qJa{U{z0Sils+mVNF}P0Z(+nIe+vE;26_xr>OZhFfRG&xl;`<3Dzo>AKC$ z@oG-nxqUj<)@3uL|NBapKgy1HT4U)0iOeSKth6prUTO77Sy&n81vpSYBO{YPj&JP^ zvs_KLd&xVtt0%h=9khBRVcR1(drq#{o6SE;Lcl{&d1JZzs+HaSzBgmSRmZWwgF5TH z^zGo3U%CDoRplVyoOoX#jr6Q*lWoElHz zNvA%E`qF=rGd82%jU%8gHe2_EdobCbRA_8s`^w`n>6iEMhaFzBP(prI?7S%VO9hmv5cqp7{Jyqsr1hZ7;iIfkiu*mGjm@0<=1Jm zGptNwzxmOJ5f8FKq6^Nk0ah-*9&UTJqA&JR--nxkTZ|C>C9hhDw(Cn77a<||IFb7^ zx|V_Vp)sTO=N$N}Xt%k1NTgH8EaC7U3UEloMwQpgOG|KJ7Do(G_SRIuc4cpK& z&>r}2-=0xtg23c7**l^O1CR16TwLsfM7D8`B~6kKT`jbol`k|$N{m$<_U+aLY9~C& zc~}*5YN=o{CD0P#I*ka)qQ(O!ODjo!{|9AZ_r%g`4N2?q8Vg@RksyC z|K{y~HiC|L1jpj)Ls&)t2bHla-eWa9ib@@1y zl*N(zluHkDvwIOnm@+&BY_Z*#g!QHnB3l7GA$Y%;&wF5Y`rU_m29!l|%YQ$=<2+~VMp90{HfkjWigNeMdSQY*BY@ry=WN%M7)nAZO;YT@Bxnkm50#F(zPZY|+fMiVoktUy) zynv+ZH5W!(o{8PYqhZoc@nNuUAj{;&$${!%n5>FukMC4=Y#^Siw%gU__?%zwpOtNP zZ`QpP-mbH#N#kc6Pq9payx5oN)|tEOcOz!~-rjF-Ub(dA+OW0h(3w0K2BhHQJNc=Y zK-f4Il4*dVndj=2n~)HnKV@%xacBhbNJ+rGgfVj7d%Be^y|K|=x$};Ade6e*9*P(e zXNFnhq^v6@Hi!Bil?ic>up@EL!^f8PSK|G7MFIVMw5YtMCQ&WJhv`9hItI@X3Ak;K z-@Yf-J;NIximQ-63PGB8J z!Eq6?Q_DM!c2NR{Y)49G1z8jvpG}=#DO5OZe3QXiYj@#Jt~q!UGQx#hyKzLw2NHaV zB{|eC7+8S>@edLI#|6Ng$xB)5T2X29`ZLpAgLj?CVVmf(AfU+hzlRM*Vwc8v%aa?U zo4b<#oYDjfCi)B1i3fA;6Y2P4Q)J}tS~B}r!4BHFg0;EBy|ZJYvfEYXY{wEtA#g@# zt5)t4BuK+oJR1T;ubeJ$KVrVozy?%(mJp zF|r0eMhRt%yFe3|NUuPM<%oPEOZxkST7Lprj&X*$`ODTBEB^_VhfrQ`TuhLkCRF^{ z*XamK#E0}^AOUc|+3?E?DKdjGBF&Ulobl9M)Xi-9kqr&*sK!5l7=_zF1Oiq_F`cN& zhJ%9z{7RF}cfn$9%fXS{)zlu!rf|$2e2R3qz@DKkgCg2ZHbK2GJCuz5$3Ia_o|Wl~ zUE*b6978>Wr_$7C@~Ot*J4W*nI^7~NO2I|fQzMRaHEk*R>k-mU`4BkZs4nd9MAuaa7f zy?pmv%9nk?pE7y=BmuGTH+Sn!(6S;2l!pf#;V>gJu5`0G76!e?O75cefyD*9_>Lqt z4I8IFJg9)70NhSWA6t(Mktxg<@GlFq63V|8XCfexkA*5&j(CCdrbJbR7#hKBz1wW& ziZ2N2<<@x;gSlQvja>}Sd7I66CPc%H+yD%6bXlKjT!Z9;Pdh4EY$4-z*KVn{F$Oe~ zUoRyqW%f&%Oxn;4;EgVgE3gK%H)L`_P-Kk1f~DgeO$%eJI_j&|xe1BBAa@VpTayw^ zd>g{6Fg62>0In08>Jiim$w!DlS{Nm@*pgTyOrK$$TA)WUHkgC&Hc1%y0rt_+IOB)G z!_p)69$C`!it7$7POL2I@1H7}&8^xbPT+zK~b8u8U4gdjiE$tX`@5a|Z} z1T_}Xlspo?HyS3C7-LP{91mf-*w-*g1LM6x3xXY7lTFg)6e!4LJ>W8;HA6)RF<(Z* z)i+@2WryN86R9Nspk?qZi+u?ed71FY+tPB}twMk_xy+%EeP`z0@zLmQ1uboOsfl8l z#6FPH79JVo2IdC^EDwX5nP`!Yvv$8eLPRX)Ztcf#%-;`41p!k+H^CZ3Bn1&mMk;Lq zpJMC2Cvb;gD)gi6E(pTc`|;1GDAbymh|eEYQa&azy(gWU3`$!+WI zPZmZ*s5JA}7!IdNze*}ReCqBmWA87z^XOFN1rmsTNO5%4x^ym$5N&-Sq+<`#VLUh@hlm(C20lJ!Y3Uh4?zF54IJt;Sr$iT`O%ULcAtL-OP+@>3 zw_$`_Jwq!c4UWG|V5>S_ZE(Y>lzjfyH6(iDFHpW?VaI~8_7y`9yb?Yec;erJ460jr z-@Md1Lzv1dX<(61+k-M!(7AbN91mMvHtdYGpawrO3f#XQAP$Y<_T!j>G;V&1PBu}yd2?Pa`dbz%LMbvL;z2??(}{>%57 z;KQyn`J|oqMetzWyv&E6%@$)d>7mdIzogv*>O00|Xc+a)sAX`8A+Z!Ctc}=GT}3Uu zz=JX z2gyZQop-H^kB>M9<+EARoTwa`%bsIVm3$^?p+*!h{Lzu>=9%n_h$?i`L?i=_@ig;- zT9Vk>2neS1mzKt4Ni12{UqvU+0S}SiH>N>2bxV*s&dRNUyW;Jze*-fgtpFlleI z{N&iaTU|s$^WnSL1CKZda>=rc$aiG00fokYJKWiM2)f>t!v8RG1MEXm2sl}V1b{1b z4PoHyF?-0EbkRi|NcsN z+Hs(Ppdcf%=)eD6MtNi3ey0{(Kl=aTM}9U(X0@{Mqzh@u@4UDpBR^HsbziJ_tquAs zewtxb=xZ$Bm>X|xg+R#i8^gNX0qKcbPcDo&fA2ML! z6tnl(K1Q$AEdPwu6-CC|VQv(hBA-JARseq`q$(ixBchQ#mQLJ=HO<+;{ z#VKw<@F=k}W8wbVdoe?`j27CgtWn@`Bh-3yZlq>$p0@zI#C`cVkA!$1ij$oR zgyRcF7X~9OIi9#K)A?f!pG<0cMF9oVD@zvo&@KO8i*|1aIh!@fSaKC@x71{YAJ^V< zsN2!Yg$qw!4~LhX9UVbXaIVx{ODiqcQ6kdrr07&2BTlFWUDWM`(rBD-B>u~0Y_jxktz+>A++au^TD84psKU-OrqQ`)%*V9qb-jCai!cHhp z8LD_}FWIWDvlrWUZaDCBL6_#$kNh$(t=uE>ZjwI7O2FA0xbjS&u$vCq@{V~0o%B-8 zz7I#y1X=!vtDSggP3hz_d&Dvq-KqRprwld9{Mue4>8YR;$|P1l^dLGqKouu4WbXU0 zP5`b_^a2J`fS)V4ljb3v=xrNcw0ozFY>_2B6+L_eMb5lgw&-7pK_rK^RUJJy<@_h) ztm|~m%dMoWFBwgQ+T7=%i2U_MPr!#Wx!DY?M2P@g!`LJ}qVwGuhKah+o> zt0EX}uIR%&sHLL#fuf_RLP%rTRZj&TnxCr&}U%Who zAEr5ipYUCvOFbQ^ZVX7zyhp*#U)3t3o28ye{7i`U7{Ifcn6P*1;uv{bJGzMrmCF*j zJ3I5iFZj);P*{3;UrQyQE!Q5iy%}eQvw$BTrS5Vu=9@uL{Z1jW@BDD`QZ|T5NF;$F zczk7@%sd|_!s_I~I>9vy!g;-g_hvW<hs|C1-M}ZA6*s@etue`H zpO{ia|K^2_C>Hh(pn8LQB9cCL7Vg}OzkG#EpTd5~q^qt~0T^!!s<@MyjyTn)aDn{9~j+x}bii)aOHtwvg>2VCg ztiCAZx3O&O<r{la`Km1lpa< zJPvBP3(;p9T9Uj(#9ozr44;~Q(s#vbV*}RQ()NQ>`Pmkn+TJn&SiNyt?B;fDspcUt zScf?8odi!xM=d?y7VS=lVFVRoMCAzbPjUkld8L;FH&yt7vqXC-gP z?PqcFj#?kOdueTo&H!yRVEl@2*%Sv*mzy>~99?q}y{76Kpd^0sK ziLtfHETUB`msKRo#C*FJ9%#&Z$A8XCQ(3-ckSpxdSr&56><)6qLIW>?M(O5Z7Te`( zFu4K~fZh%F`CQD^ov(Eee2Ao?NR)sQoebf*Q(xgXAd>_ECxU)qi9dMQ;VFnb##pD7 zq~;=B64KJ~#qq#Ql93!?JF$-W$O*V=^(R6RXZ)nr1$V2VkzHRf;05~&bXlf&B_O$N z!|N`NLLh*JSXLZPow*&%lKUzcQu35{vDmXq68~sS%B0OZi-i`N3E_FCv%EFnLwUQ6!t{0G`)JKv{O`&aG-Z4*F%rWt5^)qZ3Gee8zS> z>5QqvlH5(-O;NW8|BNicgnEm*G2hP3%D#G2COM*U{O{U$;5@C0VtoPh;o7uSi{y&P z|L64)0MqLAg%>{TT)yy=#}3yqt*^r%mhzSmVY|hlDo;WRZY=*L--R5twxu zKnCMi=^D__o;|U8i!3Qx3f1qf<34O8V#utBM})xg8v|7g5;A?5|1NY z9M$Rgoxk+=LU zgeSprZ1g52Z|I;M5#1*}xj&Ki|NrOzyE7npN`_cONxs2DHKUDI)#Mo?^Kl$Aei=hP zsLFERo!tw$-Hlp9xdgJx;?}domV;FI7daNawuXPdn_(otW=Se(C!Z;JpK7e%MDhA0 zwZtcnsjK|e!G~Rkr(IDqei8haLTA?%nw*&8_F8yH&ZvGlzVlJ9M2efPcfG-<8OdoRxIH_hObABRp{l*uL8jqWl@zFwPxFhD%%IviG^&B<=yJNxHExV4p$9v7$|traNP>v3Ad=|NSP z;4-0bwhww!G{5cKy;hErUzNdj-^8h?b1YunP2^{Lz&e5Ry8)y z%ks}EhIcS_P@-1KwO-3*RH46uSv?m-r%_QXffhtkK|zCtO+E=WwnB>xHjFm0$umNt zOtMQx>7u93-yx$8z|XZMU1b+y6^>0ZoZ#nhv?o&{ZWEl&nY>JBX;&L38YfNR^|N}H z;rds_6jH9G@@Lzwbz%WVZgwDOwXQ>e@Cu`H;9KrOGz9H zsesavp0?a}ZFJRZ#6<1rFcvb`oVouc84*s5juUUisr)JNnrxgZ94?0iO4JX2f^!2v!FEa4sryBZ1Ylt_XbWu_f`O@fT8u%%;9s=_eD9 z4tQb{IF1?KK0a6Rp!eRr&`%e6DvAU{r9~$)M;aBcq(dM_Eo-}f(!8z`l4Kh=yj-^< zN_0k^nLJZRNUq8_5S-GajK@%dmKE=U6o6l#QHT6+zkNJVY?nECB?J4JB4_yKYh$O%~DhFi4|NOZw}xiUtwhyr~YwX2}`TT;aMmpI#Z7-7II z&M^JT0(BP(^H?Ta+T!gKU7w^_aT!9iUl^C}Q)YQjFcB6#{fqz3nE3cJs5-M6p2y!u z@3Uvlf#eIbw84CGT85uQJ$Y~3+NZtl_z*FUucaqhh0m64>0m_Ozszr^wFiutFlog= z&tLah>n%Nuiz)7-r?ElS?B5(H!Y}TD8pb6wN0D&$n-}j?_j@WBWd9J(_FipHti-h_ z4UYlWZk^N0ET9!JjkBs({x8Pek~>agzH)+!E&;gM>OhEDoD#9%{l=T$xo6yKHGk+VXitxPKIPwTK%HRiHo;E1l|0j(5##|CPIX4M{5NL zDXy(WTIP*$xu^am41r{NRNST(uEUVcjN__#xKvR<#7Rf2)lTC0;75Ay?2Yf6x?SvK zh{vf|PGNojZlwaUS)URcNb^(>MyeNdTUknCpxo3?%v29c-?gg{b~ufUovXoaZ=k`> z`q65n5r>xC?2DMQU*Nd@##p8*l zX2h!Lv$?~w8sMVGAbS0Od6u*Hz6!ZD$#75EK(KR%+E<8~fe>@MHQO!dgto1Xk0hf- z_cHE`BO0WI@Q?c!DrpXkXvSjGTaca;(>m4hTxf7zdDls$qTP%=G`OX-A-GX)i#1s? zi)*l5r~26FKAHH=)?OQ2YB4Ab4Tgy6k!OAbEl&WRA?h_cHt>F{e)iCoI_wGWn9+r{ zVDhZ&LsA0vU;UfI2$)W9G{QOM7orJS+>&CkS(7z(#cj zIgOgRNS?WUXv>jd-v0ji-iTxh03cZ(Ajit*C5?oq!zmsuoO2{gHkUML7n516&|z&% z`dF>AbR*iZg8E@aY_a??&_uJ5vJBm2&pFBoTI`za%O1w_pA7r*AV+Ac01f|JLMg~l zr`co4M}xaY&Xk)ZXkTY)YR^AJD@iC3Su^OB26ix>$DYJUb2mji46>vKJ@9tY^)V}= z7dFUO5w1YeSRW26;;Bk zv}I*N(lpm{idW;mt>L*R6g2{J*Ws~kwuM<1HL(g2KNYyLe5a!QVaV3~$Ee2j_E&hi zat{}3RSiqc&%Vayo*SxB96FxM;rFG(82Nm&dJp%DzO`hqTxBFTLEQ-rym-yx_bcBW z(qZxI)gHE?`17AJ!)mTJU-&GN8aM*%5^m0z{m?a5ZM5E%#(Keog`YNWB#GD-ot0Td z63`@TDm^8gzTcmb<(=}9+C|9Uuv3=Go0R&Os-6|u)wL|M?~qxHH`~_viNW%1 zwqO0%(2-q8U7~=tvsW1?=^n2D2!V*Y`h_!BYlYWbR=cX*mE46iu%@xijXLGC^{$`K zWIKmR)!0rS>+D~@VG}aD&@jrZvz!vGUnCeU*^9HUm-ekK?O9>M+zaS@E!-tP<_{es z&gDL#Nr;#>th4S^!dS3hM?^0@ZnvIE{a-=a>j|D;v-)v&e2BGoy{YGSPOYM!y{O}Q z%dPJK!%Bm!;p2gC#A z22K6DcOo9zh(Tuox3=z2bi=w$#O3T~!Z-+Sbrjxq0tcc5wHq%GWJaVRl!* zu2g`c)_)C+_w4BH+x}Ya0F`rc2KaxCA7d}2p3XILmX{U z?x1GkPnH8#qS=OAbfWG;XuqbcpS~e;#e>D}A|E~QEfYFyhPQ62T(!Q$XHObzylQ#z z@6Kfku*EYW9yh3+l3IBz-o%jiLuZCjFu>}-YBnu*lb$1~hROHL>%i#hUl+FA_PuN2 zFLA})O>)*dXPBVz^OABrw2^s!)%$-*sCYtNTyqDI1yU04)_;2BC;zx~N6%%)wq84* z3n#%%x%NAkpK%8Kv4gvqN={8l{Mo$AfcE$md1~4?^=HHoQ=Zs$RxVvCh=^EKw@zxW zDb4mFDw~!~i2lGis)7{+LJNV(N@>j`xL#CEKczVQ;l`k+#Fac|rC_?}Z4t@nF-;Fu zpXL3A=ys6uwO^h%ssf`YTeUCTc8f%IcP!@5_}?6sk=VZ;j?cPpS9}|px(|1^Yq$n> z*~du-9wd4SENC-Ct$n`0ZyB@NqJZ)Uw!nV^lc5H!O7V9Z&@rwU81p_u^e>1~(161^ z9dO*w?XnOFNGS-t%gl`P-WlX1Q7To{dUq2fU-(nmY-qBxZ(xhEIfL0H0MC7=5=x~; zs3MUek<-`mtzDxnk~_jGAn^Jl`vlkNiFd;TP}mBt(rwxNo%9T#JQ^cQ;)5!ub8sE*W&9Mi}2NY3?f-9nvqQM~)DZx%wCt z!R?Q{k~08Zf3)z9(Z!5TM!404nEhvegtFMTz$KJ`6|o$KpQ2}1201q z*hcap{eEzER8C_wZHR$V6Spb zJ|c|Av@|Eagg-y1!u0WHRo2hQ84cy(H#I-t+6<$MYm0>HM{?=$j1S@ti6 zq6`(&3%j0|Q$_gRJELDcAKzCeKVg9nwbUn-*eD9bzi~ZEjy+a)-m!{1GfcLQ{;*Rz z@W|I!MUKeitHY{ZvTzPm&cO1(tqx8|wvJ`iasK#UY1RjZdk&2=IrI`+Mtbi^V6o)wua`dkwO{$f-cwOI zm%c*f$dgr=mpJo-E)e}cNp&NUNn7UHc^f1ly=A9wnr#1-YwFKqvO@(^EkDq^>i(~H zwg1hicqMJDRKc`f$3&=65sn^WUAh|}gCs%snw(t3d@RH)U;r9SwN7Adye-Yy&Wf9Q zVG_3AsXY)?UBx5!K*8*CSGvG#ehU;^DAa4FK}+1+U_KvyP?rawYWKpldLC*`8S+DV%xbk))i- zdAH_5 zW_T@V6YG~V1K>H0YcF%;h}JbQ1vLUZ*Xf;2xlRL>pgK80X50YqgSN6czDn~7C%yD5ZU5F3wwF{^_91&rlaCQ?V8CD(b8jqR>Xu*0pc)w+!`56zbw zl**HgD{)xt(f9Wj^3z)*O?gnc<{(v?#2FJPj~xQ4NEeY!h4Jf_olq?lNfe-FS4Wif zvJ8p;)Zu&ZTXJ{8Kf8P0bj;26?#h5Bka+Y#b?q5Fw91#WrA&ORX;L#F(ujWpeX>^kJd(NzjAJ^J|<#J-}OKJnQW*^*k#c0$51EEim)5=qH4as{aus; zeUu63$5`S?P{vE{y=fF0JVf@*+5d8!mQH)5zX))AreC`}lcd{(De}Y+eGw>bQjgPo zRQxy2^VZh-6VlbM{f?~(C!%|n&ZX5=AK=6mi`b`VzHey+OXEJ*#;<5=9k)u|8yh#pB8rvWERLtd3r zsteRi>`}MizZ1~Jrj0Uiqp+wZ6t&HF`X`@!t84i48^)fSd(EKsnlNgx{m^dvT|TG< z=uKlu&VoKX9QL;TS3^b&d2an|)p0EI2~$#cg@|g+_%!;m=I0X-1if3ydGjvf(;n>V z#|5YW99zF#Fo69b;d=%m8nLuXDRJCi7R!T2U!VCe8A!Ma3L0*S7FJag+i}*{p8ad& zYOCG+XLoaJ$|SQgb~SkyQ|*kw)%aaijcj}q$>Fq}PZ;qSPv=>qyF2N{gYNf^=03AO z#7}fn+$m)VMGdIh`kUMg3?&SI;AYcJTtP#ZKb#|=o>BYP_#ZneCRsNhuGDfz^?_RN zYGaEy>8hMW$0~Oj+5()OX2C`171(qWc>#dLh@d39@uH8Iqg&lNl2OP#sX7iBf3bs>{CD{;9>2(Rd1XWJqm!f8 zWlD!UCnVfc`?}k#o4ttI0h-((TSIZr#q5Se?`lxFt@RVhv2*s8g6c6Idsl040PLNq z)+RHoowgDUT2&BJ(B5F#EdJQ(YKhtANy?(3HxCJDkSd0BFeg-v-X_jE2_6``Ksyt_%M;~ZpZAE~zi&B&;e zm=IP1B#@%kaf`R)VI2LjbRsQh<9h0mQ|;XC8S3fuCNVJ1-G-YhA#*0su@Rv7ja?Q* zE&lLYt;76gNL0k6`~+)Ma$DW5P|*=p9oRfq4X(%3-+!^VL&>vVQlOun4z07L+0|HC z*j>2xv9a9=(U?{sn>lShL=5i{g^?_g^`{+tamq!Sk>ZMdFZ>il8va(05Gm6h(TT73 zt6W@BBp;~<80BL`A;EeCtjxFAwvKnVv14EyzxyA=8_1Jd*DWtkM0^*84odI>If)G^ z1rZoeL)^vn!<4R9&UL#289YA$1Pm9?GGR{F=Z&bn=8qyabNC8h&Ngf6pt4TXb|Pxe zUmrg!V?94w888Uu>smIx&Q`RUxs&2_${vltBEOO8`dA5B^1z_5fnI4|mc>?a_YITb7LnCDXfNtE zCC0<$kwu*@?%{xF7DUH7FO0*0l`-CZ@U7udW1QU2njy1uKA0d(f^I!6@q`9|G6bVI zR#b_sYugSg@{$m+Fyvn&ICi0dU4x@w?k@RGXc(g;$S4P?OF@=bRkAsQ>nCs6VsnvD zY_I7GARV+p>e)JPN-dL-K@(~|m*<+4B|m45nj7ee@T zOq*}%`L-a*e+zURykot+fOlsA==#2gIp(~l*g72TIndDqA79+|AzakLP|O#Dsj0)* zwyy4cGBTLgY?~`E-f3L;OJ0nmxA9*&{d?xTDsygRo;^5RDy^!!^<7Jb3g{OtvY3gf zLm-)P0Oa;XQ)Yfv`5KvCMj?A&O%YS>yYvYgXM4I8rpRcGze+oD=QI$7)9Mc)d~EM488aGk2V(Htun zf)W>~PXu#&8V9<+U@DZ0A~8Yi$M8SCc@oA7b~@=7QNq?39FkwEf%XEiIPdFZJNwoB z*Omc_tm9x2+q*r^L4R1_YVP-dl>Ju%1pGChdAQy5ibw;})c$xZqY=L6vML-B+7Z0D`#@T-sCIziXGA zxN(ledt?LzDk}#G0;I4<%R|?gV$k5pMhR*lV&f1~lqp|N_6~shCZoF48YxjIAc~~> z4JSVK3R%0YSL8A>x$Gcy4Xdt7s>$V#E+%k4FerT|TuJBIB6O#OjmTK!e@50+0eK(p zO_U$*(S$B35QbL`&&>jl*{LQ@SNyFqqNeur`f$5`UJCGr8fPmV84djNOq6Z&&NzHZ zp~ir%v7nJWNif?@?*+O$h2a^Jvqtf3LkI&i%rn#erM_2 zYAY;=R^9~!gdprJWWEM_BEA9YUyr&bSv$C7Y)REg>ccH zw>1^2dmwJL9@Py&<>X@`yf-)@Nz{yJt5JPQrfeN%vk22 zB=!n`Lk9{_Zq<@UFn)1ykt^6e8IhH^|4epWN&LtgrX&Z2vH*N={fo&lTS-L#I}N{CNqHyhM%Rnd+zTh zsBW%3J=r~ELPM0@g1=G+qjUEYwt%P|WYADG@-E@$nGfF7`B6(j3Z7lIxFy~{4;?4r z3<+(+juJKxu!q8;mOi1S?<=8L`CcFk@4UQ0=oqaPgBL#iGiAb&nYZLWXYO$_FSJrF z=}|yX1L@7kj5A{1NrN6UArP5s2L*?WSosa#nCJ6|fbxxM$jwWFQ#XVu+GXX8=&)=~ zeE4h-P;>=k=7wYtID`Jr^vOv=3Np7GLjz&E_Oial9!~$*<{^ipsUsxu3hWUD0>WX5 z<7p98#U2DEFIkY}xY~EenXD_T3dxQGg)Bib6d21XHmy5RX-H2z*c}2@VP3Nm8b_*o zUt!7x@bei!a}n2UGIw;mN;MKXq5y5o-w$I!zI21-ivlqN+atgl=nlnz{FjHNeTNI` z`V^*+tO|Y?(|7tbFg58qR#z4p~NY@ZInG%@IYee#gqRDo_FY z(KI8^TA?Z@S*=(!GauA{je398OQZN)1{C8n1X?HUN+_AMC&Zxbr89~Zz`49bd1D}{ zH$Y{KXd1%%`>2eK-vQ51i)ciU_GK>lRRiiC*<^^EKYzGp(EYXuNO?Os$U{lP5nd{V zM<}J+A>04sUOXbK0y6aRw%-xc+RPi395L(S+;J>>U#$^<^2^6fp|=^ zpfsV_F?S$7{5*WZ+&2;V$nW%8hmr{(qoO=s@nuzNEkY9VQ5K$wBeQno9^Q-c6b2*M zi8XSH2>Y2WikcNZmMb3RxK`?RD)k0!yDO?-{+8VOPpbWX4R!;`pa4^)+_aK+YmFEWhre%SQuyk-?TIp5S zD&ru;Vl&Pgi3OtfD(&Qke+xCtol57anv1t%uDL1V8(7wHL7Ro6=#NzRnL(3jma#!o zCTY;B*mKnTUq|RigUXcJIc!8=sGH%_Q|&MuNd@~L(fjZBMj=Kc4S(s5(we+1Nhp=u zG5om!DWI4P^Z9!qwD*PpBp(&gdhVGBUBJ8|vJ}^ajn5>ZK9nR|{qJ*!cO|7Ic?J&q zWn#Y_Cd%R|ew|TS>SLug!I;+%O*2LWR=9iesLYwU0P#Tn96v=io|sJBH*p0MeZCF( z6q6rF7$o)|VHtD#`R>h(A_HGFv+Jf%Nbtop512>bwOe%6P$hj?M;&{Y4?wiTnW@t@ zV?Kw4mU(D-;gbLCS*s_Up9PrVjfr(xNR5TCZn-IZ`taFsPci)09bz9GXG+EdHt*JO zdHW7d{t$bX8F?YF?ukmbLgtVfy{qy-&G82hj?`&f1jR2#?h+6iax#@2IeHt4_0pC* z4DlggCfC1d0eaf6%8Cp&d19-l& zN>KA3ML*Zc1>PYFY+|m7ZT|?Naj&jE<_w$>1s&Ft>lXx;hpp`{hIi5HPq7nq@To+c zp0a?(b^a!A#!4dcs84koXWlCPl4jUMeD!hnuiGwwi|rop`-1sTl7(%_9f8%N#O>Y2 zs~`(Qbo@MKmw=Ac1cUvw4~~1Rtk%aB?u4Q^jO;eji0SeWC39i&MEMLZ^`QH)DHCfU z9ROr2jf~9lt2E-Z?Oy$&mW7!a&<^nJgMX#{*M%OBz2VUK>wj*w-a}FNGqTvMO}y!w z-q&-Dn&TTSfx~i>jghg(1+1fWa7EZ9iE(|pxj|EQ0gAAmf#&^td_LR^8^A=8OXwsv z>u*_LOhox`1oMHMCiT9%pt#1kCfe+?_>!hG-gv@|@Jm*Vn#SD>QXmuao7nTuF?*k1 zl@}E&-rh7ym~R@@AQ%&d;GUpu&t{`}TRjnensTN>$Op4b{{E>a^*>J}e%a~2-92A5zDREoq7?3Un$y;@E&BKG-JIy@--a(I zcY(R08HKim$o3ylfAb1)Xea%6to6c4YO#a(G4oJ1tp9|AxhAOLp%WT5Ywx)Ea3PVC zO(*VSbyUwl)|j{9TdJ>6+)P;992s3l4iiw#cakmM`wri<7*$pp6)^~pYl1xMxXax)0Ubu-XBpvR?-nA;iznq(C3RHd0(r@csmQe_g;0{gI3Lb?#lAe{o zB5S+y|9(zRyqX}AlWA14QtwwsR6pHEvG$cwN95Izp{&9c&v&7Yum^V1i-y`rEw0Il z-?CQxD1y*`cKPv^!s%IWlpIA^YN>mae&ok87P^1UZjDMj(U{P?qt(7=d5I-(%4aIf z-V$24Lh9gerYwNy)tr=C9=TiUrV&u?`*2_#*`y8y#3Yh~Z08g_gRXDR)or0+mLeU9aZ^ zx7pJtQ|KqCvq|tW5djK97Sx&M3hyepT$95m#2oy1AJGwHE`&KDmwO_6CJsLf9%Tra zq9|fe7$j6NH8Qw(`u?erAn8~!dtvl!&!QXqAKR}^zz_q-VxGtlc=)4aGZW*POe<^* z!8jWpbXeEx)VBUx;ok00QMb!{dE1Os=F&2ltcY>>tv=~Dy&sA)CN4MK7+u;0O;u?m zHZFG*zYSG3b|`)JMO#RL`&Q7;f<C0Bi@R^4gLo;&o9yCN2XvL+12d($4A zD{ihnhjIC6RkygAwooALqWtNs5?lN9)yGFymYSS_5MP=oyC~#!jyDcWd~yg$P|s4Z z34+Pyd>~L5GK;@#7jnHS@NM^ooiH z0+#J^|G$%hhe6uhUPd^7oCJL7>AJX)a^+E!!FZyuMl_J6BfyDKD=6GUo1_MR-@mki zgQH^ge-1cH>taY4S3=c0>&ma_1v7oq1rXdx><`6{q2`$8^Ez$MgZK>M!4ZXIzZBVp zH;vFc)v~FFf=2+|bLd_U6x;2vdPdal&7ro{r#c>61e?;+S);JKnv&LHqgGR#YPl~e zwx!3h+e?RTiJv?JXNbc@_G$3*2ljcE7RB%S{iu9dN_;q?TT)mbB3^tp-Oy7Z)DfOk z8_8o^IPWI3kt6P=AWcbg-W(8V7m}KXyn2?EJ5(_A@x`9906lc&T9#pO1Pkf5IZ;C02X7S?kP}aato< zZn-F{DtM8zB@=DYGMqCB98X(SW+5rp_%`%~x_b`ldcGN)_Y1|ksPX)Z^uQX%C2!($ zyvSFh{dv@Bew=yFs()gBY62=|WjWuBXL873o(7L2M2IaW-Ns`g+c&u$!r~+qqU7w2 zHFs|TdHnznIaiDCG;fMAKBGC)4eDR|d!+?zN)lvLb{@iQvWMwo&O`QsOMlHe7FS(j z&nXtgYvK}3=>I-?j!^IJm|_+rx&@~4&=peS!qVf%t!sMoTl=lT!@|>FobhOb2L^nL zPILB#3N`pWQ5|bbS__2w^D^$&H~S&H^V8Osz0iL=Hid-d^P%gge-o<>j5f{~RQRZk zKOvQC#5rC2K-aC@jviZPYK53G%g;_4&K!s_A(q&HBPO=0A3_21OMFeg$ylxvFF@_! zT(=@~F!)JxhIgWpzth1e!8|BN@BKzG??fT;)P>0#NrWaQF{tB|i@>E;sk+LNuqWqy zBD)q6HB0ch2P%slY)#4rjvvQ-deDQ(r_wJPuy*sm#Z~ehz!_-s=i~1vEMulBa~Bpz zuqJ!|(|7F|j6?smkX>=8-xis{Xu)VR@iAoQ37DP4&zeeD3XKZ8@Fx)8Ci0cfD!d`D zmxYA|ZXAOBCVoA%1yo`&8H}hwt29LS78x^&f%V^N0J3X*>9GvPh}!>Q0m#A}*G;%k z=u0(>cstrx9e5}|e9Or*|Ah66ssqdgSTFsg%%6*KDx8BQJDz-fC``rh`UhWs{L1{h z17|yRALM6Y$hb&Nv42y^6M>$NuzgB6)O96|DvfX?WpWkq#tTu<(M?IL{=Vx%|qTE;K-H9Z4gd!sQ{5KnwWy+A2k zCVlfmb-T(Xp0k{sXKtr*3ZXMU11(~?d#l?5{v5K~o`|LkXkY^p zK8cE+_sTwx(tnMEwQH9-dZx3^mv~suey|vt!N?GFsr=|(mtTwPMQa6j;})StatyPbxS(+*&jW4^f}BtAw2{}WPG3f5} z(MP2?Um-LW)4j$(IuDVci~64ZSoWvnc^2>4&^7& z82`T7dw~ocjzpx1cLVKe#>klM9yu|y+f{3~@UoKx%j8n)kW>i(e??K}pvsxZu;5K}p8mps@5GfNhtSXIv3CQf zS@PeMcpKr2kwZEhe3ZdI++OjGP0dDs5bMTCG5B!S^)d%S^?mVs83Do~LhS0^jM)rY zrSpE9c>bF6l_`X2Wt4%CH;ybGeQt}z7H5#j?3 zSsm6veeopwa}_q+P807)U7Z&eC%Xn++!S`J8ibn72H=ud)?6mw8A*B*OnUcu&3W3=y93R5g9yhes-N@5#GG$aDR! z)3kycg2p@FM5;`iTRt7XDsdI4Gp`iu!+9kAR&??OGNGrgUc#QXNdCj_H{k4Rr5@vu zn5xIE8~JTkxwU1!8x8Kyd@m+1TIkf@`M`Q9j5lyUbW(JKQ&%&bdyKO&d!jm@(vxC@ zIzNm>fu!HwIkJVgb8|xsAxBS8KaiI3g}C<^=U`6Ly>nm7aA$ny-ov-s^0A&%Ic)b& z-E?{L#o0~7*}g6FavM0X-Kh#a^+3N!d)<)IrdO%(yua!_E{^{1hbJfeFwEfbV1pUD z3~*dk#;uNJJfy>BMohe-*kR!`KH@SPDH=J}>Jz;Revkmf1BH9~2LyL8&E?B+ma@PO zUq@#Nvc9bv(m=f%qdO9xJZ8P*qm%w0Sw^$*8?vnHL#^ItMI8qo-0VyQH5DNRP8U>QR8zxaGn=PNZ2je z7sk#NMwP?E7;Nsqcpo;~!HRhs^5TGi-qV~<^DzAF2ln`Kl5aUQLA_MO0#^a$@Ooa? zu(M9vM9ix9vV1`?pF<65*xN+Oe9q-NQs{98e?gX`+EBs_KVd9f-^O@fNnp}>d?mrL zlp18GM`umLF!UYD?QD{$qokH`OleV#qc;8$cL-gG*9M_`-&)DmoFy-+ zEpNj=AjLE9=yU%-iRbN5=l;uW=*;VI{FseUS^# z^MIQ10ynvZqNABkAg$d}={yvb~)LM9qjOsbyg&np? zgC=FNKyLz48;403A?cgKQ-4Vox?sB%^k~0w1Z!Wj<=Og68=|a09+?VLx9~x-Z8Wp^ z_SseleWHkiZN4ixy4RDPJxf`)H300O$f3^2*;u_9l|Fjxf2pKxW-=ySO5rVG#jgdQ z--JI`K)4RP3a(K?3zWsh_j#|C(}|IIxiXf-OO*p)$M=Wv-Nv;%h(mB?%{*`C1C?{nJeY+?{iCd%o$Cc)Je0 zMt9$Mh!;a23YArI={Ngb3{t=0e`-j{w;%amoahlnY7?4nR?zOi%>IG$1u&M%zI|dGU>sEELS2(OeKm({mb$Zr^eW7brVTK*qKUZ*1|^fN z0>WP8&}!7DD3TvnEHte^;yb4195H#++RApB_&g+#&xdlk5n%e>uBRuEuKRC1c8sDS z=wz7tq$MhworNY8d+umDj5XKEnn(EX#7C=cw=3~TFl%1_EZLXCCbQ+b_RbHHo40;F zdX999AM|sN5PVLh*(1~yH6p^5H(5gGKXh(85dm(Nd{((2TGwG97J}vVh;gq#tUaAp!=nexh+X-2eV4GVz!1%Y9%J`sw%75f&?W1{fcB zX2VGGrxI`Q8~95M^9y9eo%cUF(My00Tdh$l!==VK%8s0w+}CQop$*1e=C0T}m# zVH?e``CnQYA)fTvh6+d*c=)}iT9og8fr|Lgs}7m}C~Os_6z)e#XoK_jh6^!-cVR`~ zCvcHEpzB@)<&il7X)H|dXQ!2eGxp^6oR3$PzW@^f#^=@Dk)5m=7x;nb-e<^c>EDeW z2((5qAXENFySvt*7?{Jebt*j7yL7K4$c3(*L_FV!xFgkZ5yN<@Od!`*$XB9tPfiV$ z`@GlRCEG$nVN5u6&&(@k5CqP~D2ZV~1&h-Sn^?H=@cKrH{!ar}S|MX6+_=l*uG@GC z&vM;a^zXlQW+u8qQTfiy@eFNgZYU|J^8-t^x8paPr0wP-*0c<2rS2zFkV$LzTq%l zypUtbhT`B@l1}OyOFtS&tycWQ$f4lXfw`JHTvjQtR#ly6bwF&eswq2gzDOx-fb%2? zP{fc|ZSXC%XD?T1kOt{N4riliUfp;=-MH{Tub9Yo(2(2G5kK8Dhy|TjHHZbG0ZG=1 zPGqJ)b5(ySP^W=~NJhfa7mk0+a6WPi*{@ofy#E5D?>gkWz#e_dE6w)HrM=8a^`QnCj+5xaVGthuN3m_5$Y1|#BQmOcA97Jl z9;W4{(ZE>>pZJXG91Kj=6Lfq{5Qd3o=zpBJy+W{(Kl=7a7nmSfnOj{XUGNTVy2<`+ z)dy=ttQ2tU5VOyyblN6tv4hhYljZLam!F)hK_woT1`PT@3!8{qH+mUVQtCCZ))vLO z0ROyfr~9IrvKO>oA?1yx43>g`HNq$}wmj7^<*wJ9# zqhw;@D{SPxw_|hXzDa!hjXEUj`5*^Z{Dq?t$XP|NV{V#Ba-CSba#Xz^{(6bCcI#Id zYWUQxASl@HNwG%z?6DDda^F@0FBTOR!i*W?>3gu-()+ z%Ga{G!+g3|iy2a;&*d;G$z(V< ztN&cjl0#2@cRY(8GTOgQDY+(WwPXAsh@hf-{qd&C=52(A#VJi_ST!UAH$PrmmUS>w z)^Tm${`8Z$6ictuFJfz6^DU!{$_0Lr7ERj2E!c1&a+y#^0>o8DRp7R0yuBqr=Hz)X zHO1ROQ&>{N_-GFK(o!N<6QNo<_ucahqc>+O>ppBj!dy4iHHMA#q>jX>91uKXizHs& z53e-+^micKE^WhwoFAa(y|%Q9lIThzB$N#3?ZGk_QHj0IG&mJpjL9=xHkokgT8flD zG?gCO?Zh?&Y5liBg|cnlCGR>(PEQ7E6gY1&JVCpes=VBD%I%QPMo?@pymPFKUqg=M zwE5gjgJy27GZonE6q64wo%JS8)Ty)#TT-Moar5jm2JV)u$$GJ=c-ix79pxioEsOO+ z5T`Bdud!-I`TBxPp?jOG@>@WiJkv7hzD-B_NK``I2qhHEh7vrscl zI@EX-qPCu9XKCJAXaO}%k(yW}Xc53U_I&E5fLZc1p<}h*^hu)^Y+|Ea5Ixbx=!$sV z`%?5>ini{RZ#6&G6%8xJVCbqyBxOgD$aK|!_G>x19Z_42TyBC&?iM!Jl%*^Z$;Gc$-1)T%T)N6eur z@uTzN(|itIS+*APPoAHK2mNw&fu}i{4-dcyYSaqBNz^m`e)xOvtX*V*>06FOXfKm~ z)XztLWzY8Sl8cmj@wTPXsJ-l``)T&yRAjnbg+A)Zwhwyry3sr+jQgnusB5bOTS;kl zeJIe1@ApyBBifr%uC2Na9RGAO$LG8D@VHOukj6ldv~es02iexOKd(cV(fp^mi&PBH zt3B2Bv_~$iwd{C}w!pUYDo^KG2Duu4jN>HyW9tdOyOf}hy^Gqd;AU!W^?VA zh*1RAGqSIyG8<<^&m<^GEA(u_Hpn*CD@J5|qKPFk24gL~QDma`@EVH@QeNHzV&7)B z;@^R_Co6-4$RL?SL*G6(_#xX{8q1A8_z{V5827sA)F~Jqb;Vf8{e1DZnjU3u+A|0o zm->^tGz{m>u$UfgS~H>A6S|4{txwdJmPSI;qUUva@525~C#baAU)ix}VAmfr2M?rp z-O3iB&?ibvz>{_8zP){7=P6Y)UgSmIq2D4P?+cL_J;+vuh5dVG78L|~@je%zR`Rri3J-+bAnGS%yRJ^LcaV_R z3%ppk)>V4PkD~fof_J|Y=ZmC=w9HKeM^-A{bgq|KE`Bmqm?Ih$Ut3F88qT{HN5kV{>e7`t12cKH$XTT#uq%He>FOPR z*>OnU7<@7#$vILoiTv{N2*&x!Um~b}mhZzr@Us|3cw`0})qUVdZJ&KbO)9tbTlr6f zSHjhB&Y249$Z6DaH&Giw9SL}NV$CpH5sJ*IQiRgLTCw~OgV2Kr*hn)G{?Or3iLllF zFYp0zDxkW9Gk8E#u4LEq~xa*U!)XU z^c~_|&pvdP51SLZSS_^lSiPQ*VQMs<+C*RLpl}lw_8$I&!>22PE%4*n;&EVlu8onf z@HBCH;&}2Ohh7qG&cC8X;4qmkb41>fidRR5kMGjKSXjeM1qbr$!g`Km>Hd2X2#hb1 z@WKa%0MWJ%Uv{M*OY7@`d(@I= z2gvps+>WNqL{gd(!o_e38jNd89lKhZs&xXh$v8K^3uYgvvTq@i(jWKJFjhswHm7w? z(27uiJL4bu;On0U8%CK6D7n-)qb)+Z;<*a zj;fI;dQdfa1a-hLG%Y?ma~Z2614EUSM2sqJv6j70t=83_VA^&whJX?`eQGb9cx%+y zd4=Lvg^d6N-y7xp~nc(%z=e?YM~34)k1wzn!7;M(8&q{85n4r>1wV!F~$H z4xVOG4hPT04BxiQd>52xXbqfQPS!kL z#Ac($W@9yOS}*+@0@v?hnY$K6|aHF~*!zLK=d^kt#dn zqS)2=fslAKxO|S)1C}Rwg^7_T>A7;Y*9qk6MwT6QF=3{fU$1UHdG78E-520;jx(Lv zR^DA-U};4Rtcn3*G!M^h2MN*@*Zu6s4O1Z$)W`bc9C;r4^=8`dR5YpEG_a3YNnu^b z*m2--fPzD%niwV8SCkETDs2D`cX4{1ZeDS}e7kQFLQ6~@M7vzmR_;hM zTTbTGa5rf3c=juSMycV0vgZP`hCRU~g?XB@;F_u$TZd01M_(qr=O%&WBwqd~Z>^%4 zD~jrw`tRMMj6L_|h1(k}O7l1EU+V|6;__fl!B%?HG>>WX(mYrlr0mCz73sW#SPyX^ zit3ld(~p*Z%SL~s=81V7S6KhC&DK30D*_9&EPV4LA*$xba4Ws(lAg|ohngWT9k^yt z)3!u~-6Kp8N_fmCXIPQawm>NmS#r9_Zm2hS8H-sYhH4aSw!Miq+BOorcLs7#>WH#Y8l={>pXjHSmU$P< zB{f&~Xn3@VUaE7Y9ctw!_Ca5q4HW*Jbsk{c-(M-;8XZWuZvRU zg|wFcw?N!nV0n#%T@HiPtb=eh2M{_=RHy$R9a^pYwR5B`VD}o|o(hRKH8nVXX_Jn# zZ65id;L&VmBbr#M70Ugj;r?#1=h-~F*Ex1L9hhog&n*#yayncz^i$i}a))3Wb7s|3 zJ$km6I(p9w8ny?vz9-V1}JZ>5jS_A;3*fcBVY)-sXP)C)_CY^+Q_vYzimPx!V@ zNS)xh9YU}dH!id^2x1{=cXaG>X8zF4OJW8-88q}#y}Cq5Er3XOT4w2s((UroilQeW zb)f{_l!#Koi#cd+R)WjcKy{Tyfs+_spbj7r-GM?C zjcbs1Yqt)tQeU?ZJFg1qGw4$y7mF^`4FCF@x&_ekMVK5t2U+mWu@6yCP)Q|- z-B$nk(w8PN^Cpa~>@CdLo+zXv#bue9;xivHZ=eR|C?gg{ljUy5`uZ{gL*Im5SA0h{Q{Jb&Adt5DJyR- zF;lx0!y`WRjhH)AH?AL&+H{~I)ZB~_CF%YXm%QeYIN1spu^<;K{})fNbVZK<3Ksjs z19tj?Pm5-GK+@CN%%-c%uysO&PqUd?O;S7g3eoeO5P^OQzw$La(ePKO58nT40hX>% zu9zn6uh1v$O)<7(L@%GUDqn-n51VsP)S6cDkg8)Ot9}-e04FIQ16xSdYI#?v@=K)v zY-T2i)=NT&U@rb49H|?71zPoNjyfWrnsCQuX$pZDOR^4Db0?Mvj9~kI+*9CkR7?wl za)k~zJ=F~43lK%h(TEHS9JA8lDsuC{UCd0R-x!GAEZcQ8`>F0`I7lTIVYSRh{iDm6Pa=|TzGxti@% zC~;U7bi9dOxs)k{8>$FijCrzF2Daifrtn#i4}AP2VDmVm&l24a2JBM!Pl>2eV^#c7 zN`FC@iOMOi(U)MeeMXi1^+?E@tamT3;**JqBV+WR)zQ&*ww!8F81%SbewryT;SlhA zOU&L6STI)#R`)WHQt$;xO9ubw7_2C4H=qaPZAFJLR1jdmBcG!jz7q8y5mJq9{Os(e zCAw0U!`~)i`qQmT8)RJ~>JjRO_vF6yV=CHwn8EP|h9G03Q~v!WS!IzfMkAhPRoe`j zkbbQ1AaQ$P9!TkV$`pL@+j8)aq`m+(1LgCcg?mEu>WR!=@Xr%mfN4=?@XM4d=7)NX zrx4ThP~TeH#{-nse47oSe>4U*RgGS@|sonCx>rKAjICP4`cWW#JNiNd! zlPcGLjzw~_@4kdAW8x@O?&p7_PD_NJECGoCZa^jl=S`{RxD5I3&`IBmeGa6)0M0m0Kt}>VZ0el{=cn`_fzkrA z()%C(jjP7vDpqjajX)Va4#Pbg6Z$%m??|RSh7QL0vMvk z(f8BeQa`+u_qrRd6U3N#PLSrV!ngNJE@DzH#W@(Nr=Dp*3Hcy5 zjH_}}T%ekly)jx~|LzNb{RF7J7j%i#KV~_Uvg)}vkHIwm1@Xm9s&!Ad-U zlV3>EnB@h(z;l{MMdLS3T6-sV8cDwWH~XHDFC@n))kuqQV@dQSMx;cJU|Z&8tob(Q zI@3fI%?%}-#OfeYt+c;%=ccO;_IBP7ae@QNw8|(xh+?Zf^dihhL|2!o}nBR;>@&o zxvb@dqd{IDNk(#ZKT}i7ITt8D;P-@!9UjgcrorR=WZ2T8!hA&b60sa9D&7L3SGGI< zitpoDsk6Zc^eGKxgYlVY9g20!>79bA-%GcxsADw2A+EJk zSsdDbW7Rhj6mxjr3#yHz7Na}Uv6VF)kLN`tgg>t(j;p`av<5}@HBQP3Ok^u)tx0Uvo4I3e%Grd_I|<+S zrx7lB@Nc!Qqp>5{1qS6yeR^E)XxOi1)>(sDUbIAbUmck(u<5-$w$zU1!HQ8*Beq9* zG=`W9?N#3=I%6n>;4lP}nAk_37q%kByP{!1PGrJn!5wySRj+e8;bI58<#p|&c-|Xh zPYtnOe+m3~{rJj`*0&CPpSvoYyAoi(S_RrQ-LMbhdxT)~I`0ANkZmFqdG3$pvJ8(& zTkJV~ZK-j;I>`pfy?D>5rS&pm4)rlCdJp3aT1{!bnJ&s=(=V`Jx){fOIahV)HY(To zK$v?^stK8GqeFUYRg5LGCe?XqTQH;V0M9j5PIfJVbNB}cJNf@Ai7P9O&e#6PNF1>y z>F+oi{Rgymk8Ku$Ml|E}+!Ips+>U-B~WTw98tb-yLXT9zHf zP{Hvt_e=SIkP=7Tmy&&6fEtHu(Fextzu@xe-}^xX)b3v?R+s>f;Ob_q#g4rJ%gCa3 zQG|$bZ5CZdurq({OW`fJfJX=*12)+}T^a$~LVw8Zj>8gKhYU9X8(5=P{Pt$k6}ed2 z%PnC0t5B9?5@rgWn2>ZmP*uN_^J~}VxT4p+B=8=meIUh;^8iko+5r0L4>%O`Iu@*< z!qrlZ*^9qp8zY2hv{BRxpEMCq{F#_7~7wj1Scx6dWdtT;^(t>WOW|{g^_#fs08K zj$OM=-?aYH5lnYjOHh6^D@zDmlDehR*O_o%4ZPMe$eY+Cb9(pA!}>3`@Y745!GE&% zlUYGriqXHEMKaT7dPyw&#|PG9Bxn}xm+R6Bxk!~40NVuMUy3peTgNeQS*2|bKyi*e z-9&QUZP>}6nn5sh=Iw3mN-l}aSVy;oj5?`z!htM;%IhBAA^i2=0E_?7MRalIc5adU z&yOY%+uEf%ZGRA0n7g1d);}H(K2mVMXF(|dKIExP{-wew{5&3fzj1InosU(pK3|QN zoOo(J-P+}Z>5stlU!rPsO1&062f{;IBP)jGl*rmks6fi4hyJ_^)}Bj;nmYcD6pmwW zcrCL`DmeMnoThL0Jem4|`-?;5;iVZkx65|MOmJbD>ZM%giXX)xd<38mMEc+~)cFcE z{ulkgW>SVEkWYD8C@FPB$q8pk!&w@`vAvG?Cl zzrCg+Upc3@7DKn$|Hw>y*LYPr>uT{21xI4nmKzZQ>CQK+oaxfztct5^f-P{`l*12| z)u!{=a6Z02G}k%BQM`T&T~ITbiI%;UuW2#2GXzq0Wov#8#m*3lR zTz=1GpqqH*?Du`4y|4<1sr>+I2s<;PbNDAsuP=W#3Y}n0;sYU@8q5+Mh1q`M=ui@k^y!?svUBsN zvk*qDCu89_ijtw2VxGdlSXlSi0vGdo){$D@CTaN@>6m%?J36VIzrqp@WreaiiYHx{ zK|F!$D_oae%9R@3hPcCz#Yc*Z|^mSO8ON)2*!3jV{)m%I#E@S><^jwlC&U%~$y=&pQbRL}1NX$a3^T1*9 zvL*v4Y7K|=Ku04t&6k{wnqcg6VlB?8AGcN2Fg0;jHqDn3jsanb5OSweW_Xt7tsODl zx3+F}0EVKYcWjWAHOVzD#U^QXv*k`J4svB!oX;r@}{Os&hmRyy60dT4uOed}r{h2=k7&S~d)zF!pCZ@BQh0 z)1D=!M2n*JbeW6EN*YuNWp3G&AO5rN>#BE&rpn|clk`!ZYQ9Zmx%otWB@Rb@Dd7`& zps{t<*|9L8CDE(XSMWPv=@QHMUUG%*B;Lp)Man{#YdDN<%F#<{+mh#=5kbIJQR~`r z-!_!1))58SYCXl<$_f17-2FB6=vU`%c++W!61DRBd;PzbL!yfPF+epbX_shCF=y60 z4SV~*l)3Whp(F0s&$%C^cc6D;FG9$UN}%jc&wYOhueoyaN^z!CJLO68%)sD7HLci3 zM=zYqEw}T}0NAbQf4?Q3id3iD;EQKV=hfxC~=^|G5wHob{oGSdR_E?3dd6$cHYXRGj~xr`PYs#&f5t z%S?_$Kl$Tr5~lqsnpRVOh8B*)C9@{IHgn&eH(dwUTinb3m&17KmV&H3zQs_G4DW|b z8|8j$yy0le(t2XW`9urH-g_o(C?QhMkub^K0~xQ>S>Z0UTa~@1KH23rmb-i{76_uL zf+VACv`m~h9^Gm6kf>&Cv5Cg(psM#b6g9;5IcmYhJHa7gOE|WU$BnkzMS8UuZP0h0 zy@vBy1R*oMQBs^)^LBIz`HiOU%)YXHudA~T+%=A)@kOJ|76*|K?u&{fUZ&1nWjQV? zlc1#!H~$1@upd=%E%86?<#!M$fJ9^UdVYKO*Q>GI7a0J`!Lf6ZiKlxb%J2WL?J+sB zwN$s}87qA|Y(9153tS)G%7d>g!gS;7Vu}q~#%UkkKJ2sGC&L{C8k~YM*8Z}}7`igumLeXd zTAi@(4;v<|9?3A4_}IbT3BEV~VHda5+{yyFLAYDoU($@xwUG-_u0c};g35qa>?evr zRp}7-J2qzzU`un0wqFV}TH^QI``ADC1c6nx*EYermvSG@9E4}>lMQ_~zQ8G>E=HRf z8hXua+hyd&Fx4lS-Tv&u(K}=CV=ihK#BUAe$K7l#?`8*zfUHIc{7Z@owYr-weh(LL zb1yjJPOFFAPw4Fg+c=Y>=QEMFn1AyiS8ESYMw$YQHtzDlXcbUhSOW!zuZVBTnkWA! z!86h9SwXahk}8CViQQ$SP?x-$p^*%13L=aNKO4*ce8GXh;4lht!;SO zqwW1i{YU7)=dhbEdlkJ+7^4xyc)pwFW|GU5BIv1R-3trZe3 zK<)-9xw=(-V32HaHzDuXyNV`8S5%oIkM}IByRU;Z%f%Dng0B87l=PGUW!!tM`fr0OHIS_^96*z&=a^af`jB zYr4qhd_o4+GU1yu{BLQ%ob|IuyCloH=duoYK6MF$tyU5P0G8&}mEXAvXFJEagQxj+Bit5?Qt?gtqvbp0#?53OVb-CAb;=U|S zG#eQ@&Xg%O&Hu2$i42(LsoC{e=>7efNXOEe7Le7-s!`Fcq>DTmBVY9|SNb9C;GZJb zj8(bk4?Z-ZB)v3TTWe`knYd9E8hvCq^^3PX6CRVh_vWYt`|7V1WSFAI;=dXTAITPV zLK|3rqKq?Znap*4irkAr?YilHg1TWu32YCP9376N!{z5(a;a+Y4810?KKjT`;!Znx1!;(RQa%toAQTNCs1Hk0CXL$)chkBXyG6C-IA z`03lZe>eBR1gJVWdCo^ll9O3YO+v*=e&(FS4h`voOHzU|brcNSmp3I%G?SiPNjJA%;oE%$@c$4ZUn1|0An+tZ#PEJ;wUxZ8KcG~x?EZY4aeeL&t{8%6ieP8Y`8}7BTT<(L zR`oA^M3>0JwBm+rL%vW&?j^%3}cXyAN6v5VZXa)sZBgLDG2jPu(*Gla8r^3u82jh5dAPGrI!Bq>C5g=1<}S zCG$)=H&3*KC&7>1Z10a?t=NmWibweBP-EwBa?k^M5*U(Lf5%8rNH5)i>9Rnjvkdo+ zG7c)YSqgo@pPM!Lf-dle=Tne=qO5eB zvh9e+b;p7PuZq50oN6?GOSQ1Ok)SBHWROe^+K4UFaOznSO}Ujn*^X@tZd^kX@yhsx zD7kXNXYi>?t}tw|9JOMwWL%i^pJ3@>?b>ra;bQ|$aa<_NLd1jO&eDHC3$EyRcR|cg zAKb7pn60V^2sPfv!u~d#mxtL;m}1$*(56SD8FEsU#mG=P7Aa5XIvW9v80~rkI*JG+ zHs4PkoJyy3D2kPEf#u`mJ@TcH;pD)T`qi_MLJfPQx(=GwS`@(aPk_6IuL*X0ji&|F zb)71?9URU=gZ6&;9Mj>Jzm>cYPid0h2GpVW$3gXQ5Q^8lvM)@_J zKGAT4){#(^)HQW`o(=Ct6W5qwaUS{jTg7(*gT0;aaCd8C+}#6py=UMOVa;TYX2rmg zNxRK>$;M$MhUP38hXm|S0ALp6kGb}ayT1hW6vI+cXUM%}(xYqtO&cQNdHxZU0-)q{ z2Y_CmIy2qUFo zl}ppR&T%!oxk9iKs&q>rJ^G7`13estdCL;X!ICLw&rm<(1*5yiHa0M}&Db4J?FUTK z7qPJAg8Qe&PvnaQjM$8$_P@Pm;$^ZXtfIL9(%{oKv?N*-3hvQbm0ucG0oAOrxdIt)BaQ76KP#N`0C@&w1rAx^3o`VUnI+izJVgslqHo2%})364aR+Yz-1 z=MKr_A{OqHu`92YK-RjwrD}n;ahV1wV^7D8{9$Gf;}t%@t#KR=;yyC7m&O>EeCuOwyvv85C z@OOt0Xh{auuKOce@9E_#Z<`RMXlUK3?~-r%eg($>TM-8&ignc zObL8E5(zw>goCn zyfwU=Gt!YBwzN3=>nwovog=qCi>9}&AEH2y3mg^|8o@n|O?6C}NCefAk0qBTSKOolv73|sP5#$gW|y`r8c zL{#JP=?}64Ph3#t6)|N&gyUOo}mJgZ?DomxrxVvJ=>KkPrQ0l zG+u%8a}`5#C-Di{J%`4cO#+a4dBM$1tqZaGD+-z z6yTdUs6w0888H-P{+qy4Yv3fB#*=PZQul=iO)`gjkgzavHFul->wiIA22mK%IG{2q zPwDK-jKtDlaJUWnz zg)vcdw|Ig_k|u&@+J&plX9iAJwj@22hMIe-4V|{QXM+YZfFTAOjCSukP;5QuPgRu| zCs9Jtrc&@A3MbmW)1gojh2Z~`&hE&~&L;FzlXl3A{@K;x^#Ok$qK9a=VC4jZifi)zfVIlFh4SA1rq~!7cS^)C#MJ4(>t};;1wo=5m z5$lwsmWip53@0}$ew&|7b>!9vhr6aMq5w7T`YslwRjW?eFRG>_BlV?i2*w<+d8TpMBHi~llWB4 zw|b%F*yYt=>vYXc*O|Xryc~y^{A2W_CU7?t`;lBtFOBV)omroaq}hHVjK{^E?|FRv zGWBomS>d-zif!bOgztEV`mGIXvU+XaSsr-D(p+axp1RYm4iSDuP&4VdDe1;jcRFp2 zyJJYhLn~kI<*1$zVMXv<_Pu+L&`<73$6F%vBWwV!F}qUzY{gVMqWqt<2m0cbh7cDg zdsVGIxB04;8iSD#G)e`3zO^hMiP_Xb&&`4h48(fSP35w* z$Jr=N)S*=OaQE<Kd~d|}?k4!jp!!bO z&Gi0FR(mfu4e5VOji?Y3h8++x#%8>PX$}Cs=8@P`xu$d9b(7d9`=)$8Bh2y*!76|> zM(HVAhPIiAp5P^eI%A5JUs*i-a3xJdP&QfDuXa(f5b^)%`nhNB9&~OmBJZn<+vv4M z^3b7COnEF8Bi<`EH=<{B9LwyDPJAVU0y4htMmt8GFPR3N5R3GKmoM<2Nk68%z}HX_ zXG_&hv~bRgm$GIbP1ehP`$dEnC{o=LbYMral*#Hu0exzOelj<~MHXllt$I_qEmFMF1mO;MQPSb7Bq4 z9OC9OuAGjVPbrfAk^A!HeA#6Ut?4yMz%F(IrboyjIp+hCmN`bQ$%lnP-fC zC=2zUG$+{H+)6+M*-b@83mJzXd}jN-Z0#>{wFW1=8^9{$##(WAS1OXGBP~_)-@mF! z%(~-vfeM};3Fy8kO+L4l2cqWQMwu^U{l~(NNu977HA2dglKemxDbM>Ax>^q)uqUcG zpLi*iijW<{p(0~xY%R>sd91repPOAT9*ezLpNiS*gOK|rLx#q5TbXqO8#2UfFU(po z*lZSCuw?R@&3Kiq;I0R0hQumm1&oLEf%E6e#a{apz3qJu8F`9)jS$*5%AOyD{QEk4Nr8k-#DvxTuqXp)C2pY#5VVI}$#W8hB;~8k6P7)Z?k!{56J2O`asFdfzh%_n+R;wtXiV^BW__+ zK?gc3lp@5UroglJc*4fM{W9^n@-(}<%_VAQXIC<*#xSd^KjX8QL}%(Aceq*7f(D}h z%0Yc$Nl4=tmYPkA`AHUa7_(g|V|M$4Nyp0-FrxFie?l&@N5ZuZ=_uzMJ$h%@_pBd- zi~I$2!U{E%J5oMVQQBGSuNV|UaP=ro5R>(b99-)=P$jbrY)q8EIH67ys^mgC?PI_2 z+e>So;#BOuZ6w!vG(1&{?8q33BYY>wrP?*mbBfl=)25%gPO9WtC)GGqu3Ya?GbW7QFE3nh z3eq%%L)c?7_H1liyCJw9Rt`3!ha)IVN&;0M(ctp&IX}?p)b+3`Rh4vbY zY9UQ_!mREXIE3o_Nrx#%p(4;IxN)R1IDDIW7q?&&?{3L^**cCF{8hdp-mNPp;3vO+ zh(*n5X{M#-FF#Ws$O@IBo+=5BlJ8DGG0W1>q&jfFGU;Bd`w^jc-=W=L&O_^}?GsBe zZCixX=+f$CCAL+iH|(M|eU0n)ibwQq%7<1phrkgU|}c#q~;Fh>VbJ});$03M5kWgS72UgfjNf2#9oMA36Rd>H1Xl}!yRDfQ z&!_C^WE%VtNQ#{1$`NVv(lKjH15phV-7|qp?z3N_?Tby@D~cdY7v4J1rRg|#GOw4| znOrEA;yJ>4;p=1!YJS(a;-_}5)~`QRVXF-KKb>na!K2l7qE=J)1h>9dGkyVg@i+Ke zEalyX2vOEg~tDdGT{g1+ASN|0vw5W57H&0%xqd83_$7+Mfx=lUa0ZmZQ3lB-a%& zYdGmFa9MOfTBbq_B>kxLOpF(*gF-*o0B>}AEjQyPU!K!LTr@d2O-m4ky9(n<;ZnE0 zdnmu!-$S10Gx)}DpV&9##uBUaWaEdrP-LcDp+^}qldjgPi$^B8nUQpiar4Rg!#sv0 zB{b5#W$MOTz$H>X`^x@GACyz@OM9~J#%yN0qq}T?<{n*1Mqd6$DDYE*`|7PAl+?VB zq=o|B*7`8sR2DJS%y?yOO|@YT+WjrHqVS>f-+!KY=LdW#@`hOcnFvpnN}UhWi2A=b z=zk9STF0*vcdEy5HzhVc<#Bq0>vC^Qe{$u6Xt(R5AZMC}s;2o(EobzX-}P-0K=wZT z4Ymyk;IXP74GSS#H}4a`GEWOrtdR5(-W%cr`lceP8#OUTlWyC6?@}CA#A;tW2lD)H z4TEQ5zb~LPo)cr@BVE%#4_*VaO&(5b0lQsid7{;;zsVjS#6z|qm!#)lrUx$wC>8Yx zv|+dE3o<2YO7WAg{;h4<3L!sY08bJtVs2bqtjo}mHf%SW7H~^@{PxQ-pL7>^DD3s948Rx#}PONKW++%Q_^wwAo`-Qj{G5W_%vXyN6YR;)50Z7#Yy9(q^}-N{h~I z%?XTZM^CJ@SrfD!YRVq_K2eZV*_g(*GqrnlmuJM=Dd)BYJKaK}ChWSjzOjnS-yuOe zdp;uRN^tLjriZVbmyx>dNL^!U-kkUkT6Km`Dgw_8wgPhd)Z&JrsOIprGhR}k1dW`Y z^oi%(hGLe|h(^+O!x2whBTrufW(2q3iVEb^Izenv1E|d&+@Cl4MBT44_8{I`i*A+# zAq?0k#QRk@jlHFqKEF0U$oPlWm|;m3e;YLtH!}A@)Ti5jwP(XjCH-S=)7LG1^pdHWt(XOtb8tVUjQnOSodGY{Q#Mk@ z*G&w1%K(cuPC4*klo^^&AYou_P+!~fA&5%aoGA{gotbL1?8hg+LE5u)CakBDEd$(M z2=8*P>(|B(xAd}>u<{$L8F@=>?*})7)wYN^JQ%5YJv#WDhE7y*^Jzk7$TL-XlG@H) z?>_b^0ljtEr==mxMzy|Z{a_Dk#=~{32k0(VGB+E zA~=|@-TwW>C38x;FJPAl&!fCQIt`VzF6+*auV8y(G2~xXdi=_nV~%CjY8K>#7Ywnt zppyu14qO~GTJNRjh_L6|s`vWljQOXvdpJ;z1&Y+AX$tkx92)KB8=pgtAw29#x9dOm zQr?><0X(v@@6|7IoX<4pHk03Q^I05L6I+JjZ#>0K7TXoj5~i7m93ct+JM+d3*bZNJ zT5K#dbG3F{_`Jky49WI5IWhe?_+%t10*3`r1 ziBag6~ElOmor3{%RchAf8{xm3^Abnph~ ztTE6JPS8t=a}OaP_f~qfwS!J~fEKw?XzUUX#xa_y;xPP$!rk(fIst3VgxFehZ z;+7XP(dUM`BUCqQJ-tP$W6iY$foPtOtZ(Cng(Iu^z8epwEcXpB-~@A|884V@?^Jw0 zaV0VWPFT#XO({o3e`^Qo$!XKyS3`>EaBAT9!=Y?#mTva?=&lJyAWIY)dYcs301I|z zqv@qd7VFU#b3x?>cd5(p&s&@;`xea3(&ylv(X`nI;01dpsN%`u zL2eVHf=yIz&Qu6$DHAAC!*!<#ZwX6v)c(K!pgIYs&TRT}qpgueoTAH?21f}m9JW`p z!1w2qnzJG92h^TQ``F3a&k(>qn|DH>J&t%~NPmwI^^LpKc^7x}t6RxFWfwBW3b9`( zfD#cmL?`HZx8F!-a=&mE4?L-<-02lj{ev`E{yErc&~fneGfZ6@T1L%uExp*UY_$qc zNS#!^J2DVlYRWYOoZwfp<1KAmmKo@zpde5J(yC$Qgiy<4Fku!^{A4w z?E1Xd+#NW+WWtrNaE^xEcgcciqJB*v2vdSERf(qPd2IlW;a=|kD`2+&&g2@AjgfXI z6EKQ%e!kmVJFLF@Ctj@_utO$dsn6oSPTEG(26^nm!dI&S3(ZIPq0+uYsAO1|}3&KwW6;e}wDR6)R0ulZief9oBU zOmR;WgR}20;L8tR5-66z!8Tc~q%8i#?jw`~=Cn+|pz^E&b5Sz^l0Zr%E)E(tM9zrH zP}8WsD$cC-LzE~;PJ>;(l+nvS++BWv%V^Vk{iXOPbsC}^M7V2l=exXFmDfhqqrFJ> zB(KgVO;wq_6f8mQw5&jQ5O_dhfMq3hz$blajOWSgE~WGLdLN_n2`MF|tdNBwbT&Hu(KSO=ak7r@&=$5Dr@#L~i zA$`kTW0XC)nL!zK)i6zFJq2$f!|oAeHlRF zUv&mAzBR9})Ihg<7!<_%sWY=u9i@4n^;clHZ-N%O-Vp7)?HRKfx*kK;)YYxIl?AQ| zJS>Y(uUEQaNzOYOVHo~Ng|+nLY7pD{E7OGxQ~Q#G-%t&dNdwsK0T(l~Qug?WP;1^H z0O@m(r=3-Vz8O{%SO-MIf;cZJd$aTkmtW)bW}X^lN_o;MFS9X9t3c5R%Rp^Q$e6J~ zVsnB?3utouAxM=@DiKEb1`>(tX{2Pe~*v*({_OpcvV-xPn3FcYIlO%5hRT*kBj<)xw4Py_ri`FL*r-- zN86P0ICX*I3R{EjPLOG!ex71ChXAcm`WSCvQyo8Wzv$Iej39aA~^wl zc?Hgb|Mo935&U`#B^$S}O4e){+eb}{dH+J&3!bhjImN#iJa;r64chCBEb;KEcp3J8 zN>03$wW(N&f;-)cX0iaAU>E*w;-;hfm(EmH+5|J`0|{r9)rdOf+>j{IqiJmI{G0pQiM5s@#ugNh&=WL%?;iDsg--H<)e? z)A#fwY0~i9J?O#qKx{z;Av&RHTK|K8CikLPkeb3WSD!t360Q6ZX64wWB6|_e)@n0L z47DPkpM7f38B3weG3X`%17|V->GukfZ*s_Ptcu<~Dkv>@rmE3#Qsl-OPKj)m^{!eYo!* zZQ=`|2~y3(wnlIpe%_9~4dVEHlbZ+y$%>gsf;~^~FX|r$?Gcx9T0&TgS+&}qA5tB- z%)_)eTX=`l>#psrKt^xt`2U?1@;xq1YqdR28srpMjks00m!nEy_!ku{Y*=&`xl|of z*uJ@$ccu0SdKGXP&I8f&5~;}WLWI4$#!Y1II{m>Hd*E3D=ac88$v3_~HDo>9zgbi37Tlcgr}>xBgBz!4w)MwxAW$2{L>Sg4 zJGlONKReDWPY#p>9Fj%@ef_IVe}mCpcvzO`AvPP|DW)S#iz~W*z9G@c1+!_ zOV25E&iB}z(SJ9#bk>05VWzC~Idn}l1L4_v3CL`Md#m2PzQ5ouXG~yq!{q(CqdQyX@;D_s;u=F3&N@Myyx$&0M3xnD)O+%Ka zbK#%Q0 zzT-c)spD@oUy_1(tO*`|o!!L?5g%z~JGPBHK)=Uy9WsLg-H4mPQi0nr2Mtv;)@ z^kGeF+F9it!W?r|&+BEw68H_@vf^$v+>@ln`xfakvVd6AW8nvBu&}4vs5QVeN3Anl z>hGEfrOgxPSt;;kH2}Sh>1NW!8dZ|g)FAM#d_$Lxw^_N!GV~BK=xw3>F(PisN zTBhA_eG9s=c@*kllMnRKs~ND-XhU~Dtq&r&CP zqc^c)%?t5py|`Z)(9}upoTG98GM5Mv=SmW@^kE&6W;VKQlPPo;^Ks*MFPdD|dAW;; z#xm46{9B@&)8WL*P9?UjR&T^&j1%yp8#{CgJ3c6}jq>mNZ~VK{PVvQ!{W@Z=9vpIw zKeEf`&$+xDu~Ys}t~dnEsP~u72d_f?!NuPb+s1pd@!E&=y{ZVo@^a{RdKr0{jHZ*` z|5~}**Kv51JEnhGb*Q9f_;}X%Ssqt>?p%x^n|}Fh9&a+9HcR!k^~}YN?+>0nO zv3N{pf4k~v#2v0y!I1Z}%bZM3yos*j`bJM*{qqk#gMGTsBZJ7>c(BgBxHdyJdm)+= z{*UBL1l%aV*;71LT`o$AztpO}oYClW{4M4U?2 zbKL**(wQa;*Y?+!7ashdus~wG^qyMLb<(Gc9po97`wq9~!iASsoY%!a&UpR;w$;N0 zsw<_c8vjSsTgOH9eQm?TP|_{kFbpY;G)Q-YNP~o=bhmVgAl(QO(j}pEmvnbYch`Hy z@BMpT{_^9Tv(MRUUu*4a)joDvwNA<*iz6TCs3RP(De{z{sH<}#3(;^wX0^w?1wvJx z$PMg#_uO5B)ln^lon#eC&_^^X{vSMVO%B7v0!JFG#*$51eKK_S!(Zr|!m^W{_-lcyR`xxNA>|ngcbLZQ{R=l0oyI{B_t4%u5{X z#P5;2i^Zx0J`HSsFE8?7%zk{|i}b3-yt)d1~Wak6lg1# z1=)xxr%u#4y|U{NL97cOo6YqnK0K!E4eCB4$%~y%+RFO~y&qP_3yG>jF;||+uP|d@ z%t2f8wq^CUv>7xixvYt{zYRb;WXzg=#h?6swKQu12{9_Ivsx0JSTR_gh!{}?sw28z$w=HQ~nS!sOb{OuDeQ~ymC7gd+ADS zKE3w8T7dUz^PfgfTz23P_X#1#t#hGY-f_IB5ENW6bJA5Ng5ULuzf0vcDe#A*C!HVa zEK5piu?VA2ZE0&T{&CL|c!7bNOL+#d+bbvU5B~~x>?ziw-YiMRI zP6??5N@Hs=xlXz88Pnb+&v8DEh>2w$m8DZ?gy*{6i_tL%{tF9E5_qb;p`ej0Yn{CJ z3x#_3w7Dnv-U|VWWX-=Pzbl<8htg!R_`Nr%*Voe&%q)9aA*k#Rv{2qrypcm2xEroyZ#JMJ>i@I{tWG^3GP)fJXg@x3$FkeOtG zwg{XTi!b-Vh9?gxL`a8%ik~*FO~hBeZXDNG8X=WphD|~qGSPfLIM%w*Z6G6n}F>y?w!ezf7WaTU%#=PO`*SmZ@5!80V*+-x#fWj)TzPOwX-q)`*kHICi3#1T6Vylid!3nc<4DClh7vpR0Hr zeg}tKRm^J5k=B_P^gP5AZjS^a4hjZbghJk*Ft!$*9}5Zf|LQ@KGvAG_%zRC^K6F)k zr1VmyO-gnwMtkG9 z=H7_I9jJuj`@P$*p>|t;o+Bz3o^jBBQF7g*u>0nwK`TL?090WnhIFWw@5@kL=(@iD zB&OnB|NQB%$klM}4_&8L-rQPPNRq^rr>Ex);r3m_%)L9wq5pI|FJ<~M%P(PNL~B?+ zZ2jf8Gm7+`xh%S-q>FbgZNrs0xkpaalaL+0O~*~m6$hLe3pPn;HQ31b?~9 z3ca9p{hei2U$EI|GwGov!rKvhfvyp%v(LOHMhhL|xzW-w4C` z1v$Rt9w!-1J$}5Wyl46RYYq~LC1{^o;MJ%j(~e_V4ERumu+RLUOd_d7^L+^L^xs?= zBOfPiuYdj-K#}mwwpyGW5pZS|U;Z@XgneL38I!&6S)W&c(cZ<=tM%8jRQ*LUgeoh} zHVXP;yOG@bXufal`C|yh{mB z{~hL+Ki2f$>K^8_N`AfNUKV-T>jaSWXgpH60usNR!Vj5V^)Xc%ZKsQvTAuo;>kf4& zQXq;if0GZ`x~yS|3O zSeLAaC%~TYPMi%|_QA&@=Qmz+n~(Q;t3L65vx4bH<|<~muzPB~+z(~r?1{_2q@bT4 zM?H-!+3p94(0QwP0-T$)j}S?co-{I_OO&7iUZS*|LuGIu!^VD3#O(bIIt?o&mAT?(9UkZ)o(Fi!ig9@~6T2lS!p9X^$ zmLu3#P*MITMZJME;(PrchPkp*#m}y}Sl{mGMC4jJLbQ8S2SRK5|75t@73(6eB|Lr? zIPV{|K2ReN!MA$eD4*fNNfseJY=z4kdEZbzO_Kle1D?Fdi%|>i(5?ZMDMi1%$k&Nx zFhZ<)Q%4#s$HTH_lhq1wL(9-PRo=cZjxQ)N9jiZz{+UPz1R}_G;o{tfY$As7NFh55 z#5(N^V!>ay1{tjJ+#GtI)!%?O$`PrLWZy zW~}fcC89is0mY3NzTn^Tb=84PPOJtGb`g-4VR60L}4mfmYt*Bc&g& z`Y>E+&BtxT;KavNWi-Cm#gpj?z+IuOMY+dsu{7S*`ofW!@MKzh%$jLF5tgPHfPB!y z1*up#ldTo%KQdhE)=yWhWn3Z+3-&ert*38gRyDZ$cY@=<-BOU#Pua#HS$e43(L3>h zLmB&O_m_2tjxD2&*VA4oL)QE!=B2j-lj|Ny3P1D-dwz`S_s+f7iEwbdO2W(h)e4g3 zpwS}ZLd{02^?$#SY4sEUW$Y>d1brFw4N@4;+q7%L295{B8ZFlXtYK(v(S4(d_i~oQI(3Xif$ZRoE|9UVP1iXax2S{%DI@dzXDXo@yawiGjI#f zr7fwq-5KJO^UOpGX{~dt82c@6eU|Ys()_01siJOCklSul?$v=*t{$_pUIdCUrFbpx6FEt zR@=(H9Pus9(oDZjH~#PS?v7iC!#HG-+s(I72F_t)=v~d_bEfqDv9cGLkQ-u~)$<{f z`mr&cb*faq`Lmyj$2P9q_C0A(!@}Exjzx*-o<<+!iUEpMdBQRApX~7y@CS>PET=Ya90+PyX`S_3s;xSl(PooF^nf!-7h!hOytME?05r zQb8+l%e!LSYlD>+X(S6srr#z7o1ErkzNpSkICwbeJ2;O1MVS{ShU`yKp_P=AZ&^y#jYKEi8hxgmQ&Ep2T; zxFA7Wn5#VtL)3}4=e1>|k&9<&pL^1BxzbP1gFAJ~gq1tl%YrM@vq1!pfb`vi0)kgS zAUR~LsP_$hvc0E}z=O;Pi~E@&ADnV+)nb%N=2H-l-tmiUmv7C{1F0tob^B4LUeA1o zQbN#CoUPI;(T>>uH-$6%I#NJ*1}~=cqqq0{eHp+0z~&?6EU|@aK|(|YO2r=t{^@31 zLqC z?`98Fr$W;753bdjTQ3Dwg4ys@>Ka@BzS(_a_og4n02+8ctmG*_pR*zxD0wHf&+F~7?GNWEuzLKJ9i{4Nc=D4Zk5eGVU%^kGlT)sIT&3boflePZw zZ9K02^!*`9gwW-rD_}~ppr02u(!b3-VYAqE5P}X4#hj(3@28g+jW_N}1C$UCwwgzzKtor_>%>T)Nd%oomunPBY8ju^7lBQn`v~3egN}B+5B8Jg6yAO*gbc&jjP_k&hV^`@&(tRyab;#B zo;54PTk|1EXsLJkVyou4xJ{?`ANU$mll?>PF<&bjl@iTY=!hn$Vx|IMcPUGS;EEy$WJdn z?|C9hopq}e0)@2pPdZ=vncSA3l(3BXsouE4Plr|j7w7E7Kh(2&xFs_8zsf0hvxzd! z?A%Zd&p@dF{4kYGen@N8$r%v5!B1FW8v2MXuEkgE9!TijYd6)*`^Qg$BG4K`-r-b| zqMFqri$TV%zW$**FH1OY}2XGKQgq@R8dtg$?;}&}h z(>Gij^5h;}A6w%k!F@BZqR{#MhzKJ8L@0L9JYMbT>^X#CIWnvI>_KpjT?cyj!eUQ4 zzoE4JObp)+958P2%F88N(P+=Jhc~JJWG?WkqIBjMh@QhCw#1NTBRTl72!{xw*hy?g zW}v8Ow8bdfqVHdrkj?}y9qBfK4|n#){ew@4=zn6gWswb6?IZi6)cVuWsu?`Ed>?q3 zE%1n#?~4^QK@^k1y4P0s7$@rh6u`*rpWH87n50Y#{PcS5Y@CVN(airP!nE=C;$K-U zLr2!zx}Pd_(`P%QyIw4%O2tJ=Q27%ZK<*kJ_C749_d5*t5Kg&tT6c(oRs}mwFKfj_ zNdG2zm)=T@Hq}qIIM&+Mv+KH?;gH&O^nJZ8*LH`;8~ePIyajrvUo=>xGa0@=GII5L zMq1p19^u@M*}X3NZVZTmM-8y3x1EwTIxa`{7YEww4#~2^)z33VQBo{vQrv>wo+!w> zJ82CIoJ@h5l#e%2cDn-MJ|eqOcKR2sX(z9A_Bv&9Bi5-clNz8NgXD8KY&`t_Nl}NB z%WTUfas`pTsh=~<&sbMTN8(Z%-%s^bk@B(z8AD`j4|-RHAv>+vfyUqie4tBTn$L+M3brik0?9k`9*0eU;txnF)m%*EX>v{{aW7HKWKe_6fX^CE0W?kBA z<^QKaE(0jB9UI=l2^1S%ht}n1dUK^;HGa5St6;~!jJJ5P_w(nb-V<`bK>E7BvwEa& z(CLw4w%5CKY|vB6o`P?o*>bK*W9IoFBHPTXKTq)^w%Uk<^$ml`Kowe7yZmI%C#DyK z9q|`B_#%k`kb9f}m3P|PaH9OP^{Z9F%*DT@RQE(xkv>UGCjFXm476`dh%dV4%_f=L zklM|u1?!a)Q+o^L6dg+@(WooU4zdU#og&0L=u`m$&Fl*wv0oD1?)= z%{x=L*#?h25zQ#D*MIwdaIFEyZWYy*8B8@Oirkwc z1)+STxm4*ZZNCn-t5v6}X%H1tKwgW&jy406P0-DL0&1<46<6hlSvIR19HF>Vz7%r@ z15KI#m&fI&KD5{%%#R~F9Gzv`JzN*pp7sLR6f`uq>gI(@@DeP-1(L2sT2sqfRf!JQ zDufn^UWh^-X(Tf(&gKeuA+6Y!2C>E zr@zs)fcQgo;o23zsn3uJW}Cb)+^5qsdkw#<)pCwSmRf{ zVWSnl+}xWY6ePEVw7|FZk`<5ON#ASCMn&xL`k$;aD+~jn6O3Z$W$Qt=ri!7|uirJS z&C&73V8!Nmt~D@XEeCFw5;k8|Gp*_|IzZbF`X%eW@~uq()l5AtYra%}G>*3yRWwV* z3oTN8+!*0;L@6Y&RRXVeE*a=sO}L8+@sH#-n-E-o2r5CZYiRMNUOO^gez@n=F=0c2;? zly|4rUPTkFGe6a z6~BlQDXMGILuN>;Vn8vby^z_NK>p)cvB(^j7$5DM&Xkr>B`@^o5dqiP3^sfR(@{uC zmVDFMHwovb^w~U+i? zr>TjOIaleO>Ii&Tr==^2o+PUU#o^^Dos650N@|8^Y8h&6!%C(h&u$wht+<4&&q_Z# zJ6z!neFrn>pxX)?Z?%04;)BrUB2z*ueecr|W<{jj)X41y_%=hg%X9qM$8dOfE1%Yp z`lo26f5u|;ir=Z1z%z?VV zwE4gW8qtrMR7)Akh@i)ieACJ&iIw)CO>JLFnYEp25C!d zk^Ffhg?MQv9psk(BVeC-pt*^e&s7VT>0lNm*F66b;%1hYY2!c$WXILJQ-2A!U?F(z zEtNOu*{IH|$X!Swy7C679rV{W=Te`Dqzp8g0#1fYu;zX_G$m-YJ}1DXVY z4B#Re9vKQx9KPJz-Nqc4ioLJRHf6}~sxViMv2p!AHn%~d8u(-xeVk_C4WoHklz?exk^ z8$4;Y;q>A3K{NZ;&OJzOl=5jUj9Cn-I{Y=MQ7yFAJl8PiQbX?0GYFbGER#|kNIWR9 zgDJOxL>Tm64XvZcf*uA@=x$V&!E<^f*be0 z6N<}5ZDIhdoa7gRWH5`qOaUrWXrh&9cY9(WJ@Zy{#h~#;&Ah{FN zK2u8v=>t_n$N@9{I6Q`QpQptdSS+C7DD3p(KnX2LbFK^XF#*Jyr9%C~E>MfWiMy$P zM*0aUh>TWzQr0P<|MvUzIjRIOG`@G4_%6H3X2WV`kR(RCOm07q9a`kQ_V}KsbWjns zc0|WLlJ_bd4xX_*od}K6Bz7FhA!QHyXXXsS+StBO1PK#E>K%7>Twvv`Ud%6adt0mT zN+X_>yv!58_Mm)mG1*LvQf)BusZ|w-cq6C@Ph+|uG#-5L=}Juj;c1P*(s7<@w-7|K zQ7h~zOv(_*LY*tYcP*MrD6P2Wgyed8;qVro0}PDP!N46;DQrJHgf+J?VXzG^Q3%)p zAD$cdRF41y;f?$HPITdkbc<=GUr>K4ic5W%B#4GBv-Mj}{kzwR57=!`>ENPm!_ba= zdCeE})Jz`SXPX>i6j&Fvm*`kp3JXD&GE#=unr-Q*D!1SdfgRj046%%{q{EBsc|GKP zOSqCB=_LSdj95=b&j!;t6u+~;JJWbbdwM9-)F}(;GN`^PWb&}zgb4XB&COAS+OEC} z9{1Z7Ie4`@;1QvI4^`ETu%2f($6^G1EDuo=i~DatYTVXQU~N=iy53JI&8c_!E} zvf~37fqv-!h)t0%Y2T3~a~BT$>0kUGh5q+aG@v$^7C=J~16rcSsAyU}}k3W}e z>x}^Z*@t>-e2Ywk2-Cw($JY{KuzRpQjEwQa0YC!J!l9>ze|jA(275nQm$mr*XfW)5 z0hP%^kUf1g0%lPSSOiNM4pd11J4i~5t|a;YMk)Tro6!!%1`tZZ4JXZs3XJ@oAjFv% z0ro7|U+@sUV^m0YR$me=>uGRs#&R?f{)Q*cKd;zW z!^&G(B#&gd5F`a56x+Jm>pag-&)}tMqPBJa=VN_riVYMt{8gfQ7T~^8UT9y#eM{jW z%)X3ry@S%jKk2Re63VmHloT3rW3}DdI^`W+4@uTa%zrY~@YL|FHtKCj^2gXZ z9@%}@s3U(j656K=x-#F#!-=Q$qx*b})U>s{_VBqLaWuB%8()j5?vfGj{7RHT0Bk7| zP%6j#w0i$pNa+4Ky2t-&0SF9U6eaNMVB^FiYD-M=eAT>5GY}ogi1rm{y+V>?Tc!OY z2^8|8i_)RQiCgNq5eLjYK7&B8YLs>x_)UWYdP&JiRa6D3&G|LIW(C;l;Hs#npha;S zBVNXNJ!BnX%~)e-E1qFzVu%CBd)Ls=nP4ahLom^{l| zyXeq=R=c8vEnc&(J!Rl|T1A@!0bkUz;RmxHE8!OJLR&OTg8WKL~U?(%VZr zl}y;q2zoagDJiLp2Yq-eX^-jj^vr$4vE4=7jSU0gd;x$D;Ltc8ofPlBcc7JnXUp^( z=J>gQG{l_LcmTyC)=-wKyGf--WF~us1w9T#TU=wh^c2_cVj9-xl*xWsPYT2lIImmA&fPHY=B;5=E@zXc$HDqG-PFXPgpXI2Ps39c4lBC>NEddxc4k!+Eb2t6$2kYcB<9)vj->!&A z2EU3e9TooL`w2Epon}N+DZBfg1iI|h52T6(>HteL&N`h; z+hF1^IDvGIIaJ4b;atH19MMEL-F>vGH^m_LOG+A9oy&;*Vd*jUwX8_LSb0IVwWuTl;L&CnXGi6ExkN27I*~?LQ|bJ##&Q{ zVhJW%+b&lc0Z$^R&8jd)!&g!wY`{e$SMqs_N!TKtumtQ7oY*1=9gAzroJfk#XC8#A zW*Z9FNWV(Ys#iz)TvdcOYMcOj!|Exo(13cSpvU-^%L@GL@&;D5qQ&!~_0Nfij)vW& zgavtyOzIn}Qr=8Z6&fDpVykaZo;L^^iEl{Si0FxsL3!+$K~*62*)NF>zxv5^@?~4V zAMHEsZL~bY7|~i{Ba}R!U7!h4cO}T2{cj(A@SNRAn?^pS$P9Na_M-lw)PV8 zM835;#KUZZVaoaJn=-S};&*5F)upan^E-T&wfS`(IQYO$J6CUH`XU@eu!iUM^>tH7 zne@WGt=%nJKz3u}XqWEo2!Vq+bFaqor-sfk=EgLywA&Qn!_WN<4?XpqJ3~$s8M2B2 z#9$f_sx~>g$=Sq_S^gO2edtvj@}HgexCc^L^$jb-49TVqxrV2HaLO*#PBcd4+qCPF z7%Ml-amXe(y>Jp@2%yg-D)9)`W_p`I&{tLbx!TH?H+SI z2#_(@QAYf*0}^J&p+!+ZWw{5ZL;jZ)pq&UGGbBBe`7gl#tG|ArQfFKo_{TM><>}92 zYl>TNfQ^dV7^wK5)i2Xa{Ng{NPs3R6 zmJfshBEB3#Lj&|*{!J2udl;Cy`=FsetX;101KwTqqbd%j8JY$z^c0vIKp<(H(#M{v zKxD#II!b>Ef2Ne_Z*0zd8q{Cndog(lbdBfRnv=}qe=<)pZv)0fVaL%mBajf2P!4jQ z!#SE(&ir!BPY~Fp;5TH*<(NlW8^=} zc9*t{%_&)Z^8=dMtAywNOifK|WgxZd=$B;!L9=>J3>#~LOS6BxF`nQov!Fq*u00G0 z#hK{N3OrJ(zR)i-qBro2DANayom$tT**eH?->N0+(k@)%1f0qLsH1kcQ1fyy%Db9Y zlhUzDJ{!GqPtUojyDg=k@n!ntr4W9fzXY4(-QVklI<*Vw2HcZw*06xrlrM^#tuxc; zfaI6Zwa>2%PBo#htEZ3uvfWx6gXp7(@xS|JiPlt*S*9pQFE7#q1^9O!f_mEm(2L8| zK>3{LzNNHFQ-AhnQ>hBH>RLWMYV|Bu)%HOMO_#Qhn@VAZNwMC!JP5%mvjQPFRw z7t2qSYDLbWU0d|9bJ^b((4c5{Vzc)gz9G|+A z!g>044uI`$Apc`1L$4G~>&N;a8q3s&Xu`R1&Bq5q_jlUwN1|XjUl(~h^$KV?M9hDb z&@VTl|FuR?f7W)vd;K$mtepKe>A31^@yk2SZRLORR{OCvbQZz;RmZafA;nr6JI1xq zZ~l{FkUM3*Ve-CZZMHeHMj4B3W_73VV_|jv6``Cg<@Mtd?Xosyk7jBAfyIFuum|oYcZt zUsKRf5PZTJ*wPNnQvTO*Q%#Mq?T0+OEi~p>Q+$B=sC~gTHUTTv{t~;VgsU7|qI+vF zPV#B-;xe7|hX(@!Vbj9$&pPJhM{>Qiy{>YscS0?3O42YTl7s^qrt@Yv=P3^_Iv8#y zcKL+(fz*S~_;5j0yyP{%es?nX&_9+oZSQB*%`c_y7^?rU-aWm64magWNm#(}Q(v@K zMUdh%j__Ia;3d~QWpBLVGBxqK^}8@*8X(w&0|j$P{f>lMV*wHWi-DC-*(lEp;Cz)8 z-n+;s{|J>~?Ea*MJS1g!!OKew0|ppT`9?BWv+s5V;Us*}l_fd9jw?A_16i^l?+nuL z-TAVBYUjM4xHzRUes&_hj5 zO|s*Ab)PFjr);fV0sK~MAjBn!-#m5U*Arm+6=A3P!wj%cvm0XM(`{S(u>m6ak9;2` z)qmj1tIX9~oRb;@P?zM;Q_KZIc|!sPUo?%Zt2gRw$07P39MA5NK^q44RQZqS$h6(| zW(KiGH9z{yX02h1Yby0=1*GxdG9-Ax2=|V>Vtc=q@o}*Uu#^=DA8RMhY4YItQ5mzG z%?5#{Zu-S%jRhaRLO3C9uwkT}3i*>ZQQ=DcK!k9;@Oxn@B)*n6KQdviRZ6DbAAy3W=XN;;pJ5SlJxe~7Z+u~&;|2f1> z$x0?j0HKCn-SYlxf_6xdc;?8A|szR;z|n$ukF)9~Sm1`yi#i!(wA<%Efs zXb$Ml;Rk8|G*q$cSnf&Ay+HsqPzn>?Dx26}sgUWu*Ls5@WIIzIZkZ1YoHU^H=xWYC zn+M0+MPJo`m|}If@|9*Q??viRj=_`fdx4YCVL@ITscF0NuMI;bU}nJbz_gsLvFY6i z^z&D_k8J63Vm#MlkRSJa!a#21sTWcZ!*LkxZiPTig zjPwMroW;P_cRfJvsbc2UM2Nbw_=t;ek@WosOq%Mc4*sy&E0Px~Zy8_+O@JdYABd|AEuzSU#f>fOii0al2-8J2HNs)Af^L6jsE@@6~55kMb`h5+0iKDs!9m&-*%{ z4Y@ern1KpKgqbo?xngQGd*QU`Rn{WLHT>-|tVbZ0Hte5*)BgclwO(UEJCv~BIcw6Ux1UrTVuRvYu+S#aaX!CK!xeNOr?)DB<34+Bm{iW|6Kz}xTqzI0H z6CWIkr{iF)+K`FlI~{OS-wJr?j6N2h2IeqmO4*UesQ~tYBncr-wyT5bOm!is7qh%) zwB%dwRTIT4L|e{ze>9mFI52u$QvKUyr9B#~wxQWF)F(N~W#GwanG{DnGWrLi*d;Ci zR1U580r4t8NOiks3B>SuJpeZ_cm6gRO*g64zHjf)>Mc8S3)I#?sHI`860e#1)LzYN z&L-Hi#h51mu_78mzHhjvK!y})f54nFa1~9iXdl*5hU|S6z`G^@BHrPn0-D%dEiJuY z)AUJ!0hoGnZHf4a!>HBb!D%F(kQ#bQi+>Eroi4Xr04fzM>z9pKsROPKo`88GWGI_V z^m~q_xW;mh{xG%6z;7>$)d z0(d|A4lZ?ANFl%Ht%f=dkVqp6f-*9Ej{O7i@hshR4+O`myy=d)N}ruzWK!@&HOG?7#5MC4sJ~U!!vx}D0|6)|2 zrC~z;16!gy?;NVR0p-{9#C$$>-?=}86Q_0D2y4T5D@3bl7$DXp#;s5W^ z*7ybgdV$d;?T8P*1DhC3*?};hv4W-2JTSM2_@bC2j=BF|D5iNpn_cZre|)s0E6*kO z@h_L85_a7Gnv?+Y;a|M+L zHAgD&A9yr*`drjAiZl1u$hrvBbO}RaQ;$9myKqyZDk@VuOH*Oxxm_Q>8~L`RINV}V zgFxtQAka5i#-YsB@x#Pf<#L5QpCh3+AP`Xi97uKt+b884g}iO>E`u6%LpU}Fgk%f? zsk5LuJJUVJ;EoO#EadwfNy`6sc~K0thlAWc<0(sN!y-L0C;*PA?X@Ex4Tx3*LFJ2P zZkGl{M8{%OKL}(DLSip}*X(_r17>HE_y|uxCzqbj-XKW)?|pg^ z9zA{{2;D_Y{H$n=rEuyb527vob)H4cD7Y!3%fk+WC)&B4x&97j|KhJ{Z-U=U_Z#t! z*udpIQTH`An27(YBE9*{$9v>bBtTFbzZf&65RBim{5AZg@Ro@oakfO)1YcAd$+!z? z;BmZeOO`009fUr)tymnU?(*}##rBnJ`r+DiL((H zK@8Vn-8V6bAUCUCN7a&8-p+rcK^l?K+r(nf@^37XmlY!7X9@OueDM9FvD+#O_P(R@ z0lxw(YpofAC#1U2c?|!>P$eQhBhc0GZDg`KxX3_Z#L6=O6?Tc^!!WlqGEvdentRPR zUnmEvzH=vZ`vC=pjPcFtXh(Lpd2=F=GM z^{c_nHdWpvKNezg+vjzqe89|~6%s5uttO=4Mgj7SNZ+GUkn3cWtLZ05AK=d~O5knu1`&qh*rC>O zn-sDxtuDd2^-0W#f_+FVDdj9g)-VC;MRkoM8CljOUj$u~yhB*icSiQla z$7|riTvevlQpdh&RT^Qpxy`tSuUDaN>hU`CATa^*DKc3CA{-j7Z4pl~S`xqh{yi}sOg8uxPQsH*A8jhq8q-vj<9)fT z2{S4OlMkh4MFC!_f8X(xI!HIZiAYO8$)6=gSH&XnIgw<786>x${u@r>$)^*&$OYjS zN4b(1D((HNM(1iR0k}oxN2VYom~{e{9{-g)p;3w^vf>_Q{#gZMAj#D+qu}yN^?LwD zdjSd!8gNAZAyC6tGx3QhiFN# zeqjB2jh;VikR}$>G)X31Mc8yS7lq$;)BhGQQn2-a!y3PgwET>Ino2VnT}hOU`%_dB z#e@CAScEAoQH(XEd6Mgc;I_eZ1RN1Cy08_|K`Vz+ug%%*4-#wBn;0)Y`U$N>ReDrs z$ZmuemdTkZb)`8$mAz_$>2cK7ZN~j+@9a`k7^P#z} zYAH6Kzd?tTk|uSI#r3_kh`QxSj&tCidxuo=!N6^xBIm=X<1Aw7Dg|rPupjsN?0j3h z&uaMF76UHKqxf@^foH0@r9Q72Kg*YIM1TM^g7)50@9h?GYaZo)qT8*9W-lB!K1D&Z zy~`9<=;Jp7pCQrf_VQFAEOt9||3v0%P*|=ov9_I`m0V*bo4_7<>^AqEk-EPY*cL{; zEo<<%w+AjfP36A4{G|3kL>w@-F@9YHsBBIa-LAlCdeC*1m27aM!ac;+bMQQ>n7aRB z3!0tYApAT5%@))t*NA|~rM;A{YB16k3BWIMyDj2#U2(vsLpc_J18}Z_M9R!4c6_L6yOH7H|kz~a@s%2`h$ z#Qo;Bj2pw`ANxBB6)=~e9L(BRzw3ps=u1mDk zc`Y|sErm-?B5`S)um1;TeinVASl#RW4ku?+tb2$yCJeBgx7C{D75f@LNJ=bkVxFmL zC{@=PDMI-7^*#Qs%036@v(G?xDe3(7Y(2b)x=H^ASf6x#+oUZP)a@70OS?1f4_He@wWQMb}UYE@LPs7>h!ztPd)eJH8Vzg`AMNf z=YRMhxEhP8@Rk>Nx@<3KoPbgSF?!JXRpiXieXzWc+1;-eA`2tlq~`%>w%+O)SNL;u z$ZMu((@~ky!arcMV&7Bp7?|-0td*N8&7t_q%tGAb5Y-N83 zOG~_sq;#Ayl@}VMRZBs8uU+TvoyXqLpfFRZIm*c#ZR)`K)kq38`Y%MFUy@PCHq_{( zK>;krxf_^B?i8xk8IJk8d%5A0+JV!de2ir#wLL)Ejy}8|S5FaaS47jT*_l20`OFr* zuE!XNvnbdiVAp$4t?&<7sx8EK**LlP&iqJY%xDh9Ke849a1PPz=d_6p|FsK^4%mEkxEykcNIQ2Vn~^c z2oO@7c$5j{n5LvdXDD^&ceLef>9a9?R(EG*732oz1h!O_NcHjl>8fNpvMPSFFA!=7uDJIbV5A2j^bvA z*cXetdT-Pwn>|vPrH7IV@ktAKr}y$$zFeiSVMdcWM*C9_Y*@&$cy5vgDCeDK+*PcF zMq?`-J2wHd*yH6jL{2UP6A+#75Z9`wO8E|9p2wpuVbcG{-djFI)qP>ZhY+MhkrJeY zp*tlcM5zI3kOo1JmhMs!DS;t|kdp3_PL)n6X;8Ym^V#F?e%?Rf{q*<|=gi)F#kJPD z*4k&1f&=`vzg$_Yd5cWt=!pHfxu%B1U^GY6uN8b_o4)(JJ;{B$OJ7L)!e~E7Ug`aP z>gW;4@Rdq&u)CXk@3=$!7}lPp+?kr@@L}s-c>%+$YAB5tQ5C1mJW94}kz2UKz005V z_ITgfuAjoMZ=H_44W5L>RA_oSgEiKN->fItX0pBINTnQXD{k@PFTDJ2+~foLb|by0o2RzM@SA_mvNyx2AIb)AnU*L0WTuXn_Nks#XvV4kALY*3Gx9hNrXG5`Qpn3r+NmjBkeskOBQI` z+@+39ArzS9F3e)Jt53A*H|)8Y(6UnTuBGC*2fEh0m=~pBBT!dA%h)sTCOZ(u`b&X` z=pIYDe4}8~oUPPXZ&3cGS(c^j;0LoIhozqazNs<7CFaMb1#^^dVDWwwwY!zk_#Z%| zgOcTo5>4vK_fv7~&^>H3kyN6e`)`StkHK3pCCGYckY`9{o?a!bSF$8i)fwcE8Zrv(n|HK_u*z#VOVCoDI{@oz+jc6I@KBy_v1t zsnG#kgcDb}JR<}1`1yGqE7%(2C=w~5g7W@>8!vm6nV1Z-{r>K4~aY;N`s zyTxep5-5I7uio-~scqe}6+`Z0LR=Evy7E5AKACMIhq(U%?Q^S?4a=sB9&u=VG9>`B zMJqn*{09<IIW2+$cJA10I5tOO_{NkN z3W-8v^2E!$g|9TlOML0pUMg(To(RbXlFlxvPz@|GF(_rW-jPT^%9`NK?Hd{ltTAkP znay6~+fcdr2iV%bpjJGXa|ijQF+sr_Q_T=?M^-iPuUiMhm3lb=ezRufV2W8eEM{EQ zRfD{ZTIR{v&{x*}!Id1JQ-KL49r-_J*D{b;$f%briGebG0PK)X&4E5u@?YJtg+V_&ZHKKbc)W&Ls;z&frQiIaP{a?rm%_ zGfHcHAzEtR-t^vt#n(*gWWBMAXZ@$W5r^34_V!+rLdMb}+b8~8jgPahV@;6N$RBZ> zT29ViniiF#6S0^srPSgm=;yt_$;ciIS%SyO%n;vYS$GgR;F7RL=k*6-dT$@DxOy|g z+`x_>^^G7v88321W}R}@-g$9DYW3zO_w6sA!c{rD!<~L}M0Ya6HNCyF6Vuliyx)jb z;q7*-lilofJ^8Y@Y;Y90??QE#vyze+SMLk1sc8I40NG#6%6HUXwYoV}A1hOP50`sj+cUQB{_`yP&Fad1 z_nHel5G?2=cAxDr$}3gwzC6z{qm1jTz%8hwPdal?kZ%xh%d8bAC2=%@Ju50M(R;~S zLbek_P9W{rNYA?Hs}Qo)kV58V(SvZ@+FaeDR2BCkW&8J)R#GS3NOMGQGFauSx8R=~ z!78^34d1L@`xyQ}3VI0&&3Em=$jbgnxe(7&y^v=1Vc{6^%H$d4b0!Pr`CI)()@(;j zoO_FLx}J*DSGRy04Nf(Twhk~{4g-959krbB)pBLqFbHX880%o+u_8;SA^th-r}DMw z3n;6O6vBANurr=+qd&b=7iUei+Sk4KvUvpb##eyaVus6}*x;f>epUyu1}lfb z7Iu5#cJ!pe-d?bEf_uR-vwi=28;$rG_@{G{xcQsd4RVFBy5_E}n%u}MjDhM&uO^2R zG62RhH;;5p-2$q=;P-QVtR)=XNaO^xk{jcL%i2uj0Y1&vcWpP>z-gPOk_cRby#VS} zt{C!)=qucUH+E$l)#bkZ!geNk4N_`O1mbm5U%A~LE8Bovf_#QRkHt5lzDe^vVNr2Y zfDn7}xYBR;%1l!at%$+rOoL@@RnsmpEfqJ^3lg1&xC&u;qD!-+B)YzO1%%u*N8aOR zMg^lC9c~_|DremGx79A^uDaE!lc~ub*9FU))p=W_>9#$vlq7t2@xbC)X)(EN&>*t8 zEyS=-81o~pc+#CSHplDFi9+|tZsN>Kd?(rcO_UmVq9Qy$^Gys`onuCgTZh_C=&3i~ zTi^C5Alh)YG)k#m*cIbVR_k3U&c>|LCT}ZXs8o5S@AgRub9u$NvT8b|*!m#fr}tg` z;$-D-w~lf0@&J4Hvi+Tq*kdKa^To-gJ;x-`Gt@_HCNBdAln55#=}5TfBhbOfnF{ z9Nfyz#U6rEt<(SBlL1mMqet*-#bAxoAn?+p13jBgyEUtU;_(STV{zR|W#fd5`zOPS z=O=Yso5xMLk&W>=6eu7JMHS(S|LW(-#i0|7VP!%73FQ(Ij;ZF1o3y9e-o`}Z8@-nV zh|dUXMi2E;rs!EsT&KAVOc~p|oNYZzA_$^fi~l)|11fx>B6-@2D*;@mi%2xnbe}yV zLk-I}FX1>N844;1E;<_lCu-=xl-ms&z3E7Io$dZ_MPz-(+|-g;!4hyT{C9mjH!?}- zHi}jHj8-##V3)9`&XtP{AMaD8JCS*6ELI7M@3JB8BOdwtc>%f|dZ__X_aY(kbUgL+ zr76U3RrE@`((gHZmtQHIImMj0ah;+UT^|Xk3{NlLMhBLBy zYk{qe+wBfar3hE`>;i%+LyF7djKs^DAHL?pZ_agX zm&8BnC-@-o2h|3tAB3F6c@==0NNR4Z?xvxrFPu#GVHYL9y-VU`QrU;fgbe&7jQuff7=x;HHExG44Zm*s zKqQyol8}Bq0}2cgIoy#D?{8K#>ZKoj2!}q{`v4*=;E>?EYJ-9r9xM{KSm=4+w9*I3 zzLeBirf5^ZeJTy{|S@)0cjJkZfdr_GHdsLQEk| zL1@K$K^)jc=GYqinm^C-EqXIyn3cxoANrs1bK%>har2dkEhT)7!TSf_nQc7oQTY%4 z9H2$Z*bF)2@_V|?q>8S|U}=MY{Oa_%0p9`mM3na%KY1J}6#{bK0G`KJ(GWSMiNX?+tB>*$*=K2hmpH56kYW3;~)1T2Jl9jai?TT z630{~%+l}!=dzV(-V1aXcXrO3VYDpoZR&p_<+$^mWN!~6ESW|Yr1fUd#~`lmA20tV z3xhMO5K42;;fJd(4dttedqwuT7o&;N(ZrSroejpctZue$4XcV@=sZPfM#zac2t55ch0`i4{yV`H@^#+V!Lp5 z&MM&=dyAbp#96w@_uE^UdijXrI_=P500oW+%-#wAi{BJCj@DMSNudUfrf2+o-}GRq zo`Fh^z$P3{7WZQsn;8uRr(ZXXS;Y?bVWlJ+`top=FBNgbl1Hr1_FOm{6Nuc~KTbI- z07mSe>G=D7-@#l+xcuH1PHADpbF-xU3tcY4o7l*BXd*`Pm8+ba_=Oir8BmotW=ZVf zBZZNpiL>7iPAno;S4%&TOXg$$jYx2&hOG~`GT9&j(Ye3P3EaHJ761EO?BNTA5i(>Q z+=NpZC#}7ItquGv+B-@H0hJ8SOL|-a`6?soZ<*`*Ww3JuY*#m0>Q7(kG2{k<|$X0Hlj9HC*rDq2d@IP1oG>>N>5=tcC zY^aPNBb!<-%*F&FGhPu=@UD1M^!Cc8J#iDqyNS%7VJSm1C=u*I>8p&@3}s-gjv4AZ z!_um@Pf6szN~k=le7}5{_$O~bgxt&lm- z?p5IBXv6Y_PZA%RvhKl48IzxUPoe4cu9+UUq9hxoHe>wW<_3$ob~-)j;Czj!DX*_j zT_3POn}wz1ev;V-EUE$xWjx~-LuVBTb{eF*-EC*PuYqR1y_!UN9QR}3IxH!ANy$RbdV%%GLNWa2(_UjUri)KP9MIi7FzO;;Y zY%&YYExSLh42VPt2Gm2euYagL?2654y^~Cb)GRE!0!^TZdl-@wBnnTM>NmW*jy)ad%G z(Bn|=9G>J;DVo|CrTI@+_1{42Mtg7ZiZPj;C3jw$%F!}mQ5$4T);huvxj|@C?W_Il zzCqXb=2gz-=ug+cH9V zTmVO~nO2U15ssi>y??*jT)w=OQEu`%f?cIz@qSRDLl*!#K{Y}M8hK;~nuY%B%XSCI z!pWj^L_*xl*J?jiOw|$cu9eUF5K1xpZRqyy?KiMNja!}>nLa6(gc>|~H+eU+hpXy0 z3$4^b2QI;zJWhVSeKfJ}I(o0l6teeoJr+!tr6Xd02xG8gf!&ol{UdzqH5kpJLtew? zlmoKild^Ufo!%eyz2H^~f2F4whUcbz!n>|nhpk{$lN>r6XHTM2I;Xt`Cnl7{Fu=&i z%RgA$U?hd)A4s+v@H(OQ^vdgF$Dgq~ZS7?1IBv1AsAmxRG-is|Zfm8L*CPAg&4x6H z9b98?@2ozy`ecC(Hew|u+p+)g!u-X+>zD?9henW>GakH$C9xQ~J^UPM=C~3k=N~`GV*SnE*W}nuQHh~ zZ}x)0cb5uGLqJN(3H9IXf5f;@evZ6oPS|`SAC&7Vk(ZCS33Z6SY{T4^k zv#b-y56&_khblAe;}H+DTR%IG{pD?x8QPAK7mB8SJ1n4Z7=4|0-?!3cHjF?64N5CM z0V|}XpqiXzh=hF^KGE5%1z2CUf>K>a7G%-9H$!Xm=zLbnt z?iLM9aq`E%FKqc=xpL4N{d$&l?RN3rxcn9G)zFOJcHEh8Dm6F^xfg1e+o`oXQH)ev z)e8&*s<$!<2bPe60_Gve{?x0x!Vo0KW%v*aqJ6#0dDJ^{eTsRjO0HPQ=}8AUCHGk+ zuaBR!`r9qdoYxofz=ui~Py|8|BCnxOiD@D_b$MwcQI%slD^=loNo{=J+7W^xsT+*( zA<0<0P&U_S3bNWY_Gm-7dm4GqiuI;1gQVsqn5+79l!$=#{j7|pD`a8!djT2Yxv%HN zt09FuLmKZ>$Ci3^3$%}O4N*Ez>;A^IJz<(FMZ+_30aMDpZPk*@SntV9et!JA2zwTO z2ZB_3mN^Xu`Cq54aWMKtWZs7e)`Ptrz!3f`|6cRty8O5atbqo^or?{*gO8B=c(Mqo&$Ei?OBvkhI%%$CaUpr5=9YZi_>{Tf)l zleN3Qq!2(%gO0xgmzD{lqum(niWsTrS<-Mzhdu9CJarTIq6cCk_d$utIOd<-4n5wA zcD&(|S0YA}@n-W1V%KS?HCY(d?)5vne+bO$=jh;Hsky^_2Lx%?A*n+J899cpk@5E* zD8}a-aAD`S803)uJ^p_viJ_G0dM1pZU`7wCP3m=C``~hXg__fN1Yp9w&U@s*lTTE= z*iFGI`!@HsCp*pyAnj`^)Ru(*Z3&ZD!J)psiPIMkKUXk#@dn(aKR;cZ7(=yx!O2u; zP{zb(ncFazB`D98c3Wl3yS7J}Ezs%r5Ey$){)w`3SCyCgE+2GusgTE6SdpyCot3Q| zwQ0otYjj`}Yh#0D4S%m64B!0hm0%eAON^#g^ytJXgZl)QAPh{KTpR`6pn7^U8Y8LY zJRxQU2`q7$*U^%H@dha5^Bd(&>!hS!7HqqOojw7XUBqZszn|>?*-|w*Hpm3>xNtzp zV@qWf5O7Scm6>@X(E5)w#UAuw?K)j2KL)Ugg$A0PkO+D7iw|89*;pz_R>m859-A`? zAct{5)cU0)PRQaniGsi0mi0Wff+7#~;D<|Vgl2x@gC;nrT{ilh#sp*!D~ZVNKYR{} zyIpL}um@qj4(;);lY(^!h{)L;jv97?hl0 zjhT0KGkC<3hUL%0&9J86u`4ls7YiCGzco{E(yt+yN?#F(U{u3wAus4G5@0nep}hsA z8KTsn;)a{GpRj$cRQw)l*J(4;X329V28ApmHbh(WFL?Gz-xpskj!^JKdk$#?OVu{= zv6}fk#f2mr{|4HFwV7i)U$|BmFucx1OT!gfrX-qZBarSwijY-ZzJCPyTM4-3S!CnK zC<}Q6nO&%2O2+DOjX9{&x!ni4JbFjj0{JH*BRnH`VPnANvHXcWUS=QgzK?DmtbLn$ zvY6{IhbotZ64JZumzClmf8BO0YDmRtlB^{8rKP@G zqkfP&h9tqxVhNri;C+{`VNUG3|92KZ4!~3Yzp0Fm@?94*o6U=pv5%m2V~Hy;aCCu5 z2SJq{2^dh?$Hk1(3dUqO4&-890Y}zOpTNHFa%C&ra z{AZQk9Q;t477AV>t-z$#n?kc}L#|=UTr>zw(^|h{5Uw8=v=9)0(wc}B3O>hK^t+wG z^U$EFX`xgDTqiPBbSTmlWy6_TFT<3h)>svwmeN9(GbZ@iG>NweIb@{_+J9|gr!k5& zkt2%tAo6S9S|WaGN1csAYC7JBRzLkjux{{^b2CHap5@T|xjQ^A1RTO;9Q z_EuF+|2Z(Z(E*oHt=CVLWjw~p;4vr2STTXcsCT7~1?;`AG8E(yR%E2wRCIWDF)`^_ zP}tO;w;5i$*Qip~3ThcgMWcBs$Fj_yK%xu1E(c)(6ZE1Y>~tW4PX6fQs@7x{r<&U+-IpkZo6_JcPK#wnE2VC{p}(sX3&RCm=@iU$@96BtEFc z1G~?iv?c)nHkw_j;j8|q>B|N&loqQPwaI67k z;6(Kh8l)1d%>ojIeEFB`ep1V+nV8VXhq;%ChU#&_l^1GIuG`kk6DLF~r^}ks2yo54 zlkXq91K|CScTLp5Q#dH4Y5rpX6P5s1@Pz_WiPoyW^Z{Dc1y7R&Zl?&jzY2u`ZV<}V zk-vNT7d8DBjSi`BpdviE+rQp$Qld~1?^+;Opl&z5M_jjifU^sTEiLXt+o>(D0js45 z5QuNQr3p{!2H0U5YcZSwAVJRm*fLQR)<7<6I7lBWn3PTzdr7y(|mW`0# zLQEeU_EkV1iU%f;CJ2gW3SurD>vqY^WMTJ6cDQ0^ zU7VG<4YjzVqKvUVkZuOAPau&?#-m{x7>CfolF~+yUEQe`W0wKtM50!1V#P`VV z-C|5u3Qjz%S(J#Iay!qtV<@DR`dg{s^XDZ3!p-UdHa7XU9}=3Sis@UmWzh%PV9l8x z3%@$7&-&=0{JqVC5v9435am5I!k$C6Xy3dLJ5JK_0<&ea2@jJpx2oQO7!NihE(7)J z#0QCD^-h1qHvnvrTmRGCmN8|UHr!JPX7z)y3yBrLxo%}!oBS{%$f3wdd$9reG z=+}(b*LpwQAvPR@6`0`U#RjdTKMufq+KEu!W6H?hCK0!RsgSAl=uC6JyH@pY+C?YN zHHuw>?S3D_F0QV1{+daqe#<5M(byPkLc6ljZxL&HVQ4eVd&CK0hTJ!28wo%|`kL5D zP}@8_pFr^4@s4NE?EepPl!mA=<>%(~U%5&G7TpcCFz&yFAN|*-kW2Q9p9l&$+lbSHedaI zt+kx07b@1q^Na6kAqS#2Z0Fm#t%l8O#f41!FpSnw)$&6qg_Gu}Vb%;8O39Q_`PT?-foT zUt@)1K5yPMagOulkgg;q{>Gn62TLNlY9Cp1?`;^I%dw;yu=6ottEBD^=98)~D|8WN zVX4_=b;U6c#-f@Xj(^rJ&cf^YT@w$ftu!hF02Hz}c~U{#lm8AVaK?Nc3^?wu`B!a9 zOfmblUUC5|YOCu{7;q40dWLe7(U0V6o0D|(cv7$KvG`A(%)%PE9zIkE0aGFbnJSNl zj~F++z4w=C4)P4~tqF}-Q`ff1f`weP3Oa-Yr+QJdTmU$^b^k3!0v03P5i5RGocfwI zdc~D<+TsZhw|-!;*Rf*(dt`%BHU{&%m=x?C*NS1d$+1u?WYzJn>b+BVlW%4bGA0)J zwE!VM)??$qeR>-4uK`FD*4flpze12Q9sz6gr_jvd;v4aU{B}Tn^n)7{B0rZ4y*8Z+PeH&MIi$|Bqd%7=8UNO1shhe|tF@x2mk zdBKn50;YPMzb`~%H+L|3@i6k8M+?34iS@zU7`#TC&nKH5524qW49YjEm`$&-Z%gDWCPvty-#pLF*T@hSG zGc~xNFzr*o`eWrnksrPNt`qX}flM0J&x%XTS+7#(3(ox42X$F#VjO&?mbkL8^7kf9 zh9ah;OP&V`S4U!u)-&y#h4o%15sm)f`urpAWDpJFM*P#*y`rpBfq)Gy1&wgo#qZW% ze{346r6nf2nADyH%Xf7le1l~I|Jo{lWugt0!uM9nL3ela3}jMa#Hf72b{Akcqy|-xjy>#v#>a7cm_lhxqk}F=`~nS$irCjf+^*+ z*Id||=iVH7YqD4=rEjD(B8+$6GkT?FvJgv=)Xv8Ca)J62G&9qkeBB20o|N^p+IM7# zOq&IZ8`<<2$l{Kaf4)O_ZXQz-+iE}fxkTaB_rmSVO>qESuB0gF5{3PTnPGe{Y|-t7Tqn#nCYYn5O48MiBmU*ELeDo&p{`) z`4aK`;)w$8$p3hb2XEY~yToBE@Oxnu9esr=y%x=IT;mN9a8sx-p==;W-?jL(&Mz#Q z$^H~870@!*R094?D5ZN`G2Ap}zR%^cv&f;5F*#-s0jF~;!Gl_M1Hp)NCm3$#DJI(s z4KdlaQGf;x7YY8hH^|?xSYkcr{>-$l7mMF0%KFfmhR2`D_RM*LWS%XBN8ApvF%3GG z!Ne_s=GVC^NeGUwt*39-zNp1t;KCqCGz3*xn1Dv~$+yh(eQhM8is={5Kju5k%M}t| zF-vX#713424gvKdt=clC-n%4&xz;-dLl-~3r!Okheon_~A2)Ekup#chF7EyEuw~cg z%-}dx?Ugr!d64r;MRN`&WGsuSKe%l`canYWD2ALYq8{;H;qRBqOvtr2PdhG0(0(XL z@%o;;I`cc8loo0M9X9)UsiGusxn&q@-svpFA`FJ4<~d5@g}uVlrXx0{XqP>UfIQhE|cyPdw@Sq-uegTTw2zz?AxMziMfSq zBC#J{o6Qb-$jVaX%pg5F9;kkI9#h9bd#Lo5^5JuRmAkS551!r5RE7oovgw}1nW)>C z-l1WaQG6OFo?NUxH{jwyAX0u>v@J5A?)GE_W$hRsExHq0;M38ySsgP@Uwp@5E!+$$ z*Ul??3_DsqU~CMdAg3dU_9@g&xxQtm8e-1xWqEV@*@cobZo|fk)~R@-cZ(+fAf%ZN ziyP7GW#>?IO)1}T&(thoB4N~V56p}}uIuMg;7;4;)$QY4KLwxg)ApT|8vT=xHIGy8 zv~(sl?`9v%n9QRmTvcRVvApZ8)p~xbvA(+CQ1q4YwdBaar=K7fs2V`vN|qVLE|)mj+Z0433Qur(l#rnHM;C46Jb%sfM6mKQbx zoW3zcE#UPf4lg}E_DaxO;z~vSz4docPNbk({~V2{G^cgcEI`pHjz5l~v*jn_&5HEJ zj^6l;&;DIuf5sZl5k!__Uv}$lI|;K`U449jwwt%HfJ<$8uKx!2FBsKL8H8M~&vd8H zB4VIKS>eL?hb-q`;W=gfG9UG7Xu>D>mk&b+L@!l!X{{{`hTP;XB7J1VcJ56Sy7}2s zUn%7h+h=3_`ofyNqsN&f9el6Ca^a;YxU>?20SZMiGVyqH$VOXVsfl)2Lgm%7l76Gx zOG808X#6D;@Wx*}DkYtVmV2AVW(zpTSZfCd78dSl*2?qR?du&xy9&n7H!9^NHV+Gw zxf`JUjECzId}k~%Gu%F_^^@HSCxOF?jx)5MHB>*( z{CqHwGg*$nthC^w%Q$_n31%_i9Zx>4xm5b9T<6fX)=-K7f8kJhneNI( z#jfkNOpM#_{?-?c4@`X=Iyq!t_5MWRUUi0NFX5hB^fs{Ta}L(W6%N@@EWB{PKQAyP zHxlbt``_cP{h67^`%M2sk)|LHo|+C|FKG;y2vCT&*FTabDQ&3;<=4~NKfN>}XI0$R zdE2^>3F+!-b9i_x*1a5p=LVQe?%KZ94pjdhnOUPNp}zbC(XNV7zlM__u0#Itv^wQh z#~lP{@%I&s&c)XmJrBMYm2HmA!AeHM0KyVwDzNO`m3fsL?Jfz);Cu6HIO)6#o?ui& z4OpB_$hGE>S6+Zg?X;Z4IREb#&6i>GkbrK-8gf*$-EO}}$&*r`H0kYVEMX0lY_yl4ctNy7tb{f^#A__!YuhpN}K87Wz+A&|CUfx0|wyZhlGkBiHy4 zj4GJ*ZABu#%FZrdJDJ-u${Zv$j^I&ktfxk8NRPA>m#A)OoqQu=O%_tYXyGi;&Uxq< zk%^HPb(VCj{IvEE>nQ|X?-QXxE$Yi03Wi^@>k^3Q=Ls?HhX%1HnG&c$o zif@=KCEghe`NsdQIehUVl0WAx^xT|Z?Lt}pxs@@Q0i^)Nf#=GAq8ys>V-3%ZlHJam zB%+DX-q{g7&g*z0$e)7;&;Vlece)~AdwqlVCeogltaB*e2*4ox9LL<|pNmFFXKsPg z(CNk0LSQ&CwUlpY(p3lEnkALZdhqUXX`Io3x>^&r&Nc6Wlvy=&vpPVd&%s7IUE zCmzq3pCQ4^gF>%8@dQc_HqT{%7NAI%@0MHLEPm#dq+a?9wqugz*>!y6OvUq$eNWyp5zSa`8}sN zJ5dtxrx=%Swt5!GD{TaMfiV}ihO|i1?aXIY`gLWb$j=#=&>u^Dkiv;2Szro$ZC4Gg zH=k9&fxI@KG*`_NpX9PyvI>;q>4CfVzZOlp@c?*thp%kmN)l< z%qmaOU;Qp7a9DfB3qcG3Ab;(%Hg+jSIE%t~Pj+Ljy$IL0#XUX|Lo!Q8X?UV^bE)lE`^hr8dk) z8VhgE0t6(8j^An&RtxIbv!At-O>6Ar_p|u~5kZMk`bEgs*Y*gJ+<@e9eP1Dp$&0X* zThU|crc5<@Sz0&m;5SI}aj6r%MH0IMoU{pzr;Z8m9Q8-Tw6{*=<7@=?-4j38x25|AB#5sJxxX{UE^^JX&uim5mn*Y%a5?i;yErieTx}`F z?>c8G4o(inTmI$(ZiC6#BtzdXS}pD-SUn5RL+S824)n(M9uAb|QYkdqZ?O>j1g`$# z5PCBt#C@Q`;!{h3JZ8lw2;(_pV#xaN-6`HYM5~o?I1@TSt-%G zOEy5~vi2h&_`RvL{<`rgUfKl5cH+6e{>{^18xjiJgFFcOBkc#hF^P?wUKpZ_=|mV& z%=cHULbS@uT>6#D8I2B6`Z=l?qRs*_q?H5&?5jF&H;oGfKUw>b)Ecnog{R&Y1AQBk z<@b0`U;m~DO$4C|Bqz;qS=E(^yq7vXU&IGT2fqYi7H}5e%l@RAcYN#x9}E!m#F2gc zcxO%L?c!A?6sdhcHWmS1=$D{hl7{8lvcpkXt+hh3V;Oi;=0r9lT+A`!9o)0LJ7ij~ z*zB-&s9XCjksR7DR)cfC9YeB2(NznltLXzW?#&VhppRi~>DLBb%305{krP~jHK$S{ z&>NB^6~C-5u4w*n3imtKOM_oj5_~l|{m87k_?@m))R?#gs%q6@wr%5+n{xFpVFJ)M z#I{|;dCmw;%r_bV-um{-Zxl#FWuTZfYtVWhbsk+Gh?u^S3syWc)>}A(_otk3vq0az zIJ!#KKbdiqtJY}F61UYXo@(_x@)8Nh)VuGV9p4n8E<;iud6+&4Q(RIk8VCETcU$JzUy=Rp5a;>c z{ATE4!takTXNrV_@|2?R>1 z3Mf_oDuvd6&W%|1>zsfiBi3F{`37g6>?2Glw@dkb>|JKV<^Y>gRW4Wvqj4F_VTnrU zkgk2qLg=Q025pL=9R1bu=(@e)Ov%@0AE&wSV*B}UK&ymQJ9@0sxi(WeFTnOCSpvv} z^)L6{oCmQ6kwhyE62hqZ;2(;vrV}lFEA`I_)u5K+J_F~Knx`UMPC$zWeT#d{5X#V(^~{w*bs@LSfX^O)z$WAtDt+}XCk3q|$ZvdIIk-zgCtS4t zWR)U+((OyHFYVe{1H*WC#9CI;lu(M-nvSf56dp);H>_7L63tdrA5~Ne8mVCWlePhu z*R^ws6=SrdQ7~K91|FY?50xG)b8SvF50Y|3UG|N%Xw~}prJ0tTa3t}){`sjWIp4>k zr%>Bl3eE335uCE3wv7+ktW&V(9j2do5!_ptI%M=^e8v{!4QXwzYz&Zp+~mu~S$YGd zV0^B^?BSXv8fddA$L`)04M>ME^c?E5j@#E8=AR^7j?QoxYTSI)_XC$Wdl+lQiCMF_ zfC@fZ&X6He6+Ag$<@XY1XZ1L*{E47nx+t(>v(2~a8e7tp4DKz?kN8+Te_*!U3ig z_(=o9g78ZeimqR{-B82IP0C@THSU6-S2H?$1M~qx_It!}&NK6*`~j_nd0C*NiN_XQ z-57#|=YH{*#8!WF1iQ9+RaiKuVkK&a>dz%3KKe4O!7^J(sa+>5D{DHboFQ7%rO3Fs2Dm*yVKFl(`o_NpTSnJYy9Pt@^j(tsK$Rv~|1CGtOU1`jaDnI~nG*{sr`Ndvh#B{E9Gy1_fwlD92-Met3 zKuYya7gDLtpD5vM=PvRy69yDkc+gbkz0-q%bX=&Ado#Pl_4OGe^&N*`*>`A?c&J2^gSNQXJDnYj4=3!&j5N*77w1Jp zp+mD%A`JtDVaP92Usgd+V&vvO*N>7=!JFK_t|X4GFS(#g|A9tHrcn>3q?<&Wi+ggYfPJzmPzjLF#Q|a?GKpW5V5L1Uu-2C>A%2*$Y=5o%%>j&Et1O1s+*oBY!b_Z;brI>77A5} z3cN*wZ%;h1veuWs1wNYM*|ZV_^Ql2qSP@@$6cS|~&>|mi;Xz8>i*rs7F#ae`t`mdN zkQ&*C(6{yrafo)H+oY{5dsRlk%$224ytVEADg^ZfsehO3uh9~~4R6++7C6v)1xY$3 zRx^7zB!c?}X7uH&nvF|q&DmfVEnea{5bcTm5z{cO^zw~7CiLb-&+<$97&y%x2bOaF zC%Quh8fb|T@F#)k0X*qyiT%4|P@% z!CIAMp@kDfcE4erw_-=#ap)4O`YrNN>Zpq^Dr=Wu)|}Qzv93GIi8(4j4ovV{K7}OV z`pRffEhxr|nhb{?zcTwO(VF$M6TD1b;||C&&xDo$tzbOD{sz=r)ZmKq2tq>U3eu>XQe5x&Veem50W`5lJMvvC8)F8fEmnu7IKF9gv-^3S9+{B068f2Y4$rTUi$5kPOK$Wq-- zGh!nzOW<5t?YmADNEGX_X!r~r>OAt`Mw)h3?W}0g~`EJ6dOl3Y0iQ9d2NOu@f zA-WUm-24C8B+XacQoY~LvrmrV;1XcCgBIbNpx~z*{MTaNG#7$695`-4i->x8Uw%5? zDINn^OsJ(?_&177kk;oFYBbE2%|qXep`=i~_)f>EWOj-NxtsSqS#3^#DyT2wd922z zf|5AuOd45}Cy(T}Vmhrl%!ELFRhp$+dpNAZxy3}|oub&BcDpn=E5`Y6%=Ig})+{6! z$mF2s5Tv)R^Xn{9zW~7G(~g$z43yH_Q5Kam)M;pA)>*!*#1ATXrQBZ6XG2{G4V)vw z`b)m~o@#%FC+uTJK?-Z2y9}kMXU=uIVA7SpNus7-GY1xx!j%E}>+@D1)#&)b13nMk zM4~~v`uPrf2Xveyi`S0werdOLM+oAosEFr>uJQc^kgbAQHveDT?IO7cDzQ`>h1|8w^JJ z_N--v#XI1=fjWhOn@6g1_N6`5a!6jeL5Ezs+E%Epb2FnCQFO?C#;g09kxY!Xa#?)V z4r@~*fJFM7UPVwH{@|hVC&kQZT}o)bSqKAK>`Q>#C2*U+y%bR}Yu&n3VKICL==Qg{ zBU)ePseSZ@nnon=>uo8_sfAh`0(<7x2Wb%tc)b|8FUSiveg5SII8Z0k3lK{0kWiRr ztI~-s*CpeE2&%?0a9W!w4>DB`6*{UqwSCjPciB2*@^e1k^QXhezJ&4s3h=SzA=`H7 z@qJ|R*G?K7Brva61XE!jxNavKygL$jD z3Eqv^krxlb&^PqOb4cB;L4oCeFKW{9fzjK6cM0xyz~kf?#^7vNEjoXX2f%+4vnC_u z>M|c{J+ux18IokaG2zRZPq_BF(=N}F!P8N($MP~C@oOkikMW>X)N>W3Z0Z+7z^4pc zg50vwytMhr-XCJF<8yogS$q%wi2+4g zfI5~oC)9npS*J35I~yG`R>q0diI5X90S>ZRQFX0}>`%x2=+j7V@RE(}CL+ws4n(xV z=S%bN9pq9X`2#3^_OzmmegGv_ak4%2yhs8!3xK8L3n`v2c54y+;i#I$$3QKBcbp(; z$yFwo7%7i<^$zr{!og*+Nc^AMZ;2pD-{&9=^Ab!&#)j# zzM9oboehRYl&qZ#3;dLdZ)sRshUOg3iAGf7LunH=&;9rvupZ-S?OuV3@$8@3RrBnx zB%GStFxqAX0iC}Q1aVJ#NEp%25(MtTT-9fO;w>uo-}3{>KH*(-=vN``vY%YSjd_J) zWQy`FU~Pg|P^5&n7au+2RTOX|bIm(P+KGq4#{orE{$G0#O(coDI+Uok*&P+3GspxqB`~%sNnj+%Ll&m&Aa_Z12OZ+Yu)VE5_Ko5kG+^k#1wMZC6(w>n@bQ0&3|$M{=^`_5 z)#c#i%(@L36YId={aryxuNviO*W6J5Cy#C%Kn~~L)xLNUJHdPG+$s5eaV|u<9E@e7 zf(sDaF+cM6g9jgz9ms^CP7ZN)V2GAXQZke;LLY;{rSXjAQ7!6JPtVFsoDs?PW5gN~ z@E6}Sn6y@6w`p-eW?WV|y~prA|6jm<1uXbXuQ9?zIYv|OpM%pcA5E(&;00Q%D-&j7 z$&4R78QOA?(;@|96T=mMI#Gk*!U35D2s&zg6P-2 zz}N`MA1an8WxcR6CQO=rV_na6r;ET;=uXq|*8__pFlcSO=+5eJfAuet7d-w2wG9tb ziXNOlVf?s29uWO26k8oMDFS}OQE^U=AdI)emSU_)@J^Rd&LNrd&bHuhS;&90HmldK z!uTPW-ux0G2LWFs77jh>Jx=P!{sQ^;wv9G%2~3IzCbjO8WlVToROg9$kg7@Gfc$9DabY&H z>{&PT-UaGpK^eY8l3XMKh+$AUP}k?^i2;~W8djo4Qdcug(BdBRko-To4in-oWOv+a zDEK?jZ6OCm&M8pmmf2*aoCEc zi`Y-n$N`z(;j~}K_{?5s#Rt;If8lQS*<>g3RmI@jlyD4a+~>b;!(S_cHB2kooNO=t zL&=AT)UBfrjYpvIC2RnG!GnV_JpCyn%GO?>kok*k$d{=TvmBn!SRhqcwu}9xy#@Le zjX+);e=9ebPTL)G{bE6gnlYKjo0xDGKpk2gWv>=rR;tZ{L98@JYFHgPE$BXR(NQG$ zMiHG#6T}c+aKsDzss2Ye+FL<`WK={YuJ#93!Z9Zl5(HWNm~K}G`4}H-<59HOe!+Ay zA;;i8oFyShL9QvWdrl=()bBYF=q@fqDNdNVtlUKd&trhtNJF}lz=IOEt6XiIBHzh| zf$v=be+dW6hOT0OaE2%8+JW6s*171A`}S5%duJE-rcOA@Mh*Y@vxDtC^wu049;zyM zsHMmsS{$`OzTJstW8al8ZD#A%MptXH+5UaZ(D}O11zZWSS^2>ea67^IH84)$Ha>7_ zKl?38%gBUa29N>9*0)ufm9bE`JD%bhV^dXI>R(JM$Z;})E=ZE%#a+7S;_2siAjf~{ zwf&yBu~RVe`9?6PsU;Iz1DhSKJ%GtFFZLi zoh@s1(0WS3MnhS25Pb%$jll^C7i#|Xpx{1vW5)2CR3(r%7j6IfZq`l&-^#nSQ={U1 zcT@PIupH}OPr#?Fizux?aJVBHrEu}MEx+u%fc-a=WpFiygJfYPP6$DuM1yO*G-4J{ zBa@&P#H1=Yabhv*Q7Lw`_HI!1pj3^*qdA-5U@aj2iET?h>lS}6=Kjvepq?*V_Z z*@!ALpoo_)w2>g}GNIlw5!xtF5u<9V1e$W2wKnhWoh+XC&xlAQgdlm`3OgY|9w%Tk z*;-n5ayo{e1OTao&iU1zQ;#B?wtRBaS``J-cjb6|&=fsPg7C$nCNFf51iE%!Bs_p6 z7%?DBM_XgV$Tji#xX12hHhR_b)D{!6@KqL2*#1QnwuF#PTzS(^N&nHfsUE(yJFi9< zOzJc9ze{zh)Np?K1PIda`aX8<;dG4ij{mX{t%D73z%exEE9O(|81D>PsMDCDg`W8i zx^4N10tYpjU|f6j?I)>7;ERPD3n++UMX2N4U$20L_P6v~L!TFUk;G10>XznO=Q=tUv5v>pxS-mW@OmZs^+&h#RgetmqRd+TWll(f__E z>mLia;~eL;%8RP~S?h(zObX`Ct#kSl{ z!9;^)tjXE$wjMBM&a@ugcO9LD6y7lJ<|-8$wkt8b0k(>xDF9VLijw%pvq8;lQSC7C z8zkeaI%ABKwb2QcFD!QIft}V~x#F8w?eZ9> z1@K2Raw`a%A))exB=8Dq_~;qnk1n6sk`aNQWq1rwj@eT&U&$P9O!kL{rM8`xeA%fg z=_#m`y^uF757hp1EBnWgvHvJUkk+fd@j1ush2HmDSzwd70tda{G!LLf#ScOVbL6^n z=|nex77_lC+GId+kz9A5=y81azQFy;V*ghF5_dhl`mJ94P@HhEN4Ah`zSX^HBHau52n98^-EGR$jvODxlx0K*gRUb|hnmVz_-Vxy`I@TuM>6Oe>P%qclj7KD z#`+cjL4{srF@V53ZUw4}rrTDpL&*$e^dPk|5IHN}tUgYtFda(>XQ`~nmwHI-AVd;~IdJrb`nTxi zdYKl>X7xi7U=ZhEqSQibO#LxU^SpAjl}Xp%d6~%%WXlr@&xh`8F~BlHMjV0>Zo0v~T0arB?j>m#Hg+YH) zx%O`d;ESRQPu~=rd`7rW+7eYmqv-WaJbj{6K+He~O-ZN1k8OL=OFN4AF&SKucCS~i zLec=KAv*f5@)$m-8vMI3uo!n0B2xk#p+M(w@eV69)S1Z_xTLfr<#=gmd8pAe$JeI0 zTLcJGf%F5a_D94i^7>>tmp5uwS!-(!zLd6KoB?}Z`1RYH2Y!zf|0D`P+a+y{_Yc;# z%4P?h0qL_!j)-BcZmxDTwRH%5_>`$)T71%G>xaXkM)CNZ;)QpFLZ}txjT4imusAWW z&>CaopN3^;F^+ZRez^c4D+0D(Y72Enk=f!89w-3Y@6e%B;u*iSXJ+7Nd=duWJ!G_X z%5NqFX}2tHeC&7yQYt=7n6PTDOcWi~Lp=9gU0*%1qvF`mH{PIV%|F}~q$MBBxseCk z9PV{swD3Tq@`w;}7=u_-s?ReINrE3YGJZB^=igd)`=ZwCjhxI6g`MQpZ`P5 zsvOnNeVLG!UL=W8E>ZxMN_%*w2zFIj!yRtN}otI zAAN1TADC7DxP_y;phRu8Pfow@z2tX4xje_;50X@GK~Ia?kKKIXWAt&3+bS71n4UXc zr_D&8{pUkr3)SguX%H{BL1gN~2ANsLYeyxzaJovtSF_+v^c=I_pV_aK}Oo|HLm$q?gQ_@j5v!vKkW2Xa5KEGLVl_SBn4 zK#*Q*$7g_DY-!l$n83U5dPI1HH%(4&b}g`l%5RX1EQD zvV~;&A=>es9}`i{3qlafY>*Hra4gE#S}lt*@Blb#HVTB3CGUJV<61r+YtPS@c80}t zZ7P4;wo~79hH2+u6cI(m3i_;ZSIl<2*JGDk7ey4@x_ANqijknMb98$SnrBwK)WFE8 z7Sz##C={NUJQkv?`5fknQzj}uF_I5JsQWaXmuO``u}g@;_u}zMr$*HlLfX?bqavCoFOwHEoUQx86z}mQ3cRuraIb72SijAEyW+WyB>uKycl6+0`nu zrg-d#In9mS2Ku3t6l*vqrs*w<6PW&UCA!#EGeV&jxohF$bZz#(9Q+ik{+)vOY4!XP zN)jJmFCp56SdlRw^q}8MzFY(~aWVt|x@4nO(I5q7L`l`?PiV?pxDouX)A++@?VDFH z_)3*64qsYwi)KYnK~Fx(=tA_x27O23weNR@HBYvz_r@19o^Ao>IdJ#1&$Q z=(2*ypBRUv*mHd*Gh)@SKRDZk-pkWCUUfIJIPehSVY zJ}dfeT!jkMYXE{!(eP7XtNBjYF_@K$<;GTmdKIj-i4B~g)`E%RNUT-sL&!QizLj!oH>|`?ny3fci*{PA zKU0ml^w#9ESN8IzAY0}2n%F`IA zzdjK9DSH@i-~sX-5qxi@=0-m0)ejvF3DOD>hnE&8cjAeUrXfdE zr{y&%h;(Q|5pO_CDg9QlB3~!WZG-X+6l87WS2|$JZKV9R@MJ`lJ+rqw^Ldt=Y`en* zTB6N~M}7cxV$>WN8PvcTxK!Fj<`~VF*xwyO!%iuI4%y)P+k5tFT|_NU0HI0{(26+v|}?XstWB$6KeRs5+E3&qf{+9 zZtMGfBPF_7qNlTM-Am(BIiyn3^RXirbb~#SF>44Bp-_LrC=1aeYjclkl%0jYeU~pB zcMsCn0x+vKmY)#xPZBH%-0%*0>FPCn=f?vI*_)YF0$18=NCQ9rKhRWf#ofwz?1!aerSx@F9R7 zE)M}EZXMQ4J-mPTb<#Z1^Ef04mJbMds^DbcTAay~$4uWdSdbfQpBehTDpoX+i}BZY zI~fKY4d&*nsbzM~ks*IMii_Q}jwK|in>102* ziXrN~WxMNP8G}A6Km|wBTj)O;?0HuFuvywAsu)ZtmaA>XfVgCI;dRf`)^V%*$x;jJ zHb~UB&OV-m1T{;MuRwFph7AEgr4_xObtHm1B`=_~+c6tyRol?09a#7jx5=~U!j~xp zju@eCwxbE}L&0qIe*BH-y0Kph@uhi`+fv0y)p#1K1U%vc7!kqK#vKvLTfC%nH3zoG z)))>!b?*?YokgDp>_IvP{i9QT{ys9GPGN9mJ8w0l%7ts#!3#C~h6<=+k;lp~>=Dut znTdZT#>wN1rpkvL=aWJA}Y}mf$P7-n*GBc z-rDQ5h2cPlxfI$jfn~j0a&~w7IrGfW&ipLO`V+7}DMR7THEWGL+rTdi^Wp_!AcZy( zqDVN+&$2F8%cs^86$OIejle38;v=O48;GZlMl_*sM|0&A@s@=)q4@##CSLBc;++4p zcRg^HeZ2!LSE2BT7~Abuj4$owhV6wU-DF@OLL?fCB2mk8DxgM_*WeEnA>|i0_kmz$ zucJ!L^BUEJqa8|25_tyDA<#EzH7B=@8tTX~tLAO+vL1SAwg?BxVr`e5W9v{(+t|;6 zUV$AiLrP%PBd=F)fzV3L&`8KAd73G1iVyZt4YXFkwpe|Hmei&`TC4b0{!m8^mWOSh zru=C%-Iak3;!U{gQ3JtYbpC_l@ptLM2I|pKbECv9HX`Pt#x0(A6y7f7A5OR2Y)jT0$j(>gHw_0wv#U=c^s@Geb7?|Lg{Sf&5*g z2eQI=K*bS$SO*DveNz)}Via0)KoptMMyHIyuK<8~aF`(82kx$y>tzUL0N5O2lBa*^ zR-cVc8^}S~q^-AKFMc#7&n14Ycvy6u7M*_X2UaWp(OA=a3X=JrT%Y2H3tRH{<6hpE zOxwqOb`#f>EUJzOdSC;33+U@mf8Sz^8@GJA%tH;?Xd%qHN3?xxk%JBwOvXsk(dSbW zT`C~<$`2YyIGY35b+oY;Fnj&)*du!6&OyPDeS|8GrG&Q5JZPn z=EJSfpEWmC4mTOWf}ZZ)bv;&^PRNzgK+O16VIAdR`rE1BJO1>jrtc#s zjy?j%R?Rv1G1d>d!u}uWfFgy^(CRmAMHBd;ZQk z>(OM}`KWhDF4~4VcOp)F=-X#R zZrEBD>eSmcUkg-1gZ!R>gk$sXhthl5H2G+&Wqb8nlxK!l)NJ1reLoB9ylJYdG`s~B z-2Ok(J(*ZD??*DF)$-L*OnS*n$8BKXmVyV_9QOc0LpGmMbJ5FaIdU*5AuMgj zI$&00g%I)`P}D#FlT{?6;o95*5)Oy1CcBs{9`7fhO7t~dK5MgB){7ZgPolK{C6Fw2 z$gU2NRHLcpxG)pdXxKy{-Z|k$9Z0^H+Ei`ZZQy5gOjiE|}0>ifx{mr9eU&^P$~0qw!nCcWQt?u|%6+QwlM?*-#k zDE2xmwZ+QvEIIQCp`$~A>i7|fbnudGMX2-VZZmKAJ*b8kp}6eH*?W~5kU^$o`BBtY zjWK1u3M@eX>sHJp(wXok-s${Gjl2ztDI0@RctP^ZIAjTJkew~$7*t_TdO=Kp5Kdb_ zgibDsA!xwC7=FPr08wKneVZ|o#n?;PrnciHXdDY|;^opTT#&(8H3H(jU-OSC8NdIY zw5e%i)?urlYjh3UnrQeKE0dAht zD$VN=pFpxlC`#Bm_9hxjVrgdl-a@8Lnsx(dcfhKmt9V>cL%lRGit7HrKM}j zmWZ@Te;rSzbn@uWD_f8!#KBG&Z#(FRkx_k;2CZvR+4g*0$9JGyqk-<`Vu}M5jVz~=dPgp0NaB>n&vJelR_Dd^MDsNdzd-u`m$IOn+OFdn2^LYV;b8B(rMvC zCX>~kT^EQ#Y!a#x$>m);a!%fxDcl2088ssICeQFRHi3dFu|I~C+z@K10I8rC(Gr`$ zvEz-Ngaz71C_F!9{m`08(V1nS$$rfbL?GM;YZ3G-aqUK+i-VA)O5s8+M`C7aQlY~R zVr94OV8x(V1hYPr6C!K=wPYc3ie^6W*F5q&i0(E}X-seCS!7pMH7OQEr|c}2q) zw1d4iArxJFZJMxKAfwSX)>dZjcnLZV9U)|pr(Hlx)2laf;FKoqy|J6N-Q9$6Mx_5f zqaf2*GE~tc(Vk^N866TSrMQ@%0~`hI#@eI}897^YOnGm?3H z{s?MmGy2r4T{mxu>a1=t275GDQsqQrC@ zsG+FkS6)j|+11+tl^huj$4|aeh8YW3w+dqjTPnKsUTGR}q|Z7#>hSv6^sK8_{CbZZ zZQ;S9ew%nWP_hsFAP_<{rA$V&65w! z{zJE{k-Xo$H^-vL8kB3k6kRxQp3BIQF`pG;s=PDcko&WR&LJE){aO1;>5dpu6ZU2+ z>Pk~)J{5Q)zdk05WZIG?qM4AyO)2?S5eM{rcCM4KBhzJ(Aa6U+CJoZW91w3ll9RWf z_b9lW2Fd|BBvbq4%}AYrToYNlJelv_x?(RCiz%A_Y}}gOeAT*ic>Eyxy}wIkF@ci0 zfjP%Nn@V1-@cg${8{Vfj&T^NGhi$73DZ{5)rI_4Q9JP4ON{Rj)sq_H_leB}58%u(BJYk0z=r0%Dv@32z3Mf9 zn5^>>g05_R@Svdl3jOQ;{s195?$*C)A9dJ>ISNsOtfM|1I}ctxO$06QW}1{NLqwMe z3oKGuWNk%x-4Q;(M z0nJLc+7h7q%F8EO%m7K)XJHJ!oI%|;t8}x~l*~$p_H7yVQSuGzPXSv9I*a;*f(e97 zky6((1MdsqRyTk{khFjf*Y4EL)s0lJ(}6$ZU*Zd!&n9@=UbLT6Oxvt1b8v;Ix*rzoeZ%W{oSEkBUT zRu%Ar-crNrAssyzkj}hD07TzAY)?XY7jttOMiR&!U%AjKx!b1AF{E#s2D*9s{ctZ& zpBb`bmn$r~SsYMl%4i2WZ|u9ct+#j=R$K>YTI($qdDBzOXu-xp!Y+NMOpD>k18Wzy&FwGfOV-L;-taF{KBc zt);iZCmzgc*Xmr%3 zDjnLYm{eVtL^Y?|&(ZJf^ z{Rs$&+v1v0SQHmCnf0;zm{`7H#M(sQXxJ#>_-G_SY3?a0P}S&zy?{}6^w&L(Wmzjn z2eJ7rSssUHp6~t7Uw9GkZSFQCw)RJ9+A4K(pV z!HUjFeRPh~+{T%dqR6~C5V#`^GG&mcv(O}m&hPxsEgUH?pXZD>wcS-Q7<#3X@$6nx z0B-#P1vdd0`me8S*+`H<(qQrjK%a%>GF);)y~;w@HNJgkxY{rO*;;L|3W%sz=*3&f zM&2Bz_^5IZ82KLZNPyAQ-AmZwlnZY@(*K#j@&!~iCr%n|audv{$?2CnyW@w9Q# zL;`w%M2worGqL4kpOg{zHVa!0n88bIN#GPTcydM)FXb(oZ58f=4J^BP@GW74A`1N% zMiJnzlT#_1d&-lGYQQ&XL5Dt0BV|Yjoy&>&G_5*qWbI`Co(xZy$Fk? zw#?-J?D;r6u-1G+h4cm)%DmgT$WKHTN*CRLjs6lhkcGVOMG*Js@fdncx_9$#jZ;fD$jjNpF1sIH?7||o7`Zx zg{)7UJd9c*L+u(`CCklodVMLi&qDN?)!p6t&#_?N_mBzJF~9ZsF>5jRy^ly!Lo{DE zs>7x8?8?X+K2LI8t-SdA0_v4=Weno*zbP{mZ(rhWWCdrY6O1c^51Am5Mp0@|XC+*< z_AGlcYCk*TD{f_u)PZh4RS%A{4gWQIVedik(7GCq{&ueC9vogb^BwI0KEZhA2km7p ziHmj%!Ln|^kHuyvqHA?df+TuHzX?G+Sq^5L5x6$k5LVsMitoY_HssueUNzaJV z-Kc!{*X*_XYd(%KqR(d4!&b!llNQ+3Ykd>RddcTTQ=h=Bd%k}0(*=hspP*Gj^k8(Q zpGc-0^bf?51>f><3#9N+7@{uLIGn$>X4M^c_T#u+%H>8vk5TIpKqa}_==gWgHts2w z8IdLO1Yrfatsf6@2^PB%&qHo$N%Kzmr7RNmZ|rj<*X>Byf^tAF&U`*oUW3D?jxQAt zFe$P3q9205!=>{Zmb^Vy)slfejZSF`-FHd*h4p;GUy~nyDCq4d@^T-b36gc*%>8Gr z;7^&+sPX=~5%|ccA8zj-7ktW9bM@WCh?JSKVU}}1RqY;0AVr=dGBfNw_twI*XMs<-? zB1`LltsFOn-*PiudfPjc*}-aT(GLx;_wc*}93)N9ipEPoup=VPhpNK^r++Zi1AVT8 zC>pehCEsz7mp(uel6hT;#5i}pAf9}XdpFr)o3li`< z;qJQS`_LJUg2g0@YV-YEldeAOR+JBK5Y`zH(JGxzGlAD5+tB}^yj=PV(y<2Z2=Lke zj@BdMiCas~All+E+5Pc@VQ`)};+m(E@?KvbR{y&LHn_oZM>!FzDxAwtaTN}6AlBgS zQlsD4aRC4E@e7(Mc+ImTsWokF;F@>WAkJ&{>XE}^R6?Ya2$VAL1`}*W@+a zzp)w_tmq?RaEN&^Pc43E@B@PX-XPbBVaV=l!L1nvxHl_1m@>7ZV!=iv+1mem{wcvy z_%8TI`z8n+1pd)1eJvfSS`S$N-BtXnmFg2?TM8*S(46HzzxZ>{$r79!es|^W(sVlF zt07`Q#Ue5%cnf_;!6w4atp9g|A>MD=-Wb5J)pT4D6a86`kIU%=>i=#~p_aWXz=L-Y zO9!6t>Fx4Sz{mVviJ#kAzkp$p`>r05yAVH;%%1Jj+Cl=fvisLT|LP-DjUx#%&SXVvxqQP~y zOS)@+AAv`~5c9kCK#QyVEXB0nR#k}T8-CvZ#;`_#X3_lBr{85YN7vGZ2s~r${@w43 z2RFL~kA)J5+#Usuv;J=+a7Y`g?s3fASm+B_?p!ypja*jZ65EXIWyRN~SV0_B_rT2T zSS_E%VKqp_p?~|lV&WV|T~O+XZjp}luu}$7?Rf;r5!hn9WPv*4?juP^H#m_=z9MkaBHj-7}isX11h3&FPy*t zqnGVuqfK=J^Ns!Xi_xtnRFX87q!+wO<*t3>FOQu0*6Co6RB($42!7sLpN<-il zvBh}mJ=FKmk$$MWmPE!u#y6D&ndCj@K4Er;|ZwO9lMYt&kQF&p$w1U2vpe580kPcHDfoqbpJ59I^HdG1KmAA*L|>?>DS#h7KpL0&#Q= z_lp}+DW%8mifCwrjdM7d{R?>LZ(TD%Uv&5<=$#da#)AsXGX`;smN=5|RmT_h$DFSZ z$bznQLn0y$Cx7A3VfRJo#ZAckp@vlK1-U@$%zx9?q3-`^{8V-l=!D`Q147AYFnAX!oIIL zb|8TaI%!2spUPb}w&U1D@U{9*NVgH;Dg8|85O#l+>*B|eD2(2VOoHp$D`~;{&=R`f zq9;&mq)17@R&6UW*=yMmSQ7p-B8m>4 zNMtpt^3Z8(B?C*6h~$5$4Y~^Lu-@rG`)Vp>8dnu^!p;uOq+sbBoXE`4=RD0QuPEHxNFL`s<^5b?@q>Fu__OqR`r>3T-u$y_oXMYOgul=Gt4I z<*@5rPLXoq6KED-+K-8(nE0*}@qi$%1*W~cj@6b)C%Uyjr}X9Rc(GvfkwSn!1IIh9 z@dI>D^TFa2KA7{8P?aB;Qy(VjsZ5)PJc z>3pKLwNHAR5ayG)nTSknSJ*+tfyE!Lmc@t|qm>V|2q0L8I z8OA$iJgrM3Ggu^qq5x*Xi4jv@)RIVHd6(iJ#-4IAO@wf%n$g{B2iKKFiwR(>fz$hp zQyS&6KdDH9BN#hCG0U4odxK;Ov-f_<%IxdQYUnAh;NM>2#fNiR^bQj}gF`qL6WO1j zlQWqnmo+WBjfrzt5u0`X>2!V9a?7~wQfZz z$2q7Lqfr!etcTn^+DiWu2fh#*7mR$H6lCGvMQH$m_v5f`mk)mPM>Jabm@oX+Ng=FE@gyL+-T@>ynmlqh+#^B|xvU zA8qSDwJ*B+S0Xc-;c{g5R`;gtdg&e?z4%4)q_%Lr-Yzh3P!NkVhVX9+M1i&_0cPNF zgLII77ek|#3U*B=0S+B?3X>*5VnfIwsyp@T@ z&aVzd#mCbqnYVihr9KiZPCYZGoU2qIeJ!=gEaPZ_3x=*kAYz<@l}^_x_gcY$hc^Z6 z|1ZlB{N}Px1Ob22Ard5%Fag8G`H37SEa;X_#N=p!2fN?}qg}gJRHt+3>#&w!*IxXE z^9=smwB?xzVb8yy1LwZjb-S(trQ!H%nCG&E)|ytqJmrrCavmvhOOT~E-%(N>`cg^& z6I`C7e6JVx4HGBsx^Sw3a#^7gs&!`gp< z12Oy6$h#0R3%uMbP(|fZ5SRGmk;oiUgc?Go)KU23#tuP?q=MeslipU{pF>PyK%!5+ zB8o0O(3ZQheeItFd|G3oa^+E$Q9}$9C_`F4REPbeb`w$Xjz{rmcak2=vW)b9oX2t8 z@wC;VHIjz_J?6C;VGxRLSj35>NcQO^j-if`T0@#pgc~t%b~nX*tK%1T{SFeZkY5QW zMtIii1+60mOcVH6xp&NuO{*}SN9g_ir^#j~NWGJywU{nve5}JlafJs@1W#u~aUW8% zBdJ9G+ebG4B-W&RcoCOXGK&EWpMFzBMw%gVk%Tb@GOfZP*!fd-$ofz~KW_1fgJhz@ ziZpC+7paZ%mS3}SIY|$g9+s$Wdd^-o>P{4v$N{dD2UA~^ae(Advo>v0EDd;6LarKL znmpkx#2LpYx-phaDjY*<*XVI z%AmMusRRcKXPR_G@rt?k(-Hom$7Yzb556m35tiyyzhS@t8>xf?yp^Ut2-@Ql#MzsN z=q{^A9NK9(+cDX&P;{*ePh^^O9mw3nv%-XJQaFZ@2%N_U5NoMWHAFv+s6hc!DZ0Ia zwvd~3ZxstF0GQC|aSh7eI|nShHTQsxe*i_~;ZuweW*)i8egB-7J1)mmm|f_mRwZ=;Oh{d{fsb9!TQ#|%;hguShkADzfAb8vEyf~PR{B5 z$DwdXp8iiY1GT;;hbIyF7lF*31F95gV&*O;v{0MaPv?H4MT}ZT1$dsqwbGMtaf}|+ z>HXE9B`g-g&tWt+MWxdA==s+hUP!0_Kyv>Lcs>6j|Ef__Mcn&=JH8KM-h98U(y?Gg z@?(63ouNH^qW31kFgJz-V=7D`{X;O+`HqhQEiNzwo8LH*ALr@k!rX1?Lh3ynt5!#} z|7iitrie*?UTH)aVwvKEyc}yLWyVgB-cZ0_b3A6m?#1)GvSVbo##FiZM1=PW12*{Z zVKt!_(@SOr{J0@8{4bT_%(1_GLOIpO0Gf`A`VSUDd5|lPq52gDO1X#s2`G{;SX^@? zoL^w7=x-?;i@X`rg{d^{cfEcs@rzP5V}OM8G_F{)VZqR!LnAgtYc|@%W73E03Q8qz zOFt^=V-@oozEq5xS-HwXyWmKs&V9^qh97I7^}X?j)wvZqjoVhib9ibVbK#VC?!5}F zzd0cOWeUS3l^aGDsq|ohsh(GojG(+wX@9oYFwAXSF8P$5^V6C&ej7^Adp_S~Rceoc z+%HM~PMkhddQm1D2C>`MWMF^8(w8R@f(tRBL$|#TeT1hQmv50cGwCAwL*^fSnR+s> zZ~Z(kL2#6A5FZ3!k6J8|8%wojU$?*9B#g+s zpUr`QIU24O7G>OL{2Ht65g$P@a@$FmNs+|C;bZ?>$NQ3HldE=`3ZL`cOb(+J&R7c{ z7_u}NvL<2(b>i2;L9prljN1$K>)yM#z~q)r8pZJ@$m@VQ*Dx+v{-b$+a9@?_(-)6;H*j`5E5PVE$R^oc(P|!&dMj2L2Vvsr_wUVv-p*MY!DZP93G&~ z6wq;YfD+pC5A}sV@cCI>o@wuhNFJ4-72S~H=e&~pevHgterY#LxfT*(UMJJI9kp7~ zJw`dYWL;|0$rKc1*CzFiWGXH?vu-qG{g$o=W4TYm!LW{-3Psd_neUD?$?2@r{ptsI zkzu9y{GQJ3z$3+5D<{0>4Y`JmX2hl^K?dL-kdDlWavvWAKePU6^^-?Y@<`lVjGlV- zz&~+%XI<)u8@kqe)6aLSwfG)r>OjREYqZeGyAyU#)9%9nk->z_qQom-Zj3SKba8#m zMQmUbdqOaC`>rouslmSTrrQ4ybsC}G(}F-@p~|zZZ3*N06}#?0l>O?k89b_{5v*`_ zi-?+;r3n_$SqOj?J&da8jmZIrM% zr^Z*S|KQvhO|_pa)35&Ni&V>2Sh}y~QqKs35c*@Qw;85%>$q<@QT~74+WdCboz5BU z{acXs-)-|BS7=>gsJB}|uclp=3RVR3%#+saMZ}&fymQBSN)$|mL^2i+Cp`^&_Uc8r z!q)9+?t|Pbl1+j&Or8caagx^x*-iNVJQ<7{fS;RxJ#U@9hWq;fjpeRXGq%$AVqE>y zKzb#hV9^L%GzYq0^@hR3!o5t^=CPFO`_CY@Aq5)n^mPmIR_mPGUXJvf)}Z?6bw@7b zb*8c|2~i2c)>>KQraRhSRd$xJF7>(?J6Da=n7mw{;WcNuk9<`mVZohkg0@i0F!*hY zIPmat_3NhX7rrt{A1)OO+^Gu-2`XKG&!3+a1EqK# zncVv#q_`LP#xm^LaBSPK?y_*iO)y=n*S2Oq{8eXgYc^Q(C(MFzbZ+u~HEb@_P757L zO#Le>iJWk@T*sqB-EVAT9UghR_zo9cckOb*>+2*DCV6?OLo!@c7bUVt*UZrtA(`W?R2LQz9C9BRTRF*Px)e2ZMg-<^tCO&&F~LG z;%ZIhmF?Ks5$WA%r73!GHCv>x%exkvkNu0iw&Jw!GG9J?j#MN68SJb7r3_bGJuLTw@wTM zyl(A3>R>m?_Qb_i4=(;vjH3j#`(DC{voU7BWZ6T%a>pBp0qF2UH3^uW&dFu8L(87*kk z^lirDEk~Oy9Z`x!$8AP~-qW{s5-fUO-O2Q$;=`v9_4~tlExk78)iZxw)+M~G9P?5T z53PTVQ33#c(jVr`{EjE*j3x+aE)7muLl9{LYQ9HJ9+zIZP8n2$J|kA%#yS-QkOP4uOU-mKz}j)do&;+#;z}vE==Xk#^0}GT)0I zxQa{TGkD_EJIl>PjlIL)q??aKKGyD!NDde~CTO|R2fc-GoNRLggdYDT6zpZ4=X+nX zdL_N81PJH6$=J}K{f4)2zXtW}W0#`}UCZ;?xvW)wR_KimN3(g$S5gNA1Nb#$U5@3z zJ@jx>ea~ksWrEA!3ExM_)bk%Rw8k38@F2jWw{Ahyfe*YNDE+J~X0wcuvZ?I7BO`Mb zBD4~pjy!yvPTaRlEYZ2n*OFIX&*)>?Zb)!j@=G=g&6HO_d^~eB{_OqI_tLb;8e-BA zQ6UZsgD(LY589b|+GWhvo|8F|yj%)Asc~6T!SMa5V_6znP*e;`N2(a`@R$pKpYdk*afYpE2n6p6SoZIm1(Es$SUYaHxIfUOA=) zylDOGm{m*j9_I(?2(fC+NEU-jjJ@J4nC+kJ$LWOJNX=|yS}W!8-Ob2`*v4O;C#o-E zO6-hCmpuQsmi+8D_eTBlEwT%*LX(-fy;{wOOY5<;YE$Ws2IJT0P?v6(h9-p&zc%TW zh(;_i(Xi7i_1B;kX)I44fQGT$d(F>ml65?<1x9#2T1HcVZO!QBd`vHP$4m%e^Rk8m8Fh^hjSL4e^52Cx57Q#>^EZoPZ^@ zzh7A()LMk?^V1}DG%%{(FLq3~9OHaGqxi|lqj>DV74~N~NV5Ec-lG?9GYJ}2@}#Sg zB{-({6Qh^UhRl=l3_b+67K0G4qPcI7+;6WC|1a$711TeUYIPEZJv3?=UXhMyHjMw-DMGr3eUuL2Xy;r#t^50QAjo}b zxwfx$j3n{=1-V+7CY$~O!`gyd8?=7Vt?Xli^3dy(V1r|_0Oxb751z}O#hHDC6}ajh zj-Y7^pz_{&b(pi{DhKOQv*eLNdSvkP15f2uJ)Q@lufOJceG%DRefs?P>}W)a${KTU z^pq$WZQ|yJnBXaaA3hZz@z2Mei@uD>nwY3%czqc_)%mVeGjABwy z<;OO_)X3%nFTeQLjD?~#l!p6`Ar}7DffgxQ7U%O{&ftxgzn$6{4s@;i#_e`4@*2(n)X$yMeziEu$b^?l$lS82aB1COgG)k~VA!zPU>(65!J97@e zI?Xo|K&kXbfr25%41Lhkn(bAAvt-Q-79c)xReW;tnY>@}GUI8y%&JN{tB}aD!1Q8t zdFvSVrv}dNB$_1a*hTw1+8tGp^eP*F4fe(87xwBEqQ_u~GuvnsX2Zdt@;x$(1t!4s zEnSlFxnR)EPkcSjtMWzjjO;(?JjwT@Ce1Ks=zBrXdx@j~9s+3XP8-PCcCCK=@ISRq zw!^o}iQ^|4wjo|@IZsFSMwRA8U(!gaD!;oe@0JS6{7RT9+|SFx+kJn;<9(_05VCFH z?VXL2cfImqvqHab{&tQ4kqorBuPl&8kz81t9zAP*f;(joIKDs+USXylilg&&{@mXY zlieM8=$jCZIqo1*wCbGNkL0>XnIcZu?yKzc{4+)|{Q{tv2&{t7q*iwm;2WWLn&PTN zCstN}&0zsiTpEO;1?msogmoAL`IU^`Nsj;l*B(`Uiw zRm=5IVf7o4hrUgY$!%W=n;mun&~j;iaj;H-L%TxJ6H{ z?v;WcHDWzYd!PP>7D~S7Tzb27pDKV z{tvo0k_1ytzL5$v!yJ6{T914*OqNpNn^-HZYF37hXecG4j^=+ji7>JH|Uh-h1t=J1*u1SCJi~ydY6ft@z+OQ+kcUWP%cOt=A>;P_U0* z%Bu$6H=L2hI5(|h0O6S8>eSUeLJR-*lx~)ZOe@b8zJdw!ZAV_PA{bPz8I~;?T}4y( zX(#5Cyh+t=X-HY3b$)0{e~L87y(hI#E_b;Xp%vrw0`Ee!kSGuh%KE+Xh_BrlNHJd}{p+7>9zmHSgp;qmkoDsOqQYsI@yx-iw!#Ch z8)-AcK`H3H;SyqCZuJ+I{I}n~;RP49b@dyC?|Od^5ItOlZ<*_REcXcyOp1drvm>M# zheSW{BgY{sf>hXE?~6o^J1)B%bgTIo6=GC}v^;M9#bA!|MB$JaaA_o z*YKgGyBh>ikd%^^qo^R=9ReZ^(%oGm2apEo?(S}o4#`7^bT{vCe}B*WKOfFqGdtE^ zd(EC}PF^h0#$FN18;dyl+B8}VqfigRnl-s6HdNBi18FaLx-8#l^m_FNepq{AUH&13 z?CZa#a~H|2GUN@4iI2)in*9Vcna)F@{<8YP9is7}eTn)eL_4AkG!Z+f?jI|kmH!$1*G}r$|5T{6Fu3(p3vy}-4*YpC zk|hXbO7c!mw6NDv5>Wd7LJ-;B(9A^h{f-4Guc?PfPb3f$%@3`zAgPV@4uXP zq>)41ire;=ZFO20vZ^kiJV@~4xk?xXj?Jxr96b-hZZ88|$F-J2<+O6=Z)Z*U+Y;<% z7AI!@YHU3vDNi(gGV|yyS;n@oKtIZNMVR;W1Evu%(jBVnPklNU3>!?%SI^P^;GJ*wa8d{{J@K=KBP4 z0+Rl#uxPaE7kD+pV}3F*thqu1=Y+lDdJWAu49_Z2U4oHT=mYHiEMXi*I6EJ5sB6=o zRQj9KR1b}X3>|tg@P=3yWJqgtC{42_+b!)!RA>N>Fc%@QkH9-mmL!G`?UK>_+ehxi z7gXU|XqKNb2L9u)7zsz;91%|+;{9I-5mCT&HOX%tbAb=S@)_IdTvTu1B4Fn)T5C7a zWM{8Le$l7oXw^Fu+U564NuO5*^?qL%(Xdu}@F=QcXdTgF$fJS!B^vD)q&aHzfQjSh z|7!Ib2w5A2)h9!^HYF5ra;0WbWc7_ssvBi>{gcxJ@yczDe- zFNiSVPX)famEo4`pJ+72lh9|C$Q#@fU)3RfSg=F9_H0#wZ-f`amwFKQFd^g%AqF0j zhu6rha4sL=r|8`>tOS}}M03sqSw&n%?V+A~&4^*d0&%=~LDiD-Nw8CF2V$f9K`OXI z%zWVbRE(5H2k%e5-&rSjm-_QZg&B3pjebFnGWso+f$aL|1N$G^h3*hNk}ui{{T(aj zw@9QQ>H4yRmXHzC?<2P9&vLe~H=IN4+;rP;w_KvyYC7n7thccKr(U3LufA#vt08|K z%EY3jJbT1JiQ|dhegypbP)-UiRlT~>C=>ItlkK>PdbF$vtxU{Z9(N9>ok3-b83=7h zseVK-s7lJvGfUU;wnfhvnjDt7-`x$XcmBbZ8u7b`D~JfL@#(39Sr8gSWnCGOK6wBrb~o z6UlVFloyHO%|m;NaF-Ga-Lu)o-b~l#1k$@uzGu^zoC&;(KXnJsfQnM1{ol^B&+Gl3xnD064Ov}LBFE0=RDL+ygfC`P zlKa}FkZYCGJ{^OsK!78v0Ie%d80Z-vn}}7dmr8O)CM{+EeGX?>z&ieFKJc8_@pdq? zPTQMM!_Rel{JwdA~wLfT?_rIiPD2NwQ~Fc!E5JR%&jA94(;?k$Ksz={v96pK3xa%mHXHuNgKj$eyLdP!^htS-V+$Hz2( z2p0j7tYc2PwmfIyl`HXWGLz_$#LeQ`A5n%}eOY@XI(p`vQ>cN9o$gW0uJ{#$MYk7g zo1A(FPtB!bzC62^_h@*rD5{}w=chdisns8cF(yBpl)J0eo=L*LLV`G-)bppbHGQx3 zjemFbg&fxcV~6X1sJGz4L;lvAw-1FigJ7fiDg;TNcp|cNBZWkp+F}v(k_B&s7cqov z(=+Cuq>I(oNa=32rCIQF9T9JYcSuji2}WA;O1ocwi+qSrR&)Qef3MY^OhPCg9@n7k zY+|=GCN%4F+#QL#q1Q{08Y4^jmvIMVD42Px`lE>|bKhD*x)+D6hNaG$5;SVOnOK%p zUTTuqAl|VmAFG zS*pD2+4uf$cHZ}{T~cWmq!{dGW`V~M#q95y?kxRmJ0)njQ8q@Y=sgjU0f5BC{)fC= z-kH$~pY$~8{g*C~q&36j`+uq8y6F8dW%rJ>9?sMY2nyR9^2tma*{b1VW0}=+v*<;k zy!jB?{GC4#SFmhxMW5xoKHghp>~YagO;FyQl zogP4({TaKIDooxWDWf4d!LNrxHmJ{Iv7qDw8e&hG_D??oW5wC8WE^eS-tJMnEK0q` zC?l1_V<|GLI4uT=M==GVW=vMzD+E31SWW)%5)LrX{D^%S{F%1+IGJa-V|r1S`cb*bh5E=f zO(!(zehEb)0E+2wAcj^=J!Xt|?v{1e*<$E*>V!_R zC&vFt%y#O&C`aVrM~L|g*k3*29f(HL3Uf_Ud1P2}`c~?r(Ye=?1FUhrvM$~~dsGGF zQCcdmG_+_L-|uaqEhPBmnGdP2)8lRN!fX_97E}2Rd6NtAL`lbmG$-Dr7nK+)15{OV zG-{Pk%2L|4xFO7dIlqN1YOQzwwS5;BMt8}Z<CDa#WW`307RKV+}Ymzaq^6x z30FR@+xct6U-s@@kKAN2nxv4ZCe(L8bv4PnPPj~F~(_@ZO*D@83oc)(6`O{2=zb0l7Ci>U~6x=UA-Frdi^YSGn z1j{5*C#Mv1VGBpJmhmCVS6b8L4OiM;gSu!$=e(y*lbm&r4OfDlb;+0w4b;jMy_71t ztO;Jcq5w2xbBF7J#epG+E;^ z-qn>@nQ`h)=AG~VYkok)>CNT0{wms@b^xBZ&_ZGoDb@}g15t!9N5f7jjQrZM=C;g) z?Vbg>*S^vPUW7hWJ3NNMCZW+x>-Dw$!i#vwtc5%}Ov6l#y8hZJJ~h7Tm88Ouua4`# zmH!gvx1EQ6U?vE0j%xx^XXvoQA&t{vQLPB>QZWki{}^A-1_X?ykPeaCXch(Bu-V5r zp$*Z~$KLTJA~MyA8M98z#Hg4wZW&bW zk8+8n6r&z5(CAuJE-^dFcJKaA8%+eI5yY8(`c5El>1o^F6-^=sN9H`cRAO}Y&!HnS zt9eFfFNJI)3)uCAcDgdYMqHlWs=u8x3J1!I9O4Hw@6t+tH!R7hf_xUY@h~whkSHEh z`wwT3S+-!{fof&h3Wjzm@CjdQ{{+2VmSatrxFw*IDqCbv{#;<=)oi@dGvevvEBG=3 zf@3nk{^2o{pIyh$I`)#T8*&5gD@|tQ~1#|ZHgX-?Dk)7-a z>!qN~y&dgn>b`wR1tc#qe|g+-c&~hXd^*ejNIe@;Ek73|dSe%S8mUS|N|)!v5vcUuV4A~ZFcr1uIu zfGs|knHAO|1Zd}ah_9B$q1Urw?pn+J73qd!UJO(Ihxc!HG%CYx_zvX(XKwbVC8C~8 zM&t7_!5Q}K;$_7fTtM}{e-lxz`m1VO$Ua0x?@+LXzwH9=4;9<2s=#M%WQFr5S`o3x zBh-LeL3OZEvg)1lpnDF7&XrXKwqL=C&MWqH?|YbZwdwO<%{gTVJb!EZl$MapWb~o1ii^Sqz_)0 z5L)y7*DbQ=_Nag3BpZcm*b^p>8N3-2tIV;`o>{lnUq&TfUu$FKSQyM7iM=^Of*m6F z;$JCR3S53iLq!G(y+QxYP>GMd$*Q3F|BC>g|$_X`JK=*n;Pw`Hgd160sC4vTJ5ba}weE3CLLVEtK|5R;n9 zjFX)3^g~bS7_hAd}DD0N0 zPa|(5R2p}i;Yr<+-_U<2-oMkvVlL$=?i%*i9U@qwTXSb6VSmuVJs_O&R<$#)6I74p z0CKKDEQueK9n(7uNIlgU$(SX>W1_?48;=NBRPse;TdMl|3=D(djV1#PR{W zQi7)g{V{&Pcc&p_-DLY*SX2s1_}6lB9uMFId_|u%BZ_-#brRlN2Ke>Lq$BJL?Z zKVjShZp*AFv|Zki(!310Bk?zGhXssz1=vBUrWl#-0vuhvc|L&VEw}*e%<3aMV}C;# zR2+DO=z@OxEnf;XuR_2Cb<_m?_~*XvB?_b-IL!RR0$)@d3 z*bI5CR^-(B!X}R6-P|tNbGZ@f-KpLJ3NK^ysASP}l^PAz_05Z9SGCSV@sCT$v>Piq zrffW?ye4!5v?gp^QS!TAh<;ZT1XV+?kPk>=jd^wnQ!`1+hqX!FCYaKR6Z zRF9MaR;DnO`g}-O`n5UC=B(|e&KNby=|m{7xaR|6P%ZKqcsaN<&@uKG$Ud|8Le#N|hT)4h*UN6})YqW*QjvU*&TbDHS4}ziIi5bLl zRZon*w7rzf(DKpSF3{-{_g^_&9ryEui$q@*F~F_j(z!nKHYk#4EdP+P3?u_;$AWK` zMiTxfF3*0zXI;!9i< zXYX;5%Dr6Bes3i6Z7LTsx!+$$spOaOCL2_D<0n)Ze{RW-oj=+)({j0YhuG5AxS~Vb z(1`*t+1ABwOGkkIapeDtlL(I*=8k?Uejp&tPQ2#>bs{B-XU|GWB%y3nz~H_qIs>Ak z@HC+&Hh^#G59F9dA8rr{fp76{ZCr6Ld#?T;2evGEgtUKmny=Qe>=6hp$VHjqM8)@* z4@Y6Wu0F$fg|t0LVHG)gY7R(38Rk~0*^dc`5#=>fvfVf>l!aI#-2{{Cy|fMo6g*tkB zd(mnDVPh9iS#kT>hdxK#c=Ic%*Hx4qC_w2H2_GUUG?9P=Kq8F-k8Q7V>e5qA*s;WP zG|{E2im=sxM`dx&EQmDx+jY_7t+X7vOc5L!bIM3Hsmt9bPL?VHl7N!4XKrzx4IRZ_ zVKzDU|2F@gRzZzxlQ#!6DKQ%Awi}gJzB`$O?PyOg51-?0{p(K(6ipcqIV8G7M5}H> z12R`92e(z+{-jX3v)`j#;0O>WLdCH48Kj+8)4i7gBZb>|GbmfABhwtg;6TJG-zp^Z`xkihFAV4 zeD)1~4GKtW!WDOzjf4Do6*0O;^Fl9*>Y8SNZckfknaZj^XqSj6$wyI{xazNxLO#n5 zu0YBVnoy3caPFK11Zyve_*>K-OFhT|^0zd+Dn7cJ8kVJIW#6c1g(DCQ5qeD zz4@(OLt{=24mX-d#2^cm{J+c|!vr*^TkuPAP8&2LKXt}~>36R18-bHLRP1`%ct|BJnCZA_;nC0e-E9PZ)OAKFfDFt_dU6 zDfld5eV@@x&*#vJDYxF-&F4|m>&i*FeCa(=kGoZ@8ZcBgywWTq0sRBS+fref_%7#9 z0%*jFC8KJGD|#ER9b{M)u)i>cxf&ujWLE3hxZe?d;6bey`ZPxKK#sBXN>1TP8gbo? zUuOqkU35HnL^yLd)DbQv#`kT_0VxnB+#F;}pWynH#-Q62gENguc-5GdDj9;mcY6-E z_i}4H0ht?v2T#GNK(mT1`W(9sBQxID$#lTfi_Hupl_DZE)}Ciq`zC;a_h@3W?ZNb5 z1Su=;;32AYsj?BBPG2j=2IcLn4&FZ%H;sj_=EXJD{LYhpyB5Au-G0cL=F%3$Xb9E6 z3!+m#K#MV|r{<@x@2a~!i>EcU&b06yNri*IAbusrd(S6yuuS{)pF~GY;@sTa%sNLv z^txarPnw*l5YOP1Z}Izrw#?y9j8B8Pa(h7Df9#vspN2G^R_8uyW^6Ayksr{Gt9GYVznYcgl_Zmw5Z%E~R9nw9dZDLrsP2_F92 zphcv&$!z1p76KdkfC_`w(M=UO-=|Is;xsHT6H-`Pi+#9Icb}$uUy|Xu^2w zRl2~qZQ?ajLxOK`)9*3?p-eJj%$25e!;opM{Lgtb_(VT7Mm3~o!r6$Dr4T0Vh)Qb| zM&Xe~c{>qd_~tS;Coyv*xqnd5+*g;ql-8?f6Y` zS|O#K=!P_4DBO+x=865+dD!W1*p^shH^X9sa4{VEU2Xf-f{bW85fol~QZlG!{YQER zX*P)0-J#K#S#~bPOJDP98Nn5C0>yiPSoO6hmt?ecqqaARCqnvH$C+OJmC{9Sq2wPe zvwswMa(*mJIw+Zjy}1mRRnv8^OE;AmmK!j6SZCn8Dl#~lKa#Dg`#DOD)pcd+QHq~5 zsmpJ0!#@0Scd=MLdBCp4DqD3hoWBeSKknoFh?kNI&x%g6^ZoPDa@nho8gr7!$9UfK zi}b8-qMrQZ&PPs5l7upunj8m7oTjm@as-Uj48x}yU%jujyI?&uQ^oA?R%%V*ifwXu zePy5gWVYi#tKcVJ5$db{msNg7{wwhPD_$lK*jiHUmM3`|r&SCBD~VwouU6yotiUvi~lEHf_LWf%&zN*q5Q zN)MiJqfS37Qs8Rnj>+OVI|>>+m(heRR~ICl|I|agR@wI>UX3bGu-%C;m6>lNf)YJ_ z&g$hOUTT1z7KAV+H*a#xapw_kwsnuu-K);}WC3%zYPc(fO=3w7-}k1mU0rF$38gMs z%Pfdy$1MK}iq{fT&{OgXxp?tu3DwO3d)4HR4fhnxc6hwmpsFhNGLajGZ%C1XU8w{n zn)=`T(%o&2)t># zXl12jwQSSey!l=#96c z{^_BBD(@?*?z16S>7%DTADMsUe)zkY-+GXh6DIL-f9g$@fZ5+fC0!Fxd>QL8hqc=M zt@Jb0LbXQb{GnwjwSd3O!IoFg7QL{)c6QT+F^R|t#D&hBjs>Nj#Csmgaxas|hX$$4B9%UXNAU$5uv z&Z?IRBk0raf6S;rd6BF6_fiDpXoJ`aJ2BG3&NedW`D2NV>zP38$dd>ic(z>w zlevmfJc>l9mSs?H*hnf0uaPqTEH;Jt&UGpz-qyT+EhH88Q&O_>!Hzyb*u>=6p5B#7 zS{?=GRJQzg{{p#haEFWMDDN8^;!Ea`_Fr;5k9j0+H^aSK$V_@%H(YFv_@RCR z!t9ZgnkI&1q~IfpdYroC{Jd+M&uB@#q&b92jPCBi5Q@>j@5YBk%e7&{E=RGzB7?Sz z=s4~X#WS)udof&6DF=yzlzAO>$a2>4W8#ax-M&~A^nYPh7DQPG>~B@H^%;q}2?Il< z{gd?3^7mh`)HSsA?4mv1F6T z$aSrall6?F?@RhqD7>tMXFksmef^CQx^?^V2JC@Ivd)q)X|W$Ss)tD(}ln z2LsPxwKuhL_V@|HpG_)gefm0AlBAzEg<_aCS;~6)JP*!O%-+-Xdr^XhXAn^_^AZPV zaPpZdieU+XzqM~G3vNV_zzDiT^Rgg*%;*-MmiKE|dKp1p99OIvjE>{SzqNyv9?}ce z&?B~5{WOw`s>x&()rHf>lp9jFfD_7@5$fZ!eOOE@#-GvdxBAE5bjx2q=S)S$GsedF zlYndY-LfbCal}Zp)v%WgHW(Q4WSZsTgc9Vsu88b3ueb!WEvpUVedB|fn5B$dwnRY_ zR&YJO*&#=bYtJ30?P*W?VNBsm9?>M~zNAjmtEEp(1^NFxA!(bciy8ZfWl=SgO}bXg z&JGiSti-S5lg5Zki2|o5w}npw_lNqxddA54jeAwkKI#Imm!PLO)3HwMx1aL~-cB*8 z65)A~8L%vVL_f{4UP*OGxge9Q{#)>4e#>E%F|}Wi^->K%8}dHJMg!X5|9}G?{+@bD zbI!EF@AF3qS*WcGj2rylan+E(O4NWhC0Js@02UPLkyK-0JhhaR#n1ZrwfT?Yt-@N; z9Br@t$(KxtNk2Z1&8McRv+cw}P;GDGsRMS{SW|AFgT30*o*zlc3{9&<4)77DPjty<_?9VGU9*dJMpxWBMO&POk;`p2E$Wr?BPOQ3vyg8c=F)T=+Kz6f?V zinqYP?;F;7MphKcl}Gtw)s|{zXt*j$HqeD6F-zQIr++zO8t!moM-(bBxt>ID$Ko zR{Sx`-W*lC*P~RK86Rw{SQxQBF{|k&jHGINq&|8Fm5`j_+Lg zJtC-sgBRmIFddW)L1lbiLvX@=bPLbDD&9@Iz0_Q4Ay!e5aT{jzrfDCha9+shnJGH` zwakNpALBG6BZ{IB#>BF{t{?>uu2H^Clabh$!|y03re7!+n zze^uAT$IwKS0=jCUU^?39FEGo@I;1Ac9yP2Y?|=C?%8_44b5Nt(N5$4Ji1~SDg@l> zs&fcl60~9gOZVPU5kQ;UgtI9{-yn@17NMx}I*2^+9(6qMV-zTN@*KAAxIR(gb-2TC zGp)D&NNvfPwm!Ay!p); z%)X|&=VpI#{>~)u-rMD@FBip*n7`IMcJicvLhlwYDhP^XluZbD zId&X_?+G)Cfz;0?kxfpxol%qM?hDMuw|A&WkY;TWiEec84f)od7x;7G!wP#6qUW%50_W;4UCdQ8pPa!Rsx#X!eI#CQ=~Nh@tZd~1zkyd?i;^XfCcJOl7@sB2mfoA7nWP2s#E{K zZIE++V`dyK)U$)%rd*qgx9Ft92|))$9hdJHZjaA z2<0F}D=Z>rFCiQfvc}bUgAo87omKytDjomxGS`!`ONqf;=@{O=$~(5tm}GXVg$H48 z8~G7~?f#ut4{uy{_{Ln6cTpOC(rG1GfdZ-Os(am5!FZJFBvBej*u9`?qeQ&*W$J5Q zCowTm3}FKClZZVhP6wm!FPp-#hLfpfFJ|@daPRK_3a@-wuJLYh5Ll7`F{zuH6 zGA_O2I4FaqqZqIKILmMK)#orOY<))QXw1}tyA4JBd5n&1o7&1tyNm` z64{7hpi?tR3Hedxn@ylhMpiPi=X-VR{1ILve{7gkc2MU0VXVT%_|;x zY35(jiF=JwFgaA1nNBo{rGUG_^QwEawhVGcxYpF4*oVB{<`^s5E)@g?=OH$^Ea@Q8 zbx>3V0YKOCcwh>T}FmJw_?ORUQzHNWoS-1*W*43Mg*x?^)qA|Y~Zz}3>U}N6z9&Fo2yeV6V zu5rY7y!WRye{Rqk`#|{^w4%w!-fxY&U-P@alpD<2F$Sbv7;;54(-;1t`B!ZB5~3&Z zO|&_I)w=yr+@P@(%1bo zmgZXRWO_`s1r{}lO%xrhdSBFfebk4$^)eASPnq9sI|WuGhqX55s5vl0mIB&~PmKAN-2^$+>Uk4%w-eH-Blq4#yyMcL->_6LIYeu*TTr@lSuf9KP zF$qqL;LeFWplgT@WS27C%eIUd97K zZkv*n>p~m2oE!v5hi0hA%y%pdQ5g=@!L9-D+uV=edj~u(+|NOj*?k1z z1J~IqPZ@Xiv|C#l_ni>bsVz;Q%S~j@v8ZQs`BzmQKl@(&?}t`3Ktj<$m(QrZwtxt$Hl8&EXg?>l$Xm6I?;8}9x}`yB z=_ereY~nrblDUJMKF-f^GFh=rw6JH%F^; z+hcLWfN^I!hDrT}^ko{EnIf%b>OQp|%oORfo7gjm*PgI#rScV`5raSk*`ZRGEFT1rY23*L@=A?!faEQsA2D( z7Mmmbkg+1XdGfX$e|_cOXi7r>m~`{SNgZI5_D(j1mkFU5&czg8)JtMf1 zr`oV>(>KqLsheFFS=m-Qx=M}VQxMfkf9V_M!+;&ZlnEfQ(R!qE^G5VTLWKsFEV2ns z0LKvQI8&V4%}*S$M!!NG?Y?$e4{Pj1Ss}MHUq^ILUA-lf>z7(kjD1Z8w(7hq`la0~ z?+7*pg~ts`sB(ARjaNvM zads@f#E;%m4Ei>)mpm@0U|Q*T>Q@jqiv*58zz#RM?gDhf#0TuqGfoJ~bl#Js(03LD2UKrf*^~>W*aPVS!QF_O0LM2CgZ36L zgi{kBhg&LNO%XEyhNqGL8TCbz`Md4WyV)`GF41=2YOmxIuP-|pfZKT{w>jOuYo=z0 zgsl;goFuF;FUYVPKVe{?$jdfmo}o0P8YalNXkg^dZ?@_vl#zJVmT{RJkpk$enqegr<>X^?Y^w~p+*Vs73*t(6vnIEi zPrwa27F=$rmm)m%sQ|q6eX9PqmJ5ar%8M}FOf8s4x?iNVm?Ef$T~Zji2&ejbR)QQ3 zMhi0VgQ%#=(lSbrq2zrI#=rCfdHQ&p3co{2QS`b-<}&&qRr97t(}H)9tLD2qB44j^ zfAgFs7cD1-W1qN>Lt9OZ+R)R_tSRpP;OP1+hlkgK87DM4v~ZFyiuPJANX7!GdX;Gu z`)4=dQh>1yZqf%}6n)Y#WQ>I*qEGoT)q8dy z69yDh|EfOM?E)bW{x^LmiK=6xDDTs3f*MQB5puh;fgI8}oZ4g(CDN>;pELCvB*b&%ID>&HUw^`0C-VEkH zCZZ*BOm_$$qUeJc2?32y<1HY4>a;5nt9#|yVwQ&tOo$y7PRq9XbG3Zt;tHJy?+Ub5 z<zotGnjH)i5VaM{hCi^T zcbE#Hq-6GgWa7b+fS2e#b0uWmg@m@>wzk9K&_`mv;C{4H^0raRW_k#U#Jz%7T$ z=TcpF%XkvbX(`6f9hN48cP6ZER;Zupc z%$lbIU~h3@urRaPa!4HBx-pS00C%`bhy2sXnpDDRUikQo11LurFoyC!{0bv(QlvVb z_PR4gnC0@vY)kzl*q)LY9E@n>-iw(Qs822Z!`>_%WQ?w}e_%(?3U+p+y#KK=$N2Y7ONm(_c&JT0?TUWXZi~<{SZ$F(i#f)bLX*9 z{4fQ)zIvcfOjH3pb`KWxo|C8kUBHl0h(4aa>cD_r8?bMp;FIq*2(y*-zo1Kv5H^Yp zk=o|9m8?gf&W2T};)V%yOD%ie=YGG*OzdAC!Gi9yyswW4N1Z(IR8GY|whQ zgxL2`;U9*zM3dT=<|4Jv_C!;iK^@uk6A(BAfE<(upHN(R4^C)c{q)wf_(H4|VkO

AIBCl5&NP}mce@hY>e65}VCBJSwC4tppoxoqWx zfqa~AT;^JApg5VBKz69a&c1BEFKq;XoQIjv1F=eTA_!bm{=(X(TNjT*C|?BRO}J69 zI&V^&H}wdiK^ne$G*Re$_=yjGifE~+;k1$s-zN0rlh6fYAlnQU0x%4rFp^+OB-WXv*=9SN&5??ij7 z^}{kqu!U=BZ1BX<>A5SUM1Ux7L5FWSfMwZVSu|@!dPv5TT@nvmFIW#8l{k6{cJUn1 zMwI8r-+Tk|P(+a=kZ}I2)$R0@D1i^F7VMRxJ4S=Cux4E>QQffefL}}dU0gqkAP~&d zME~MIecfZ`W%>~rp-Zp#h#|22W9fkbxuCucHU-D5YSszWbM3%%@jVy=!d(j;-t6KV zp$xkW(0?1j+bC=_p5%sTYula~`*hnqFZE=kVBx9UqzeZ8iLo;kG7kUVBKITySsoEV zT~63#ig7AAYB55n%l*1=XPx}epA|DT6j-zS89;Z2(rm36_xI^eWzc#Ya(J!@vm3KC z-dSlu`M+L7>Ry678U>nv8l1=P99g{Zy+>^vXUb;(F_OeB@KaCn!{v=X&ebE)jTk}d zj9>>{Mn4n#b-IB8!msMu2WZh&fLMY&mu_6F^$vHb9O8aL9@K=>C%Fq>C9&~ubqAyK z<%Ykwnf#y_@nciigw9Vm-X~#6R2li1wEmD^X?(OCyK&B^HPw^CjBUgK7QU4%GVAOm z_x*Cg%cd)&OH>GfYGf^LQ73?2ygLmeKE8{4!+3Ymim{&X*rQrV$dkIvFY1~$=h)6O zL@p_D_i@59R9E1j!QG+juM3tquerbeVtRwHbZAzOW}&3mn2@+2xX zgEt;B+eWaDFR)i6UgbtXBF5W5_R<95kZ&hLkYp|JF<3qBG)F?>t`ov87)qHs^swCc zuq}ewhI5DsJ9d@q`{dy0srR_mwaqQ@qL4lo*b`ip=0U(Mr!wW8O3tn<{wXi8?bMKW z57)}pTfpc>Oe-a-vF{KTKwMSP+^6|NP~KA#Hs|wY<`vsWB+I)jL168S+Ei0+6UFt< zA3w;dpzU3X#hHin>2G%Wr`Vuq`cNErKyb|@5pU5hL<9DTmhvkal5f3yQ_=EVXK^|N!&-U z=38;D7jj5s0~D*mR0Td#!$SkOoG1Y18_ZY4sRZtLu&thvQ$2jKO!)40K}#ugs~?wE znb1o_`%&Wx zb;;j-@OBPa2s`QuXHqYZ%(ewjY|&5{CdWYuk>UFEI&Shk^R57SR60zDaY#QC!4UuXwHqA9LP0^idb(!)6dN zkP&##Yg{bq%ar$2a)w~ZQ<*)$K-|JAASK{8~V%ZE(k8EfHzVcrRPVcKqDA- zXr{|DB6oA$C`#(ha~6A#uu?m;HIqKz+%@!B40sl_iWM|*Sl(^m1J#v6q9ht`c<<2A zPrn3T_vNdPHpH3$nn+-neZEWinSF8&@?%_9t?{Haaa|IVwhC=h^Xhw(^p7)Tm*cb3 z&EJT=T0*iE=fFOUB zi2O3H^@EJ4xs@*d%XdMgaCbk5IGvYFt>|!L8307Bfc6$mce%8n^Qdb+LA>x^0yP6B+ygOJ<0`0lS^4syLu`vh9 z%4^u+RLY&s9p>(51TqLiKws_Lxak^jZaa4v7!KbY1jMm8!0yv)LrB7Y7VA~KXeT0S zFgSWU>IDfc)G*A=E;-N;I7WBO(++_B1f!`VnY7(i5X30Bojm%jJq8QC`sF5IW}h!N zZ$AP;cd79FYQFq}8&vkqS_1qQk8~K4V;iGO(If6>ktz!bjz&)(d|F?`~lT zEv-0}HT|>o*CDoH&IjW}>OSg?XFEa3>zW4J&e{&wWG2@^%CJ`RR76rQGt*usebxDq zBhou4l-LR=j}D~gu4Gw6dnj7mT(o;nP8^S#n$3q~?xDf=KP{yzCBokArUSMlMFud? zi84YLPl=Q?d>theR%NP(`!#at#PSOMr77hw5-gM!Vz!C0Ego3xuclt{(waWG9%Z*Z zy7n*(_(BTQ4s|Bd8Ez-RicRCbm~C)0-79G~zWckt%q`N&C- za}xYrm`tan{r9$+Mn%+5zO%mOKL{r^j`85ydwv%!{P2uOR#*XSzGBHe0MZ4WqNU_6 zcLMVC=dk@}Xh(I`Sw+yWi9R_pEKub7%C}V;CPa2@0xpwD&}A47QBIjqZX`h6(S=%V z;X@BfVkRp9cHe#1tDxxRyWwgyLOl#49KuxVN!rGASNnIOfa(wf_yG}szdw#dj7s*V zV!2}%b8(B$x4!P}>g+KjN5&TCooPBN{UT6>eS`??ZmuX7r{~KGAXvRVb&7Wz)z*ZfLQSpuk^}u3^9N>NsM9$5L)8s$AlRT^Po$ z3nf>eJXagk88O^fZa!+}W`)Lriw>LWMaIPg`2EyrK|{W41EBszZcM7*PWzkDXt&*z zSBJ`~pvOVqt{Yp#>UtAdSG4XIvc|T}REAY!;IT5i$z%+u&5qW9_Z82GM|K<}4%<8U z3ZaTgnVVhebpTi*uH+pj9!}#=)kDzApA&SkZ+N~?XHM|0f#-$tR#xvz0Ce9s*JB+Z zBp`2y81xLAonU|PgU-3p)giyoQB5RXIPz;KF&wM=f&uyvu_fE~x2DS4>niV`SN2^{ z7|nYH!~1Rn_26G)Fz&!a4%rASQ4F1bBG%^7qvKc(0t3F=F(JJa_4S%O@P3VNIB(CH zE`H43shQ^(pfPGWT||76JZehzKW8P|JU>HWXD{oMcqE&m?k}>_$eL1fxKO2#m_8r)N25<*+yH3aI z>}^t@imV)&wEDeqbTQrGR{z@AMx75Kjhku(YN+-7oy|WTn|c4an%@sW&*gCTi|RIL z4$bK*Mmhk`(!7eu5J{v>MUY7)7GlhY(ZW{_{rVCIb(iQ`)}nhhqJOrD2)aN5?MO=Z z4j7#cEIQ4V3($hjGy7ME<&IVV`})Q(GIlK0c#RZ_{4aUqgjqgwgt4d-5b&13-?n83Y8rF$uUMex5ZzK?unW^9nArJp49p05KY^m zwVZpOpOg#wCCol1%w4qnC7oI`q<*_t#aXTKfKO;pbYXNP;zO_<^eNY~2yezmLR4 zgQ~tQ-eG+>=T0Hdhw%4?UzGiRoWMZcbOIja`T1pZOauLh7}txSv%ON}d5oRXF5`0~ zP)P<30H7Cf{SmHnr4p;oiN@C~Bb=n^tQobjopw>qS2LHt1|izWgq4m^p5Bd6ji;89 z969%IM#FMnk0IR%i->P31mc~EkQ_td?Tmz#eBz-N-2nCE#q^vY`5Nk5y&P?c0Pz%@ zVfm?dcoXCG1tGv7QW2V-zGRBIV+ic}DUH3O%^AMqXCPU!S+Jq~8f#95-ZPsT#UGKo zmMaEs!(=CY2PjYx0-GEm>}zEK0jAV=K>V(1o3Jvbu82U1+Tme?bKP1~At$Xq-joDk z?DjhKimW<%ecWj(dkBFo>z74}hp#ozFQbJ!acEN<*ieWBX}#`VH&0b|gur}!o!r%`Yg(ze zLj)?we1*@CGr^|3u2&ncx2ml6;(?(2A0Eez;t3Hn%NS66eYa$%sa3ZRmhTuFfL(u#$Xcsdx&4Gs|{EBon6_vWQU{X(d0b!u#*L*{I zQ#`mo@#(-Wvh$C;{td0;`wC2DsmC(FYgyZR9speZY7Pcp>pGn1Ds>|k8>PwvF;{9JQzl!!iJ6;x^wEu2H`P&?9HX5ekFXi02E@0a*-Y>f)_Cv{%1qAt*40F(~# zH?M{xKI^_J;7I{a8h04Q=5el#SztUe#IGzLu*Rvu*#nD2o`q5v-31EK?Po#2O}Cj0 zh%CZD{ijv~4|ny}s%V27c(f+|X7YOlhDO&dyZ=p%L?@ChAgi`LToSXhHy@AzlQ$p? zk42tdf4}~p62;HYt<$^;x+RxYazw~w8&M(|xj6q*vu{iYg=&gQj+{P=BH9=| z?(yKTdRCSUd~@_Y_^wPrEC+;XjE2l6X=eReX8}a0M?s!|P>t5~15}i0G#lx;D*YRw zu_@-iePi*E^9vv|G3s!6tpr7^BLS96c3n)YvrMUEX)+W$_LY9@&0;N8OL|H=LKMTtO7ZLY?3C* zlr}E`Z(pQPi9SgY5T2AdpZn$Y>`mDp=L4L`s}ZRHODG^EynFK*`2f_d6*Oq`K6i-C z;+!%iHz0!3bsI_!fbYn6;TL-V>cN2m?y;MS#`6$#TL!rF{h5L&P-4ADm}`a+J3}~) zScPnay)T9x6}Y1{4Lo;nzy)5&dRG-;wd1t*8zK3C z33bUbBYZgP|@v^=B|s?0#VxWEDi zY~^BnmO9OgpiE%nwx6xj!zt1OTxZvsnWIh^3B~|VwtB*+?soq1N&v<*U8T{6Jwy&bwC4@aHB*q4dB07|&w_^Y4hs z+8Vs0M^a*!TvxIh;7lpXA#7Z>F?0`oDrP{)v_M`+pF6}K`zpmJi>WM*%~LzBQkz8f zDR)@zS|#ien9SoGD&0RB^-d@e2>&aEbhKXbk;0bj63vQmEbNIg475icTp)lJqqSaR z1^roK95nE<>$|`I&jb)gHxB@)c`v7D9ynkWL9nC5g(t6yN#j9`ykb`bf#4)h>5eQYQQ?kQRuFlONFhnIW+1&`>iSTnz22=X)x^ z+d<{9R(!L$5joIdH4<9zPq*#K3VL`yE^I(<&)oJ%Pl}+RrrEDnFMSE0PKq5~`vLgonTDyKF**Y(l~vHi z2=Y8RRc{4_d1qz%Jh&Ojk&}~>Uz&vd;BrGaKXUi`8BLwuvWm0?1;f7d#6N_9I@Ypr zW!jXQyJh;S0icK+RF~W)N(N}YnjPx7(Wb$m9C>HbvnM{Y2uc9vtvYJVds+Cz~@@QO>fN z0|X!4;H334lfv8j>lWHEp#DjwU{4f6$p5LI-(f&--V*idtjU5vs1Y~a!@QNU8RY^cQ&;l@*NlLnAY59A8Q zjQ$uuB&4sxHsnU96@9nA3rXoV8`7O}7N5mJ6Xv&N^qygT5mSo+s$Q0`XY9`BN~{H( zKRR!ASQayX^6ajbC#lXRC3gttJ_egKos}Dr)A6~uJ`0PwfMsuou+kS&B80A1KYzTY z3E=N!6M2jJzt#`6l)1xEpi_~druJPL(_y+$c{~}-Y3qJbSZ{;v9BB7JyX%jsuzsGo zGoR?VU*C_4KEx<~f3iyD->FnTMgrIexTrf$uZ8?Buv`>jASCp6JUQd7fEla;NM>99 znhzS|dq`>K8R6pQ9PPBs4(;^kBp~#)V?57__wf$xPpJ=LVgc_r|HSAc7;)I#@&rzJ z(kBo9e27(@*{6W*rP%t=i?mD?sPm3J-69cDKI0E%^Q`A6-b zL6NJ>QLA!D6j-nRJInODfNfUY^uT|Y%pF@eiBrZplH!Z7E?xU)NxyXakyusH95_s4 zx)&Pf20N;|_ZH;Hm9Hfekz`5$u;Sm^dpw^`{%Uyc({Eksryem&zDfkak4bz6=9oqk zHeJZk{~DqJsDwQ=${1uqAbVTB%!cFQ^RxvRLP?@N#P>nHl~X^*xfRf$J2MYK?9fu( z8O!?+40dHRcXqTjHXb1XIuoQ_RCn5t0cu)LKx9QtONl**hz?+S{Pc1$0v+@i>Qfsv zhoBm>@m8l-5nh{70MG6AxyK>wP8X1Xfms*%x$Ya#Ju6(o9;ty5Jow48>K!L(E=f+e zAwA5fw7`3Vh`;id(CB;VL)M08)YiEHa-^tt=Q%}eMy97kxNx;%XFs)4=0kkH%&Bz* zX%rVp!~VMDv2BL(T?Cg45p_9WL>;w=o?NLlG9waIYMy@;l8_b7JRIW(mqnp3(^lXL zPAtPCvLrJRCk$)F1`NZq;#Z7uQiqr7>CZ>xj@b~~`|R6C!O!|hb7`+&3aG7R{>#TY zr&XHCo8eL?;}mW#nV7>1oX`A#($lDC=TSNa?OYXb=Dces*0SIr6&9Kdeh zXC$auc;$Io&wp8LmpzeAFd*zenx>_Hsp+(h*0m2&T7hp^>33L%{kTRL5bic8;6QXw`@!xnm zJ`1yb0+^1V`7q;GRWz_NyPcLt%%^k&HU6!fZe~vr z^9nW48a?SH%|Bd%C*QVm7Q9xwY4)Wi2>LR|YKGc%7Jd49%Lk!S2lh z%)$4Xf970@KJGxe6{z$B6I+44p4&XUpAWI_Ho2W+5ya;=B zKGDzf`f9ALqon1*3Up%HpKw4+5FfN~K((Eo|ENCVYYd5~i2%EPxm9^A_7Xw!^AI*? zo|*Qj6V~|gwUt~s>&MgJ#27^Ew&=U91Tcv+$=jd?;;R3+wr%nG`cjpnZigBmOA#ER zPnbCcKNV4*G3kkIwg8gD1Ylg&%a4=oY#r7B2DVPc_e(ASma^ZRhe!vV{~E(|dEQoR zvI@-b1-^5oJ42WuC2uUOd~^;tr(^Pa>S4pldEZZcJHvSQH>kyh(I0DA`(BxI`mQiJ z`;k;NsS${J9U`Y#DZ82uWHWp+%p?zNs!DIwI9-_FHl2Z?8{79C!El^87NL$nNwfM9 zkRE8RhR|Mq?5~r!ZUhDZf~_biH*0zIqJ#cX%k9?yh7}yFwu47+I#_NHpasA2_Qc{5 z0Q!lsM^!D;$|9`3H>2fKf99@o2LLocRNX1R&M0x|m9MxCzmhNj9+M_$pKoc?ky!QA z@tzVEQtn#E55XxkKG9f?rdkhFJ{!$=Ja-AKmo?lpmkouZO>Wc2ZINPmo%?q-gt3A zhp|d@JOi4O6D7OSoEoQH8q#hwAoSY-?j=Ny*!e-+zpuAL1dGuu518@^CUJRQVN0ZT zKTB8Duuldh&d<&AbaUIWf2NkjoTw_Vbt2(ZOM(7oga#cKd$}JkYe8j*{D7gO+$hP# zJ|8P=1_ulz=-V3++3;yo=1hHUm?03WOLXdYBm2T5d+QnZTm#^=_3M%>fcEd=-XTG7 z#H2tlVQHZ;rLw3Iy9?uTWyIg**3S2nP^Pl)@Z6kY5HVK!GuNZr*(!9Zt)sbu(P;;ehsO7t)3s{gihv1bncDg=H7AA?w5`a|2B(<_18&4G9D` zSpCY4x5QdG+YBi+mMFxx*zI}u4TJKEit8~*xe}U$Q1u>*%Fz_?(i~mQN;ht|SHZiB zmscam@dNI<9KaRh+4^4vZs+fyR_K<)#WKW&6G`XDp!O^13q1feYMURXV&D_};{kqr zh6P^P+{Rv`pn&V;Js=zX%{UUL;A(mGKpObHcJvWM;H2|o5?36Bkzj3GRwuncDM!zx zRN+HKnML_-dFfcY+pr?Hl^2f&`vYw;Ri0HpjHaK5mD*RDdMKZf4IGs`11l=k*7 z!FWO&qScwUd=#H_rTe9Oi>01hmpnq#ZHDynmb|aAc>U&%OZ$h@k^p(p@7+F2RJ&? z+IM@`#aTDOzGDu1qs`-E0Gy|{AM^hIFh%`JkGH0F9ZhW4ii2AM+4=^y~z zp{zXuZBd9sR?4pe%dHzjOSXc8L6QWa@Hq4o(+pw?WYH87ZschFA z<`seGUQL&#z!xpc9oje6pb_6H#_Yr5d8+6V_=XKZk2~CKoEKC)|D2*WCEgE?FUf^S z)1Byo{IO!^C@Av{Cn_+X1b0SsYF=i@d}3t?K1R0?Y59>@Oj4t+nXTin`GlZhp)lQO zhBR|kdvoY<{C76bfXEaVvGW-`{3J(hSD$ zKB5wSM~@UUXos#RZJp+Z=1$#WsO{ZBNk7d-df0rzu@~{1b9B;q_WP1Lb2E_juWw5W zB`fZH^Hz7#=Fim&kiUjC+G;(97jmnZticsGx>!y&cK@w6`@Qa$aVgy(BT$0o>PnXJ zO%f@$#>I7I24X#&CTsRgEA6EW%l8>xD-qFIM$>CiMTdVj33`#Ue&?4OdHD*H6$j^! z#KAB6we>C+eybn0no0(sII?Z?+|%_mRr0IYuNy;}FEKVwfhmUT>BlA$tX!=jE_jf# zAzD^p!TZyIfiFWk(nuz@v$I3&l381$Cm_}jU}oJ1EGM6A>?dnkZC)vMN!F66ywTA` z9gS##L&48COR@7OtqvG7Kp8L)nG>H3%;Fa4(eac$w@Kzh(`Ln zfKp@%?FNr=MHKDLGh8TyS#jZ;cUj#3q`{?N3txG0K7To%RN9g9&ZgaRa*?)1KVzt? zAZVJ$bE+c>N*lG8bjovYA))Yd((dg1X7pBis6w9TPq`!Qc0+QyR7xVTXefNR04kTp zl9TX7lnswgnDtm=t|w$R&>8pllG}Cb&Dr!r_32KgdmGNuc6)_~uMg5SrVOBye7UB& z5!^?;B?5xh9kOPoh#_@*(6hQ_2|@)rGh^z3qxE#CtSrjBGedP||F)MQQ|&6dK?E>% zH+>q3-#X7%$FkC=WT-9>wsV!x@J<>dw5u09oAa;3lc%d5|tZd)SHUzX57bsu%@rJ$u| zFQL(TbxTZihP5W>l>#K<@mS)HyH{ zkv!+Tvdnf=^L54^S9Xi_CJo|`js6Vei?r{b@93_PX%ZJOD z>&;%85=TFvjC}23&Tz)csPrYTl@>^!UQPnRYjAb!g5bWV4n1{ryV1?rwUfsq8j$Re zc=xGTqW`T)d}^umqO0D;F3D^~IPnK@kcWQ_jzLvK>rM+I)-!22J*Cc5E5?3O?K zWvSZl3NUEb~~fLHlE@puhX8ezO3&bv#eW7)?Fb{7!(n3lUUy5loxOOC$a!rXO>)zD7?8XZzc81n==1 z%j`ATM^L@Xf2*{5N*flUv7!+l$2cy9A7~u05;~VwIpo3ff0*CA%bv6Bf>cWjMicBx zb|6BJ?Aj}?iX!K}m|qmxr|-}xbNekGSP?!YN2>Usxy7t%wP;p_+x|{NHIq;GrW*P4 z;fcXx;2VP3;SS&2173<{41aryA57%0Pno7?9Y7aZX3chEf-52?B)7xv&fd=ZbTF-4SnfO!jCbbI8 zll%1Zih<%mTlBTQ@nJijTRb52vpMcm@YjVk%R z&?pMFoAlhZ#wW~RzF@|88NUuwfnb9`J0YaQq|ev2RGr_Ae$5w4W!vU?IqCVF#ehh` z_0VzT?z!kWuzzO%3)}jtRnKF)G!C_XcHTpGsLQl(X@rr%lzpug2xN*jmyPjgUOO_b z=!A9l1tpvZl7)Q?AG*rxK(2;;hbuw(cn?XkFJM|}tjm+U1wj&vKA+6R>sf2W;BOfk zTG!?M1te0uaRj9S;D9~IvD`hL3aFJgtc_mVZr(Dw5T;bQIv~_Ad#u5Q>;7SFC?jnI z->iedOtreCo4CdOsNZZ-Gjb8<_!IP1^LKVhACt}-FTAhH)jlh(CpJMd?`%5O&Sh!m zsvDAuf;gOTgp>5CG|IJk^?&VDC}ntVWTf}?aSe4q3=hewL9~RAp@F7LFzpY z>)a6bXcO{0)z;!-;zIGPh{W7ys)lW&c#$Ob4hQNRo2<=JEjLbaKo5@ zyUW(T=<%n_*`a(ESI4Eg1z+$uuj$C5{ylNg!(A=W9$GSU%sm|V-be4oAl(PRIy~X} zZ?_lP7m^+p*khww6QcFF6_2m#qSu=fI)&t#jRyh-tk+eVnNm2C$V<;EH@w0JS1euR zN!r5kT$mIC1G0^hsD`|m5Ok*Za5^Rn#{@X}-<+f3qFUe^=n_Dz91Q8L46Ucb7n4|0 zTWa2|>QEi}lnk_YNyJP& znR-c)o%LSLtdPE+FFzkv4o%E^F+=GY>%T&h>9#m_lt`0h{Iu`G#PBRLIbeI(g640J z>}0nj02Smm$o)`dmb6r|yv&?xiz}{_THE~Ck@1(+5lsMrQiLB!;^+BdNw<0K=!p9V zG5v=)Knkgr3iw5-OEa2y;FDB36{dI(ps4Jn=?As;n=Q5n0n>^PM{d5-WQ*70GKX4U zdcPfj&ur_C6fd8K3V1JxLXLqhYf zm%%G0VBwfI-&j(gU8YXl#`taSm8HMiUh)!gQ)Ff5q-=+_zNPF_Y1A8oOzE%C&WZ)* z#yndDbWp6WTobBvn~eH@n0HlQxJoEifq`)pzHNqkt~tJL5K@L2p~Jyb-qUzhnJcBusBWf2-J?6j$@|t zf1QUkAGt5v5kQLgzs$hla3?^I(5TY1i&W9edA{Rh0kQY#R)`#=J1xX|C*ZMuV@@D# zFMcEA5V5%$XX9sWL>jZe^u!XDAG=c$-4Xl#6FgC^=83x9{B2rcTbXi6fJ7npc1e*R zm)6S3boSN*IRBhY8Ub=;%D$lg!PR_!D=P~RYhx8`S*cIwK?rVOCr$8aWpmmzli{B= zitqW`^1io{r}*f-gZ26-aD1rajc4sz?;-tZj7(jeb{b}Tk9E^sK@Nt8ZORswwfNI^ zh7b0F8QT$l9Kmv0yuUVc;x9d|jr=bMd_2=^S_5!v1Ww3~c`byR9O{dB6(@B|1EAF6 ztqhdP3?`OY^Q6!@HaA<8GMVuW*JtgLj1AG)%TN#&7qj{Oln(?C5+ludzh#jU>v=LD zC)hn=Um4cxLAFgT?%#tOY;2mDJ$|%*S@Tpm+}?>5Unk0>Ll{fSKK7TtVDEUhtkF7n@n#i7aZ{Tr)=%h zKh$79c21Vg=e39x_5K(``G~Zf3#oCfFTpD}O}ZkJ2GgCONWJ^`44)S2#FmWrVSM)0 z>JIJX!-cU)^SMvkLjM&mhbT45XwXEf%h~OrxRXCHp09q$ln{hkjEaIxs_%>e)7`|%Rds*VxBl@oJc45%oR4Oz_2PMFZOlm?aQcej6Wv9M$^td zjZ0zBt)_GzWnELuXQZu>JLG{EkS zReRyWiY4Z7V(p+S6Dg5NmHT%Kxu|ye$@5H3w)+IrsYFjRWd3s_>UIUlz(K(H|GWTL zK^tas4~(fo|3S9NcGCW_5d|rUmm3?$hIFHlN zkx>Vm+{Nu@Jls_Xy4M_v;;d%h!%y11aa#0Kvxs@*0cYzrDE*YLnpFv`(W<#vV=?kQ)YUtKOi#{#x8$tEZwIB%c{zGXW3UN^WtV%BEI=)&4~!cH4AJf@v?~g{~j+qTP_q9HPIEmPRY_Na;CX$Zy<@Zjnn)CcaV^7vPGM$Z}8eZzz zQAjo&Hb8CY=|-0EY$(IuVcYIrBWIW|*5)eHK|5TZC5m|2sCP3-Q9ybtOe(+e*(|KN zgh7Q$i1CR?h2!s|Kdih^T#c<(i&Sw%H~wf?2SjcaWw?6Z-r)g<=SN?nW%h;osz~tO zx;K>%BRG52qgLav!$rzadNN=-ESiR`t(-dXS+ureB1Kjs#}@A~LcYBKDS@cbWxM}@ z25NdHZiv__G9Pvf`@k{)Zm+!pofhpHz4_zb@^QPr067;w;^Uj)3%4)Cgm`}7Ju{hU zyAyAxG(tCevL6o*ak|ANm!8c`TzlVPMMMu9RAyHc7sU;mY5qt?Z}&i-l1{R=-sH+e zE}Knelm@_m$w{xO(E4(mc}>w62g64{+h&`9Frg3JCI5BJJKOvEq`8{^qX)(k45Xsp z9(5J(-O067q_3KuPjX@my5Q=1dG)ciS|1F@rz%62&VIH!^7xV?9`1X!_!{ET_dSHQ z?lXskdaE!qJbrKICcGWf4}6WC&W>yCIw~lf)?-C|Tv1Zd296=>WdT_euM4y$?;m_5 zKMRB6m^lO9wYEMv{zow6z6&*G8T?v=BPXc1^aUl_GDuc{F}eGX9BGZf{EsH7N!Fy& z$o@CcjAnh+R6SLhk&)aN2WxZkAuT{XeQDwCz{pPg^kd*T^!v}{qmC9JGri5uL7LVC zu!Bd!ie$L&ALVSGa<8~iDEs(JJlB9Ztv1eP9-ob*jcnlK2Hr#v9e?AQM7m;Atlf9KRM|xQ-Ld3(j%P4gum1^jx?4<9sa1ikTUduy0 zV=~(6?l)iWbkhE9S&|eU6r!tp#BW(SV}Vx1O-XGOE)C7Vh|tCrDN02 zqN#qNTusKXX8>)y{3EOOPrC#eXC-^8)5qty2AoYPTN|hob>w1xfpM6K?2w7K-)mM& zL!KaU@@?7Jt+9qTeUqyR14h5ERC@(xP#r=l{M^>HEba}q%9T$FVOfL)Ato?F@>=Uq|S1SFCygCTVw!Hm;+?`%m61=ha+C z>n#(;WrywIhv?k@Ro<7e|CO^!`34Wwg73B`bHHL#+3ZwJdmqz_r4};CKgD#Vyl{m* z9zNEc4V4A>WuV7__!35#1wUFhD;I03!pOVAZq7`|#nedVkmcZ6ES!JcCHar`Ns(EI zB>4PI{;u!0-r^47)mEe4{jT}8E12;74laIW<)%kjC>Itp$aE&E-ht(AjAp`tD>d}R zMaZSy(T2Uf8HjpCa;Y`x8yxl!l;3*Rcx3lphQNUN;T45&&!b-6mN;o4vGCq&L#I?C zm6iP?$S(gtOfKTL2&*FUES&Ah4l4MDjtWpK*RFT-uqP#vC>lo|WS~R0-bka%@Qf4D zW!Ruiv)+7T!{n?|Fwta>I@tDJh*mlB$-T>js0-audG;^wT4Lp%F$u|mEmjJ(%&H9^DJJ)BZJJF)WU)I0a9+$-7|N zZ+tmMJ7b?HJCCiIaSgGWJSpXK;lIs!HgCfrxxDg+WRl+IT`SEAS)$=BG($rLzn8i@ z;`1dQobql}o1cM7?feHlZ}9{%1wd;QGn567++=P8#gZq+JO5j0y_W6o0S6W`hdk_F zH!~FyTqF3ws$MB4sbPb%;Apdh-d?=OeAA{YGrKM19`@xc7a4$F+<61pJD|l9dPVk? z1nl?UA-SUG+|tOUfmGL;srpL&#oLL{t(^FzQ1<|-^44so^-|ucRdBfISuQ332pkR^ zcZxL1CBK5KJOvYv^Tq78ey`)}wIpHJs3b2A5$w&a@@`D%>R(fFE!Q@+tG9bjdm%w} zYo0^?^wA?f)3i6vQEUyyJzW(&<=95lDBnP&iN*Zll8lCW%?wBdCR>X5eP0U-m4a)C z@!3OyLV=hMdd}mn$C?Yk8l0a_9?0#-9b~PCet-Kun`0{UZUya$Lj&gCOGU%82*Cgo zShAiLE^#N)ukxCrP%x29bjz(v8t@C+cn7v4PZF(&!6v;|hQ>?+tyl*84RA?9H51Ps z@Mb$H)dW1Ln84$tYvnKr;hWgfp_r!J=x*ofx|YNXxI$DzUwdBI_H1nbXx-_jNoUcp zQ;Yl9wnF=UFVwJ}HXS}$#c;AaAr{W#c z8plhwcP*o6ZF!`LQ^d=I0au{v;hqAnLuoD z$(zf?p5o^Wz^|LdifMXtqnTV$$(Fdy51Mip}|CyFY$j63gK9xKsEl{t2 zzYDX#BuoZ)-cJQ4jGSG7y1%<^UFo;=RHVA1SIK=YVKMTTe^nnalbN~q zo=^<}{Aw189H^nMoL@soU&r9K*D6`1LonXe&LudCKqn3Xg^}vB?r%nKUo@50W8qS)rJ2oGM$rW6v=Mjxm zUu%1(*^}C<2b9sYCKn|Q$40%py1}BZIq?3(q9Dn(3JHan_a<`D#gY#m*o3?87`?VE zCdB71RgjBr@7YzlI`xq=0X=+xzCy}VxLAnpe3c4^QE2fpI7qX$1Ipb1U$90|)@JK# zXFiU;Ykr}0!nNI+Tb=kMiJof)+#iyZ4wm~Wi)H8ek7snv?gn0&#n6+c%5k>FCZmN75XO3j!Txjw)bi#4tYhnpNjZR6cqHvjqTYrlpK|Cd?N#$9;3z_GPM>!m)5MD-yN*0D z{;d`gf<2KU&1fHWRrY-+@xC{Z4KHaZP^UulNvhOBEJ4lr2up@wBI;Sn2)+>6lqHR_ z7n6YNZTWN_K-X~IdkuV*jm5yt+?w?2uJsJiKWiEm;&L@_8At7d<`Ba3pU8z-5=W34 z7#o}>qZPq2nx$e4xMZwd%UC{=e5snKIvft}Icd67XfP9S#TyE3p62-2t!ues$A}S2 zA~E69O@2QYVE4fyNkdQdT~l=O~feo4$R~0?t1_8G$Gl10J{tSQb?)d5*l# zPh|s#s#XpvmLk@Hz*w+h<$R;@(0)iLuVrfac7E8Yuu!bmXoS?2 zSedX0HfE~#$Nfab04gYx&+f3E6Fg|tqr6a*B2d7}HDu(v3nax_n&afWGWz}k(bKvQ z10s^P4?IH0pygC`k(lYA3vMRqE? z!OlPXkM5C>neM>>gc%7YK$!75C;6A49ztwA78`WAUqTDX3gN78nv)OMO-Xz=TSiA! z={7r!I&%qwW;X94btG*+d32=ve5`t+g`R%=>eSfUP6&6Ml`Us|R`uAL{^QmqakS7x zpdnE|eyrFXPnUh|I^y$l;cF$cB8>p*G>RX&F<`1yR3^9R65oS-B+w0SqklK9*|`dH9>94a9pvXw>EraNiVv;58fK66`cRVoRG5yP^{WPp~Cy`yz6Y< z@{~DonSGOBAdG1wT$y@FF`yWCi1=mt?>MzkeVp9`EBKot6+^cDWFswBA6Dp!R)3+N z0y0RrcHp0c8A*908m%?2WPgU_G-l`Z6<7X#9wjozd9Q<389#&aNF3g%GfBS1*GBg0 zym?2#J@9>JhY8f%IV7T5FN|`kAjKh{mO@H#5XavzBat-e9Fef?d50%jwFJb z2aqr8a4}OJ3@F#5m#AofEk`kYF8U51Ja}Mue%Q*Cha?nad?q3-sSGWQb6+5S{THC7 zj|xGq9G5UZhKjElJe0|0yfr4Rra|Mdbby5f{chn-vXVl)Hm4&6LtbqNqaPr)*12dJ zAA$x|6K_A_fyQ?scPfp;PDx?QMjHplR6clQ@S*>wrGv(Ay@Q8%xuc|(o7PY(CSm51 z|C0C%q|oB7lFq)NYKtNO5jZe>m+jK?q#}cl1!&NYFKv<7HBcK3#1 z-kysfsP5HsmW=HgqaYX7isFn_)9J|&SY>>Z1%@LC}N)JWidheE}U7GC6 zH{77H{}EiPrU^QwP^7(dUouRqhAyU5FcM*Qg&06EoHMLmR|bE&r|{_j98)hO4(gUR zy3ScnpH`${{ZNk|QH`kAk<E;o5ciAFB%jb?a9t{p{B_EEYR_WK2h;(i1XYGA(@j z6LPnXnqHL;>#sH9T9hLhA*jTL288m?~( z!VJ=Vbs{uwVke^KNgO_M0v~wZ!w4d6*a-V^>myyFOzwJ&$X=FczFjE%UowI+0zE0% z=U_OMWk^F!W1w_)f^3+R(9y|r$foWRLR4Xevzo+RKQzw%S~c%l9|HsA2kYaHe|f}L z4hbZz_fM?@$SD(FVLZ`ddH_sPeC=E{|7~89mT#y6Eli{+;ij{hx&z255-3Kbp}`;% z?s)s}u=p*9FbUU1i2el8AVETl$s9`9XYB^1`=ll260ygoY4!f%5>;pr%lH?8wh~V> zp+d3u2&k?Enwo!k`tI%~xy_%6Wk97^Ri|(!VQ@yI+y8}1Mqb5jlK46janNN@-)yWD zQ44U&5}?NbNT8Uq=h_?od6Qo6IsX-p=m2s4Nw%wEe5ECBCZ;29+On5YeNT!MZx}%h z&VY-|zvBY(zmG=KI8m3k{i#@7P=>|lXCOp=#pb&dPBefQkviZ427?aSW*vsF-r4V= za^T_l2f%ZCJm=3~5$deiKw_n>3lRN@GVdG!Jy{hofJpIli7nV%i2Lp!3~T7fNgjX{ zm}DSO{fq%kJGtXBEv-m&8XAJx>>EhgjVd%BJt3ZKLa#D(r>hv#lT-u~vsvG&IC}2q z8W1W+-fQ+ZBLTS6Y0xP@SK1}Qz)95baTtR~-#>yBZY+fnSBPSkng&a@4bb$w1_If8 z?Wy2Exl|ke-v0v=oBvQf71`<7tETL$$V7O;=$qe~L%C-L&?l(=M{~O>d6VmgX~oy+>n>g!A9HV*0>|p2Ak8QWb6%*W`E2HxM$7j)%D@sY+Tc)XnWxI3^apSeNBD!rXuTZx!`0vF$-iBPhXk+A9#uq#e2) z-+#w_s`~a85?2wHp;`5i7oT0q5D#dD-KSGDKE-kJei1-e5J*N!ZAcIF>dserKXxN~ zWr-1~GEC$CH zBL>51gP0T!WK`0uTcvbgChI^d0VrGMU3%rhVeb2fKfjxA%}wCI)M_?eA~zc_?Y)(T zasf>zS;e>N*WOIEgtv-Em^5^fAM#hf2a8B<-Y0yyWee>xk?EF~8HKpCAYad@d+n7Ua~lp1GZ1eh@> zDEUU0sA$K-zhp63QJRBL{l6#pRS<}2j#%Y53h{sr5e?^{=In@^WF$4qedDFyeNJZa zcc)3elyrNNjyPUeSa2JQR*muc#!&xxrSi>#0};f$#;l+eOZKLUMA`Q)ke$jN3LQV{N565?4oC5(i(c!Itq33{y2$ZJbab_&;|-v-p4GePt*B0BFTM?*W7aSYgr60;R%k z^pIftdnZir@rWXyHKXyfK9C1LP1Yxc9ko9O13m#3AiDh9yb9lHEzHP0+Qk)BfSglZ z*M2xUY)wc`!RnLZWr}O-E=t``57xKWN6(!QOL*!I+^sOxD0DbFtP7(ASqH!wfm~8) zabwxaM5`+QAEMqmAgb>B9=?Epl1hVgcXvz45F#Nctul$r#(1ih2Aq; zT?tnxG#spx!}4bLS>85UeWQLV5swMsteW!jUUmA+N#c*l8U+=c&vw35>+sX@;lKN= zPHHWWs6ZgwHSxyTAkiLKt^10ZRn^b zZblkG+!gp)_93hNXWXX3!3<-5k+Q>{E^>`+??Y^-_q99ZCU38G^vlRpX8?Sc_J5<{ z+KhMwN3wv`UY7hJ11=1zH`&d2grUwbkg{A-hj08D~Dbsh9;ZWY-;@WQPN7dBWo%MR)YBnQ1Nid!^m^G8ypbJPbAsP#D3;*!mV1c4U8llA# z?f2S^HUU1i$1BBvLhCjo)s|L6Mk=O{OP=I8B^X4kC`~8i^%eHrK)aJ#* zQj{w}8YB#}+Y?AVS$AEcQ1ITWbB>7x*Vh;4HRC%D<-BD=thtt$kR+N!3*9%;N!im@ zy(6#SJgwvo*?9xhNi}>WH$En-%h#Ym+=5!NR=n@L*X&~k9`kOu%tZ97tNIQ->Rmn# z1R08|&J|w!nRdmM5ks$b)YUN`dd+zKpB4Z*GJ-Yk!G3mgRz9iB$Khlc5W)9H-@mK) zo!PLn-Q$1>8Jtc8PkiCPx$OEtT!OpS0LWTZ@?LP4;KRN0R^y< z9?(;E=GUJ!BBQgfLs>Tp2rLLHi!}d0(7&JN55>j*{*gzV>S95IuQm8n$B={CX8QWX zNG!;k4p@0`0Q4;kDTRg?$}cj1jC=>K^6#1BT@{5f@5HeikgD|k3as8UMa00_U@1c|Y0Tp4lpFZ-Icd@H~4_>tCy z+kQ#Zf6LehEQb9DEkd_vB&u95J3j{C>h?TCZ9B(py1pPj>^v05f7@^zv?V^>8`|S+ z!8K`Aan8EQGj!p;$-|Y!2|;4jZMh5$r)Nxoi6%B?f^IAbi1FefgcHL43Uw%8@$eUU z%vT*eaRd^#=^l~3^fgHXfba4QBQlQBTG6u+h08?&<$`^=_` zn3P8*2yQMUGX6HCUb`cx0|zAL9SJF5YpIs(xkMJS_kw>f1JEl3zo$dbP0n7#m@f}sAEFWksuuHo(%93xcc2T zBEW*+e~Nk!D&~3u?^K8#wZrpkH4?~99;A{MM$i7~fJ2v=`muGZpH^Mqa0bK2t4~0p z(c1jydOO&BiAmcYssa!JKlpp-!UCKf;OU^Su(okcoRVSF(Z{~}bH*=*b$d@e8rXCL z*G5ZMJCcDT08$z%*M}*EJHXo;P_t`jN4Dzw|9v2fpCa}7ospNvKo0rD9fH1uf@QbR zOReXl<&|qx3Q|_n`DM)XUUL7pnuZQ*BO_z(%*=qT*Bpfy&^R5uniJL1f~>~UsV|J^Y}&iWFy&VMfp3$pZqLw5Y>6g!)1?zOAW zwq)$SKKcLxss{d*r5@(hPj7OR+S|?;OorZsLS|sUwv0&=Ih<`=>i*v!WX)YuKFL0e z$AHRBIBt#JVDRdH{`;Jpb)dG1=WCqPy)%Gm~8+3 z-XYW$1EfV5iH6L`zIwJVaP@OVy0lr4N0SJkkn}eAdn8-$g1&cMOJjIgV(CH%p^&f# zzc~i{!*UAOG_&!3_jTu`VComaRB=>bqG&ax%Fk1j{zzBtsX^{n!nSCLTY(&FgeC;9h-AHG=2R#B&CS#Bmzg^Wqfm)U>SyD<-IL@u)* z6kF^uTDnz?Y7H%2+(JnSL6D5RGX#}KRy=mA%cZ=ZZDYHV3b=(TxnmvA|3K8!7>~$% zdRe4P{^_|`;rQ_7U&Uy~AWm}XW`0x5Oz2Jg4TW9rbUWZB+J`L|H_x$=>AV-56wp?J zAn(^ausvB}(P;m?tG4R5Pjctr(iwVjRnMj}1r){s~zd2LIskAAjcyp0^y zGJ0XYvN8FcxQ>?IFOKd_)-DbNP4`=P|3kp+-7~XcE8+R$Y#QDTpaF_l!0)4o@aYl@ z*ETe{Q$0Bf>pX8jEeFrA!EUW^cpQUKg>*Ve^}=%H{GLDF#J^&;k|fXF-E$GTN`~ng zlY%lAAxM^?6vBZv60|-X;dq=!kyNK~ zP61YNZQ%8I__^CuWq4mUVqn^PGG@hS8C)1TXu;{)@;Lt9tl)T9KC+PXEOCi{U_|Zx zOD`aMEi97x?sPI@1z(l|xQ&cdI1j(z>P$i*YVOU%UUBDO^OX>=iOGaLWr`K0gLFdX zKIMd0OaS(C^z!u8OT=bEVM&&Q0KB`|*FanO4BrlFAxf8UY`ZWS@sVb8=&&Bs{c!0V z&^}5BTcB%~vU=;#%JE}L7&~f0Xe)(tb%~u$Nflg_(ObOJAmQ{$9p9c}BzO2)=1PXl z?;Ge=%OJ;t2OhQsJD@}fmMM}=z(z~wDvnCp^w2A?1zX97Pj zMuxf+@uz!zYmHv~mH|fM0?88voVq4UNo#jxFKK|CrZH)t@<5xFn;+i#VP$G#Z93u(`SW>(%nk}i+=6EROh`__t470mkV2wuQ)$*;&HdZ94Y39I54{F zV|R<3pFHsZ!?*-cF@oF4K{Z)fa=p`k8_<#)wC9|8lFa%d)>I$`TM(FufDZR*IV_2EpKE^ zwK({Gb?^^@E-q=cFrgNY|6}{r{yqJWQiLwE#ySU={>Vzq+8m$+wGZ~ z`=d365d)&qqEFr{&wapu-eyW%H?hN6$Xmw#Mc(sDN_p$P3H!GDL;;uX4_B(i6?HJT zf&N||Jz;?UPRHZo=f6+8S&g5@fq5UxM&8I@W#H_%Z|jT$ZeD17{i;=&USQCPNkBhQ?i-m44l=);b_FM2 zR&HWKjBcPZ{gQf*ZR_#Rm5;-^{zaQbR-Ko&LKCn3(ieqG_SEgbvfidUT%Z$-3EX4> zC#%?)LcaAelgnCS)P9NEl#5>x=ynOnB?7qtUmXI(gw(5bIfFtviH115mR}U$ywD>; zZoS35;BEX6iRf*gWKV9aFe zhJUX>iSV@BB^xs&m||J)O-WbZ4>My8Lg+~0U<+_fANwzlRsxD;0#dXMl5B*E)?U|U zWz{lX->Qw)oPXKsIkR@{mEcx?SdJXamb5gZCQ^EYDa7tho$cWv}_VJh`Gjj+KR zokSBdGhWTj3WIa6G#NGLwn|O5$AWidm9=Kmr#i$ywQ-hKKH`2MCR(ONHdYeH^R5v0&H%=OFnG|h6=d!xk>7=(dDS#xOejbc)AHzVB zbshSM#5*d)Gbc-1ad(a|6*1b^YdO1X$G3*Q7*C`Vc20II$SpzA2s(!%Axa$o zrQz-XULqGcbe!`973lwN3SuXA?Glg>Wrv z%hTk$kU5j2HuqVLTMt<8Qnq9m|NAm=h`5l`uyXjmnI75{K>!U-jst9@ z?tf%b%b%_l-g|aP?#k!Fj1?mH*;99{k%`}{d*5}~j@{d8F~~=1Sn3<0EXcJ%DQI&7>{+&!c8cL{%$Jy3FYTU^~lO7hJa=o<%kaVFn;BsM^^ z2$k1}ducu53SUwGqO&p9XSRwB?7aR23*=D2q4ls>lxJaJhfx<~X<;fHygb9iPscsh zQTS8VG-X5A-;9k_VNqF9@guLv?yw}QiJ5dfjdu0JT9=`{4~P$XXB2$UM)8AP>6)HB zLSPy6UZ0}{$QyQM@aheS9P>5(h1i7WFG_lr6`XmPps3gPxdJ=&))PD##8T`yW6g&@ z*U1|cjnuhe@fFpKy(*a$%Q^Ra5T& zt)FrC&jVx>35tCA#1>-tIH^BJwVsJ# z#oXFjo;5jgv3xZJn0s}RWg-+n7>>2 z)05?I!$Pdnb}1XjAf_Mb*ct^WHUrF}pvER$o*Z+`Cvlw-Z6A>ip$>Y6ATM>EkURP44YsR3;M`cN-h1N=hZ>4X(p(<++CY;`Byk*2^wSFK?OxQozNwl-<;#Ym7dFFF>$*~` zbHb{Qt;??QpV#x9su4~Xm{iWi%a4BKx#}`cNiDx@+SdVWK^47t2u4<0p788tD)~?h zzqDgNg%U*NJW{*vQCjsQPi)xk%ZDHGlw-(K%DoaEJ*+*^_W?Tg5$44?HYU;)pZof zHVvPYqS+Uuvtq@O?&?hvK6#YaU;bO$q@3|qq(#>EHu0MajhJdR^AotHJdA7@_r(y* z$BVW%($wIJTN0U@08|%TCZMWvHKzHK6|J#{KSvB8!BGb{A<^uEE_O4WX!hH8bCbQD zN{Jshbfp%(_{Uz#mN_lu_BRM2QuNaR-ML}?!PLJWt=d5xht=}Xr2fyKGx9Qo1l7-_ zv%cwd00@`1zrS!pD3;q#gGEdqpO*qpSG*1_eB0T|@iACHyCtpdBh#4s#IkGGHQo5? zHhak(8FYxEs=F)1bfT3jR7;8P=d7O9dSs0^eKI|h=Ypa*_yeQyPzUK>e}`RA-Uq&k ze;W|K-+T9jxvf~q3xYACWJWU3W74?d_hQ$L9Ym?eZYe9Tnz{Y4xI+;2=8a~lV~k^$ z7`>{5Mv6vUzOYkVCfPhX(mx>D(GVl5dC5ccw~0Y#?Ptnb92&@&VEYe72*m@U{gwA; z$qAiyZr0wW7ImFo#ZddUWN+vB{s(khaKI0VEfC*i;9NbkF||xk+|b$&Kk=60WN&}jS+noP+!aYc$-Zs za}G?XWLK?X`g@pZs#%ph3FgXD$G6} zt13!Xt!cn9wb=~nFC<#?5bn)sG<}k#jxMIf67vq1sbMby9~808(50^b5dK%%vRtX` zGH`tfEvpCFiC5RI2eUfotGv~3AC|lhL42=a7r!GHxSqjcPr_F5v*{@_*w7TcLeKQy z8ny`kFdFR+D{pIBqzre@T4+30fWw_RzPoKqbyH?y4x&tBZD7GfiSvZ5(BRj2>J_qQ zNy=}+VaqCk5*I>|kWbjOk4m32{d&}i+X-bo8kv7|&cwgzS`nk4!$mhAN8HL(7vcEf zvy6X$T!ivYw36{dfmO>0(ewu1>i+v&eC*gEHpx5mzqC-IjsR0|0G`hn3wF7b%8U50 z*aya?!8ozRBelL;ufK)kc2~cn(O%srw!lyS`i5*gvDR4OX;$TI?4E;zC_{21Pir2B zVL-&~LJUUY?BO64IMQV-6tN+@IJd-W(BPA4ZDH|{%AQkFZm2Udl9J(Au`t1=+e=z3 z1=;1PN{bAbUz}_m(qAGq4ODm z&@2`KRPqwGu#lU22A4e^o3Kz-QO*&*Fw~g}>RFM8<Em_HJWi0fEs18eeayl8sO=m%4*1efo1W}$(PRxEaTvq7KIfX9Jqvb zWz~*Q4lG)fBeR$1zf_?`#?)>M8=IbytL~H(2uO)*dzIwc58HLuogTcM2oGGE-vowIrpy^vH9&D_as$kQG4b|gpA-3#0vl$C;VpnVHA{x_8j5};&4g z^JtO6pHXKzrF-S~`5WUYAmbe_&IOu3TB-xt7*JKqPzG=kX>?~M;!Q6_;nzz_#h#CC zZ30dy@_rGBG(AT>cCQX5M9+sH;4ns}+V>)qg*nGSb<4e^=%Wa&U5_=ET_>rG*>LlHcpNu&b%gwpK3|}0~SG*A&Z6nnJ@p*H%EX1Ar ze`^K#(IN*LRwt_6R}GP(p>H%#7{)lq%dAuGM6;iFaF|^V?saio96!Q?`1qpnn!{w- zRJ^mN-brpqBAS`7p~a)eU`%00$L@wH*+9-crhpZadmnY&c%T1EohP|i%ILRcW6ID) z3H;<~p*OS(My_Rd-PB7RswU)|F2uKa_2?VF(j>oox=RVsj~Zo2G1`ZaOoZ#XgkgnD zE36|xI{7}s3NFp^=Iwa|9`x7N#ynEfgKtC#DNdSeFIW8Yi?t&gYbHnAkv>t^1XlX~ z+uSkz90WrmdQ7=)oPt}V`7UVdWS)0PPu&SSgs>DZ#%@C)hJ!=Nw5j>^FGx^P`Nhh0 zdsa$NivopFJaN~au7;?X&jfXKtuHoLyP?!4sadjf1GIsIXvrx)cEBhayUh!rc(Xo+ zQ*b^4pEK@f>pf%rNX<$xMm%o20Rr6=2>kCzEa-eFs32mK@ETFfZ>UQW<-2e-uDLodPf* zdBA>XV|tnP$YcdzOkaZHWiJ2ARw;IkV3_6W|4~x$$n|tLP@-DZTMM9i<*XOqk9ybR#4%Mk{D@m z!}?7q0;r*g!slEkOp{c5UZdG&S=!~9-s!UBa54#tOyXehsG@D-?+U+RJG4}7)eQR2 z(M?JnQ!!T}iy(}UnV^uAhRCU>!rHX|q;5frRB%SY1ioqSvHDQM>WL;_#)u9MG%hky z>)C(bWWmkdjnF}VH$#%uUTSZkpsjOtbv@XI7RkrIP-Q0~68MoOIo}|_=HeaT3@KxD zNe2d;R@~A+J)m`D!GIR$T7HKrsJb`p#drB5ByM6r2mKK>eN8&(UX79q8lTIQqn8eq z!trJ_p^Gm$(Oo_Dn#~+tv#8)zKHO?T$_ozdwt%EmfB!-;=O1ru1i%M`98rQ z4j*YN33E9V9u#ZwyaiO`a+?UzP&`z0?ieY!i*~i?nHneMlxaPZM!SSX+e_J0d(<## z=H#0DMpGS6-qYHX}*E8Efpjv{828?gw;7u#rt4xvj4sKbz2Bxgb*rs3|3U3SbfkADe?&R zu`7wAIhXM4AgVjnzN2)Y*J3}!9=1DJ4b7}~{u97%P687LVRIh^Sr_KYCN7Q;490?^FGA4b zG(*hu`3r7Xm0l-|2TtS89}MD; z?gOYuP!#)Z;d_v+*3O_A}<15rsd%(52Y)Sn|*L{V z0v}Nq7W?H}-zB}uhUQ!38ch7@Uma%C(ifqS&kH04A(d%wROe~zpiU-`$`~(s@jYH(Y3dh98 zkS%Z*&%vE7YA+C^weK0rG1BbkJlStSjKMHMJd;6QL)EI<+{1yW0$|7z>b}b6lESn~ zAF*he?f@gtlBL1mdEbj@evm4wBw3peI&oQ__K$36S*+7?QaHHTgK4EDty~6+iSnBb zNe?QhldTjKP+F5(tC=7|G08W`HcW$lOfqoV#kkJ1IJd*d;oQ};hKG&%LCPdqyxHy0 zMS7!?Gh^A};IC)x0Ef~@KHp5n>6`0};iB9sAHG+3KqdhMLG27Wf$359W^doXy&LU3 zXlfV7`)|m^WGSijuvG2?l>V>Ccdh#nonm(kT*JCoMF9l-ZDAy5&v>+JF>qRq-O`nJIYzj_j z4|n!GU&&mE^##P6C2LS!cg4wXH}%mTbSijC-KI%uMZ#n;Ci3$eLNgL9PzI#c;4Ck<%dO<%aowei>WE13gY9ZaaKU zcwYBeD#8<8v4!47U_f=$^V?Z>yr-k#1ykPx1>xTQf&U`QF09slCjjmgXN{{<`B>HIv^)Bn6D_Pd;{)Ml0`R zP2VE~T_4imMpr?g$9dpl7jbgwr^LvDo+$ih5MwCX?xJmt6acY$#!OG9u%(j3Spj}B}MUlkmugW!8!+$K_X!_7V$C9e`~ zI+1w|w&LC%V5BSHi*y3W_hsI>ayz~%o&@zb`Rpz}#1}p$WWCZ-$CK{32r=G;3x)f~-$7a7MvyHFT$b&a;M}F@-}Yl0 z*X1-XH>VIY3cHy%LDO|Xt{EDvptqz?N`K}3Nk$zFo>v+2{1==&5+1eQ`1J{AKop#K zf(HG8xtIHICcjHsw*p)NhFV`ADGmoc)qLqO03nL&?h{xBo&A3;yI0hqSQZ#febqQ; zB!X;n1dGyPF!=a`-br09BJutuWpeOK@K##!p3TMkT(h9ag>-?I?mo>wZXu|X6!xGX zI`x-M(-QWv;DaF_-TuX==2K3wHl)zBT=$RxZ8DK~FrdAuZjVF#v32x!v7t_4_+#cA zTg$jocSG(r6;}n0e3g;`I65}>!R{xf)oPdmk2@7$>&wL}*J+~dZmW4VA_D!|9$i=_ z7L>H&go)#w{fD^Fq8|5D3?9qC5;1UtzcnY_Z2?NA+{TL>h)HnjlNe{6o*5M%0=32AQj-kAfT*=c}V5o&qoy2b?$gjx#q}LsUw>!@D_l+Z7sk$E&5l0V#WAAj+J zC;|#DU^LOaGaBtr z236vNR0w|!Okc3I=83~*3t;wI!Jj}84LpB$4f6XAc$>w9Iw7}#Tpp0gLgXspY%@~3 z_r%EmeeOQl9sE=G6~)gtx!ZKWA&c@AX7Laat7%qTsO~%YAOL{;?4Wd71KX7wIsE%1 z!zx!qJ4)*s5yWgS{a}!0L)vIz*jUz4gb#vFLkNF4xnYY!i`U_lY0`h=7wE(XzKKcbHJ2UqyQUYjNkWlV9!yuVUfbU0d_>Le@6ROR6xE3<=X;nLN_-i*pIZ57vesjr&?Roz^UTw7a1wENV)y7 z@1@_1>rlw2H{HF}$c&ptrxu)*mr0^8xT$Q#$=>1*nAF>~Z^AZuTgc?mgiNQ?ysG_= zVPB3U{KYF-1K_%vPNC=dLv(BH2qpoCv zQ}tgaacD8I5+hCbA&4kQ&8*NfP^gtnWL0Fig^C)vo(R~n4v?HJc~x|~ALkRGA_1Eg zTi_Od4T>E@!R7Uts_C~I5EW>~_AdHgJh_8TE_(4Z<>I})F6jM~^7iO}e6QU}(LqJO zC^p>y&b%3aOSquU&2DuWYbz>y_DnTwsO90>X0-u2b)}S+)5mGzV$QuWguByD{`fQK zOTvJ>&P|9HrL*+(9q*M#-GC#nX4e}aT9`3xsVxWW#KC?3badDxaqRjb*|$z@7B5xc z$Sv^NWy2TKpnmtW6_6S`$*&U5XN2DTzo1b-k@^zG*MeX7{ zE}%t<^6BYr+YYT2)pglr%Om^7;uK%N@wV2J6Lz@#$NsdpgnMsK1j7Di2|LU>J&D!R zmDi#4I@sX&>Gi~UYbJhjtrI~pWAh)q%OFO?3~bI{(gL}(hv1EhG`43TBzLa9JD1PD zzP>0j8W`n=BnDZIn)c*UV0I;H% zuUb3ELRnI%I}1I*y(KS%Loi44n=!9<*UZZz;S9qggTq9G=H z!WxeI7|@`Tf70lR@3-b{8u=(1KKqvqO=O{qn!}cew7ZbOPQQaK+Sj0MH`!8w@FGD__&y5cYE%m|N2nP^I z%bLJ6U!Jl)XB=Vt7XdTRKjMHO41$|5De~&|47FE8)Fn|wfNBR+J!re8_m7AD_KCg4 z3O}YiyCqUzz8b0(~)J($jB-@wRA!%1p>mXQfXBSMby_`8*Ja{~HGjx%^u2I$?;wuXcB-pQVS3}E1cwrteIh|9T zaI!1Ni?oqtwT~sC7Npa@2DSLQpDgXat4%T;0%J*DKVsGL6_3kL-S!*5df(gAfudvqr$E1qmdG2=+3|Jkcm6jKv;5RLa#B1W z>*Or@yo6OeIBx0rPTGrp{~X#i1#`G50*4Bsx_qrbfgq@x@CR&Z)0M->zDORWrmmn? z3=NGz?r~^<%%(3jtng&VeD+1?Pn#Y6+s@Ir3&!pN+yQlpR%ffuTCdvBB-2#Af z3wAt+aq4qNpX2_->rO#8hiOK@C;WiD=^>fDS@%jSH6l|B3sOv)U+cTuJ=xTtEuXsW z@t8J+vyx{a)|6|=R>oBzDCF=O7F01<>7*^hM|MOj({m^A+20r#7(V`WErfRW?dZQR zhf(kQn1EIWf5~`<*~5%2{IDb&!Jh8Ft!R7R=%yYtG)v!jf;<-421~Nc&DHfJAQ$!; zQ?>1zfT?iGtNw|8($&taW7%8D3LYVa#4Wfa8t>dn4t#Br0q8|48jbA;W%po*gZd`- zf3~a`(8jK4mnT8Z2P^Ot;p5D@YgS3B0MXUsG9`!$uH@}^8C z`)UEu8*UVB8J|8o!6hxYuC7e7E=Z2DB78*Bc_8n!uu?$kjYv!d!fLgqKfwm;=w{>E}rj> zYH3)l;r!oH-23y^{fzF3_rjy8mZ!!blJ&lYzBG0HfRm+c9TZ4QB5@pSuuy7_1kzt? zUv$51*J^AYr}N4$2wJ=e=jPM!uNK?Whp{&(L9KxrD2&GBAB`S;L4RN=!Z=I6Yf9|g ztgcv^6$IRyWr(^0m&y;w{9&2fbub;MBsvQKU`Y;$incqi9?l;hb4#rhx&umsL3R>B~j9jTNTx zgQ`tCbg`&p_yZN9C+Di*x?BX>B=XS3DezRL@Tm9nU~u^2H3*^ksWm_ee@rY*Wp&O` z5ubd!uLSZ&&;vlFe0pt_dRHFQeZd1Qe|si6e@3FN{95B+a#e`2#$53wK?is>I-u!} z+W?>)B&qcGAnwx9@@ErLGtd3=25AVU$U9GAQ4rz1lxL{L%f)-dmT4*cyRPlP!WNUF z&hFMDU;8($FhZ8c%!)I44~r5y?{S+cgQ|SRv|EqIu-RfsV)3tNfU#Y8ZAu#JkP&WP z2V&z4Q(KfNK(k|c(=}XK_?L!-QKYTeT{6hdJZ^o&pfkx2p1&_1OTjY{!mqfJ3m9TM z@gHZ*#`FNgq2szO=3L`Le;^g#{{bhKfuC1EyAqi)y z7q3M?ibK6W-`z@Wo^U_C0cf!~xVtoVe0lj4)f{(|WnlUeferwD)`AJVAgsHz-WjG0 zHw6x{ji2K2(ow)n=WG3M;OP)}rA8u}JJlf zc4yGE-Cw!MUYwDtO>LwLkWWVu6E{yC{?$o2le5<#R!5p{8Fg+%BPY9lqKWo9gULfx z*olAqeC-1WCV$*Vkfjsf#(L(6`aXe%RYz`gPlN3+_)5p^fON29(xfCCL!7X%Rs7yL z2I=~<(IdlPZ(8Jw(7Da^?GM*k3G2_inD|vcpuN-p!ZkfGMI6TC@J9l9*#TgY9-N%$ z~B!6Vl zi@UXRdI74{1xM><{m~yK7`Plyn{xTxf8VOCcbuHUcdfU&=xwmafO0s9&Vv&+)WPEQ z8gt=J1`yjT0|6lWIj$C!1iGxP3ILjI2`0w?nSM8~>{3)`6Fjn74=d)Gro&H7n1=Q~ zRFHhy7Ol@gpnZ{&n;c6VBgi?13jn)CE)?PfgfHRj4M{+MM%LYSZry(R4cy^sh7LFu zoMfUL6?Po_AF25O7MS9u zPcRWZK-$MrOnb7Dy72^|U-+W=^H)HLfOz2gae9JZl447Uu+@;RBsm#ypEyP`lPKpu z&8wmhRpIALuOI2J`;|7&_!zQeUG@Vit`wc{sJc>SkORASu%SVB?!fbb!{MNNK=fu2 zrm4e%1x2;IujWN<#+4#H3B>+N=+({2(HQL}DPQ(zf6+i2R4lm4avpBoU#(9e0~PS8 z^NxJHymq*jGa!HOZEsd5kb&KXo191>AK*afWT~i`a)fGxYkNcE__moAnYCUYgHxus z%kfQ^D8z48BVh}=n-PT5^GhPj=s&ZikO%hPD%5l3tTvoHMPqEL%xPF{xC^SiFs+tsW zJb!qObMf`_SoP8Oks%z8>JsFJ_1VL}Vbllz;PGm!HBb-Q4dEukdPsig?;jvp!2{|h z8{WiVfT0GZk4&*42Z^q{VVN^^qh{xue_uGK;mdk%m8!Sb5~F{RWw- zn!ZM-i=i*?8s<_O9ymA-cpT#%OFgEfPni0CpR1G^8`^M?e}870zoO5qZz7Ewaq4z1 z0#yxaq<~@e_sCDNpW^pe!Q)B0FN`>oXA#$-BS$cl(TPBR&_Q{MJCbZfXs!SujZb%P z>TmEi>k$iK#xfh&l#BEh}^LQg~#>|lu2vDo$8Npz_w8p}73PXm2 zXtu*Qc2)5dPrxuVPx*MG=u$>X8Z+@YLpZsa6?C0pw$6U%C z()Jvxr1d!&2{MKL>NLn$+q6W%YTt#_J<-f0N<`yc#{iN+ z{<=~*=hUFmo(pX~m0Pmy8hiR58ji~Pc7o<^W%vYYqc6_bTApe#x>l;&8Zy?;GnW?RrvJ+ zF^?mAR=}=qfAJ5)4qVTCs2V9{7bwg zw9E|*sH6b2k5IgT+k`DwoY{O;$)*T$Rs#?6gP9dOa0uO#O04`gOzeJrvYJg@6F>jB zry=GdKG(J%NTJTf#}u~F69(UMd<~hLS>4oGSBsUMqg8ok#ZTocAUnfE<8#8T{^e~> zb!$xkC`w?V5tJU}*Z35jrN9Ut5a<2-N+ISe2cAQa12+FX=RS{>bP~-t9shncp{sF~ z=g)u2!@f?5)?MpltM19{`dAISI=$AE)r2~MmuS^c7Z%(Q8Ez*f4`ogJE9Lo8a~<5P zOOov}or7~)c`A+j>0bW3^v2@lz6k^owD2e|DQ&%UmorW-xv`3ZGFTDZK^x>Sh~E4) zpNU7+-Jc~1o&Fg4TgIlwKv1yoz^5eW8Edmj>6k87fMp3!pfx;@kBEcQe7;wWfH608c`7@%BCr>O4u1T)`hq30bjg1BHXDiTi@|tFGvWMqH<4$4%3l% zWZ&rPg{uEN2wXy8V z+VTYsUTSK_P>uTqgw^2vRPNW*lE;akQZbylczPRxsof=*7O|8r^?l z@a%*VVho47B?aTO5u|JPKDUNdPaY4fBuIb+(ULPpwbLYG4>aYeIREOY{qRNp(#%~2_2^}Cqj;mv zJvId0aLcSbk*P6z-gZe_rFcA6%PeQ8SZGT26e{&yio)yKJu+bk0^%^xv)#Y3uW2Tq zNrJk4uaD@eQ^O9C^IDFmj$xp=ryxLCbHmbtpx)DlkDrf2waIgA4fpPr5kfkgW}L&t zLP+4uqk0A5a|^3wOHN{X-nh|1FODiF!8FL2Z|j5~ba!yg4KXX^ZP>p-PdL~0P>B0P zxlYo=20YCz#u}C-s@nf1i8t3E+{n3%CvKKDcvlxq#wS=4aD>+{py5z}a}d5hsq~GK ze{;)N8R%t5j7|mOCrr46jALw05q$hjvEcA!^DpH8TwjBx*x=~|)5C8UAnvB>cNt`FA+{o$h0sQc&0 z7Uj>Top)XBrREBQQ29SOc$fuJGCdr9wsp zFVPo2CPSSYeP>$iCO=mOo-XjGURITW$}W4gRULpPOh#rXhwH|5=ak+@)g_TB;>%hT z7ZWFFALTBRFE3Nw!7APJ0*V%|+!lJb8X*5+O7>?{z4q<;NnOvtZ+|_;X0XJk8ad8A zA-PyZLJ`U}p7;3p-DbqWVCgRtDH!4K0VyWeo2tLT2~=VxOUid&cc+~qFcx*JCnguZ z#s=wv0)@rWP+uuP@s{5I5Y|fH!a9||G%@1!U0DChLq%PyQ|ck%MOJJ|PPq8Gp{@Fa z4_O~3l;WXq&Yz&!0p$08V?u8L(n1+1*SuE)!EJoRvJY~A6&hcWDS8AP$)$FgXdgTR zFO0gz@-=H}T(GgJ%yix?p!4nj8g?NB_Djpw%Lv4r%WeL&YA}qPD#8#gkYpXxkd7nC zDgOWQ%y`=hHn858S@Rfh=l}~zl-FKZhIl)&^_gEY5nrWRE8Yatg&`+^|koWb!(g8e_4b?0mEXc=9XSY?xUyq zSbF7C4hYpfJR?ISGknxwb$9Tt_1xH(-B_?NQi~w_;>+%jwH@oRKK|Ng2jWWSap~(D zcL#UwiO4IpA}cPMqBN6^d?gxHB95mvQqP?w;ont$;h0|ykU^;IsyK|8dfa#jNC~$| z>FkcT?jCfVEJa}?5p|A{t8G@+>ngzOL_HPw=wpiE>)ys&Murg#bX;+4wg8SFs2Z~< zE!Ry~&5dFP9rJdH`26c`;3*|qEoGRcubvF#Vo%1Cs_a;`n^BLQprZ!5z zL*Fex7|Oq(S!mXNo+Y(EWXJt+K}KO}ukM#^&=k-u^GlofvHQ|#KNp5@_q$(ZKvxF; zTQa8oa{wQbpD})*T4AjPXr5huORKMjZ8jeUgjt*|%;d%G1Br#IvHT4QVZS9VC?_$N zuxBe-+mhQ{SDT4)*Bp#9;(DVyQ-6tI!0dUOfGpbJ^NS18sMfb%r0#`y03{fDhdr6E zWGT~Caem}D>4xl%D{U#%@5vhtwdCk+O6q>OT=S;sAb~ZcGczWem!h49+e@fIQ?-j_ zy?nVu8`Sd;)+PTB)m9yA3IiP?`Y!*N5O$jOyP9ofiK)H4qZ<8s zxCJaV?D~jWa6m`lFZyo?<9gHEe6R6LPvKBdqWQZp)dfX*@QE8Q*eABnjh#xXoG3`x z=YRuJx>=?G$*_jSQKIe2ukp3aZYYsRf;>_p6b$=P?l9!qg6bcVbuK80lG6g@`vuzSCFlQR3wP5%sF+!=S0wAUo1fu5J5p5x*jVz7tKkG?+T3w>_ltB3 zVj@t!yq5<-IW(m{D5^c;tMRsO9&j1#OS|*|<4Ln{-4kNr>=k$8-yL;db)vr?7UYLW z+j?|jt=gw)%7#f7#3EoMLR?adpwi&2h}CuEQf0p*TY`KvswnLWi|_>$X7B~Y`L<1f zb?ET}dYLe5<;*WqcpI5hl-eiyIpgC-k!Wo2RnWTQ@`36E-REfXOnLB7ctD`(VL8$F ze!ro?&Wof<1veptib?8BWyx1v-_>dL$}S+sJO7$pIq7-dW7jd zIth6RC_^a;fez){2RhFeMACH$485YUo{EJgA@Li17M|Eu|ZV zqY_{mO9ayxk+40uMCRtz-R`xqIYYOf@b7{U)L_TivcW<3UJaT1J=T7poj?ct(S1%A zYw6IS){O*jP>bxpbF)2($@0A>~q>G(Lr+vkZ3G z@1ftK#GUs2?ox|FMA%hEZ%FQX)of?O7+d`dZ?AnSd|eB@ZXIv)t4!E|Yf4l$&f|%HOk@NzSd|Gh9X&&5r{=QpI(AYnM=o_T5Plf?E zsPB9#jX-Vm_i8Sc-qg9#NI8~>M7)lzm87K>J7D^fn>{`l*JJ)bFN9i8&t!E2X5hKd z*^*QW7wN`{R~Jd!S^u^Vw!7!qFduv7sD1C0MGS`lb4 z@o9%A_)2Twmf5b#R$1&URSchhu=njj0mB$AT$a<`9g>sg1vvq38fL&Jk<*)~U zibU^{()_Jk^vIKSrN!T!Vy!m$y=5y3m6Pi&L;0;M=Sctg^WSUAwHYrQ_dPK@c&#yw z@qY4CuR~6C*Udi@6E9t^=5`hJJ}CE{XQdmQLXZ+sm!do#2Skdxxz%32TV$nRb2m(O ze;85f%&C%lD7DHp!m@b(w5R#-9koPu)6l%#R--m4v2}DYxOH~%Xpii6rYWs;D#z<; zo(pW4`QqD9CU&7dg&N5JR`xB7W%W$McyD)-=@y{jAGNR}-ynMUu>Jb1!3+-wASEqg;UAS4u&`Dh_6z*(tSU za(s$xeRdo640<|MUDv0-(y*E6eDq@qwZ%W(J&JCy z=SN#!toe$m-=RunN_o8|bMu;)kw=A<(V6kdWB9eP-t=SN9DTI{Ys6Zo3RAfAnsI|X znvp;A%a1Cyf>70#BebV#57`HII4Pl=At(Q$?WJg^^-UxH?q{9C=Gm%&mGx$(cad;6 zLJq534c5BvsXxAeUaEeRt_dl+;&8urVe3;rCnH9wU?l$qVmvb4$WtA2X*T&mTO0={Y%cZv{&~jF6a3=0Z@1*p z2r=ai12~khQ=|%#QF-ieOBu~7mK&He$vzoYuWYcxfeF_~kn3cy8y+^CBhrOiqUO(iZI^&peDg-cGGxEWiC|wyD3% zUc-_;&e$G4JF)RNX(3g1_kpnbduH$GNLVr!e-Tr{N@^acSbp}hC7>=Ua6Pwdt4=<) zW$9z4dmsirT*!Kp#Ifgd7F)!%23o4ddL3q>w}mDO3`FSM-^If^@ZogBCZhq_?s!&C zZ%j^dF+JODc585~my{JS{_^2sR=$?c?4zfOI5%@yBrPsif%yR?@(btu&=|K+n>iiW z*fZDRWiC9nUGZFJ%g?gnioDDqm1o*2`)5oFPBL3${p7eUF?biujB(#!;#ohr4!^kG zk}?+6rXx7TQ+=Roi+b5lp6Qbn(kifOsl)WQv&-_j!S{*ATvKINt$~Zg45g0nr3V|4 z#uE}n*r=-w5~#?l3r|?5Q4Jl$^&1<(gh=T)Pk!}Int|vKeHBQ=-b^Z~XQ9`sk*ru< zvw9mv&&wQ4V)Yp{cofCla&JD0W(Ipq@KP|dZdqF5U75l5KWCo$!I+O<_C7_YX#S1T zgoSr{c2J!d*krtg+hiKb`_jUokEovh+IH6?xry^TMyK z8h@;El49PFIrq*(BPq(S#LtAh+5^cb05fblk|QS<<&NW#QR|&hf+P-8r#UcUL#q`Y zDF`QgS0x)akihqShRlsRGiCli`yiQbT+qPHnbbLyEE#_`nIuCIsd`f=Uz8d$C){kH z{I{QdluXrT->gY$yX+)xLLEHqfLkn>PjiajDO45a3|2R{Fd%3W2J?Tq5AyyzKs{{9 zaQN{kI=a0H{Cmw-xrt5jU=KEx%_xGb1NJU!Uy4>@Qu@{z!3-@7A zKs%b+oE*Gu+mC3=k24$LejAy37DR8N&jFz^F~o3)ajxz1=NL>UWDmL}g1MKrs$6^0 zd)B-@Fia?*T93s-?0>9Ci{19)!>x}q6I;bz^K`^84|Pa!n~GK}t0Y2#7kRuCKgP^nd;VdWzV%0#2J%BMm8#tPrdfT++dk8( zC0B*2?gDGpZiHbvd}m{b(GJLY1-~8Aacr(*I%H-|>eb$S2&s>+x5s(cJrk|?YkSq{Ug`WYMrB{g zY97q#%a)XVrMppbe59B%=nD@u`GVzL%1E1Mwsx`9W1${9(WeZ!$6}9GrkNcqr=EgIoqL6b&ymj^7g}}XTu&@ z-ZzOgENC@x22MSWW0dI*uWN>`xpP-XYAI)D(arv-y_i3K@IRDfzR^(qdu{~-eaqPs zDwKeIRwu8A!SeNYhK92^`N_q>D?M``*jV9E@`!xC*_s8BpCO_`j^&UX9yjtq5~(Q+ zAqI`a3B0>i`DC@C(Si&j)W5Wvf8J1c%%%d;K6LVA(f10+z8vgCJy9DiVXym+IZ`~X z=QNa^K5Hf%O0N>UwYw{?n1t&fs57f^khevN+Ih39uD<0Qgevdcd#0Enki|d4{`isHtxMj2ehlSGL%9(d!28(WUt737G3Q441 zj-0|0&*BW@Ae}tc&-qTpx+jpm$r)dyBo1&1p@5+^{VgAW29lpb_Gi?=#;~=dyKTI!nF*Xz#(D#_^XWkf8)z7A zB(KjuuXga;xlLbrwPZzfv<78E+o94JW?|LU^zZ>YtGbWin9Hb}t@_^I25fEgaV{D{q;-<&Z1Rs3NwNkCUUqF%N$S-67;wX2#T z=Cb?DTPw$M59+-JX^FwFS3Nu}8Pf;~%P(t0_Hw8}8X7(;W2ZB>6Al4mfCvn$#&2IZ zYY6{%sj8E6=`r~8y`MtVbbU5c@K9BSY9XNy<(A2|!P=&P;)%K0{$#5Vmmt^LZVG5; z@m2k|xPyh|KNp&gzPKkm(m(tyK%zi>!=HdIe#WIz}n1b1?rmCsg!0 zSzgLxvzyBFZX=p2|?+1BSZ8hKt=5|{kK6tp1 ze6cu!jo26p0gsO@CfvE}`ePvm0}~3RJ2_@(^u-%joJO}8HSZqsms)xhh+WK_PaC!a zMMlSTq-~)d1CjdT@>7%u7!o6vP~>?AKAGgHr6E9t94K_nt(lP`>IZ<)Ct|rORbFx1 z$Im`E-dEsi_0Ilwwa~*U@PF*>a*Fmunx-Zb7fGiN{IR#kWQAt6NYC`pLuv#~p&vnz zUTetKCg=9c1-w$#{K-f`e1hh5V-Aj@hTm^AN*hhhZMR^WC7G@dCp`bLgt7;VJ zIT_`COr^%IR}nF0|ABhgM#|7V{XM3}6&ZQlN3z1Ws#c$iXpKTNe^i5}xvqhPLcim< zs~k9NdXiM2#@v4(Y$30GB*mddnB4}>^M?oHAZTwnIMt(0QP!^ET1?s%K5G|hF)5U0 zNk%X)gnqxXtqdjv1q^(b_SAfruf<*H<$&w()S2hARm?j%k#gL}Xus|;0XjP%6e?T~ zHh^ z)C=P4_i?<{&pHFU%Nr#jXGvjuC}H@@72L-mb2+=duFVpnOwJCS!j8>)tI7C{q#%Ev z&KJ#K-8O^VyQZ~E`$_<`SeuSnc)`-PJ?I>*1m{MHSLCntZy((|6)g-oD}w>Y&R^W0 z%y-CZo|X6ia74yF&>epnyD)6L5?m_}NQ>piR*iFYdGg)G<%M#}MhpG2M{oB;&6qYw z;(AR@_s~ks_5!O1cC8|sYq`R!$NmD8Yq4y+;c!zBoU2#k7{z8U$*{D$d`qn zk2P~+oOutDc?`zRf+Q(x`R}f%&!12{L#5%j&ugs(H-CH3CH#KvzrT>LsUu`(Z+uaa* zY!!l33IRIrRC{2kZ3)J}AKs?4wXw=6C4| zy>EpB=5ozmaV#w9^bJZ@e=4U8!7W2m*>3LO+6ryo_|srv-kL>u*}hpy>Cezrb|c$h z2};a@hvM^L?RiYSSSvow2fy}6l))~adowgk+77L<1>=W57;*9XyC5XnpOA#d;gB$@ ze0}J{%uNL*a8ZFM8aioqAh2g}viz|mFzw$?uGo!iiSxdY#L)H-!Aykqg&+Hnf}qQZ zi#^OAH(s$(XDlb&aukA&i2)0+C;vBoSUDfuiZev27NuUpMjA0cQ2om_`37j_GRrvA z@fP)g8s&T3IO9Rv2m@K<610UVL(LfC{m?UKm^QGr+e&nVhp()Yi`u7; u>I0QLTK#NAGe~Uz-{*ht421d*g$Nz76(NSL6Ey^{iMniZiFU#M(fconcordia_logo_clean_transp \ No newline at end of file diff --git a/packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx b/packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx index 32ea822..e64aa29 100644 --- a/packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx +++ b/packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx @@ -8,7 +8,7 @@ import metamaskLogo from '../../../assets/images/metamask_logo.svg'; import ethereumLogo from '../../../assets/images/ethereum_logo.svg'; import ipfsLogo from '../../../assets/images/ipfs_logo.svg'; import orbitdbLogo from '../../../assets/images/orbitdb_logo.svg'; -import appLogo from '../../../assets/images/app_logo.png'; +import appLogo from '../../../assets/images/app_logo.svg'; const LoadingComponent = (props) => { useEffect(() => function cleanup() { diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx index d45b962..cd79a9a 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router'; import { useSelector } from 'react-redux'; import AppContext from '../../../components/AppContext'; -import appLogo from '../../../assets/images/app_logo.png'; +import appLogo from '../../../assets/images/app_logo.svg'; import ClearDatabasesModal from '../../../components/ClearDatabasesModal'; const MainLayoutMenu = () => { @@ -30,7 +30,7 @@ const MainLayoutMenu = () => { return ( {() => ( -

+ Date: Fri, 15 Jan 2021 15:41:59 +0200 Subject: [PATCH 21/37] refactor: add link to posts --- .../components/PostList/PostListRow/index.jsx | 42 +- .../src/components/PostList/index.jsx | 8 +- .../src/views/Topic/TopicView/index.jsx | 5 +- .../concordia-app/src/views/Topic/index.jsx | 8 +- yarn.lock | 700 +++++++++--------- 5 files changed, 400 insertions(+), 363 deletions(-) diff --git a/packages/concordia-app/src/components/PostList/PostListRow/index.jsx b/packages/concordia-app/src/components/PostList/PostListRow/index.jsx index 0848d84..8814374 100644 --- a/packages/concordia-app/src/components/PostList/PostListRow/index.jsx +++ b/packages/concordia-app/src/components/PostList/PostListRow/index.jsx @@ -1,8 +1,8 @@ import React, { - memo, useEffect, useMemo, useState, + memo, useEffect, useMemo, useState, useCallback, } from 'react'; import { - Dimmer, Icon, Image, Feed, Placeholder, + Dimmer, Icon, Image, Feed, Placeholder, Ref, } from 'semantic-ui-react'; import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; @@ -22,12 +22,13 @@ const { orbit } = breeze; const PostListRow = (props) => { const { - id: postId, postIndexInTopic, postCallHash, loading, + id: postId, postIndex, postCallHash, loading, focus, } = props; const getPostResults = useSelector((state) => state.contracts[FORUM_CONTRACT].getPost); const [postAuthorAddress, setPostAuthorAddress] = useState(null); const [postAuthor, setPostAuthor] = useState(null); const [timeAgo, setTimeAgo] = useState(null); + const [topicId, setTopicId] = useState(null); const [postContent, setPostContent] = useState(null); const [postAuthorMeta, setPostAuthorMeta] = useState(null); const userAddress = useSelector((state) => state.user.address); @@ -41,6 +42,7 @@ const PostListRow = (props) => { setPostAuthorAddress(getPostResults[postCallHash].value[0]); setPostAuthor(getPostResults[postCallHash].value[1]); setTimeAgo(getPostResults[postCallHash].value[2] * 1000); + setTopicId(getPostResults[postCallHash].value[3]); } }, [getPostResults, loading, postCallHash]); @@ -116,18 +118,31 @@ const PostListRow = (props) => { return authorAvatar; }, [authorAvatar, postAuthorAddress]); + const focusRef = useCallback((node) => { + if (focus && node !== null) { + node.scrollIntoView({ behavior: 'smooth' }); + } + }, [focus]); + return useMemo(() => ( - - - {authorAvatarLink} - + + + + {authorAvatarLink} + + -
+ - {t('post.list.row.post.id', { id: postIndexInTopic })} + {t('post.list.row.post.id', { id: postIndex })} -
+ {postAuthor !== null && setPostAuthorAddress !== null && timeAgo !== null ? ( <> @@ -147,19 +162,22 @@ const PostListRow = (props) => {
), [ - authorAvatarLink, loading, postAuthor, postAuthorAddress, postContent, postIndexInTopic, t, timeAgo, + authorAvatarLink, focusRef, loading, postAuthor, postAuthorAddress, postContent, postId, postIndex, t, timeAgo, + topicId, ]); }; PostListRow.defaultProps = { loading: false, + focus: false, }; PostListRow.propTypes = { id: PropTypes.number.isRequired, - postIndexInTopic: PropTypes.number.isRequired, + postIndex: PropTypes.number.isRequired, postCallHash: PropTypes.string, loading: PropTypes.bool, + focus: PropTypes.bool, }; export default memo(PostListRow); diff --git a/packages/concordia-app/src/components/PostList/index.jsx b/packages/concordia-app/src/components/PostList/index.jsx index fda4102..a967ccd 100644 --- a/packages/concordia-app/src/components/PostList/index.jsx +++ b/packages/concordia-app/src/components/PostList/index.jsx @@ -11,7 +11,7 @@ import { FORUM_CONTRACT } from '../../constants/contracts/ContractNames'; const { contracts: { [FORUM_CONTRACT]: { methods: { getPost: { cacheCall: getPostChainData } } } } } = drizzle; const PostList = (props) => { - const { postIds, loading } = props; + const { postIds, loading, focusOnPost } = props; const [getPostCallHashes, setGetPostCallHashes] = useState([]); const drizzleInitialized = useSelector((state) => state.drizzleStatus.initialized); const drizzleInitializationFailed = useSelector((state) => state.drizzleStatus.failed); @@ -47,14 +47,15 @@ const PostList = (props) => { return ( ); }); - }, [getPostCallHashes, loading, postIds]); + }, [focusOnPost, getPostCallHashes, loading, postIds]); return ( @@ -67,6 +68,7 @@ const PostList = (props) => { PostList.propTypes = { postIds: PropTypes.arrayOf(PropTypes.number).isRequired, loading: PropTypes.bool, + focusOnPost: PropTypes.number, }; export default PostList; diff --git a/packages/concordia-app/src/views/Topic/TopicView/index.jsx b/packages/concordia-app/src/views/Topic/TopicView/index.jsx index d237e98..c0ca6c8 100644 --- a/packages/concordia-app/src/views/Topic/TopicView/index.jsx +++ b/packages/concordia-app/src/views/Topic/TopicView/index.jsx @@ -24,7 +24,7 @@ const { orbit } = breeze; const TopicView = (props) => { const { topicId, topicAuthorAddress: initialTopicAuthorAddress, topicAuthor: initialTopicAuthor, - timestamp: initialTimestamp, postIds: initialPostIds, + timestamp: initialTimestamp, postIds: initialPostIds, focusOnPost, } = props; const drizzleInitialized = useSelector((state) => state.drizzleStatus.initialized); const drizzleInitializationFailed = useSelector((state) => state.drizzleStatus.failed); @@ -174,7 +174,7 @@ const TopicView = (props) => { - + {topicSubject !== null && postIds !== null && hasSignedUp && ( { const match = useRouteMatch(); const { id: topicId } = match.params; + const location = useLocation(); + const postHash = location.hash; + const postId = postHash ? postHash.substring('#post-'.length) : null; + const focusPostId = postId ? parseInt(postId, 10) : null; return topicId === 'new' ? ( ) : ( - + ); }; diff --git a/yarn.lock b/yarn.lock index ad94257..854ae86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,9 +22,9 @@ "@babel/highlight" "^7.8.3" "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" - integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: "@babel/highlight" "^7.10.4" @@ -56,42 +56,41 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.4.5": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" - integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" + integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" + "@babel/generator" "^7.12.10" "@babel/helper-module-transforms" "^7.12.1" "@babel/helpers" "^7.12.5" - "@babel/parser" "^7.12.7" + "@babel/parser" "^7.12.10" "@babel/template" "^7.12.7" - "@babel/traverse" "^7.12.9" - "@babel/types" "^7.12.7" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.10" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" json5 "^2.1.2" lodash "^4.17.19" - resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" - integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A== +"@babel/generator@^7.12.10", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" + integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== dependencies: - "@babel/types" "^7.12.5" + "@babel/types" "^7.12.11" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3" - integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA== +"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" + integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.10" "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": version "7.10.4" @@ -101,14 +100,14 @@ "@babel/helper-explode-assignable-expression" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-builder-react-jsx-experimental@^7.12.4": - version "7.12.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48" - integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og== +"@babel/helper-builder-react-jsx-experimental@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.11.tgz#a39616d7e4cf8f9da1f82b5fc3ee1f7406beeb11" + integrity sha512-4oGVOekPI8dh9JphkPXC68iIuP6qp/RPbaPmorRmEFbRAHZjSqxPjqHudn18GVDPgCuFM/KdFXc63C17Ygfa9w== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-module-imports" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/helper-annotate-as-pure" "^7.12.10" + "@babel/helper-module-imports" "^7.12.5" + "@babel/types" "^7.12.11" "@babel/helper-builder-react-jsx@^7.10.4": version "7.10.4" @@ -164,20 +163,20 @@ "@babel/types" "^7.12.1" "@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" + integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-get-function-arity" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/types" "^7.12.11" -"@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" - integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== +"@babel/helper-get-function-arity@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" + integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.10" "@babel/helper-hoist-variables@^7.10.4": version "7.10.4" @@ -186,7 +185,7 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-member-expression-to-functions@^7.12.1": +"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== @@ -215,12 +214,12 @@ "@babel/types" "^7.12.1" lodash "^4.17.19" -"@babel/helper-optimise-call-expression@^7.10.4": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c" - integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw== +"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" + integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== dependencies: - "@babel/types" "^7.12.7" + "@babel/types" "^7.12.10" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.10.4" @@ -237,14 +236,14 @@ "@babel/types" "^7.12.1" "@babel/helper-replace-supers@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9" - integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" + integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/helper-member-expression-to-functions" "^7.12.7" + "@babel/helper-optimise-call-expression" "^7.12.10" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.11" "@babel/helper-simple-access@^7.12.1": version "7.12.1" @@ -261,21 +260,21 @@ "@babel/types" "^7.12.1" "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" - integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" + integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== dependencies: - "@babel/types" "^7.11.0" + "@babel/types" "^7.12.11" -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== +"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9" - integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A== +"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f" + integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw== "@babel/helper-wrap-function@^7.10.4": version "7.12.3" @@ -305,10 +304,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" - integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" + integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== "@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.12.1" @@ -593,10 +592,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1" - integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w== +"@babel/plugin-transform-block-scoping@^7.12.11", "@babel/plugin-transform-block-scoping@^7.8.3": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.11.tgz#83ae92a104dbb93a7d6c6dd1844f351083c46b4f" + integrity sha512-atR1Rxc3hM+VPg/NvNvfYw0npQEAcHuJ+MGZnFn6h3bo+1U3BWXMdFMlvVRApBTWKQMX7SOwRJZA5FBF/JQbvA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -784,35 +783,35 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08" - integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.11.tgz#078aa7e1f5f75a68ee9598ebed90000fcb11092f" + integrity sha512-5MvsGschXeXJsbzQGR/BH89ATMzCsM7rx95n+R7/852cGoK2JgMbacDw/A9Pmrfex4tArdMab0L5SBV4SB/Nxg== dependencies: - "@babel/helper-builder-react-jsx-experimental" "^7.12.4" + "@babel/helper-builder-react-jsx-experimental" "^7.12.11" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" -"@babel/plugin-transform-react-jsx-self@^7.12.1", "@babel/plugin-transform-react-jsx-self@^7.9.0": +"@babel/plugin-transform-react-jsx-self@^7.9.0": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28" integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx-source@^7.12.1", "@babel/plugin-transform-react-jsx-source@^7.9.0": +"@babel/plugin-transform-react-jsx-source@^7.9.0": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b" integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx@^7.12.7", "@babel/plugin-transform-react-jsx@^7.9.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f" - integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ== +"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.9.1": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.11.tgz#09a7319195946b0ddc09f9a5f01346f2cb80dfdd" + integrity sha512-5nWOw6mTylaFU72BdZfa0dP1HsGdY3IMExpxn8LBE8dNmkQjB+W+sR+JwIdtbzkPvVuFviT3zyNbSUkuVTVxbw== dependencies: "@babel/helper-builder-react-jsx" "^7.10.4" - "@babel/helper-builder-react-jsx-experimental" "^7.12.4" + "@babel/helper-builder-react-jsx-experimental" "^7.12.11" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" @@ -877,10 +876,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.8.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a" - integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q== +"@babel/plugin-transform-typeof-symbol@^7.12.10", "@babel/plugin-transform-typeof-symbol@^7.8.4": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" + integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -975,15 +974,15 @@ semver "^5.5.0" "@babel/preset-env@^7.4.5": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55" - integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" + integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== dependencies: "@babel/compat-data" "^7.12.7" "@babel/helper-compilation-targets" "^7.12.5" "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.1" + "@babel/helper-validator-option" "^7.12.11" "@babel/plugin-proposal-async-generator-functions" "^7.12.1" "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-dynamic-import" "^7.12.1" @@ -1012,7 +1011,7 @@ "@babel/plugin-transform-arrow-functions" "^7.12.1" "@babel/plugin-transform-async-to-generator" "^7.12.1" "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.11" "@babel/plugin-transform-classes" "^7.12.1" "@babel/plugin-transform-computed-properties" "^7.12.1" "@babel/plugin-transform-destructuring" "^7.12.1" @@ -1038,12 +1037,12 @@ "@babel/plugin-transform-spread" "^7.12.1" "@babel/plugin-transform-sticky-regex" "^7.12.7" "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.1" + "@babel/plugin-transform-typeof-symbol" "^7.12.10" "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.7" - core-js-compat "^3.7.0" + "@babel/types" "^7.12.11" + core-js-compat "^3.8.0" semver "^5.5.0" "@babel/preset-modules@^0.1.3": @@ -1070,16 +1069,14 @@ "@babel/plugin-transform-react-jsx-source" "^7.9.0" "@babel/preset-react@^7.0.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b" - integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9" + integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-react-display-name" "^7.12.1" - "@babel/plugin-transform-react-jsx" "^7.12.7" + "@babel/plugin-transform-react-jsx" "^7.12.10" "@babel/plugin-transform-react-jsx-development" "^7.12.7" - "@babel/plugin-transform-react-jsx-self" "^7.12.1" - "@babel/plugin-transform-react-jsx-source" "^7.12.1" "@babel/plugin-transform-react-pure-annotations" "^7.12.1" "@babel/preset-typescript@7.9.0": @@ -1121,27 +1118,27 @@ "@babel/parser" "^7.12.7" "@babel/types" "^7.12.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f" - integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" + integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" + "@babel/generator" "^7.12.10" "@babel/helper-function-name" "^7.10.4" "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" + "@babel/parser" "^7.12.10" + "@babel/types" "^7.12.10" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" - integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce" + integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" to-fast-properties "^2.0.0" @@ -1281,10 +1278,10 @@ "@ethersproject/logger" "^5.0.5" "@ethersproject/properties" "^5.0.3" -"@ethersproject/hash@5.0.8", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.8.tgz#368a60addc3c5cd18e28f78c80dc94e1bacb82d8" - integrity sha512-Qay01tcFyFreYjSMt82rOQGMfQDmLm1sj3iNNO1BhrVf840xgBZuJ7gBATERzAjTuTCHUHw9BuGwxErJUS95yg== +"@ethersproject/hash@5.0.9", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.9.tgz#81252a848185b584aa600db4a1a68cad9229a4d4" + integrity sha512-e8/i2ZDeGSgCxXT0vocL54+pMbw5oX5fNjb2E3bAIvdkh5kH29M7zz1jHu1QDZnptIuvCZepIbhUH8lxKE2/SQ== dependencies: "@ethersproject/abstract-signer" "^5.0.6" "@ethersproject/address" "^5.0.5" @@ -1588,9 +1585,9 @@ "@hapi/hoek" "9.x.x" "@hapi/boom@9.x.x", "@hapi/boom@^9.1.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz#0d9517657a56ff1e0b42d0aca9da1b37706fec56" - integrity sha512-4nZmpp4tXbm162LaZT45P7F7sgiem8dwAh2vHWT6XX24dozNjGMg6BvKCRvtCUcmcXqeMIUqWN8Rc5X8yKuROQ== + version "9.1.1" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.1.tgz#89e6f0e01637c2a4228da0d113e8157c93677b04" + integrity sha512-VNR8eDbBrOxBgbkddRYIe7+8DZ+vSbV6qlmaN2x7eWjsUjy2VmQgChkOKcVZIeupEZYj+I0dqNg430OhwzagjA== dependencies: "@hapi/hoek" "9.x.x" @@ -2189,7 +2186,7 @@ "@sinonjs/commons" "^1" "@sinonjs/samsam" "^5.0.2" -"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.2.0": +"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.3.0": version "5.3.0" resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz#1d2f0743dc54bf13fe9d508baefacdffa25d4329" integrity sha512-hXpcfx3aq+ETVBwPlRFICld5EnrkexXuXDwqUNhDdr5L8VjvMeSRwyOa0qL7XFmR+jVWR4rUZtnxlG7RX72sBg== @@ -2350,9 +2347,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.16" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7" - integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" + integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== dependencies: "@babel/types" "^7.3.0" @@ -2429,19 +2426,19 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" - integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== + version "14.14.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae" + integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ== "@types/node@^12.12.6": - version "12.19.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.8.tgz#efd6d1a90525519fc608c9db16c8a78f7693a978" - integrity sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg== + version "12.19.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679" + integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q== "@types/node@^13.7.0": - version "13.13.34" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.34.tgz#c9300a1b6560d90817fb2bba650e250116a575f9" - integrity sha512-g8D1HF2dMDKYSDl5+79izRwRgNPsSynmWMbj50mj7GZ0b7Lv4p8EmZjbo3h0h+6iLr6YmVz9VnF6XVZ3O6V1Ug== + version "13.13.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.36.tgz#0c4d3c4e365396c84b1c595524e2faff7dd45b26" + integrity sha512-ctzZJ+XsmHQwe3xp07gFUq4JxBaRSYzKHPgblR76//UanGST7vfFNF0+ty5eEbgTqsENopzoDK090xlha9dccQ== "@types/parse-json@^4.0.0": version "4.0.0" @@ -3058,7 +3055,7 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.0.3, array-includes@^3.1.1: +array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8" integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw== @@ -3795,13 +3792,13 @@ browserslist@4.10.0: pkg-up "^3.1.0" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.15.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.15.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.15.0.tgz#3d48bbca6a3f378e86102ffd017d9a03f122bdb0" - integrity sha512-IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ== + version "4.16.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b" + integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ== dependencies: - caniuse-lite "^1.0.30001164" + caniuse-lite "^1.0.30001165" colorette "^1.2.1" - electron-to-chromium "^1.3.612" + electron-to-chromium "^1.3.621" escalade "^3.1.1" node-releases "^1.1.67" @@ -4058,10 +4055,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001164: - version "1.0.30001165" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz#32955490d2f60290bb186bb754f2981917fa744f" - integrity sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001165: + version "1.0.30001168" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001168.tgz#6fcd098c139d003b9bd484cbb9ca26cb89907f9a" + integrity sha512-P2zmX7swIXKu+GMMR01TWa4csIKELTNnZKc+f1CjebmZJQtTAEXmpQSoKVJVVcvPGAA0TEYTOUp3VehavZSFPQ== capture-exit@^2.0.0: version "2.0.0" @@ -4242,13 +4239,12 @@ cids@^0.7.1: multihashes "~0.4.15" cids@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cids/-/cids-1.0.2.tgz#04ebadd65e5600a07feb16db594160f087c6eab3" - integrity sha512-ohCcYyEHh0Z5Hl+O1IML4kt6Kx5GPho1ybxtqK4zyk6DeV5CvOLoT/mqDh0cgKcAvsls3vcVa9HjZc7RQr3geA== + version "1.1.4" + resolved "https://registry.yarnpkg.com/cids/-/cids-1.1.4.tgz#d2aa4343fef971ef896b032fa0b99a66755d0f98" + integrity sha512-mo0IWZKcaQZsret8cP39MzDnPVT9NhhQEVaIKwWnBFaLtj2slTFckYMnbk15ptewNkb22qRBLfuBK+qiWYW/Mg== dependencies: - class-is "^1.1.0" multibase "^3.0.1" - multicodec "^2.0.1" + multicodec "^2.1.0" multihashes "^3.0.1" uint8arrays "^1.1.0" @@ -4653,7 +4649,7 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.6.2, core-js-compat@^3.7.0: +core-js-compat@^3.6.2, core-js-compat@^3.8.0: version "3.8.1" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e" integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ== @@ -4774,7 +4770,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0: +cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -5582,10 +5578,10 @@ electron-fetch@^1.7.2: dependencies: encoding "^0.1.13" -electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.612: - version "1.3.616" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.616.tgz#de63d1c79bb8eb61168774df0c11c9e1af69f9e8" - integrity sha512-CI8L38UN2BEnqXw3/oRIQTmde0LiSeqWSRlPA42ZTYgJQ8fYenzAM2Z3ni+jtILTcrs5aiXZCGJ96Pm+3/yGyQ== +electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.621: + version "1.3.629" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.629.tgz#a08d13b64d90e3c77ec5b9bffa3efbc5b4a00969" + integrity sha512-iSPPJtPvHrMAvYOt+9cdbDmTasPqwnwz4lkP8Dn200gDNUBQOLQ96xUsWXBwXslAo5XxdoXAoQQ3RAy4uao9IQ== elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: version "6.5.3" @@ -5719,9 +5715,9 @@ err-code@^2.0.0, err-code@^2.0.1, err-code@^2.0.3: integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" + integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== dependencies: prr "~1.0.1" @@ -6297,9 +6293,9 @@ ethereumjs-util@^6.0.0: rlp "^2.2.3" ethers@^5.0.8: - version "5.0.23" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.23.tgz#461a6e63c4906d5ea64126d53975ddf2ca81a979" - integrity sha512-f3pTcgYpMhtmMTMG9KO6pWHYjrCiGz7yVnvMsTQgAYfAVAeUxKy2H1cxQJyqyghRjtAvgVYJlnXQo8mMCD63BA== + version "5.0.24" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.24.tgz#fbb8e4d35070d134f2eb846c07500b8c0eaef6d3" + integrity sha512-77CEtVC88fJGEhxGXRvQqAEH6e2A+ZFiv2FBT6ikXndlty5sw6vMatAhg1v+w3CaaGZOf1CP81jl4Mc8Zrj08A== dependencies: "@ethersproject/abi" "5.0.9" "@ethersproject/abstract-provider" "5.0.7" @@ -6311,7 +6307,7 @@ ethers@^5.0.8: "@ethersproject/bytes" "5.0.8" "@ethersproject/constants" "5.0.7" "@ethersproject/contracts" "5.0.8" - "@ethersproject/hash" "5.0.8" + "@ethersproject/hash" "5.0.9" "@ethersproject/hdnode" "5.0.7" "@ethersproject/json-wallets" "5.0.9" "@ethersproject/keccak256" "5.0.6" @@ -6406,19 +6402,19 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== +execa@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376" + integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" is-stream "^2.0.0" merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" strip-final-newline "^2.0.0" exenv@^1.2.2: @@ -6844,9 +6840,9 @@ fnv1a@^1.0.1: integrity sha1-kV4tbQI8Q9UiStn20qPEFW9XEvU= follow-redirects@^1.0.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" - integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== + version "1.13.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" + integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== for-in@^0.1.3: version "0.1.8" @@ -7107,13 +7103,18 @@ get-stream@^4.0.0, get-stream@^4.1.0: dependencies: pump "^3.0.0" -get-stream@^5.0.0, get-stream@^5.1.0: +get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" +get-stream@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718" + integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -7159,11 +7160,11 @@ glob@7.1.6, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glo path-is-absolute "^1.0.0" global-dirs@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201" - integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A== + version "2.1.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" + integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ== dependencies: - ini "^1.3.5" + ini "1.3.7" global-modules@2.0.0: version "2.0.0" @@ -7554,9 +7555,9 @@ html-encoding-sniffer@^1.0.2: whatwg-encoding "^1.0.1" html-entities@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" - integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== + version "1.3.3" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.3.tgz#3dca638a43ee7de316fc23067398491152ad4736" + integrity sha512-/VulV3SYni1taM7a4RMdceqzJWR39gpZHjBwUnsCFKWV/GJkD14CJ5F7eWcZozmHJK0/f/H5U3b3SiPkuvxMgg== html-escaper@^2.0.0: version "2.0.2" @@ -7692,10 +7693,10 @@ 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= -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== humble-localstorage@^1.4.2: version "1.4.2" @@ -7899,10 +7900,15 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +ini@1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== + ini@^1.3.5, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== inquirer@7.0.4: version "7.0.4" @@ -8062,25 +8068,23 @@ ipfs-block-service@^0.18.0: err-code "^2.0.0" streaming-iterables "^5.0.2" -ipfs-cli@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/ipfs-cli/-/ipfs-cli-0.2.2.tgz#24223ba5f414e2f85ad2908cd8c1399e47192fef" - integrity sha512-9DhIdTd8P/uvBv+IdhGjHEl2lpeXm8x2sj30PLddBHFo9PHOWUfqwo7FYHYIzn6MiakL0XWph4HAKX9Jw0iHJA== +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== dependencies: bignumber.js "^9.0.0" byteman "^1.3.5" cid-tool "^1.0.0" cids "^1.0.0" debug "^4.1.1" - dlv "^1.1.3" err-code "^2.0.3" - execa "^4.0.3" + execa "^5.0.0" get-folder-size "^2.0.1" - ipfs-core "^0.3.0" - ipfs-core-utils "^0.5.3" - ipfs-http-client "^48.1.2" - ipfs-http-gateway "^0.1.3" - ipfs-http-server "^0.1.3" + 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" ipld-dag-cbor "^0.17.0" @@ -8091,12 +8095,7 @@ ipfs-cli@^0.2.2: it-glob "0.0.10" it-pipe "^1.1.0" jsondiffpatch "^0.4.1" - just-safe-set "^2.1.0" - libp2p "^0.29.3" libp2p-crypto "^0.18.0" - libp2p-delegated-content-routing "^0.8.0" - libp2p-delegated-peer-routing "^0.8.0" - libp2p-webrtc-star "^0.20.1" mafmt "^8.0.0" multiaddr "^8.0.0" multiaddr-to-uri "^6.0.0" @@ -8110,9 +8109,6 @@ ipfs-cli@^0.2.2: streaming-iterables "^5.0.2" uint8arrays "^1.1.0" yargs "^16.0.3" - optionalDependencies: - prom-client "^12.0.0" - prometheus-gc-stats "^0.6.0" ipfs-core-utils@^0.4.0: version "0.4.0" @@ -8129,10 +8125,10 @@ ipfs-core-utils@^0.4.0: it-peekable "0.0.1" uint8arrays "^1.1.0" -ipfs-core-utils@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.5.3.tgz#1590301675cb7f0d5103f49c6543b1dfd9a4c04d" - integrity sha512-JuJz+sp+9+g7U5j0+M6+biBnVtbJnlRNuBrqku/RcwoH4IIMTX99PctGGyo8AjCo5ZK+j0om1Pp2cWTZrlSdAQ== +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" @@ -8149,10 +8145,10 @@ ipfs-core-utils@^0.5.3: timeout-abort-controller "^1.1.1" uint8arrays "^1.1.0" -ipfs-core@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ipfs-core/-/ipfs-core-0.3.0.tgz#eb2f4a62d5adb2575e0ba3a43508e4f9d17818db" - integrity sha512-uBcYGsIM8lb8dixDvZ09OrMM5nBsvMQX9tUFS3+oo24JRhGKMWtDVV3umn26mXygobdQfGCTZFqjVMxoLssVEA== +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== dependencies: array-shuffle "^1.0.1" bignumber.js "^9.0.0" @@ -8170,11 +8166,11 @@ ipfs-core@^0.3.0: interface-datastore "^2.0.0" ipfs-bitswap "^4.0.0" ipfs-block-service "^0.18.0" - ipfs-core-utils "^0.5.3" + ipfs-core-utils "^0.5.4" ipfs-repo "^7.0.0" ipfs-unixfs "^2.0.3" ipfs-unixfs-exporter "^3.0.4" - ipfs-unixfs-importer "^4.0.0" + ipfs-unixfs-importer "^5.0.0" ipfs-utils "^5.0.0" ipld "^0.28.0" ipld-block "^0.11.0" @@ -8210,13 +8206,34 @@ ipfs-core@^0.3.0: multicodec "^2.0.1" multihashing-async "^2.0.1" native-abort-controller "~0.0.3" - p-defer "^3.0.0" p-queue "^6.6.1" parse-duration "^0.4.4" peer-id "^0.14.1" streaming-iterables "^5.0.2" uint8arrays "^1.1.0" +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== + 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" + just-safe-set "^2.1.0" + libp2p "^0.29.3" + libp2p-delegated-content-routing "^0.8.0" + libp2p-delegated-peer-routing "^0.8.0" + libp2p-webrtc-star "^0.20.1" + multiaddr "^8.0.0" + optionalDependencies: + prom-client "^12.0.0" + prometheus-gc-stats "^0.6.0" + 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" @@ -8252,17 +8269,17 @@ ipfs-http-client@^47.0.1: stream-to-it "^0.2.1" uint8arrays "^1.1.0" -ipfs-http-client@^48.1.2: - version "48.1.2" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.2.tgz#7cdb731e792e4d235be1e19726ccaf12e55ff0b6" - integrity sha512-eeqHhjYUgPNBKxkS29xYS7Mtc9JxzLKI9Bua2nphB5vG1l6W2hjDTntfVl4ddY07XqZogDu6yTL3UsFj0WJFeg== +ipfs-http-client@^48.1.3: + version "48.1.3" + resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.3.tgz#d9b91b1f65d54730de92290d3be5a11ef124b400" + integrity sha512-+JV4cdMaTvYN3vd4r6+mcVxV3LkJXzc4kn2ToVbObpVpdqmG34ePf1KlvFF8A9gjcel84WpiP5xCEV/IrisPBA== dependencies: any-signal "^2.0.0" bignumber.js "^9.0.0" cids "^1.0.0" debug "^4.1.1" form-data "^3.0.0" - ipfs-core-utils "^0.5.3" + ipfs-core-utils "^0.5.4" ipfs-utils "^5.0.0" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" @@ -8283,10 +8300,10 @@ ipfs-http-client@^48.1.2: stream-to-it "^0.2.2" uint8arrays "^1.1.0" -ipfs-http-gateway@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/ipfs-http-gateway/-/ipfs-http-gateway-0.1.3.tgz#0a5689d692bd802cea72a3a5866396f2636be846" - integrity sha512-SwBRSvwwXxlYEUBlDOBngmKFifnCFjs7HM90mgJnRjahDZzGV8YKAZpVLys0szLybz+pqGKK7LxSo7+ALS2hKQ== +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== dependencies: "@hapi/ammo" "^5.0.1" "@hapi/boom" "^9.1.0" @@ -8294,7 +8311,7 @@ ipfs-http-gateway@^0.1.3: cids "^1.0.0" debug "^4.1.1" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.3" + ipfs-core-utils "^0.5.4" ipfs-http-response "^0.6.0" is-ipfs "^2.0.0" it-last "^1.0.4" @@ -8320,10 +8337,10 @@ ipfs-http-response@^0.6.0: multihashes "^3.0.1" p-try-each "^1.0.1" -ipfs-http-server@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/ipfs-http-server/-/ipfs-http-server-0.1.3.tgz#5f5c06c12a3d29d27eff56c806d7ca893c428789" - integrity sha512-Hn7mEgfifHSVL1DFO1mIIytYiOW3Zlav+t6yQjdU+mgTzyH/4C7vwbz7V6ib5IfShROrfmeE6ahkt4IvEb9wxA== +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== dependencies: "@hapi/boom" "^9.1.0" "@hapi/content" "^5.0.2" @@ -8333,8 +8350,8 @@ ipfs-http-server@^0.1.3: dlv "^1.1.3" err-code "^2.0.3" hapi-pino "^8.3.0" - ipfs-core-utils "^0.5.3" - ipfs-http-gateway "^0.1.3" + ipfs-core-utils "^0.5.4" + ipfs-http-gateway "^0.1.4" ipfs-unixfs "^2.0.3" ipld-dag-pb "^0.20.0" it-all "^1.0.4" @@ -8363,12 +8380,13 @@ ipfs-http-server@^0.1.3: prom-client "^12.0.0" ipfs-log@~5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ipfs-log/-/ipfs-log-5.0.0.tgz#bd89edd9eabd22d22365184817b4eca6ad89bf43" - integrity sha512-I8ow4Y42fODdQAX0vtc4xWO5daNTzAQzrWWGd1p6tIdr/OI0IFpC3ifpEWPW3qgWXPg30E9TXYmtxRp0fkOSbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ipfs-log/-/ipfs-log-5.0.1.tgz#0335492ae404ab88bebbd682cecd9efcb8059838" + integrity sha512-n9Tf2rFqqK/r2rshQMAcS/COCwYNi8m2wCZN2ZLT9vhgXMsB1c1YEsCgZru7+cWCHTmuJwuBEjAJX9l9jQPSWw== dependencies: ipfs-http-client "^47.0.1" json-stringify-deterministic "^1.0.1" + multicodec "^2.0.1" multihashing-async "^2.0.1" orbit-db-identity-provider "~0.3.1" orbit-db-io "~0.3.0" @@ -8452,16 +8470,16 @@ ipfs-unixfs-exporter@^3.0.4: it-last "^1.0.1" multihashing-async "^2.0.0" -ipfs-unixfs-importer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ipfs-unixfs-importer/-/ipfs-unixfs-importer-4.0.0.tgz#da9906225fbe0eb9d3ebed05c6ed4a41b5812376" - integrity sha512-ybTcgjNBaB6azQz8jJYESweATJFoc6D+Xo8USM0GahRx9xlFS+4qjnmGbC6H9RcFFt81amcP/P1zX9v83wo3cA== +ipfs-unixfs-importer@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ipfs-unixfs-importer/-/ipfs-unixfs-importer-5.0.0.tgz#f87bc69f99b08ef5d904ecdcd2fc74e9360122ca" + integrity sha512-bvdnCXwwCj72w/FQ7o6XcvrcbCUgXrruK0UZOfhl/mf44Nv0DWyn1Y4hQF/u63rJvYLQdAMlqniAAtFQpHQhcg== dependencies: bl "^4.0.0" err-code "^2.0.0" hamt-sharding "^1.0.0" ipfs-unixfs "^2.0.4" - ipfs-utils "^4.0.0" + ipfs-utils "^5.0.0" ipld-dag-pb "^0.20.0" it-all "^1.0.1" it-batch "^1.0.3" @@ -8561,13 +8579,13 @@ ipfs-utils@^5.0.0: stream-to-it "^0.2.0" ipfs@~0.52.0: - version "0.52.2" - resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.2.tgz#e568d6b5818e3c2deddf7e7230ce7b87fb3b8537" - integrity sha512-2OZe6HyHGzSfdv55RFuw89n43zj+hPGLfmsz0h2LL4OH7ERtQVCH/5foDEoV6NJsXnBnps8w6adCtyrZeze9IQ== + version "0.52.3" + resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.3.tgz#4a1e1651da197fb8dfdcd01abd20308198059b66" + integrity sha512-zCd2Ziq1GYDJizXdoAj5nof325i3mx2kzOhG6E+xdEK6FcK6kQwKendaBlQHwTbzHLqLI7ITxsepQzFWNopI2g== dependencies: debug "^4.1.1" - ipfs-cli "^0.2.2" - ipfs-core "^0.3.0" + ipfs-cli "^0.2.3" + ipfs-core "^0.3.1" ipfs-repo "^7.0.0" semver "^7.3.2" update-notifier "^5.0.0" @@ -8913,9 +8931,9 @@ is-loopback-addr@^1.0.0: integrity sha512-DhWU/kqY7X2F6KrrVTu7mHlbd2Pbo4D1YkAzasBMjQs6lJAoefxaA6m6CpSX0K6pjt9D0b9PNFI5zduy/vzOYw== is-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" - integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" + integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== is-negative-zero@^2.0.0: version "2.0.1" @@ -9038,9 +9056,9 @@ is-root@2.1.0: integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== is-set@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" - integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" + integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== is-stream@^1.0.0, is-stream@^1.1.0: version "1.1.0" @@ -9881,7 +9899,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@3.14.0, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: +js-yaml@3.14.0: version "3.14.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== @@ -9889,6 +9907,30 @@ js-yaml@3.14.0, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" @@ -10094,12 +10136,12 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: object.assign "^4.1.0" "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz#642f1d7b88aa6d7eb9d8f2210e166478444fa891" - integrity sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82" + integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q== dependencies: - array-includes "^3.1.1" - object.assign "^4.1.1" + array-includes "^3.1.2" + object.assign "^4.1.2" just-debounce-it@^1.1.0: version "1.1.0" @@ -10629,9 +10671,9 @@ libp2p-interfaces@^0.7.1: uint8arrays "^1.1.0" libp2p-kad-dht@^0.20.1: - version "0.20.2" - resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.2.tgz#8ba427985c763d92f907a7608f586c72d4709152" - integrity sha512-O6WK43kYjKXJWy+7tLyPScWt7ulBxMzmMKtvlKIv0z8GF7GboUWYAbcbLVEeZIaKkwwfjSMwadL9qFeImGTAOg== + version "0.20.4" + resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.4.tgz#2a1f61e86a10942ef16a7553a91ff96e598c55a0" + integrity sha512-7v4+3bdcoGUyR/8Y5G/Ok9UyhuqghpXFZq5VpW3oph5WtR348snTaBTPkI/8xkQmBxvLIAMxuomp7cMrQaTUyw== dependencies: abort-controller "^3.0.0" async "^2.6.2" @@ -10755,34 +10797,7 @@ libp2p-webrtc-peer@^10.0.1: randombytes "^2.0.3" readable-stream "^3.4.0" -libp2p-webrtc-star@^0.20.1: - version "0.20.2" - resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.2.tgz#9979e42d02c5f42fc78785b3c325b7f0fad50a35" - integrity sha512-P4oZ/v/bhhR0U/dpq8QfzRyKE2l5L4KFM6yrc3j1bj+gbQLBMH2P76/N3jlHqTVBdYavOwdCEifXwfG/qGp+3Q== - dependencies: - "@hapi/hapi" "^20.0.0" - "@hapi/inert" "^6.0.3" - abortable-iterator "^3.0.0" - class-is "^1.1.0" - debug "^4.2.0" - err-code "^2.0.3" - ipfs-utils "^5.0.0" - it-pipe "^1.1.0" - libp2p-utils "^0.2.1" - libp2p-webrtc-peer "^10.0.1" - mafmt "^8.0.0" - menoetius "0.0.2" - minimist "^1.2.5" - multiaddr "^8.0.0" - p-defer "^3.0.0" - peer-id "^0.14.2" - prom-client "^12.0.0" - socket.io "^2.3.0" - socket.io-client "^2.3.0" - stream-to-it "^0.2.2" - streaming-iterables "^5.0.3" - -libp2p-webrtc-star@~0.20.5: +libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.5: version "0.20.5" resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.5.tgz#c52364dfbe59fd8e5da0e32feeaca374d3a79f9a" integrity sha512-Tny1+q0EY192WgrkNCV7360ifI3RXjMoao91qwLhNwx7ArsqVMzrZvBnK3MTMmYQaGE1W0n/CLlw/Nn344iv2Q== @@ -10826,9 +10841,9 @@ libp2p-websockets@^0.14.0: p-timeout "^3.2.0" libp2p@^0.29.3: - version "0.29.3" - resolved "https://registry.yarnpkg.com/libp2p/-/libp2p-0.29.3.tgz#9cee0f44a300a5ac22f2805e5da57d98df442664" - integrity sha512-voILMLwpDqe/KafqaeH7CsmMNtOagV7ln6vNl0/2Lgq4zyY+vCmlzULRaStSagU+9V0QWoSoPmIgQdZ/Ydelhw== + 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" @@ -11326,9 +11341,9 @@ mime@1.6.0: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4: - version "2.4.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" - integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + version "2.4.7" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" + integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== mimic-fn@^1.0.0: version "1.2.0" @@ -11565,11 +11580,16 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@2.1.2, ms@^2.1.1: +ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multiaddr-to-uri@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/multiaddr-to-uri/-/multiaddr-to-uri-6.0.0.tgz#8f08a75c6eeb2370d5d24b77b8413e3f0fa9bcc0" @@ -11578,9 +11598,9 @@ multiaddr-to-uri@^6.0.0: multiaddr "^8.0.0" multiaddr@^8.0.0, multiaddr@^8.1.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-8.1.1.tgz#d86315deed93752fa68b4199fee56f8b4a516a2b" - integrity sha512-Dyur7rWX44MlgKIqVA2dYPOZx/UwG60PVSffJ5S17uo6Pu31lftJXShMEfPtUDGHnyALAOWOuC3X/iPhDtw4Vg== + version "8.1.2" + resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-8.1.2.tgz#74060ff8636ba1c01b2cf0ffd53950b852fa9b1f" + integrity sha512-r13IzW8+Sv9zab9Gt8RPMIN2WkptIPq99EpAzg4IbJ/zTELhiEwXWr9bAmEatSCI4j/LSA6ESJzvz95JZ+ZYXQ== dependencies: cids "^1.0.0" class-is "^1.1.0" @@ -11651,13 +11671,13 @@ multicodec@^1.0.0: buffer "^5.6.0" varint "^5.0.0" -multicodec@^2.0.0, multicodec@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.0.1.tgz#0971bbef83fcb354315c837c9a3f3e2e422af371" - integrity sha512-YDYeWn9iGa76hOHAyyZa0kbt3tr5FLg1ZXUHrZUJltjnxxdbTIbHnxWLd2zTcMOjdT3QyO+Xs4bQgJUcC2RWUA== +multicodec@^2.0.0, multicodec@^2.0.1, multicodec@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.1.0.tgz#b66dff2184e91e74ac68981e0deba2591bbf1f87" + integrity sha512-7AYpK/avswOWvnqQ9/jOkQCS7Fp4aKxw5ojvn5gyK2VQTZz3YVXeLMzoIZDBy745JSfJMXkTS0ptnHci5Mt1mA== dependencies: - uint8arrays "1.0.0" - varint "^5.0.0" + uint8arrays "1.1.0" + varint "^6.0.0" multihashes@^0.4.15, multihashes@~0.4.13, multihashes@~0.4.15: version "0.4.21" @@ -12076,7 +12096,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^4.0.0: +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -12291,7 +12311,7 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -onetime@^5.1.0: +onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -13109,9 +13129,9 @@ pino-std-serializers@^2.4.2: integrity sha512-wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg== pino@^6.0.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-6.7.0.tgz#d5d96b7004fed78816b5694fda3eab02b5ca6d23" - integrity sha512-vPXJ4P9rWCwzlTJt+f0Ni4THc3DWyt8iDDCO4edQ8narTu6hnpzdXu8FqeSJCGndl1W6lfbYQUQihUO54y66Lw== + version "6.8.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-6.8.0.tgz#d242f9936f2e65217fde75c0af5d5d8b4d3d3fde" + integrity sha512-nxq+6Jr7m0cMjYFBoTRw3bco14omZ/SQCheAHz9GVwdkbUrzKhgT+gSI/ql2Mnsca0QQKgpB/ACWhjxE4JsX3Q== dependencies: fast-redact "^3.0.0" fast-safe-stringify "^2.0.7" @@ -14318,9 +14338,9 @@ react-error-overlay@^6.0.7: integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw== react-i18next@^11.7.3: - version "11.7.4" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.7.4.tgz#6c0142e15652d8dd80cd7d857e36efe2e9d4d09a" - integrity sha512-Aq0+QVW7NMYuAtk0Stcwp4jWeNTd1p5XefAfBPcjs/4c/2duG3v3G3zdtn8fC8L4EyA/coKLwdULHI+lYTbF8w== + version "11.8.4" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.4.tgz#5407d2edcaa704c38e4034e7ac06413914ed6e6d" + integrity sha512-QlPJfX+Roi+jEQ6frBSsLHHH+VWbUoCl6wZDT8XHMd6PsSgepjgD2sZf/h7F46JnHeuy0U+SxY3TtrJF+aDIyg== dependencies: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" @@ -15355,7 +15375,7 @@ side-channel@^1.0.2, side-channel@^1.0.3: es-abstract "^1.18.0-next.0" object-inspect "^1.8.0" -signal-exit@^3.0.0, signal-exit@^3.0.2: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== @@ -15389,14 +15409,14 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sinon@^9.0.2: - version "9.2.1" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.1.tgz#64cc88beac718557055bd8caa526b34a2231be6d" - integrity sha512-naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w== + version "9.2.2" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.2.tgz#b83cf5d43838f99cfa3644453f4c7db23e7bd535" + integrity sha512-9Owi+RisvCZpB0bdOVFfL314I6I4YoRlz6Isi4+fr8q8YQsDPoCe5UnmNtKHRThX3negz2bXHWIuiPa42vM8EQ== dependencies: "@sinonjs/commons" "^1.8.1" "@sinonjs/fake-timers" "^6.0.1" "@sinonjs/formatio" "^5.0.1" - "@sinonjs/samsam" "^5.2.0" + "@sinonjs/samsam" "^5.3.0" diff "^4.0.2" nise "^4.0.4" supports-color "^7.1.0" @@ -16407,9 +16427,9 @@ tr46@^1.0.1: punycode "^2.1.0" truffle@~5.1.45: - version "5.1.56" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.56.tgz#8453e9487bca3d300fe936168a8069ce1274bc84" - integrity sha512-hmRcHZqrOF5vlc0s4CoM72mRMRgP/jObK57ixfDAri+oLRgHgIKBf98R7nsy0ruq+WHCAdq1jslmrF026lUxAw== + version "5.1.58" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.58.tgz#3202bc080ef71c811fe9181bfc47fff944afab62" + integrity sha512-BnMSq9+0vUj6B8OODs/U/cV7MiyNrKOKmeO1fhn2LOvN6XpOd06Qitw0V15lNxlCL+datx2WEZ9AnYql689bnQ== dependencies: app-module-path "^2.2.0" mocha "8.1.2" @@ -16569,15 +16589,7 @@ typical@^6.0.0: resolved "https://registry.yarnpkg.com/typical/-/typical-6.0.1.tgz#89bd1a6aa5e5e96fa907fb6b7579223bff558a06" integrity sha512-+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A== -uint8arrays@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-1.0.0.tgz#9cf979517f85c32d6ef54adf824e3499bb715331" - integrity sha512-14tqEVujDREW7YwonSZZwLvo7aFDfX7b6ubvM/U7XvZol+CC/LbhaX/550VlWmhddAL9Wou1sxp0Of3tGqXigg== - dependencies: - multibase "^3.0.0" - web-encoding "^1.0.2" - -uint8arrays@^1.0.0, uint8arrays@^1.1.0: +uint8arrays@1.1.0, uint8arrays@^1.0.0, uint8arrays@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-1.1.0.tgz#d034aa65399a9fd213a1579e323f0b29f67d0ed2" integrity sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA== @@ -16993,9 +17005,9 @@ wbuf@^1.1.0, wbuf@^1.7.3: minimalistic-assert "^1.0.0" web-encoding@^1.0.2, web-encoding@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.4.tgz#0398d39ce2cbef5ed2617080750ed874e6153aea" - integrity sha512-DcXs2lbVPzuJmn2kuDEwul2oZg7p4YMa5J2f0YzsOBHaAnBYGPNUB/rJ74DTjTKpw7F0+lSsVM8sFHE2UyBixg== + version "1.0.6" + resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.6.tgz#ec631356ee523b4474ecbcae680440bd1e79416a" + integrity sha512-26wEnRPEFAc5d5lmH1Q/DuvWEYsRF1D2alX2jlKpdmqv7cj+BbANL7Xlcl9r4s72Eg9kItZa9RWVbBMC9dMv4w== web3-bzz@1.3.0: version "1.3.0" @@ -17242,9 +17254,9 @@ webidl-conversions@^4.0.2: integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== webpack-dev-middleware@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" - integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw== + version "3.7.3" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5" + integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ== dependencies: memory-fs "^0.4.1" mime "^2.4.4" @@ -17368,9 +17380,9 @@ websocket-extensions@>=0.1.1: integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== websocket@^1.0.32: - version "1.0.32" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.32.tgz#1f16ddab3a21a2d929dec1687ab21cfdc6d3dbb1" - integrity sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q== + version "1.0.33" + resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.33.tgz#407f763fc58e74a3fa41ca3ae5d78d3f5e3b82a5" + integrity sha512-XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA== dependencies: bufferutil "^4.0.1" debug "^2.2.0" @@ -17772,9 +17784,9 @@ xor-distance@^2.0.0: integrity sha512-AsAqZfPAuWx7qB/0kyRDUEvoU3QKsHWzHU9smFlkaiprEpGfJ/NBbLze2Uq0rdkxCxkNM9uOLvz/KoNBCbZiLQ== xregexp@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.0.tgz#29660f5d6567cd2ef981dd4a50cb05d22c10719d" - integrity sha512-83y4aa8o8o4NZe+L+46wpa+F1cWR/wCGOWI3tzqUso0w3/KAvXy0+Di7Oe/cbNMixDR4Jmi7NEybWU6ps25Wkg== + version "4.4.1" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.1.tgz#c84a88fa79e9ab18ca543959712094492185fe65" + integrity sha512-2u9HwfadaJaY9zHtRRnH6BY6CQVNQKkYm3oLtC9gJXXzfsbACg5X5e4EZZGVAH+YIfa+QA9lsFQTTe3HURF3ag== dependencies: "@babel/runtime-corejs3" "^7.12.1" From ea5988d2f50262ba6877152ef409002771d9fb51 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Fri, 15 Jan 2021 16:53:22 +0200 Subject: [PATCH 22/37] refactor: add logo to about page --- .../src/assets/images/app_logo_circle.svg | 1 + .../concordia-app/src/views/About/index.jsx | 7 +- yarn.lock | 271 +++++++++++++++++- 3 files changed, 269 insertions(+), 10 deletions(-) create mode 100644 packages/concordia-app/src/assets/images/app_logo_circle.svg diff --git a/packages/concordia-app/src/assets/images/app_logo_circle.svg b/packages/concordia-app/src/assets/images/app_logo_circle.svg new file mode 100644 index 0000000..c1634d0 --- /dev/null +++ b/packages/concordia-app/src/assets/images/app_logo_circle.svg @@ -0,0 +1 @@ +concordia_logo_clean \ No newline at end of file diff --git a/packages/concordia-app/src/views/About/index.jsx b/packages/concordia-app/src/views/About/index.jsx index 12ed27f..9277a23 100644 --- a/packages/concordia-app/src/views/About/index.jsx +++ b/packages/concordia-app/src/views/About/index.jsx @@ -2,8 +2,9 @@ import React, { memo, useEffect, useState, } from 'react'; import ReactMarkdown from 'react-markdown'; -import { Container } from 'semantic-ui-react'; +import { Container, Image } from 'semantic-ui-react'; import AboutMd from '../../assets/About.md'; +import appLogo from '../../assets/images/app_logo_circle.svg'; const targetBlank = () => ({ href, children }) => (
@@ -25,9 +26,7 @@ const About = () => { return (
- {/* TODO: add logo */} - LOGO -
+ {`v${process.env.REACT_APP_VERSION}`}
Date: Fri, 15 Jan 2021 16:53:37 +0200 Subject: [PATCH 23/37] refactor: complete about page text --- packages/concordia-app/src/assets/About.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/concordia-app/src/assets/About.md b/packages/concordia-app/src/assets/About.md index d5e73aa..b9a5885 100644 --- a/packages/concordia-app/src/assets/About.md +++ b/packages/concordia-app/src/assets/About.md @@ -8,15 +8,20 @@ the [MIT][concordia-license] license. ## Why -Values of privacy and freedom are diminishing in modern software. Even more so in social media software. Users are now -called to decide between being the product of companies that sell their personal information for gain and being shut out -of the modern, digital society. +The value of privacy, freedom of speech and democracy are diminishing in modern software. Even more so in social media +platforms. Users are called to select between being the product of companies that sell their personal information and +being shut out of the modern, digital society. Concordia, much like other projects of this kind, provides an alternative to this predicament. ## How -TODO +Concordia uses decentralized technologies, namely the Ethereum blockchain and its smart contracts, as well as the +distributed database OrbitDB that's based on the decentralized network IPFS. These technologies make Concordia +impervious to censorship and guaranty the immutability of user information and anonymity while enabling user +authentication that makes trusted, direct voting possible. + +You can read more about the technological stack in Concordia's [whitepaper][concordia-whitepaper]. --- @@ -26,4 +31,5 @@ Developed by [apostolof][devs-apostolof-profile], [ezerous][devs-ezerous-profile [concordia-docker-hub]: https://hub.docker.com/repository/docker/ecentrics/apella-app [concordia-license]: https://gitlab.com/ecentrics/apella/-/blob/master/LICENSE.md [devs-apostolof-profile]: https://gitlab.com/Apostolof -[devs-ezerous-profile]: https://gitlab.com/Ezerous \ No newline at end of file +[devs-ezerous-profile]: https://gitlab.com/Ezerous +[concordia-whitepaper]: https://whitepaper.concordia.ecentrics.net From 7e8be84500ea25d9ba8d920b392f7fc26be3337c Mon Sep 17 00:00:00 2001 From: Ezerous Date: Fri, 15 Jan 2021 17:15:02 +0200 Subject: [PATCH 24/37] Remove menu margin --- packages/concordia-app/src/assets/css/index.css | 3 ++- packages/concordia-app/src/assets/css/loading-component.css | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/concordia-app/src/assets/css/index.css b/packages/concordia-app/src/assets/css/index.css index 09e53ea..2848ffd 100644 --- a/packages/concordia-app/src/assets/css/index.css +++ b/packages/concordia-app/src/assets/css/index.css @@ -1,6 +1,6 @@ body.app { overflow: auto; - margin: 1em !important; + margin: 0; } #root { @@ -18,4 +18,5 @@ body.app { .ui.inverted.menu { background: #0B2540; + border-radius: 0; } diff --git a/packages/concordia-app/src/assets/css/loading-component.css b/packages/concordia-app/src/assets/css/loading-component.css index 37a8f96..5ed41f8 100644 --- a/packages/concordia-app/src/assets/css/loading-component.css +++ b/packages/concordia-app/src/assets/css/loading-component.css @@ -3,7 +3,7 @@ body { } .loading-screen { - margin-top: 10em; + margin-top: 12em; text-align: center; font-size: large; } From fe842631c9c1d365cdcec018be16e1d101fe26e7 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Fri, 15 Jan 2021 17:49:12 +0200 Subject: [PATCH 25/37] chore: update yarn.lock --- yarn.lock | 2081 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 1300 insertions(+), 781 deletions(-) diff --git a/yarn.lock b/yarn.lock index 854ae86..dbf567e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,7 +21,7 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11", "@babel/code-frame@^7.8.3": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== @@ -76,7 +76,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.10", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": +"@babel/generator@^7.12.10", "@babel/generator@^7.12.11", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== @@ -100,23 +100,6 @@ "@babel/helper-explode-assignable-expression" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-builder-react-jsx-experimental@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.11.tgz#a39616d7e4cf8f9da1f82b5fc3ee1f7406beeb11" - integrity sha512-4oGVOekPI8dh9JphkPXC68iIuP6qp/RPbaPmorRmEFbRAHZjSqxPjqHudn18GVDPgCuFM/KdFXc63C17Ygfa9w== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.10" - "@babel/helper-module-imports" "^7.12.5" - "@babel/types" "^7.12.11" - -"@babel/helper-builder-react-jsx@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz#8095cddbff858e6fa9c326daee54a2f2732c1d5d" - integrity sha512-5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/types" "^7.10.4" - "@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.8.7": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" @@ -162,7 +145,7 @@ dependencies: "@babel/types" "^7.12.1" -"@babel/helper-function-name@^7.10.4": +"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== @@ -259,7 +242,7 @@ dependencies: "@babel/types" "^7.12.1" -"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": +"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== @@ -304,15 +287,15 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": +"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== "@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e" - integrity sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A== + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566" + integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-remap-async-to-generator" "^7.12.1" @@ -593,9 +576,9 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-block-scoping@^7.12.11", "@babel/plugin-transform-block-scoping@^7.8.3": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.11.tgz#83ae92a104dbb93a7d6c6dd1844f351083c46b4f" - integrity sha512-atR1Rxc3hM+VPg/NvNvfYw0npQEAcHuJ+MGZnFn6h3bo+1U3BWXMdFMlvVRApBTWKQMX7SOwRJZA5FBF/JQbvA== + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" + integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -783,13 +766,11 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.11.tgz#078aa7e1f5f75a68ee9598ebed90000fcb11092f" - integrity sha512-5MvsGschXeXJsbzQGR/BH89ATMzCsM7rx95n+R7/852cGoK2JgMbacDw/A9Pmrfex4tArdMab0L5SBV4SB/Nxg== + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz#bccca33108fe99d95d7f9e82046bfe762e71f4e7" + integrity sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg== dependencies: - "@babel/helper-builder-react-jsx-experimental" "^7.12.11" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-jsx" "^7.12.1" + "@babel/plugin-transform-react-jsx" "^7.12.12" "@babel/plugin-transform-react-jsx-self@^7.9.0": version "7.12.1" @@ -805,15 +786,16 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.9.1": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.11.tgz#09a7319195946b0ddc09f9a5f01346f2cb80dfdd" - integrity sha512-5nWOw6mTylaFU72BdZfa0dP1HsGdY3IMExpxn8LBE8dNmkQjB+W+sR+JwIdtbzkPvVuFviT3zyNbSUkuVTVxbw== +"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.12.12", "@babel/plugin-transform-react-jsx@^7.9.1": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz#b0da51ffe5f34b9a900e9f1f5fb814f9e512d25e" + integrity sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw== dependencies: - "@babel/helper-builder-react-jsx" "^7.10.4" - "@babel/helper-builder-react-jsx-experimental" "^7.12.11" + "@babel/helper-annotate-as-pure" "^7.12.10" + "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.12.1" + "@babel/types" "^7.12.12" "@babel/plugin-transform-react-pure-annotations@^7.12.1": version "7.12.1" @@ -1119,24 +1101,24 @@ "@babel/types" "^7.12.7" "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" - integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.10" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.10" - "@babel/types" "^7.12.10" + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" + integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== + dependencies: + "@babel/code-frame" "^7.12.11" + "@babel/generator" "^7.12.11" + "@babel/helper-function-name" "^7.12.11" + "@babel/helper-split-export-declaration" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/types" "^7.12.12" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce" - integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA== +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" + integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== dependencies: "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" @@ -1175,10 +1157,25 @@ "@ethersproject/properties" ">=5.0.0-beta.131" "@ethersproject/strings" ">=5.0.0-beta.130" -"@ethersproject/abi@5.0.9", "@ethersproject/abi@^5.0.5": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.9.tgz#738c1c557e56d8f395a5a27caef9b0449bc85a10" - integrity sha512-ily2OufA2DTrxkiHQw5GqbkMSnNKuwZBqKsajtT0ERhZy1r9w2CpW1bmtRMIGzaqQxCdn/GEoFogexk72cBBZQ== +"@ethersproject/abi@5.0.10", "@ethersproject/abi@^5.0.10": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.10.tgz#c32baa919ad0e5cddabb2f3a8aed0eaeeed7fa4a" + integrity sha512-cfC3lGgotfxX3SMri4+CisOPwignoj/QGHW9J29spC4R4Qqcnk/SYuVkPFBMdLbvBp3f/pGiVqPNwont0TSXhg== + dependencies: + "@ethersproject/address" "^5.0.9" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/constants" "^5.0.8" + "@ethersproject/hash" "^5.0.10" + "@ethersproject/keccak256" "^5.0.7" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/strings" "^5.0.8" + +"@ethersproject/abi@5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b" + integrity sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw== dependencies: "@ethersproject/address" "^5.0.4" "@ethersproject/bignumber" "^5.0.7" @@ -1190,326 +1187,326 @@ "@ethersproject/properties" "^5.0.3" "@ethersproject/strings" "^5.0.4" -"@ethersproject/abstract-provider@5.0.7", "@ethersproject/abstract-provider@^5.0.4": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.7.tgz#04ee3bfe43323384e7fecf6c774975b8dec4bdc9" - integrity sha512-NF16JGn6M0zZP5ZS8KtDL2Rh7yHxZbUjBIHLNHMm/0X0BephhjUWy8jqs/Zks6kDJRzNthgmPVy41Ec0RYWPYA== - dependencies: - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/networks" "^5.0.3" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/transactions" "^5.0.5" - "@ethersproject/web" "^5.0.6" - -"@ethersproject/abstract-signer@5.0.9", "@ethersproject/abstract-signer@^5.0.4", "@ethersproject/abstract-signer@^5.0.6": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.9.tgz#238ddc06031aeb9dfceee2add965292d7dd1acbf" - integrity sha512-CM5UNmXQaA03MyYARFDDRjHWBxujO41tVle7glf5kHcQsDDULgqSVpkliLJMtPzZjOKFeCVZBHybTZDEZg5zzg== - dependencies: - "@ethersproject/abstract-provider" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - -"@ethersproject/address@5.0.8", "@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.5": +"@ethersproject/abstract-provider@5.0.8", "@ethersproject/abstract-provider@^5.0.8": version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.8.tgz#0c551659144a5a7643c6bea337149d410825298f" - integrity sha512-V87DHiZMZR6hmFYmoGaHex0D53UEbZpW75uj8AqPbjYUmi65RB4N2LPRcJXuWuN2R0Y2CxkvW6ArijWychr5FA== - dependencies: - "@ethersproject/bignumber" "^5.0.10" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/rlp" "^5.0.3" - -"@ethersproject/base64@5.0.6", "@ethersproject/base64@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.6.tgz#26311ebf29ea3d0b9c300ccf3e1fdc44b7481516" - integrity sha512-HwrGn8YMiUf7bcdVvB4NJ+eWT0BtEFpDtrYxVXEbR7p/XBSJjwiR7DEggIiRvxbualMKg+EZijQWJ3az2li0uw== - dependencies: - "@ethersproject/bytes" "^5.0.4" - -"@ethersproject/basex@5.0.6", "@ethersproject/basex@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.0.6.tgz#ab95c32e48288a3d868726463506641cb1e9fb6b" - integrity sha512-Y/8dowRxBF3bsKkqEp7XN4kcFFQ0o5xxP1YyopfqkXejaOEGiD7ToQdQ0pIZpAJ5GreW56oFOTDDSO6ZcUCNYg== + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.8.tgz#880793c29bfed33dff4c2b2be7ecb9ba966d52c0" + integrity sha512-fqJXkewcGdi8LogKMgRyzc/Ls2js07yor7+g9KfPs09uPOcQLg7cc34JN+lk34HH9gg2HU0DIA5797ZR8znkfw== + dependencies: + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/networks" "^5.0.7" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/transactions" "^5.0.9" + "@ethersproject/web" "^5.0.12" + +"@ethersproject/abstract-signer@5.0.11", "@ethersproject/abstract-signer@^5.0.10": + version "5.0.11" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.11.tgz#675da9ec168905c60ee79a6da95f7157ca956f46" + integrity sha512-RKOgPSEYafknA62SrD3OCK42AllHE4YBfKYXyQeM+sBP7Nq3X5FpzeoY4uzC43P4wIhmNoTHCKQuwnX7fBqb6Q== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/properties" "^5.0.3" + "@ethersproject/abstract-provider" "^5.0.8" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" -"@ethersproject/bignumber@5.0.12", "@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.10", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.0.8": - version "5.0.12" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.12.tgz#fe4a78667d7cb01790f75131147e82d6ea7e7cba" - integrity sha512-mbFZjwthx6vFlHG9owXP/C5QkNvsA+xHpDCkPPPdG2n1dS9AmZAL5DI0InNLid60rQWL3MXpEl19tFmtL7Q9jw== +"@ethersproject/address@5.0.9", "@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.9": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.9.tgz#347ef30dc8243c682574a3f23ff63f73c8f8cbf1" + integrity sha512-gKkmbZDMyGbVjr8nA5P0md1GgESqSGH7ILIrDidPdNXBl4adqbuA3OAuZx/O2oGpL6PtJ9BDa0kHheZ1ToHU3w== dependencies: - "@ethersproject/bytes" "^5.0.8" - "@ethersproject/logger" "^5.0.5" - bn.js "^4.4.0" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/keccak256" "^5.0.7" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/rlp" "^5.0.7" -"@ethersproject/bytes@5.0.8", "@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.8.tgz#cf1246a6a386086e590063a4602b1ffb6cc43db1" - integrity sha512-O+sJNVGzzuy51g+EMK8BegomqNIg+C2RO6vOt0XP6ac4o4saiq69FnjlsrNslaiMFVO7qcEHBsWJ9hx1tj1lMw== +"@ethersproject/base64@5.0.7", "@ethersproject/base64@^5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.7.tgz#d5da73699b4a33dc92bd8e5056ad1880b262057d" + integrity sha512-S5oh5DVfCo06xwJXT8fQC68mvJfgScTl2AXvbYMsHNfIBTDb084Wx4iA9MNlEReOv6HulkS+gyrUM/j3514rSw== dependencies: - "@ethersproject/logger" "^5.0.5" + "@ethersproject/bytes" "^5.0.9" -"@ethersproject/constants@5.0.7", "@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4": +"@ethersproject/basex@5.0.7", "@ethersproject/basex@^5.0.7": version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.7.tgz#44ff979e5781b17c8c6901266896c3ee745f4e7e" - integrity sha512-cbQK1UpE4hamB52Eg6DLhJoXeQ1plSzekh5Ujir1xdREdwdsZPPXKczkrWqBBR0KyywJZHN/o/hj0w8j7scSGg== + resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.0.7.tgz#2f7026b12c9dee6cdc7b7bf1805461836e635495" + integrity sha512-OsXnRsujGmYD9LYyJlX+cVe5KfwgLUbUJrJMWdzRWogrygXd5HvGd7ygX1AYjlu1z8W/+t2FoQnczDR/H2iBjA== dependencies: - "@ethersproject/bignumber" "^5.0.7" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/properties" "^5.0.7" -"@ethersproject/contracts@5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.0.8.tgz#71d3ba16853a1555be2e161a6741df186f81c73b" - integrity sha512-PecBL4vnsrpuks2lzzkRsOts8csJy338HNDKDIivbFmx92BVzh3ohOOv3XsoYPSXIHQvobF959W+aSk3RCZL/g== +"@ethersproject/bignumber@5.0.13", "@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.13", "@ethersproject/bignumber@^5.0.7": + version "5.0.13" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.13.tgz#a5466412b3b80104097b9c694f6ae827df4353fe" + integrity sha512-b89bX5li6aK492yuPP5mPgRVgIxxBP7ksaBtKX5QQBsrZTpNOjf/MR4CjcUrAw8g+RQuD6kap9lPjFgY4U1/5A== dependencies: - "@ethersproject/abi" "^5.0.5" - "@ethersproject/abstract-provider" "^5.0.4" - "@ethersproject/abstract-signer" "^5.0.4" - "@ethersproject/address" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" + bn.js "^4.4.0" -"@ethersproject/hash@5.0.9", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4": +"@ethersproject/bytes@5.0.9", "@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.0.9": version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.9.tgz#81252a848185b584aa600db4a1a68cad9229a4d4" - integrity sha512-e8/i2ZDeGSgCxXT0vocL54+pMbw5oX5fNjb2E3bAIvdkh5kH29M7zz1jHu1QDZnptIuvCZepIbhUH8lxKE2/SQ== + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.9.tgz#2748247402ad20df69f3a3e935dc7b58c0d75c08" + integrity sha512-k+17ZViDtAugC0s7HM6rdsTWEdIYII4RPCDkPEuxKc6i40Bs+m6tjRAtCECX06wKZnrEoR9pjOJRXHJ/VLoOcA== dependencies: - "@ethersproject/abstract-signer" "^5.0.6" - "@ethersproject/address" "^5.0.5" - "@ethersproject/bignumber" "^5.0.8" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.4" - "@ethersproject/strings" "^5.0.4" + "@ethersproject/logger" "^5.0.8" -"@ethersproject/hdnode@5.0.7", "@ethersproject/hdnode@^5.0.4": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.0.7.tgz#c7bce94a337ea65e37c46bab09a83e1c1a555d99" - integrity sha512-89tphqlji4y/LNE1cSaMQ3hrBtJ4lO1qWGi2hn54LiHym85DTw+zAKbA8QgmdSdJDLGR/kc9VHaIPQ+vZQ2LkQ== +"@ethersproject/constants@5.0.8", "@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.8.tgz#50f2e23f48c0d1d0de3759ea79b68ec3e06435a1" + integrity sha512-sCc73pFBsl59eDfoQR5OCEZCRv5b0iywadunti6MQIr5lt3XpwxK1Iuzd8XSFO02N9jUifvuZRrt0cY0+NBgTg== dependencies: - "@ethersproject/abstract-signer" "^5.0.4" - "@ethersproject/basex" "^5.0.3" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/pbkdf2" "^5.0.3" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/sha2" "^5.0.3" - "@ethersproject/signing-key" "^5.0.4" - "@ethersproject/strings" "^5.0.4" - "@ethersproject/transactions" "^5.0.5" - "@ethersproject/wordlists" "^5.0.4" + "@ethersproject/bignumber" "^5.0.13" -"@ethersproject/json-wallets@5.0.9", "@ethersproject/json-wallets@^5.0.6": +"@ethersproject/contracts@5.0.9": version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.0.9.tgz#2e1708c2854c4ab764e35920bd1f44c948b95434" - integrity sha512-EWuFvJd8nu90dkmJwmJddxOYCvFvMkKBsZi8rxTme2XEZsHKOFnybVkoL23u7ZtApuEfTKmVcR2PTwgZwqDsKw== - dependencies: - "@ethersproject/abstract-signer" "^5.0.4" - "@ethersproject/address" "^5.0.4" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/hdnode" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/pbkdf2" "^5.0.3" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/random" "^5.0.3" - "@ethersproject/strings" "^5.0.4" - "@ethersproject/transactions" "^5.0.5" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.0.9.tgz#6c67c0ebe20ee1af903f7f43568401023334a181" + integrity sha512-CCTxVeDh6sjdSEbjzONhtwPjECvaHE62oGkY8M7kP0CHmgLD2SEGel0HZib8e5oQKRKGly9AKcUFW4g3rQ0AQw== + dependencies: + "@ethersproject/abi" "^5.0.10" + "@ethersproject/abstract-provider" "^5.0.8" + "@ethersproject/abstract-signer" "^5.0.10" + "@ethersproject/address" "^5.0.9" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/constants" "^5.0.8" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" + +"@ethersproject/hash@5.0.10", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.10", "@ethersproject/hash@^5.0.4": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.10.tgz#41bf37428e8ddbc229ffd81c47af667174cb491a" + integrity sha512-Tf0bvs6YFhw28LuHnhlDWyr0xfcDxSXdwM4TcskeBbmXVSKLv3bJQEEEBFUcRX0fJuslR3gCVySEaSh7vuMx5w== + dependencies: + "@ethersproject/abstract-signer" "^5.0.10" + "@ethersproject/address" "^5.0.9" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/keccak256" "^5.0.7" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/strings" "^5.0.8" + +"@ethersproject/hdnode@5.0.8", "@ethersproject/hdnode@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.0.8.tgz#2b52ede921cfbce8de49da774ec5a74025fc2bb1" + integrity sha512-Mscpjd7BBjxYSWghaNMwV0xrBBkOoCq6YEPRm9MgE24CiBlzzbfEB5DGq6hiZqhQaxPkdCUtKKqZi3nt9hx43g== + dependencies: + "@ethersproject/abstract-signer" "^5.0.10" + "@ethersproject/basex" "^5.0.7" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/pbkdf2" "^5.0.7" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/sha2" "^5.0.7" + "@ethersproject/signing-key" "^5.0.8" + "@ethersproject/strings" "^5.0.8" + "@ethersproject/transactions" "^5.0.9" + "@ethersproject/wordlists" "^5.0.8" + +"@ethersproject/json-wallets@5.0.10", "@ethersproject/json-wallets@^5.0.10": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.0.10.tgz#cdc9c27cb486762a3313e25f6f2fef0eb890dbaf" + integrity sha512-Ux36u+d7Dm0M5AQ+mWuHdvfGPMN8K1aaLQgwzrsD4ELTWlwRuHuQbmn7/GqeOpbfaV6POLwdYcBk2TXjlGp/IQ== + dependencies: + "@ethersproject/abstract-signer" "^5.0.10" + "@ethersproject/address" "^5.0.9" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/hdnode" "^5.0.8" + "@ethersproject/keccak256" "^5.0.7" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/pbkdf2" "^5.0.7" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/random" "^5.0.7" + "@ethersproject/strings" "^5.0.8" + "@ethersproject/transactions" "^5.0.9" aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/keccak256@5.0.6", "@ethersproject/keccak256@>=5.0.0-beta.127", "@ethersproject/keccak256@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.6.tgz#5b5ba715ef1be86efde5c271f896fa0daf0e1efe" - integrity sha512-eJ4Id/i2rwrf5JXEA7a12bG1phuxjj47mPZgDUbttuNBodhSuZF2nEO5QdpaRjmlphQ8Kt9PNqY/z7lhtJptZg== +"@ethersproject/keccak256@5.0.7", "@ethersproject/keccak256@>=5.0.0-beta.127", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.7.tgz#2eedb5e4c160fcdf0079660f8ae362d7855ea943" + integrity sha512-zpUBmofWvx9PGfc7IICobgFQSgNmTOGTGLUxSYqZzY/T+b4y/2o5eqf/GGmD7qnTGzKQ42YlLNo+LeDP2qe55g== dependencies: - "@ethersproject/bytes" "^5.0.4" + "@ethersproject/bytes" "^5.0.9" js-sha3 "0.5.7" -"@ethersproject/logger@5.0.8", "@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5": +"@ethersproject/logger@5.0.8", "@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.0.8": version "5.0.8" resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.8.tgz#135c1903d35c878265f3cbf2b287042c4c20d5d4" integrity sha512-SkJCTaVTnaZ3/ieLF5pVftxGEFX56pTH+f2Slrpv7cU0TNpUZNib84QQdukd++sWUp/S7j5t5NW+WegbXd4U/A== -"@ethersproject/networks@5.0.6", "@ethersproject/networks@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.6.tgz#4d6586bbebfde1c027504ebf6dfb783b29c3803a" - integrity sha512-2Cg1N5109zzFOBfkyuPj+FfF7ioqAsRffmybJ2lrsiB5skphIAE72XNSCs4fqktlf+rwSh/5o/UXRjXxvSktZw== - dependencies: - "@ethersproject/logger" "^5.0.5" - -"@ethersproject/pbkdf2@5.0.6", "@ethersproject/pbkdf2@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.0.6.tgz#105dbfb08cd5fcf33869b42bfdc35a3ebd978cbd" - integrity sha512-CUYciSxR/AaCoKMJk3WUW+BDhR41G3C+O9lOeZ4bR1wDhLKL2Z8p0ciF5XDEiVbmI4CToW6boVKybeVMdngRrg== +"@ethersproject/networks@5.0.7", "@ethersproject/networks@^5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.7.tgz#8d06e41197b27c2404d89a29ca21f741a01acbfc" + integrity sha512-dI14QATndIcUgcCBL1c5vUr/YsI5cCHLN81rF7PU+yS7Xgp2/Rzbr9+YqpC6NBXHFUASjh6GpKqsVMpufAL0BQ== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/sha2" "^5.0.3" + "@ethersproject/logger" "^5.0.8" -"@ethersproject/properties@5.0.6", "@ethersproject/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.4": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.6.tgz#44d82aaa294816fd63333e7def42426cf0e87b3b" - integrity sha512-a9DUMizYhJ0TbtuDkO9iYlb2CDlpSKqGPDr+amvlZhRspQ6jbl5Eq8jfu4SCcGlcfaTbguJmqGnyOGn1EFt6xA== +"@ethersproject/pbkdf2@5.0.7", "@ethersproject/pbkdf2@^5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.0.7.tgz#a36fdb7327760ec0096857053e01c923a63417da" + integrity sha512-0SNLNixPMqnosH6pyc4yPiUu/C9/Jbu+f6I8GJW9U2qNpMBddmRJviwseoha5Zw1V+Aw0Z/yvYyzIIE8yPXqLA== dependencies: - "@ethersproject/logger" "^5.0.5" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/sha2" "^5.0.7" -"@ethersproject/providers@5.0.17": - version "5.0.17" - resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.0.17.tgz#f380e7831149e24e7a1c6c9b5fb1d6dfc729d024" - integrity sha512-bJnvs5X7ttU5x2ekGJYG7R3Z+spZawLFfR0IDsbaMDLiCwZOyrgk+VTBU7amSFLT0WUhWFv8WwSUB+AryCQG1Q== - dependencies: - "@ethersproject/abstract-provider" "^5.0.4" - "@ethersproject/abstract-signer" "^5.0.4" - "@ethersproject/address" "^5.0.4" - "@ethersproject/basex" "^5.0.3" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/hash" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/networks" "^5.0.3" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/random" "^5.0.3" - "@ethersproject/rlp" "^5.0.3" - "@ethersproject/sha2" "^5.0.3" - "@ethersproject/strings" "^5.0.4" - "@ethersproject/transactions" "^5.0.5" - "@ethersproject/web" "^5.0.6" +"@ethersproject/properties@5.0.7", "@ethersproject/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.7.tgz#951d11ba592ff90bbe8ec34c5a03a5157e3b3360" + integrity sha512-812H1Rus2vjw0zbasfDI1GLNPDsoyX1pYqiCgaR1BuyKxUTbwcH1B+214l6VGe1v+F6iEVb7WjIwMjKhb4EUsg== + dependencies: + "@ethersproject/logger" "^5.0.8" + +"@ethersproject/providers@5.0.19": + version "5.0.19" + resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.0.19.tgz#94c8f1a86755ee4187911fc6250e94b1116c089a" + integrity sha512-G+flo1jK1y/rvQy6b71+Nu7qOlkOKz+XqpgqFMZslkCzGuzQRmk9Qp7Ln4soK8RSyP1e5TCujaRf1H+EZahoaw== + dependencies: + "@ethersproject/abstract-provider" "^5.0.8" + "@ethersproject/abstract-signer" "^5.0.10" + "@ethersproject/address" "^5.0.9" + "@ethersproject/basex" "^5.0.7" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/constants" "^5.0.8" + "@ethersproject/hash" "^5.0.10" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/networks" "^5.0.7" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/random" "^5.0.7" + "@ethersproject/rlp" "^5.0.7" + "@ethersproject/sha2" "^5.0.7" + "@ethersproject/strings" "^5.0.8" + "@ethersproject/transactions" "^5.0.9" + "@ethersproject/web" "^5.0.12" bech32 "1.1.4" ws "7.2.3" -"@ethersproject/random@5.0.6", "@ethersproject/random@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.0.6.tgz#9be80a1065f2b8e6f321dccb3ebeb4886cac9ea4" - integrity sha512-8nsVNaZvZ9OD5NXfzE4mmz8IH/1DYJbAR95xpRxZkIuNmfn6QlMp49ccJYZWGhs6m0Zj2+FXjx3pzXfYlo9/dA== - dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - -"@ethersproject/rlp@5.0.6", "@ethersproject/rlp@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.6.tgz#29f9097348a3c330811997433b7df89ab51cd644" - integrity sha512-M223MTaydfmQSsvqAl0FJZDYFlSqt6cgbhnssLDwqCKYegAHE16vrFyo+eiOapYlt32XAIJm0BXlqSunULzZuQ== - dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - -"@ethersproject/sha2@5.0.6", "@ethersproject/sha2@^5.0.3": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.0.6.tgz#175116dc10b866a0a381f6316d094bcc510bee3c" - integrity sha512-30gypDLkfkP5gE3llqi0jEuRV8m4/nvzeqmqMxiihZ7veFQHqDaGpyFeHzFim+qGeH9fq0lgYjavLvwW69+Fkw== - dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - hash.js "1.1.3" - -"@ethersproject/signing-key@5.0.7", "@ethersproject/signing-key@^5.0.4": +"@ethersproject/random@5.0.7", "@ethersproject/random@^5.0.7": version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.7.tgz#d03bfc5f565efb962bafebf8e6965e70d1c46d31" - integrity sha512-JYndnhFPKH0daPcIjyhi+GMcw3srIHkQ40hGRe6DA0CdGrpMfgyfSYDQ2D8HL2lgR+Xm4SHfEB0qba6+sCyrvg== + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.0.7.tgz#e364268ce68bf6d300c36d654e622fd9d26b3a86" + integrity sha512-PxSRWwN3s+FH9AWMZU6AcWJsNQ9KzqKV6NgdeKPtxahdDjCuXxTAuzTZNXNRK+qj+Il351UnweAGd+VuZcOAlQ== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - elliptic "6.5.3" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" -"@ethersproject/solidity@5.0.7": +"@ethersproject/rlp@5.0.7", "@ethersproject/rlp@^5.0.7": version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.0.7.tgz#72a3455f47a454db2dcf363992d42e9045dc7fce" - integrity sha512-dUevKUZ06p/VMLP/+cz4QUV+lA17NixucDJfm0ioWF0B3R0Lf+6wqwPchcqiAXlxkNFGIax7WNLgGMh4CkQ8iw== + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.7.tgz#cfa4fa6415960a435b7814e1a29bdfea657e2b6e" + integrity sha512-ulUTVEuV7PT4jJTPpfhRHK57tkLEDEY9XSYJtrSNHOqdwMvH0z7BM2AKIMq4LVDlnu4YZASdKrkFGEIO712V9w== dependencies: - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/sha2" "^5.0.3" - "@ethersproject/strings" "^5.0.4" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" -"@ethersproject/strings@5.0.7", "@ethersproject/strings@>=5.0.0-beta.130", "@ethersproject/strings@^5.0.4": +"@ethersproject/sha2@5.0.7", "@ethersproject/sha2@^5.0.7": version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.7.tgz#8dc68f794c9e2901f3b75e53b2afbcb6b6c15037" - integrity sha512-a+6T80LvmXGMOOWQTZHtGGQEg1z4v8rm8oX70KNs55YtPXI/5J3LBbVf5pyqCKSlmiBw5IaepPvs5XGalRUSZQ== + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.0.7.tgz#ef9f18770c9f90a6cfd73840b0c3400910219099" + integrity sha512-MbUqz68hhp5RsaZdqi1eg1rrtiqt5wmhRYqdA7MX8swBkzW2KiLgK+Oh25UcWhUhdi1ImU9qrV6if5j0cC7Bxg== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/logger" "^5.0.5" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" + hash.js "1.1.3" -"@ethersproject/transactions@5.0.8", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.5": +"@ethersproject/signing-key@5.0.8", "@ethersproject/signing-key@^5.0.8": version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.8.tgz#3b4d7041e13b957a9c4f131e0aea9dae7b6f5a23" - integrity sha512-i7NtOXVzUe+YSU6QufzlRrI2WzHaTmULAKHJv4duIZMLqzehCBXGA9lTpFgFdqGYcQJ7vOtNFC2BB2mSjmuXqg== + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.8.tgz#156522e542916b9aa9135527b40c5b6f9235af02" + integrity sha512-YKxQM45eDa6WAD+s3QZPdm1uW1MutzVuyoepdRRVmMJ8qkk7iOiIhUkZwqKLNxKzEJijt/82ycuOREc9WBNAKg== dependencies: - "@ethersproject/address" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/rlp" "^5.0.3" - "@ethersproject/signing-key" "^5.0.4" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" + elliptic "6.5.3" -"@ethersproject/units@5.0.8": +"@ethersproject/solidity@5.0.8": version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.0.8.tgz#563325b20fe1eceff7b61857711d5e2b3f38fd09" - integrity sha512-3O4MaNHFs05vC5v2ZGqVFVWtO1WyqFejO78M7Qh16njo282aoMlENtVI6cn2B36zOLFXRvYt2pYx6xCG53qKzg== + resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.0.8.tgz#a260116a794bc97558d89e98f59831ce8d25c733" + integrity sha512-OJkyBq9KaoGsi8E8mYn6LX+vKyCURvxSp0yuGBcOqEFM3vkn9PsCiXsHdOXdNBvlHG5evJXwAYC2UR0TzgJeKA== dependencies: - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/constants" "^5.0.4" - "@ethersproject/logger" "^5.0.5" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/keccak256" "^5.0.7" + "@ethersproject/sha2" "^5.0.7" + "@ethersproject/strings" "^5.0.8" -"@ethersproject/wallet@5.0.9": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.0.9.tgz#976c7d950489c40308d676869d24e59ab7b82ad1" - integrity sha512-GfpQF56PO/945SJq7Wdg5F5U6wkxaDgkAzcgGbCW6Joz8oW8MzKItkvYCzMh+j/8gJMzFncsuqX4zg2gq3J6nQ== +"@ethersproject/strings@5.0.8", "@ethersproject/strings@>=5.0.0-beta.130", "@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.8.tgz#11a1b0ed1e8417408693789839f0b5f4e323c0c9" + integrity sha512-5IsdXf8tMY8QuHl8vTLnk9ehXDDm6x9FB9S9Og5IA1GYhLe5ZewydXSjlJlsqU2t9HRbfv97OJZV/pX8DVA/Hw== dependencies: - "@ethersproject/abstract-provider" "^5.0.4" - "@ethersproject/abstract-signer" "^5.0.4" - "@ethersproject/address" "^5.0.4" - "@ethersproject/bignumber" "^5.0.7" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/hash" "^5.0.4" - "@ethersproject/hdnode" "^5.0.4" - "@ethersproject/json-wallets" "^5.0.6" - "@ethersproject/keccak256" "^5.0.3" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/random" "^5.0.3" - "@ethersproject/signing-key" "^5.0.4" - "@ethersproject/transactions" "^5.0.5" - "@ethersproject/wordlists" "^5.0.4" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/constants" "^5.0.8" + "@ethersproject/logger" "^5.0.8" -"@ethersproject/web@5.0.11", "@ethersproject/web@^5.0.6": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.11.tgz#d47da612b958b4439e415782a53c8f8461522d68" - integrity sha512-x03ihbPoN1S8Gsh9WSwxkYxUIumLi02ZEKJku1C43sxBfe+mdprWyvujzYlpuoRNfWRgNhdRDKMP8JbG6MwNGA== +"@ethersproject/transactions@5.0.9", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.9": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.9.tgz#ccfcc1d395b5e3ce7342545fa28bfe5541182fd6" + integrity sha512-0Fu1yhdFBkrbMjenEr+39tmDxuHmaw0pe9Jb18XuKoItj7Z3p7+UzdHLr2S/okvHDHYPbZE5gtANDdQ3ZL1nBA== + dependencies: + "@ethersproject/address" "^5.0.9" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/constants" "^5.0.8" + "@ethersproject/keccak256" "^5.0.7" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/rlp" "^5.0.7" + "@ethersproject/signing-key" "^5.0.8" + +"@ethersproject/units@5.0.9": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.0.9.tgz#f8dc406f593eadcba883d6e86cc077203b03e7da" + integrity sha512-4jIkcMVrJ3lCgXMO4M/2ww0/T/IN08vJTZld7FIAwa6aoBDTAy71+sby3sShl1SG3HEeKYbI3fBWauCUgPRUpQ== + dependencies: + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/constants" "^5.0.8" + "@ethersproject/logger" "^5.0.8" + +"@ethersproject/wallet@5.0.10": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.0.10.tgz#16ad0864d9e0e2b57fb32d768ea4161891d62727" + integrity sha512-5siYr38NhqZKH6DUr6u4PdhgOKur8Q6sw+JID2TitEUmW0tOl8f6rpxAe77tw6SJT60D2UcvgsyLtl32+Nl+ig== + dependencies: + "@ethersproject/abstract-provider" "^5.0.8" + "@ethersproject/abstract-signer" "^5.0.10" + "@ethersproject/address" "^5.0.9" + "@ethersproject/bignumber" "^5.0.13" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/hash" "^5.0.10" + "@ethersproject/hdnode" "^5.0.8" + "@ethersproject/json-wallets" "^5.0.10" + "@ethersproject/keccak256" "^5.0.7" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/random" "^5.0.7" + "@ethersproject/signing-key" "^5.0.8" + "@ethersproject/transactions" "^5.0.9" + "@ethersproject/wordlists" "^5.0.8" + +"@ethersproject/web@5.0.12", "@ethersproject/web@^5.0.12": + version "5.0.12" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.12.tgz#f123397c107f863c31fce5f31a97c66ec155e755" + integrity sha512-gVxS5iW0bgidZ76kr7LsTxj4uzN5XpCLzvZrLp8TP+4YgxHfCeetFyQkRPgBEAJdNrexdSBayvyJvzGvOq0O8g== dependencies: - "@ethersproject/base64" "^5.0.3" - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/strings" "^5.0.4" + "@ethersproject/base64" "^5.0.7" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/strings" "^5.0.8" -"@ethersproject/wordlists@5.0.7", "@ethersproject/wordlists@^5.0.4": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.0.7.tgz#4e5ad38cfbef746b196a3290c0d41696eb7ab468" - integrity sha512-ZjQtYxm41FmHfYgpkdQG++EDcBPQWv9O6FfP6NndYRVaXaQZh6eq3sy7HQP8zCZ8dznKgy6ZyKECS8qdvnGHwA== +"@ethersproject/wordlists@5.0.8", "@ethersproject/wordlists@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.0.8.tgz#593319b710a5a1f4e839b72641aa765b4f111137" + integrity sha512-px2mloc1wAcdTbzv0ZotTx+Uh/dfnDO22D9Rx8xr7+/PUwAhZQjoJ9t7Hn72nsaN83rWBXsLvFcIRZju4GIaEQ== dependencies: - "@ethersproject/bytes" "^5.0.4" - "@ethersproject/hash" "^5.0.4" - "@ethersproject/logger" "^5.0.5" - "@ethersproject/properties" "^5.0.3" - "@ethersproject/strings" "^5.0.4" + "@ethersproject/bytes" "^5.0.9" + "@ethersproject/hash" "^5.0.10" + "@ethersproject/logger" "^5.0.8" + "@ethersproject/properties" "^5.0.7" + "@ethersproject/strings" "^5.0.8" "@ezerous/breeze@~0.4.0": version "0.4.0" @@ -1543,16 +1540,16 @@ orbit-db-identity-provider "~0.3.1" "@fluentui/react-component-event-listener@~0.51.0": - version "0.51.3" - resolved "https://registry.yarnpkg.com/@fluentui/react-component-event-listener/-/react-component-event-listener-0.51.3.tgz#c1e64244eefb1802930eb6e74cc046775d257315" - integrity sha512-ngRG5XUgX5tsN79Rkwaxaon8U79bUO8GRKnN1bc3WQl6cYVrL6XFdgc09/a/ISK53/sS6oa2wZ/csNTwvkDO4Q== + version "0.51.5" + resolved "https://registry.yarnpkg.com/@fluentui/react-component-event-listener/-/react-component-event-listener-0.51.5.tgz#cc744ef1a048604925c2a3cd4636638f3b65136c" + integrity sha512-GdKyWJJ/JE4YpE2XCl3ZcwM3fnsfat64M3KD5nrPJCp7CL8n7GR0RbacQqZZa8pd1A9Zp7mBhFm/kQxw52D+hA== dependencies: "@babel/runtime" "^7.10.4" "@fluentui/react-component-ref@~0.51.0": - version "0.51.3" - resolved "https://registry.yarnpkg.com/@fluentui/react-component-ref/-/react-component-ref-0.51.3.tgz#d8a2d87e5830d8da048072d7c615a94364bb5dca" - integrity sha512-6+DhceCb+4ua3WVoOW99aniEaFlfrlBs9kuCs6BJEcAeqYMoa2VFzxkPWXH/35a73LKIeLsHwoLXyOsILuYRRw== + version "0.51.5" + resolved "https://registry.yarnpkg.com/@fluentui/react-component-ref/-/react-component-ref-0.51.5.tgz#a6066223bb3e55439807ce541f28abb14b8850b8" + integrity sha512-EwlQm7ohwdcX8uYYMic+1WSd1FJUByDID4LpUkb+fwoz1qCNEeMsAk8yjqvidOYUddC2LJfG35iEvZ2/Ae41Hg== dependencies: "@babel/runtime" "^7.10.4" react-is "^16.6.3" @@ -1693,9 +1690,9 @@ integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow== "@hapi/hoek@9.x.x", "@hapi/hoek@^9.0.0", "@hapi/hoek@^9.0.4": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz#6c9eafc78c1529248f8f4d92b0799a712b6052c6" - integrity sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw== + version "9.1.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.1.tgz#9daf5745156fd84b8e9889a2dc721f0c58e894aa" + integrity sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw== "@hapi/inert@^6.0.3": version "6.0.3" @@ -2130,9 +2127,9 @@ reselect "^4.0.0" "@semantic-ui-react/event-stack@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@semantic-ui-react/event-stack/-/event-stack-3.1.1.tgz#3263d17511db81a743167fe45281a24b3eb6b3c8" - integrity sha512-SA7VOu/tY3OkooR++mm9voeQrJpYXjJaMHO1aFCcSouS2xhqMR9Gnz0LEGLOR0h9ueWPBKaQzKIrx3FTTJZmUQ== + version "3.1.2" + resolved "https://registry.yarnpkg.com/@semantic-ui-react/event-stack/-/event-stack-3.1.2.tgz#14fac9796695aa3967962d94ea9733a85325f9c4" + integrity sha512-Yd0Qf7lPCIjzJ9bZYfurlNu2RDXT6KKSyubHfYK3WjRauhxCsq6Fk2LMRI9DEvShoEU+AsLSv3NGkqXAcVp0zg== dependencies: exenv "^1.2.2" prop-types "^15.6.2" @@ -2164,10 +2161,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== -"@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.1": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" - integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== +"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.1": + version "1.8.2" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" + integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== dependencies: type-detect "4.0.8" @@ -2178,18 +2175,10 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@sinonjs/formatio@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz#f13e713cb3313b1ab965901b01b0828ea6b77089" - integrity sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ== - dependencies: - "@sinonjs/commons" "^1" - "@sinonjs/samsam" "^5.0.2" - -"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz#1d2f0743dc54bf13fe9d508baefacdffa25d4329" - integrity sha512-hXpcfx3aq+ETVBwPlRFICld5EnrkexXuXDwqUNhDdr5L8VjvMeSRwyOa0qL7XFmR+jVWR4rUZtnxlG7RX72sBg== +"@sinonjs/samsam@^5.3.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f" + integrity sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg== dependencies: "@sinonjs/commons" "^1.6.0" lodash.get "^4.4.2" @@ -2315,7 +2304,7 @@ dependencies: defer-to-connect "^1.0.1" -"@tokenizer/token@^0.1.0", "@tokenizer/token@^0.1.1": +"@tokenizer/token@^0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz#f0d92c12f87079ddfd1b29f614758b9696bc29e3" integrity sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w== @@ -2420,25 +2409,32 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== +"@types/mdast@^3.0.0", "@types/mdast@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb" + integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw== + dependencies: + "@types/unist" "*" + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.14.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae" - integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ== + version "14.14.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz#d934aacc22424fe9622ebf6857370c052eae464e" + integrity sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A== "@types/node@^12.12.6": - version "12.19.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679" - integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q== + version "12.19.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.14.tgz#59e5029a3c2aea34f68b717955381692fd47cafb" + integrity sha512-2U9uLN46+7dv9PiS8VQJcHhuoOjiDPZOLAt0WuA1EanEknIMae+2QbMhayF7cgGqjvRVIfNpt+6jLPczJZFiRw== "@types/node@^13.7.0": - version "13.13.36" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.36.tgz#0c4d3c4e365396c84b1c595524e2faff7dd45b26" - integrity sha512-ctzZJ+XsmHQwe3xp07gFUq4JxBaRSYzKHPgblR76//UanGST7vfFNF0+ty5eEbgTqsENopzoDK090xlha9dccQ== + version "13.13.40" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.40.tgz#f655ef327362cc83912f2e69336ddc62a24a9f88" + integrity sha512-eKaRo87lu1yAXrzEJl0zcJxfUMDT5/mZalFyOkT44rnQps41eS2pfWzbaulSPpQLFNy29bFqn+Y5lOTL8ATlEQ== "@types/parse-json@^4.0.0": version "4.0.0" @@ -2457,6 +2453,14 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== +"@types/readable-stream@^2.3.9": + version "2.3.9" + resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz#40a8349e6ace3afd2dd1b6d8e9b02945de4566a9" + integrity sha512-sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw== + dependencies: + "@types/node" "*" + safe-buffer "*" + "@types/secp256k1@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.1.tgz#fb3aa61a1848ad97d7425ff9dcba784549fca5a4" @@ -2469,10 +2473,15 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== +"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" + integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== + "@types/yargs-parser@*": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" - integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== + version "20.2.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" + integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== "@types/yargs@^13.0.0": version "13.0.11" @@ -2671,9 +2680,9 @@ "@xtuc/long" "4.2.2" "@welldone-software/why-did-you-render@^6.0.0-rc.1": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-6.0.3.tgz#99c58ea8e3f2ea8c042fb1d58ebf147d345fff26" - integrity sha512-9HskvqZrCVEnKur2WIZ2Jm36u+1bCbb1c+iHa8QljjHmEVOA2US1qKq3HeUcwsjgKZRo5xucV6td2FeJP8agmQ== + 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== dependencies: lodash "^4" @@ -3045,6 +3054,11 @@ array-equal@^1.0.0: resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= +array-filter@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" + integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -3248,6 +3262,13 @@ autoprefixer@^9.6.1: postcss "^7.0.32" postcss-value-parser "^4.1.0" +available-typed-arrays@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" + integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== + dependencies: + array-filter "^1.0.0" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -3423,6 +3444,11 @@ backo2@1.0.2: resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= +bail@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -3445,11 +3471,6 @@ base64-arraybuffer@0.1.4: resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= -base64-arraybuffer@0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" - integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg= - base64-js@^1.0.2, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -3498,19 +3519,12 @@ bech32@1.1.4: resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9" integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ== -better-assert@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" - integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI= - dependencies: - callsite "1.0.0" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== -bignumber.js@^9.0.0: +bignumber.js@^9.0.0, bignumber.js@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz#8d7ba124c882bfd8e43260c67475518d0689e4e5" integrity sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA== @@ -3521,9 +3535,9 @@ binary-extensions@^1.0.0: integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== binary-extensions@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9" - integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== bindings@^1.5.0: version "1.5.0" @@ -3791,16 +3805,16 @@ browserslist@4.10.0: node-releases "^1.1.52" pkg-up "^3.1.0" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.15.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.16.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b" - integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: + version "4.16.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" + integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== dependencies: - caniuse-lite "^1.0.30001165" + caniuse-lite "^1.0.30001173" colorette "^1.2.1" - electron-to-chromium "^1.3.621" + electron-to-chromium "^1.3.634" escalade "^3.1.1" - node-releases "^1.1.67" + node-releases "^1.1.69" bs58@^4.0.0, bs58@^4.0.1: version "4.0.1" @@ -3881,9 +3895,9 @@ buffer@^6.0.1: ieee754 "^1.2.1" bufferutil@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz#79f68631910f6b993d870fc77dc0a2894eb96cd5" - integrity sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA== + version "4.0.3" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz#66724b756bed23cd7c28c4d306d7994f9943cc6b" + integrity sha512-yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw== dependencies: node-gyp-build "^4.2.0" @@ -3986,12 +4000,12 @@ cacheable-request@^6.0.0: responselike "^1.0.2" call-bind@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" - integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w== + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" - get-intrinsic "^1.0.0" + get-intrinsic "^1.0.2" call-me-maybe@^1.0.1: version "1.0.1" @@ -4012,11 +4026,6 @@ caller-path@^2.0.0: dependencies: caller-callsite "^2.0.0" -callsite@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" - integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA= - callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" @@ -4055,10 +4064,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001165: - version "1.0.30001168" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001168.tgz#6fcd098c139d003b9bd484cbb9ca26cb89907f9a" - integrity sha512-P2zmX7swIXKu+GMMR01TWa4csIKELTNnZKc+f1CjebmZJQtTAEXmpQSoKVJVVcvPGAA0TEYTOUp3VehavZSFPQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173: + version "1.0.30001177" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001177.tgz#2c3b384933aafda03e29ccca7bb3d8c3389e1ece" + integrity sha512-6Ld7t3ifCL02jTj3MxPMM5wAYjbo4h/TAQGFTgv1inihP1tWnWp8mxxT4ut4JBEHLbpFXEXJJQ119JCJTBkYDw== capture-exit@^2.0.0: version "2.0.0" @@ -4078,11 +4087,11 @@ caseless@~0.12.0: integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= cbor@^5.0.2, cbor@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.1.0.tgz#c3be220dcbbd96a338d279a664237aed3f596904" - integrity sha512-qzEc7kUShdMbWTaUH7X+aHW8owvBU3FS0dfYR1lGYpoZr0mGJhhojLlZJH653x/DfeMZ56h315FRNBUIG1R7qg== + 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.0" + bignumber.js "^9.0.1" nofilter "^1.0.4" chai-checkmark@^1.0.1: @@ -4138,6 +4147,21 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +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" + integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== + +character-entities@^1.0.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== + +character-reference-invalid@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -4183,9 +4207,9 @@ chokidar@^2.1.8: fsevents "^1.2.7" chokidar@^3.3.0, chokidar@^3.4.1: - version "3.4.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" - integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -4195,7 +4219,7 @@ chokidar@^3.3.0, chokidar@^3.4.1: normalize-path "~3.0.0" readdirp "~3.5.0" optionalDependencies: - fsevents "~2.1.2" + fsevents "~2.3.1" chownr@^1.1.1, chownr@^1.1.2: version "1.1.4" @@ -4238,15 +4262,15 @@ cids@^0.7.1: multicodec "^1.0.0" multihashes "~0.4.15" -cids@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/cids/-/cids-1.1.4.tgz#d2aa4343fef971ef896b032fa0b99a66755d0f98" - integrity sha512-mo0IWZKcaQZsret8cP39MzDnPVT9NhhQEVaIKwWnBFaLtj2slTFckYMnbk15ptewNkb22qRBLfuBK+qiWYW/Mg== +cids@^1.0.0, cids@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/cids/-/cids-1.1.5.tgz#778bf8b70de3a0bf70989fd7d89c28fe23c685cb" + integrity sha512-i0V7tF2Jf78BKXyy2rpy1H/ozaJEP8b3Z7ZcHe9J86RRvJZ4e7daaJP3xwL09e14/Bl/mYX5WVc36fbQtjH7Sg== dependencies: multibase "^3.0.1" multicodec "^2.1.0" - multihashes "^3.0.1" - uint8arrays "^1.1.0" + multihashes "^3.1.0" + uint8arrays "^2.0.5" cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -4617,16 +4641,16 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= - cookie@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== + cookiejar@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" @@ -4650,17 +4674,17 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-js-compat@^3.6.2, core-js-compat@^3.8.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e" - integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ== + version "3.8.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.2.tgz#3717f51f6c3d2ebba8cbf27619b57160029d1d4c" + integrity sha512-LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ== dependencies: - browserslist "^4.15.0" + browserslist "^4.16.0" semver "7.0.0" core-js-pure@^3.0.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.1.tgz#23f84048f366fdfcf52d3fd1c68fec349177d119" - integrity sha512-Se+LaxqXlVXGvmexKGPvnUIYC1jwXu1H6Pkyb3uBM5d8/NELMYCHs/4/roD7721NxrTLyv7e5nXd5/QLBO+10g== + version "3.8.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.2.tgz#286f885c0dac1cdcd6d78397392abc25ddeca225" + integrity sha512-v6zfIQqL/pzTVAbZvYUozsxNfxcFb6Ks3ZfEbuneJl3FW9Jb8F6vLWB6f+qTmAu72msUdyb84V8d/yBFf7FNnw== core-js@^2.4.0: version "2.6.12" @@ -4668,9 +4692,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.5.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47" - integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg== + version "3.8.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044" + integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -4750,6 +4774,13 @@ create-react-context@^0.3.0: gud "^1.0.0" warning "^4.0.3" +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + cross-spawn@7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" @@ -4770,7 +4801,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.3: +cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4859,17 +4890,7 @@ css-select-base-adapter@^0.1.1: resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== -css-select@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" - integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= - dependencies: - boolbase "~1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "~1.0.1" - -css-select@^2.0.0: +css-select@^2.0.0, css-select@^2.0.2: version "2.1.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== @@ -4895,11 +4916,6 @@ css-tree@^1.1.2: mdn-data "2.0.14" source-map "^0.6.1" -css-what@2.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" - integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== - css-what@^3.2.1: version "3.4.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" @@ -5094,14 +5110,14 @@ datastore-level@^2.0.0: level "^5.0.1" datastore-pubsub@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/datastore-pubsub/-/datastore-pubsub-0.4.1.tgz#95c1b6e6a2de380ec169de918e958bb00f75c157" - integrity sha512-OVKIlSqILBSFApJ5FPmiWaSA71l53sX52sV0JgyGBaghzqbFTTB1HQikB8npSyGMEJfmpCVhKue9rkTHF+WoXg== + version "0.4.2" + resolved "https://registry.yarnpkg.com/datastore-pubsub/-/datastore-pubsub-0.4.2.tgz#9e31f0429382650eeadb3f1c7601f5bc88437cc7" + integrity sha512-ig7p3pYxs+LRZ8EnU3LGMC5z2fV5f3ZsFAszJjdiHaayBixXpQg7J2Kcv28apr4eJg+Zs0kClPdlM3LRqvwaBg== dependencies: - debug "^4.1.1" + debug "^4.2.0" err-code "^2.0.3" interface-datastore "^2.0.0" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" dateformat@^3.0.3: version "3.0.3" @@ -5129,7 +5145,7 @@ debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: +debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -5286,9 +5302,9 @@ delimit-stream@0.1.0: integrity sha1-m4MZR3wOX4rrPONXrjBfwl6hzSs= denque@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf" - integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== + version "1.5.0" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" + integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ== depd@~1.1.2: version "1.1.2" @@ -5447,6 +5463,15 @@ dom-serializer@0: domelementtype "^2.0.1" entities "^2.0.0" +dom-serializer@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1" + integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.0.0" + entities "^2.0.0" + dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" @@ -5462,7 +5487,7 @@ domelementtype@1, domelementtype@^1.3.1: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domelementtype@^2.0.1: +domelementtype@^2.0.1, domelementtype@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== @@ -5481,13 +5506,19 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -domutils@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" - integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= +domhandler@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a" + integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA== dependencies: - dom-serializer "0" - domelementtype "1" + domelementtype "^2.0.1" + +domhandler@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e" + integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA== + dependencies: + domelementtype "^2.1.0" domutils@^1.5.1, domutils@^1.7.0: version "1.7.0" @@ -5497,6 +5528,15 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" +domutils@^2.4.2: + version "2.4.4" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3" + integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.0.1" + domhandler "^4.0.0" + dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -5572,16 +5612,16 @@ ejs@^3.1.5: jake "^10.6.1" electron-fetch@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/electron-fetch/-/electron-fetch-1.7.2.tgz#7ecc63629715a5de286957a8aceb35272c5d0b02" - integrity sha512-J7D136rhxIhPwYJsnHPpKgbyd4NUCGnKM1CuXLhmVWZdc8f6+LBiJqUOTngtSacj+xvGWgaDWOAuCXnhqiMTCw== + version "1.7.3" + resolved "https://registry.yarnpkg.com/electron-fetch/-/electron-fetch-1.7.3.tgz#06cf363d7f64073ec00a37e9949ec9d29ce6b08a" + integrity sha512-1AVMaxrHXTTMqd7EK0MGWusdqNr07Rpj8Th6bG4at0oNgIi/1LBwa9CjT/0Zy+M0k/tSJPS04nFxHj0SXDVgVw== dependencies: encoding "^0.1.13" -electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.621: - version "1.3.629" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.629.tgz#a08d13b64d90e3c77ec5b9bffa3efbc5b4a00969" - integrity sha512-iSPPJtPvHrMAvYOt+9cdbDmTasPqwnwz4lkP8Dn200gDNUBQOLQ96xUsWXBwXslAo5XxdoXAoQQ3RAy4uao9IQ== +electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.634: + version "1.3.640" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.640.tgz#94e68c0ae79181a1d6fd1ed9a42b9790d51a1bca" + integrity sha512-cU6wQdXYzuSPzLdszsa4whStYfmU7CVNnG6c5z6/z9YlCOQ2Xh/uKB1gTxlIRr0ubgSg1/dZuSbUAoeESeQ3sQ== elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: version "6.5.3" @@ -5650,10 +5690,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -engine.io-client@~3.4.0: - version "3.4.4" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967" - integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ== +engine.io-client@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7" + integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA== dependencies: component-emitter "~1.3.0" component-inherit "0.0.3" @@ -5663,7 +5703,7 @@ engine.io-client@~3.4.0: indexof "0.0.1" parseqs "0.0.6" parseuri "0.0.6" - ws "~6.1.0" + ws "~7.4.2" xmlhttprequest-ssl "~1.5.4" yeast "0.1.2" @@ -5678,22 +5718,22 @@ engine.io-parser@~2.2.0: blob "0.0.5" has-binary2 "~1.0.2" -engine.io@~3.4.0: - version "3.4.2" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c" - integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg== +engine.io@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" + integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== dependencies: accepts "~1.3.4" base64id "2.0.0" - cookie "0.3.1" + cookie "~0.4.1" debug "~4.1.0" engine.io-parser "~2.2.0" - ws "^7.1.2" + ws "~7.4.2" enhanced-resolve@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" - integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== + version "4.5.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" + integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0" @@ -5745,7 +5785,7 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" -es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1: +es-abstract@^1.18.0-next.1: version "1.18.0-next.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== @@ -6016,9 +6056,9 @@ eslint-plugin-react@7.19.0: xregexp "^4.3.0" eslint-plugin-react@^7.19.0: - version "7.21.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz#50b21a412b9574bfe05b21db176e8b7b3b15bff3" - integrity sha512-8MaEggC2et0wSF6bUeywF7qQ46ER81irOdWS4QWxnnlAEsnzeBevk1sWh7fhpCghPpXb+8Ks7hvaft6L/xsR6g== + version "7.22.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" + integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== dependencies: array-includes "^3.1.1" array.prototype.flatmap "^1.2.3" @@ -6293,40 +6333,40 @@ ethereumjs-util@^6.0.0: rlp "^2.2.3" ethers@^5.0.8: - version "5.0.24" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.24.tgz#fbb8e4d35070d134f2eb846c07500b8c0eaef6d3" - integrity sha512-77CEtVC88fJGEhxGXRvQqAEH6e2A+ZFiv2FBT6ikXndlty5sw6vMatAhg1v+w3CaaGZOf1CP81jl4Mc8Zrj08A== - dependencies: - "@ethersproject/abi" "5.0.9" - "@ethersproject/abstract-provider" "5.0.7" - "@ethersproject/abstract-signer" "5.0.9" - "@ethersproject/address" "5.0.8" - "@ethersproject/base64" "5.0.6" - "@ethersproject/basex" "5.0.6" - "@ethersproject/bignumber" "5.0.12" - "@ethersproject/bytes" "5.0.8" - "@ethersproject/constants" "5.0.7" - "@ethersproject/contracts" "5.0.8" - "@ethersproject/hash" "5.0.9" - "@ethersproject/hdnode" "5.0.7" - "@ethersproject/json-wallets" "5.0.9" - "@ethersproject/keccak256" "5.0.6" + version "5.0.26" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.26.tgz#ef43c6b6aad71f10c1a184003f69b142d7d03bae" + integrity sha512-MqA8Fvutn3qEW0yBJOHeV6KZmRpF2rqlL2B5058AGkUFsuu6j5Ns/FRlMsbGeQwBz801IB23jQp7vjRfFsKSkg== + dependencies: + "@ethersproject/abi" "5.0.10" + "@ethersproject/abstract-provider" "5.0.8" + "@ethersproject/abstract-signer" "5.0.11" + "@ethersproject/address" "5.0.9" + "@ethersproject/base64" "5.0.7" + "@ethersproject/basex" "5.0.7" + "@ethersproject/bignumber" "5.0.13" + "@ethersproject/bytes" "5.0.9" + "@ethersproject/constants" "5.0.8" + "@ethersproject/contracts" "5.0.9" + "@ethersproject/hash" "5.0.10" + "@ethersproject/hdnode" "5.0.8" + "@ethersproject/json-wallets" "5.0.10" + "@ethersproject/keccak256" "5.0.7" "@ethersproject/logger" "5.0.8" - "@ethersproject/networks" "5.0.6" - "@ethersproject/pbkdf2" "5.0.6" - "@ethersproject/properties" "5.0.6" - "@ethersproject/providers" "5.0.17" - "@ethersproject/random" "5.0.6" - "@ethersproject/rlp" "5.0.6" - "@ethersproject/sha2" "5.0.6" - "@ethersproject/signing-key" "5.0.7" - "@ethersproject/solidity" "5.0.7" - "@ethersproject/strings" "5.0.7" - "@ethersproject/transactions" "5.0.8" - "@ethersproject/units" "5.0.8" - "@ethersproject/wallet" "5.0.9" - "@ethersproject/web" "5.0.11" - "@ethersproject/wordlists" "5.0.7" + "@ethersproject/networks" "5.0.7" + "@ethersproject/pbkdf2" "5.0.7" + "@ethersproject/properties" "5.0.7" + "@ethersproject/providers" "5.0.19" + "@ethersproject/random" "5.0.7" + "@ethersproject/rlp" "5.0.7" + "@ethersproject/sha2" "5.0.7" + "@ethersproject/signing-key" "5.0.8" + "@ethersproject/solidity" "5.0.8" + "@ethersproject/strings" "5.0.8" + "@ethersproject/transactions" "5.0.9" + "@ethersproject/units" "5.0.9" + "@ethersproject/wallet" "5.0.10" + "@ethersproject/web" "5.0.12" + "@ethersproject/wordlists" "5.0.8" ethjs-unit@0.1.6: version "0.1.6" @@ -6515,7 +6555,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.2: +extend@^3.0.0, 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== @@ -6660,12 +6700,12 @@ file-loader@4.3.0: loader-utils "^1.2.3" schema-utils "^2.5.0" -file-type@^14.7.1: - version "14.7.1" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-14.7.1.tgz#f748732b3e70478bff530e1cf0ec2fe33608b1bb" - integrity sha512-sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA== +file-type@^16.0.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.2.0.tgz#d4f1da71ddda758db7f15f93adfaed09ce9e2715" + integrity sha512-1Wwww3mmZCMmLjBfslCluwt2mxH80GsAXYrvPnfQ42G1EGWag336kB1iyCgyn7UXiKY3cJrNykXPrCwA7xb5Ag== dependencies: - readable-web-to-node-stream "^2.0.0" + readable-web-to-node-stream "^3.0.0" strtok3 "^6.0.3" token-types "^2.0.0" typedarray-to-buffer "^3.1.5" @@ -6844,6 +6884,13 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + for-in@^0.1.3: version "0.1.8" resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" @@ -6861,6 +6908,11 @@ for-own@^0.1.3: dependencies: for-in "^1.0.1" +foreach@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -7007,6 +7059,11 @@ fsevents@~2.1.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== +fsevents@~2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f" + integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -7072,10 +7129,10 @@ get-func-name@^2.0.0: resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= -get-intrinsic@^1.0.0, get-intrinsic@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be" - integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg== +get-intrinsic@^1.0.1, get-intrinsic@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" + integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -7555,9 +7612,9 @@ html-encoding-sniffer@^1.0.2: whatwg-encoding "^1.0.1" html-entities@^1.3.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.3.tgz#3dca638a43ee7de316fc23067398491152ad4736" - integrity sha512-/VulV3SYni1taM7a4RMdceqzJWR39gpZHjBwUnsCFKWV/GJkD14CJ5F7eWcZozmHJK0/f/H5U3b3SiPkuvxMgg== + version "1.4.0" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" + integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== html-escaper@^2.0.0: version "2.0.2" @@ -7584,6 +7641,16 @@ html-parse-stringify2@2.0.1: dependencies: void-elements "^2.0.1" +html-to-react@^1.3.4: + version "1.4.5" + resolved "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.5.tgz#59091c11021d1ef315ef738460abb6a4a41fe1ce" + integrity sha512-KONZUDFPg5OodWaQu2ymfkDmU0JA7zB1iPfvyHehTmMUZnk0DS7/TyCMTzsLH6b4BvxX15g88qZCXFhJWktsmA== + dependencies: + domhandler "^3.3.0" + htmlparser2 "^5.0" + lodash.camelcase "^4.3.0" + ramda "^0.27.1" + html-webpack-plugin@4.0.0-beta.11: version "4.0.0-beta.11" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz#3059a69144b5aecef97708196ca32f9e68677715" @@ -7596,7 +7663,7 @@ html-webpack-plugin@4.0.0-beta.11: tapable "^1.1.3" util.promisify "1.0.0" -htmlparser2@^3.3.0: +htmlparser2@^3.10.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -7608,6 +7675,16 @@ htmlparser2@^3.3.0: inherits "^2.0.1" readable-stream "^3.1.1" +htmlparser2@^5.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-5.0.1.tgz#7daa6fc3e35d6107ac95a4fc08781f091664f6e7" + integrity sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ== + dependencies: + domelementtype "^2.0.1" + domhandler "^3.3.0" + domutils "^2.4.2" + entities "^2.0.0" + http-cache-semantics@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" @@ -7656,9 +7733,9 @@ http-https@^1.0.0: integrity sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs= http-parser-js@>=0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77" - integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ== + version "0.5.3" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" + integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== http-proxy-middleware@0.19.1: version "0.19.1" @@ -7825,9 +7902,9 @@ import-fresh@^2.0.0: resolve-from "^3.0.0" import-fresh@^3.0.0, import-fresh@^3.1.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" - integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -8110,6 +8187,15 @@ ipfs-cli@^0.2.3: uint8arrays "^1.1.0" yargs "^16.0.3" +ipfs-core-types@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/ipfs-core-types/-/ipfs-core-types-0.2.0.tgz#7985c89aa0e8004ccbc4cf18a14a2e4483541258" + integrity sha512-Cen7q8rEhXBRrhM5VWOtIVNsTw7dQvs7E6guXTKFpWAqzTeV39KOO5rC69HY2Boiom9pqVMZRxeqq2UKVvCACw== + dependencies: + cids "^1.1.5" + multiaddr "^8.0.0" + peer-id "^0.14.1" + ipfs-core-utils@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.4.0.tgz#f633b0e51be6374f8caa1b15d5107e056123137a" @@ -8145,6 +8231,27 @@ ipfs-core-utils@^0.5.4: timeout-abort-controller "^1.1.1" uint8arrays "^1.1.0" +ipfs-core-utils@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.6.0.tgz#b89e7decf49f92b3539a47c01479494d891fb8d9" + integrity sha512-w5uoE3RLO5ReNt0E9BwIRdSGbjz9NzFxGqMDCW9zMPUAkiDWC8FTksYOifAVQcdekI4oP8kMHVDzJ/5YKyba/Q== + dependencies: + any-signal "^2.0.0" + 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.0" + 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@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/ipfs-core/-/ipfs-core-0.3.1.tgz#059bca87fa50f5a26f007e11526c530b9e7abbf9" @@ -8270,16 +8377,17 @@ ipfs-http-client@^47.0.1: uint8arrays "^1.1.0" ipfs-http-client@^48.1.3: - version "48.1.3" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.1.3.tgz#d9b91b1f65d54730de92290d3be5a11ef124b400" - integrity sha512-+JV4cdMaTvYN3vd4r6+mcVxV3LkJXzc4kn2ToVbObpVpdqmG34ePf1KlvFF8A9gjcel84WpiP5xCEV/IrisPBA== + version "48.2.0" + resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.2.0.tgz#36bdde46cc41e4fa1f55fa216084b4b7c9ba745f" + integrity sha512-7t8Ju5LGUNP9AdSs3WzeKkcqKXhwPamQJO+YGLMplYXzlk3+L13nM5O/fi37kRBpWkGYAdNAMv4dNslQhzI1Mw== dependencies: any-signal "^2.0.0" bignumber.js "^9.0.0" - cids "^1.0.0" + cids "^1.1.5" debug "^4.1.1" form-data "^3.0.0" - ipfs-core-utils "^0.5.4" + ipfs-core-types "^0.2.0" + ipfs-core-utils "^0.6.0" ipfs-utils "^5.0.0" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" @@ -8322,12 +8430,12 @@ ipfs-http-gateway@^0.1.4: uri-to-multiaddr "^4.0.0" ipfs-http-response@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/ipfs-http-response/-/ipfs-http-response-0.6.0.tgz#95d6d8e7617a35b69a0b3dc551b5f728a985f941" - integrity sha512-x1x4ZGvR0azgasT2ql6qKjiH+aPVjra9rJbNq89KzQVxrQLf9zlEHfLzfL7p8m0iYY4MiD+fW+QZF8xA18Xh2g== + version "0.6.1" + resolved "https://registry.yarnpkg.com/ipfs-http-response/-/ipfs-http-response-0.6.1.tgz#fa1fc685264318112481195898f56178522c57b8" + integrity sha512-tfvgB0xtciDyIsjrpAooyLvj28rKsnFXAOcPjbWdB8atejo9Rh96bkcHa+mq51KZLo0VpAUYJCVCV38gcIpObQ== dependencies: debug "^4.1.1" - file-type "^14.7.1" + file-type "^16.0.0" filesize "^6.1.0" it-buffer "^0.1.1" it-concat "^1.0.0" @@ -8656,20 +8764,20 @@ ipld@^0.28.0: typical "^6.0.0" ipns@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/ipns/-/ipns-0.8.0.tgz#5102c39e1e4905392e7fde81f671ff269a7d2afc" - integrity sha512-DbveKyLuiO6GgZ4lILxQ3h+27dV/5MPriDTDny3/WHEaCOYH8Gs64CRP5MBQPQcsnZ2Tg+YkjnUAKX/pWAwNhA== + version "0.8.1" + resolved "https://registry.yarnpkg.com/ipns/-/ipns-0.8.1.tgz#428e19105484a948ee33d27eba5c191210a4682e" + integrity sha512-1xyvOhf/oqE9ECVjfZiqAURO3jXdm/jRyluX6lhAPCBImoE5KLTcoJubUkHey+Z8LXJRW+mIxAUMm1FcAyGwTA== dependencies: - debug "^4.1.1" - err-code "^2.0.0" + debug "^4.2.0" + err-code "^2.0.3" interface-datastore "^2.0.0" libp2p-crypto "^0.18.0" - multibase "^3.0.0" + multibase "^3.0.1" multihashes "^3.0.1" - peer-id "^0.14.0" + peer-id "^0.14.2" protons "^2.0.0" timestamp-nano "^1.0.0" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" is-absolute-url@^2.0.0: version "2.1.0" @@ -8695,6 +8803,19 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-alphabetical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" + integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== + +is-alphanumerical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" + integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-arguments@^1.0.4: version "1.1.0" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" @@ -8731,12 +8852,12 @@ is-buffer@^1.0.2, is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.4, is-buffer@~2.0.3: +is-buffer@^2.0.0, is-buffer@^2.0.4, is-buffer@~2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-callable@^1.1.4, is-callable@^1.2.2: +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== @@ -8791,6 +8912,11 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== +is-decimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== + is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -8878,6 +9004,11 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== +is-generator-function@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b" + integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ== + is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -8897,6 +9028,11 @@ is-hex-prefixed@1.0.0: resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" integrity sha1-fY035q135dEnFIkTxXPggtd39VQ= +is-hexadecimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== + is-installed-globally@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" @@ -9089,6 +9225,17 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.1" +is-typed-array@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.4.tgz#1f66f34a283a3c94a4335434661ca53fff801120" + integrity sha512-ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA== + dependencies: + available-typed-arrays "^1.0.2" + call-bind "^1.0.0" + es-abstract "^1.18.0-next.1" + foreach "^2.0.5" + has-symbols "^1.0.1" + is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -9915,22 +10062,6 @@ js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" @@ -10759,9 +10890,9 @@ libp2p-record@^0.9.0: uint8arrays "^1.1.0" libp2p-tcp@^0.15.0, libp2p-tcp@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/libp2p-tcp/-/libp2p-tcp-0.15.1.tgz#644b83abf46f213ee9476d2db4135636f0a17d17" - integrity sha512-alvgZ3lSNUyiz4vJOqvm6RpMQN9d17gSJa+VT+2pYLGf82o8pX3QvyhltMkBG7u9I+qZAkD6L27s8o0h38dpOg== + version "0.15.2" + resolved "https://registry.yarnpkg.com/libp2p-tcp/-/libp2p-tcp-0.15.2.tgz#308a845a9462d89f638d669b916ebddfdad7dea9" + integrity sha512-sJwzP6+iWj2QYwo3ab8DycWWGbjxHFm6Cv0mDj8nzkiebLnm36wMs5wXVDiSgerPITAOHE9SPTOOqaST8Y1rnw== dependencies: abortable-iterator "^3.0.0" class-is "^1.1.0" @@ -10798,9 +10929,9 @@ libp2p-webrtc-peer@^10.0.1: readable-stream "^3.4.0" libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.5: - version "0.20.5" - resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.5.tgz#c52364dfbe59fd8e5da0e32feeaca374d3a79f9a" - integrity sha512-Tny1+q0EY192WgrkNCV7360ifI3RXjMoao91qwLhNwx7ArsqVMzrZvBnK3MTMmYQaGE1W0n/CLlw/Nn344iv2Q== + version "0.20.6" + resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.6.tgz#64fbd4078d2fe513a2a1c58fda06331c2f93d5a6" + integrity sha512-XR7h/UYT694IuPj4xM3ik4aH2j2HqzHB4KEOXeE2bpsQ0myVPri3qG0BBrv+vkFCCK7NWu9L4EARGSgqB+qdCw== dependencies: "@hapi/hapi" "^20.0.0" "@hapi/inert" "^6.0.3" @@ -10818,7 +10949,7 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.5: multiaddr "^8.0.0" p-defer "^3.0.0" peer-id "^0.14.2" - prom-client "^12.0.0" + prom-client "^13.0.0" socket.io "^2.3.0" socket.io-client "^2.3.0" stream-to-it "^0.2.2" @@ -11008,6 +11139,11 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + lodash.find@4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" @@ -11151,9 +11287,9 @@ ltgt@^2.1.2: integrity sha1-81ypHEk/e3PaDgdJUwTxezH4fuU= mafmt@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/mafmt/-/mafmt-8.0.1.tgz#2c2ba61a84a66e58552100f163caef1a1267b276" - integrity sha512-A2z9CQp8C9koExHLdYs2tGzwYgCWuEfp+M+QNKe+qQif+YwYRq0+wJ9019SP7Go9TLx0I6+ylx01RqIxZ8RuHw== + version "8.0.4" + resolved "https://registry.yarnpkg.com/mafmt/-/mafmt-8.0.4.tgz#5b158a28bd800fb8d0e5c28bd9ee15120bed2a61" + integrity sha512-wwZ5+PU0vQw10kwQRyZin1Z0dqVOp0BnYlX1xvXHS2fmLwrrQCfU1+3tlW5MRcihUwGz1virnVhbRAU1biKfiw== dependencies: multiaddr "^8.0.0" @@ -11205,6 +11341,29 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +mdast-add-list-metadata@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mdast-add-list-metadata/-/mdast-add-list-metadata-1.0.1.tgz#95e73640ce2fc1fa2dcb7ec443d09e2bfe7db4cf" + integrity sha512-fB/VP4MJ0LaRsog7hGPxgOrSL3gE/2uEdZyDuSEnKCv/8IkYHiDkIQSbChiJoHyxZZXZ9bzckyRk+vNxFzh8rA== + dependencies: + unist-util-visit-parents "1.1.2" + +mdast-util-from-markdown@^0.8.0: + version "0.8.4" + resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz#2882100c1b9fc967d3f83806802f303666682d32" + integrity sha512-jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw== + dependencies: + "@types/mdast" "^3.0.0" + mdast-util-to-string "^2.0.0" + micromark "~2.11.0" + parse-entities "^2.0.0" + unist-util-stringify-position "^2.0.0" + +mdast-util-to-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== + mdn-data@2.0.14: version "2.0.14" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" @@ -11244,9 +11403,9 @@ menoetius@0.0.2: prom-client "^11.5.3" merge-deep@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2" - integrity sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.3.tgz#1a2b2ae926da8b2ae93a0ac15d90cd1922766003" + integrity sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA== dependencies: arr-union "^3.1.0" clone-deep "^0.2.4" @@ -11291,6 +11450,14 @@ microevent.ts@~0.1.1: resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0" integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g== +micromark@~2.11.0: + version "2.11.2" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.2.tgz#e8b6a05f54697d2d3d27fc89600c6bc40dd05f35" + integrity sha512-IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ== + dependencies: + debug "^4.0.0" + parse-entities "^2.0.0" + micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -11318,22 +11485,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - -mime-db@1.x.x, "mime-db@>= 1.43.0 < 2": +mime-db@1.45.0, mime-db@1.x.x, "mime-db@>= 1.43.0 < 2": version "1.45.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== mime-types@^2.1.12, mime-types@^2.1.16, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + version "2.1.28" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" + integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== dependencies: - mime-db "1.44.0" + mime-db "1.45.0" mime@1.6.0: version "1.6.0" @@ -11620,12 +11782,12 @@ multibase@^0.7.0: buffer "^5.5.0" multibase@^3.0.0, multibase@^3.0.1, multibase@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/multibase/-/multibase-3.1.0.tgz#2999aebbd34b3fa85cd5a9d42babc6031aeccafe" - integrity sha512-Z+pThrpbS7ckQ2DwW5mPiwCGe1a94f8DWi/OxmbyeRednVOyUKmLSE+60kL/WHFYwWnaD1OakXGk3PYI1NkMFw== + version "3.1.1" + resolved "https://registry.yarnpkg.com/multibase/-/multibase-3.1.1.tgz#fb4c0fc169c2d89d80cbf0cbbec4e00ffed8cf3a" + integrity sha512-kkSd8jWGznDNEC2eDwtnvSGlZeTeEt0+oHieNWUhv8rIi8JU3voIUo02HpJBNOtgmtxT2CPwkElub7Y9kz3nrw== dependencies: "@multiformats/base-x" "^4.0.1" - web-encoding "^1.0.4" + web-encoding "^1.0.6" multibase@~0.6.0: version "0.6.1" @@ -11688,13 +11850,13 @@ multihashes@^0.4.15, multihashes@~0.4.13, multihashes@~0.4.15: multibase "^0.7.0" varint "^5.0.0" -multihashes@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-3.1.0.tgz#aada18fc55169ae044c3455e2264024bd00f5690" - integrity sha512-snU+w6aZy5bTrrqIHW3wkT0MfHmxcpOsaVNJt0NzUnseksbjFDVUZjSmhDMAVOVnIdLMS7xHjo55pKlBIGmC3g== +multihashes@^3.0.1, multihashes@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-3.1.1.tgz#4e0bbf1e4f3d5118f3621ec8d4404aee47a7d32b" + integrity sha512-oF4BesRWbr5BbcRr1/QCDlZK+An8LWBPHVPYKt/foDpqNtXX/l0lm/rmAjI8dDYruPO90OaGcAWI3KS5vNJdNw== dependencies: multibase "^3.1.0" - uint8arrays "^1.0.0" + uint8arrays "^2.0.5" varint "^6.0.0" multihashes@~3.0.1: @@ -11847,9 +12009,9 @@ natural-compare@^1.4.0: integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= needle@^2.2.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz#cf1a8fce382b5a280108bba90a14993c00e4010a" - integrity sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ== + version "2.6.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" + integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" @@ -11995,10 +12157,10 @@ node-pre-gyp@^0.13.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.52, node-releases@^1.1.67: - version "1.1.67" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12" - integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg== +node-releases@^1.1.52, node-releases@^1.1.69: + version "1.1.69" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.69.tgz#3149dbde53b781610cd8b486d62d86e26c3725f6" + integrity sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA== nodeify@^1.0.1: version "1.0.1" @@ -12113,7 +12275,7 @@ npmlog@^4.0.2: gauge "~2.7.3" set-blocking "~2.0.0" -nth-check@^1.0.2, nth-check@~1.0.1: +nth-check@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== @@ -12158,11 +12320,6 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1 resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-component@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" - integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE= - object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -12173,11 +12330,11 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-hash@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea" - integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg== + version "2.1.1" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09" + integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ== -object-inspect@^1.8.0: +object-inspect@^1.8.0, object-inspect@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== @@ -12242,7 +12399,7 @@ object.fromentries@^2.0.2: es-abstract "^1.18.0-next.1" has "^1.0.3" -object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: +object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0, object.getownpropertydescriptors@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544" integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng== @@ -12318,10 +12475,10 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^7.0.2, open@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" - integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== +open@^7.0.2, open@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/open/-/open-7.3.1.tgz#111119cb919ca1acd988f49685c4fdd0f4755356" + integrity sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -12774,9 +12931,9 @@ p-try@^2.0.0: integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== p-wait-for@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-3.1.0.tgz#9da568a2adda3ea8175a3c43f46a5317e28c0e47" - integrity sha512-0Uy19uhxbssHelu9ynDMcON6BmMk6pH8551CvxROhiz3Vx+yC4RqxjyIDk2V4ll0g9177RKT++PK4zcV58uJ7A== + version "3.2.0" + resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-3.2.0.tgz#640429bcabf3b0dd9f492c31539c5718cb6a3f1f" + integrity sha512-wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA== dependencies: p-timeout "^3.0.0" @@ -12840,6 +12997,18 @@ parse-duration@^0.4.4: resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-0.4.4.tgz#11c0f51a689e97d06c57bd772f7fda7dc013243c" integrity sha512-KbAJuYGUhZkB9gotDiKLnZ7Z3VTacK3fgwmDdB6ZVDtJbMBT6MfLga0WJaYpPDu0mzqT0NgHtHDt5PY4l0nidg== +parse-entities@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" + integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" + parse-headers@^2.0.0, parse-headers@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515" @@ -12880,25 +13049,11 @@ parse5@5.1.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== -parseqs@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" - integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0= - dependencies: - better-assert "~1.0.0" - parseqs@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== -parseuri@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" - integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo= - dependencies: - better-assert "~1.0.0" - parseuri@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" @@ -13044,10 +13199,10 @@ pbkdf2@^3.0.17, pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -peek-readable@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.0.tgz#250b08b7de09db8573d7fd8ea475215bbff14348" - integrity sha512-KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA== +peek-readable@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.3.tgz#932480d46cf6aa553c46c68566c4fb69a82cd2b1" + integrity sha512-mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg== peer-id@^0.14.0, peer-id@^0.14.1, peer-id@^0.14.2: version "0.14.2" @@ -13123,20 +13278,20 @@ pino-pretty@^4.0.0: split2 "^3.1.1" strip-json-comments "^3.1.1" -pino-std-serializers@^2.4.2: - version "2.5.0" - resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-2.5.0.tgz#40ead781c65a0ce7ecd9c1c33f409d31fe712315" - integrity sha512-wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg== +pino-std-serializers@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-3.1.1.tgz#5a9a00715c9ff3428d5555d4b023a3f8a5893e54" + integrity sha512-Ud4+WzgEr/swOlfQdkxqKP2hlwuQlIqQ5YwYpo9MczNg2mpsKKyKgwQXW5KnP5tgH3/Cy9QRhAhLM8k1K+gfnA== pino@^6.0.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-6.8.0.tgz#d242f9936f2e65217fde75c0af5d5d8b4d3d3fde" - integrity sha512-nxq+6Jr7m0cMjYFBoTRw3bco14omZ/SQCheAHz9GVwdkbUrzKhgT+gSI/ql2Mnsca0QQKgpB/ACWhjxE4JsX3Q== + version "6.10.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-6.10.0.tgz#0dc4c701aef9e6f1ab276c7c1fbfcbebeba720db" + integrity sha512-ZFGE/Wq930gFb1h0RI6S/QOfkyzNj94Xubwlyo4XpxNUgrG1C0iEqnlooG5Fymx6yrUUtEJ8j/u8NCGwgwTXaQ== dependencies: fast-redact "^3.0.0" fast-safe-stringify "^2.0.7" flatstr "^1.0.12" - pino-std-serializers "^2.4.2" + pino-std-serializers "^3.1.0" quick-format-unescaped "^4.0.1" sonic-boom "^1.0.2" @@ -13784,9 +13939,9 @@ postcss-selector-matches@^4.0.0: postcss "^7.0.2" postcss-selector-not@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz#c68ff7ba96527499e832724a2674d65603b645c0" - integrity sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ== + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz#263016eef1cf219e0ade9a913780fc1f48204cbf" + integrity sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ== dependencies: balanced-match "^1.0.0" postcss "^7.0.2" @@ -13901,9 +14056,9 @@ prettier@^1.14.3: integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== pretty-bytes@^5.1.0, pretty-bytes@^5.4.1: - version "5.4.1" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz#cd89f79bbcef21e3d21eb0da68ffe93f803e884b" - integrity sha512-s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA== + version "5.5.0" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e" + integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA== pretty-error@^2.1.1: version "2.1.2" @@ -13960,6 +14115,13 @@ prom-client@^12.0.0: dependencies: tdigest "^0.1.1" +prom-client@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-13.0.0.tgz#7e883e1c10c2d471258d3acf2d386197ffc819bd" + integrity sha512-M7ZNjIO6x+2R/vjSD13yjJPjpoZA8eEwH2Bp2Re0/PvzozD7azikv+SaBtZes4Q1ca/xHjZ4RSCuTag3YZLg1A== + dependencies: + tdigest "^0.1.1" + prometheus-gc-stats@^0.6.0: version "0.6.3" resolved "https://registry.yarnpkg.com/prometheus-gc-stats/-/prometheus-gc-stats-0.6.3.tgz#7858623419d5f3e88d7ac782d931aafbc1e4b001" @@ -14240,6 +14402,11 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" +ramda@^0.27.1: + version "0.27.1" + resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9" + integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw== + randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.3, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -14338,9 +14505,9 @@ react-error-overlay@^6.0.7: integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw== react-i18next@^11.7.3: - version "11.8.4" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.4.tgz#5407d2edcaa704c38e4034e7ac06413914ed6e6d" - integrity sha512-QlPJfX+Roi+jEQ6frBSsLHHH+VWbUoCl6wZDT8XHMd6PsSgepjgD2sZf/h7F46JnHeuy0U+SxY3TtrJF+aDIyg== + version "11.8.5" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.5.tgz#a093335822e36252cda6efc0f55facef6253643f" + integrity sha512-2jY/8NkhNv2KWBnZuhHxTn13aMxAbvhiDUNskm+1xVVnrPId78l8fA7fCyVeO3XU1kptM0t4MtvxV1Nu08cjLw== dependencies: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" @@ -14350,6 +14517,22 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-i resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +react-markdown@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-5.0.3.tgz#41040ea7a9324b564b328fb81dd6c04f2a5373ac" + integrity sha512-jDWOc1AvWn0WahpjW6NK64mtx6cwjM4iSsLHJPNBqoAgGOVoIdJMqaKX4++plhOtdd4JksdqzlDibgPx6B/M2w== + dependencies: + "@types/mdast" "^3.0.3" + "@types/unist" "^2.0.3" + html-to-react "^1.3.4" + mdast-add-list-metadata "1.0.1" + prop-types "^15.7.2" + react-is "^16.8.6" + remark-parse "^9.0.0" + unified "^9.0.0" + unist-util-visit "^2.0.0" + xtend "^4.0.1" + react-particles-js@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/react-particles-js/-/react-particles-js-3.4.1.tgz#e0f17ae1ddb07d01ce911448db76cd59726fe666" @@ -14541,10 +14724,13 @@ readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1, readable string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-web-to-node-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-2.0.0.tgz#751e632f466552ac0d5c440cc01470352f93c4b7" - integrity sha512-+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA== +readable-web-to-node-stream@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.1.tgz#3f619b1bc5dd73a4cfe5c5f9b4f6faba55dff845" + integrity sha512-4zDC6CvjUyusN7V0QLsXVB7pJCD9+vtrM9bYDRv6uBQ+SKfx36rp5AFNPRgh9auKRul/a1iFZJYXcCbwRL+SaA== + dependencies: + "@types/readable-stream" "^2.3.9" + readable-stream "^3.6.0" readdirp@^2.2.1: version "2.2.1" @@ -14702,9 +14888,9 @@ regjsgen@^0.5.1: integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== regjsparser@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272" - integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw== + version "0.6.6" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.6.tgz#6d8c939d1a654f78859b08ddcc4aa777f3fa800a" + integrity sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ== dependencies: jsesc "~0.5.0" @@ -14718,19 +14904,26 @@ relative-url@^1.0.2: resolved "https://registry.yarnpkg.com/relative-url/-/relative-url-1.0.2.tgz#d21c52a72d6061018bcee9f9c9fc106bf7d65287" integrity sha1-0hxSpy1gYQGLzun5yfwQa/fWUoc= +remark-parse@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640" + integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw== + dependencies: + mdast-util-from-markdown "^0.8.0" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= renderkid@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz#d325e532afb28d3f8796ffee306be8ffd6fc864c" - integrity sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g== + version "2.0.5" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5" + integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ== dependencies: - css-select "^1.1.0" + css-select "^2.0.2" dom-converter "^0.2" - htmlparser2 "^3.3.0" + htmlparser2 "^3.10.1" lodash "^4.17.20" strip-ansi "^3.0.0" @@ -15010,16 +15203,16 @@ rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.6.0: dependencies: tslib "^1.9.0" +safe-buffer@*, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0, safe-buffer@~5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0, safe-buffer@~5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -15368,12 +15561,13 @@ shortid@^2.2.8: nanoid "^2.1.0" side-channel@^1.0.2, side-channel@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3" - integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g== + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== dependencies: - es-abstract "^1.18.0-next.0" - object-inspect "^1.8.0" + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.3" @@ -15409,13 +15603,12 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sinon@^9.0.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.2.tgz#b83cf5d43838f99cfa3644453f4c7db23e7bd535" - integrity sha512-9Owi+RisvCZpB0bdOVFfL314I6I4YoRlz6Isi4+fr8q8YQsDPoCe5UnmNtKHRThX3negz2bXHWIuiPa42vM8EQ== + version "9.2.3" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.3.tgz#f68ce414e843e2fd638703043c97f260697caa52" + integrity sha512-m+DyAWvqVHZtjnjX/nuShasykFeiZ+nPuEfD4G3gpvKGkXRhkF/6NSt2qN2FjZhfrcHXFzUzI+NLnk+42fnLEw== dependencies: "@sinonjs/commons" "^1.8.1" "@sinonjs/fake-timers" "^6.0.1" - "@sinonjs/formatio" "^5.0.1" "@sinonjs/samsam" "^5.3.0" diff "^4.0.2" nise "^4.0.4" @@ -15485,36 +15678,16 @@ 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.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4" - integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA== - dependencies: - backo2 "1.0.2" - base64-arraybuffer "0.1.5" - component-bind "1.0.0" - component-emitter "1.2.1" - debug "~4.1.0" - engine.io-client "~3.4.0" - has-binary2 "~1.0.2" - has-cors "1.1.0" - indexof "0.0.1" - object-component "0.0.3" - parseqs "0.0.5" - parseuri "0.0.5" - socket.io-parser "~3.3.0" - to-array "0.1.4" - -socket.io-client@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz#91a4038ef4d03c19967bb3c646fec6e0eaa78cff" - integrity sha512-YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ== +socket.io-client@2.4.0, socket.io-client@^2.3.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== dependencies: backo2 "1.0.2" component-bind "1.0.0" component-emitter "~1.3.0" debug "~3.1.0" - engine.io-client "~3.4.0" + engine.io-client "~3.5.0" has-binary2 "~1.0.2" indexof "0.0.1" parseqs "0.0.6" @@ -15523,9 +15696,9 @@ socket.io-client@^2.3.0: to-array "0.1.4" socket.io-parser@~3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199" - integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" + integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg== dependencies: component-emitter "~1.3.0" debug "~3.1.0" @@ -15541,15 +15714,15 @@ socket.io-parser@~3.4.0: isarray "2.0.1" socket.io@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb" - integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg== + version "2.4.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" + integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== dependencies: debug "~4.1.0" - engine.io "~3.4.0" + engine.io "~3.5.0" has-binary2 "~1.0.2" socket.io-adapter "~1.1.0" - socket.io-client "2.3.0" + socket.io-client "2.4.0" socket.io-parser "~3.4.0" sockjs-client@1.4.0: @@ -15611,9 +15784,9 @@ sort-keys@^1.0.0: is-plain-obj "^1.0.0" sort-keys@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.1.0.tgz#727edc12fee49ce482848db07369ec44e0f3e9f2" - integrity sha512-/sRdxzkkPFUYiCrTr/2t+104nDc9AgDmEpeVYuvOWYQe3Djk1GWO6lVw3Vx2jfh1SsR0eehhd1nvFYlzt5e99w== + version "4.2.0" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18" + integrity sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg== dependencies: is-plain-obj "^2.0.0" @@ -15623,9 +15796,9 @@ source-list-map@^2.0.0: integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== source-map-explorer@~2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.1.tgz#35ca7ba3574f0002ac347343f1894e04860c827f" - integrity sha512-sg60PIva7pOkvTqbLRGOB3Cp84I1pial0J6tUNs/bNGIz+0+WNw37oLXEDFHTDJhFh24rto8rESv4wCB7w9HVQ== + version "2.5.2" + resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.2.tgz#857cab5dd9d1d7175e9c5c2739dc9ccfb99f2dc5" + integrity sha512-gBwOyCcHPHcdLbgw6Y6kgoH1uLKL6hN3zz0xJcNI2lpnElZliIlmSYAjUVwAWnc7+HscoTyh1ScR7ITtFuEnxg== dependencies: btoa "^1.2.1" chalk "^4.1.0" @@ -15635,10 +15808,10 @@ source-map-explorer@~2.5.0: glob "^7.1.6" gzip-size "^6.0.0" lodash "^4.17.20" - open "^7.3.0" + open "^7.3.1" source-map "^0.7.3" temp "^0.9.4" - yargs "^16.1.1" + yargs "^16.2.0" source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" @@ -16043,13 +16216,13 @@ strip-json-comments@^3.0.1, strip-json-comments@^3.1.1: integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== strtok3@^6.0.3: - version "6.0.4" - resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.4.tgz#ede0d20fde5aa9fda56417c3558eaafccc724694" - integrity sha512-rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ== + version "6.0.8" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.8.tgz#c839157f615c10ba0f4ae35067dad9959eeca346" + integrity sha512-QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw== dependencies: "@tokenizer/token" "^0.1.1" "@types/debug" "^4.1.5" - peek-readable "^3.1.0" + peek-readable "^3.1.3" style-loader@0.23.1: version "0.23.1" @@ -16404,12 +16577,12 @@ toidentifier@1.0.0: integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== token-types@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/token-types/-/token-types-2.0.0.tgz#b23618af744818299c6fbf125e0fdad98bab7e85" - integrity sha512-WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw== + version "2.1.1" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-2.1.1.tgz#bd585d64902aaf720b8979d257b4b850b4d45c45" + integrity sha512-wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q== dependencies: - "@tokenizer/token" "^0.1.0" - ieee754 "^1.1.13" + "@tokenizer/token" "^0.1.1" + ieee754 "^1.2.1" tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0, tough-cookie@~2.5.0: version "2.5.0" @@ -16426,10 +16599,15 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -truffle@~5.1.45: - version "5.1.58" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.58.tgz#3202bc080ef71c811fe9181bfc47fff944afab62" - integrity sha512-BnMSq9+0vUj6B8OODs/U/cV7MiyNrKOKmeO1fhn2LOvN6XpOd06Qitw0V15lNxlCL+datx2WEZ9AnYql689bnQ== +trough@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" + integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== + +truffle@~5.1.55: + version "5.1.62" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.62.tgz#819b8280615345bf42bbba7967f2dc9d39347869" + integrity sha512-TWgZ3xSSb8us4ZkHEHRghJWivfewjEy7yd8nARd7EHvoOi5lcUmKnbsunP+G7u/AO47gRoEqwFdPuGPdXrBM1A== dependencies: app-module-path "^2.2.0" mocha "8.1.2" @@ -16468,9 +16646,9 @@ tslib@^1.8.1, tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" - integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== tsparticles@^1.18.10: version "1.18.11" @@ -16480,9 +16658,9 @@ tsparticles@^1.18.10: pathseg "^1.2.0" tsutils@^3.17.1: - version "3.17.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" - integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== + version "3.19.1" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.19.1.tgz#d8566e0c51c82f32f9c25a4d367cd62409a547a9" + integrity sha512-GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw== dependencies: tslib "^1.8.1" @@ -16597,6 +16775,14 @@ uint8arrays@1.1.0, uint8arrays@^1.0.0, uint8arrays@^1.1.0: multibase "^3.0.0" web-encoding "^1.0.2" +uint8arrays@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-2.0.5.tgz#763d0c3dd8e1d05b656d2e60c8a9a53096a47d9e" + integrity sha512-1HSktgwqtYIwVn1mg3GcnqKhHH9oC4kVgdD/43cxMWwhP8rihKcFPmToDzS1XtbvVvlR8XxTk/DUBf0C83qNIg== + dependencies: + multibase "^3.0.0" + web-encoding "^1.0.5" + ultron@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" @@ -16630,6 +16816,18 @@ unicode-property-aliases-ecmascript@^1.0.4: resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== +unified@^9.0.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg== + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-buffer "^2.0.0" + is-plain-obj "^2.0.0" + trough "^1.0.0" + vfile "^4.0.0" + union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" @@ -16671,6 +16869,40 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" +unist-util-is@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz#3e9e8de6af2eb0039a59f50c9b3e99698a924f50" + integrity sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA== + +unist-util-stringify-position@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== + dependencies: + "@types/unist" "^2.0.2" + +unist-util-visit-parents@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-1.1.2.tgz#f6e3afee8bdbf961c0e6f028ea3c0480028c3d06" + integrity sha512-yvo+MMLjEwdc3RhhPYSximset7rwjMrdt9E41Smmvg25UQIenzrN83cRnF1JMzoMi9zZOQeYXHSDf7p+IQkW3Q== + +unist-util-visit-parents@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" + integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + +unist-util-visit@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit-parents "^3.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -16730,9 +16962,9 @@ update-notifier@^5.0.0: xdg-basedir "^4.0.0" uri-js@^4.2.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" - integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" @@ -16812,9 +17044,9 @@ use@^3.1.0: integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== utf-8-validate@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz#3b64e418ad2ff829809025fdfef595eab2f03a27" - integrity sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A== + version "5.0.4" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.4.tgz#72a1735983ddf7a05a43a9c6b67c5ce1c910f9b8" + integrity sha512-MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q== dependencies: node-gyp-build "^4.2.0" @@ -16841,7 +17073,18 @@ util.promisify@1.0.0: define-properties "^1.1.2" object.getownpropertydescriptors "^2.0.3" -util.promisify@^1.0.0, util.promisify@~1.0.0: +util.promisify@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b" + integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + for-each "^0.3.3" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.1" + +util.promisify@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== @@ -16865,6 +17108,18 @@ util@^0.11.0: dependencies: inherits "2.0.3" +util@^0.12.0: + version "0.12.3" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" + integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== + dependencies: + inherits "^2.0.3" + is-arguments "^1.0.4" + is-generator-function "^1.0.7" + is-typed-array "^1.1.3" + safe-buffer "^5.1.2" + which-typed-array "^1.1.2" + utila@~0.4: version "0.4.0" resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" @@ -16939,6 +17194,24 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vfile-message@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^2.0.0" + +vfile@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" + integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + unist-util-stringify-position "^2.0.0" + vfile-message "^2.0.0" + vm-browserify@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" @@ -17004,7 +17277,7 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web-encoding@^1.0.2, web-encoding@^1.0.4: +web-encoding@^1.0.2, web-encoding@^1.0.5, web-encoding@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.6.tgz#ec631356ee523b4474ecbcae680440bd1e79416a" integrity sha512-26wEnRPEFAc5d5lmH1Q/DuvWEYsRF1D2alX2jlKpdmqv7cj+BbANL7Xlcl9r4s72Eg9kItZa9RWVbBMC9dMv4w== @@ -17019,6 +17292,16 @@ web3-bzz@1.3.0: swarm-js "^0.1.40" underscore "1.9.1" +web3-bzz@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.1.tgz#c7e13e5fbbbe4634b0d883e5440069fc58e58044" + integrity sha512-MN726zFpFpwhs3NMC35diJGkwTVUj+8LM/VWqooGX/MOjgYzNrJ7Wr8EzxoaTCy87edYNBprtxBkd0HzzLmung== + dependencies: + "@types/node" "^12.12.6" + got "9.6.0" + swarm-js "^0.1.40" + underscore "1.9.1" + web3-core-helpers@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.0.tgz#697cc3246a7eaaaac64ea506828d861c981c3f31" @@ -17028,6 +17311,15 @@ web3-core-helpers@1.3.0: web3-eth-iban "1.3.0" web3-utils "1.3.0" +web3-core-helpers@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.1.tgz#ffd6f47c1b54a8523f00760a8d713f44d0f97e97" + integrity sha512-tMVU0ScyQUJd/HFWfZrvGf+QmPCodPyKQw1gQ+n9We/H3vPPbUxDjNeYnd4BbYy5O9ox+0XG6i3+JlwiSkgDkA== + dependencies: + underscore "1.9.1" + web3-eth-iban "1.3.1" + web3-utils "1.3.1" + web3-core-method@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.0.tgz#a71387af842aec7dbad5dbbd1130c14cc6c8beb3" @@ -17040,6 +17332,18 @@ web3-core-method@1.3.0: web3-core-subscriptions "1.3.0" web3-utils "1.3.0" +web3-core-method@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.1.tgz#c1d8bf1e2104a8d625c99caf94218ad2dc948c92" + integrity sha512-dA38tNVZWTxBFMlLFunLD5Az1AWRi5HqM+AtQrTIhxWCzg7rJSHuaYOZ6A5MHKGPWpdykLhzlna0SsNv5AVs8w== + dependencies: + "@ethersproject/transactions" "^5.0.0-beta.135" + underscore "1.9.1" + web3-core-helpers "1.3.1" + web3-core-promievent "1.3.1" + web3-core-subscriptions "1.3.1" + web3-utils "1.3.1" + web3-core-promievent@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.0.tgz#e0442dd0a8989b6bdce09293976cee6d9237a484" @@ -17047,6 +17351,13 @@ web3-core-promievent@1.3.0: dependencies: eventemitter3 "4.0.4" +web3-core-promievent@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.1.tgz#b4da4b34cd9681e22fcda25994d7629280a1e046" + integrity sha512-jGu7TkwUqIHlvWd72AlIRpsJqdHBQnHMeMktrows2148gg5PBPgpJ10cPFmCCzKT6lDOVh9B7pZMf9eckMDmiA== + dependencies: + eventemitter3 "4.0.4" + web3-core-requestmanager@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.0.tgz#c5b9a0304504c0e6cce6c90bc1a3bff82732aa1f" @@ -17058,6 +17369,18 @@ web3-core-requestmanager@1.3.0: web3-providers-ipc "1.3.0" web3-providers-ws "1.3.0" +web3-core-requestmanager@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.1.tgz#6dd2b5161ba778dfffe68994a4accff2decc54fe" + integrity sha512-9WTaN2SoyJX1amRyTzX2FtbVXsyWBI2Wef2Q3gPiWaEo/VRVm3e4Bq8MwxNTUMIJMO8RLGHjtdgsoDKPwfL73Q== + dependencies: + underscore "1.9.1" + util "^0.12.0" + web3-core-helpers "1.3.1" + web3-providers-http "1.3.1" + web3-providers-ipc "1.3.1" + web3-providers-ws "1.3.1" + web3-core-subscriptions@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.0.tgz#c2622ccd2b84f4687475398ff966b579dba0847e" @@ -17067,6 +17390,15 @@ web3-core-subscriptions@1.3.0: underscore "1.9.1" web3-core-helpers "1.3.0" +web3-core-subscriptions@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.1.tgz#be1103259f91b7fc7f4c6a867aa34dea70a636f7" + integrity sha512-eX3N5diKmrxshc6ZBZ8EJxxAhCxdYPbYXuF2EfgdIyHmxwmYqIVvKepzO8388Bx8JD3D0Id/pKE0dC/FnDIHTQ== + dependencies: + eventemitter3 "4.0.4" + underscore "1.9.1" + web3-core-helpers "1.3.1" + web3-core@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.0.tgz#b818903738461c1cca0163339e1d6d3fa51242cf" @@ -17080,6 +17412,19 @@ web3-core@1.3.0: web3-core-requestmanager "1.3.0" web3-utils "1.3.0" +web3-core@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.1.tgz#fb0fc5d952a7f3d580a7e6155d2f28be064e64cb" + integrity sha512-QlBwSyjl2pqYUBE7lH9PfLxa8j6AzzAtvLUqkgoaaFJYLP/+XavW1n6dhVCTq+U3L3eNc+bMp9GLjGDJNXMnGg== + dependencies: + "@types/bn.js" "^4.11.5" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-core-requestmanager "1.3.1" + web3-utils "1.3.1" + web3-eth-abi@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.0.tgz#387b7ea9b38be69ad8856bc7b4e9a6a69bb4d22b" @@ -17089,6 +17434,15 @@ web3-eth-abi@1.3.0: underscore "1.9.1" web3-utils "1.3.0" +web3-eth-abi@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.1.tgz#d60fe5f15c7a3a426c553fdaa4199d07f1ad899c" + integrity sha512-ds4aTeKDUEqTXgncAtxvcfMpPiei9ey7+s2ZZ+OazK2CK5jWhFiJuuj9Q68kOT+hID7E1oSDVsNmJWFD/7lbMw== + dependencies: + "@ethersproject/abi" "5.0.7" + underscore "1.9.1" + web3-utils "1.3.1" + web3-eth-accounts@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.0.tgz#010acf389b2bee6d5e1aecb2fe78bfa5c8f26c7a" @@ -17106,6 +17460,23 @@ web3-eth-accounts@1.3.0: web3-core-method "1.3.0" web3-utils "1.3.0" +web3-eth-accounts@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.1.tgz#63b247461f1ae0ae46f9a5d5aa896ea80237143e" + integrity sha512-wsV3/0Pbn5+pI8PiCD1CYw7I1dkQujcP//aJ+ZH8PoaHQoG6HnJ7nTp7foqa0r/X5lizImz/g5S8D76t3Z9tHA== + dependencies: + crypto-browserify "3.12.0" + eth-lib "0.2.8" + ethereumjs-common "^1.3.2" + ethereumjs-tx "^2.1.1" + scrypt-js "^3.0.1" + underscore "1.9.1" + uuid "3.3.2" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-utils "1.3.1" + web3-eth-contract@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.0.tgz#c758340ac800788e29fa29edc8b0c0ac957b741c" @@ -17121,6 +17492,21 @@ web3-eth-contract@1.3.0: web3-eth-abi "1.3.0" web3-utils "1.3.0" +web3-eth-contract@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.1.tgz#05cb77bd2a671c5480897d20de487f3bae82e113" + integrity sha512-cHu9X1iGrK+Zbrj4wYKwHI1BtVGn/9O0JRsZqd9qcFGLwwAmaCJYy0sDn7PKCKDSL3qB+MDILoyI7FaDTWWTHg== + dependencies: + "@types/bn.js" "^4.11.5" + underscore "1.9.1" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-core-promievent "1.3.1" + web3-core-subscriptions "1.3.1" + web3-eth-abi "1.3.1" + web3-utils "1.3.1" + web3-eth-ens@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.0.tgz#0887ba38473c104cf5fb8a715828b3b354fa02a2" @@ -17136,6 +17522,21 @@ web3-eth-ens@1.3.0: web3-eth-contract "1.3.0" web3-utils "1.3.0" +web3-eth-ens@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.1.tgz#ccfd621ddc1fecb44096bc8e60689499a9eb4421" + integrity sha512-MUQvYgUYQ5gAwbZyHwI7y+NTT6j98qG3MVhGCUf58inF5Gxmn9OlLJRw8Tofgf0K87Tk9Kqw1/2QxUE4PEZMMA== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + underscore "1.9.1" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-promievent "1.3.1" + web3-eth-abi "1.3.1" + web3-eth-contract "1.3.1" + web3-utils "1.3.1" + web3-eth-iban@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.0.tgz#15b782dfaf273ebc4e3f389f1367f4e88ddce4a5" @@ -17144,6 +17545,14 @@ web3-eth-iban@1.3.0: bn.js "^4.11.9" web3-utils "1.3.0" +web3-eth-iban@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.1.tgz#4351e1a658efa5f3218357f0a38d6d8cad82481e" + integrity sha512-RCQLfR9Z+DNfpw7oUauYHg1HcVoEljzhwxKn3vi15gK0ssWnTwRGqUiIyVTeSb836G6oakOd5zh7XYqy7pn+nw== + dependencies: + bn.js "^4.11.9" + web3-utils "1.3.1" + web3-eth-personal@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.0.tgz#d376e03dc737d961ff1f8d1aca866efad8477135" @@ -17156,6 +17565,18 @@ web3-eth-personal@1.3.0: web3-net "1.3.0" web3-utils "1.3.0" +web3-eth-personal@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.1.tgz#cfe8af01588870d195dabf0a8d9e34956fb8856d" + integrity sha512-/vZEQpXJfBfYoy9KT911ItfoscEfF0Q2j8tsXzC2xmmasSZ6YvAUuPhflVmAo0IHQSX9rmxq0q1p3sbnE3x2pQ== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-net "1.3.1" + web3-utils "1.3.1" + web3-eth@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.0.tgz#898e5f5a8827f9bc6844e267a52eb388916a6771" @@ -17175,6 +17596,25 @@ web3-eth@1.3.0: web3-net "1.3.0" web3-utils "1.3.0" +web3-eth@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.1.tgz#60ac4b58e5fd17b8dbbb8378abd63b02e8326727" + integrity sha512-e4iL8ovj0zNxzbv4LTHEv9VS03FxKlAZD+95MolwAqtVoUnKC2H9X6dli0w6eyXP0aKw+mwY0g0CWQHzqZvtXw== + dependencies: + underscore "1.9.1" + web3-core "1.3.1" + web3-core-helpers "1.3.1" + web3-core-method "1.3.1" + web3-core-subscriptions "1.3.1" + web3-eth-abi "1.3.1" + web3-eth-accounts "1.3.1" + web3-eth-contract "1.3.1" + web3-eth-ens "1.3.1" + web3-eth-iban "1.3.1" + web3-eth-personal "1.3.1" + web3-net "1.3.1" + web3-utils "1.3.1" + web3-net@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.0.tgz#b69068cccffab58911c2f08ca4abfbefb0f948c6" @@ -17184,6 +17624,15 @@ web3-net@1.3.0: web3-core-method "1.3.0" web3-utils "1.3.0" +web3-net@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.1.tgz#79374b1df37429b0839b83b0abc4440ac6181568" + integrity sha512-vuMMWMk+NWHlrNfszGp3qRjH/64eFLiNIwUi0kO8JXQ896SP3Ma0su5sBfSPxNCig047E9GQimrL9wvYAJSO5A== + dependencies: + web3-core "1.3.1" + web3-core-method "1.3.1" + web3-utils "1.3.1" + web3-providers-http@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.0.tgz#88227f64c88b32abed4359383c2663616e0dc531" @@ -17192,6 +17641,14 @@ web3-providers-http@1.3.0: web3-core-helpers "1.3.0" xhr2-cookies "1.1.0" +web3-providers-http@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.1.tgz#becbea61706b2fa52e15aca6fe519ee108a8fab9" + integrity sha512-DOujG6Ts7/hAMj0PW5p9/1vwxAIr+1CJ6ZWHshtfOq1v1KnMphVTGOrjcTTUvPT33/DA/so2pgGoPMrgaEIIvQ== + dependencies: + web3-core-helpers "1.3.1" + xhr2-cookies "1.1.0" + web3-providers-ipc@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.0.tgz#d7c2b203733b46f7b4e7b15633d891648cf9a293" @@ -17201,6 +17658,15 @@ web3-providers-ipc@1.3.0: underscore "1.9.1" web3-core-helpers "1.3.0" +web3-providers-ipc@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.1.tgz#3cb2572fc5286ab2f3117e0a2dce917816c3dedb" + integrity sha512-BNPscLbvwo+u/tYJrLvPnl/g/SQVSnqP/TjEsB033n4IXqTC4iZ9Of8EDmI0U6ds/9nwNqOBx3KsxbinL46UZA== + dependencies: + oboe "2.1.5" + underscore "1.9.1" + web3-core-helpers "1.3.1" + web3-providers-ws@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.0.tgz#84adeff65acd4624d7f5bb43c5b2b22d8f0f63a4" @@ -17211,6 +17677,16 @@ web3-providers-ws@1.3.0: web3-core-helpers "1.3.0" websocket "^1.0.32" +web3-providers-ws@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.1.tgz#a70140811d138a1a5cf3f0c39d11887c8e341c83" + integrity sha512-DAbVbiizv0Hr/bLKjyyKMHc/66ccVkudan3eRsf+R/PXWCqfXb7q6Lwodj4llvC047pEuLKR521ZKr5wbfk1KQ== + dependencies: + eventemitter3 "4.0.4" + underscore "1.9.1" + web3-core-helpers "1.3.1" + websocket "^1.0.32" + web3-shh@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.0.tgz#62d15297da8fb5f733dd1b98f9ade300590f4d49" @@ -17221,6 +17697,16 @@ web3-shh@1.3.0: web3-core-subscriptions "1.3.0" web3-net "1.3.0" +web3-shh@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.1.tgz#42294d684358c22aa48616cb9a3eb2e9c1e6362f" + integrity sha512-57FTQvOW1Zm3wqfZpIEqL4apEQIR5JAxjqA4RM4eL0jbdr+Zj5Y4J93xisaEVl6/jMtZNlsqYKTVswx8mHu1xw== + dependencies: + web3-core "1.3.1" + web3-core-method "1.3.1" + web3-core-subscriptions "1.3.1" + web3-net "1.3.1" + web3-utils@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.0.tgz#5bac16e5e0ec9fe7bdcfadb621655e8aa3cf14e1" @@ -17235,7 +17721,21 @@ web3-utils@1.3.0: underscore "1.9.1" utf8 "3.0.0" -web3@1.3.0, web3@~1.3.0: +web3-utils@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.1.tgz#9aa880dd8c9463fe5c099107889f86a085370c2e" + integrity sha512-9gPwFm8SXtIJuzdrZ37PRlalu40fufXxo+H2PiCwaO6RpKGAvlUlWU0qQbyToFNXg7W2H8djEgoAVac8NLMCKQ== + dependencies: + bn.js "^4.11.9" + eth-lib "0.2.8" + ethereum-bloom-filters "^1.0.6" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + underscore "1.9.1" + utf8 "3.0.0" + +web3@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.0.tgz#8fe4cd6e2a21c91904f343ba75717ee4c76bb349" integrity sha512-4q9dna0RecnrlgD/bD1C5S+81Untbd6Z/TBD7rb+D5Bvvc0Wxjr4OP70x+LlnwuRDjDtzBwJbNUblh2grlVArw== @@ -17248,6 +17748,19 @@ web3@1.3.0, web3@~1.3.0: web3-shh "1.3.0" web3-utils "1.3.0" +web3@~1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.1.tgz#f780138c92ae3c42ea45e1a3c6ae8844e0aa5054" + integrity sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog== + dependencies: + web3-bzz "1.3.1" + web3-core "1.3.1" + web3-eth "1.3.1" + web3-eth-personal "1.3.1" + web3-net "1.3.1" + web3-shh "1.3.1" + web3-utils "1.3.1" + webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" @@ -17431,6 +17944,19 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-typed-array@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff" + integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA== + dependencies: + available-typed-arrays "^1.0.2" + call-bind "^1.0.0" + es-abstract "^1.18.0-next.1" + foreach "^2.0.5" + function-bind "^1.1.1" + has-symbols "^1.0.1" + is-typed-array "^1.1.3" + which@2.0.2, which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -17709,17 +18235,10 @@ ws@^6.1.2, ws@^6.2.1: dependencies: async-limiter "~1.0.0" -ws@^7.1.2, ws@^7.3.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" - integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ== - -ws@~6.1.0: - version "6.1.4" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9" - integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA== - dependencies: - async-limiter "~1.0.0" +ws@^7.3.1, ws@~7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" + integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== xdg-basedir@^4.0.0: version "4.0.0" @@ -17795,7 +18314,7 @@ xsalsa20@^1.0.2: resolved "https://registry.yarnpkg.com/xsalsa20/-/xsalsa20-1.1.0.tgz#bee27174af1913aaec0fe677d8ba161ec12bf87d" integrity sha512-zd3ytX2cm+tcSndRU+krm0eL4TMMpZE7evs5hLRAoOy6gviqLfe3qOlkjF3i5SeAkQUCeJk0lJZrEU56kHRfWw== -xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -17925,7 +18444,7 @@ yargs@^15.0.2: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.0.3, yargs@^16.1.1: +yargs@^16.0.3, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From dee15bdd494fd3f6c724472e1e30a1cbf0e1d71f Mon Sep 17 00:00:00 2001 From: Apostolof Date: Fri, 15 Jan 2021 17:49:43 +0200 Subject: [PATCH 26/37] refactor: the night sky shall be concordia colored from now on --- packages/concordia-app/src/layouts/RegisterLayout/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/concordia-app/src/layouts/RegisterLayout/styles.css b/packages/concordia-app/src/layouts/RegisterLayout/styles.css index 461d072..41ee966 100644 --- a/packages/concordia-app/src/layouts/RegisterLayout/styles.css +++ b/packages/concordia-app/src/layouts/RegisterLayout/styles.css @@ -4,5 +4,5 @@ bottom: 0; left: 0; z-index: -1; - background: rgba(0, 0, 0, 0) linear-gradient(45deg, rgb(45, 54, 76) 0%, rgb(37, 45, 63) 100%) repeat scroll 0 0; + background: rgba(0, 0, 0, 0) linear-gradient(45deg, rgb(37, 45, 63) 0%, rgb(11,37,64) 100%) repeat scroll 0 0; } From 2511f1da7a29c7973d4bc6ae65687bd92fecdaa4 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Fri, 15 Jan 2021 17:55:49 +0200 Subject: [PATCH 27/37] fix: change css class name to prevent unwanted side-effects --- packages/concordia-app/src/views/Register/index.jsx | 2 +- packages/concordia-app/src/views/Register/styles.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/concordia-app/src/views/Register/index.jsx b/packages/concordia-app/src/views/Register/index.jsx index d2dac4a..e404fff 100644 --- a/packages/concordia-app/src/views/Register/index.jsx +++ b/packages/concordia-app/src/views/Register/index.jsx @@ -46,7 +46,7 @@ const Register = () => { }, [currentStep, pushNextStep]); return ( -
+
{ diff --git a/packages/concordia-app/src/views/Register/styles.css b/packages/concordia-app/src/views/Register/styles.css index 4732c4a..1079b2e 100644 --- a/packages/concordia-app/src/views/Register/styles.css +++ b/packages/concordia-app/src/views/Register/styles.css @@ -1,4 +1,4 @@ -.centered { +.register-centered { position: fixed; top: 50%; left: 50%; From c38f239a6c26b87912f22ac0fb93e2f98c78bbf9 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Fri, 15 Jan 2021 17:59:36 +0200 Subject: [PATCH 28/37] refactor: remove duplicate contract export, minor particles improvement --- packages/concordia-app/src/assets/particles.js | 2 +- .../concordia-app/src/constants/contracts/ContractNames.js | 2 ++ packages/concordia-app/src/redux/sagas/orbitSaga.js | 7 +++++-- packages/concordia-contracts/index.js | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/concordia-app/src/assets/particles.js b/packages/concordia-app/src/assets/particles.js index 1862f6f..d4ce239 100644 --- a/packages/concordia-app/src/assets/particles.js +++ b/packages/concordia-app/src/assets/particles.js @@ -21,7 +21,7 @@ const particlesOptions = { opacity: { anim: { enable: true, - speed: 1.3, + speed: 0.6, opacity_min: 0.05, }, }, diff --git a/packages/concordia-app/src/constants/contracts/ContractNames.js b/packages/concordia-app/src/constants/contracts/ContractNames.js index 95fe6f7..8ddebb5 100644 --- a/packages/concordia-app/src/constants/contracts/ContractNames.js +++ b/packages/concordia-app/src/constants/contracts/ContractNames.js @@ -1 +1,3 @@ export const FORUM_CONTRACT = 'Forum'; +export const POST_VOTING_CONTRACT = 'PostVoting'; +export const VOTING_CONTRACT = 'Voting'; diff --git a/packages/concordia-app/src/redux/sagas/orbitSaga.js b/packages/concordia-app/src/redux/sagas/orbitSaga.js index 749f498..385295b 100644 --- a/packages/concordia-app/src/redux/sagas/orbitSaga.js +++ b/packages/concordia-app/src/redux/sagas/orbitSaga.js @@ -5,8 +5,9 @@ import { import { breezeActions } from '@ezerous/breeze'; import { drizzleActions } from '@ezerous/drizzle'; -import { forumContract } from 'concordia-contracts'; +import { contracts } from 'concordia-contracts'; import { EthereumContractIdentityProvider } from '@ezerous/eth-identity-provider'; +import { FORUM_CONTRACT } from '../../constants/contracts/ContractNames'; function* initOrbitDatabases(action) { const { account, breeze } = action; @@ -23,7 +24,9 @@ function* orbitSaga() { const { drizzle: { web3 } } = res[0]; const networkId = yield call([web3.eth.net, web3.eth.net.getId]); - const contractAddress = forumContract.networks[networkId].address; + const contractAddress = contracts + .find((contract) => contract.contractName === FORUM_CONTRACT) + .networks[networkId].address; EthereumContractIdentityProvider.setContractAddress(contractAddress); EthereumContractIdentityProvider.setWeb3(web3); diff --git a/packages/concordia-contracts/index.js b/packages/concordia-contracts/index.js index bc231ce..b877f71 100644 --- a/packages/concordia-contracts/index.js +++ b/packages/concordia-contracts/index.js @@ -12,5 +12,4 @@ try { module.exports = { contracts: [Forum, Voting, PostVoting], - forumContract: Forum, }; From 252cfaefc09357025dd1e5c47beae1f051a44b88 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Mon, 18 Jan 2021 12:14:21 +0200 Subject: [PATCH 29/37] Web3 patch for broken subscriptions --- packages/concordia-app/package.json | 2 +- .../web3-core-requestmanager+1.3.1.patch | 37 ++ ...3-eth+1.3.0.patch => web3-eth+1.3.1.patch} | 0 yarn.lock | 511 ++++++------------ 4 files changed, 192 insertions(+), 358 deletions(-) create mode 100644 packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch rename packages/concordia-app/patches/{web3-eth+1.3.0.patch => web3-eth+1.3.1.patch} (100%) diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index ef95c96..85da848 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -48,7 +48,7 @@ "redux-saga": "~1.1.3", "semantic-ui-css": "~2.4.1", "semantic-ui-react": "~1.2.1", - "web3": "1.3.0" + "web3": "1.3.1" }, "devDependencies": { "cross-env": "^7.0.3", diff --git a/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch b/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch new file mode 100644 index 0000000..4891f47 --- /dev/null +++ b/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch @@ -0,0 +1,37 @@ +diff --git a/node_modules/web3-core-requestmanager/lib/index.js b/node_modules/web3-core-requestmanager/lib/index.js +index 32caf52..b51b734 100644 +--- a/node_modules/web3-core-requestmanager/lib/index.js ++++ b/node_modules/web3-core-requestmanager/lib/index.js +@@ -82,13 +82,25 @@ RequestManager.prototype.setProvider = function (provider, net) { + this.provider = provider || null; + // listen to incoming notifications + if (this.provider && this.provider.on) { +- this.provider.on('data', function data(result, deprecatedResult) { +- result = result || deprecatedResult; // this is for possible old providers, which may had the error first handler +- // if result is a subscription, call callback for that subscription +- if (result.method && result.params && result.params.subscription && _this.subscriptions.has(result.params.subscription)) { +- _this.subscriptions.get(result.params.subscription).callback(null, result.params.result); +- } +- }); ++ if (typeof provider.request === 'function') { // EIP-1193 provider ++ this.provider.on('message', function (payload) { ++ if (payload && payload.type === 'eth_subscription' && payload.data) { ++ const data = payload.data ++ if (data.subscription && _this.subscriptions.has(data.subscription)) { ++ _this.subscriptions.get(data.subscription).callback(null, data.result); ++ } ++ } ++ }) ++ } else { // legacy provider subscription event ++ this.provider.on('data', function data(result, deprecatedResult) { ++ result = result || deprecatedResult; // this is for possible old providers, which may had the error first handler ++ ++ // if result is a subscription, call callback for that subscription ++ if (result.method && result.params && result.params.subscription && _this.subscriptions.has(result.params.subscription)) { ++ _this.subscriptions.get(result.params.subscription).callback(null, result.params.result); ++ } ++ }); ++ } + // resubscribe if the provider has reconnected + this.provider.on('connect', function connect() { + _this.subscriptions.forEach(function (subscription) { diff --git a/packages/concordia-app/patches/web3-eth+1.3.0.patch b/packages/concordia-app/patches/web3-eth+1.3.1.patch similarity index 100% rename from packages/concordia-app/patches/web3-eth+1.3.0.patch rename to packages/concordia-app/patches/web3-eth+1.3.1.patch diff --git a/yarn.lock b/yarn.lock index dbf567e..8d0147c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1142,21 +1142,6 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18" integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== -"@ethersproject/abi@5.0.0-beta.153": - version "5.0.0-beta.153" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.0-beta.153.tgz#43a37172b33794e4562999f6e2d555b7599a8eee" - integrity sha512-aXweZ1Z7vMNzJdLpR1CZUAIgnwjrZeUSvN9syCwlBaEBUFJmFY+HHnfuTI5vIhVs/mRkfJVrbEyl51JZQqyjAg== - dependencies: - "@ethersproject/address" ">=5.0.0-beta.128" - "@ethersproject/bignumber" ">=5.0.0-beta.130" - "@ethersproject/bytes" ">=5.0.0-beta.129" - "@ethersproject/constants" ">=5.0.0-beta.128" - "@ethersproject/hash" ">=5.0.0-beta.128" - "@ethersproject/keccak256" ">=5.0.0-beta.127" - "@ethersproject/logger" ">=5.0.0-beta.129" - "@ethersproject/properties" ">=5.0.0-beta.131" - "@ethersproject/strings" ">=5.0.0-beta.130" - "@ethersproject/abi@5.0.10", "@ethersproject/abi@^5.0.10": version "5.0.10" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.10.tgz#c32baa919ad0e5cddabb2f3a8aed0eaeeed7fa4a" @@ -1211,7 +1196,7 @@ "@ethersproject/logger" "^5.0.8" "@ethersproject/properties" "^5.0.7" -"@ethersproject/address@5.0.9", "@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.9": +"@ethersproject/address@5.0.9", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.9": version "5.0.9" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.9.tgz#347ef30dc8243c682574a3f23ff63f73c8f8cbf1" integrity sha512-gKkmbZDMyGbVjr8nA5P0md1GgESqSGH7ILIrDidPdNXBl4adqbuA3OAuZx/O2oGpL6PtJ9BDa0kHheZ1ToHU3w== @@ -1237,7 +1222,7 @@ "@ethersproject/bytes" "^5.0.9" "@ethersproject/properties" "^5.0.7" -"@ethersproject/bignumber@5.0.13", "@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.13", "@ethersproject/bignumber@^5.0.7": +"@ethersproject/bignumber@5.0.13", "@ethersproject/bignumber@^5.0.13", "@ethersproject/bignumber@^5.0.7": version "5.0.13" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.13.tgz#a5466412b3b80104097b9c694f6ae827df4353fe" integrity sha512-b89bX5li6aK492yuPP5mPgRVgIxxBP7ksaBtKX5QQBsrZTpNOjf/MR4CjcUrAw8g+RQuD6kap9lPjFgY4U1/5A== @@ -1246,14 +1231,14 @@ "@ethersproject/logger" "^5.0.8" bn.js "^4.4.0" -"@ethersproject/bytes@5.0.9", "@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.0.9": +"@ethersproject/bytes@5.0.9", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.0.9": version "5.0.9" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.9.tgz#2748247402ad20df69f3a3e935dc7b58c0d75c08" integrity sha512-k+17ZViDtAugC0s7HM6rdsTWEdIYII4RPCDkPEuxKc6i40Bs+m6tjRAtCECX06wKZnrEoR9pjOJRXHJ/VLoOcA== dependencies: "@ethersproject/logger" "^5.0.8" -"@ethersproject/constants@5.0.8", "@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.0.8": +"@ethersproject/constants@5.0.8", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.0.8": version "5.0.8" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.8.tgz#50f2e23f48c0d1d0de3759ea79b68ec3e06435a1" integrity sha512-sCc73pFBsl59eDfoQR5OCEZCRv5b0iywadunti6MQIr5lt3XpwxK1Iuzd8XSFO02N9jUifvuZRrt0cY0+NBgTg== @@ -1275,7 +1260,7 @@ "@ethersproject/logger" "^5.0.8" "@ethersproject/properties" "^5.0.7" -"@ethersproject/hash@5.0.10", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.10", "@ethersproject/hash@^5.0.4": +"@ethersproject/hash@5.0.10", "@ethersproject/hash@^5.0.10", "@ethersproject/hash@^5.0.4": version "5.0.10" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.10.tgz#41bf37428e8ddbc229ffd81c47af667174cb491a" integrity sha512-Tf0bvs6YFhw28LuHnhlDWyr0xfcDxSXdwM4TcskeBbmXVSKLv3bJQEEEBFUcRX0fJuslR3gCVySEaSh7vuMx5w== @@ -1326,7 +1311,7 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/keccak256@5.0.7", "@ethersproject/keccak256@>=5.0.0-beta.127", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.0.7": +"@ethersproject/keccak256@5.0.7", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.0.7": version "5.0.7" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.7.tgz#2eedb5e4c160fcdf0079660f8ae362d7855ea943" integrity sha512-zpUBmofWvx9PGfc7IICobgFQSgNmTOGTGLUxSYqZzY/T+b4y/2o5eqf/GGmD7qnTGzKQ42YlLNo+LeDP2qe55g== @@ -1334,7 +1319,7 @@ "@ethersproject/bytes" "^5.0.9" js-sha3 "0.5.7" -"@ethersproject/logger@5.0.8", "@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.0.8": +"@ethersproject/logger@5.0.8", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.0.8": version "5.0.8" resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.8.tgz#135c1903d35c878265f3cbf2b287042c4c20d5d4" integrity sha512-SkJCTaVTnaZ3/ieLF5pVftxGEFX56pTH+f2Slrpv7cU0TNpUZNib84QQdukd++sWUp/S7j5t5NW+WegbXd4U/A== @@ -1354,7 +1339,7 @@ "@ethersproject/bytes" "^5.0.9" "@ethersproject/sha2" "^5.0.7" -"@ethersproject/properties@5.0.7", "@ethersproject/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.7": +"@ethersproject/properties@5.0.7", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.7": version "5.0.7" resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.7.tgz#951d11ba592ff90bbe8ec34c5a03a5157e3b3360" integrity sha512-812H1Rus2vjw0zbasfDI1GLNPDsoyX1pYqiCgaR1BuyKxUTbwcH1B+214l6VGe1v+F6iEVb7WjIwMjKhb4EUsg== @@ -1432,7 +1417,7 @@ "@ethersproject/sha2" "^5.0.7" "@ethersproject/strings" "^5.0.8" -"@ethersproject/strings@5.0.8", "@ethersproject/strings@>=5.0.0-beta.130", "@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.0.8": +"@ethersproject/strings@5.0.8", "@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.0.8": version "5.0.8" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.8.tgz#11a1b0ed1e8417408693789839f0b5f4e323c0c9" integrity sha512-5IsdXf8tMY8QuHl8vTLnk9ehXDDm6x9FB9S9Og5IA1GYhLe5ZewydXSjlJlsqU2t9HRbfv97OJZV/pX8DVA/Hw== @@ -1540,16 +1525,16 @@ orbit-db-identity-provider "~0.3.1" "@fluentui/react-component-event-listener@~0.51.0": - version "0.51.5" - resolved "https://registry.yarnpkg.com/@fluentui/react-component-event-listener/-/react-component-event-listener-0.51.5.tgz#cc744ef1a048604925c2a3cd4636638f3b65136c" - integrity sha512-GdKyWJJ/JE4YpE2XCl3ZcwM3fnsfat64M3KD5nrPJCp7CL8n7GR0RbacQqZZa8pd1A9Zp7mBhFm/kQxw52D+hA== + version "0.51.6" + resolved "https://registry.yarnpkg.com/@fluentui/react-component-event-listener/-/react-component-event-listener-0.51.6.tgz#8e193b8bb20570aed09581080f110f5a95b51432" + integrity sha512-XbT3p28N6Bz6TsQSf4drCqJNL133DUYCSvyiWsDl7Y5IWzAMKwGcc4nETxqjP07XvInD9fJW9vOqWFlpLBe1xg== dependencies: "@babel/runtime" "^7.10.4" "@fluentui/react-component-ref@~0.51.0": - version "0.51.5" - resolved "https://registry.yarnpkg.com/@fluentui/react-component-ref/-/react-component-ref-0.51.5.tgz#a6066223bb3e55439807ce541f28abb14b8850b8" - integrity sha512-EwlQm7ohwdcX8uYYMic+1WSd1FJUByDID4LpUkb+fwoz1qCNEeMsAk8yjqvidOYUddC2LJfG35iEvZ2/Ae41Hg== + version "0.51.6" + resolved "https://registry.yarnpkg.com/@fluentui/react-component-ref/-/react-component-ref-0.51.6.tgz#ba1fc8a82a49f4775a043079ca8a234f3c02a1c4" + integrity sha512-FrUJKizIdL2PlUji5zMB3cTNICv/zk4/nbX6W9F+FmaEAozEm62MRZWOSAX83bnzPQX0OtPBYTenh+5dAI+BMA== dependencies: "@babel/runtime" "^7.10.4" react-is "^16.6.3" @@ -2395,9 +2380,9 @@ "@types/istanbul-lib-report" "*" "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" - integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + version "7.0.7" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" + integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== "@types/json5@^0.0.29": version "0.0.29" @@ -2422,9 +2407,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.14.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz#d934aacc22424fe9622ebf6857370c052eae464e" - integrity sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A== + version "14.14.22" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18" + integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== "@types/node@^12.12.6": version "12.19.14" @@ -3805,7 +3790,7 @@ browserslist@4.10.0: node-releases "^1.1.52" pkg-up "^3.1.0" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: version "4.16.1" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== @@ -3999,7 +3984,7 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -call-bind@^1.0.0: +call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -4065,9 +4050,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173: - version "1.0.30001177" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001177.tgz#2c3b384933aafda03e29ccca7bb3d8c3389e1ece" - integrity sha512-6Ld7t3ifCL02jTj3MxPMM5wAYjbo4h/TAQGFTgv1inihP1tWnWp8mxxT4ut4JBEHLbpFXEXJJQ119JCJTBkYDw== + version "1.0.30001178" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz#3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc" + integrity sha512-VtdZLC0vsXykKni8Uztx45xynytOi71Ufx9T8kHptSw9AL4dpqailUJJHavttuzUe1KYuBYtChiWv+BAb7mPmQ== capture-exit@^2.0.0: version "2.0.0" @@ -4674,17 +4659,17 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-js-compat@^3.6.2, core-js-compat@^3.8.0: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.2.tgz#3717f51f6c3d2ebba8cbf27619b57160029d1d4c" - integrity sha512-LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ== + version "3.8.3" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f" + integrity sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog== dependencies: - browserslist "^4.16.0" + browserslist "^4.16.1" semver "7.0.0" core-js-pure@^3.0.0: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.2.tgz#286f885c0dac1cdcd6d78397392abc25ddeca225" - integrity sha512-v6zfIQqL/pzTVAbZvYUozsxNfxcFb6Ks3ZfEbuneJl3FW9Jb8F6vLWB6f+qTmAu72msUdyb84V8d/yBFf7FNnw== + version "3.8.3" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.3.tgz#10e9e3b2592ecaede4283e8f3ad7020811587c02" + integrity sha512-V5qQZVAr9K0xu7jXg1M7qTEwuxUgqr7dUOezGaNa7i+Xn9oXAU/d1fzqD9ObuwpVQOaorO5s70ckyi1woP9lVA== core-js@^2.4.0: version "2.6.12" @@ -4692,9 +4677,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.5.0: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044" - integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A== + version "3.8.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" + integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -5395,9 +5380,9 @@ dns-equal@^1.0.0: integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-over-http-resolver@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/dns-over-http-resolver/-/dns-over-http-resolver-1.2.0.tgz#1f9c808c88810b9ffe5c4a6ece449764e9658002" - integrity sha512-LJ1sEbQgwY+qmL6z3kNIKi0vHA9nSUdZb8vf3G6z43ZVIF6WhhNHXztLMOOvaMIvtCsCZBjAie11MtUD3+H0YA== + version "1.2.1" + resolved "https://registry.yarnpkg.com/dns-over-http-resolver/-/dns-over-http-resolver-1.2.1.tgz#52367113aa6d62dffa9dc45f7bde798aa860e703" + integrity sha512-bYGLGLraOc1tllkC0Xaw+zBiQBnPyooNDpaXNYZprLn0bI6zLmX73QfR+jODz6rZ9oAUn1pw5OWxlEsSoho5TQ== dependencies: debug "^4.2.0" native-fetch "^2.0.1" @@ -5619,9 +5604,9 @@ electron-fetch@^1.7.2: encoding "^0.1.13" electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.634: - version "1.3.640" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.640.tgz#94e68c0ae79181a1d6fd1ed9a42b9790d51a1bca" - integrity sha512-cU6wQdXYzuSPzLdszsa4whStYfmU7CVNnG6c5z6/z9YlCOQ2Xh/uKB1gTxlIRr0ubgSg1/dZuSbUAoeESeQ3sQ== + version "1.3.642" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz#8b884f50296c2ae2a9997f024d0e3e57facc2b94" + integrity sha512-cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ== elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: version "6.5.3" @@ -5786,22 +5771,24 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: string.prototype.trimstart "^1.0.1" es-abstract@^1.18.0-next.1: - version "1.18.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" - integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== + version "1.18.0-next.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2" + integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw== dependencies: + call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + get-intrinsic "^1.0.2" has "^1.0.3" has-symbols "^1.0.1" is-callable "^1.2.2" - is-negative-zero "^2.0.0" + is-negative-zero "^2.0.1" is-regex "^1.1.1" - object-inspect "^1.8.0" + object-inspect "^1.9.0" object-keys "^1.1.1" - object.assign "^4.1.1" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.3" + string.prototype.trimstart "^1.0.3" es-array-method-boxes-properly@^1.0.0: version "1.0.0" @@ -7003,14 +6990,14 @@ fs-extra@^8.1.0: universalify "^0.1.0" fs-extra@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" - integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" jsonfile "^6.0.1" - universalify "^1.0.0" + universalify "^2.0.0" fs-minipass@^1.2.5: version "1.2.7" @@ -7791,9 +7778,9 @@ i18next-browser-languagedetector@^6.0.1: "@babel/runtime" "^7.5.5" i18next-http-backend@^1.0.21: - version "1.0.21" - resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.0.21.tgz#cee901b3527dad5165fa91de973b6aa6404c1c37" - integrity sha512-UDeHoV2B+31Gr++0KFAVjM5l+SEwePpF6sfDyaDq5ennM9QNJ78PBEMPStwkreEm4h5C8sT7M1JdNQrLcU1Wdg== + version "1.0.22" + resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.0.22.tgz#30b639d08aac443eb58706bee48573198806b25b" + integrity sha512-rJXovQirK4kLYD8zF4pRi1CwVGtL2WrHXndU89Ds20CimAc7InYjBHmcJFurWPZlz/zgThRNbMuSDP0GYOISMA== dependencies: node-fetch "2.6.1" @@ -8057,6 +8044,18 @@ interface-datastore@^2.0.0: it-drain "^1.0.1" nanoid "^3.0.2" +interface-datastore@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/interface-datastore/-/interface-datastore-3.0.1.tgz#366c494c4ea8f7c0265c6fde4d3d647933a98327" + integrity sha512-c7A7Lpp2slZzqk2cDtZB9/22O/+5dM1sAPHmLGDG6chCatmixL0Pz9HRyob24+nkiZNRGql2j3MwycGHdH4sPA== + dependencies: + err-code "^2.0.1" + ipfs-utils "^6.0.0" + iso-random-stream "^1.1.1" + it-all "^1.0.2" + it-drain "^1.0.1" + nanoid "^3.0.2" + internal-ip@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" @@ -8377,9 +8376,9 @@ ipfs-http-client@^47.0.1: uint8arrays "^1.1.0" ipfs-http-client@^48.1.3: - version "48.2.0" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.2.0.tgz#36bdde46cc41e4fa1f55fa216084b4b7c9ba745f" - integrity sha512-7t8Ju5LGUNP9AdSs3WzeKkcqKXhwPamQJO+YGLMplYXzlk3+L13nM5O/fi37kRBpWkGYAdNAMv4dNslQhzI1Mw== + version "48.2.1" + resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.2.1.tgz#9b0a098d673d8729071dd620c5050b234dfe903a" + integrity sha512-fK8bF0C+wX7POczu3fcrO0B3aaS35L8HxOUCi1V2yBPZ8+xeuGxV4YS6N8RgFev5Mxd7mklxEljy2RCigZRP6Q== dependencies: any-signal "^2.0.0" bignumber.js "^9.0.0" @@ -8686,6 +8685,29 @@ ipfs-utils@^5.0.0: node-fetch "^2.6.0" stream-to-it "^0.2.0" +ipfs-utils@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-6.0.0.tgz#196469a13b13fd1cbdbc35afb4d7177ed1cac1de" + integrity sha512-i47dVKS2rYFIQgWNBV+fMqBUNoDwUuvQz9YIQ1GtYgX6kmffTJx+d4lSn7R/WlVVxq83+zAIFGdh3W/9Y27VeQ== + 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 "0.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.52.0: version "0.52.3" resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.52.3.tgz#4a1e1651da197fb8dfdcd01abd20308198059b66" @@ -8764,14 +8786,14 @@ ipld@^0.28.0: typical "^6.0.0" ipns@^0.8.0: - version "0.8.1" - resolved "https://registry.yarnpkg.com/ipns/-/ipns-0.8.1.tgz#428e19105484a948ee33d27eba5c191210a4682e" - integrity sha512-1xyvOhf/oqE9ECVjfZiqAURO3jXdm/jRyluX6lhAPCBImoE5KLTcoJubUkHey+Z8LXJRW+mIxAUMm1FcAyGwTA== + version "0.8.2" + resolved "https://registry.yarnpkg.com/ipns/-/ipns-0.8.2.tgz#4ac45cb08fc24ad587fb757bd88e979c01798a52" + integrity sha512-TzWz5tUhMT/XJT/FnvU/TzVTqZln5aF9uBKP63ymdPY1tXU/ToF40SP7nr42VEfnf236gOEE8aR6CHOf4TG95g== dependencies: debug "^4.2.0" err-code "^2.0.3" - interface-datastore "^2.0.0" - libp2p-crypto "^0.18.0" + interface-datastore "^3.0.1" + libp2p-crypto "^0.19.0" multibase "^3.0.1" multihashes "^3.0.1" peer-id "^0.14.2" @@ -9071,7 +9093,7 @@ is-map@^2.0.1: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== -is-negative-zero@^2.0.0: +is-negative-zero@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== @@ -10626,6 +10648,25 @@ libp2p-crypto@^0.18.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" + integrity sha512-w4tduG32px1i6TwekYZBSvizZTvDdMReZkE4DhUkf9IQ8WSqSo98K+6IZaYYM6PzWd5arbcAQQcFCRalJu9Ytw== + 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.10.0" + pem-jwk "^2.0.0" + protons "^2.0.0" + secp256k1 "^4.0.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" @@ -11423,7 +11464,7 @@ merge-options@^2.0.0: dependencies: is-plain-obj "^2.0.0" -merge-options@^3.0.3: +merge-options@^3.0.3, merge-options@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== @@ -11503,9 +11544,9 @@ mime@1.6.0: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4: - version "2.4.7" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" - integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== + version "2.5.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" + integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== mimic-fn@^1.0.0: version "1.2.0" @@ -11957,7 +11998,7 @@ nanoid@^2.1.0: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== -nanoid@^3.0.2, nanoid@^3.1.12, nanoid@^3.1.3: +nanoid@^3.0.2, nanoid@^3.1.12, nanoid@^3.1.20, nanoid@^3.1.3: version "3.1.20" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== @@ -11996,7 +12037,7 @@ native-abort-controller@0.0.3, native-abort-controller@~0.0.3: dependencies: globalthis "^1.0.1" -native-fetch@^2.0.0, native-fetch@^2.0.1: +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" integrity sha512-gv4Bea+ga9QdXINurpkEqun3ap3vnB+WYoe4c8ddqUYEH7B2h6iD39RF8uVN7OwmSfMY3RDxkvBnoI4e2/vLXQ== @@ -12066,7 +12107,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.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== @@ -12158,9 +12199,9 @@ node-pre-gyp@^0.13.0: tar "^4" node-releases@^1.1.52, node-releases@^1.1.69: - version "1.1.69" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.69.tgz#3149dbde53b781610cd8b486d62d86e26c3725f6" - integrity sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA== + version "1.1.70" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08" + integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw== nodeify@^1.0.1: version "1.0.1" @@ -13030,9 +13071,9 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" - integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" @@ -13279,14 +13320,14 @@ pino-pretty@^4.0.0: strip-json-comments "^3.1.1" pino-std-serializers@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-3.1.1.tgz#5a9a00715c9ff3428d5555d4b023a3f8a5893e54" - integrity sha512-Ud4+WzgEr/swOlfQdkxqKP2hlwuQlIqQ5YwYpo9MczNg2mpsKKyKgwQXW5KnP5tgH3/Cy9QRhAhLM8k1K+gfnA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-3.2.0.tgz#b56487c402d882eb96cd67c257868016b61ad671" + integrity sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg== pino@^6.0.0: - version "6.10.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-6.10.0.tgz#0dc4c701aef9e6f1ab276c7c1fbfcbebeba720db" - integrity sha512-ZFGE/Wq930gFb1h0RI6S/QOfkyzNj94Xubwlyo4XpxNUgrG1C0iEqnlooG5Fymx6yrUUtEJ8j/u8NCGwgwTXaQ== + version "6.11.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-6.11.0.tgz#c474712d462f1de524cf885257d21271d1ab7c16" + integrity sha512-VPqEE2sU1z6wqkTtr7DdTktayTNE/JgeuWjfXh9g/TI6X7venzv4gaoU24/jSywf6bBeDfZRHWEeO/6f8bNppA== dependencies: fast-redact "^3.0.0" fast-safe-stringify "^2.0.7" @@ -14220,9 +14261,9 @@ protobufjs@^6.10.1: long "^4.0.0" protocol-buffers-schema@^3.3.1: - version "3.4.0" - resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.4.0.tgz#2f0ea31ca96627d680bf2fefae7ebfa2b6453eae" - integrity sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA== + version "3.5.1" + resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz#8388e768d383ac8cbea23e1280dfadb79f4122ad" + integrity sha512-YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw== protons@^1.0.1: version "1.2.1" @@ -14839,12 +14880,12 @@ regex-parser@^2.2.11: integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" regexpp@^2.0.1: version "2.0.1" @@ -16030,9 +16071,9 @@ stream-to-it@^0.2.0, stream-to-it@^0.2.1, stream-to-it@^0.2.2: get-iterator "^1.0.2" streaming-iterables@^5.0.2, streaming-iterables@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/streaming-iterables/-/streaming-iterables-5.0.3.tgz#a988de42d55e1c0b28f92769101ef69723816918" - integrity sha512-1AgrKjHTvaaK+iA+N3BuTXQWVb7Adyb6+v8yIW3SCTwlBVYEbm76mF8Mf0/IVo+DOk7hoeELOURBKTCMhe/qow== + version "5.0.4" + resolved "https://registry.yarnpkg.com/streaming-iterables/-/streaming-iterables-5.0.4.tgz#4e0eed3416eed956968d1d19b9776dc480802062" + integrity sha512-nEs6hBGIPsVz6uq6pscGGKfoPDQWrDQW0b0UHurtSDysekfKLmkPg7FQVRE2sj3Rad6yUo9E1sGTxOWyYsHQ/g== strict-uri-encode@^1.0.0: version "1.1.0" @@ -16103,7 +16144,7 @@ string.prototype.matchall@^4.0.2: regexp.prototype.flags "^1.3.0" side-channel "^1.0.3" -string.prototype.trimend@^1.0.1: +string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== @@ -16111,7 +16152,7 @@ string.prototype.trimend@^1.0.1: call-bind "^1.0.0" define-properties "^1.1.3" -string.prototype.trimstart@^1.0.1: +string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== @@ -16908,11 +16949,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -17282,16 +17318,6 @@ web-encoding@^1.0.2, web-encoding@^1.0.5, web-encoding@^1.0.6: resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.6.tgz#ec631356ee523b4474ecbcae680440bd1e79416a" integrity sha512-26wEnRPEFAc5d5lmH1Q/DuvWEYsRF1D2alX2jlKpdmqv7cj+BbANL7Xlcl9r4s72Eg9kItZa9RWVbBMC9dMv4w== -web3-bzz@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.0.tgz#83dfd77fa8a64bbb660462dffd0fee2a02ef1051" - integrity sha512-ibYAnKab+sgTo/UdfbrvYfWblXjjgSMgyy9/FHa6WXS14n/HVB+HfWqGz2EM3fok8Wy5XoKGMvdqvERQ/mzq1w== - dependencies: - "@types/node" "^12.12.6" - got "9.6.0" - swarm-js "^0.1.40" - underscore "1.9.1" - web3-bzz@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.1.tgz#c7e13e5fbbbe4634b0d883e5440069fc58e58044" @@ -17302,15 +17328,6 @@ web3-bzz@1.3.1: swarm-js "^0.1.40" underscore "1.9.1" -web3-core-helpers@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.0.tgz#697cc3246a7eaaaac64ea506828d861c981c3f31" - integrity sha512-+MFb1kZCrRctf7UYE7NCG4rGhSXaQJ/KF07di9GVK1pxy1K0+rFi61ZobuV1ky9uQp+uhhSPts4Zp55kRDB5sw== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.3.0" - web3-utils "1.3.0" - web3-core-helpers@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.1.tgz#ffd6f47c1b54a8523f00760a8d713f44d0f97e97" @@ -17320,18 +17337,6 @@ web3-core-helpers@1.3.1: web3-eth-iban "1.3.1" web3-utils "1.3.1" -web3-core-method@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.0.tgz#a71387af842aec7dbad5dbbd1130c14cc6c8beb3" - integrity sha512-h0yFDrYVzy5WkLxC/C3q+hiMnzxdWm9p1T1rslnuHgOp6nYfqzu/6mUIXrsS4h/OWiGJt+BZ0xVZmtC31HDWtg== - dependencies: - "@ethersproject/transactions" "^5.0.0-beta.135" - underscore "1.9.1" - web3-core-helpers "1.3.0" - web3-core-promievent "1.3.0" - web3-core-subscriptions "1.3.0" - web3-utils "1.3.0" - web3-core-method@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.1.tgz#c1d8bf1e2104a8d625c99caf94218ad2dc948c92" @@ -17344,13 +17349,6 @@ web3-core-method@1.3.1: web3-core-subscriptions "1.3.1" web3-utils "1.3.1" -web3-core-promievent@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.0.tgz#e0442dd0a8989b6bdce09293976cee6d9237a484" - integrity sha512-blv69wrXw447TP3iPvYJpllkhW6B18nfuEbrfcr3n2Y0v1Jx8VJacNZFDFsFIcgXcgUIVCtOpimU7w9v4+rtaw== - dependencies: - eventemitter3 "4.0.4" - web3-core-promievent@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.1.tgz#b4da4b34cd9681e22fcda25994d7629280a1e046" @@ -17358,17 +17356,6 @@ web3-core-promievent@1.3.1: dependencies: eventemitter3 "4.0.4" -web3-core-requestmanager@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.0.tgz#c5b9a0304504c0e6cce6c90bc1a3bff82732aa1f" - integrity sha512-3yMbuGcomtzlmvTVqNRydxsx7oPlw3ioRL6ReF9PeNYDkUsZaUib+6Dp5eBt7UXh5X+SIn/xa1smhDHz5/HpAw== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.3.0" - web3-providers-http "1.3.0" - web3-providers-ipc "1.3.0" - web3-providers-ws "1.3.0" - web3-core-requestmanager@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.1.tgz#6dd2b5161ba778dfffe68994a4accff2decc54fe" @@ -17381,15 +17368,6 @@ web3-core-requestmanager@1.3.1: web3-providers-ipc "1.3.1" web3-providers-ws "1.3.1" -web3-core-subscriptions@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.0.tgz#c2622ccd2b84f4687475398ff966b579dba0847e" - integrity sha512-MUUQUAhJDb+Nz3S97ExVWveH4utoUnsbPWP+q1HJH437hEGb4vunIb9KvN3hFHLB+aHJfPeStM/4yYTz5PeuyQ== - dependencies: - eventemitter3 "4.0.4" - underscore "1.9.1" - web3-core-helpers "1.3.0" - web3-core-subscriptions@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.1.tgz#be1103259f91b7fc7f4c6a867aa34dea70a636f7" @@ -17399,19 +17377,6 @@ web3-core-subscriptions@1.3.1: underscore "1.9.1" web3-core-helpers "1.3.1" -web3-core@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.0.tgz#b818903738461c1cca0163339e1d6d3fa51242cf" - integrity sha512-BwWvAaKJf4KFG9QsKRi3MNoNgzjI6szyUlgme1qNPxUdCkaS3Rdpa0VKYNHP7M/YTk82/59kNE66mH5vmoaXjA== - dependencies: - "@types/bn.js" "^4.11.5" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-core-requestmanager "1.3.0" - web3-utils "1.3.0" - web3-core@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.1.tgz#fb0fc5d952a7f3d580a7e6155d2f28be064e64cb" @@ -17425,15 +17390,6 @@ web3-core@1.3.1: web3-core-requestmanager "1.3.1" web3-utils "1.3.1" -web3-eth-abi@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.0.tgz#387b7ea9b38be69ad8856bc7b4e9a6a69bb4d22b" - integrity sha512-1OrZ9+KGrBeBRd3lO8upkpNua9+7cBsQAgor9wbA25UrcUYSyL8teV66JNRu9gFxaTbkpdrGqM7J/LXpraXWrg== - dependencies: - "@ethersproject/abi" "5.0.0-beta.153" - underscore "1.9.1" - web3-utils "1.3.0" - web3-eth-abi@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.1.tgz#d60fe5f15c7a3a426c553fdaa4199d07f1ad899c" @@ -17443,23 +17399,6 @@ web3-eth-abi@1.3.1: underscore "1.9.1" web3-utils "1.3.1" -web3-eth-accounts@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.0.tgz#010acf389b2bee6d5e1aecb2fe78bfa5c8f26c7a" - integrity sha512-/Q7EVW4L2wWUbNRtOTwAIrYvJid/5UnKMw67x/JpvRMwYC+e+744P536Ja6SG4X3MnzFvd3E/jruV4qa6k+zIw== - dependencies: - crypto-browserify "3.12.0" - eth-lib "0.2.8" - ethereumjs-common "^1.3.2" - ethereumjs-tx "^2.1.1" - scrypt-js "^3.0.1" - underscore "1.9.1" - uuid "3.3.2" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-utils "1.3.0" - web3-eth-accounts@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.1.tgz#63b247461f1ae0ae46f9a5d5aa896ea80237143e" @@ -17477,21 +17416,6 @@ web3-eth-accounts@1.3.1: web3-core-method "1.3.1" web3-utils "1.3.1" -web3-eth-contract@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.0.tgz#c758340ac800788e29fa29edc8b0c0ac957b741c" - integrity sha512-3SCge4SRNCnzLxf0R+sXk6vyTOl05g80Z5+9/B5pERwtPpPWaQGw8w01vqYqsYBKC7zH+dxhMaUgVzU2Dgf7bQ== - dependencies: - "@types/bn.js" "^4.11.5" - underscore "1.9.1" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-core-promievent "1.3.0" - web3-core-subscriptions "1.3.0" - web3-eth-abi "1.3.0" - web3-utils "1.3.0" - web3-eth-contract@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.1.tgz#05cb77bd2a671c5480897d20de487f3bae82e113" @@ -17507,21 +17431,6 @@ web3-eth-contract@1.3.1: web3-eth-abi "1.3.1" web3-utils "1.3.1" -web3-eth-ens@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.0.tgz#0887ba38473c104cf5fb8a715828b3b354fa02a2" - integrity sha512-WnOru+EcuM5dteiVYJcHXo/I7Wq+ei8RrlS2nir49M0QpYvUPGbCGgTbifcjJQTWamgORtWdljSA1s2Asdb74w== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - underscore "1.9.1" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-promievent "1.3.0" - web3-eth-abi "1.3.0" - web3-eth-contract "1.3.0" - web3-utils "1.3.0" - web3-eth-ens@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.1.tgz#ccfd621ddc1fecb44096bc8e60689499a9eb4421" @@ -17537,14 +17446,6 @@ web3-eth-ens@1.3.1: web3-eth-contract "1.3.1" web3-utils "1.3.1" -web3-eth-iban@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.0.tgz#15b782dfaf273ebc4e3f389f1367f4e88ddce4a5" - integrity sha512-v9mZWhR4fPF17/KhHLiWir4YHWLe09O3B/NTdhWqw3fdAMJNztzMHGzgHxA/4fU+rhrs/FhDzc4yt32zMEXBZw== - dependencies: - bn.js "^4.11.9" - web3-utils "1.3.0" - web3-eth-iban@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.1.tgz#4351e1a658efa5f3218357f0a38d6d8cad82481e" @@ -17553,18 +17454,6 @@ web3-eth-iban@1.3.1: bn.js "^4.11.9" web3-utils "1.3.1" -web3-eth-personal@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.0.tgz#d376e03dc737d961ff1f8d1aca866efad8477135" - integrity sha512-2czUhElsJdLpuNfun9GeLiClo5O6Xw+bLSjl3f4bNG5X2V4wcIjX2ygep/nfstLLtkz8jSkgl/bV7esANJyeRA== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-net "1.3.0" - web3-utils "1.3.0" - web3-eth-personal@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.1.tgz#cfe8af01588870d195dabf0a8d9e34956fb8856d" @@ -17577,25 +17466,6 @@ web3-eth-personal@1.3.1: web3-net "1.3.1" web3-utils "1.3.1" -web3-eth@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.0.tgz#898e5f5a8827f9bc6844e267a52eb388916a6771" - integrity sha512-/bzJcxXPM9EM18JM5kO2JjZ3nEqVo3HxqU93aWAEgJNqaP/Lltmufl2GpvIB2Hvj+FXAjAXquxUdQ2/xP7BzHQ== - dependencies: - underscore "1.9.1" - web3-core "1.3.0" - web3-core-helpers "1.3.0" - web3-core-method "1.3.0" - web3-core-subscriptions "1.3.0" - web3-eth-abi "1.3.0" - web3-eth-accounts "1.3.0" - web3-eth-contract "1.3.0" - web3-eth-ens "1.3.0" - web3-eth-iban "1.3.0" - web3-eth-personal "1.3.0" - web3-net "1.3.0" - web3-utils "1.3.0" - web3-eth@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.1.tgz#60ac4b58e5fd17b8dbbb8378abd63b02e8326727" @@ -17615,15 +17485,6 @@ web3-eth@1.3.1: web3-net "1.3.1" web3-utils "1.3.1" -web3-net@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.0.tgz#b69068cccffab58911c2f08ca4abfbefb0f948c6" - integrity sha512-Xz02KylOyrB2YZzCkysEDrY7RbKxb7LADzx3Zlovfvuby7HBwtXVexXKtoGqksa+ns1lvjQLLQGb+OeLi7Sr7w== - dependencies: - web3-core "1.3.0" - web3-core-method "1.3.0" - web3-utils "1.3.0" - web3-net@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.1.tgz#79374b1df37429b0839b83b0abc4440ac6181568" @@ -17633,14 +17494,6 @@ web3-net@1.3.1: web3-core-method "1.3.1" web3-utils "1.3.1" -web3-providers-http@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.0.tgz#88227f64c88b32abed4359383c2663616e0dc531" - integrity sha512-cMKhUI6PqlY/EC+ZDacAxajySBu8AzW8jOjt1Pe/mbRQgS0rcZyvLePGTTuoyaA8C21F8UW+EE5jj7YsNgOuqA== - dependencies: - web3-core-helpers "1.3.0" - xhr2-cookies "1.1.0" - web3-providers-http@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.1.tgz#becbea61706b2fa52e15aca6fe519ee108a8fab9" @@ -17649,15 +17502,6 @@ web3-providers-http@1.3.1: web3-core-helpers "1.3.1" xhr2-cookies "1.1.0" -web3-providers-ipc@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.0.tgz#d7c2b203733b46f7b4e7b15633d891648cf9a293" - integrity sha512-0CrLuRofR+1J38nEj4WsId/oolwQEM6Yl1sOt41S/6bNI7htdkwgVhSloFIMJMDFHtRw229QIJ6wIaKQz0X1Og== - dependencies: - oboe "2.1.5" - underscore "1.9.1" - web3-core-helpers "1.3.0" - web3-providers-ipc@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.1.tgz#3cb2572fc5286ab2f3117e0a2dce917816c3dedb" @@ -17667,16 +17511,6 @@ web3-providers-ipc@1.3.1: underscore "1.9.1" web3-core-helpers "1.3.1" -web3-providers-ws@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.0.tgz#84adeff65acd4624d7f5bb43c5b2b22d8f0f63a4" - integrity sha512-Im5MthhJnJst8nSoq0TgbyOdaiFQFa5r6sHPOVllhgIgViDqzbnlAFW9sNzQ0Q8VXPNfPIQKi9cOrHlSRNPjRw== - dependencies: - eventemitter3 "4.0.4" - underscore "1.9.1" - web3-core-helpers "1.3.0" - websocket "^1.0.32" - web3-providers-ws@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.1.tgz#a70140811d138a1a5cf3f0c39d11887c8e341c83" @@ -17687,16 +17521,6 @@ web3-providers-ws@1.3.1: web3-core-helpers "1.3.1" websocket "^1.0.32" -web3-shh@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.0.tgz#62d15297da8fb5f733dd1b98f9ade300590f4d49" - integrity sha512-IZTojA4VCwVq+7eEIHuL1tJXtU+LJDhO8Y2QmuwetEWW1iBgWCGPHZasipWP+7kDpSm/5lo5GRxL72FF/Os/tA== - dependencies: - web3-core "1.3.0" - web3-core-method "1.3.0" - web3-core-subscriptions "1.3.0" - web3-net "1.3.0" - web3-shh@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.1.tgz#42294d684358c22aa48616cb9a3eb2e9c1e6362f" @@ -17707,20 +17531,6 @@ web3-shh@1.3.1: web3-core-subscriptions "1.3.1" web3-net "1.3.1" -web3-utils@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.0.tgz#5bac16e5e0ec9fe7bdcfadb621655e8aa3cf14e1" - integrity sha512-2mS5axFCbkhicmoDRuJeuo0TVGQDgC2sPi/5dblfVC+PMtX0efrb8Xlttv/eGkq7X4E83Pds34FH98TP2WOUZA== - dependencies: - bn.js "^4.11.9" - eth-lib "0.2.8" - ethereum-bloom-filters "^1.0.6" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - underscore "1.9.1" - utf8 "3.0.0" - web3-utils@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.1.tgz#9aa880dd8c9463fe5c099107889f86a085370c2e" @@ -17735,20 +17545,7 @@ web3-utils@1.3.1: underscore "1.9.1" utf8 "3.0.0" -web3@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.0.tgz#8fe4cd6e2a21c91904f343ba75717ee4c76bb349" - integrity sha512-4q9dna0RecnrlgD/bD1C5S+81Untbd6Z/TBD7rb+D5Bvvc0Wxjr4OP70x+LlnwuRDjDtzBwJbNUblh2grlVArw== - dependencies: - web3-bzz "1.3.0" - web3-core "1.3.0" - web3-eth "1.3.0" - web3-eth-personal "1.3.0" - web3-net "1.3.0" - web3-shh "1.3.0" - web3-utils "1.3.0" - -web3@~1.3.0: +web3@~1.3.0, web3@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.1.tgz#f780138c92ae3c42ea45e1a3c6ae8844e0aa5054" integrity sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog== From 8aa74ab7fd8fc0087a9c88518eba3369a2211b34 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 20 Jan 2021 16:03:47 +0200 Subject: [PATCH 30/37] Minor ui improvements --- .../patches/web3-core-requestmanager+1.3.1.patch | 5 +++-- packages/concordia-app/src/assets/css/index.css | 9 ++++----- .../src/layouts/MainLayout/MainLayoutMenu/index.jsx | 4 +++- .../src/layouts/MainLayout/MainLayoutMenu/styles.css | 9 +++++++++ yarn.lock | 2 +- 5 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css diff --git a/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch b/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch index 4891f47..2613b98 100644 --- a/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch +++ b/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/web3-core-requestmanager/lib/index.js b/node_modules/web3-core-requestmanager/lib/index.js -index 32caf52..b51b734 100644 +index 32caf52..835b4d8 100644 --- a/node_modules/web3-core-requestmanager/lib/index.js +++ b/node_modules/web3-core-requestmanager/lib/index.js -@@ -82,13 +82,25 @@ RequestManager.prototype.setProvider = function (provider, net) { +@@ -82,13 +82,26 @@ RequestManager.prototype.setProvider = function (provider, net) { this.provider = provider || null; // listen to incoming notifications if (this.provider && this.provider.on) { @@ -13,6 +13,7 @@ index 32caf52..b51b734 100644 - _this.subscriptions.get(result.params.subscription).callback(null, result.params.result); - } - }); ++ // See also https://github.com/ChainSafe/web3.js/pull/3864 + if (typeof provider.request === 'function') { // EIP-1193 provider + this.provider.on('message', function (payload) { + if (payload && payload.type === 'eth_subscription' && payload.data) { diff --git a/packages/concordia-app/src/assets/css/index.css b/packages/concordia-app/src/assets/css/index.css index 2848ffd..31db996 100644 --- a/packages/concordia-app/src/assets/css/index.css +++ b/packages/concordia-app/src/assets/css/index.css @@ -3,6 +3,10 @@ body.app { margin: 0; } +div { + word-break: break-word; +} + #root { height: 100%; } @@ -15,8 +19,3 @@ body.app { color: gray; font-style: italic; } - -.ui.inverted.menu { - background: #0B2540; - border-radius: 0; -} diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx index 0a52901..b2453f0 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx @@ -4,8 +4,9 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router'; import { useSelector } from 'react-redux'; import AppContext from '../../../components/AppContext'; -import appLogo from '../../../assets/images/app_logo.svg'; import ClearDatabasesModal from '../../../components/ClearDatabasesModal'; +import appLogo from '../../../assets/images/app_logo.svg'; +import './styles.css'; const MainLayoutMenu = () => { const hasSignedUp = useSelector((state) => state.user.hasSignedUp); @@ -32,6 +33,7 @@ const MainLayoutMenu = () => { {() => ( Date: Sun, 24 Jan 2021 14:32:08 +0200 Subject: [PATCH 31/37] Up web3 --- packages/concordia-app/package.json | 2 +- .../web3-core-requestmanager+1.3.1.patch | 38 --- yarn.lock | 242 +++++++++++++++++- 3 files changed, 242 insertions(+), 40 deletions(-) delete mode 100644 packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json index 85da848..bbe624a 100644 --- a/packages/concordia-app/package.json +++ b/packages/concordia-app/package.json @@ -48,7 +48,7 @@ "redux-saga": "~1.1.3", "semantic-ui-css": "~2.4.1", "semantic-ui-react": "~1.2.1", - "web3": "1.3.1" + "web3": "~1.3.3" }, "devDependencies": { "cross-env": "^7.0.3", diff --git a/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch b/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch deleted file mode 100644 index 2613b98..0000000 --- a/packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/node_modules/web3-core-requestmanager/lib/index.js b/node_modules/web3-core-requestmanager/lib/index.js -index 32caf52..835b4d8 100644 ---- a/node_modules/web3-core-requestmanager/lib/index.js -+++ b/node_modules/web3-core-requestmanager/lib/index.js -@@ -82,13 +82,26 @@ RequestManager.prototype.setProvider = function (provider, net) { - this.provider = provider || null; - // listen to incoming notifications - if (this.provider && this.provider.on) { -- this.provider.on('data', function data(result, deprecatedResult) { -- result = result || deprecatedResult; // this is for possible old providers, which may had the error first handler -- // if result is a subscription, call callback for that subscription -- if (result.method && result.params && result.params.subscription && _this.subscriptions.has(result.params.subscription)) { -- _this.subscriptions.get(result.params.subscription).callback(null, result.params.result); -- } -- }); -+ // See also https://github.com/ChainSafe/web3.js/pull/3864 -+ if (typeof provider.request === 'function') { // EIP-1193 provider -+ this.provider.on('message', function (payload) { -+ if (payload && payload.type === 'eth_subscription' && payload.data) { -+ const data = payload.data -+ if (data.subscription && _this.subscriptions.has(data.subscription)) { -+ _this.subscriptions.get(data.subscription).callback(null, data.result); -+ } -+ } -+ }) -+ } else { // legacy provider subscription event -+ this.provider.on('data', function data(result, deprecatedResult) { -+ result = result || deprecatedResult; // this is for possible old providers, which may had the error first handler -+ -+ // if result is a subscription, call callback for that subscription -+ if (result.method && result.params && result.params.subscription && _this.subscriptions.has(result.params.subscription)) { -+ _this.subscriptions.get(result.params.subscription).callback(null, result.params.result); -+ } -+ }); -+ } - // resubscribe if the provider has reconnected - this.provider.on('connect', function connect() { - _this.subscriptions.forEach(function (subscription) { diff --git a/yarn.lock b/yarn.lock index e401e5e..e9fd9b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17328,6 +17328,16 @@ web3-bzz@1.3.1: swarm-js "^0.1.40" underscore "1.9.1" +web3-bzz@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.3.tgz#e3d9c8ff5db4d61fe3a4b7b7b93d61000c0e4322" + integrity sha512-lFERlqnr/upJhADT6US7BGUkM5cy6idw86/GvWKo9h/uyrbV14gk+bUqcQdBBSopa1Mvvy5ZaO6rKtRe8PTsQw== + dependencies: + "@types/node" "^12.12.6" + got "9.6.0" + swarm-js "^0.1.40" + underscore "1.9.1" + web3-core-helpers@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.1.tgz#ffd6f47c1b54a8523f00760a8d713f44d0f97e97" @@ -17337,6 +17347,15 @@ web3-core-helpers@1.3.1: web3-eth-iban "1.3.1" web3-utils "1.3.1" +web3-core-helpers@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.3.tgz#58a7a34278e4b338dde9520012679d5952701a69" + integrity sha512-rUTC9sgn1Wvw2KGBtc9/bsQKUd+yjzIm14mlaqqiO0vpFueTmmagwiGRE2CWzEfYg+r2jnYIIgh9qnsCykgVkQ== + dependencies: + underscore "1.9.1" + web3-eth-iban "1.3.3" + web3-utils "1.3.3" + web3-core-method@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.1.tgz#c1d8bf1e2104a8d625c99caf94218ad2dc948c92" @@ -17349,6 +17368,18 @@ web3-core-method@1.3.1: web3-core-subscriptions "1.3.1" web3-utils "1.3.1" +web3-core-method@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.3.tgz#f992744180e003d0ca55b1b17b4a9678cb9f7247" + integrity sha512-d3AA1lyw0dvLs53X17pHpD5QpxJdkfolbN31UQymRF5Y+swFweqRiCuJoNTplE95ZX2uUtsLhEIbaszj7dQgFg== + dependencies: + "@ethersproject/transactions" "^5.0.0-beta.135" + underscore "1.9.1" + web3-core-helpers "1.3.3" + web3-core-promievent "1.3.3" + web3-core-subscriptions "1.3.3" + web3-utils "1.3.3" + web3-core-promievent@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.1.tgz#b4da4b34cd9681e22fcda25994d7629280a1e046" @@ -17356,6 +17387,13 @@ web3-core-promievent@1.3.1: dependencies: eventemitter3 "4.0.4" +web3-core-promievent@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.3.tgz#b6dcede41965a35ad53041f4f16c6ef7865bf13c" + integrity sha512-ARgO+BWUCxK8U/977SdJ8oyJo51mDYUzlZFoa2NFjUH+QYrFoKA7l9Hhw/vxhy13jE2LaVUM31JBLzVb+GM9dQ== + dependencies: + eventemitter3 "4.0.4" + web3-core-requestmanager@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.1.tgz#6dd2b5161ba778dfffe68994a4accff2decc54fe" @@ -17368,6 +17406,18 @@ web3-core-requestmanager@1.3.1: web3-providers-ipc "1.3.1" web3-providers-ws "1.3.1" +web3-core-requestmanager@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.3.tgz#deaf18307ddf0e292ac783b5486d2f6e2480a9ac" + integrity sha512-4/J23wK5IXRw/1kqda7FXtvySKjX7Phcevqjx0EkcBtrxAfLedcqf8k2PlDh5LtCXfPW66u4V3fDgHdLZMrVgQ== + dependencies: + underscore "1.9.1" + util "^0.12.0" + web3-core-helpers "1.3.3" + web3-providers-http "1.3.3" + web3-providers-ipc "1.3.3" + web3-providers-ws "1.3.3" + web3-core-subscriptions@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.1.tgz#be1103259f91b7fc7f4c6a867aa34dea70a636f7" @@ -17377,6 +17427,15 @@ web3-core-subscriptions@1.3.1: underscore "1.9.1" web3-core-helpers "1.3.1" +web3-core-subscriptions@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.3.tgz#296752e7cfad5a559162eea4dbc9086e4e24e62d" + integrity sha512-VvcPuNYcGLb6HfgMrNN6Q/1CwSk2uIqUjhrVTQ67JIxIddsEdV1f6SsQH9MX1cmwi39ffGsYtssOT1pht4Zc8g== + dependencies: + eventemitter3 "4.0.4" + underscore "1.9.1" + web3-core-helpers "1.3.3" + web3-core@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.1.tgz#fb0fc5d952a7f3d580a7e6155d2f28be064e64cb" @@ -17390,6 +17449,19 @@ web3-core@1.3.1: web3-core-requestmanager "1.3.1" web3-utils "1.3.1" +web3-core@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.3.tgz#c012792d82a26743c068658a9fed56894501e396" + integrity sha512-hCDWj/3PBHhSJSSBi+nV7MiW9Djf/pRuUXcVO2jWroAXqAbTSXLHpju0AWTzXnlsqs1QHK0Yk8nF9jojGUQVYg== + dependencies: + "@types/bn.js" "^4.11.5" + "@types/node" "^12.12.6" + bignumber.js "^9.0.0" + web3-core-helpers "1.3.3" + web3-core-method "1.3.3" + web3-core-requestmanager "1.3.3" + web3-utils "1.3.3" + web3-eth-abi@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.1.tgz#d60fe5f15c7a3a426c553fdaa4199d07f1ad899c" @@ -17399,6 +17471,15 @@ web3-eth-abi@1.3.1: underscore "1.9.1" web3-utils "1.3.1" +web3-eth-abi@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.3.tgz#21dbebc7c50d66cb61195f13ece9262601a2b5b7" + integrity sha512-9GQ7YTALt1uxGwdMBpBHlagCj4yn0fPUT2wDDAGoyJFVJMsUt3arF855zsVpJL3zfhHmUgRNoVrAkobRR2YYLw== + dependencies: + "@ethersproject/abi" "5.0.7" + underscore "1.9.1" + web3-utils "1.3.3" + web3-eth-accounts@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.1.tgz#63b247461f1ae0ae46f9a5d5aa896ea80237143e" @@ -17416,6 +17497,23 @@ web3-eth-accounts@1.3.1: web3-core-method "1.3.1" web3-utils "1.3.1" +web3-eth-accounts@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.3.tgz#1fda75f55bdb780765d627315fe9f499a27fda28" + integrity sha512-Jn9nguNsCLnY7Po6lv7Mg5JDaYuKdvL0Ezv1V2LTLy+EhcVt5i19h+/3M92Xynpe5Tx+WY/ELfeA2jLTeP5jRg== + dependencies: + crypto-browserify "3.12.0" + eth-lib "0.2.8" + ethereumjs-common "^1.3.2" + ethereumjs-tx "^2.1.1" + scrypt-js "^3.0.1" + underscore "1.9.1" + uuid "3.3.2" + web3-core "1.3.3" + web3-core-helpers "1.3.3" + web3-core-method "1.3.3" + web3-utils "1.3.3" + web3-eth-contract@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.1.tgz#05cb77bd2a671c5480897d20de487f3bae82e113" @@ -17431,6 +17529,21 @@ web3-eth-contract@1.3.1: web3-eth-abi "1.3.1" web3-utils "1.3.1" +web3-eth-contract@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.3.tgz#a89944b04eb40227b3490cb5f807cb95c0e48eeb" + integrity sha512-TKGs1qvc/v7TriyGKtnTqVrB3J/mWSeqLkWtLY60lGqY8KopZ9k7dZ/g5Cvfiox57VHWkpOk0xDwUQjlIe4Ikg== + dependencies: + "@types/bn.js" "^4.11.5" + underscore "1.9.1" + web3-core "1.3.3" + web3-core-helpers "1.3.3" + web3-core-method "1.3.3" + web3-core-promievent "1.3.3" + web3-core-subscriptions "1.3.3" + web3-eth-abi "1.3.3" + web3-utils "1.3.3" + web3-eth-ens@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.1.tgz#ccfd621ddc1fecb44096bc8e60689499a9eb4421" @@ -17446,6 +17559,21 @@ web3-eth-ens@1.3.1: web3-eth-contract "1.3.1" web3-utils "1.3.1" +web3-eth-ens@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.3.tgz#88c8d061c2f5eeeeea3736ef0712451d76b5091b" + integrity sha512-tresrI1CM6RbxsUCM6kfG1W10LDMqWJnU+lNhfaD5mt5IzJ4GcfDAHO9WzoYl8Esh+Epj/jD+vI30clI4j90Vg== + dependencies: + content-hash "^2.5.2" + eth-ens-namehash "2.0.8" + underscore "1.9.1" + web3-core "1.3.3" + web3-core-helpers "1.3.3" + web3-core-promievent "1.3.3" + web3-eth-abi "1.3.3" + web3-eth-contract "1.3.3" + web3-utils "1.3.3" + web3-eth-iban@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.1.tgz#4351e1a658efa5f3218357f0a38d6d8cad82481e" @@ -17454,6 +17582,14 @@ web3-eth-iban@1.3.1: bn.js "^4.11.9" web3-utils "1.3.1" +web3-eth-iban@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.3.tgz#ad3e4e30a2a101febfeed0248a107889a13372ec" + integrity sha512-+9a+bZHAKQ4oBcRxiGbC1MC8S2cOgDlXo8qcw0XpMhLJZ3c/brZM7ZbPdiuU8Z7AMYf3PknaGFQyVmedZhrauA== + dependencies: + bn.js "^4.11.9" + web3-utils "1.3.3" + web3-eth-personal@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.1.tgz#cfe8af01588870d195dabf0a8d9e34956fb8856d" @@ -17466,6 +17602,18 @@ web3-eth-personal@1.3.1: web3-net "1.3.1" web3-utils "1.3.1" +web3-eth-personal@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.3.tgz#45ecf0a6fcb2bca0a7a4de11d4c2ed405579ee44" + integrity sha512-S/TSGTm7x9oHRXUHXi8f+y187RKpn5aqYJRlSoyTmB3B4EMrv9NcZZQmHaiXwM48wkFdRhTMECW1Ar8E5zZLFw== + dependencies: + "@types/node" "^12.12.6" + web3-core "1.3.3" + web3-core-helpers "1.3.3" + web3-core-method "1.3.3" + web3-net "1.3.3" + web3-utils "1.3.3" + web3-eth@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.1.tgz#60ac4b58e5fd17b8dbbb8378abd63b02e8326727" @@ -17485,6 +17633,25 @@ web3-eth@1.3.1: web3-net "1.3.1" web3-utils "1.3.1" +web3-eth@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.3.tgz#e03d1a4a7ea97b36c63bb54f000ebe0ef9f140c7" + integrity sha512-NvbkCaN26o7f9EogsRsA/lbwF+8dXimJWsaGpZK3ANa+AZrYkWj3NuaxfPO/S/RLsC9ptJdt7id72qxT40r5QQ== + dependencies: + underscore "1.9.1" + web3-core "1.3.3" + web3-core-helpers "1.3.3" + web3-core-method "1.3.3" + web3-core-subscriptions "1.3.3" + web3-eth-abi "1.3.3" + web3-eth-accounts "1.3.3" + web3-eth-contract "1.3.3" + web3-eth-ens "1.3.3" + web3-eth-iban "1.3.3" + web3-eth-personal "1.3.3" + web3-net "1.3.3" + web3-utils "1.3.3" + web3-net@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.1.tgz#79374b1df37429b0839b83b0abc4440ac6181568" @@ -17494,6 +17661,15 @@ web3-net@1.3.1: web3-core-method "1.3.1" web3-utils "1.3.1" +web3-net@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.3.tgz#dacfe2456d0584ed1500e98bdd12082353883cd6" + integrity sha512-GcPj2lyAC5CP6FOCwoURCRMFsh0khWBi6sGqiKtUPMa7dKnLw8CLCAFcwX//d3ucnn1E7I78Va6k8liKjj87sA== + dependencies: + web3-core "1.3.3" + web3-core-method "1.3.3" + web3-utils "1.3.3" + web3-providers-http@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.1.tgz#becbea61706b2fa52e15aca6fe519ee108a8fab9" @@ -17502,6 +17678,14 @@ web3-providers-http@1.3.1: web3-core-helpers "1.3.1" xhr2-cookies "1.1.0" +web3-providers-http@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.3.tgz#55c15c79ecd7f5415d2d0d0f748ff4304ba23edd" + integrity sha512-V2x27IFXQqsaZrAbA4GJurKuyrNXapmmpSJ7jxPDOxewOy9dEURlKIg5W1bb4QXGh2YSCksuH9fKquvTfPfc/A== + dependencies: + web3-core-helpers "1.3.3" + xhr2-cookies "1.1.0" + web3-providers-ipc@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.1.tgz#3cb2572fc5286ab2f3117e0a2dce917816c3dedb" @@ -17511,6 +17695,15 @@ web3-providers-ipc@1.3.1: underscore "1.9.1" web3-core-helpers "1.3.1" +web3-providers-ipc@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.3.tgz#b3e1f30875e9c71e94c23be264ed4d9c50313f37" + integrity sha512-XMQo/YsH/2lBaRlkYa5d/Q+2EJ2RTzVjio1i2G9TESESfHCj0l2AWLb3zet+f/QRVxfvXGmGlZuf99diof2a1g== + dependencies: + oboe "2.1.5" + underscore "1.9.1" + web3-core-helpers "1.3.3" + web3-providers-ws@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.1.tgz#a70140811d138a1a5cf3f0c39d11887c8e341c83" @@ -17521,6 +17714,16 @@ web3-providers-ws@1.3.1: web3-core-helpers "1.3.1" websocket "^1.0.32" +web3-providers-ws@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.3.tgz#f654ee83444d141c365eee7fba6985590b674ba5" + integrity sha512-yuzqB3jST9JS19oOR1FRaARM7JBeP6cbKffM8HoWp4Y98/OowjW1mbDQVS47YTSHBP2QiLzSrwBxjIEPm8f48Q== + dependencies: + eventemitter3 "4.0.4" + underscore "1.9.1" + web3-core-helpers "1.3.3" + websocket "^1.0.32" + web3-shh@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.1.tgz#42294d684358c22aa48616cb9a3eb2e9c1e6362f" @@ -17531,6 +17734,16 @@ web3-shh@1.3.1: web3-core-subscriptions "1.3.1" web3-net "1.3.1" +web3-shh@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.3.tgz#55e4e6826b5af51b60708969da268c76a960f2bd" + integrity sha512-byp2+sHnc8UAj6sNcVFacF3pmRzIaMATsI4ARfU+0S8EpaQ3trojww2QBYPnZ4r0QOMH+I6+bVl8qTu0Zz4eoA== + dependencies: + web3-core "1.3.3" + web3-core-method "1.3.3" + web3-core-subscriptions "1.3.3" + web3-net "1.3.3" + web3-utils@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.1.tgz#9aa880dd8c9463fe5c099107889f86a085370c2e" @@ -17545,7 +17758,21 @@ web3-utils@1.3.1: underscore "1.9.1" utf8 "3.0.0" -web3@1.3.1, web3@~1.3.0: +web3-utils@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.3.tgz#71b837958f1fcc970223eb14a1d0110233348305" + integrity sha512-ZwpdqEcBBzqRgXUbCj+kyu1jFnsDauURSQ79yVqgnTKSI4C3s0Qjpp4WLThV+LKhCKR5GZtBTkgGHeiq0FT88A== + dependencies: + bn.js "^4.11.9" + eth-lib "0.2.8" + ethereum-bloom-filters "^1.0.6" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randombytes "^2.1.0" + underscore "1.9.1" + utf8 "3.0.0" + +web3@~1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.1.tgz#f780138c92ae3c42ea45e1a3c6ae8844e0aa5054" integrity sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog== @@ -17558,6 +17785,19 @@ web3@1.3.1, web3@~1.3.0: web3-shh "1.3.1" web3-utils "1.3.1" +web3@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.3.tgz#be2dda6f58b177c00275fc19529f7465b1460687" + integrity sha512-fI/g0yC1FC0m4envv8FsPh7tbBoe/eXbEho+iY/hahs7YGgGt3nYNrAFTkR9pLhQaVMpOilhwgFxXEp+O7My/g== + dependencies: + web3-bzz "1.3.3" + web3-core "1.3.3" + web3-eth "1.3.3" + web3-eth-personal "1.3.3" + web3-net "1.3.3" + web3-shh "1.3.3" + web3-utils "1.3.3" + webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" From f3b68ace75c5a721bfd9119a6dba489d208d1ad0 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Sun, 24 Jan 2021 14:47:05 +0200 Subject: [PATCH 32/37] chore: up Web3-eth patch --- .../patches/{web3-eth+1.3.1.patch => web3-eth+1.3.3.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/concordia-app/patches/{web3-eth+1.3.1.patch => web3-eth+1.3.3.patch} (100%) diff --git a/packages/concordia-app/patches/web3-eth+1.3.1.patch b/packages/concordia-app/patches/web3-eth+1.3.3.patch similarity index 100% rename from packages/concordia-app/patches/web3-eth+1.3.1.patch rename to packages/concordia-app/patches/web3-eth+1.3.3.patch From 755ff0e717b057a7e61b889f82dab70b95ffa417 Mon Sep 17 00:00:00 2001 From: apostolof Date: Wed, 3 Feb 2021 02:16:58 +0200 Subject: [PATCH 33/37] feat: init contracts provider --- .../src/constants/contracts/ContractNames.js | 2 + .../src/options/drizzleOptions.js | 12 +++- .../concordia-app/src/utils/drizzleUtils.js | 47 +++++++++++++++ .../concordia-contracts-provider/.eslintrc.js | 60 +++++++++++++++++++ .../concordia-contracts-provider/.gitignore | 22 +++++++ .../concordia-contracts-provider/package.json | 26 ++++++++ .../src/constants.js | 3 + .../src/controllers/download.js | 19 ++++++ .../src/controllers/upload.js | 19 ++++++ .../concordia-contracts-provider/src/index.js | 19 ++++++ .../src/middleware/upload.js | 32 ++++++++++ .../src/routes/web.js | 14 +++++ 12 files changed, 274 insertions(+), 1 deletion(-) create mode 100755 packages/concordia-app/src/utils/drizzleUtils.js create mode 100755 packages/concordia-contracts-provider/.eslintrc.js create mode 100755 packages/concordia-contracts-provider/.gitignore create mode 100755 packages/concordia-contracts-provider/package.json create mode 100755 packages/concordia-contracts-provider/src/constants.js create mode 100755 packages/concordia-contracts-provider/src/controllers/download.js create mode 100755 packages/concordia-contracts-provider/src/controllers/upload.js create mode 100755 packages/concordia-contracts-provider/src/index.js create mode 100755 packages/concordia-contracts-provider/src/middleware/upload.js create mode 100755 packages/concordia-contracts-provider/src/routes/web.js diff --git a/packages/concordia-app/src/constants/contracts/ContractNames.js b/packages/concordia-app/src/constants/contracts/ContractNames.js index 8ddebb5..edaef10 100644 --- a/packages/concordia-app/src/constants/contracts/ContractNames.js +++ b/packages/concordia-app/src/constants/contracts/ContractNames.js @@ -1,3 +1,5 @@ export const FORUM_CONTRACT = 'Forum'; export const POST_VOTING_CONTRACT = 'PostVoting'; export const VOTING_CONTRACT = 'Voting'; +export const NUMBER_OF_CONTRACTS = 4; +export const NUMBER_OF_CONTRACTS = 4; diff --git a/packages/concordia-app/src/options/drizzleOptions.js b/packages/concordia-app/src/options/drizzleOptions.js index 7d689ee..1323bbb 100644 --- a/packages/concordia-app/src/options/drizzleOptions.js +++ b/packages/concordia-app/src/options/drizzleOptions.js @@ -2,13 +2,23 @@ import { contracts } from 'concordia-contracts'; import web3Options from './web3Options'; import appEvents from '../constants/contracts/events'; +import { downloadContractArtifactsSync } from '../utils/drizzleUtils'; const drizzleOptions = { web3: web3Options, - contracts, events: { ...appEvents }, reloadWindowOnNetworkChange: true, reloadWindowOnAccountChange: true, // We need it to reinitialize breeze and create new Orbit databases }; +const CONTRACTS_SUPPLIER_URL = process.env.REACT_APP_CONTRACTS_SUPPLIER; + +if (!CONTRACTS_SUPPLIER_URL) { + drizzleOptions.contracts = contracts; +} else { + const remoteContracts = downloadContractArtifactsSync(); + console.log(remoteContracts); + drizzleOptions.contracts = remoteContracts; +} + export default drizzleOptions; diff --git a/packages/concordia-app/src/utils/drizzleUtils.js b/packages/concordia-app/src/utils/drizzleUtils.js new file mode 100755 index 0000000..613d0cd --- /dev/null +++ b/packages/concordia-app/src/utils/drizzleUtils.js @@ -0,0 +1,47 @@ +// const downloadContractArtifacts = async () => { +import { NUMBER_OF_CONTRACTS } from '../constants/contracts/ContractNames'; + +export const downloadContractArtifacts = async () => { + const headers = new Headers(); + headers.append('Access-Control-Allow-Origin', 'http://localhost:7000'); + headers.append('Access-Control-Allow-Credentials', 'true'); + + const requestOptions = { + method: 'GET', + redirect: 'follow', + headers, + }; + + const remoteContracts = await fetch('http://127.0.0.1:8400/contracts/asdf', requestOptions) + .then((response) => response.text()) + .then((contractsRawData) => JSON.parse(contractsRawData)); + + if (remoteContracts.length !== NUMBER_OF_CONTRACTS) { + throw new Error(`Version mismatch detected. Artifacts brought ${remoteContracts.length} contracts but app + expected ${NUMBER_OF_CONTRACTS}`); + } + + return remoteContracts; +}; + +export const downloadContractArtifactsSync = () => { + const xhrRequest = new XMLHttpRequest(); + // xhrRequest.withCredentials = true; + xhrRequest.open('GET', 'http://127.0.0.1:8400/contracts/asdf', false); + xhrRequest.setRequestHeader('Access-Control-Allow-Origin', 'http://localhost:7000'); + xhrRequest.setRequestHeader('Access-Control-Allow-Credentials', 'true'); + xhrRequest.send(null); + + if (xhrRequest.status === 200) { + const contractsRawData = xhrRequest.responseText; + const remoteContracts = JSON.parse(contractsRawData); + + if (remoteContracts.length !== NUMBER_OF_CONTRACTS) { + throw new Error(`Version mismatch detected. Artifacts brought ${remoteContracts.length} contracts but app + expected ${NUMBER_OF_CONTRACTS}`); + } + + return remoteContracts; + } + throw new Error(`Remote contract artifacts download request failed!\n${xhrRequest.responseText}`); +}; diff --git a/packages/concordia-contracts-provider/.eslintrc.js b/packages/concordia-contracts-provider/.eslintrc.js new file mode 100755 index 0000000..7ca05eb --- /dev/null +++ b/packages/concordia-contracts-provider/.eslintrc.js @@ -0,0 +1,60 @@ +module.exports = { + env: { + browser: true, + es6: true, + jest: true, + }, + extends: [ + 'plugin:react/recommended', + 'airbnb', + ], + globals: { + Atomics: 'readonly', + SharedArrayBuffer: 'readonly', + }, + parser: 'babel-eslint', + parserOptions: { + ecmaFeatures: { + jsx: true, + }, + ecmaVersion: 2018, + sourceType: 'module', + }, + plugins: [ + 'react', + 'react-hooks', + ], + rules: { + 'react/jsx-props-no-spreading': 'off', + 'import/extensions': 'off', + 'react/jsx-indent': [ + 'error', + 4, + { + checkAttributes: true, + indentLogicalExpressions: true, + }, + ], + 'react/require-default-props': 'off', + 'react/prop-types': 'off', + 'react-hooks/rules-of-hooks': 'error', + 'react-hooks/exhaustive-deps': 'error', + 'max-len': ['warn', { code: 120, tabWidth: 4 }], + 'no-unused-vars': 'warn', + 'no-console': 'warn', + 'no-shadow': 'warn', + 'no-multi-str': 'warn', + 'jsx-a11y/label-has-associated-control': [2, { + labelAttributes: ['label'], + controlComponents: ['Input'], + depth: 3, + }], + }, + settings: { + 'import/resolver': { + node: { + extensions: ['.js', '.jsx'], + }, + }, + }, +}; diff --git a/packages/concordia-contracts-provider/.gitignore b/packages/concordia-contracts-provider/.gitignore new file mode 100755 index 0000000..b1c784e --- /dev/null +++ b/packages/concordia-contracts-provider/.gitignore @@ -0,0 +1,22 @@ +# Node +/node_modules + +# IDE +.DS_Store +.idea + +# Build Directories +/build +/src/build + +# Logs +/log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Misc +.env.local +.env.development.local +.env.test.local +.env.production.local diff --git a/packages/concordia-contracts-provider/package.json b/packages/concordia-contracts-provider/package.json new file mode 100755 index 0000000..7bdc166 --- /dev/null +++ b/packages/concordia-contracts-provider/package.json @@ -0,0 +1,26 @@ +{ + "name": "concordia-contracts-provider", + "description": "A server that provides built contracts for Concordia.", + "version": "0.1.0", + "private": true, + "main": "src/index.js", + "scripts": { + "start": "node -r esm src/index.js" + }, + "license": "MIT", + "dependencies": { + "cors": "^2.8.5", + "esm": "~3.2.25", + "express": "^4.17.1", + "lodash": "^4.17.20", + "multer": "^1.4.2", + "multiparty": "^4.2.2" + }, + "devDependencies": { + "eslint": "^7.19.0", + "eslint-config-airbnb": "^18.2.1", + "eslint-plugin-jsx-a11y": "^6.4.1", + "eslint-plugin-react": "^7.22.0", + "eslint-plugin-react-hooks": "^4.2.0" + } +} diff --git a/packages/concordia-contracts-provider/src/constants.js b/packages/concordia-contracts-provider/src/constants.js new file mode 100755 index 0000000..e46b59b --- /dev/null +++ b/packages/concordia-contracts-provider/src/constants.js @@ -0,0 +1,3 @@ +export const API_HOST = '127.0.0.1'; +export const API_PORT = '8400'; +export const UPLOADED_CONTRACTS_DIR = './contracts-uploads/'; diff --git a/packages/concordia-contracts-provider/src/controllers/download.js b/packages/concordia-contracts-provider/src/controllers/download.js new file mode 100755 index 0000000..5748fff --- /dev/null +++ b/packages/concordia-contracts-provider/src/controllers/download.js @@ -0,0 +1,19 @@ +import * as fs from 'fs'; +import path from 'path'; +import { UPLOADED_CONTRACTS_DIR } from '../constants'; + +const downloadContracts = async (req, res) => { + const { params: { hash } } = req; + const directoryPath = path.join(`${__dirname}/../../${UPLOADED_CONTRACTS_DIR}/${hash}`); + const contracts = []; + + fs.readdirSync(directoryPath).forEach((contractFilename) => { + const rawContractData = fs.readFileSync(path.join(`${directoryPath}/${contractFilename}`), 'utf-8'); + const contractJson = JSON.parse(rawContractData); + contracts.push(contractJson); + }); + + res.send(contracts); +}; + +export default downloadContracts; diff --git a/packages/concordia-contracts-provider/src/controllers/upload.js b/packages/concordia-contracts-provider/src/controllers/upload.js new file mode 100755 index 0000000..018a047 --- /dev/null +++ b/packages/concordia-contracts-provider/src/controllers/upload.js @@ -0,0 +1,19 @@ +import upload from '../middleware/upload'; + +const uploadContracts = async (req, res) => { + try { + await upload(req, res); + + if (req.files.length <= 0) { + return res.send('You must select at least 1 file.'); + } + + return res.send('Files have been uploaded.'); + } catch (error) { + console.log(error); + + return res.send(`Error when trying upload many files: ${error}`); + } +}; + +export default uploadContracts; diff --git a/packages/concordia-contracts-provider/src/index.js b/packages/concordia-contracts-provider/src/index.js new file mode 100755 index 0000000..462db85 --- /dev/null +++ b/packages/concordia-contracts-provider/src/index.js @@ -0,0 +1,19 @@ +import express from 'express'; +import cors from 'cors'; +import initRoutes from './routes/web'; +import { API_HOST, API_PORT } from './constants'; + +const app = express(); + +const corsOptions = { + origin: ['localhost:7000', '127.0.0.1:7000', 'http://localhost:7000'], + optionsSuccessStatus: 200, // some legacy browsers (IE11, various SmartTVs) choke on 204 +}; + +app.use(express.urlencoded({ extended: true })); +app.use(cors(corsOptions)); + +initRoutes(app); +app.listen(API_PORT, () => { + console.log(`Contracts provider listening at http://${API_HOST}:${API_PORT}`); +}); diff --git a/packages/concordia-contracts-provider/src/middleware/upload.js b/packages/concordia-contracts-provider/src/middleware/upload.js new file mode 100755 index 0000000..ced18fa --- /dev/null +++ b/packages/concordia-contracts-provider/src/middleware/upload.js @@ -0,0 +1,32 @@ +import * as util from 'util'; +import * as path from 'path'; +import * as fs from 'fs'; +import multer from 'multer'; +import { UPLOADED_CONTRACTS_DIR } from '../constants'; + +const storage = multer.diskStorage({ + destination: (req, file, callback) => { + const { params: { hash } } = req; + const contractsPath = path.join(`${__dirname}/../../${UPLOADED_CONTRACTS_DIR}/${hash}`); + + fs.mkdirSync(contractsPath, { recursive: true }); + callback(null, contractsPath); + // callback(null, UPLOADED_CONTRACTS_DIR); + }, + filename: (req, file, callback) => { + const match = ['application/json']; + + if (match.indexOf(file.mimetype) === -1) { + const message = `${file.originalname} is invalid. Only JSON files are accepted.`; + return callback(message, null); + } + + const filename = `${file.originalname}`; + callback(null, filename); + }, +}); + +const uploadFiles = multer({ storage }).array('contracts'); +const uploadFilesMiddleware = util.promisify(uploadFiles); + +export default uploadFilesMiddleware; diff --git a/packages/concordia-contracts-provider/src/routes/web.js b/packages/concordia-contracts-provider/src/routes/web.js new file mode 100755 index 0000000..5bdd4fb --- /dev/null +++ b/packages/concordia-contracts-provider/src/routes/web.js @@ -0,0 +1,14 @@ +import express from 'express'; +import downloadContracts from '../controllers/download'; +import uploadContracts from '../controllers/upload'; + +const router = express.Router(); + +const routes = (app) => { + router.get('/contracts/:hash', downloadContracts); + router.post('/contracts/:hash', uploadContracts); + + return app.use('/', router); +}; + +export default routes; From 06c8e98f28c448b9568c9f74397417d9df8c0ad4 Mon Sep 17 00:00:00 2001 From: apostolof Date: Wed, 3 Feb 2021 23:21:27 +0200 Subject: [PATCH 34/37] refactor: cleanup code, add environment configuration, add upload script and target --- .../src/constants/configuration/defaults.js | 4 + .../src/constants/contracts/ContractNames.js | 10 +- .../src/options/drizzleOptions.js | 12 +- .../concordia-app/src/utils/drizzleUtils.js | 71 +- .../concordia-contracts-provider/.gitignore | 2 + .../src/constants.js | 14 +- .../src/controllers/download.js | 5 +- .../concordia-contracts-provider/src/index.js | 14 +- .../src/middleware/upload.js | 6 +- .../src/utils/storageUtils.js | 10 + .../constants/config/defaults.js | 5 + packages/concordia-contracts/package.json | 10 +- .../utils/contractsProviderUtils.js | 31 + yarn.lock | 3104 +++++++++-------- 14 files changed, 1732 insertions(+), 1566 deletions(-) create mode 100644 packages/concordia-contracts-provider/src/utils/storageUtils.js create mode 100644 packages/concordia-contracts/utils/contractsProviderUtils.js diff --git a/packages/concordia-app/src/constants/configuration/defaults.js b/packages/concordia-app/src/constants/configuration/defaults.js index 74c67a2..1e72777 100644 --- a/packages/concordia-app/src/constants/configuration/defaults.js +++ b/packages/concordia-app/src/constants/configuration/defaults.js @@ -5,3 +5,7 @@ export const WEB3_PORT_SOCKET_CONNECT_MAX_ATTEMPTS_DEFAULT = 3; export const REACT_APP_RENDEZVOUS_HOST_DEFAULT = '127.0.0.1'; export const REACT_APP_RENDEZVOUS_PORT_DEFAULT = '9090'; + +export const REACT_APP_CONTRACTS_SUPPLIER_HOST_DEFAULT = '127.0.0.1'; +export const REACT_APP_CONTRACTS_SUPPLIER_PORT_DEFAULT = '8400'; +export const REACT_APP_CONTRACTS_VERSION_HASH_DEFAULT = 'latest'; diff --git a/packages/concordia-app/src/constants/contracts/ContractNames.js b/packages/concordia-app/src/constants/contracts/ContractNames.js index edaef10..52990a1 100644 --- a/packages/concordia-app/src/constants/contracts/ContractNames.js +++ b/packages/concordia-app/src/constants/contracts/ContractNames.js @@ -1,5 +1,11 @@ export const FORUM_CONTRACT = 'Forum'; export const POST_VOTING_CONTRACT = 'PostVoting'; export const VOTING_CONTRACT = 'Voting'; -export const NUMBER_OF_CONTRACTS = 4; -export const NUMBER_OF_CONTRACTS = 4; + +const CONTRACTS = [ + FORUM_CONTRACT, + POST_VOTING_CONTRACT, + VOTING_CONTRACT, +]; + +export default CONTRACTS; diff --git a/packages/concordia-app/src/options/drizzleOptions.js b/packages/concordia-app/src/options/drizzleOptions.js index 1323bbb..9bb664d 100644 --- a/packages/concordia-app/src/options/drizzleOptions.js +++ b/packages/concordia-app/src/options/drizzleOptions.js @@ -2,7 +2,7 @@ import { contracts } from 'concordia-contracts'; import web3Options from './web3Options'; import appEvents from '../constants/contracts/events'; -import { downloadContractArtifactsSync } from '../utils/drizzleUtils'; +import downloadContractArtifactsSync from '../utils/drizzleUtils'; const drizzleOptions = { web3: web3Options, @@ -11,14 +11,10 @@ const drizzleOptions = { reloadWindowOnAccountChange: true, // We need it to reinitialize breeze and create new Orbit databases }; -const CONTRACTS_SUPPLIER_URL = process.env.REACT_APP_CONTRACTS_SUPPLIER; - -if (!CONTRACTS_SUPPLIER_URL) { - drizzleOptions.contracts = contracts; +if (process.env.REACT_APP_USE_EXTERNAL_CONTRACTS_SUPPLIER) { + drizzleOptions.contracts = downloadContractArtifactsSync(); } else { - const remoteContracts = downloadContractArtifactsSync(); - console.log(remoteContracts); - drizzleOptions.contracts = remoteContracts; + drizzleOptions.contracts = contracts; } export default drizzleOptions; diff --git a/packages/concordia-app/src/utils/drizzleUtils.js b/packages/concordia-app/src/utils/drizzleUtils.js index 613d0cd..0f4291f 100755 --- a/packages/concordia-app/src/utils/drizzleUtils.js +++ b/packages/concordia-app/src/utils/drizzleUtils.js @@ -1,47 +1,62 @@ -// const downloadContractArtifacts = async () => { -import { NUMBER_OF_CONTRACTS } from '../constants/contracts/ContractNames'; +import { + REACT_APP_CONTRACTS_SUPPLIER_HOST_DEFAULT, + REACT_APP_CONTRACTS_SUPPLIER_PORT_DEFAULT, REACT_APP_CONTRACTS_VERSION_HASH_DEFAULT, +} from '../constants/configuration/defaults'; +import CONTRACTS from '../constants/contracts/ContractNames'; + +function getContractsDownloadRequest() { + const CONTRACTS_SUPPLIER_HOST = process.env.REACT_APP_CONTRACTS_SUPPLIER_HOST + || REACT_APP_CONTRACTS_SUPPLIER_HOST_DEFAULT; + const CONTRACTS_SUPPLIER_PORT = process.env.REACT_APP_CONTRACTS_SUPPLIER_PORT + || REACT_APP_CONTRACTS_SUPPLIER_PORT_DEFAULT; + const CONTRACTS_VERSION_HASH = process.env.REACT_APP_CONTRACTS_VERSION_HASH + || REACT_APP_CONTRACTS_VERSION_HASH_DEFAULT; -export const downloadContractArtifacts = async () => { - const headers = new Headers(); - headers.append('Access-Control-Allow-Origin', 'http://localhost:7000'); - headers.append('Access-Control-Allow-Credentials', 'true'); + const xhrRequest = new XMLHttpRequest(); - const requestOptions = { - method: 'GET', - redirect: 'follow', - headers, - }; + xhrRequest.open('GET', + `http://${CONTRACTS_SUPPLIER_HOST}:${CONTRACTS_SUPPLIER_PORT}/contracts/${CONTRACTS_VERSION_HASH}`, + false); + xhrRequest.setRequestHeader('Access-Control-Allow-Origin', 'http://localhost:7000'); + xhrRequest.setRequestHeader('Access-Control-Allow-Credentials', 'true'); - const remoteContracts = await fetch('http://127.0.0.1:8400/contracts/asdf', requestOptions) - .then((response) => response.text()) - .then((contractsRawData) => JSON.parse(contractsRawData)); + return xhrRequest; +} - if (remoteContracts.length !== NUMBER_OF_CONTRACTS) { +function validateRemoteContracts(remoteContracts) { + if (remoteContracts.length !== CONTRACTS.length) { throw new Error(`Version mismatch detected. Artifacts brought ${remoteContracts.length} contracts but app - expected ${NUMBER_OF_CONTRACTS}`); + expected ${CONTRACTS.length}`); } - return remoteContracts; -}; + const contractsPresentStatus = CONTRACTS.map((contract) => ({ + contract, + present: remoteContracts.contains((remoteContract) => remoteContract.contractName === contract), + })); + + if (contractsPresentStatus.reduce((accumulator, contract) => accumulator && contract.present, true)) { + throw new Error(`Contracts missing from artifacts. Supplier didn't bring ${contractsPresentStatus + .filter((contractPresentStatus) => contractPresentStatus.present === false) + .map((contractPresentStatus) => contractPresentStatus.contract) + .join(', ')}.`); + } +} + +const downloadContractArtifactsSync = () => { + const xhrRequest = getContractsDownloadRequest(); -export const downloadContractArtifactsSync = () => { - const xhrRequest = new XMLHttpRequest(); - // xhrRequest.withCredentials = true; - xhrRequest.open('GET', 'http://127.0.0.1:8400/contracts/asdf', false); - xhrRequest.setRequestHeader('Access-Control-Allow-Origin', 'http://localhost:7000'); - xhrRequest.setRequestHeader('Access-Control-Allow-Credentials', 'true'); xhrRequest.send(null); if (xhrRequest.status === 200) { const contractsRawData = xhrRequest.responseText; const remoteContracts = JSON.parse(contractsRawData); - if (remoteContracts.length !== NUMBER_OF_CONTRACTS) { - throw new Error(`Version mismatch detected. Artifacts brought ${remoteContracts.length} contracts but app - expected ${NUMBER_OF_CONTRACTS}`); - } + validateRemoteContracts(remoteContracts); return remoteContracts; } + throw new Error(`Remote contract artifacts download request failed!\n${xhrRequest.responseText}`); }; + +export default downloadContractArtifactsSync; diff --git a/packages/concordia-contracts-provider/.gitignore b/packages/concordia-contracts-provider/.gitignore index b1c784e..f38c888 100755 --- a/packages/concordia-contracts-provider/.gitignore +++ b/packages/concordia-contracts-provider/.gitignore @@ -20,3 +20,5 @@ yarn-error.log* .env.development.local .env.test.local .env.production.local + +contracts-uploads \ No newline at end of file diff --git a/packages/concordia-contracts-provider/src/constants.js b/packages/concordia-contracts-provider/src/constants.js index e46b59b..8a17128 100755 --- a/packages/concordia-contracts-provider/src/constants.js +++ b/packages/concordia-contracts-provider/src/constants.js @@ -1,3 +1,11 @@ -export const API_HOST = '127.0.0.1'; -export const API_PORT = '8400'; -export const UPLOADED_CONTRACTS_DIR = './contracts-uploads/'; +import path from 'path'; + +const PROVIDER_PORT = '8400'; +const UPLOAD_CONTRACTS_DIRECTORY = path.join(__dirname, '..', 'contracts-uploads'); +const CORS_ALLOWED_ORIGINS = ['localhost:7000', '127.0.0.1:7000']; + +export default { + port: PROVIDER_PORT, + uploadsDirectory: UPLOAD_CONTRACTS_DIRECTORY, + corsAllowedOrigins: CORS_ALLOWED_ORIGINS, +}; diff --git a/packages/concordia-contracts-provider/src/controllers/download.js b/packages/concordia-contracts-provider/src/controllers/download.js index 5748fff..10241c2 100755 --- a/packages/concordia-contracts-provider/src/controllers/download.js +++ b/packages/concordia-contracts-provider/src/controllers/download.js @@ -1,10 +1,11 @@ import * as fs from 'fs'; import path from 'path'; -import { UPLOADED_CONTRACTS_DIR } from '../constants'; +import getStorageLocation from '../utils/storageUtils'; const downloadContracts = async (req, res) => { const { params: { hash } } = req; - const directoryPath = path.join(`${__dirname}/../../${UPLOADED_CONTRACTS_DIR}/${hash}`); + const directoryPath = getStorageLocation(hash); + const contracts = []; fs.readdirSync(directoryPath).forEach((contractFilename) => { diff --git a/packages/concordia-contracts-provider/src/index.js b/packages/concordia-contracts-provider/src/index.js index 462db85..0d8ddf4 100755 --- a/packages/concordia-contracts-provider/src/index.js +++ b/packages/concordia-contracts-provider/src/index.js @@ -1,12 +1,17 @@ import express from 'express'; import cors from 'cors'; import initRoutes from './routes/web'; -import { API_HOST, API_PORT } from './constants'; +import constants from './constants'; + +const PROVIDER_PORT = process.env.CONTRACTS_PROVIDER_PORT || constants.port; +const ALLOWED_ORIGINS = process.env.CORS_ALLOWED_ORIGINS + ? process.env.CORS_ALLOWED_ORIGINS.split(';') + : constants.corsAllowedOrigins; const app = express(); const corsOptions = { - origin: ['localhost:7000', '127.0.0.1:7000', 'http://localhost:7000'], + origin: ALLOWED_ORIGINS, optionsSuccessStatus: 200, // some legacy browsers (IE11, various SmartTVs) choke on 204 }; @@ -14,6 +19,7 @@ app.use(express.urlencoded({ extended: true })); app.use(cors(corsOptions)); initRoutes(app); -app.listen(API_PORT, () => { - console.log(`Contracts provider listening at http://${API_HOST}:${API_PORT}`); + +app.listen(PROVIDER_PORT, () => { + console.log(`Contracts provider listening at http://127.0.0.1:${PROVIDER_PORT}`); }); diff --git a/packages/concordia-contracts-provider/src/middleware/upload.js b/packages/concordia-contracts-provider/src/middleware/upload.js index ced18fa..39a0ec0 100755 --- a/packages/concordia-contracts-provider/src/middleware/upload.js +++ b/packages/concordia-contracts-provider/src/middleware/upload.js @@ -1,17 +1,15 @@ import * as util from 'util'; -import * as path from 'path'; import * as fs from 'fs'; import multer from 'multer'; -import { UPLOADED_CONTRACTS_DIR } from '../constants'; +import getStorageLocation from '../utils/storageUtils'; const storage = multer.diskStorage({ destination: (req, file, callback) => { const { params: { hash } } = req; - const contractsPath = path.join(`${__dirname}/../../${UPLOADED_CONTRACTS_DIR}/${hash}`); + const contractsPath = getStorageLocation(hash); fs.mkdirSync(contractsPath, { recursive: true }); callback(null, contractsPath); - // callback(null, UPLOADED_CONTRACTS_DIR); }, filename: (req, file, callback) => { const match = ['application/json']; diff --git a/packages/concordia-contracts-provider/src/utils/storageUtils.js b/packages/concordia-contracts-provider/src/utils/storageUtils.js new file mode 100644 index 0000000..6471d88 --- /dev/null +++ b/packages/concordia-contracts-provider/src/utils/storageUtils.js @@ -0,0 +1,10 @@ +import path from 'path'; +import constants from '../constants'; + +const getStorageLocation = (hash) => { + const UPLOADS_DIRECTORY = process.env.UPLOAD_CONTRACTS_DIRECTORY || constants.uploadsDirectory; + + return path.join(UPLOADS_DIRECTORY, hash); +}; + +export default getStorageLocation; diff --git a/packages/concordia-contracts/constants/config/defaults.js b/packages/concordia-contracts/constants/config/defaults.js index e2cfa34..10941e0 100644 --- a/packages/concordia-contracts/constants/config/defaults.js +++ b/packages/concordia-contracts/constants/config/defaults.js @@ -4,6 +4,9 @@ const DEVELOP_CHAIN_PORT_DEFAULT = '8545'; const TEST_CHAIN_HOST_DEFAULT = '127.0.0.1'; const TEST_CHAIN_PORT_DEFAULT = '8546'; +const CONTRACTS_PROVIDER_HOST_DEFAULT = '127.0.0.1'; +const CONTRACTS_PROVIDER_PORT_DEFAULT = '8400'; + module.exports = { develop: { chainHost: DEVELOP_CHAIN_HOST_DEFAULT, @@ -13,4 +16,6 @@ module.exports = { chainHost: TEST_CHAIN_HOST_DEFAULT, chainPort: TEST_CHAIN_PORT_DEFAULT, }, + contractsProviderHost: CONTRACTS_PROVIDER_HOST_DEFAULT, + contractsProviderPort: CONTRACTS_PROVIDER_PORT_DEFAULT, }; diff --git a/packages/concordia-contracts/package.json b/packages/concordia-contracts/package.json index 595e1f1..367ccbf 100644 --- a/packages/concordia-contracts/package.json +++ b/packages/concordia-contracts/package.json @@ -10,13 +10,15 @@ "_eslint": "yarn eslint . --format table", "_solhint": "yarn solhint --formatter table contracts/*.sol test/*.sol", "test": "yarn truffle test", - "migrate": "yarn _migrate --network develop", - "migrate-reset": "yarn _migrate --network develop --reset", - "_migrate": "yarn truffle migrate" + "migrate": "yarn _migrate --network develop && yarn upload", + "migrate-reset": "yarn _migrate --network develop --reset && yarn upload", + "_migrate": "yarn truffle migrate", + "upload": "node ./utils/contractsProviderUtils.js $npm_package_version" }, "dependencies": { "@openzeppelin/contracts": "~3.2.0", - "truffle": "~5.1.55" + "truffle": "~5.1.55", + "unirest": "^0.6.0" }, "devDependencies": { "eslint": "^6.8.0", diff --git a/packages/concordia-contracts/utils/contractsProviderUtils.js b/packages/concordia-contracts/utils/contractsProviderUtils.js new file mode 100644 index 0000000..3d79162 --- /dev/null +++ b/packages/concordia-contracts/utils/contractsProviderUtils.js @@ -0,0 +1,31 @@ +const path = require('path'); +const unirest = require('unirest'); +const { contracts } = require('../index'); +const defaults = require('../constants/config/defaults'); + +const uploadContractsToProviderUnirest = (versionHash, tag) => { + const CONTRACTS_PROVIDER_HOST = process.env.CONTRACTS_PROVIDER_HOST || defaults.contractsProviderHost; + const CONTRACTS_PROVIDER_PORT = process.env.CONTRACTS_PROVIDER_PORT || defaults.contractsProviderPort; + + const uploadPath = `http://${CONTRACTS_PROVIDER_HOST}:${CONTRACTS_PROVIDER_PORT}/contracts/${versionHash}`; + const req = unirest('POST', uploadPath); + + contracts + .forEach((contract) => req + .attach('contracts', path.join(__dirname, '../', 'build/', `${contract.contractName}.json`))); + + console.log(`Uploading to ${uploadPath}`); + req.end((res) => { + if (res.error) { + throw new Error(`Failed to upload contracts to provider: ${res.error}`); + } + + console.log('Contracts uploaded to provider.'); + }); +}; + +const main = () => { + uploadContractsToProviderUnirest(process.argv[2], process.argv[3]); +}; + +main(); diff --git a/yarn.lock b/yarn.lock index e9fd9b9..5123b75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,17 +21,17 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11", "@babel/code-frame@^7.8.3": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== dependencies: - "@babel/highlight" "^7.10.4" + "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7", "@babel/compat-data@^7.9.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" - integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== +"@babel/compat-data@^7.12.13", "@babel/compat-data@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.13.tgz#27e19e0ed3726ccf54067ced4109501765e7e2e8" + integrity sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg== "@babel/core@7.9.0": version "7.9.0" @@ -56,18 +56,18 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.4.5": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" - integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.10" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.5" - "@babel/parser" "^7.12.10" - "@babel/template" "^7.12.7" - "@babel/traverse" "^7.12.10" - "@babel/types" "^7.12.10" + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.13.tgz#b73a87a3a3e7d142a66248bf6ad88b9ceb093425" + integrity sha512-BQKE9kXkPlXHPeqissfxo0lySWJcYdEP0hdtJOH/iJfDdhOCcgtNCjftCJg3qqauB4h+lz2N6ixM++b9DN1Tcw== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.12.13" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helpers" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -76,164 +76,155 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.10", "@babel/generator@^7.12.11", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" - integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== +"@babel/generator@^7.12.13", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.13.tgz#5f6ebe6c85db99886db2d7b044409196f872a503" + integrity sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw== dependencies: - "@babel/types" "^7.12.11" + "@babel/types" "^7.12.13" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" - integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== +"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" + integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== dependencies: - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.13" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3" - integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" + integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== dependencies: - "@babel/helper-explode-assignable-expression" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-explode-assignable-expression" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.8.7": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" - integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== +"@babel/helper-compilation-targets@^7.12.13", "@babel/helper-compilation-targets@^7.8.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.13.tgz#d689cdef88810aa74e15a7a94186f26a3d773c98" + integrity sha512-dXof20y/6wB5HnLOGyLh/gobsMvDNoekcC+8MCV2iaTd5JemhFkPD73QB+tK3iFC9P0xJC73B6MvKkyUfS9cCw== dependencies: - "@babel/compat-data" "^7.12.5" - "@babel/helper-validator-option" "^7.12.1" + "@babel/compat-data" "^7.12.13" + "@babel/helper-validator-option" "^7.12.11" browserslist "^4.14.5" semver "^5.5.0" -"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" - integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== +"@babel/helper-create-class-features-plugin@^7.12.13", "@babel/helper-create-class-features-plugin@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.13.tgz#0f1707c2eec1a4604f2a22a6fb209854ef2a399a" + integrity sha512-Vs/e9wv7rakKYeywsmEBSRC9KtmE7Px+YBlESekLeJOF0zbGUicGfXSNi3o+tfXSNS48U/7K9mIOOCR79Cl3+Q== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-member-expression-to-functions" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" -"@babel/helper-create-regexp-features-plugin@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f" - integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ== +"@babel/helper-create-regexp-features-plugin@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.13.tgz#0996d370a92896c612ae41a4215544bd152579c0" + integrity sha512-XC+kiA0J3at6E85dL5UnCYfVOcIZ834QcAY0TIpgUVnz0zDzg+0TtvZTnJ4g9L1dPRGe30Qi03XCIS4tYCLtqw== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.12.13" regexpu-core "^4.7.1" -"@babel/helper-define-map@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" - integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ== +"@babel/helper-explode-assignable-expression@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz#0e46990da9e271502f77507efa4c9918d3d8634a" + integrity sha512-5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/types" "^7.10.5" - lodash "^4.17.19" + "@babel/types" "^7.12.13" -"@babel/helper-explode-assignable-expression@^7.10.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633" - integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA== +"@babel/helper-function-name@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" + integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== dependencies: - "@babel/types" "^7.12.1" + "@babel/helper-get-function-arity" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" - integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== +"@babel/helper-get-function-arity@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" + integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== dependencies: - "@babel/helper-get-function-arity" "^7.12.10" - "@babel/template" "^7.12.7" - "@babel/types" "^7.12.11" + "@babel/types" "^7.12.13" -"@babel/helper-get-function-arity@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" - integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== +"@babel/helper-hoist-variables@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz#13aba58b7480b502362316ea02f52cca0e9796cd" + integrity sha512-KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw== dependencies: - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.13" -"@babel/helper-hoist-variables@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e" - integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA== +"@babel/helper-member-expression-to-functions@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz#c5715695b4f8bab32660dbdcdc2341dec7e3df40" + integrity sha512-B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.13" -"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" - integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" + integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== dependencies: - "@babel/types" "^7.12.7" + "@babel/types" "^7.12.13" -"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5", "@babel/helper-module-imports@^7.8.3": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" - integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== +"@babel/helper-module-transforms@^7.12.13", "@babel/helper-module-transforms@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea" + integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA== dependencies: - "@babel/types" "^7.12.5" - -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" - integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== - dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-simple-access" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/helper-validator-identifier" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-validator-identifier" "^7.12.11" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" lodash "^4.17.19" -"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" - integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== +"@babel/helper-optimise-call-expression@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" + integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== dependencies: - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.13" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" + integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== -"@babel/helper-remap-async-to-generator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd" - integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A== +"@babel/helper-remap-async-to-generator@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878" + integrity sha512-Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-wrap-function" "^7.10.4" - "@babel/types" "^7.12.1" + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-wrap-function" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-replace-supers@^7.12.1": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" - integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== +"@babel/helper-replace-supers@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121" + integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg== dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.7" - "@babel/helper-optimise-call-expression" "^7.12.10" - "@babel/traverse" "^7.12.10" - "@babel/types" "^7.12.11" + "@babel/helper-member-expression-to-functions" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-simple-access@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" - integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== +"@babel/helper-simple-access@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" + integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers@^7.12.1": version "7.12.1" @@ -242,63 +233,63 @@ dependencies: "@babel/types" "^7.12.1" -"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" - integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== +"@babel/helper-split-export-declaration@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" + integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== dependencies: - "@babel/types" "^7.12.11" + "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": +"@babel/helper-validator-identifier@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11": +"@babel/helper-validator-option@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f" integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw== -"@babel/helper-wrap-function@^7.10.4": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9" - integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow== +"@babel/helper-wrap-function@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz#e3ea8cb3ee0a16911f9c1b50d9e99fe8fe30f9ff" + integrity sha512-t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.9.0": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" - integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== +"@babel/helpers@^7.12.13", "@babel/helpers@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47" + integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ== dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/highlight@^7.10.4", "@babel/highlight@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/highlight@^7.12.13", "@babel/highlight@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" + integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.12.11" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" - integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": + version "7.12.14" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.14.tgz#4adb7c5eef1d437ef965ad1569cd826db8c11dc9" + integrity sha512-xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ== -"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566" - integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A== +"@babel/plugin-proposal-async-generator-functions@^7.12.13", "@babel/plugin-proposal-async-generator-functions@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz#d1c6d841802ffb88c64a2413e311f7345b9e66b5" + integrity sha512-1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-remap-async-to-generator" "^7.12.13" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-proposal-class-properties@7.8.3": @@ -309,13 +300,13 @@ "@babel/helper-create-class-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-proposal-class-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" - integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w== +"@babel/plugin-proposal-class-properties@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz#3d2ce350367058033c93c098e348161d6dc0d8c8" + integrity sha512-8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-proposal-decorators@7.8.3": version "7.8.3" @@ -334,28 +325,28 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-dynamic-import" "^7.8.0" -"@babel/plugin-proposal-export-namespace-from@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4" - integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw== +"@babel/plugin-proposal-export-namespace-from@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" + integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.12.1", "@babel/plugin-proposal-json-strings@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c" - integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw== +"@babel/plugin-proposal-json-strings@^7.12.13", "@babel/plugin-proposal-json-strings@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz#ced7888a2db92a3d520a2e35eb421fdb7fcc9b5d" + integrity sha512-v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-json-strings" "^7.8.0" -"@babel/plugin-proposal-logical-assignment-operators@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751" - integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA== +"@babel/plugin-proposal-logical-assignment-operators@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz#575b5d9a08d8299eeb4db6430da6e16e5cf14350" + integrity sha512-fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@7.8.3": @@ -366,12 +357,12 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c" - integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg== +"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.13", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz#24867307285cee4e1031170efd8a7ac807deefde" + integrity sha512-Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" "@babel/plugin-proposal-numeric-separator@7.8.3": @@ -382,29 +373,29 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-numeric-separator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.12.7", "@babel/plugin-proposal-numeric-separator@^7.8.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b" - integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ== +"@babel/plugin-proposal-numeric-separator@^7.12.13", "@babel/plugin-proposal-numeric-separator@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" + integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" - integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== +"@babel/plugin-proposal-object-rest-spread@^7.12.13", "@babel/plugin-proposal-object-rest-spread@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz#f93f3116381ff94bc676fdcb29d71045cd1ec011" + integrity sha512-WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.13" -"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942" - integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g== +"@babel/plugin-proposal-optional-catch-binding@^7.12.13", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz#4640520afe57728af14b4d1574ba844f263bcae5" + integrity sha512-9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" "@babel/plugin-proposal-optional-chaining@7.9.0": @@ -415,30 +406,30 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.9.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" - integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== +"@babel/plugin-proposal-optional-chaining@^7.12.13", "@babel/plugin-proposal-optional-chaining@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.13.tgz#63a7d805bc8ce626f3234ee5421a2a7fb23f66d9" + integrity sha512-0ZwjGfTcnZqyV3y9DSD1Yk3ebp+sIUpT2YDqP8hovzaNZnQq2Kd7PEqa6iOIUDBXBt7Jl3P7YAcEIL5Pz8u09Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-private-methods@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389" - integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w== +"@babel/plugin-proposal-private-methods@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz#ea78a12554d784ecf7fc55950b752d469d9c4a71" + integrity sha512-sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072" - integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w== +"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" + integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-async-generators@^7.8.0": version "7.8.4" @@ -447,19 +438,19 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" - integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== +"@babel/plugin-syntax-class-properties@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-decorators@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd" - integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648" + integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-dynamic-import@^7.8.0": version "7.8.3" @@ -476,11 +467,11 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-flow@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz#a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd" - integrity sha512-1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz#5df9962503c0a9c918381c929d51d4d6949e7e86" + integrity sha512-J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-json-strings@^7.8.0": version "7.8.3" @@ -489,12 +480,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926" - integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg== +"@babel/plugin-syntax-jsx@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15" + integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" @@ -538,100 +529,99 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" - integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== +"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" + integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-syntax-typescript@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5" - integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA== +"@babel/plugin-syntax-typescript@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474" + integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3" - integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A== +"@babel/plugin-transform-arrow-functions@^7.12.13", "@babel/plugin-transform-arrow-functions@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz#eda5670b282952100c229f8a3bd49e0f6a72e9fe" + integrity sha512-tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-async-to-generator@^7.12.1", "@babel/plugin-transform-async-to-generator@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" - integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== +"@babel/plugin-transform-async-to-generator@^7.12.13", "@babel/plugin-transform-async-to-generator@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz#fed8c69eebf187a535bfa4ee97a614009b24f7ae" + integrity sha512-psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A== dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-remap-async-to-generator" "^7.12.13" -"@babel/plugin-transform-block-scoped-functions@^7.12.1", "@babel/plugin-transform-block-scoped-functions@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9" - integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA== +"@babel/plugin-transform-block-scoped-functions@^7.12.13", "@babel/plugin-transform-block-scoped-functions@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" + integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.12.11", "@babel/plugin-transform-block-scoping@^7.8.3": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" - integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== +"@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" + integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6" - integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog== +"@babel/plugin-transform-classes@^7.12.13", "@babel/plugin-transform-classes@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz#9728edc1838b5d62fc93ad830bd523b1fcb0e1f6" + integrity sha512-cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-define-map" "^7.10.4" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852" - integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg== +"@babel/plugin-transform-computed-properties@^7.12.13", "@babel/plugin-transform-computed-properties@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz#6a210647a3d67f21f699cfd2a01333803b27339d" + integrity sha512-dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847" - integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw== +"@babel/plugin-transform-destructuring@^7.12.13", "@babel/plugin-transform-destructuring@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz#fc56c5176940c5b41735c677124d1d20cecc9aeb" + integrity sha512-Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975" - integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA== +"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" + integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-duplicate-keys@^7.12.1", "@babel/plugin-transform-duplicate-keys@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228" - integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw== +"@babel/plugin-transform-duplicate-keys@^7.12.13", "@babel/plugin-transform-duplicate-keys@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" + integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-exponentiation-operator@^7.12.1", "@babel/plugin-transform-exponentiation-operator@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0" - integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug== +"@babel/plugin-transform-exponentiation-operator@^7.12.13", "@babel/plugin-transform-exponentiation-operator@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" + integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-flow-strip-types@7.9.0": version "7.9.0" @@ -641,115 +631,115 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-flow" "^7.8.3" -"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa" - integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg== +"@babel/plugin-transform-for-of@^7.12.13", "@babel/plugin-transform-for-of@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz#561ff6d74d9e1c8879cb12dbaf4a14cd29d15cf6" + integrity sha512-xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-function-name@^7.12.1", "@babel/plugin-transform-function-name@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667" - integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw== +"@babel/plugin-transform-function-name@^7.12.13", "@babel/plugin-transform-function-name@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" + integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-literals@^7.12.1", "@babel/plugin-transform-literals@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57" - integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ== +"@babel/plugin-transform-literals@^7.12.13", "@babel/plugin-transform-literals@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" + integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-member-expression-literals@^7.12.1", "@babel/plugin-transform-member-expression-literals@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad" - integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg== +"@babel/plugin-transform-member-expression-literals@^7.12.13", "@babel/plugin-transform-member-expression-literals@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" + integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9" - integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ== +"@babel/plugin-transform-modules-amd@^7.12.13", "@babel/plugin-transform-modules-amd@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz#43db16249b274ee2e551e2422090aa1c47692d56" + integrity sha512-JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648" - integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag== +"@babel/plugin-transform-modules-commonjs@^7.12.13", "@babel/plugin-transform-modules-commonjs@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz#5043b870a784a8421fa1fd9136a24f294da13e50" + integrity sha512-OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-simple-access" "^7.12.13" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086" - integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q== +"@babel/plugin-transform-modules-systemjs@^7.12.13", "@babel/plugin-transform-modules-systemjs@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz#351937f392c7f07493fc79b2118201d50404a3c5" + integrity sha512-aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA== dependencies: - "@babel/helper-hoist-variables" "^7.10.4" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-hoist-variables" "^7.12.13" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-validator-identifier" "^7.12.11" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902" - integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q== +"@babel/plugin-transform-modules-umd@^7.12.13", "@babel/plugin-transform-modules-umd@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz#26c66f161d3456674e344b4b1255de4d530cfb37" + integrity sha512-BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753" - integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q== +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" + integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" -"@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0" - integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw== +"@babel/plugin-transform-new-target@^7.12.13", "@babel/plugin-transform-new-target@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" + integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-object-super@^7.12.1", "@babel/plugin-transform-object-super@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e" - integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw== +"@babel/plugin-transform-object-super@^7.12.13", "@babel/plugin-transform-object-super@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" + integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" -"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.8.7": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d" - integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg== +"@babel/plugin-transform-parameters@^7.12.13", "@babel/plugin-transform-parameters@^7.8.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz#461e76dfb63c2dfd327b8a008a9e802818ce9853" + integrity sha512-e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-property-literals@^7.12.1", "@babel/plugin-transform-property-literals@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd" - integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ== +"@babel/plugin-transform-property-literals@^7.12.13", "@babel/plugin-transform-property-literals@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" + integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-react-constant-elements@^7.0.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz#4471f0851feec3231cc9aaa0dccde39947c1ac1e" - integrity sha512-KOHd0tIRLoER+J+8f9DblZDa1fLGPwaaN1DI1TVHuQFOpjHV22C3CUB3obeC4fexHY9nx+fH0hQNvLFFfA1mxA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.13.tgz#f8ee56888545d53d80f766b3cc1563ab2c241f92" + integrity sha512-qmzKVTn46Upvtxv8LQoQ8mTCdUC83AOVQIQm57e9oekLT5cmK9GOMOfcWhe8jMNx4UJXn/UDhVZ/7lGofVNeDQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-react-display-name@7.8.3": version "7.8.3" @@ -758,14 +748,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-react-display-name@^7.12.1", "@babel/plugin-transform-react-display-name@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d" - integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w== +"@babel/plugin-transform-react-display-name@^7.12.13", "@babel/plugin-transform-react-display-name@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz#c28effd771b276f4647411c9733dbb2d2da954bd" + integrity sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0": +"@babel/plugin-transform-react-jsx-development@^7.12.12", "@babel/plugin-transform-react-jsx-development@^7.9.0": version "7.12.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz#bccca33108fe99d95d7f9e82046bfe762e71f4e7" integrity sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg== @@ -773,29 +763,29 @@ "@babel/plugin-transform-react-jsx" "^7.12.12" "@babel/plugin-transform-react-jsx-self@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28" - integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz#422d99d122d592acab9c35ea22a6cfd9bf189f60" + integrity sha512-FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-react-jsx-source@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b" - integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz#051d76126bee5c9a6aa3ba37be2f6c1698856bcb" + integrity sha512-O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.12.12", "@babel/plugin-transform-react-jsx@^7.9.1": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz#b0da51ffe5f34b9a900e9f1f5fb814f9e512d25e" - integrity sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw== +"@babel/plugin-transform-react-jsx@^7.12.12", "@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.9.1": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.13.tgz#6c9f993b9f6fb6f0e32a4821ed59349748576a3e" + integrity sha512-hhXZMYR8t9RvduN2uW4sjl6MRtUhzNE726JvoJhpjhxKgRUVkZqTsA0xc49ALZxQM7H26pZ/lLvB2Yrea9dllA== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.10" - "@babel/helper-module-imports" "^7.12.5" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-jsx" "^7.12.1" - "@babel/types" "^7.12.12" + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/plugin-syntax-jsx" "^7.12.13" + "@babel/types" "^7.12.13" "@babel/plugin-transform-react-pure-annotations@^7.12.1": version "7.12.1" @@ -805,19 +795,19 @@ "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.8.7": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" - integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng== +"@babel/plugin-transform-regenerator@^7.12.13", "@babel/plugin-transform-regenerator@^7.8.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" + integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.12.1", "@babel/plugin-transform-reserved-words@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8" - integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A== +"@babel/plugin-transform-reserved-words@^7.12.13", "@babel/plugin-transform-reserved-words@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" + integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-runtime@7.9.0": version "7.9.0" @@ -829,65 +819,65 @@ resolve "^1.8.1" semver "^5.5.1" -"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3" - integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw== +"@babel/plugin-transform-shorthand-properties@^7.12.13", "@babel/plugin-transform-shorthand-properties@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" + integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e" - integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng== +"@babel/plugin-transform-spread@^7.12.13", "@babel/plugin-transform-spread@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz#ca0d5645abbd560719c354451b849f14df4a7949" + integrity sha512-dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" -"@babel/plugin-transform-sticky-regex@^7.12.7", "@babel/plugin-transform-sticky-regex@^7.8.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad" - integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg== +"@babel/plugin-transform-sticky-regex@^7.12.13", "@babel/plugin-transform-sticky-regex@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" + integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" - integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw== +"@babel/plugin-transform-template-literals@^7.12.13", "@babel/plugin-transform-template-literals@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz#655037b07ebbddaf3b7752f55d15c2fd6f5aa865" + integrity sha512-arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-typeof-symbol@^7.12.10", "@babel/plugin-transform-typeof-symbol@^7.8.4": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" - integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== +"@babel/plugin-transform-typeof-symbol@^7.12.13", "@babel/plugin-transform-typeof-symbol@^7.8.4": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" + integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-typescript@^7.9.0": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4" - integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.13.tgz#8bcb5dd79cb8bba690d6920e19992d9228dfed48" + integrity sha512-z1VWskPJxK9tfxoYvePWvzSJC+4pxXr8ArmRm5ofqgi+mwpKg6lvtomkIngBYMJVnKhsFYVysCQLDn//v2RHcg== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-typescript" "^7.12.1" + "@babel/helper-create-class-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/plugin-syntax-typescript" "^7.12.13" -"@babel/plugin-transform-unicode-escapes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" - integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q== +"@babel/plugin-transform-unicode-escapes@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" + integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-unicode-regex@^7.12.1", "@babel/plugin-transform-unicode-regex@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb" - integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg== +"@babel/plugin-transform-unicode-regex@^7.12.13", "@babel/plugin-transform-unicode-regex@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" + integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/preset-env@7.9.0": version "7.9.0" @@ -956,30 +946,30 @@ semver "^5.5.0" "@babel/preset-env@^7.4.5": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" - integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== - dependencies: - "@babel/compat-data" "^7.12.7" - "@babel/helper-compilation-targets" "^7.12.5" - "@babel/helper-module-imports" "^7.12.5" - "@babel/helper-plugin-utils" "^7.10.4" + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.13.tgz#3aa2d09cf7d255177538dff292ac9af29ad46525" + integrity sha512-JUVlizG8SoFTz4LmVUL8++aVwzwxcvey3N0j1tRbMAXVEy95uQ/cnEkmEKHN00Bwq4voAV3imQGnQvpkLAxsrw== + dependencies: + "@babel/compat-data" "^7.12.13" + "@babel/helper-compilation-targets" "^7.12.13" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-validator-option" "^7.12.11" - "@babel/plugin-proposal-async-generator-functions" "^7.12.1" - "@babel/plugin-proposal-class-properties" "^7.12.1" + "@babel/plugin-proposal-async-generator-functions" "^7.12.13" + "@babel/plugin-proposal-class-properties" "^7.12.13" "@babel/plugin-proposal-dynamic-import" "^7.12.1" - "@babel/plugin-proposal-export-namespace-from" "^7.12.1" - "@babel/plugin-proposal-json-strings" "^7.12.1" - "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.7" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" + "@babel/plugin-proposal-export-namespace-from" "^7.12.13" + "@babel/plugin-proposal-json-strings" "^7.12.13" + "@babel/plugin-proposal-logical-assignment-operators" "^7.12.13" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.13" + "@babel/plugin-proposal-numeric-separator" "^7.12.13" + "@babel/plugin-proposal-object-rest-spread" "^7.12.13" + "@babel/plugin-proposal-optional-catch-binding" "^7.12.13" + "@babel/plugin-proposal-optional-chaining" "^7.12.13" + "@babel/plugin-proposal-private-methods" "^7.12.13" + "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" "@babel/plugin-syntax-async-generators" "^7.8.0" - "@babel/plugin-syntax-class-properties" "^7.12.1" + "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-dynamic-import" "^7.8.0" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.0" @@ -989,41 +979,41 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" "@babel/plugin-syntax-optional-chaining" "^7.8.0" - "@babel/plugin-syntax-top-level-await" "^7.12.1" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-async-to-generator" "^7.12.1" - "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.11" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-computed-properties" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-dotall-regex" "^7.12.1" - "@babel/plugin-transform-duplicate-keys" "^7.12.1" - "@babel/plugin-transform-exponentiation-operator" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-function-name" "^7.12.1" - "@babel/plugin-transform-literals" "^7.12.1" - "@babel/plugin-transform-member-expression-literals" "^7.12.1" - "@babel/plugin-transform-modules-amd" "^7.12.1" - "@babel/plugin-transform-modules-commonjs" "^7.12.1" - "@babel/plugin-transform-modules-systemjs" "^7.12.1" - "@babel/plugin-transform-modules-umd" "^7.12.1" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1" - "@babel/plugin-transform-new-target" "^7.12.1" - "@babel/plugin-transform-object-super" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-property-literals" "^7.12.1" - "@babel/plugin-transform-regenerator" "^7.12.1" - "@babel/plugin-transform-reserved-words" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.7" - "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.10" - "@babel/plugin-transform-unicode-escapes" "^7.12.1" - "@babel/plugin-transform-unicode-regex" "^7.12.1" + "@babel/plugin-syntax-top-level-await" "^7.12.13" + "@babel/plugin-transform-arrow-functions" "^7.12.13" + "@babel/plugin-transform-async-to-generator" "^7.12.13" + "@babel/plugin-transform-block-scoped-functions" "^7.12.13" + "@babel/plugin-transform-block-scoping" "^7.12.13" + "@babel/plugin-transform-classes" "^7.12.13" + "@babel/plugin-transform-computed-properties" "^7.12.13" + "@babel/plugin-transform-destructuring" "^7.12.13" + "@babel/plugin-transform-dotall-regex" "^7.12.13" + "@babel/plugin-transform-duplicate-keys" "^7.12.13" + "@babel/plugin-transform-exponentiation-operator" "^7.12.13" + "@babel/plugin-transform-for-of" "^7.12.13" + "@babel/plugin-transform-function-name" "^7.12.13" + "@babel/plugin-transform-literals" "^7.12.13" + "@babel/plugin-transform-member-expression-literals" "^7.12.13" + "@babel/plugin-transform-modules-amd" "^7.12.13" + "@babel/plugin-transform-modules-commonjs" "^7.12.13" + "@babel/plugin-transform-modules-systemjs" "^7.12.13" + "@babel/plugin-transform-modules-umd" "^7.12.13" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" + "@babel/plugin-transform-new-target" "^7.12.13" + "@babel/plugin-transform-object-super" "^7.12.13" + "@babel/plugin-transform-parameters" "^7.12.13" + "@babel/plugin-transform-property-literals" "^7.12.13" + "@babel/plugin-transform-regenerator" "^7.12.13" + "@babel/plugin-transform-reserved-words" "^7.12.13" + "@babel/plugin-transform-shorthand-properties" "^7.12.13" + "@babel/plugin-transform-spread" "^7.12.13" + "@babel/plugin-transform-sticky-regex" "^7.12.13" + "@babel/plugin-transform-template-literals" "^7.12.13" + "@babel/plugin-transform-typeof-symbol" "^7.12.13" + "@babel/plugin-transform-unicode-escapes" "^7.12.13" + "@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.11" + "@babel/types" "^7.12.13" core-js-compat "^3.8.0" semver "^5.5.0" @@ -1051,14 +1041,14 @@ "@babel/plugin-transform-react-jsx-source" "^7.9.0" "@babel/preset-react@^7.0.0": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9" - integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-transform-react-display-name" "^7.12.1" - "@babel/plugin-transform-react-jsx" "^7.12.10" - "@babel/plugin-transform-react-jsx-development" "^7.12.7" + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz#5f911b2eb24277fa686820d5bd81cad9a0602a0a" + integrity sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/plugin-transform-react-display-name" "^7.12.13" + "@babel/plugin-transform-react-jsx" "^7.12.13" + "@babel/plugin-transform-react-jsx-development" "^7.12.12" "@babel/plugin-transform-react-pure-annotations" "^7.12.1" "@babel/preset-typescript@7.9.0": @@ -1070,9 +1060,9 @@ "@babel/plugin-transform-typescript" "^7.9.0" "@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz#ffee91da0eb4c6dae080774e94ba606368e414f4" - integrity sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.13.tgz#53d09813b7c20d616caf258e9325550ff701c039" + integrity sha512-8fSpqYRETHATtNitsCXq8QQbKJP31/KnDl2Wz2Vtui9nKzjss2ysuZtyVsWjBtvkeEFo346gkwjYPab1hvrXkQ== dependencies: core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" @@ -1085,40 +1075,40 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" - integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d" + integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.4.0", "@babel/template@^7.8.6": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" - integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" - integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== - dependencies: - "@babel/code-frame" "^7.12.11" - "@babel/generator" "^7.12.11" - "@babel/helper-function-name" "^7.12.11" - "@babel/helper-split-export-declaration" "^7.12.11" - "@babel/parser" "^7.12.11" - "@babel/types" "^7.12.12" +"@babel/template@^7.12.13", "@babel/template@^7.4.0", "@babel/template@^7.8.6": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" + integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.13", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" + integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.12.13" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" - integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" + integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== dependencies: "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" @@ -1142,10 +1132,26 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18" integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== -"@ethersproject/abi@5.0.10", "@ethersproject/abi@^5.0.10": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.10.tgz#c32baa919ad0e5cddabb2f3a8aed0eaeeed7fa4a" - integrity sha512-cfC3lGgotfxX3SMri4+CisOPwignoj/QGHW9J29spC4R4Qqcnk/SYuVkPFBMdLbvBp3f/pGiVqPNwont0TSXhg== +"@eslint/eslintrc@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" + integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + lodash "^4.17.20" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +"@ethersproject/abi@5.0.11", "@ethersproject/abi@^5.0.10": + version "5.0.11" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.11.tgz#d3b6fd955d3172214603d4d123055b3b0b06376b" + integrity sha512-ibZswQsjdFuLSfY2lbRTZM2Uk+ci7tp+mjVK0kjxVol2V32cb7va1r6B4AJU/Ac/VTstCjxtn0KKMfbkPc002w== dependencies: "@ethersproject/address" "^5.0.9" "@ethersproject/bignumber" "^5.0.13" @@ -1172,10 +1178,10 @@ "@ethersproject/properties" "^5.0.3" "@ethersproject/strings" "^5.0.4" -"@ethersproject/abstract-provider@5.0.8", "@ethersproject/abstract-provider@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.8.tgz#880793c29bfed33dff4c2b2be7ecb9ba966d52c0" - integrity sha512-fqJXkewcGdi8LogKMgRyzc/Ls2js07yor7+g9KfPs09uPOcQLg7cc34JN+lk34HH9gg2HU0DIA5797ZR8znkfw== +"@ethersproject/abstract-provider@5.0.9", "@ethersproject/abstract-provider@^5.0.8": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.9.tgz#a55410b73e3994842884eb82b1f43e3a9f653eea" + integrity sha512-X9fMkqpeu9ayC3JyBkeeZhn35P4xQkpGX/l+FrxDtEW9tybf/UWXSMi8bGThpPtfJ6q6U2LDetXSpSwK4TfYQQ== dependencies: "@ethersproject/bignumber" "^5.0.13" "@ethersproject/bytes" "^5.0.9" @@ -1185,10 +1191,10 @@ "@ethersproject/transactions" "^5.0.9" "@ethersproject/web" "^5.0.12" -"@ethersproject/abstract-signer@5.0.11", "@ethersproject/abstract-signer@^5.0.10": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.11.tgz#675da9ec168905c60ee79a6da95f7157ca956f46" - integrity sha512-RKOgPSEYafknA62SrD3OCK42AllHE4YBfKYXyQeM+sBP7Nq3X5FpzeoY4uzC43P4wIhmNoTHCKQuwnX7fBqb6Q== +"@ethersproject/abstract-signer@5.0.12", "@ethersproject/abstract-signer@^5.0.10": + version "5.0.12" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.12.tgz#04ab597eb87a08faaab19dd5a739339e1e3beb58" + integrity sha512-qt4jAEzQGPZ31My1gFGPzzJHJveYhVycW7RHkuX0W8fvMdg7wr0uvP7mQEptMVrb+jYwsVktCf6gBGwWDpFiTA== dependencies: "@ethersproject/abstract-provider" "^5.0.8" "@ethersproject/bignumber" "^5.0.13" @@ -1196,10 +1202,10 @@ "@ethersproject/logger" "^5.0.8" "@ethersproject/properties" "^5.0.7" -"@ethersproject/address@5.0.9", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.9": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.9.tgz#347ef30dc8243c682574a3f23ff63f73c8f8cbf1" - integrity sha512-gKkmbZDMyGbVjr8nA5P0md1GgESqSGH7ILIrDidPdNXBl4adqbuA3OAuZx/O2oGpL6PtJ9BDa0kHheZ1ToHU3w== +"@ethersproject/address@5.0.10", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.9": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.10.tgz#2bc69fdff4408e0570471cd19dee577ab06a10d0" + integrity sha512-70vqESmW5Srua1kMDIN6uVfdneZMaMyRYH4qPvkAXGkbicrCOsA9m01vIloA4wYiiF+HLEfL1ENKdn5jb9xiAw== dependencies: "@ethersproject/bignumber" "^5.0.13" "@ethersproject/bytes" "^5.0.9" @@ -1207,48 +1213,48 @@ "@ethersproject/logger" "^5.0.8" "@ethersproject/rlp" "^5.0.7" -"@ethersproject/base64@5.0.7", "@ethersproject/base64@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.7.tgz#d5da73699b4a33dc92bd8e5056ad1880b262057d" - integrity sha512-S5oh5DVfCo06xwJXT8fQC68mvJfgScTl2AXvbYMsHNfIBTDb084Wx4iA9MNlEReOv6HulkS+gyrUM/j3514rSw== +"@ethersproject/base64@5.0.8", "@ethersproject/base64@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.8.tgz#1bc4b4b8c59c1debf972c7164b96c0b8964a20a1" + integrity sha512-PNbpHOMgZpZ1skvQl119pV2YkCPXmZTxw+T92qX0z7zaMFPypXWTZBzim+hUceb//zx4DFjeGT4aSjZRTOYThg== dependencies: "@ethersproject/bytes" "^5.0.9" -"@ethersproject/basex@5.0.7", "@ethersproject/basex@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.0.7.tgz#2f7026b12c9dee6cdc7b7bf1805461836e635495" - integrity sha512-OsXnRsujGmYD9LYyJlX+cVe5KfwgLUbUJrJMWdzRWogrygXd5HvGd7ygX1AYjlu1z8W/+t2FoQnczDR/H2iBjA== +"@ethersproject/basex@5.0.8", "@ethersproject/basex@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.0.8.tgz#6867fad20047aa29fbd4b880f27894ed04cc7bb8" + integrity sha512-PCVKZIShBQUqAXjJSvaCidThPvL0jaaQZcewJc0sf8Xx05BizaOS8r3jdPdpNdY+/qZtRDqwHTSKjvR/xssyLQ== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/properties" "^5.0.7" -"@ethersproject/bignumber@5.0.13", "@ethersproject/bignumber@^5.0.13", "@ethersproject/bignumber@^5.0.7": - version "5.0.13" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.13.tgz#a5466412b3b80104097b9c694f6ae827df4353fe" - integrity sha512-b89bX5li6aK492yuPP5mPgRVgIxxBP7ksaBtKX5QQBsrZTpNOjf/MR4CjcUrAw8g+RQuD6kap9lPjFgY4U1/5A== +"@ethersproject/bignumber@5.0.14", "@ethersproject/bignumber@^5.0.13", "@ethersproject/bignumber@^5.0.7": + version "5.0.14" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.14.tgz#605bc61dcbd4a8c6df8b5a7a77c0210273f3de8a" + integrity sha512-Q4TjMq9Gg3Xzj0aeJWqJgI3tdEiPiET7Y5OtNtjTAODZ2kp4y9jMNg97zVcvPedFvGROdpGDyCI77JDFodUzOw== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/logger" "^5.0.8" bn.js "^4.4.0" -"@ethersproject/bytes@5.0.9", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.0.9": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.9.tgz#2748247402ad20df69f3a3e935dc7b58c0d75c08" - integrity sha512-k+17ZViDtAugC0s7HM6rdsTWEdIYII4RPCDkPEuxKc6i40Bs+m6tjRAtCECX06wKZnrEoR9pjOJRXHJ/VLoOcA== +"@ethersproject/bytes@5.0.10", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.0.9": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.10.tgz#aa49afe7491ba24ff76fa33d98677351263f9ba4" + integrity sha512-vpu0v1LZ1j1s9kERQIMnVU69MyHEzUff7nqK9XuCU4vx+AM8n9lU2gj7jtJIvGSt9HzatK/6I6bWusI5nyuaTA== dependencies: "@ethersproject/logger" "^5.0.8" -"@ethersproject/constants@5.0.8", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.8.tgz#50f2e23f48c0d1d0de3759ea79b68ec3e06435a1" - integrity sha512-sCc73pFBsl59eDfoQR5OCEZCRv5b0iywadunti6MQIr5lt3XpwxK1Iuzd8XSFO02N9jUifvuZRrt0cY0+NBgTg== +"@ethersproject/constants@5.0.9", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.0.8": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.9.tgz#81ac44c3bf612de63eb1c490b314ea1b932cda9f" + integrity sha512-2uAKH89UcaJP/Sc+54u92BtJtZ4cPgcS1p0YbB1L3tlkavwNvth+kNCUplIB1Becqs7BOZr0B/3dMNjhJDy4Dg== dependencies: "@ethersproject/bignumber" "^5.0.13" -"@ethersproject/contracts@5.0.9": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.0.9.tgz#6c67c0ebe20ee1af903f7f43568401023334a181" - integrity sha512-CCTxVeDh6sjdSEbjzONhtwPjECvaHE62oGkY8M7kP0CHmgLD2SEGel0HZib8e5oQKRKGly9AKcUFW4g3rQ0AQw== +"@ethersproject/contracts@5.0.10": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.0.10.tgz#650cbf6f3cf89a63006ea91727a68aee4dc3381f" + integrity sha512-h9kdvllwT6B1LyUXeNQIb7Y6u6ZprP5LUiQIjSqvOehhm1sFZcaVtydsSa0LIg3SBC5QF0M7zH5p7EtI2VD0rQ== dependencies: "@ethersproject/abi" "^5.0.10" "@ethersproject/abstract-provider" "^5.0.8" @@ -1260,10 +1266,10 @@ "@ethersproject/logger" "^5.0.8" "@ethersproject/properties" "^5.0.7" -"@ethersproject/hash@5.0.10", "@ethersproject/hash@^5.0.10", "@ethersproject/hash@^5.0.4": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.10.tgz#41bf37428e8ddbc229ffd81c47af667174cb491a" - integrity sha512-Tf0bvs6YFhw28LuHnhlDWyr0xfcDxSXdwM4TcskeBbmXVSKLv3bJQEEEBFUcRX0fJuslR3gCVySEaSh7vuMx5w== +"@ethersproject/hash@5.0.11", "@ethersproject/hash@^5.0.10", "@ethersproject/hash@^5.0.4": + version "5.0.11" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.11.tgz#da89517438bbbf8a39df56fff09f0a71669ae7a7" + integrity sha512-H3KJ9fk33XWJ2djAW03IL7fg3DsDMYjO1XijiUb1hJ85vYfhvxu0OmsU7d3tg2Uv1H1kFSo8ghr3WFQ8c+NL3g== dependencies: "@ethersproject/abstract-signer" "^5.0.10" "@ethersproject/address" "^5.0.9" @@ -1274,10 +1280,10 @@ "@ethersproject/properties" "^5.0.7" "@ethersproject/strings" "^5.0.8" -"@ethersproject/hdnode@5.0.8", "@ethersproject/hdnode@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.0.8.tgz#2b52ede921cfbce8de49da774ec5a74025fc2bb1" - integrity sha512-Mscpjd7BBjxYSWghaNMwV0xrBBkOoCq6YEPRm9MgE24CiBlzzbfEB5DGq6hiZqhQaxPkdCUtKKqZi3nt9hx43g== +"@ethersproject/hdnode@5.0.9", "@ethersproject/hdnode@^5.0.8": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.0.9.tgz#ce65b430d3d3f0cd3c8f9dfaaf376b55881d9dba" + integrity sha512-S5UMmIC6XfFtqhUK4uTjD8GPNzSbE+sZ/0VMqFnA3zAJ+cEFZuEyhZDYnl2ItGJzjT4jsy+uEy1SIl3baYK1PQ== dependencies: "@ethersproject/abstract-signer" "^5.0.10" "@ethersproject/basex" "^5.0.7" @@ -1292,10 +1298,10 @@ "@ethersproject/transactions" "^5.0.9" "@ethersproject/wordlists" "^5.0.8" -"@ethersproject/json-wallets@5.0.10", "@ethersproject/json-wallets@^5.0.10": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.0.10.tgz#cdc9c27cb486762a3313e25f6f2fef0eb890dbaf" - integrity sha512-Ux36u+d7Dm0M5AQ+mWuHdvfGPMN8K1aaLQgwzrsD4ELTWlwRuHuQbmn7/GqeOpbfaV6POLwdYcBk2TXjlGp/IQ== +"@ethersproject/json-wallets@5.0.11", "@ethersproject/json-wallets@^5.0.10": + version "5.0.11" + resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.0.11.tgz#86fdc41b7762acb443d6a896f6c61231ab2aee5d" + integrity sha512-0GhWScWUlXXb4qJNp0wmkU95QS3YdN9UMOfMSEl76CRANWWrmyzxcBVSXSBu5iQ0/W8wO+xGlJJ3tpA6v3mbIw== dependencies: "@ethersproject/abstract-signer" "^5.0.10" "@ethersproject/address" "^5.0.9" @@ -1311,45 +1317,45 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/keccak256@5.0.7", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.7.tgz#2eedb5e4c160fcdf0079660f8ae362d7855ea943" - integrity sha512-zpUBmofWvx9PGfc7IICobgFQSgNmTOGTGLUxSYqZzY/T+b4y/2o5eqf/GGmD7qnTGzKQ42YlLNo+LeDP2qe55g== +"@ethersproject/keccak256@5.0.8", "@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.8.tgz#13aaf69e1c8bd15fc59a2ebd055c0878f2a059c8" + integrity sha512-zoGbwXcWWs9MX4NOAZ7N0hhgIRl4Q/IO/u9c/RHRY4WqDy3Ywm0OLamEV53QDwhjwn3YiiVwU1Ve5j7yJ0a/KQ== dependencies: "@ethersproject/bytes" "^5.0.9" js-sha3 "0.5.7" -"@ethersproject/logger@5.0.8", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.8.tgz#135c1903d35c878265f3cbf2b287042c4c20d5d4" - integrity sha512-SkJCTaVTnaZ3/ieLF5pVftxGEFX56pTH+f2Slrpv7cU0TNpUZNib84QQdukd++sWUp/S7j5t5NW+WegbXd4U/A== +"@ethersproject/logger@5.0.9", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.0.8": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.9.tgz#0e6a0b3ecc938713016954daf4ac7967467aa763" + integrity sha512-kV3Uamv3XOH99Xf3kpIG3ZkS7mBNYcLDM00JSDtNgNB4BihuyxpQzIZPRIDmRi+95Z/R1Bb0X2kUNHa/kJoVrw== -"@ethersproject/networks@5.0.7", "@ethersproject/networks@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.7.tgz#8d06e41197b27c2404d89a29ca21f741a01acbfc" - integrity sha512-dI14QATndIcUgcCBL1c5vUr/YsI5cCHLN81rF7PU+yS7Xgp2/Rzbr9+YqpC6NBXHFUASjh6GpKqsVMpufAL0BQ== +"@ethersproject/networks@5.0.8", "@ethersproject/networks@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.8.tgz#37e6f8c058f2d540373ea5939056cd3de069132e" + integrity sha512-PYpptlO2Tu5f/JEBI5hdlMds5k1DY1QwVbh3LKPb3un9dQA2bC51vd2/gRWAgSBpF3kkmZOj4FhD7ATLX4H+DA== dependencies: "@ethersproject/logger" "^5.0.8" -"@ethersproject/pbkdf2@5.0.7", "@ethersproject/pbkdf2@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.0.7.tgz#a36fdb7327760ec0096857053e01c923a63417da" - integrity sha512-0SNLNixPMqnosH6pyc4yPiUu/C9/Jbu+f6I8GJW9U2qNpMBddmRJviwseoha5Zw1V+Aw0Z/yvYyzIIE8yPXqLA== +"@ethersproject/pbkdf2@5.0.8", "@ethersproject/pbkdf2@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.0.8.tgz#06a086b1ac04c75e6846afd6cf6170a49a634411" + integrity sha512-UlmAMGbIPaS2xXsI38FbePVTfJMuU9jnwcqVn3p88HxPF4kD897ha+l3TNsBqJqf32UbQL5GImnf1oJkSKq4vQ== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/sha2" "^5.0.7" -"@ethersproject/properties@5.0.7", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.7.tgz#951d11ba592ff90bbe8ec34c5a03a5157e3b3360" - integrity sha512-812H1Rus2vjw0zbasfDI1GLNPDsoyX1pYqiCgaR1BuyKxUTbwcH1B+214l6VGe1v+F6iEVb7WjIwMjKhb4EUsg== +"@ethersproject/properties@5.0.8", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.8.tgz#e45d28d25402c73394873dbf058f856c966cae01" + integrity sha512-zEnLMze2Eu2VDPj/05QwCwMKHh506gpT9PP9KPVd4dDB+5d6AcROUYVLoIIQgBYK7X/Gw0UJmG3oVtnxOQafAw== dependencies: "@ethersproject/logger" "^5.0.8" -"@ethersproject/providers@5.0.19": - version "5.0.19" - resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.0.19.tgz#94c8f1a86755ee4187911fc6250e94b1116c089a" - integrity sha512-G+flo1jK1y/rvQy6b71+Nu7qOlkOKz+XqpgqFMZslkCzGuzQRmk9Qp7Ln4soK8RSyP1e5TCujaRf1H+EZahoaw== +"@ethersproject/providers@5.0.21": + version "5.0.21" + resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.0.21.tgz#04e6b7734637a82ea4df22ef49311f419fc5e3bd" + integrity sha512-KyH9TylyLqspbO/2C0ph+0ZpOnb/2GkKQtpcs7IyHZ/wHXdhbClLeaBdO0b4Fpo6zAZWjgIdN6WUOMGkyy7b6A== dependencies: "@ethersproject/abstract-provider" "^5.0.8" "@ethersproject/abstract-signer" "^5.0.10" @@ -1371,45 +1377,45 @@ bech32 "1.1.4" ws "7.2.3" -"@ethersproject/random@5.0.7", "@ethersproject/random@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.0.7.tgz#e364268ce68bf6d300c36d654e622fd9d26b3a86" - integrity sha512-PxSRWwN3s+FH9AWMZU6AcWJsNQ9KzqKV6NgdeKPtxahdDjCuXxTAuzTZNXNRK+qj+Il351UnweAGd+VuZcOAlQ== +"@ethersproject/random@5.0.8", "@ethersproject/random@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.0.8.tgz#8d3726be48e95467abce9b23c93adbb1de009dda" + integrity sha512-4rHtotmd9NjklW0eDvByicEkL+qareIyFSbG1ShC8tPJJSAC0g55oQWzw+3nfdRCgBHRuEE7S8EcPcTVPvZ9cA== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/logger" "^5.0.8" -"@ethersproject/rlp@5.0.7", "@ethersproject/rlp@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.7.tgz#cfa4fa6415960a435b7814e1a29bdfea657e2b6e" - integrity sha512-ulUTVEuV7PT4jJTPpfhRHK57tkLEDEY9XSYJtrSNHOqdwMvH0z7BM2AKIMq4LVDlnu4YZASdKrkFGEIO712V9w== +"@ethersproject/rlp@5.0.8", "@ethersproject/rlp@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.8.tgz#ff54e206d0ae28640dd054f2bcc7070f06f9dfbe" + integrity sha512-E4wdFs8xRNJfzNHmnkC8w5fPeT4Wd1U2cust3YeT16/46iSkLT8nn8ilidC6KhR7hfuSZE4UqSPzyk76p7cdZg== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/logger" "^5.0.8" -"@ethersproject/sha2@5.0.7", "@ethersproject/sha2@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.0.7.tgz#ef9f18770c9f90a6cfd73840b0c3400910219099" - integrity sha512-MbUqz68hhp5RsaZdqi1eg1rrtiqt5wmhRYqdA7MX8swBkzW2KiLgK+Oh25UcWhUhdi1ImU9qrV6if5j0cC7Bxg== +"@ethersproject/sha2@5.0.8", "@ethersproject/sha2@^5.0.7": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.0.8.tgz#9903c67e562739d8b312820b0a265b9c9bf35fc3" + integrity sha512-ILP1ZgyvDj4rrdE+AXrTv9V88m7x87uga2VZ/FeULKPumOEw/4bGnJz/oQ8zDnDvVYRCJ+48VaQBS2CFLbk1ww== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/logger" "^5.0.8" hash.js "1.1.3" -"@ethersproject/signing-key@5.0.8", "@ethersproject/signing-key@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.8.tgz#156522e542916b9aa9135527b40c5b6f9235af02" - integrity sha512-YKxQM45eDa6WAD+s3QZPdm1uW1MutzVuyoepdRRVmMJ8qkk7iOiIhUkZwqKLNxKzEJijt/82ycuOREc9WBNAKg== +"@ethersproject/signing-key@5.0.9", "@ethersproject/signing-key@^5.0.8": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.9.tgz#37e3038e26b53979d41dd90a2077fb0efd020fcc" + integrity sha512-AobnsEiLv+Z4a/NbbelwB/Lsnc+qxeNejXDlEwbo/nwjijvxLpwiNN+rjx/lQGel1QnQ/d+lEv7xezyUaXdKFQ== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/logger" "^5.0.8" "@ethersproject/properties" "^5.0.7" elliptic "6.5.3" -"@ethersproject/solidity@5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.0.8.tgz#a260116a794bc97558d89e98f59831ce8d25c733" - integrity sha512-OJkyBq9KaoGsi8E8mYn6LX+vKyCURvxSp0yuGBcOqEFM3vkn9PsCiXsHdOXdNBvlHG5evJXwAYC2UR0TzgJeKA== +"@ethersproject/solidity@5.0.9": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.0.9.tgz#49100fbe9f364ac56f7ff7c726f4f3d151901134" + integrity sha512-LIxSAYEQgLRXE3mRPCq39ou61kqP8fDrGqEeNcaNJS3aLbmAOS8MZp56uK++WsdI9hj8sNsFh78hrAa6zR9Jag== dependencies: "@ethersproject/bignumber" "^5.0.13" "@ethersproject/bytes" "^5.0.9" @@ -1417,19 +1423,19 @@ "@ethersproject/sha2" "^5.0.7" "@ethersproject/strings" "^5.0.8" -"@ethersproject/strings@5.0.8", "@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.8.tgz#11a1b0ed1e8417408693789839f0b5f4e323c0c9" - integrity sha512-5IsdXf8tMY8QuHl8vTLnk9ehXDDm6x9FB9S9Og5IA1GYhLe5ZewydXSjlJlsqU2t9HRbfv97OJZV/pX8DVA/Hw== +"@ethersproject/strings@5.0.9", "@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.0.8": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.9.tgz#8e2eb2918b140231e1d1b883d77e43213a8ac280" + integrity sha512-ogxBpcUpdO524CYs841MoJHgHxEPUy0bJFDS4Ezg8My+WYVMfVAOlZSLss0Rurbeeam8CpUVDzM4zUn09SU66Q== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/constants" "^5.0.8" "@ethersproject/logger" "^5.0.8" -"@ethersproject/transactions@5.0.9", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.9": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.9.tgz#ccfcc1d395b5e3ce7342545fa28bfe5541182fd6" - integrity sha512-0Fu1yhdFBkrbMjenEr+39tmDxuHmaw0pe9Jb18XuKoItj7Z3p7+UzdHLr2S/okvHDHYPbZE5gtANDdQ3ZL1nBA== +"@ethersproject/transactions@5.0.10", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.9": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.10.tgz#d50cafd80d27206336f80114bc0f18bc18687331" + integrity sha512-Tqpp+vKYQyQdJQQk4M73tDzO7ODf2D42/sJOcKlDAAbdSni13v6a+31hUdo02qYXhVYwIs+ZjHnO4zKv5BNk8w== dependencies: "@ethersproject/address" "^5.0.9" "@ethersproject/bignumber" "^5.0.13" @@ -1441,19 +1447,19 @@ "@ethersproject/rlp" "^5.0.7" "@ethersproject/signing-key" "^5.0.8" -"@ethersproject/units@5.0.9": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.0.9.tgz#f8dc406f593eadcba883d6e86cc077203b03e7da" - integrity sha512-4jIkcMVrJ3lCgXMO4M/2ww0/T/IN08vJTZld7FIAwa6aoBDTAy71+sby3sShl1SG3HEeKYbI3fBWauCUgPRUpQ== +"@ethersproject/units@5.0.10": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.0.10.tgz#9cca3b65cd0c92fab1bd33f2abd233546dd61987" + integrity sha512-eaiHi9ham5lbC7qpqxpae7OY/nHJUnRUnFFuEwi2VB5Nwe3Np468OAV+e+HR+jAK4fHXQE6PFBTxWGtnZuO37g== dependencies: "@ethersproject/bignumber" "^5.0.13" "@ethersproject/constants" "^5.0.8" "@ethersproject/logger" "^5.0.8" -"@ethersproject/wallet@5.0.10": - version "5.0.10" - resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.0.10.tgz#16ad0864d9e0e2b57fb32d768ea4161891d62727" - integrity sha512-5siYr38NhqZKH6DUr6u4PdhgOKur8Q6sw+JID2TitEUmW0tOl8f6rpxAe77tw6SJT60D2UcvgsyLtl32+Nl+ig== +"@ethersproject/wallet@5.0.11": + version "5.0.11" + resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.0.11.tgz#9891936089d1b91e22ed59f850bc344b1544bf26" + integrity sha512-2Fg/DOvUltR7aZTOyWWlQhru+SKvq2UE3uEhXSyCFgMqDQNuc2nHXh1SHJtN65jsEbjVIppOe1Q7EQMvhmeeRw== dependencies: "@ethersproject/abstract-provider" "^5.0.8" "@ethersproject/abstract-signer" "^5.0.10" @@ -1471,10 +1477,10 @@ "@ethersproject/transactions" "^5.0.9" "@ethersproject/wordlists" "^5.0.8" -"@ethersproject/web@5.0.12", "@ethersproject/web@^5.0.12": - version "5.0.12" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.12.tgz#f123397c107f863c31fce5f31a97c66ec155e755" - integrity sha512-gVxS5iW0bgidZ76kr7LsTxj4uzN5XpCLzvZrLp8TP+4YgxHfCeetFyQkRPgBEAJdNrexdSBayvyJvzGvOq0O8g== +"@ethersproject/web@5.0.13", "@ethersproject/web@^5.0.12": + version "5.0.13" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.13.tgz#5a92ac6d835d2ebce95b6b645a86668736e2f532" + integrity sha512-G3x/Ns7pQm21ALnWLbdBI5XkW/jrsbXXffI9hKNPHqf59mTxHYtlNiSwxdoTSwCef3Hn7uvGZpaSgTyxs7IufQ== dependencies: "@ethersproject/base64" "^5.0.7" "@ethersproject/bytes" "^5.0.9" @@ -1482,10 +1488,10 @@ "@ethersproject/properties" "^5.0.7" "@ethersproject/strings" "^5.0.8" -"@ethersproject/wordlists@5.0.8", "@ethersproject/wordlists@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.0.8.tgz#593319b710a5a1f4e839b72641aa765b4f111137" - integrity sha512-px2mloc1wAcdTbzv0ZotTx+Uh/dfnDO22D9Rx8xr7+/PUwAhZQjoJ9t7Hn72nsaN83rWBXsLvFcIRZju4GIaEQ== +"@ethersproject/wordlists@5.0.9", "@ethersproject/wordlists@^5.0.8": + version "5.0.9" + resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.0.9.tgz#f16cc0b317637c3ae9c689ebd7bc2cbbffadd013" + integrity sha512-Sn6MTjZkfbriod6GG6+p43W09HOXT4gwcDVNj0YoPYlo4Zq2Fk6b1CU9KUX3c6aI17PrgYb4qwZm5BMuORyqyQ== dependencies: "@ethersproject/bytes" "^5.0.9" "@ethersproject/hash" "^5.0.10" @@ -1525,16 +1531,16 @@ orbit-db-identity-provider "~0.3.1" "@fluentui/react-component-event-listener@~0.51.0": - version "0.51.6" - resolved "https://registry.yarnpkg.com/@fluentui/react-component-event-listener/-/react-component-event-listener-0.51.6.tgz#8e193b8bb20570aed09581080f110f5a95b51432" - integrity sha512-XbT3p28N6Bz6TsQSf4drCqJNL133DUYCSvyiWsDl7Y5IWzAMKwGcc4nETxqjP07XvInD9fJW9vOqWFlpLBe1xg== + version "0.51.7" + resolved "https://registry.yarnpkg.com/@fluentui/react-component-event-listener/-/react-component-event-listener-0.51.7.tgz#158adb970d8bc982c91c57fd1322a0036042d86e" + integrity sha512-NjVm+crN0T9A7vITL8alZeHnuV8zi2gos0nezU/2YOxaUAB9E4zKiPxt/6k5U50rJs/gj8Nu45iXxnjO41HbZg== dependencies: "@babel/runtime" "^7.10.4" "@fluentui/react-component-ref@~0.51.0": - version "0.51.6" - resolved "https://registry.yarnpkg.com/@fluentui/react-component-ref/-/react-component-ref-0.51.6.tgz#ba1fc8a82a49f4775a043079ca8a234f3c02a1c4" - integrity sha512-FrUJKizIdL2PlUji5zMB3cTNICv/zk4/nbX6W9F+FmaEAozEm62MRZWOSAX83bnzPQX0OtPBYTenh+5dAI+BMA== + version "0.51.7" + resolved "https://registry.yarnpkg.com/@fluentui/react-component-ref/-/react-component-ref-0.51.7.tgz#bfb0312e926c213bed35e53ee5105a68732eea99" + integrity sha512-CX27jVJYaFoBCWpuWAizQZ2se137ku1dmDyn8sw+ySNJa+kkQf7LnMydiPW5K7cRdUSqUJW3eS4EjKRvVAx8xA== dependencies: "@babel/runtime" "^7.10.4" react-is "^16.6.3" @@ -1637,9 +1643,9 @@ integrity sha512-WSrlgpvEqgPWkI18kkGELEZfXr0bYLtr16iIN4Krh9sRnzBZN6nnWxHFxtsnP684wueEySBbXPDg/WfA9xJdBQ== "@hapi/hapi@^20.0.0": - version "20.0.3" - resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.0.3.tgz#e72cad460394e6d2c15f9c57abb5d3332dea27e3" - integrity sha512-aqJVHVjoY3phiZsgsGjDRG15CoUNIs1azScqLZDOCZUSKYGTbzPi+K0QP+RUjUJ0m8L9dRuTZ27c8HKxG3wEhA== + version "20.1.0" + resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.1.0.tgz#af39b3ad00a9d8c612cde7bbead5f32a6706c488" + integrity sha512-DocLxRpPlHV0jEZw7FHfF/Y+tiRLNOXMcqEDGWdqfbQkDKo8ca3TLHRO4w91BKq1TDcM27w+MHZ1sINTDZyGRw== dependencies: "@hapi/accept" "^5.0.1" "@hapi/ammo" "^5.0.1" @@ -1749,9 +1755,9 @@ "@hapi/validate" "1.x.x" "@hapi/shot@^5.0.1": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@hapi/shot/-/shot-5.0.4.tgz#6c978314f21a054c041f4becc50095dd78d3d775" - integrity sha512-PcEz0WJgFDA3xNSMeONgQmothFr7jhbbRRSAKaDh7chN7zOXBlhl13bvKZW6CMb2xVfJUmt34CW3e/oExMgBhQ== + version "5.0.5" + resolved "https://registry.yarnpkg.com/@hapi/shot/-/shot-5.0.5.tgz#a25c23d18973bec93c7969c51bf9579632a5bebd" + integrity sha512-x5AMSZ5+j+Paa8KdfCoKh+klB78otxF+vcJR/IoN91Vo2e5ulXIW6HUsFTCU+4W6P/Etaip9nmdAx2zWDimB2A== dependencies: "@hapi/hoek" "9.x.x" "@hapi/validate" "1.x.x" @@ -2160,7 +2166,7 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@sinonjs/samsam@^5.3.0": +"@sinonjs/samsam@^5.3.1": version "5.3.1" resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f" integrity sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg== @@ -2412,9 +2418,9 @@ integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== "@types/node@^12.12.6": - version "12.19.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.14.tgz#59e5029a3c2aea34f68b717955381692fd47cafb" - integrity sha512-2U9uLN46+7dv9PiS8VQJcHhuoOjiDPZOLAt0WuA1EanEknIMae+2QbMhayF7cgGqjvRVIfNpt+6jLPczJZFiRw== + version "12.19.15" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.15.tgz#0de7e978fb43db62da369db18ea088a63673c182" + integrity sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw== "@types/node@^13.7.0": version "13.13.40" @@ -2768,7 +2774,7 @@ acorn-globals@^4.1.0, acorn-globals@^4.3.0: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-jsx@^5.0.0, acorn-jsx@^5.2.0: +acorn-jsx@^5.0.0, acorn-jsx@^5.2.0, acorn-jsx@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== @@ -2788,7 +2794,7 @@ acorn@^6.0.1, acorn@^6.0.4, acorn@^6.0.7, acorn@^6.2.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^7.1.1: +acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== @@ -2844,6 +2850,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.6.1, ajv@ json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.4.tgz#827e5f5ae32f5e5c1637db61f253a112229b5e2f" + integrity sha512-xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -2856,7 +2872,7 @@ ansi-align@^3.0.0: dependencies: string-width "^3.0.0" -ansi-colors@4.1.1: +ansi-colors@4.1.1, ansi-colors@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== @@ -2963,6 +2979,11 @@ app-module-path@^2.2.0: resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5" integrity sha1-ZBqlXft9am8KgUHEucCqULbCTdU= +append-field@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56" + integrity sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY= + aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -3192,6 +3213,11 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-each@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" @@ -3202,7 +3228,7 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@0.9.x: +async@0.9.x, async@~0.9.0: version "0.9.2" resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= @@ -3491,10 +3517,10 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bcrypto@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/bcrypto/-/bcrypto-5.3.0.tgz#d2d7d8a808b5efeb09fe529034a30bd772902d84" - integrity sha512-SP48cpoc4BkEPNOErdsZ1VjbtdXY/C0f5wAywWniLne/Fd/5oOBqLbC6ZavngLvk4oik76g4I7PO5KduJoqECQ== +bcrypto@^5.3.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/bcrypto/-/bcrypto-5.4.0.tgz#4046f0c44a4b301eff84de593b4f86fce8d91db2" + integrity sha512-KDX2CR29o6ZoqpQndcCxFZAtYA1jDMnXU3jmCfzP44g++Cu7AHHtZN/JbrN/MXAg9SLvtQ8XISG+eVD9zH1+Jg== dependencies: bufio "~1.0.7" loady "~0.0.5" @@ -3642,19 +3668,19 @@ borc@^2.1.2: json-text-sequence "~0.1.0" readable-stream "^3.6.0" -boxen@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" - integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ== +boxen@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz#64fe9b16066af815f51057adcc800c3730120854" + integrity sha512-5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA== dependencies: ansi-align "^3.0.0" - camelcase "^5.3.1" - chalk "^3.0.0" - cli-boxes "^2.2.0" - string-width "^4.1.0" - term-size "^2.1.0" - type-fest "^0.8.1" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.0" + type-fest "^0.20.2" widest-line "^3.1.0" + wrap-ansi "^7.0.0" brace-expansion@^1.1.7: version "1.1.11" @@ -3687,7 +3713,7 @@ braces@~3.0.2: dependencies: fill-range "^7.0.1" -brorand@^1.0.1: +brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= @@ -3791,15 +3817,15 @@ browserslist@4.10.0: pkg-up "^3.1.0" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.16.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" - integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== + version "4.16.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" + integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== dependencies: - caniuse-lite "^1.0.30001173" + caniuse-lite "^1.0.30001181" colorette "^1.2.1" - electron-to-chromium "^1.3.634" + electron-to-chromium "^1.3.649" escalade "^3.1.1" - node-releases "^1.1.69" + node-releases "^1.1.70" bs58@^4.0.0, bs58@^4.0.1: version "4.0.1" @@ -3896,6 +3922,14 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= +busboy@^0.2.11: + version "0.2.14" + resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453" + integrity sha1-bCpiLvz0fFe7vh4qnDetNseSVFM= + dependencies: + dicer "0.2.5" + readable-stream "1.1.x" + byteman@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/byteman/-/byteman-1.3.5.tgz#d6061f7536c7e7c4bcb756037ef9c4c266ec51fd" @@ -4039,6 +4073,11 @@ camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== +camelcase@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -4049,10 +4088,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173: - version "1.0.30001178" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz#3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc" - integrity sha512-VtdZLC0vsXykKni8Uztx45xynytOi71Ufx9T8kHptSw9AL4dpqailUJJHavttuzUe1KYuBYtChiWv+BAb7mPmQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181: + version "1.0.30001183" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001183.tgz#7a57ba9d6584119bb5f2bc76d3cc47ba9356b3e2" + integrity sha512-7JkwTEE1hlRKETbCFd8HDZeLiQIUcl8rC6JgNjvHCNaxOeNmQ9V4LvQXRUsKIV2CC73qKxljwVhToaA3kLRqTw== capture-exit@^2.0.0: version "2.0.0" @@ -4071,7 +4110,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -cbor@^5.0.2, cbor@^5.1.0: +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== @@ -4079,6 +4118,14 @@ cbor@^5.0.2, cbor@^5.1.0: 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" + integrity sha512-gVJ2e/DFInWOriOUqNyrZe5xN8RSK49X7G+pLalz32GwKs1xHNXtrkcbV5K4+Z2X7qJiv6f700PnUEaJoIEPGQ== + dependencies: + bignumber.js "^9.0.1" + nofilter "^1.0.4" + chai-checkmark@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/chai-checkmark/-/chai-checkmark-1.0.1.tgz#9fbb3c9ad9101f097ef288328d30f4227d74fffb" @@ -4116,14 +4163,6 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^4.0.0, chalk@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" @@ -4292,7 +4331,7 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-boxes@^2.2.0: +cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== @@ -4459,6 +4498,13 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" +combined-stream@~0.0.4: + version "0.0.7" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-0.0.7.tgz#0137e657baa5a7541c57ac37ac5fc07d73b4dc1f" + integrity sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8= + dependencies: + delayed-stream "0.0.5" + commander@2.18.0: version "2.18.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970" @@ -4536,7 +4582,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@^1.5.0: +concat-stream@^1.5.0, concat-stream@^1.5.2: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -4686,7 +4732,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.1, 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== @@ -4786,7 +4832,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.1, cross-spawn@^7.0.3: +cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -5074,24 +5120,32 @@ datastore-core@^2.0.0: interface-datastore "^2.0.0" ipfs-utils "^4.0.1" -datastore-fs@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/datastore-fs/-/datastore-fs-2.0.2.tgz#69d708024bbd1b12bff0d3c3ef0675852c2d7c4a" - integrity sha512-OA1jKopZy5fMMIJNASRRJoj36AgD/v1TIp843o+3B7x4ffSiUArHUzbLRIBchD6VGLklz/3i4mtZeIaALsh/ZQ== +datastore-core@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/datastore-core/-/datastore-core-3.0.0.tgz#35cc097c607acbfaa2337279c73c2b48004fbdfd" + integrity sha512-3jEv4DCPcDUYqZ5bc5TKwWhF8Rc4pykNxMoCKx5SxOWyTKqE1EX31JmC6eNGRKiAI1rLF3+i4AyW0UvY2LROGg== dependencies: - datastore-core "^2.0.0" + debug "^4.1.1" + interface-datastore "^3.0.1" + +datastore-fs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/datastore-fs/-/datastore-fs-3.0.0.tgz#53eae972d98fbf533821d11f5f18425faea8fdf8" + integrity sha512-TKcSj5pxjPX/1Uvz7iS4F41XMe48JUudv9g9Ncu9bGuB6uFEbEFKRJ5tGDFZwrgScxChLMOuGtrkzaxO0osMeQ== + dependencies: + datastore-core "^3.0.0" fast-write-atomic "^0.2.0" - interface-datastore "^2.0.0" + interface-datastore "^3.0.3" it-glob "0.0.10" mkdirp "^1.0.4" -datastore-level@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/datastore-level/-/datastore-level-2.0.0.tgz#0851283cd9d10436798a01d97dbf60135e469c29" - integrity sha512-52qSxZG75QRqO502cSvnYnXj/5sO29Dvtd9uuiRLSzUaSPher8pS0hl5xzlx7zglpzAjQpjaq9oy2UFO6vMn6g== +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== dependencies: - datastore-core "^2.0.0" - interface-datastore "^2.0.0" + datastore-core "^3.0.0" + interface-datastore "^3.0.3" level "^5.0.1" datastore-pubsub@^0.4.1: @@ -5130,7 +5184,7 @@ 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.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== @@ -5185,7 +5239,7 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -deep-is@~0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= @@ -5266,10 +5320,15 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" -delay@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/delay/-/delay-4.4.0.tgz#71abc745f3ce043fe7f450491236541edec4ad0c" - integrity sha512-txgOrJu3OdtOfTiEOT2e76dJVfG/1dz2NZ4F0Pyt4UGZJryssMRp5vdM5wQoLwSOBNdrJv3F9PAhp/heqd7vrA== +delay@^4.3.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== + +delayed-stream@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f" + integrity sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8= delayed-stream@~1.0.0: version "1.0.0" @@ -5332,6 +5391,14 @@ detect-port-alt@1.1.6: address "^1.0.1" debug "^2.6.0" +dicer@0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f" + integrity sha1-WZbAhrszIYyBLAkL3cCc0S+stw8= + dependencies: + readable-stream "1.1.x" + streamsearch "0.1.2" + diff-match-patch@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37" @@ -5603,12 +5670,12 @@ electron-fetch@^1.7.2: dependencies: encoding "^0.1.13" -electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.634: - version "1.3.642" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz#8b884f50296c2ae2a9997f024d0e3e57facc2b94" - integrity sha512-cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ== +electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.649: + version "1.3.652" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.652.tgz#9465d884d609acffd131ba71096de7bfabd63670" + integrity sha512-85J5D0Ksxjq2MIHfgwOURRej72UMlexbaa7t+oKTJan3Pa/RBE8vJ4/JzwaQjLCElPvd0XeLWi7+xYTVrq96aA== -elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: +elliptic@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== @@ -5621,6 +5688,19 @@ elliptic@6.5.3, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== + dependencies: + bn.js "^4.11.9" + brorand "^1.1.0" + hash.js "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" + emoji-regex@^7.0.1, emoji-regex@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -5632,9 +5712,9 @@ emoji-regex@^8.0.0: integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== emoji-regex@^9.0.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.0.tgz#a26da8e832b16a9753309f25e35e3c0efb9a066a" - integrity sha512-DNc3KFPK18bPdElMJnf/Pkv5TXhxFU3YFDEuGLDRtPmV4rkmCjBkCSEp22u6rBHdSN9Vlp/GK7k98prmE1Jgug== + version "9.2.1" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.1.tgz#c9b25604256bb3428964bead3ab63069d736f7ee" + integrity sha512-117l1H6U4X3Krn+MrzYrL57d5H7siRHWraBs7s+LjRuFK7Fe7hJqnJ0skWlinqsycVLU5YAo6L8CsEYQ0V5prg== emojis-list@^2.0.0: version "2.1.0" @@ -5724,21 +5804,33 @@ enhanced-resolve@^4.1.0: memory-fs "^0.5.0" tapable "^1.0.0" +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + entities@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== entities@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" - integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== err-code@^2.0.0, err-code@^2.0.1, err-code@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== +err-code@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.0.tgz#8d5af04379f18eeb31e9dce0ca82be8386039c23" + integrity sha512-+oiZkhFGx8PLWbQM/Noi9arR8MAs4ZLEJlzhjSsqsb5lgiSlByIt3aL8TSp/AZ8g95lIDcJeBErlERg9Q9a4ow== + errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -5796,16 +5888,16 @@ es-array-method-boxes-properly@^1.0.0: integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== es-get-iterator@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9" - integrity sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7" + integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ== dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.1" + call-bind "^1.0.2" + get-intrinsic "^1.1.0" has-symbols "^1.0.1" - is-arguments "^1.0.4" - is-map "^2.0.1" - is-set "^2.0.1" + is-arguments "^1.1.0" + is-map "^2.0.2" + is-set "^2.0.2" is-string "^1.0.5" isarray "^2.0.5" @@ -5895,7 +5987,7 @@ eslint-config-airbnb-base@^14.2.1: object.assign "^4.1.2" object.entries "^1.1.2" -eslint-config-airbnb@^18.1.0: +eslint-config-airbnb@^18.1.0, eslint-config-airbnb@^18.2.1: version "18.2.1" resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.2.1.tgz#b7fe2b42f9f8173e825b73c8014b592e449c98d9" integrity sha512-glZNDEZ36VdlZWoxn/bUR1r/sdFKPd1mHPbqUtkctgNG4yT2DLLtJ3D+yCV+jzZCc2V1nBVkmdknOJBZ5Hc0fg== @@ -5997,7 +6089,7 @@ eslint-plugin-jsx-a11y@6.2.3: has "^1.0.3" jsx-ast-utils "^2.2.1" -eslint-plugin-jsx-a11y@^6.2.3: +eslint-plugin-jsx-a11y@^6.2.3, eslint-plugin-jsx-a11y@^6.4.1: version "6.4.1" resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd" integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg== @@ -6042,7 +6134,7 @@ eslint-plugin-react@7.19.0: string.prototype.matchall "^4.0.2" xregexp "^4.3.0" -eslint-plugin-react@^7.19.0: +eslint-plugin-react@^7.19.0, eslint-plugin-react@^7.22.0: version "7.22.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== @@ -6067,7 +6159,7 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^5.0.0: +eslint-scope@^5.0.0, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -6082,18 +6174,23 @@ eslint-utils@^1.3.1, eslint-utils@^1.4.3: dependencies: eslint-visitor-keys "^1.1.0" -eslint-utils@^2.0.0: +eslint-utils@^2.0.0, eslint-utils@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + eslint@^5.6.0: version "5.16.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" @@ -6179,6 +6276,54 @@ eslint@^6.6.0, eslint@^6.8.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" +eslint@^7.19.0: + version "7.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41" + integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg== + dependencies: + "@babel/code-frame" "^7.0.0" + "@eslint/eslintrc" "^0.3.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.2.0" + esutils "^2.0.2" + file-entry-cache "^6.0.0" + functional-red-black-tree "^1.0.1" + glob-parent "^5.0.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash "^4.17.20" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.4" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +esm@~3.2.25: + version "3.2.25" + resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" + integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== + espree@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" @@ -6197,12 +6342,21 @@ espree@^6.1.2: acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.1: +esquery@^1.0.1, esquery@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== @@ -6266,9 +6420,9 @@ eth-lib@^0.1.26: xhr-request-promise "^0.1.2" ethereum-bloom-filters@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.7.tgz#b7b80735e385dbb7f944ce6b4533e24511306060" - integrity sha512-cDcJJSJ9GMAcURiAWO3DxIEhTL/uWqlQnvgKpuYQzYPrt/izuGU+1ntQmHt0IRq6ADoSYHFnB+aCEFIldjhkMQ== + version "1.0.9" + resolved "https://registry.yarnpkg.com/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.9.tgz#4a59dead803af0c9e33834170bd7695df67061ec" + integrity sha512-GiK/RQkAkcVaEdxKVkPcG07PQ5vD7v2MFSHgZmBJSfMzNRHimntdBithsHAT89tAXnIpzVDWt8iaCD1DvkaxGg== dependencies: js-sha3 "^0.8.0" @@ -6320,40 +6474,40 @@ ethereumjs-util@^6.0.0: rlp "^2.2.3" ethers@^5.0.8: - version "5.0.26" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.26.tgz#ef43c6b6aad71f10c1a184003f69b142d7d03bae" - integrity sha512-MqA8Fvutn3qEW0yBJOHeV6KZmRpF2rqlL2B5058AGkUFsuu6j5Ns/FRlMsbGeQwBz801IB23jQp7vjRfFsKSkg== - dependencies: - "@ethersproject/abi" "5.0.10" - "@ethersproject/abstract-provider" "5.0.8" - "@ethersproject/abstract-signer" "5.0.11" - "@ethersproject/address" "5.0.9" - "@ethersproject/base64" "5.0.7" - "@ethersproject/basex" "5.0.7" - "@ethersproject/bignumber" "5.0.13" - "@ethersproject/bytes" "5.0.9" - "@ethersproject/constants" "5.0.8" - "@ethersproject/contracts" "5.0.9" - "@ethersproject/hash" "5.0.10" - "@ethersproject/hdnode" "5.0.8" - "@ethersproject/json-wallets" "5.0.10" - "@ethersproject/keccak256" "5.0.7" - "@ethersproject/logger" "5.0.8" - "@ethersproject/networks" "5.0.7" - "@ethersproject/pbkdf2" "5.0.7" - "@ethersproject/properties" "5.0.7" - "@ethersproject/providers" "5.0.19" - "@ethersproject/random" "5.0.7" - "@ethersproject/rlp" "5.0.7" - "@ethersproject/sha2" "5.0.7" - "@ethersproject/signing-key" "5.0.8" - "@ethersproject/solidity" "5.0.8" - "@ethersproject/strings" "5.0.8" - "@ethersproject/transactions" "5.0.9" - "@ethersproject/units" "5.0.9" - "@ethersproject/wallet" "5.0.10" - "@ethersproject/web" "5.0.12" - "@ethersproject/wordlists" "5.0.8" + version "5.0.28" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.0.28.tgz#3c2a3d41b3639a427a822814870990cfcdd5e0a8" + integrity sha512-prYYCmZMGbrhP2PEXA2re5BpNPjaCP2y5gO1dh1i+fPxdkldQOk+0c0l8KlnxwUztKq4E40xpB0gyURdcAOaAg== + dependencies: + "@ethersproject/abi" "5.0.11" + "@ethersproject/abstract-provider" "5.0.9" + "@ethersproject/abstract-signer" "5.0.12" + "@ethersproject/address" "5.0.10" + "@ethersproject/base64" "5.0.8" + "@ethersproject/basex" "5.0.8" + "@ethersproject/bignumber" "5.0.14" + "@ethersproject/bytes" "5.0.10" + "@ethersproject/constants" "5.0.9" + "@ethersproject/contracts" "5.0.10" + "@ethersproject/hash" "5.0.11" + "@ethersproject/hdnode" "5.0.9" + "@ethersproject/json-wallets" "5.0.11" + "@ethersproject/keccak256" "5.0.8" + "@ethersproject/logger" "5.0.9" + "@ethersproject/networks" "5.0.8" + "@ethersproject/pbkdf2" "5.0.8" + "@ethersproject/properties" "5.0.8" + "@ethersproject/providers" "5.0.21" + "@ethersproject/random" "5.0.8" + "@ethersproject/rlp" "5.0.8" + "@ethersproject/sha2" "5.0.8" + "@ethersproject/signing-key" "5.0.9" + "@ethersproject/solidity" "5.0.9" + "@ethersproject/strings" "5.0.9" + "@ethersproject/transactions" "5.0.10" + "@ethersproject/units" "5.0.10" + "@ethersproject/wallet" "5.0.11" + "@ethersproject/web" "5.0.13" + "@ethersproject/wordlists" "5.0.9" ethjs-unit@0.1.6: version "0.1.6" @@ -6612,7 +6766,7 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -6679,6 +6833,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +file-entry-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" + integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== + dependencies: + flat-cache "^3.0.4" + file-loader@4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af" @@ -6831,6 +6992,14 @@ flat-cache@^2.0.1: rimraf "2.6.3" write "1.0.3" +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + flat@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.1.tgz#a392059cc382881ff98642f5da4dde0a959f309b" @@ -6848,6 +7017,11 @@ flatted@^2.0.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== +flatted@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + flatten@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" @@ -6867,9 +7041,9 @@ fnv1a@^1.0.1: integrity sha1-kV4tbQI8Q9UiStn20qPEFW9XEvU= follow-redirects@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" - integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== + version "1.13.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" + integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== for-each@^0.3.3: version "0.3.3" @@ -6919,6 +7093,15 @@ fork-ts-checker-webpack-plugin@3.1.1: tapable "^1.0.0" worker-rpc "^0.1.0" +form-data@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.2.0.tgz#26f8bc26da6440e299cbdcfb69035c4f77a6e466" + integrity sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY= + dependencies: + async "~0.9.0" + combined-stream "~0.0.4" + mime-types "~2.0.3" + form-data@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" @@ -7116,10 +7299,10 @@ get-func-name@^2.0.0: resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= -get-intrinsic@^1.0.1, get-intrinsic@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" - integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== +get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -7203,12 +7386,12 @@ glob@7.1.6, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glo once "^1.3.0" path-is-absolute "^1.0.0" -global-dirs@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" - integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ== +global-dirs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== dependencies: - ini "1.3.7" + ini "2.0.0" global-modules@2.0.0: version "2.0.0" @@ -7314,7 +7497,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== @@ -7545,7 +7728,7 @@ history@^4.9.0: tiny-warning "^1.0.0" value-equal "^1.0.1" -hmac-drbg@^1.0.0: +hmac-drbg@^1.0.0, hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= @@ -7714,6 +7897,17 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" +http-errors@~1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" + integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + http-https@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/http-https/-/http-https-1.0.0.tgz#2f908dd5f1db4068c058cd6e6d4ce392c913389b" @@ -7778,16 +7972,16 @@ i18next-browser-languagedetector@^6.0.1: "@babel/runtime" "^7.5.5" i18next-http-backend@^1.0.21: - version "1.0.22" - resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.0.22.tgz#30b639d08aac443eb58706bee48573198806b25b" - integrity sha512-rJXovQirK4kLYD8zF4pRi1CwVGtL2WrHXndU89Ds20CimAc7InYjBHmcJFurWPZlz/zgThRNbMuSDP0GYOISMA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.1.0.tgz#7ccba7252b84b031f51dee0f8e58a578736d0129" + integrity sha512-utp3MyUQpIUD5Jxkf5xz0GWYWDSte7uuf1F4qaLtVtIqlcFcyYQ2l22el1JPK3rAL44+sjhB7+ct0Qr2WpbxNA== dependencies: node-fetch "2.6.1" i18next@^19.8.3: - version "19.8.4" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.4.tgz#447718f2a26319b8debdbcc6fbc1a9761be7316b" - integrity sha512-FfVPNWv+felJObeZ6DSXZkj9QM1Ivvh7NcFCgA8XPtJWHz0iXVa9BUy+QY8EPrCLE+vWgDfV/sc96BgXVo6HAA== + version "19.8.7" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.7.tgz#ef023e353974d1b1453e8b6331bd9fb7cba427df" + integrity sha512-ezo1gb7QO4OQ5gQCdZMUxopwQSoqpRp6whdEjm1grxMSmkGj1NJ+kYS0UQd4NnpPIVqsgqTQ2L2eqSQYQ+U3Fw== dependencies: "@babel/runtime" "^7.12.0" @@ -7888,7 +8082,7 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" -import-fresh@^3.0.0, import-fresh@^3.1.0: +import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -7964,10 +8158,10 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" - integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== +ini@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== ini@^1.3.5, ini@~1.3.0: version "1.3.8" @@ -8044,10 +8238,10 @@ interface-datastore@^2.0.0: it-drain "^1.0.1" nanoid "^3.0.2" -interface-datastore@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/interface-datastore/-/interface-datastore-3.0.1.tgz#366c494c4ea8f7c0265c6fde4d3d647933a98327" - integrity sha512-c7A7Lpp2slZzqk2cDtZB9/22O/+5dM1sAPHmLGDG6chCatmixL0Pz9HRyob24+nkiZNRGql2j3MwycGHdH4sPA== +interface-datastore@^3.0.1, interface-datastore@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/interface-datastore/-/interface-datastore-3.0.3.tgz#a994f22b5a74e91dc4575d20f32b71dcecf282ff" + integrity sha512-T7CFAoJptmFgBuVYjDAHiSlFjZRlabLBL1n/zp8bG7Xq7K3uicbHIRvKaWE2bR74IqtECdjWovdeKtZccCmV6w== dependencies: err-code "^2.0.1" ipfs-utils "^6.0.0" @@ -8065,13 +8259,13 @@ internal-ip@^4.3.0: ipaddr.js "^1.9.0" internal-slot@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" - integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== dependencies: - es-abstract "^1.17.0-next.1" + get-intrinsic "^1.1.0" has "^1.0.3" - side-channel "^1.0.2" + side-channel "^1.0.4" invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" @@ -8099,9 +8293,9 @@ ip-regex@^2.1.0: integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= ip-regex@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.2.0.tgz#a03f5eb661d9a154e3973a03de8b23dd0ad6892e" - integrity sha512-n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A== + version "4.3.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5" + integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q== ip@^1.1.0, ip@^1.1.5: version "1.1.5" @@ -8114,9 +8308,9 @@ ipaddr.js@1.9.1, ipaddr.js@^1.9.0: integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== ipfs-bitswap@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ipfs-bitswap/-/ipfs-bitswap-4.0.0.tgz#1c9e67d98d1356ea0e23e805e9c71b7f262027a3" - integrity sha512-KQjRX6h2bU0DgHxCFTAgn0JJPs3sF2eTwn5kD54M1A+KeKmHG21EVyXo/ZSO2iDWgERmL66WnA+jX7xM1p2k+Q== + version "4.0.2" + resolved "https://registry.yarnpkg.com/ipfs-bitswap/-/ipfs-bitswap-4.0.2.tgz#3c091b3b4b3f99b12ad6ee93eb0f90fb4959d97d" + integrity sha512-9fYoCL7G0Qu3z4r99j2xVWLbYnB9kK+JdTSEt1XNquPW8tA89U44ZfLxaq2C/LuxbQLkV0/C26WZtrCd1QYllQ== dependencies: abort-controller "^3.0.0" any-signal "^2.1.1" @@ -8127,13 +8321,13 @@ ipfs-bitswap@^4.0.0: it-length-prefixed "^3.0.0" it-pipe "^1.1.0" just-debounce-it "^1.1.0" - libp2p-interfaces "^0.7.1" + libp2p-interfaces "^0.8.3" moving-average "^1.0.0" multicodec "^2.0.0" multihashing-async "^2.0.1" protons "^2.0.0" streaming-iterables "^5.0.2" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" varint-decoder "^1.0.0" ipfs-block-service@^0.18.0: @@ -8186,10 +8380,10 @@ ipfs-cli@^0.2.3: uint8arrays "^1.1.0" yargs "^16.0.3" -ipfs-core-types@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/ipfs-core-types/-/ipfs-core-types-0.2.0.tgz#7985c89aa0e8004ccbc4cf18a14a2e4483541258" - integrity sha512-Cen7q8rEhXBRrhM5VWOtIVNsTw7dQvs7E6guXTKFpWAqzTeV39KOO5rC69HY2Boiom9pqVMZRxeqq2UKVvCACw== +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== dependencies: cids "^1.1.5" multiaddr "^8.0.0" @@ -8230,17 +8424,17 @@ ipfs-core-utils@^0.5.4: timeout-abort-controller "^1.1.1" uint8arrays "^1.1.0" -ipfs-core-utils@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.6.0.tgz#b89e7decf49f92b3539a47c01479494d891fb8d9" - integrity sha512-w5uoE3RLO5ReNt0E9BwIRdSGbjz9NzFxGqMDCW9zMPUAkiDWC8FTksYOifAVQcdekI4oP8kMHVDzJ/5YKyba/Q== +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== dependencies: any-signal "^2.0.0" 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.0" + ipfs-core-types "^0.2.1" ipfs-utils "^5.0.0" it-all "^1.0.4" it-map "^1.0.4" @@ -8376,17 +8570,17 @@ ipfs-http-client@^47.0.1: uint8arrays "^1.1.0" ipfs-http-client@^48.1.3: - version "48.2.1" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.2.1.tgz#9b0a098d673d8729071dd620c5050b234dfe903a" - integrity sha512-fK8bF0C+wX7POczu3fcrO0B3aaS35L8HxOUCi1V2yBPZ8+xeuGxV4YS6N8RgFev5Mxd7mklxEljy2RCigZRP6Q== + version "48.2.2" + resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-48.2.2.tgz#b570fb99866f94df1c394a6101a2eb750ff46599" + integrity sha512-f3ppfWe913SJLvunm0UgqdA1dxVZSGQJPaEVJtqgjxPa5x0fPDiBDdo60g2MgkW1W6bhF9RGlxvHHIE9sv/tdg== dependencies: any-signal "^2.0.0" bignumber.js "^9.0.0" cids "^1.1.5" debug "^4.1.1" form-data "^3.0.0" - ipfs-core-types "^0.2.0" - ipfs-core-utils "^0.6.0" + ipfs-core-types "^0.2.1" + ipfs-core-utils "^0.6.1" ipfs-utils "^5.0.0" ipld-block "^0.11.0" ipld-dag-cbor "^0.17.0" @@ -8517,42 +8711,42 @@ ipfs-pubsub-peer-monitor@~0.0.5: p-forever "^2.1.0" ipfs-repo-migrations@^5.0.3: - version "5.0.5" - resolved "https://registry.yarnpkg.com/ipfs-repo-migrations/-/ipfs-repo-migrations-5.0.5.tgz#d75e46a5504071812ea23a0fb50f4cc3e1e62b1c" - integrity sha512-dbg9LY+f1MhKLCUTQ28z+TmS7+fC6dgZPJhsWpNXSSwicEgMjUssGMoaft9AjoOuOTISeF3WWVVKRqFpOvCxQg== + 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== dependencies: - cbor "^5.0.2" + cbor "^6.0.1" cids "^1.0.0" - datastore-core "^2.0.0" + datastore-core "^3.0.0" debug "^4.1.0" fnv1a "^1.0.1" - interface-datastore "^2.0.0" + interface-datastore "^3.0.3" ipld-dag-pb "^0.20.0" - it-length "0.0.2" + it-length "^1.0.1" multibase "^3.0.0" multicodec "^2.0.0" multihashing-async "^2.0.0" proper-lockfile "^4.1.1" protons "^2.0.0" - uint8arrays "^1.0.0" - varint "^5.0.0" + uint8arrays "^2.0.5" + varint "^6.0.0" ipfs-repo@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/ipfs-repo/-/ipfs-repo-7.0.0.tgz#7f7306bcc0c2a65f3447e5551efd0b5c37bbe12d" - integrity sha512-crTbJiiRpuTytWWZ5SCLmKn1fDsoK5maVSBDfKCy0MWkbrRA0GN1+cQ2Dx8PtxDIRY+bBsicSIE4gH/aZvsPuw== + version "7.0.1" + resolved "https://registry.yarnpkg.com/ipfs-repo/-/ipfs-repo-7.0.1.tgz#167bb4e44f22af4650d51c7a00ce5f8fd31b6b0c" + integrity sha512-kkw3AoRnDppb2dcZUp6ofZC+7i/Kw1L7luvT/R7mCZWPSr4CiVf3RAQtSzvrfAO5MLFMwWsQM2ricK2dHN4rug== dependencies: bignumber.js "^9.0.0" bytes "^3.1.0" cids "^1.0.0" - datastore-core "^2.0.0" - datastore-fs "^2.0.0" - datastore-level "^2.0.0" + datastore-core "^3.0.0" + datastore-fs "^3.0.0" + datastore-level "^3.0.0" debug "^4.1.0" err-code "^2.0.0" - interface-datastore "^2.0.0" + interface-datastore "^3.0.3" ipfs-repo-migrations "^5.0.3" - ipfs-utils "^4.0.0" + ipfs-utils "^6.0.0" ipld-block "^0.11.0" it-map "^1.0.2" it-pushable "^1.4.0" @@ -8562,7 +8756,7 @@ ipfs-repo@^7.0.0: p-queue "^6.0.0" proper-lockfile "^4.0.0" sort-keys "^4.0.0" - uint8arrays "^1.0.0" + uint8arrays "^2.0.5" ipfs-unixfs-exporter@^3.0.4: version "3.0.7" @@ -8642,7 +8836,7 @@ ipfs-utils@^3.0.0: node-fetch "^2.6.0" stream-to-it "^0.2.0" -ipfs-utils@^4.0.0, ipfs-utils@^4.0.1: +ipfs-utils@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-4.0.1.tgz#8856ba3ee7251f0a8f08f2f33ca5b62a2691da4d" integrity sha512-6mg+S1sbjj+Ff+uoHOhVeC4myfV2tb2sHcdYwfpJ4ZcBo9WfdxSMnWFLiC5bIqByyJuN/g5aWgz3ozjKDzND1Q== @@ -8838,7 +9032,7 @@ is-alphanumerical@^1.0.0: is-alphabetical "^1.0.0" is-decimal "^1.0.0" -is-arguments@^1.0.4: +is-arguments@^1.0.4, is-arguments@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== @@ -8880,9 +9074,9 @@ is-buffer@^2.0.0, is-buffer@^2.0.4, is-buffer@~2.0.3: integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" - integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== is-ci@^2.0.0: version "2.0.0" @@ -9055,13 +9249,13 @@ is-hexadecimal@^1.0.0: resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== -is-installed-globally@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" - integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g== +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== dependencies: - global-dirs "^2.0.1" - is-path-inside "^3.0.1" + global-dirs "^3.0.0" + is-path-inside "^3.0.2" is-ip@^3.1.0: version "3.1.0" @@ -9088,7 +9282,7 @@ is-loopback-addr@^1.0.0: resolved "https://registry.yarnpkg.com/is-loopback-addr/-/is-loopback-addr-1.0.1.tgz#d4adf50d12d53100da62a397c61d6c83fe40aab9" integrity sha512-DhWU/kqY7X2F6KrrVTu7mHlbd2Pbo4D1YkAzasBMjQs6lJAoefxaA6m6CpSX0K6pjt9D0b9PNFI5zduy/vzOYw== -is-map@^2.0.1: +is-map@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== @@ -9154,7 +9348,7 @@ is-path-inside@^2.1.0: dependencies: path-is-inside "^1.0.2" -is-path-inside@^3.0.1: +is-path-inside@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== @@ -9187,10 +9381,11 @@ is-promise@~1, is-promise@~1.0.0: integrity sha1-MVc3YcBX4zwukaq56W2gjO++duU= is-regex@^1.0.4, is-regex@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" - integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" + integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== dependencies: + call-bind "^1.0.2" has-symbols "^1.0.1" is-regexp@^1.0.0: @@ -9213,7 +9408,7 @@ is-root@2.1.0: resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== -is-set@^2.0.1: +is-set@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== @@ -9454,7 +9649,7 @@ it-glob@0.0.8: fs-extra "^8.1.0" minimatch "^3.0.4" -it-goodbye@^2.0.1: +it-goodbye@^2.0.1, 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== @@ -9485,10 +9680,10 @@ it-length-prefixed@^3.0.0, it-length-prefixed@^3.0.1, it-length-prefixed@^3.1.0: buffer "^5.5.0" varint "^5.0.0" -it-length@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/it-length/-/it-length-0.0.2.tgz#555306c61cd98e09307e6056ef67d6b9da32cc65" - integrity sha512-4HJKhSx/hWg54DLzDSe4HYtjMqDVj2ZR8WBTjJuGqRTH342x2vt6h9KeycUgzNNfygSLJvGzFYtZ7Gw1Kez9Qg== +it-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/it-length/-/it-length-1.0.1.tgz#552fffbb4efd4fe60d2c840d2491ebff25137cf6" + integrity sha512-4o8HJAePtBgixr5iAKLuJSGYredSAIVSgOMcUh/QUkGX0k9JbsSP589eElrFayZgcNurXlV5EoiuXFhOuVoldw== it-map@^1.0.2, it-map@^1.0.4: version "1.0.4" @@ -9496,9 +9691,9 @@ it-map@^1.0.2, it-map@^1.0.4: integrity sha512-LZgYdb89XMo8cFUp6jF0cn5j3gF7wcZnKRVFS3qHHn0bPB2rpToh2vIkTBKduZLZxRRjWx1VW/udd98x+j2ulg== it-multipart@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/it-multipart/-/it-multipart-1.0.5.tgz#74191fd45fab2636349f6535d3edea3a17526e73" - integrity sha512-HW0/ycdwqM1Xz1cwkBUwmU2HTxrJrUdVZBIgX5/fNzEjIgbnL3oZUysG2NeKNbIA0vt4wnqLK6fAps/nvQ0AbA== + version "1.0.6" + resolved "https://registry.yarnpkg.com/it-multipart/-/it-multipart-1.0.6.tgz#afe6722932e11e87108edc26f10d703410207948" + integrity sha512-+hIfEx0zev3EiXwMfaDWzmj3STasVriq7pvFzNU7/saN8mR+A31/TzLGAnreeSEWCz4e3/enxU/ndk67Gsbong== dependencies: buffer "^5.5.0" buffer-indexof "^1.1.1" @@ -9512,13 +9707,13 @@ it-pair@^1.0.0: get-iterator "^1.0.2" it-parallel-batch@^1.0.3: - version "1.0.6" - resolved "https://registry.yarnpkg.com/it-parallel-batch/-/it-parallel-batch-1.0.6.tgz#680aa9fe15002c6d00606a577e45f6211ea70f5e" - integrity sha512-ym2o1bZHZAl2euR79ojKsvVJt77DGQrmSTgDf+g3ERF/Agp2+VI9VM3ikQ9T1BBdgbSIylPeatNGMIyZgz7J7g== + version "1.0.7" + resolved "https://registry.yarnpkg.com/it-parallel-batch/-/it-parallel-batch-1.0.7.tgz#cd4a8e82940285497bb35114ab3f0d7ce1738582" + integrity sha512-7yySu14TSAEhTBboPi2AarxA2L/CDv8kasd8xqZPgbZ0UMO60MCMChiPK+qPT7tA2yqyHo88MZZOZ8MMCQ32tA== dependencies: it-batch "^1.0.6" -it-pb-rpc@^0.1.8: +it-pb-rpc@^0.1.9: version "0.1.9" resolved "https://registry.yarnpkg.com/it-pb-rpc/-/it-pb-rpc-0.1.9.tgz#28cc99e55a9cdbe980c1d8b89729135479a883bc" integrity sha512-IMPXz+a+lUEclV5qIlT/1WAjCMIZyqQtMRaKaL8cwgvH2P5LtMJlrbNZr3b4VEONK1H6mqAV1upfMTSSBSrOqA== @@ -9550,10 +9745,10 @@ it-protocol-buffers@^0.2.0: it-buffer "^0.1.1" it-length-prefixed "^3.0.0" -it-pushable@^1.3.1, it-pushable@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/it-pushable/-/it-pushable-1.4.0.tgz#772d81b40ccab93c963a20420ab1ef2ecfc9b97d" - integrity sha512-W7251Tj88YBqUIEDWCwd3F8JettSbze+bBp5B3ASzz5tYWaLUI1VDNGbjllH1T6RJ71a5jUSTSt5vHjvuzwoFw== +it-pushable@^1.4.0, it-pushable@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/it-pushable/-/it-pushable-1.4.1.tgz#f3bc26d659cc44b8f1a7bb4e8c98f3426ced6b9b" + integrity sha512-XOnbDxD5YoiVtL/vobQW/ZGkzQzJv9Fs9TJlO2McfkIbolBBO2IGY6XjE1ooLfw8gQeH8XbgpoLajtPUVO8Qew== dependencies: fast-fifo "^1.0.0" @@ -10188,6 +10383,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -10235,9 +10435,9 @@ json5@^1.0.1: minimist "^1.2.0" json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" @@ -10337,9 +10537,9 @@ keyboard-key@^1.1.0: integrity sha512-qkBzPTi3rlAKvX7k0/ub44sqOfXeLc/jcnGGmj5c7BJpU8eDrEVPyhCvNYAaoubbsLm9uGWwQJO1ytQK1a9/dQ== keypair@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/keypair/-/keypair-1.0.1.tgz#7603719270afb6564ed38a22087a06fc9aa4ea1b" - integrity sha1-dgNxknCvtlZO04oiCHoG/Jqk6hs= + version "1.0.2" + resolved "https://registry.yarnpkg.com/keypair/-/keypair-1.0.2.tgz#9aab2dea3355d22364e0156ef6a4282487c8fdee" + integrity sha512-7zRr8fKOWp/N8xfZyZV6WG1CUvKNiNahSDI4vjJnPJD60lHtIg62dpv60yCgcM2PP8QKv4S2UkZl+8MsYmQRpw== keyv@^3.0.0: version "3.1.0" @@ -10585,6 +10785,14 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + libp2p-bootstrap@^0.12.1: version "0.12.1" resolved "https://registry.yarnpkg.com/libp2p-bootstrap/-/libp2p-bootstrap-0.12.1.tgz#216322e2d682935c8ee1c7b672acf69241178c3c" @@ -10715,33 +10923,6 @@ libp2p-gossipsub@^0.6.1: time-cache "^0.3.0" uint8arrays "^1.1.0" -libp2p-interfaces@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/libp2p-interfaces/-/libp2p-interfaces-0.4.1.tgz#1610034845e7ceb7cf93b5309945cf5ea698c9ee" - integrity sha512-LvoK21WtoRxmdLFWGGKMomK4SLXSqcyntoCQ254IOao/EOjis0Za09THENjK+pL1Lk84D1tXLwwK+8pT19EWDw== - dependencies: - abort-controller "^3.0.0" - abortable-iterator "^3.0.0" - buffer "^5.6.0" - chai "^4.2.0" - chai-checkmark "^1.0.1" - class-is "^1.1.0" - 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-pair "^1.0.0" - it-pipe "^1.1.0" - libp2p-tcp "^0.15.0" - multiaddr "^8.0.0" - p-defer "^3.0.0" - p-limit "^2.3.0" - p-wait-for "^3.1.0" - peer-id "^0.14.0" - sinon "^9.0.2" - streaming-iterables "^5.0.2" - libp2p-interfaces@^0.5.1: version "0.5.2" resolved "https://registry.yarnpkg.com/libp2p-interfaces/-/libp2p-interfaces-0.5.2.tgz#8794f0753b26c98270d03d63d753f456c5d0a766" @@ -10808,72 +10989,72 @@ libp2p-interfaces@^0.6.0: streaming-iterables "^5.0.2" uint8arrays "^1.1.0" -libp2p-interfaces@^0.7.1: - version "0.7.2" - resolved "https://registry.yarnpkg.com/libp2p-interfaces/-/libp2p-interfaces-0.7.2.tgz#77281294b6bba72d0e9bf6c0e0b3471e37330cc3" - integrity sha512-uI4vPiwdi9pKScLoAvwMqXiEjUtUACavtqZEvdm36T1PcmzsfDbGDKGCkGoDENQ/kztsggfb/9PoEAiNw3CQxQ== +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" + integrity sha512-Q8YM2oS4gvlPOuespYRp3jZryxYF5RyuyF+SLUhwjFh3yT6HbiKcxTtMmhOEnyyRgawj0NIDdARJ7h5aUcsA5w== dependencies: + "@types/bl" "^2.1.0" 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" + debug "^4.3.1" + delay "^4.4.0" detect-node "^2.0.4" dirty-chai "^2.0.1" - err-code "^2.0.0" - it-goodbye "^2.0.1" + err-code "^2.0.3" + it-goodbye "^2.0.2" 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-crypto "^0.19.0" libp2p-tcp "^0.15.0" - multiaddr "^8.0.0" - multibase "^3.0.0" - multihashes "^3.0.1" + multiaddr "^8.1.2" + multibase "^3.1.1" + multihashes "^3.1.1" p-defer "^3.0.0" - p-limit "^2.3.0" - p-wait-for "^3.1.0" - peer-id "^0.14.0" + p-limit "^3.1.0" + p-wait-for "^3.2.0" + peer-id "^0.14.2" protons "^2.0.0" - sinon "^9.0.2" - streaming-iterables "^5.0.2" - uint8arrays "^1.1.0" + sinon "^9.2.4" + streaming-iterables "^5.0.4" + uint8arrays "^2.0.5" libp2p-kad-dht@^0.20.1: - version "0.20.4" - resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.4.tgz#2a1f61e86a10942ef16a7553a91ff96e598c55a0" - integrity sha512-7v4+3bdcoGUyR/8Y5G/Ok9UyhuqghpXFZq5VpW3oph5WtR348snTaBTPkI/8xkQmBxvLIAMxuomp7cMrQaTUyw== + version "0.20.6" + resolved "https://registry.yarnpkg.com/libp2p-kad-dht/-/libp2p-kad-dht-0.20.6.tgz#18bcc903f614d3397f523a2ab8d122ef5ba3d5e0" + integrity sha512-hRClzJP+NK3zBU0/pYkoDUhZcviqmPu4czFaftcl3cCGasjxSaWNEZNKsf65QwoINZD9jFrYkQuXW9/gWQwuOA== dependencies: abort-controller "^3.0.0" async "^2.6.2" base32.js "~0.1.0" - cids "^1.0.0" - debug "^4.1.1" - err-code "^2.0.0" + cids "^1.1.5" + debug "^4.3.1" + err-code "^2.0.3" hashlru "^2.3.0" heap "~0.2.6" - interface-datastore "^2.0.0" - it-length-prefixed "^3.0.0" + interface-datastore "^3.0.3" + it-length-prefixed "^3.1.0" it-pipe "^1.1.0" k-bucket "^5.0.0" - libp2p-crypto "^0.18.0" - libp2p-interfaces "^0.4.0" + libp2p-crypto "^0.19.0" + libp2p-interfaces "^0.8.2" libp2p-record "^0.9.0" - multiaddr "^8.0.0" + multiaddr "^8.1.2" multihashing-async "^2.0.1" p-filter "^2.1.0" p-map "^4.0.0" - p-queue "^6.2.1" - p-timeout "^3.2.0" + p-queue "^6.6.2" + p-timeout "^4.1.0" p-times "^3.0.0" - peer-id "^0.14.0" + peer-id "^0.14.2" promise-to-callback "^1.0.0" protons "^2.0.0" - streaming-iterables "^5.0.2" - uint8arrays "^1.1.0" + streaming-iterables "^5.0.4" + uint8arrays "^2.0.5" varint "^5.0.0" xor-distance "^2.0.0" @@ -10888,36 +11069,36 @@ libp2p-mdns@^0.15.0: peer-id "^0.14.0" libp2p-mplex@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/libp2p-mplex/-/libp2p-mplex-0.10.1.tgz#9f8f276230bd00805f0138591582d42a69343817" - integrity sha512-D7XslSL2MpoQdWFW9m62fZb6U1iq5x18WDIJmBIxM4PKBbhNVsicMAfRGvm/ZntLmxkl2KO8utIcVjYBFg9tsQ== + version "0.10.2" + resolved "https://registry.yarnpkg.com/libp2p-mplex/-/libp2p-mplex-0.10.2.tgz#99f1381b43258269bab2425ff5ebd500512cacb4" + integrity sha512-fNdlPTts2MmGalPTYdQtzeGeuM73je9mP+2OvB6Gdn5vP9LeutUzUV4wvD9ISDVi8Gru5BzCsIBiS3WjxQqjdw== dependencies: abort-controller "^3.0.0" abortable-iterator "^3.0.0" bl "^4.0.0" - debug "^4.1.1" + debug "^4.3.1" err-code "^2.0.3" - it-pipe "^1.0.1" - it-pushable "^1.3.1" - varint "^5.0.0" + it-pipe "^1.1.0" + it-pushable "^1.4.1" + varint "^6.0.0" libp2p-noise@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/libp2p-noise/-/libp2p-noise-2.0.1.tgz#f00dc80811c52937cd411d96af6554972ee075c2" - integrity sha512-Jhd/jirWL3qkqGqIC1P4SH+OYlmKFll6UjFVYdw7otBKnbmdBUTW2Lg75/L1+7dYKwitHKu5EWlAd3zPU36gfg== + version "2.0.4" + resolved "https://registry.yarnpkg.com/libp2p-noise/-/libp2p-noise-2.0.4.tgz#dc915dd80a5158848ababdc6ad650a86537dd887" + integrity sha512-BE+bf4cXii1kcJQ50ZcoVSmqt2ab76p5EyL3praDGkQznjQ6+VKUMR8yNPCbxkQ7CxM1wpUA3Jj5m6FKM9nPZA== dependencies: - bcrypto "^5.2.0" + bcrypto "^5.3.0" buffer "^5.4.3" - debug "^4.1.1" + debug "^4.3.1" it-buffer "^0.1.1" it-length-prefixed "^3.0.0" it-pair "^1.0.0" - it-pb-rpc "^0.1.8" + it-pb-rpc "^0.1.9" it-pipe "^1.1.0" - libp2p-crypto "^0.18.0" - peer-id "^0.14.0" + libp2p-crypto "^0.19.0" + peer-id "^0.14.3" protobufjs "^6.10.1" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" libp2p-record@^0.9.0: version "0.9.0" @@ -10931,9 +11112,9 @@ libp2p-record@^0.9.0: uint8arrays "^1.1.0" libp2p-tcp@^0.15.0, libp2p-tcp@^0.15.1: - version "0.15.2" - resolved "https://registry.yarnpkg.com/libp2p-tcp/-/libp2p-tcp-0.15.2.tgz#308a845a9462d89f638d669b916ebddfdad7dea9" - integrity sha512-sJwzP6+iWj2QYwo3ab8DycWWGbjxHFm6Cv0mDj8nzkiebLnm36wMs5wXVDiSgerPITAOHE9SPTOOqaST8Y1rnw== + version "0.15.3" + resolved "https://registry.yarnpkg.com/libp2p-tcp/-/libp2p-tcp-0.15.3.tgz#dbcca2be5ff22ef5f7ebd1a403081d0360834c8c" + integrity sha512-j9efQ0aAbcCmVnnF0UqWH1r+qjNc0TpC3bV+QJDxBIe6v92a8l3kZ04G/QkP3vmzDT5Z4ayzMGjrOAas8hJIBA== dependencies: abortable-iterator "^3.0.0" class-is "^1.1.0" @@ -10970,9 +11151,9 @@ libp2p-webrtc-peer@^10.0.1: readable-stream "^3.4.0" libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.5: - version "0.20.6" - resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.6.tgz#64fbd4078d2fe513a2a1c58fda06331c2f93d5a6" - integrity sha512-XR7h/UYT694IuPj4xM3ik4aH2j2HqzHB4KEOXeE2bpsQ0myVPri3qG0BBrv+vkFCCK7NWu9L4EARGSgqB+qdCw== + 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== dependencies: "@hapi/hapi" "^20.0.0" "@hapi/inert" "^6.0.3" @@ -10980,7 +11161,7 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.5: class-is "^1.1.0" debug "^4.2.0" err-code "^2.0.3" - ipfs-utils "^5.0.0" + ipfs-utils "^6.0.0" it-pipe "^1.1.0" libp2p-utils "^0.2.1" libp2p-webrtc-peer "^10.0.1" @@ -11390,9 +11571,9 @@ mdast-add-list-metadata@1.0.1: unist-util-visit-parents "1.1.2" mdast-util-from-markdown@^0.8.0: - version "0.8.4" - resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz#2882100c1b9fc967d3f83806802f303666682d32" - integrity sha512-jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw== + version "0.8.5" + resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c" + integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ== dependencies: "@types/mdast" "^3.0.0" mdast-util-to-string "^2.0.0" @@ -11492,9 +11673,9 @@ microevent.ts@~0.1.1: integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g== micromark@~2.11.0: - version "2.11.2" - resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.2.tgz#e8b6a05f54697d2d3d27fc89600c6bc40dd05f35" - integrity sha512-IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ== + version "2.11.3" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.3.tgz#648e1e7970ea66a946cc2cbc678093ed814f29ed" + integrity sha512-oph5YYkVqR2U9OtWBcXYysZMtrdIvi8dfSeyEdr1wFr3Bk6YwI6THosX2AzKnhdps7mVUbXiqhmosu9DcA+xlQ== dependencies: debug "^4.0.0" parse-entities "^2.0.0" @@ -11531,6 +11712,11 @@ mime-db@1.45.0, mime-db@1.x.x, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== +mime-db@~1.12.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.12.0.tgz#3d0c63180f458eb10d325aaa37d7c58ae312e9d7" + integrity sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc= + mime-types@^2.1.12, mime-types@^2.1.16, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.28" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" @@ -11538,12 +11724,19 @@ mime-types@^2.1.12, mime-types@^2.1.16, mime-types@^2.1.27, mime-types@~2.1.17, dependencies: mime-db "1.45.0" +mime-types@~2.0.3: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.0.14.tgz#310e159db23e077f8bb22b748dabfa4957140aa6" + integrity sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY= + dependencies: + mime-db "~1.12.0" + mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.4.4: +mime@^2.4.0, mime@^2.4.4: version "2.5.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== @@ -11793,6 +11986,20 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +multer@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.2.tgz#2f1f4d12dbaeeba74cb37e623f234bf4d3d2057a" + integrity sha512-xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg== + dependencies: + append-field "^1.0.0" + busboy "^0.2.11" + concat-stream "^1.5.2" + mkdirp "^0.5.1" + object-assign "^4.1.1" + on-finished "^2.3.0" + type-is "^1.6.4" + xtend "^4.0.0" + multiaddr-to-uri@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/multiaddr-to-uri/-/multiaddr-to-uri-6.0.0.tgz#8f08a75c6eeb2370d5d24b77b8413e3f0fa9bcc0" @@ -11800,7 +12007,7 @@ multiaddr-to-uri@^6.0.0: dependencies: multiaddr "^8.0.0" -multiaddr@^8.0.0, multiaddr@^8.1.0: +multiaddr@^8.0.0, multiaddr@^8.1.0, 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== @@ -11822,7 +12029,7 @@ multibase@^0.7.0: base-x "^3.0.8" buffer "^5.5.0" -multibase@^3.0.0, multibase@^3.0.1, multibase@^3.1.0: +multibase@^3.0.0, multibase@^3.0.1, multibase@^3.1.0, multibase@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/multibase/-/multibase-3.1.1.tgz#fb4c0fc169c2d89d80cbf0cbbec4e00ffed8cf3a" integrity sha512-kkSd8jWGznDNEC2eDwtnvSGlZeTeEt0+oHieNWUhv8rIi8JU3voIUo02HpJBNOtgmtxT2CPwkElub7Y9kz3nrw== @@ -11891,10 +12098,10 @@ multihashes@^0.4.15, multihashes@~0.4.13, multihashes@~0.4.15: multibase "^0.7.0" varint "^5.0.0" -multihashes@^3.0.1, multihashes@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-3.1.1.tgz#4e0bbf1e4f3d5118f3621ec8d4404aee47a7d32b" - integrity sha512-oF4BesRWbr5BbcRr1/QCDlZK+An8LWBPHVPYKt/foDpqNtXX/l0lm/rmAjI8dDYruPO90OaGcAWI3KS5vNJdNw== +multihashes@^3.0.1, multihashes@^3.1.0, multihashes@^3.1.1, multihashes@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-3.1.2.tgz#ffa5e50497aceb7911f7b4a3b6cada9b9730edfc" + integrity sha512-AP4IoV/YzkNrfbQKZE3OMPibrmy350OmCd6cJkwyM8oExaXIlOY4UnOOVSQtAEuq/LR01XfXKCESidzZvSwHCQ== dependencies: multibase "^3.1.0" uint8arrays "^2.0.5" @@ -11910,16 +12117,16 @@ multihashes@~3.0.1: varint "^5.0.0" multihashing-async@^2.0.0, multihashing-async@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/multihashing-async/-/multihashing-async-2.0.1.tgz#cc50e05e88b02ed0a2d8a9518d8a6cf1fcf12aa1" - integrity sha512-LZcH8PqW4iEKymaJ3RpsgpSJhXF29kAvO02ccqbysiXkQhZpVce8rrg+vzRKWO89hhyIBnQHI2e/ZoRVxmiJ2Q== + version "2.1.0" + resolved "https://registry.yarnpkg.com/multihashing-async/-/multihashing-async-2.1.0.tgz#0d58de96e7b679140a5cfb9dd474bd7b00189814" + integrity sha512-FMzLEQEu+y4AgFoboe6peXLDeIZzsjvbBhI/wufLEfNf/Ev917sB4GCjMLO7CP2D9CXT5sjxjoloEODJ/jgyKw== dependencies: blakejs "^1.1.0" - err-code "^2.0.0" + err-code "^3.0.0" js-sha3 "^0.8.0" - multihashes "^3.0.1" + multihashes "^3.1.2" murmurhash3js-revisited "^3.0.0" - uint8arrays "^1.0.0" + uint8arrays "^2.0.5" multihashing-async@~0.5.1: version "0.5.2" @@ -11943,6 +12150,15 @@ multihashing-async@~0.6.0: murmurhash3js "^3.0.1" nodeify "^1.0.1" +multiparty@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.2.tgz#bee5fb5737247628d39dab4979ffd6d57bf60ef6" + integrity sha512-NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q== + dependencies: + http-errors "~1.8.0" + safe-buffer "5.2.1" + uid-safe "2.1.5" + multistream-select@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/multistream-select/-/multistream-select-1.0.0.tgz#e88b182965e7442a03d662cee63300261560c634" @@ -12198,7 +12414,7 @@ node-pre-gyp@^0.13.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.52, node-releases@^1.1.69: +node-releases@^1.1.52, node-releases@^1.1.70: version "1.1.70" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08" integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw== @@ -12483,7 +12699,7 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@~2.3.0: +on-finished@^2.3.0, on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= @@ -12517,9 +12733,9 @@ onetime@^5.1.0, onetime@^5.1.2: mimic-fn "^2.1.0" open@^7.0.2, open@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/open/-/open-7.3.1.tgz#111119cb919ca1acd988f49685c4fdd0f4755356" - integrity sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A== + version "7.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.0.tgz#ad95b98f871d9acb0ec8fecc557082cc9986626b" + integrity sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -12568,6 +12784,18 @@ optionator@^0.8.1, optionator@^0.8.2, optionator@^0.8.3: type-check "~0.3.2" word-wrap "~1.2.3" +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + orbit-db-access-controllers@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/orbit-db-access-controllers/-/orbit-db-access-controllers-0.3.0.tgz#48814ab2965a73a0d0d218b56be93318c478a0fb" @@ -12820,7 +13048,7 @@ p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2, p-limit@^2.3.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2: +p-limit@^3.0.2, p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -12886,7 +13114,7 @@ p-map@~1.1.1: resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz#05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a" integrity sha1-BfXkrpegaDcbwqXMhr+9vBnErno= -p-queue@^6.0.0, p-queue@^6.2.1, p-queue@^6.3.0, p-queue@^6.6.1: +p-queue@^6.0.0, p-queue@^6.2.1, p-queue@^6.3.0, p-queue@^6.6.1, p-queue@^6.6.2: version "6.6.2" resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426" integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ== @@ -12949,6 +13177,11 @@ p-timeout@^3.0.0, p-timeout@^3.2.0: dependencies: p-finally "^1.0.0" +p-timeout@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-4.1.0.tgz#788253c0452ab0ffecf18a62dff94ff1bd09ca0a" + integrity sha512-+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw== + p-times@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-times/-/p-times-3.0.0.tgz#477ff51aa8cfe7edef4cfcd4bc7e0250b13b4183" @@ -12971,7 +13204,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.1.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== @@ -13225,9 +13458,9 @@ pathseg@^1.2.0: integrity sha512-+pQS7lTaoVIXhaCW7R3Wd/165APzZHWzYVqe7dxzdupxQwebgpBaCmf0/XZwmoA/rkDq3qvzO0qv4d5oFVrBRw== pathval@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0" - integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA= + version "1.1.1" + resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" + integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== pbkdf2@^3.0.17, pbkdf2@^3.0.3: version "3.1.1" @@ -13245,18 +13478,18 @@ peek-readable@^3.1.3: resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.3.tgz#932480d46cf6aa553c46c68566c4fb69a82cd2b1" integrity sha512-mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg== -peer-id@^0.14.0, peer-id@^0.14.1, peer-id@^0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/peer-id/-/peer-id-0.14.2.tgz#3ddd752092a54f06b750b5e67d0db98fb4ee40bc" - integrity sha512-8iZWaUT7jq8rVyyFZUHYUwFCvhoI5B1Q2MAJjUF9MTf4TsNRQPnod4Mycf2jrK/uXFBN5/9K1NhPoieFyz/PRw== +peer-id@^0.14.0, peer-id@^0.14.1, peer-id@^0.14.2, peer-id@^0.14.3: + version "0.14.3" + resolved "https://registry.yarnpkg.com/peer-id/-/peer-id-0.14.3.tgz#e8fe27fa345e59e9afb41be6bf4aee25146adf0a" + integrity sha512-3ug6gDFWPuzihjjhMC0G/EEyaJaM9JCKPZqvPhwnsbhIUbutbS/MMF8Mb+TdDE1IksOXgCKNmohSZBJ/gFijOg== dependencies: - cids "^1.0.0" + cids "^1.1.5" class-is "^1.1.0" - libp2p-crypto "^0.18.0" + libp2p-crypto "^0.19.0" minimist "^1.2.5" - multihashes "^3.0.1" + multihashes "^3.1.1" protons "^2.0.0" - uint8arrays "^1.1.0" + uint8arrays "^2.0.5" pem-jwk@^2.0.0: version "2.0.0" @@ -13303,9 +13536,9 @@ pinkie@^2.0.0: integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= pino-pretty@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-4.3.0.tgz#18695606fd4f1e21cd1585d18999cd84d429e1d8" - integrity sha512-uEc9SUCCGVEs0goZvyznKXBHtI1PNjGgqHviJHxOCEFEWZN6Z/IQKv5pO9gSdm/b+WfX+/dfheWhtZUyScqjlQ== + version "4.5.0" + resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-4.5.0.tgz#8249058a3c2129b9b5c0663a7298ed58d59f4a07" + integrity sha512-TtIzAq3JrPT4cYMZcXHypAXYV+MTE7ncAPUFoaz/1enVD2Loj+hV6RZsypYo85dm7SbBolW6fcIydOF28iGjsg== dependencies: "@hapi/bourne" "^2.0.0" args "^5.0.1" @@ -14076,6 +14309,11 @@ postinstall-postinstall@~2.1.0: resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3" integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ== +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -14157,9 +14395,9 @@ prom-client@^12.0.0: tdigest "^0.1.1" prom-client@^13.0.0: - version "13.0.0" - resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-13.0.0.tgz#7e883e1c10c2d471258d3acf2d386197ffc819bd" - integrity sha512-M7ZNjIO6x+2R/vjSD13yjJPjpoZA8eEwH2Bp2Re0/PvzozD7azikv+SaBtZes4Q1ca/xHjZ4RSCuTag3YZLg1A== + version "13.1.0" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-13.1.0.tgz#1185caffd8691e28d32e373972e662964e3dba45" + integrity sha512-jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng== dependencies: tdigest "^0.1.1" @@ -14233,11 +14471,11 @@ prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@~15.7.2: react-is "^16.8.1" proper-lockfile@^4.0.0, proper-lockfile@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.1.tgz#284cf9db9e30a90e647afad69deb7cb06881262c" - integrity sha512-1w6rxXodisVpn7QYvLk706mzprPTAPCYAqxMvctmPN3ekuRk/kuGkGc82pangZiAt4R3lwSuUzheTTn0/Yb7Zg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" + integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA== dependencies: - graceful-fs "^4.1.11" + graceful-fs "^4.2.4" retry "^0.12.0" signal-exit "^3.0.2" @@ -14448,6 +14686,11 @@ ramda@^0.27.1: resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9" integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw== +random-bytes@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b" + integrity sha1-T2ih3Arli9P7lYSMMDJNt11kNgs= + randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.3, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -14756,6 +14999,16 @@ read-pkg@^3.0.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@1.1.x: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" @@ -14892,7 +15145,7 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpp@^3.0.0: +regexpp@^3.0.0, regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== @@ -14929,9 +15182,9 @@ regjsgen@^0.5.1: integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== regjsparser@^0.6.4: - version "0.6.6" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.6.tgz#6d8c939d1a654f78859b08ddcc4aa777f3fa800a" - integrity sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ== + version "0.6.7" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c" + integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ== dependencies: jsesc "~0.5.0" @@ -15025,6 +15278,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -15183,6 +15441,13 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: dependencies: glob "^7.1.3" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -15244,7 +15509,7 @@ rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.6.0: dependencies: tslib "^1.9.0" -safe-buffer@*, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0, safe-buffer@~5.2.1: +safe-buffer@*, safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0, safe-buffer@~5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -15428,7 +15693,7 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^7.3.2: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== @@ -15530,6 +15795,11 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + sha.js@^2.4.0, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -15601,7 +15871,7 @@ shortid@^2.2.8: dependencies: nanoid "^2.1.0" -side-channel@^1.0.2, side-channel@^1.0.3: +side-channel@^1.0.3, side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== @@ -15643,14 +15913,14 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -sinon@^9.0.2: - version "9.2.3" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.3.tgz#f68ce414e843e2fd638703043c97f260697caa52" - integrity sha512-m+DyAWvqVHZtjnjX/nuShasykFeiZ+nPuEfD4G3gpvKGkXRhkF/6NSt2qN2FjZhfrcHXFzUzI+NLnk+42fnLEw== +sinon@^9.0.2, sinon@^9.2.4: + version "9.2.4" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.4.tgz#e55af4d3b174a4443a8762fa8421c2976683752b" + integrity sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg== dependencies: "@sinonjs/commons" "^1.8.1" "@sinonjs/fake-timers" "^6.0.1" - "@sinonjs/samsam" "^5.3.0" + "@sinonjs/samsam" "^5.3.1" diff "^4.0.2" nise "^4.0.4" supports-color "^7.1.0" @@ -15684,6 +15954,15 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -15874,9 +16153,9 @@ source-map-support@^0.5.6, source-map-support@~0.5.12: source-map "^0.6.0" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" @@ -16070,11 +16349,16 @@ stream-to-it@^0.2.0, stream-to-it@^0.2.1, stream-to-it@^0.2.2: dependencies: get-iterator "^1.0.2" -streaming-iterables@^5.0.2, streaming-iterables@^5.0.3: +streaming-iterables@^5.0.2, streaming-iterables@^5.0.3, streaming-iterables@^5.0.4: version "5.0.4" resolved "https://registry.yarnpkg.com/streaming-iterables/-/streaming-iterables-5.0.4.tgz#4e0eed3416eed956968d1d19b9776dc480802062" integrity sha512-nEs6hBGIPsVz6uq6pscGGKfoPDQWrDQW0b0UHurtSDysekfKLmkPg7FQVRE2sj3Rad6yUo9E1sGTxOWyYsHQ/g== +streamsearch@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" + integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= + strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -16167,6 +16451,11 @@ string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@^1.2.0: dependencies: safe-buffer "~5.2.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -16251,7 +16540,7 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -strip-json-comments@^3.0.1, strip-json-comments@^3.1.1: +strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -16376,6 +16665,16 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" +table@^6.0.4: + version "6.0.7" + resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" + integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== + dependencies: + ajv "^7.0.2" + lodash "^4.17.20" + slice-ansi "^4.0.0" + string-width "^4.2.0" + tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" @@ -16409,11 +16708,6 @@ temp@^0.9.4: mkdirp "^0.5.1" rimraf "~2.6.2" -term-size@^2.1.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" - integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== - terser-webpack-plugin@2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz#894764a19b0743f2f704e7c2a848c5283a696724" @@ -16646,9 +16940,9 @@ trough@^1.0.0: integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== truffle@~5.1.55: - version "5.1.62" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.62.tgz#819b8280615345bf42bbba7967f2dc9d39347869" - integrity sha512-TWgZ3xSSb8us4ZkHEHRghJWivfewjEy7yd8nARd7EHvoOi5lcUmKnbsunP+G7u/AO47gRoEqwFdPuGPdXrBM1A== + version "5.1.64" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.64.tgz#f89dcd3711a8c872c8c5dfd5527e49dcded4c175" + integrity sha512-qobAgDRRK8rUr6SjH8gmacp1a50XJFD2zX1tCtxdk3RXl3yCSEBxHP1srW+jPoPzL6Ua6C0vbbbjVbemrTrtAQ== dependencies: app-module-path "^2.2.0" mocha "8.1.2" @@ -16699,9 +16993,9 @@ tsparticles@^1.18.10: pathseg "^1.2.0" tsutils@^3.17.1: - version "3.19.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.19.1.tgz#d8566e0c51c82f32f9c25a4d367cd62409a547a9" - integrity sha512-GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw== + version "3.20.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.20.0.tgz#ea03ea45462e146b53d70ce0893de453ff24f698" + integrity sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg== dependencies: tslib "^1.8.1" @@ -16727,6 +17021,13 @@ tweetnacl@^1.0.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -16744,12 +17045,17 @@ type-fest@^0.11.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-is@~1.6.17, type-is@~1.6.18: +type-is@^1.6.4, type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -16808,6 +17114,13 @@ typical@^6.0.0: resolved "https://registry.yarnpkg.com/typical/-/typical-6.0.1.tgz#89bd1a6aa5e5e96fa907fb6b7579223bff558a06" integrity sha512-+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A== +uid-safe@2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a" + integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA== + dependencies: + random-bytes "~1.0.0" + uint8arrays@1.1.0, uint8arrays@^1.0.0, uint8arrays@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-1.1.0.tgz#d034aa65399a9fd213a1579e323f0b29f67d0ed2" @@ -16910,6 +17223,15 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" +unirest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/unirest/-/unirest-0.6.0.tgz#289b5ae59cc9fa9fdfff3b5866e0dd50bf5eb280" + integrity sha512-BdYdcYJHXACqZ53k8Zz7QlNK/1W/HjCZlmg1OaaN/oTSp4FTWh0upXGSJsG88PljDBpSrNc2R649drasUA9NEg== + dependencies: + form-data "^0.2.0" + mime "^2.4.0" + request "^2.88.0" + unist-util-is@^4.0.0: version "4.0.4" resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz#3e9e8de6af2eb0039a59f50c9b3e99698a924f50" @@ -16978,22 +17300,22 @@ upath@^1.1.1: integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== update-notifier@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.0.1.tgz#1f92d45fb1f70b9e33880a72dd262bc12d22c20d" - integrity sha512-BuVpRdlwxeIOvmc32AGYvO1KVdPlsmqSh8KDDBxS6kDE5VR7R8OMP1d8MdhaVBvxl4H3551k9akXr0Y1iIB2Wg== + version "5.1.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== dependencies: - boxen "^4.2.0" + boxen "^5.0.0" chalk "^4.1.0" configstore "^5.0.1" has-yarn "^2.1.0" import-lazy "^2.1.0" is-ci "^2.0.0" - is-installed-globally "^0.3.2" + is-installed-globally "^0.4.0" is-npm "^5.0.0" is-yarn-global "^0.3.0" latest-version "^5.1.0" pupa "^2.1.1" - semver "^7.3.2" + semver "^7.3.4" semver-diff "^3.1.1" xdg-basedir "^4.0.0" @@ -17318,189 +17640,91 @@ web-encoding@^1.0.2, web-encoding@^1.0.5, web-encoding@^1.0.6: resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.0.6.tgz#ec631356ee523b4474ecbcae680440bd1e79416a" integrity sha512-26wEnRPEFAc5d5lmH1Q/DuvWEYsRF1D2alX2jlKpdmqv7cj+BbANL7Xlcl9r4s72Eg9kItZa9RWVbBMC9dMv4w== -web3-bzz@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.1.tgz#c7e13e5fbbbe4634b0d883e5440069fc58e58044" - integrity sha512-MN726zFpFpwhs3NMC35diJGkwTVUj+8LM/VWqooGX/MOjgYzNrJ7Wr8EzxoaTCy87edYNBprtxBkd0HzzLmung== - dependencies: - "@types/node" "^12.12.6" - got "9.6.0" - swarm-js "^0.1.40" - underscore "1.9.1" - -web3-bzz@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.3.tgz#e3d9c8ff5db4d61fe3a4b7b7b93d61000c0e4322" - integrity sha512-lFERlqnr/upJhADT6US7BGUkM5cy6idw86/GvWKo9h/uyrbV14gk+bUqcQdBBSopa1Mvvy5ZaO6rKtRe8PTsQw== +web3-bzz@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.3.4.tgz#9be529353c4063bc68395370cb5d8e414c6b6c87" + integrity sha512-DBRVQB8FAgoAtZCpp2GAGPCJjgBgsuwOKEasjV044AAZiONpXcKHbkO6G1SgItIixnrJsRJpoGLGw52Byr6FKw== dependencies: "@types/node" "^12.12.6" got "9.6.0" swarm-js "^0.1.40" underscore "1.9.1" -web3-core-helpers@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.1.tgz#ffd6f47c1b54a8523f00760a8d713f44d0f97e97" - integrity sha512-tMVU0ScyQUJd/HFWfZrvGf+QmPCodPyKQw1gQ+n9We/H3vPPbUxDjNeYnd4BbYy5O9ox+0XG6i3+JlwiSkgDkA== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.3.1" - web3-utils "1.3.1" - -web3-core-helpers@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.3.tgz#58a7a34278e4b338dde9520012679d5952701a69" - integrity sha512-rUTC9sgn1Wvw2KGBtc9/bsQKUd+yjzIm14mlaqqiO0vpFueTmmagwiGRE2CWzEfYg+r2jnYIIgh9qnsCykgVkQ== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.3.3" - web3-utils "1.3.3" - -web3-core-method@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.1.tgz#c1d8bf1e2104a8d625c99caf94218ad2dc948c92" - integrity sha512-dA38tNVZWTxBFMlLFunLD5Az1AWRi5HqM+AtQrTIhxWCzg7rJSHuaYOZ6A5MHKGPWpdykLhzlna0SsNv5AVs8w== +web3-core-helpers@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.4.tgz#b8549740bf24d5c71688d89c3cdd802d8d36b4e4" + integrity sha512-n7BqDalcTa1stncHMmrnFtyTgDhX5Fy+avNaHCf6qcOP2lwTQC8+mdHVBONWRJ6Yddvln+c8oY/TAaB6PzWK0A== dependencies: - "@ethersproject/transactions" "^5.0.0-beta.135" underscore "1.9.1" - web3-core-helpers "1.3.1" - web3-core-promievent "1.3.1" - web3-core-subscriptions "1.3.1" - web3-utils "1.3.1" + web3-eth-iban "1.3.4" + web3-utils "1.3.4" -web3-core-method@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.3.tgz#f992744180e003d0ca55b1b17b4a9678cb9f7247" - integrity sha512-d3AA1lyw0dvLs53X17pHpD5QpxJdkfolbN31UQymRF5Y+swFweqRiCuJoNTplE95ZX2uUtsLhEIbaszj7dQgFg== +web3-core-method@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.4.tgz#6c2812d96dd6c811b9e6c8a5d25050d2c22b9527" + integrity sha512-JxmQrujsAWYRRN77P/RY7XuZDCzxSiiQJrgX/60Lfyf7FF1Y0le4L/UMCi7vUJnuYkbU1Kfl9E0udnqwyPqlvQ== dependencies: "@ethersproject/transactions" "^5.0.0-beta.135" underscore "1.9.1" - web3-core-helpers "1.3.3" - web3-core-promievent "1.3.3" - web3-core-subscriptions "1.3.3" - web3-utils "1.3.3" - -web3-core-promievent@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.1.tgz#b4da4b34cd9681e22fcda25994d7629280a1e046" - integrity sha512-jGu7TkwUqIHlvWd72AlIRpsJqdHBQnHMeMktrows2148gg5PBPgpJ10cPFmCCzKT6lDOVh9B7pZMf9eckMDmiA== - dependencies: - eventemitter3 "4.0.4" + web3-core-helpers "1.3.4" + web3-core-promievent "1.3.4" + web3-core-subscriptions "1.3.4" + web3-utils "1.3.4" -web3-core-promievent@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.3.tgz#b6dcede41965a35ad53041f4f16c6ef7865bf13c" - integrity sha512-ARgO+BWUCxK8U/977SdJ8oyJo51mDYUzlZFoa2NFjUH+QYrFoKA7l9Hhw/vxhy13jE2LaVUM31JBLzVb+GM9dQ== +web3-core-promievent@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.4.tgz#d166239012d91496cdcbe91d5d54071ea818bc73" + integrity sha512-V61dZIeBwogg6hhZZUt0qL9hTp1WDhnsdjP++9fhTDr4vy/Gz8T5vibqT2LLg6lQC8i+Py33yOpMeMNjztaUaw== dependencies: eventemitter3 "4.0.4" -web3-core-requestmanager@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.1.tgz#6dd2b5161ba778dfffe68994a4accff2decc54fe" - integrity sha512-9WTaN2SoyJX1amRyTzX2FtbVXsyWBI2Wef2Q3gPiWaEo/VRVm3e4Bq8MwxNTUMIJMO8RLGHjtdgsoDKPwfL73Q== - dependencies: - underscore "1.9.1" - util "^0.12.0" - web3-core-helpers "1.3.1" - web3-providers-http "1.3.1" - web3-providers-ipc "1.3.1" - web3-providers-ws "1.3.1" - -web3-core-requestmanager@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.3.tgz#deaf18307ddf0e292ac783b5486d2f6e2480a9ac" - integrity sha512-4/J23wK5IXRw/1kqda7FXtvySKjX7Phcevqjx0EkcBtrxAfLedcqf8k2PlDh5LtCXfPW66u4V3fDgHdLZMrVgQ== +web3-core-requestmanager@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.4.tgz#e105ced735c2b5fcedd5771e0ecf9879ae9c373f" + integrity sha512-xriouCrhVnVDYQ04TZXdEREZm0OOJzkSEsoN5bu4JYsA6e/HzROeU+RjDpMUxFMzN4wxmFZ+HWbpPndS3QwMag== dependencies: underscore "1.9.1" util "^0.12.0" - web3-core-helpers "1.3.3" - web3-providers-http "1.3.3" - web3-providers-ipc "1.3.3" - web3-providers-ws "1.3.3" - -web3-core-subscriptions@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.1.tgz#be1103259f91b7fc7f4c6a867aa34dea70a636f7" - integrity sha512-eX3N5diKmrxshc6ZBZ8EJxxAhCxdYPbYXuF2EfgdIyHmxwmYqIVvKepzO8388Bx8JD3D0Id/pKE0dC/FnDIHTQ== - dependencies: - eventemitter3 "4.0.4" - underscore "1.9.1" - web3-core-helpers "1.3.1" + web3-core-helpers "1.3.4" + web3-providers-http "1.3.4" + web3-providers-ipc "1.3.4" + web3-providers-ws "1.3.4" -web3-core-subscriptions@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.3.tgz#296752e7cfad5a559162eea4dbc9086e4e24e62d" - integrity sha512-VvcPuNYcGLb6HfgMrNN6Q/1CwSk2uIqUjhrVTQ67JIxIddsEdV1f6SsQH9MX1cmwi39ffGsYtssOT1pht4Zc8g== +web3-core-subscriptions@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.4.tgz#7b00e92bde21f792620cd02e6e508fcf4f4c31d3" + integrity sha512-drVHVDxh54hv7xmjIm44g4IXjfGj022fGw4/meB5R2D8UATFI40F73CdiBlyqk3DysP9njDOLTJFSQvEkLFUOg== dependencies: eventemitter3 "4.0.4" underscore "1.9.1" - web3-core-helpers "1.3.3" - -web3-core@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.1.tgz#fb0fc5d952a7f3d580a7e6155d2f28be064e64cb" - integrity sha512-QlBwSyjl2pqYUBE7lH9PfLxa8j6AzzAtvLUqkgoaaFJYLP/+XavW1n6dhVCTq+U3L3eNc+bMp9GLjGDJNXMnGg== - dependencies: - "@types/bn.js" "^4.11.5" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-core-requestmanager "1.3.1" - web3-utils "1.3.1" + web3-core-helpers "1.3.4" -web3-core@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.3.tgz#c012792d82a26743c068658a9fed56894501e396" - integrity sha512-hCDWj/3PBHhSJSSBi+nV7MiW9Djf/pRuUXcVO2jWroAXqAbTSXLHpju0AWTzXnlsqs1QHK0Yk8nF9jojGUQVYg== +web3-core@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.4.tgz#2cc7ba7f35cc167f7a0a46fd5855f86e51d34ce8" + integrity sha512-7OJu46RpCEfTerl+gPvHXANR2RkLqAfW7l2DAvQ7wN0pnCzl9nEfdgW6tMhr31k3TR2fWucwKzCyyxMGzMHeSA== dependencies: "@types/bn.js" "^4.11.5" "@types/node" "^12.12.6" bignumber.js "^9.0.0" - web3-core-helpers "1.3.3" - web3-core-method "1.3.3" - web3-core-requestmanager "1.3.3" - web3-utils "1.3.3" - -web3-eth-abi@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.1.tgz#d60fe5f15c7a3a426c553fdaa4199d07f1ad899c" - integrity sha512-ds4aTeKDUEqTXgncAtxvcfMpPiei9ey7+s2ZZ+OazK2CK5jWhFiJuuj9Q68kOT+hID7E1oSDVsNmJWFD/7lbMw== - dependencies: - "@ethersproject/abi" "5.0.7" - underscore "1.9.1" - web3-utils "1.3.1" + web3-core-helpers "1.3.4" + web3-core-method "1.3.4" + web3-core-requestmanager "1.3.4" + web3-utils "1.3.4" -web3-eth-abi@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.3.tgz#21dbebc7c50d66cb61195f13ece9262601a2b5b7" - integrity sha512-9GQ7YTALt1uxGwdMBpBHlagCj4yn0fPUT2wDDAGoyJFVJMsUt3arF855zsVpJL3zfhHmUgRNoVrAkobRR2YYLw== +web3-eth-abi@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.4.tgz#10f5d8b6080dbb6cbaa1bcef7e0c70573da6566f" + integrity sha512-PVSLXJ2dzdXsC+R24llIIEOS6S1KhG5qwNznJjJvXZFe3sqgdSe47eNvwUamZtCBjcrdR/HQr+L/FTxqJSf80Q== dependencies: "@ethersproject/abi" "5.0.7" underscore "1.9.1" - web3-utils "1.3.3" - -web3-eth-accounts@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.1.tgz#63b247461f1ae0ae46f9a5d5aa896ea80237143e" - integrity sha512-wsV3/0Pbn5+pI8PiCD1CYw7I1dkQujcP//aJ+ZH8PoaHQoG6HnJ7nTp7foqa0r/X5lizImz/g5S8D76t3Z9tHA== - dependencies: - crypto-browserify "3.12.0" - eth-lib "0.2.8" - ethereumjs-common "^1.3.2" - ethereumjs-tx "^2.1.1" - scrypt-js "^3.0.1" - underscore "1.9.1" - uuid "3.3.2" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-utils "1.3.1" + web3-utils "1.3.4" -web3-eth-accounts@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.3.tgz#1fda75f55bdb780765d627315fe9f499a27fda28" - integrity sha512-Jn9nguNsCLnY7Po6lv7Mg5JDaYuKdvL0Ezv1V2LTLy+EhcVt5i19h+/3M92Xynpe5Tx+WY/ELfeA2jLTeP5jRg== +web3-eth-accounts@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.4.tgz#cf513d78531c13ce079a5e7862820570350e79a5" + integrity sha512-gz9ReSmQEjqbYAjpmAx+UZF4CVMbyS4pfjSYWGAnNNI+Xz0f0u0kCIYXQ1UEaE+YeLcYiE+ZlZdgg6YoatO5nA== dependencies: crypto-browserify "3.12.0" eth-lib "0.2.8" @@ -17509,259 +17733,130 @@ web3-eth-accounts@1.3.3: scrypt-js "^3.0.1" underscore "1.9.1" uuid "3.3.2" - web3-core "1.3.3" - web3-core-helpers "1.3.3" - web3-core-method "1.3.3" - web3-utils "1.3.3" + web3-core "1.3.4" + web3-core-helpers "1.3.4" + web3-core-method "1.3.4" + web3-utils "1.3.4" -web3-eth-contract@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.1.tgz#05cb77bd2a671c5480897d20de487f3bae82e113" - integrity sha512-cHu9X1iGrK+Zbrj4wYKwHI1BtVGn/9O0JRsZqd9qcFGLwwAmaCJYy0sDn7PKCKDSL3qB+MDILoyI7FaDTWWTHg== - dependencies: - "@types/bn.js" "^4.11.5" - underscore "1.9.1" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-core-promievent "1.3.1" - web3-core-subscriptions "1.3.1" - web3-eth-abi "1.3.1" - web3-utils "1.3.1" - -web3-eth-contract@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.3.tgz#a89944b04eb40227b3490cb5f807cb95c0e48eeb" - integrity sha512-TKGs1qvc/v7TriyGKtnTqVrB3J/mWSeqLkWtLY60lGqY8KopZ9k7dZ/g5Cvfiox57VHWkpOk0xDwUQjlIe4Ikg== +web3-eth-contract@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.4.tgz#1ea2dd71be0c4a9cf4772d4f75dbb2fa99751472" + integrity sha512-Fvy8ZxUksQY2ePt+XynFfOiSqxgQtMn4m2NJs6VXRl2Inl17qyRi/nIJJVKTcENLocm+GmZ/mxq2eOE5u02nPg== dependencies: "@types/bn.js" "^4.11.5" underscore "1.9.1" - web3-core "1.3.3" - web3-core-helpers "1.3.3" - web3-core-method "1.3.3" - web3-core-promievent "1.3.3" - web3-core-subscriptions "1.3.3" - web3-eth-abi "1.3.3" - web3-utils "1.3.3" - -web3-eth-ens@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.1.tgz#ccfd621ddc1fecb44096bc8e60689499a9eb4421" - integrity sha512-MUQvYgUYQ5gAwbZyHwI7y+NTT6j98qG3MVhGCUf58inF5Gxmn9OlLJRw8Tofgf0K87Tk9Kqw1/2QxUE4PEZMMA== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - underscore "1.9.1" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-promievent "1.3.1" - web3-eth-abi "1.3.1" - web3-eth-contract "1.3.1" - web3-utils "1.3.1" - -web3-eth-ens@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.3.tgz#88c8d061c2f5eeeeea3736ef0712451d76b5091b" - integrity sha512-tresrI1CM6RbxsUCM6kfG1W10LDMqWJnU+lNhfaD5mt5IzJ4GcfDAHO9WzoYl8Esh+Epj/jD+vI30clI4j90Vg== + web3-core "1.3.4" + web3-core-helpers "1.3.4" + web3-core-method "1.3.4" + web3-core-promievent "1.3.4" + web3-core-subscriptions "1.3.4" + web3-eth-abi "1.3.4" + web3-utils "1.3.4" + +web3-eth-ens@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.4.tgz#a7e4bb18481fb0e2ce5bfb3b3da2fbb0ad78cefe" + integrity sha512-b0580tQyQwpV2wyacwQiBEfQmjCUln5iPhge3IBIMXaI43BUNtH3lsCL9ERFQeOdweB4o+6rYyNYr6xbRcSytg== dependencies: content-hash "^2.5.2" eth-ens-namehash "2.0.8" underscore "1.9.1" - web3-core "1.3.3" - web3-core-helpers "1.3.3" - web3-core-promievent "1.3.3" - web3-eth-abi "1.3.3" - web3-eth-contract "1.3.3" - web3-utils "1.3.3" - -web3-eth-iban@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.1.tgz#4351e1a658efa5f3218357f0a38d6d8cad82481e" - integrity sha512-RCQLfR9Z+DNfpw7oUauYHg1HcVoEljzhwxKn3vi15gK0ssWnTwRGqUiIyVTeSb836G6oakOd5zh7XYqy7pn+nw== + web3-core "1.3.4" + web3-core-helpers "1.3.4" + web3-core-promievent "1.3.4" + web3-eth-abi "1.3.4" + web3-eth-contract "1.3.4" + web3-utils "1.3.4" + +web3-eth-iban@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.4.tgz#5eb7a564e0dcf68730d68f48f95dd207cd173d81" + integrity sha512-Y7/hLjVvIN/OhaAyZ8L/hxbTqVX6AFTl2RwUXR6EEU9oaLydPcMjAx/Fr8mghUvQS3QJSr+UGubP3W4SkyNiYw== dependencies: bn.js "^4.11.9" - web3-utils "1.3.1" - -web3-eth-iban@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.3.tgz#ad3e4e30a2a101febfeed0248a107889a13372ec" - integrity sha512-+9a+bZHAKQ4oBcRxiGbC1MC8S2cOgDlXo8qcw0XpMhLJZ3c/brZM7ZbPdiuU8Z7AMYf3PknaGFQyVmedZhrauA== - dependencies: - bn.js "^4.11.9" - web3-utils "1.3.3" - -web3-eth-personal@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.1.tgz#cfe8af01588870d195dabf0a8d9e34956fb8856d" - integrity sha512-/vZEQpXJfBfYoy9KT911ItfoscEfF0Q2j8tsXzC2xmmasSZ6YvAUuPhflVmAo0IHQSX9rmxq0q1p3sbnE3x2pQ== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-net "1.3.1" - web3-utils "1.3.1" + web3-utils "1.3.4" -web3-eth-personal@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.3.tgz#45ecf0a6fcb2bca0a7a4de11d4c2ed405579ee44" - integrity sha512-S/TSGTm7x9oHRXUHXi8f+y187RKpn5aqYJRlSoyTmB3B4EMrv9NcZZQmHaiXwM48wkFdRhTMECW1Ar8E5zZLFw== +web3-eth-personal@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.4.tgz#0d0e0abea3447283d7ee5658ed312990c9bf48dd" + integrity sha512-JiTbaktYVk1j+S2EDooXAhw5j/VsdvZfKRmHtXUe/HizPM9ETXmj1+ne4RT6m+950jQ7DJwUF3XU1FKYNtEDwQ== dependencies: "@types/node" "^12.12.6" - web3-core "1.3.3" - web3-core-helpers "1.3.3" - web3-core-method "1.3.3" - web3-net "1.3.3" - web3-utils "1.3.3" + web3-core "1.3.4" + web3-core-helpers "1.3.4" + web3-core-method "1.3.4" + web3-net "1.3.4" + web3-utils "1.3.4" -web3-eth@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.1.tgz#60ac4b58e5fd17b8dbbb8378abd63b02e8326727" - integrity sha512-e4iL8ovj0zNxzbv4LTHEv9VS03FxKlAZD+95MolwAqtVoUnKC2H9X6dli0w6eyXP0aKw+mwY0g0CWQHzqZvtXw== - dependencies: - underscore "1.9.1" - web3-core "1.3.1" - web3-core-helpers "1.3.1" - web3-core-method "1.3.1" - web3-core-subscriptions "1.3.1" - web3-eth-abi "1.3.1" - web3-eth-accounts "1.3.1" - web3-eth-contract "1.3.1" - web3-eth-ens "1.3.1" - web3-eth-iban "1.3.1" - web3-eth-personal "1.3.1" - web3-net "1.3.1" - web3-utils "1.3.1" - -web3-eth@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.3.tgz#e03d1a4a7ea97b36c63bb54f000ebe0ef9f140c7" - integrity sha512-NvbkCaN26o7f9EogsRsA/lbwF+8dXimJWsaGpZK3ANa+AZrYkWj3NuaxfPO/S/RLsC9ptJdt7id72qxT40r5QQ== +web3-eth@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.4.tgz#7c4607685e66a1c43e3e315e526c959f24f96907" + integrity sha512-8OIVMLbvmx+LB5RZ4tDhXuFGWSdNMrCZ4HM0+PywQ08uEcmAcqTMFAn4vdPii+J8gCatZR501r1KdzX3SDLoPw== dependencies: underscore "1.9.1" - web3-core "1.3.3" - web3-core-helpers "1.3.3" - web3-core-method "1.3.3" - web3-core-subscriptions "1.3.3" - web3-eth-abi "1.3.3" - web3-eth-accounts "1.3.3" - web3-eth-contract "1.3.3" - web3-eth-ens "1.3.3" - web3-eth-iban "1.3.3" - web3-eth-personal "1.3.3" - web3-net "1.3.3" - web3-utils "1.3.3" - -web3-net@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.1.tgz#79374b1df37429b0839b83b0abc4440ac6181568" - integrity sha512-vuMMWMk+NWHlrNfszGp3qRjH/64eFLiNIwUi0kO8JXQ896SP3Ma0su5sBfSPxNCig047E9GQimrL9wvYAJSO5A== - dependencies: - web3-core "1.3.1" - web3-core-method "1.3.1" - web3-utils "1.3.1" - -web3-net@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.3.tgz#dacfe2456d0584ed1500e98bdd12082353883cd6" - integrity sha512-GcPj2lyAC5CP6FOCwoURCRMFsh0khWBi6sGqiKtUPMa7dKnLw8CLCAFcwX//d3ucnn1E7I78Va6k8liKjj87sA== - dependencies: - web3-core "1.3.3" - web3-core-method "1.3.3" - web3-utils "1.3.3" - -web3-providers-http@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.1.tgz#becbea61706b2fa52e15aca6fe519ee108a8fab9" - integrity sha512-DOujG6Ts7/hAMj0PW5p9/1vwxAIr+1CJ6ZWHshtfOq1v1KnMphVTGOrjcTTUvPT33/DA/so2pgGoPMrgaEIIvQ== - dependencies: - web3-core-helpers "1.3.1" - xhr2-cookies "1.1.0" - -web3-providers-http@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.3.tgz#55c15c79ecd7f5415d2d0d0f748ff4304ba23edd" - integrity sha512-V2x27IFXQqsaZrAbA4GJurKuyrNXapmmpSJ7jxPDOxewOy9dEURlKIg5W1bb4QXGh2YSCksuH9fKquvTfPfc/A== - dependencies: - web3-core-helpers "1.3.3" + web3-core "1.3.4" + web3-core-helpers "1.3.4" + web3-core-method "1.3.4" + web3-core-subscriptions "1.3.4" + web3-eth-abi "1.3.4" + web3-eth-accounts "1.3.4" + web3-eth-contract "1.3.4" + web3-eth-ens "1.3.4" + web3-eth-iban "1.3.4" + web3-eth-personal "1.3.4" + web3-net "1.3.4" + web3-utils "1.3.4" + +web3-net@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.4.tgz#d76158bf0b4a7b3b14352b4f95472db9efc57a2a" + integrity sha512-wVyqgVC3Zt/0uGnBiR3GpnsS8lvOFTDgWZMxAk9C6Guh8aJD9MUc7pbsw5rHrPUVe6S6RUfFJvh/Xq8oMIQgSw== + dependencies: + web3-core "1.3.4" + web3-core-method "1.3.4" + web3-utils "1.3.4" + +web3-providers-http@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.4.tgz#89389e18e27148faa2fef58842740ffadbdda8cc" + integrity sha512-aIg/xHXvxpqpFU70sqfp+JC3sGkLfAimRKTUhG4oJZ7U+tTcYTHoxBJj+4A3Id4JAoKiiv0k1/qeyQ8f3rMC3g== + dependencies: + web3-core-helpers "1.3.4" xhr2-cookies "1.1.0" -web3-providers-ipc@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.1.tgz#3cb2572fc5286ab2f3117e0a2dce917816c3dedb" - integrity sha512-BNPscLbvwo+u/tYJrLvPnl/g/SQVSnqP/TjEsB033n4IXqTC4iZ9Of8EDmI0U6ds/9nwNqOBx3KsxbinL46UZA== - dependencies: - oboe "2.1.5" - underscore "1.9.1" - web3-core-helpers "1.3.1" - -web3-providers-ipc@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.3.tgz#b3e1f30875e9c71e94c23be264ed4d9c50313f37" - integrity sha512-XMQo/YsH/2lBaRlkYa5d/Q+2EJ2RTzVjio1i2G9TESESfHCj0l2AWLb3zet+f/QRVxfvXGmGlZuf99diof2a1g== +web3-providers-ipc@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.4.tgz#b963518989b1b7847063cdd461ff73b83855834a" + integrity sha512-E0CvXEJElr/TIlG1YfJeO3Le5NI/4JZM+1SsEdiPIfBUAJN18oOoum138EBGKv5+YaLKZUtUuJSXWjIIOR/0Ig== dependencies: oboe "2.1.5" underscore "1.9.1" - web3-core-helpers "1.3.3" - -web3-providers-ws@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.1.tgz#a70140811d138a1a5cf3f0c39d11887c8e341c83" - integrity sha512-DAbVbiizv0Hr/bLKjyyKMHc/66ccVkudan3eRsf+R/PXWCqfXb7q6Lwodj4llvC047pEuLKR521ZKr5wbfk1KQ== - dependencies: - eventemitter3 "4.0.4" - underscore "1.9.1" - web3-core-helpers "1.3.1" - websocket "^1.0.32" + web3-core-helpers "1.3.4" -web3-providers-ws@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.3.tgz#f654ee83444d141c365eee7fba6985590b674ba5" - integrity sha512-yuzqB3jST9JS19oOR1FRaARM7JBeP6cbKffM8HoWp4Y98/OowjW1mbDQVS47YTSHBP2QiLzSrwBxjIEPm8f48Q== +web3-providers-ws@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.4.tgz#b94c2e0ec51a0c472abdec53a472b5bf8176bec1" + integrity sha512-WBd9hk2fUAdrbA3kUyUk94ZeILtE6txLeoVVvIKAw2bPegx+RjkLyxC1Du0oceKgQ/qQWod8CCzl1E/GgTP+MQ== dependencies: eventemitter3 "4.0.4" underscore "1.9.1" - web3-core-helpers "1.3.3" + web3-core-helpers "1.3.4" websocket "^1.0.32" -web3-shh@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.1.tgz#42294d684358c22aa48616cb9a3eb2e9c1e6362f" - integrity sha512-57FTQvOW1Zm3wqfZpIEqL4apEQIR5JAxjqA4RM4eL0jbdr+Zj5Y4J93xisaEVl6/jMtZNlsqYKTVswx8mHu1xw== - dependencies: - web3-core "1.3.1" - web3-core-method "1.3.1" - web3-core-subscriptions "1.3.1" - web3-net "1.3.1" - -web3-shh@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.3.tgz#55e4e6826b5af51b60708969da268c76a960f2bd" - integrity sha512-byp2+sHnc8UAj6sNcVFacF3pmRzIaMATsI4ARfU+0S8EpaQ3trojww2QBYPnZ4r0QOMH+I6+bVl8qTu0Zz4eoA== - dependencies: - web3-core "1.3.3" - web3-core-method "1.3.3" - web3-core-subscriptions "1.3.3" - web3-net "1.3.3" - -web3-utils@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.1.tgz#9aa880dd8c9463fe5c099107889f86a085370c2e" - integrity sha512-9gPwFm8SXtIJuzdrZ37PRlalu40fufXxo+H2PiCwaO6RpKGAvlUlWU0qQbyToFNXg7W2H8djEgoAVac8NLMCKQ== +web3-shh@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.3.4.tgz#b7d29e118f26416c1a74575e585be379cc01a77a" + integrity sha512-zoeww5mxLh3xKcqbX85irQbtFe5pc5XwrgjvmdMkhkOdZzPASlWOgqzUFtaPykpLwC3yavVx4jG5RqifweXLUA== dependencies: - bn.js "^4.11.9" - eth-lib "0.2.8" - ethereum-bloom-filters "^1.0.6" - ethjs-unit "0.1.6" - number-to-bn "1.7.0" - randombytes "^2.1.0" - underscore "1.9.1" - utf8 "3.0.0" + web3-core "1.3.4" + web3-core-method "1.3.4" + web3-core-subscriptions "1.3.4" + web3-net "1.3.4" -web3-utils@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.3.tgz#71b837958f1fcc970223eb14a1d0110233348305" - integrity sha512-ZwpdqEcBBzqRgXUbCj+kyu1jFnsDauURSQ79yVqgnTKSI4C3s0Qjpp4WLThV+LKhCKR5GZtBTkgGHeiq0FT88A== +web3-utils@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.4.tgz#9b1aa30d7549f860b573e7bb7e690999e7192198" + integrity sha512-/vC2v0MaZNpWooJfpRw63u0Y3ag2gNjAWiLtMSL6QQLmCqCy4SQIndMt/vRyx0uMoeGt1YTwSXEcHjUzOhLg0A== dependencies: bn.js "^4.11.9" eth-lib "0.2.8" @@ -17772,31 +17867,18 @@ web3-utils@1.3.3: underscore "1.9.1" utf8 "3.0.0" -web3@~1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.1.tgz#f780138c92ae3c42ea45e1a3c6ae8844e0aa5054" - integrity sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog== - dependencies: - web3-bzz "1.3.1" - web3-core "1.3.1" - web3-eth "1.3.1" - web3-eth-personal "1.3.1" - web3-net "1.3.1" - web3-shh "1.3.1" - web3-utils "1.3.1" - -web3@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.3.tgz#be2dda6f58b177c00275fc19529f7465b1460687" - integrity sha512-fI/g0yC1FC0m4envv8FsPh7tbBoe/eXbEho+iY/hahs7YGgGt3nYNrAFTkR9pLhQaVMpOilhwgFxXEp+O7My/g== +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== dependencies: - web3-bzz "1.3.3" - web3-core "1.3.3" - web3-eth "1.3.3" - web3-eth-personal "1.3.3" - web3-net "1.3.3" - web3-shh "1.3.3" - web3-utils "1.3.3" + web3-bzz "1.3.4" + web3-core "1.3.4" + web3-eth "1.3.4" + web3-eth-personal "1.3.4" + web3-net "1.3.4" + web3-shh "1.3.4" + web3-utils "1.3.4" webidl-conversions@^4.0.2: version "4.0.2" @@ -18022,7 +18104,7 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" -word-wrap@~1.2.3: +word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -18273,9 +18355,9 @@ ws@^6.1.2, ws@^6.2.1: async-limiter "~1.0.0" ws@^7.3.1, ws@~7.4.2: - version "7.4.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" - integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== + version "7.4.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" + integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== xdg-basedir@^4.0.0: version "4.0.0" From e48f0054883bcef98796607bc2fc4648a427a89c Mon Sep 17 00:00:00 2001 From: apostolof Date: Thu, 4 Feb 2021 00:07:15 +0200 Subject: [PATCH 35/37] feat: add support for version tagging --- .../src/controllers/download.js | 17 ++++++++++++++--- .../src/controllers/upload.js | 18 ++++++++++++++++++ .../src/middleware/upload.js | 2 +- .../src/utils/storageUtils.js | 13 ++++++++++--- packages/concordia-contracts/package.json | 2 +- .../utils/contractsProviderUtils.js | 7 ++++--- 6 files changed, 48 insertions(+), 11 deletions(-) diff --git a/packages/concordia-contracts-provider/src/controllers/download.js b/packages/concordia-contracts-provider/src/controllers/download.js index 10241c2..fa77b78 100755 --- a/packages/concordia-contracts-provider/src/controllers/download.js +++ b/packages/concordia-contracts-provider/src/controllers/download.js @@ -1,10 +1,21 @@ import * as fs from 'fs'; import path from 'path'; -import getStorageLocation from '../utils/storageUtils'; +import { getStorageLocation, getTagsDirectory } from '../utils/storageUtils'; const downloadContracts = async (req, res) => { - const { params: { hash } } = req; - const directoryPath = getStorageLocation(hash); + const { params: { hash: hashOrTag } } = req; + let directoryPath = getStorageLocation(hashOrTag); + + if (!fs.existsSync(directoryPath)) { + const tagsDirectory = getTagsDirectory(); + + if (fs.existsSync(tagsDirectory)) { + const tagFilePath = path.join(tagsDirectory, hashOrTag); + const tagReference = fs.readFileSync(tagFilePath, 'utf-8'); + + directoryPath = getStorageLocation(tagReference); + } + } const contracts = []; diff --git a/packages/concordia-contracts-provider/src/controllers/upload.js b/packages/concordia-contracts-provider/src/controllers/upload.js index 018a047..346c567 100755 --- a/packages/concordia-contracts-provider/src/controllers/upload.js +++ b/packages/concordia-contracts-provider/src/controllers/upload.js @@ -1,9 +1,27 @@ +import path from 'path'; +import fs from 'fs'; import upload from '../middleware/upload'; +import { getTagsDirectory } from '../utils/storageUtils'; + +const addOrTransferTag = (tag, hash) => { + const tagsDirectory = getTagsDirectory(); + const tagFilePath = path.join(tagsDirectory, tag); + + fs.mkdirSync(tagsDirectory, { recursive: true }); + fs.writeFileSync(tagFilePath, hash); +}; const uploadContracts = async (req, res) => { try { await upload(req, res); + const { body: { tag } } = req; + const { params: { hash } } = req; + + if (tag) { + addOrTransferTag(tag, hash); + } + if (req.files.length <= 0) { return res.send('You must select at least 1 file.'); } diff --git a/packages/concordia-contracts-provider/src/middleware/upload.js b/packages/concordia-contracts-provider/src/middleware/upload.js index 39a0ec0..c55af11 100755 --- a/packages/concordia-contracts-provider/src/middleware/upload.js +++ b/packages/concordia-contracts-provider/src/middleware/upload.js @@ -1,7 +1,7 @@ import * as util from 'util'; import * as fs from 'fs'; import multer from 'multer'; -import getStorageLocation from '../utils/storageUtils'; +import { getStorageLocation } from '../utils/storageUtils'; const storage = multer.diskStorage({ destination: (req, file, callback) => { diff --git a/packages/concordia-contracts-provider/src/utils/storageUtils.js b/packages/concordia-contracts-provider/src/utils/storageUtils.js index 6471d88..be851ea 100644 --- a/packages/concordia-contracts-provider/src/utils/storageUtils.js +++ b/packages/concordia-contracts-provider/src/utils/storageUtils.js @@ -1,10 +1,17 @@ import path from 'path'; import constants from '../constants'; -const getStorageLocation = (hash) => { +export const getStorageLocation = (hash) => { const UPLOADS_DIRECTORY = process.env.UPLOAD_CONTRACTS_DIRECTORY || constants.uploadsDirectory; - return path.join(UPLOADS_DIRECTORY, hash); + if (hash) { + return path.join(UPLOADS_DIRECTORY, hash); + } + + return UPLOADS_DIRECTORY; }; -export default getStorageLocation; +export const getTagsDirectory = () => { + const uploadsPath = getStorageLocation(); + return path.join(uploadsPath, '/tags'); +}; diff --git a/packages/concordia-contracts/package.json b/packages/concordia-contracts/package.json index 367ccbf..c1cfd6d 100644 --- a/packages/concordia-contracts/package.json +++ b/packages/concordia-contracts/package.json @@ -13,7 +13,7 @@ "migrate": "yarn _migrate --network develop && yarn upload", "migrate-reset": "yarn _migrate --network develop --reset && yarn upload", "_migrate": "yarn truffle migrate", - "upload": "node ./utils/contractsProviderUtils.js $npm_package_version" + "upload": "node ./utils/contractsProviderUtils.js ${npm_package_version}-dev latest" }, "dependencies": { "@openzeppelin/contracts": "~3.2.0", diff --git a/packages/concordia-contracts/utils/contractsProviderUtils.js b/packages/concordia-contracts/utils/contractsProviderUtils.js index 3d79162..2bd52a3 100644 --- a/packages/concordia-contracts/utils/contractsProviderUtils.js +++ b/packages/concordia-contracts/utils/contractsProviderUtils.js @@ -8,14 +8,15 @@ const uploadContractsToProviderUnirest = (versionHash, tag) => { const CONTRACTS_PROVIDER_PORT = process.env.CONTRACTS_PROVIDER_PORT || defaults.contractsProviderPort; const uploadPath = `http://${CONTRACTS_PROVIDER_HOST}:${CONTRACTS_PROVIDER_PORT}/contracts/${versionHash}`; - const req = unirest('POST', uploadPath); + const request = unirest('POST', uploadPath) + .field('tag', tag); contracts - .forEach((contract) => req + .forEach((contract) => request .attach('contracts', path.join(__dirname, '../', 'build/', `${contract.contractName}.json`))); console.log(`Uploading to ${uploadPath}`); - req.end((res) => { + request.end((res) => { if (res.error) { throw new Error(`Failed to upload contracts to provider: ${res.error}`); } From 44444033247b2101bcb0bde8a0c8897a3057cf9a Mon Sep 17 00:00:00 2001 From: apostolof Date: Thu, 4 Feb 2021 20:57:29 +0200 Subject: [PATCH 36/37] fix: add missing protocol to cors urls --- .../src/constants/configuration/defaults.js | 3 +++ packages/concordia-app/src/utils/drizzleUtils.js | 11 ++++++++--- .../concordia-contracts-provider/src/constants.js | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/concordia-app/src/constants/configuration/defaults.js b/packages/concordia-app/src/constants/configuration/defaults.js index 1e72777..c288c9c 100644 --- a/packages/concordia-app/src/constants/configuration/defaults.js +++ b/packages/concordia-app/src/constants/configuration/defaults.js @@ -3,6 +3,9 @@ export const WEB3_PORT_DEFAULT = '8545'; export const WEB3_PORT_SOCKET_TIMEOUT_DEFAULT = 30000; export const WEB3_PORT_SOCKET_CONNECT_MAX_ATTEMPTS_DEFAULT = 3; +export const REACT_APP_CONCORDIA_HOST_DEFAULT = '127.0.0.1'; +export const REACT_APP_CONCORDIA_PORT_DEFAULT = '7000'; + export const REACT_APP_RENDEZVOUS_HOST_DEFAULT = '127.0.0.1'; export const REACT_APP_RENDEZVOUS_PORT_DEFAULT = '9090'; diff --git a/packages/concordia-app/src/utils/drizzleUtils.js b/packages/concordia-app/src/utils/drizzleUtils.js index 0f4291f..5496d85 100755 --- a/packages/concordia-app/src/utils/drizzleUtils.js +++ b/packages/concordia-app/src/utils/drizzleUtils.js @@ -1,6 +1,9 @@ import { + REACT_APP_CONCORDIA_HOST_DEFAULT, + REACT_APP_CONCORDIA_PORT_DEFAULT, REACT_APP_CONTRACTS_SUPPLIER_HOST_DEFAULT, - REACT_APP_CONTRACTS_SUPPLIER_PORT_DEFAULT, REACT_APP_CONTRACTS_VERSION_HASH_DEFAULT, + REACT_APP_CONTRACTS_SUPPLIER_PORT_DEFAULT, + REACT_APP_CONTRACTS_VERSION_HASH_DEFAULT, } from '../constants/configuration/defaults'; import CONTRACTS from '../constants/contracts/ContractNames'; @@ -11,13 +14,15 @@ function getContractsDownloadRequest() { || REACT_APP_CONTRACTS_SUPPLIER_PORT_DEFAULT; const CONTRACTS_VERSION_HASH = process.env.REACT_APP_CONTRACTS_VERSION_HASH || REACT_APP_CONTRACTS_VERSION_HASH_DEFAULT; + const HOST = process.env.REACT_APP_CONCORDIA_HOST || REACT_APP_CONCORDIA_HOST_DEFAULT; + const PORT = process.env.REACT_APP_CONCORDIA_PORT || REACT_APP_CONCORDIA_PORT_DEFAULT; const xhrRequest = new XMLHttpRequest(); xhrRequest.open('GET', `http://${CONTRACTS_SUPPLIER_HOST}:${CONTRACTS_SUPPLIER_PORT}/contracts/${CONTRACTS_VERSION_HASH}`, false); - xhrRequest.setRequestHeader('Access-Control-Allow-Origin', 'http://localhost:7000'); + xhrRequest.setRequestHeader('Access-Control-Allow-Origin', `${HOST}:${PORT}`); xhrRequest.setRequestHeader('Access-Control-Allow-Credentials', 'true'); return xhrRequest; @@ -31,7 +36,7 @@ function validateRemoteContracts(remoteContracts) { const contractsPresentStatus = CONTRACTS.map((contract) => ({ contract, - present: remoteContracts.contains((remoteContract) => remoteContract.contractName === contract), + present: remoteContracts.includes((remoteContract) => remoteContract.contractName === contract), })); if (contractsPresentStatus.reduce((accumulator, contract) => accumulator && contract.present, true)) { diff --git a/packages/concordia-contracts-provider/src/constants.js b/packages/concordia-contracts-provider/src/constants.js index 8a17128..fbe54de 100755 --- a/packages/concordia-contracts-provider/src/constants.js +++ b/packages/concordia-contracts-provider/src/constants.js @@ -2,7 +2,7 @@ import path from 'path'; const PROVIDER_PORT = '8400'; const UPLOAD_CONTRACTS_DIRECTORY = path.join(__dirname, '..', 'contracts-uploads'); -const CORS_ALLOWED_ORIGINS = ['localhost:7000', '127.0.0.1:7000']; +const CORS_ALLOWED_ORIGINS = ['http://127.0.0.1:7000', 'http://localhost:7000']; export default { port: PROVIDER_PORT, From 1e6c03a79f020e704c6dce9497150649e1a85290 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Fri, 5 Feb 2021 21:59:06 +0200 Subject: [PATCH 37/37] fix: post's author shouldn't be able to vote for it --- packages/concordia-contracts/contracts/Forum.sol | 5 +++++ packages/concordia-contracts/contracts/PostVoting.sol | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/concordia-contracts/contracts/Forum.sol b/packages/concordia-contracts/contracts/Forum.sol index 05d6031..6120530 100644 --- a/packages/concordia-contracts/contracts/Forum.sol +++ b/packages/concordia-contracts/contracts/Forum.sol @@ -171,4 +171,9 @@ contract Forum { posts[postID].topicID ); } + + function getPostAuthor(uint postID) public view returns (address) { + require(postExists(postID), POST_DOES_NOT_EXIST); + return posts[postID].author; + } } diff --git a/packages/concordia-contracts/contracts/PostVoting.sol b/packages/concordia-contracts/contracts/PostVoting.sol index c6183c7..1b3374a 100644 --- a/packages/concordia-contracts/contracts/PostVoting.sol +++ b/packages/concordia-contracts/contracts/PostVoting.sol @@ -70,11 +70,13 @@ contract PostVoting { } function vote(uint postID, Option option) private { - require(forum.hasUserSignedUp(msg.sender), forum.USER_HAS_NOT_SIGNED_UP()); + address voter = msg.sender; + require(forum.hasUserSignedUp(voter), forum.USER_HAS_NOT_SIGNED_UP()); require(forum.postExists(postID), forum.POST_DOES_NOT_EXIST()); + address postAuthor = forum.getPostAuthor(postID); + require(voter != postAuthor, "Post's author cannot vote for it."); PostBallot storage postBallot = postBallots[postID]; - address voter = msg.sender; Option prevOption = postBallot.votes[voter]; if (prevOption == option)