From 2e8f1895a3570d6c9eb5e9ba1f5b368d69e242e0 Mon Sep 17 00:00:00 2001 From: Oren Sokolowsky Date: Mon, 27 Jul 2020 08:30:49 +0300 Subject: [PATCH 1/7] fix - totalDonation decrease order --- contracts/schemes/JoinAndQuit.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/schemes/JoinAndQuit.sol b/contracts/schemes/JoinAndQuit.sol index 054c8a79..9ddd718c 100644 --- a/contracts/schemes/JoinAndQuit.sol +++ b/contracts/schemes/JoinAndQuit.sol @@ -258,12 +258,12 @@ contract JoinAndQuit is } else { refundAmount = userDonation.mul(fundingToken.balanceOf(address(avatar))).div(totalDonation); } + totalDonation = totalDonation.sub(userDonation); sendToBeneficiary(refundAmount, msg.sender); uint256 msgSenderReputation = avatar.nativeReputation().balanceOf(msg.sender); require( Controller( avatar.owner()).burnReputation(msgSenderReputation, msg.sender)); - totalDonation = totalDonation.sub(userDonation); emit RageQuit(address(avatar), msg.sender, refundAmount); } From 257ee1d250a60998d7eb92548c62b79a62ba61cf Mon Sep 17 00:00:00 2001 From: Oren Sokolowsky Date: Mon, 27 Jul 2020 16:51:28 +0300 Subject: [PATCH 2/7] more updates --- contracts/schemes/JoinAndQuit.sol | 22 ++++++++++++++-------- test/joinandquit.js | 12 ++++++++---- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/contracts/schemes/JoinAndQuit.sol b/contracts/schemes/JoinAndQuit.sol index 9ddd718c..732dc522 100644 --- a/contracts/schemes/JoinAndQuit.sol +++ b/contracts/schemes/JoinAndQuit.sol @@ -53,14 +53,15 @@ contract JoinAndQuit is event ProposalExecuted(address indexed _avatar, bytes32 indexed _proposalId, int256 _decision); struct Proposal { - bool accepted; address proposedMember; uint256 funding; + bool executed; } struct MemberFund { bool candidate; bool rageQuit; + bool accepted; uint256 funding; } @@ -124,13 +125,18 @@ contract JoinAndQuit is onlyVotingMachine(_proposalId) override returns(bool) { - require(proposals[_proposalId].accepted == false); - require(proposals[_proposalId].proposedMember != address(0)); Proposal memory proposal = proposals[_proposalId]; + require(proposal.proposedMember != address(0), "not a valid proposal"); + require(fundings[proposal.proposedMember].accepted == false, "already accepted by the dao"); + require(proposal.executed == false, "proposal already been executed"); + proposals[_proposalId].executed = true; + bool success; // Check if vote was successful: if ((_decision == 1) && (avatar.nativeReputation().balanceOf(proposal.proposedMember) == 0)) { - proposals[_proposalId].accepted = true; + fundings[proposal.proposedMember].accepted = true; + fundings[proposal.proposedMember].funding = proposal.funding; + totalDonation = totalDonation.add(proposal.funding); if (fundingToken == IERC20(0)) { // solhint-disable-next-line (success, ) = address(avatar).call{value:proposal.funding}(""); @@ -138,8 +144,7 @@ contract JoinAndQuit is } else { fundingToken.safeTransfer(address(avatar), proposal.funding); } - fundings[proposal.proposedMember].funding = proposal.funding; - totalDonation = totalDonation.add(proposal.funding); + //this should be called/check after the transfer to the avatar. setFundingGoalReachedFlag(); } else { if (fundingToken == IERC20(0)) { @@ -172,6 +177,7 @@ contract JoinAndQuit is address proposer = msg.sender; require(!fundings[proposer].candidate, "already a candidate"); require(avatar.nativeReputation().balanceOf(proposer) == 0, "already a member"); + require(!fundings[proposer].accepted, "already accepted by the dao"); require(_feeAmount >= minFeeToJoin, "_feeAmount should be >= then the minFeeToJoin"); fundings[proposer].candidate = true; if (fundingToken == IERC20(0)) { @@ -182,7 +188,7 @@ contract JoinAndQuit is bytes32 proposalId = votingMachine.propose(2, voteParamsHash, proposer, address(avatar)); Proposal memory proposal = Proposal({ - accepted: false, + executed: false, proposedMember: proposer, funding : _feeAmount }); @@ -210,9 +216,9 @@ contract JoinAndQuit is Proposal storage proposal = proposals[_proposalId]; require(proposal.proposedMember != address(0), "no member to redeem"); require(!fundings[proposal.proposedMember].rageQuit, "member already rageQuit"); + require(fundings[proposal.proposedMember].accepted == true, " proposal not accepted"); //set proposal proposedMember to zero to prevent reentrancy attack. proposal.proposedMember = address(0); - require(proposal.accepted == true, " proposal not accepted"); if (memberReputation == 0) { reputation = _proposal.funding; } else { diff --git a/test/joinandquit.js b/test/joinandquit.js index f26d7339..a27c3c01 100644 --- a/test/joinandquit.js +++ b/test/joinandquit.js @@ -274,7 +274,7 @@ contract('JoinAndQuit', accounts => { var proposalId = await helpers.getValueFromLogs(tx, '_proposalId',1); await testSetup.joinAndQuitParams.votingMachine.absoluteVote.vote(proposalId,1,0,helpers.NULL_ADDRESS,{from:accounts[2]}); var proposal = await testSetup.joinAndQuit.proposals(proposalId); - assert.equal(proposal.accepted,true); + assert.equal(proposal.executed,true); assert.equal(await testSetup.standardTokenMock.balanceOf(testSetup.org.avatar.address),testSetup.minFeeToJoin); assert.equal(await testSetup.standardTokenMock.balanceOf(testSetup.joinAndQuit.address),0); assert.equal((await testSetup.joinAndQuit.fundings(accounts[3])).funding,testSetup.minFeeToJoin); @@ -291,7 +291,7 @@ contract('JoinAndQuit', accounts => { var proposalId = await helpers.getValueFromLogs(tx, '_proposalId',1); await testSetup.joinAndQuitParams.votingMachine.absoluteVote.vote(proposalId,1,0,helpers.NULL_ADDRESS,{from:accounts[2]}); var proposal = await testSetup.joinAndQuit.proposals(proposalId); - assert.equal(proposal.accepted,true); + assert.equal(proposal.executed,true); assert.equal(await avatarBalance(testSetup),testSetup.minFeeToJoin); assert.equal(await web3.eth.getBalance(testSetup.joinAndQuit.address),0); assert.equal((await testSetup.joinAndQuit.fundings(accounts[3])).funding,testSetup.minFeeToJoin); @@ -309,7 +309,9 @@ contract('JoinAndQuit', accounts => { var proposalId = await helpers.getValueFromLogs(tx, '_proposalId',1); await testSetup.joinAndQuitParams.votingMachine.absoluteVote.vote(proposalId,2,0,helpers.NULL_ADDRESS,{from:accounts[2]}); var proposal = await testSetup.joinAndQuit.proposals(proposalId); - assert.equal(proposal.accepted,false); + assert.equal(proposal.executed,true); + var fundings = await testSetup.joinAndQuit.fundings(accounts[3]); + assert.equal(fundings.accepted,false); assert.equal(await testSetup.standardTokenMock.balanceOf(testSetup.org.avatar.address),0); assert.equal(await testSetup.standardTokenMock.balanceOf(testSetup.joinAndQuit.address),0); assert.equal((await testSetup.joinAndQuit.fundings(accounts[3])).funding,0); @@ -329,7 +331,9 @@ contract('JoinAndQuit', accounts => { var balanceBefore = await web3.eth.getBalance(accounts[3]); await testSetup.joinAndQuitParams.votingMachine.absoluteVote.vote(proposalId,2,0,helpers.NULL_ADDRESS,{from:accounts[2]}); var proposal = await testSetup.joinAndQuit.proposals(proposalId); - assert.equal(proposal.accepted,false); + assert.equal(proposal.executed,true); + var fundings = await testSetup.joinAndQuit.fundings(accounts[3]); + assert.equal(fundings.accepted,false); assert.equal(await avatarBalance(testSetup),0); assert.equal(await web3.eth.getBalance(testSetup.joinAndQuit.address),0); assert.equal((await testSetup.joinAndQuit.fundings(accounts[3])).funding,0); From 022c3f609e459f32a39d3b5d991d6cc283cdfc95 Mon Sep 17 00:00:00 2001 From: Oren Sokolowsky Date: Mon, 27 Jul 2020 17:38:27 +0300 Subject: [PATCH 3/7] require acceptance at ragequit --- contracts/schemes/JoinAndQuit.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/schemes/JoinAndQuit.sol b/contracts/schemes/JoinAndQuit.sol index 732dc522..742e1f9f 100644 --- a/contracts/schemes/JoinAndQuit.sol +++ b/contracts/schemes/JoinAndQuit.sol @@ -256,6 +256,7 @@ contract JoinAndQuit is function rageQuit() public returns(uint256 refundAmount) { require(rageQuitEnable, "RageQuit disabled"); require(fundings[msg.sender].funding > 0, "no fund to RageQuit"); + require(fundings[msg.sender].accepted, "member not accepted by the dao"); uint256 userDonation = fundings[msg.sender].funding; fundings[msg.sender].funding = 0; fundings[msg.sender].rageQuit = true; From 7b5db6c5ef5f42d91cbbda3c03f886a97155aea5 Mon Sep 17 00:00:00 2001 From: Oren Sokolowsky Date: Wed, 29 Jul 2020 16:05:13 +0300 Subject: [PATCH 4/7] tests coverage --- contracts/schemes/JoinAndQuit.sol | 1 - test/joinandquit.js | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/contracts/schemes/JoinAndQuit.sol b/contracts/schemes/JoinAndQuit.sol index 742e1f9f..732dc522 100644 --- a/contracts/schemes/JoinAndQuit.sol +++ b/contracts/schemes/JoinAndQuit.sol @@ -256,7 +256,6 @@ contract JoinAndQuit is function rageQuit() public returns(uint256 refundAmount) { require(rageQuitEnable, "RageQuit disabled"); require(fundings[msg.sender].funding > 0, "no fund to RageQuit"); - require(fundings[msg.sender].accepted, "member not accepted by the dao"); uint256 userDonation = fundings[msg.sender].funding; fundings[msg.sender].funding = 0; fundings[msg.sender].rageQuit = true; diff --git a/test/joinandquit.js b/test/joinandquit.js index a27c3c01..3565b1a2 100644 --- a/test/joinandquit.js +++ b/test/joinandquit.js @@ -222,6 +222,16 @@ contract('JoinAndQuit', accounts => { //Vote with reputation to trigger execution var proposalId = await helpers.getValueFromLogs(tx, '_proposalId',1); await testSetup.joinAndQuitParams.votingMachine.absoluteVote.vote(proposalId,1,0,helpers.NULL_ADDRESS,{from:accounts[2]}); + try { + await testSetup.joinAndQuit.proposeToJoin( + "description-hash", + testSetup.minFeeToJoin, + {from:candidate}); + assert(false, 'proposer already benn accepted by the dao'); + } catch (ex) { + helpers.assertVMException(ex); + } + await testSetup.joinAndQuit.redeemReputation(proposalId); try { @@ -504,6 +514,7 @@ contract('JoinAndQuit', accounts => { } }); + it("rageQuit with eth", async function() { var testSetup = await setup(accounts,true); var tx = await testSetup.joinAndQuit.proposeToJoin( From 88ddf36752555e958d9985a04468cba3462271e4 Mon Sep 17 00:00:00 2001 From: Oren Sokolowsky Date: Wed, 29 Jul 2020 20:10:00 +0300 Subject: [PATCH 5/7] remove member accepted --- contracts/schemes/JoinAndQuit.sol | 11 +++++------ test/joinandquit.js | 13 ------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/contracts/schemes/JoinAndQuit.sol b/contracts/schemes/JoinAndQuit.sol index 732dc522..f5b9d5b5 100644 --- a/contracts/schemes/JoinAndQuit.sol +++ b/contracts/schemes/JoinAndQuit.sol @@ -56,12 +56,12 @@ contract JoinAndQuit is address proposedMember; uint256 funding; bool executed; + bool accepted; } struct MemberFund { bool candidate; bool rageQuit; - bool accepted; uint256 funding; } @@ -127,14 +127,13 @@ contract JoinAndQuit is returns(bool) { Proposal memory proposal = proposals[_proposalId]; require(proposal.proposedMember != address(0), "not a valid proposal"); - require(fundings[proposal.proposedMember].accepted == false, "already accepted by the dao"); require(proposal.executed == false, "proposal already been executed"); proposals[_proposalId].executed = true; bool success; // Check if vote was successful: if ((_decision == 1) && (avatar.nativeReputation().balanceOf(proposal.proposedMember) == 0)) { - fundings[proposal.proposedMember].accepted = true; + proposals[_proposalId].accepted = true; fundings[proposal.proposedMember].funding = proposal.funding; totalDonation = totalDonation.add(proposal.funding); if (fundingToken == IERC20(0)) { @@ -177,7 +176,6 @@ contract JoinAndQuit is address proposer = msg.sender; require(!fundings[proposer].candidate, "already a candidate"); require(avatar.nativeReputation().balanceOf(proposer) == 0, "already a member"); - require(!fundings[proposer].accepted, "already accepted by the dao"); require(_feeAmount >= minFeeToJoin, "_feeAmount should be >= then the minFeeToJoin"); fundings[proposer].candidate = true; if (fundingToken == IERC20(0)) { @@ -190,7 +188,8 @@ contract JoinAndQuit is Proposal memory proposal = Proposal({ executed: false, proposedMember: proposer, - funding : _feeAmount + funding : _feeAmount, + accepted: false }); proposals[proposalId] = proposal; @@ -216,7 +215,7 @@ contract JoinAndQuit is Proposal storage proposal = proposals[_proposalId]; require(proposal.proposedMember != address(0), "no member to redeem"); require(!fundings[proposal.proposedMember].rageQuit, "member already rageQuit"); - require(fundings[proposal.proposedMember].accepted == true, " proposal not accepted"); + require(proposal.accepted == true, " proposal not accepted"); //set proposal proposedMember to zero to prevent reentrancy attack. proposal.proposedMember = address(0); if (memberReputation == 0) { diff --git a/test/joinandquit.js b/test/joinandquit.js index 3565b1a2..f291574a 100644 --- a/test/joinandquit.js +++ b/test/joinandquit.js @@ -222,15 +222,6 @@ contract('JoinAndQuit', accounts => { //Vote with reputation to trigger execution var proposalId = await helpers.getValueFromLogs(tx, '_proposalId',1); await testSetup.joinAndQuitParams.votingMachine.absoluteVote.vote(proposalId,1,0,helpers.NULL_ADDRESS,{from:accounts[2]}); - try { - await testSetup.joinAndQuit.proposeToJoin( - "description-hash", - testSetup.minFeeToJoin, - {from:candidate}); - assert(false, 'proposer already benn accepted by the dao'); - } catch (ex) { - helpers.assertVMException(ex); - } await testSetup.joinAndQuit.redeemReputation(proposalId); @@ -320,8 +311,6 @@ contract('JoinAndQuit', accounts => { await testSetup.joinAndQuitParams.votingMachine.absoluteVote.vote(proposalId,2,0,helpers.NULL_ADDRESS,{from:accounts[2]}); var proposal = await testSetup.joinAndQuit.proposals(proposalId); assert.equal(proposal.executed,true); - var fundings = await testSetup.joinAndQuit.fundings(accounts[3]); - assert.equal(fundings.accepted,false); assert.equal(await testSetup.standardTokenMock.balanceOf(testSetup.org.avatar.address),0); assert.equal(await testSetup.standardTokenMock.balanceOf(testSetup.joinAndQuit.address),0); assert.equal((await testSetup.joinAndQuit.fundings(accounts[3])).funding,0); @@ -342,8 +331,6 @@ contract('JoinAndQuit', accounts => { await testSetup.joinAndQuitParams.votingMachine.absoluteVote.vote(proposalId,2,0,helpers.NULL_ADDRESS,{from:accounts[2]}); var proposal = await testSetup.joinAndQuit.proposals(proposalId); assert.equal(proposal.executed,true); - var fundings = await testSetup.joinAndQuit.fundings(accounts[3]); - assert.equal(fundings.accepted,false); assert.equal(await avatarBalance(testSetup),0); assert.equal(await web3.eth.getBalance(testSetup.joinAndQuit.address),0); assert.equal((await testSetup.joinAndQuit.fundings(accounts[3])).funding,0); From 9aca567dcb4df961b671855da65d2a56ddebb9cd Mon Sep 17 00:00:00 2001 From: Oren Sokolowsky Date: Thu, 30 Jul 2020 14:27:05 +0300 Subject: [PATCH 6/7] use infra 21 --- package-lock.json | 1026 ++++++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 602 insertions(+), 426 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e070a21..5a0ef4aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@babel/cli": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.10.3.tgz", - "integrity": "sha512-lWB3yH5/fWY8pi2Kj5/fA+17guJ9feSBw5DNjTju3/nRi9sXnl1JPh7aKQOSvdNbiDbkzzoGYtsr46M8dGmXDQ==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.10.5.tgz", + "integrity": "sha512-j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA==", "dev": true, "requires": { "chokidar": "^2.1.8", @@ -15,7 +15,7 @@ "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", "glob": "^7.0.0", - "lodash": "^4.17.13", + "lodash": "^4.17.19", "make-dir": "^2.1.0", "slash": "^2.0.0", "source-map": "^0.5.0" @@ -46,104 +46,103 @@ } }, "@babel/code-frame": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz", - "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "@babel/highlight": "^7.10.3" + "@babel/highlight": "^7.10.4" } }, "@babel/generator": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz", - "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz", + "integrity": "sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==", "dev": true, "requires": { - "@babel/types": "^7.10.3", + "@babel/types": "^7.10.5", "jsesc": "^2.5.1", - "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz", - "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.3", - "@babel/template": "^7.10.3", - "@babel/types": "^7.10.3" + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-get-function-arity": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz", - "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.10.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", - "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz", + "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==", "dev": true, "requires": { - "@babel/types": "^7.10.1" + "@babel/types": "^7.10.4" } }, "@babel/helper-validator-identifier": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz", - "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", "dev": true }, "@babel/highlight": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz", - "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.3", + "@babel/helper-validator-identifier": "^7.10.4", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz", - "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz", + "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==", "dev": true }, "@babel/template": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", - "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3" + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/traverse": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz", - "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz", + "integrity": "sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/generator": "^7.10.3", - "@babel/helper-function-name": "^7.10.3", - "@babel/helper-split-export-declaration": "^7.10.1", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3", + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.10.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/parser": "^7.10.5", + "@babel/types": "^7.10.5", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.13" + "lodash": "^4.17.19" }, "dependencies": { "debug": { @@ -164,31 +163,24 @@ } }, "@babel/types": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz", - "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", + "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.3", - "lodash": "^4.17.13", + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } }, "@daostack/infra-experimental": { - "version": "0.1.1-rc.20", - "resolved": "https://registry.npmjs.org/@daostack/infra-experimental/-/infra-experimental-0.1.1-rc.20.tgz", - "integrity": "sha512-rwtA62ataNxULQi6uzoMPMRVr7a46D5oOASJ9Qz5/7BbatgIEdEfOjbUStJ5z1alvaXW5W5PtWTHL1tIMcSdbQ==", + "version": "0.1.1-rc.21", + "resolved": "https://registry.npmjs.org/@daostack/infra-experimental/-/infra-experimental-0.1.1-rc.21.tgz", + "integrity": "sha512-tFosUdUgnDRIxO8RJC5Zzh8pry64CcyWr8AG2vgmMQPMFIPrDJKc3eBCytjklMRxSG2r2lQ9R8VLL+fZe/zQ8w==", "requires": { "@openzeppelin/contracts-ethereum-package": "3.0.0", "ethereumjs-abi": "^0.6.8", "web3-utils": "^1.2.8" - }, - "dependencies": { - "@openzeppelin/contracts-ethereum-package": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-ethereum-package/-/contracts-ethereum-package-3.0.0.tgz", - "integrity": "sha512-Xg33RtX7FGbSK/YnroLhcGNAvH30/C84NRW8KvbSdXXYiLA8YqM1bOA9sAeLjmQxXqYUn/YL4AUVTgDnG51NOw==" - } } }, "@daostack/upgrades": { @@ -223,6 +215,16 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -267,9 +269,9 @@ } }, "@nomiclabs/buidler": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@nomiclabs/buidler/-/buidler-1.4.1.tgz", - "integrity": "sha512-yZlLTRsFg92l5kC3Pg2O6+XdhRSAH1yuyItAOdVwA00gM1as5IQa6GVb4YbI4ftGcZzyQTwmO/4j0YkfdYtTcw==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@nomiclabs/buidler/-/buidler-1.4.3.tgz", + "integrity": "sha512-EcUurzBFN9yJxoAzeKW+72NCyWa2WIe1pC0AOIapoUsIhElFy8OpIKERK28EWB2yuQlIxhI98hg5ieAWVg3qJw==", "dev": true, "requires": { "@nomiclabs/ethereumjs-vm": "^4.1.1", @@ -960,9 +962,9 @@ "dev": true }, "ws": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", - "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", "dev": true } } @@ -1109,45 +1111,11 @@ "tslib": "^1.9.3" }, "dependencies": { - "agent-base": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz", - "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==", - "dev": true, - "requires": { - "debug": "4" - } - }, "cookie": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", "dev": true - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true } } }, @@ -1195,9 +1163,9 @@ } }, "@truffle/contract-schema": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.2.0.tgz", - "integrity": "sha512-yeb4UoK9cbrT5/Nuz0I0p2XKbf0K1wEmyyBQmo3Q4JOrLidxf59LtDupo9Uq74RtlTAxZC0cy9DnsfWeWVma4A==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.2.3.tgz", + "integrity": "sha512-dnR5wtqCBKVfJDX5g+sCUiDF1WDucpxoWsr6ZOwq9JqgyS4Gz7iJi1wMegMmcDctOykoKjsju6iAOi+HObrkfg==", "dev": true, "requires": { "ajv": "^6.10.0", @@ -1229,9 +1197,9 @@ "dev": true }, "@truffle/interface-adapter": { - "version": "0.4.9", - "resolved": "https://registry.npmjs.org/@truffle/interface-adapter/-/interface-adapter-0.4.9.tgz", - "integrity": "sha512-2dYccf7lAwx90NVYmn89QABpd3dx7BxvDAaHgzVa2YVOUkTUpkZiaIsD2YlsVQ1rew17wMNi5WXH2RFnmzQ82A==", + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/@truffle/interface-adapter/-/interface-adapter-0.4.13.tgz", + "integrity": "sha512-N4TDtTvDan8Zo1csU2Otk2t0O7nOi7UP4dCfpDB5WVnD/7B07iT2getU3iRmLm4ZgwUY8VxHgDptdP55ACWCRg==", "dev": true, "requires": { "bn.js": "^4.11.8", @@ -1241,9 +1209,9 @@ }, "dependencies": { "@types/node": { - "version": "10.17.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz", - "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw==", + "version": "10.17.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz", + "integrity": "sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==", "dev": true }, "debug": { @@ -1255,16 +1223,15 @@ "ms": "2.0.0" } }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" } }, "hash.js": { @@ -1295,6 +1262,12 @@ "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", "dev": true }, + "setimmediate": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", + "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=", + "dev": true + }, "web3": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", @@ -1423,6 +1396,18 @@ "web3-utils": "1.2.1" }, "dependencies": { + "elliptic": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", + "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "inherits": "^2.0.1" + } + }, "ethers": { "version": "4.0.0-beta.3", "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", @@ -1673,9 +1658,9 @@ } }, "@types/node": { - "version": "12.12.47", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.47.tgz", - "integrity": "sha512-yzBInQFhdY8kaZmqoL2+3U5dSTMrKaYcb561VU+lDzAYvqt+2lojvBEy+hmpSNuXnPTx7m9+04CzWYOUqWME2A==", + "version": "12.12.53", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.53.tgz", + "integrity": "sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ==", "dev": true }, "debug": { @@ -1687,16 +1672,15 @@ "ms": "2.0.0" } }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" } }, "hash.js": { @@ -1727,6 +1711,12 @@ "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", "dev": true }, + "setimmediate": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", + "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=", + "dev": true + }, "web3": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", @@ -1961,11 +1951,23 @@ }, "dependencies": { "@types/node": { - "version": "10.17.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz", - "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw==", + "version": "10.17.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz", + "integrity": "sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==", "dev": true }, + "elliptic": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", + "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "inherits": "^2.0.1" + } + }, "ethers": { "version": "4.0.0-beta.3", "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", @@ -2275,9 +2277,9 @@ } }, "@types/babel-types": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz", - "integrity": "sha512-dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==", + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.8.tgz", + "integrity": "sha512-jvu8g4LR7+p6ao30RhTREnEhHxmP4/R9D9/rOR/Kq14FztORty9SKgtOZUNZNMB9CXLxZ54EWu4dArUE8WdTsw==", "dev": true }, "@types/babylon": { @@ -2315,9 +2317,9 @@ } }, "@types/chai": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz", - "integrity": "sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==", + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz", + "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==", "dev": true }, "@types/color-name": { @@ -2327,9 +2329,9 @@ "dev": true }, "@types/glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", "dev": true, "requires": { "@types/minimatch": "*", @@ -2355,15 +2357,14 @@ "dev": true }, "@types/node": { - "version": "14.0.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz", - "integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==" + "version": "14.0.27", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz", + "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==" }, "@types/pbkdf2": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz", "integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==", - "dev": true, "requires": { "@types/node": "*" } @@ -2372,7 +2373,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.1.tgz", "integrity": "sha512-+ZjSA8ELlOp8SlKi0YLB2tz9d5iPNEmOBd+8Rz21wTMdaXQIa9b6TEnD6l5qKOCypE7FSyPyck12qZJxSDNoog==", - "dev": true, "requires": { "@types/node": "*" } @@ -2493,18 +2493,35 @@ "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" }, "agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz", + "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==", "dev": true, "requires": { - "es6-promisify": "^5.0.0" + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "version": "6.12.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", + "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -2563,9 +2580,9 @@ } }, "ansi-colors": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", - "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true }, "ansi-escapes": { @@ -2954,7 +2971,6 @@ "version": "3.0.8", "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz", "integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==", - "dev": true, "requires": { "safe-buffer": "^5.0.1" } @@ -2989,18 +3005,12 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, "requires": { "file-uri-to-path": "1.0.0" } }, - "bip66": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz", - "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, "bl": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", @@ -3051,8 +3061,7 @@ "blakejs": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz", - "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U=", - "dev": true + "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U=" }, "blessed": { "version": "0.1.81", @@ -3223,7 +3232,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz", "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=", - "dev": true, "requires": { "base-x": "^3.0.2" } @@ -3232,7 +3240,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz", "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==", - "dev": true, "requires": { "bs58": "^4.0.0", "create-hash": "^1.1.0", @@ -3984,9 +3991,9 @@ "dev": true }, "dayjs": { - "version": "1.8.28", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.28.tgz", - "integrity": "sha512-ccnYgKC0/hPSGXxj7Ju6AV/BP4HUkXC2u15mikXT5mX9YorEaoi1bEKOmAqdkJHN4EEkmAf97SpH66Try5Mbeg==", + "version": "1.8.31", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.31.tgz", + "integrity": "sha512-mPh1mslned+5PuIuiUfbw4CikHk6AEAf2Baxih+wP5fssv+wmlVhvgZ7mq+BhLt7Sr/Hc8leWDiwe6YnrpNt3g==", "dev": true }, "death": { @@ -4475,16 +4482,6 @@ } } }, - "drbg.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", - "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", - "requires": { - "browserify-aes": "^1.0.6", - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4" - } - }, "duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", @@ -4589,12 +4586,12 @@ } }, "enquirer": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.5.tgz", - "integrity": "sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", "dev": true, "requires": { - "ansi-colors": "^3.2.1" + "ansi-colors": "^4.1.1" } }, "errno": { @@ -4802,6 +4799,12 @@ "color-convert": "^2.0.1" } }, + "cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -4897,30 +4900,30 @@ } }, "inquirer": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz", - "integrity": "sha512-E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "requires": { "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", + "chalk": "^4.1.0", "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", + "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", - "lodash": "^4.17.15", + "lodash": "^4.17.19", "mute-stream": "0.0.8", "run-async": "^2.4.0", - "rxjs": "^6.5.3", + "rxjs": "^6.6.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", "through": "^2.3.6" }, "dependencies": { "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -5000,9 +5003,9 @@ } }, "strip-json-comments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz", - "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, "supports-color": { @@ -5098,9 +5101,9 @@ } }, "eslint-plugin-import": { - "version": "2.21.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.21.2.tgz", - "integrity": "sha512-FEmxeGI6yaz+SnEB6YgNHlQK1Bs2DKLM+YF+vuTk5H8J9CLbJLtlPvRFgZZ2+sXiKAlN5dpdlrWOjK8ZoZJpQA==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz", + "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==", "dev": true, "requires": { "array-includes": "^3.1.1", @@ -5290,9 +5293,9 @@ } }, "eth-lib": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", - "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz", + "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==", "requires": { "bn.js": "^4.11.6", "elliptic": "^6.4.0", @@ -5416,7 +5419,6 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz", "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==", - "dev": true, "requires": { "@types/pbkdf2": "^3.0.0", "@types/secp256k1": "^4.0.1", @@ -5433,41 +5435,6 @@ "scrypt-js": "^3.0.0", "secp256k1": "^4.0.1", "setimmediate": "^1.0.5" - }, - "dependencies": { - "keccak": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz", - "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==", - "dev": true, - "requires": { - "node-addon-api": "^2.0.0", - "node-gyp-build": "^4.2.0" - } - }, - "scrypt-js": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz", - "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==", - "dev": true - }, - "secp256k1": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz", - "integrity": "sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==", - "dev": true, - "requires": { - "elliptic": "^6.5.2", - "node-addon-api": "^2.0.0", - "node-gyp-build": "^4.2.0" - } - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true - } } }, "ethereum-ens": { @@ -5607,56 +5574,27 @@ } }, "ethereumjs-blockchain": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/ethereumjs-blockchain/-/ethereumjs-blockchain-4.0.3.tgz", - "integrity": "sha512-0nJWbyA+Gu0ZKZr/cywMtB/77aS/4lOVsIKbgUN2sFQYscXO5rPbUfrEe7G2Zhjp86/a0VqLllemDSTHvx3vZA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/ethereumjs-blockchain/-/ethereumjs-blockchain-4.0.4.tgz", + "integrity": "sha512-zCxaRMUOzzjvX78DTGiKjA+4h2/sF0OYL1QuPux0DHpyq8XiNoF5GYHtb++GUxVlMsMfZV7AVyzbtgcRdIcEPQ==", "dev": true, "requires": { "async": "^2.6.1", "ethashjs": "~0.0.7", "ethereumjs-block": "~2.2.2", "ethereumjs-common": "^1.5.0", - "ethereumjs-util": "~6.1.0", + "ethereumjs-util": "^6.1.0", "flow-stoplight": "^1.0.0", "level-mem": "^3.0.1", "lru-cache": "^5.1.1", "rlp": "^2.2.2", "semaphore": "^1.1.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "dev": true, - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - }, - "keccak": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz", - "integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==", - "dev": true, - "requires": { - "bindings": "^1.2.1", - "inherits": "^2.0.3", - "nan": "^2.2.1", - "safe-buffer": "^5.1.0" - } - } } }, "ethereumjs-common": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.1.tgz", - "integrity": "sha512-aVUPRLgmXORGXXEVkFYgPhr9TGtpBY2tGhZ9Uh0A3lIUzUDr1x6kQx33SbjPUkLkX3eniPQnIL/2psjkjrOfcQ==" + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz", + "integrity": "sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA==" }, "ethereumjs-tx": { "version": "2.1.2", @@ -5668,17 +5606,17 @@ } }, "ethereumjs-util": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.0.tgz", - "integrity": "sha512-vb0XN9J2QGdZGIEKG2vXM+kUdEivUfU6Wmi5y0cg+LRhDYKnXIZ/Lz7XjFbHRR9VIKq2lVGLzGBkA++y2nOdOQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz", + "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==", "requires": { "@types/bn.js": "^4.11.3", "bn.js": "^4.11.0", "create-hash": "^1.1.2", + "elliptic": "^6.5.2", + "ethereum-cryptography": "^0.1.3", "ethjs-util": "0.1.6", - "keccak": "^2.0.0", - "rlp": "^2.2.3", - "secp256k1": "^3.0.1" + "rlp": "^2.2.3" } }, "ethers": { @@ -5724,6 +5662,16 @@ "version": "0.5.7", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" + }, + "scrypt-js": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz", + "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==" + }, + "setimmediate": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", + "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=" } } }, @@ -6217,7 +6165,8 @@ "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true }, "filename-reserved-regex": { "version": "2.0.0", @@ -7493,11 +7442,11 @@ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "requires": { - "ajv": "^6.5.5", + "ajv": "^6.12.3", "har-schema": "^2.0.0" } }, @@ -7653,6 +7602,17 @@ "requires": { "agent-base": "4", "debug": "3.1.0" + }, + "dependencies": { + "agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + } } }, "http-signature": { @@ -7666,13 +7626,30 @@ } }, "https-proxy-agent": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz", - "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", "dev": true, "requires": { - "agent-base": "^4.3.0", - "debug": "^3.1.0" + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "iconv-lite": { @@ -8304,14 +8281,12 @@ } }, "keccak": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/keccak/-/keccak-2.1.0.tgz", - "integrity": "sha512-m1wbJRTo+gWbctZWay9i26v5fFnYkOn7D5PCxJ3fZUGUEb49dE1Pm4BREUYCt/aoO6di7jeoGmhvqN9Nzylm3Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz", + "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==", "requires": { - "bindings": "^1.5.0", - "inherits": "^2.0.4", - "nan": "^2.14.0", - "safe-buffer": "^5.2.0" + "node-addon-api": "^2.0.0", + "node-gyp-build": "^4.2.0" } }, "keyv": { @@ -8659,9 +8634,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, "lodash.toarray": { "version": "4.4.0", @@ -9096,9 +9071,9 @@ } }, "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, "braces": { @@ -9401,9 +9376,9 @@ "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, "netmask": { @@ -9426,8 +9401,7 @@ "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", - "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==", - "dev": true + "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==" }, "node-emoji": { "version": "1.10.0", @@ -9457,8 +9431,7 @@ "node-gyp-build": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz", - "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==", - "dev": true + "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==" }, "nofilter": { "version": "1.0.3", @@ -9807,6 +9780,15 @@ "socks-proxy-agent": "^4.0.1" }, "dependencies": { + "agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -9816,6 +9798,27 @@ "ms": "^2.1.1" } }, + "https-proxy-agent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz", + "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==", + "dev": true, + "requires": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -10058,6 +10061,12 @@ "yamljs": "0.3.0" }, "dependencies": { + "ansi-colors": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", + "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", + "dev": true + }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", @@ -10085,9 +10094,9 @@ "dev": true }, "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, "braces": { @@ -10110,9 +10119,9 @@ } }, "chokidar": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", - "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz", + "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -10155,6 +10164,15 @@ "ms": "^2.1.1" } }, + "enquirer": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.5.tgz", + "integrity": "sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==", + "dev": true, + "requires": { + "ansi-colors": "^3.2.1" + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -10403,6 +10421,15 @@ "socks-proxy-agent": "^4.0.1" }, "dependencies": { + "agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -10412,6 +10439,27 @@ "ms": "^2.1.1" } }, + "https-proxy-agent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz", + "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==", + "dev": true, + "requires": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -10958,9 +11006,9 @@ } }, "rlp": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.5.tgz", - "integrity": "sha512-y1QxTQOp0OZnjn19FxBmped4p+BSKPHwGndaqrESseyd2xXZtcgR3yuTIosh8CaMaOii9SKIYerBXnV/CpJ3qw==", + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.6.tgz", + "integrity": "sha512-HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg==", "requires": { "bn.js": "^4.11.1" } @@ -11000,9 +11048,9 @@ "dev": true }, "rxjs": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", - "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz", + "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -11149,9 +11197,9 @@ } }, "scrypt-js": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz", - "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz", + "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==" }, "scrypt-shim": { "version": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb", @@ -11174,18 +11222,13 @@ "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==" }, "secp256k1": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz", - "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz", + "integrity": "sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==", "requires": { - "bindings": "^1.5.0", - "bip66": "^1.1.5", - "bn.js": "^4.11.8", - "create-hash": "^1.2.0", - "drbg.js": "^1.0.1", "elliptic": "^6.5.2", - "nan": "^2.14.0", - "safe-buffer": "^5.1.2" + "node-addon-api": "^2.0.0", + "node-gyp-build": "^4.2.0" } }, "seek-bzip": { @@ -11314,9 +11357,9 @@ } }, "setimmediate": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", - "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "setprototypeof": { "version": "1.1.1", @@ -11370,9 +11413,9 @@ "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, "simple-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", - "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" }, "simple-get": { "version": "2.8.1", @@ -11755,9 +11798,9 @@ } }, "solidity-coverage": { - "version": "0.7.8", - "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.8.tgz", - "integrity": "sha512-m/lXaAFrfevzJ39rOp6mGnQH0MtZAt3flqQErBoFVxZA3RrpJv+hR9lgJ8lk+9CM36Mn3xxFbbR3N5nATtdpWA==", + "version": "0.7.9", + "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.9.tgz", + "integrity": "sha512-UWkl0iNmpjuVanPWvZzF6eCAKwbEmmolmzwbN8nU+MexOKO3eW6kVbxBkfEjVa8TuQcLb0F2wdgXJZBRbjpjnA==", "dev": true, "requires": { "@solidity-parser/parser": "^0.6.0", @@ -11781,9 +11824,9 @@ }, "dependencies": { "@types/node": { - "version": "12.12.47", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.47.tgz", - "integrity": "sha512-yzBInQFhdY8kaZmqoL2+3U5dSTMrKaYcb561VU+lDzAYvqt+2lojvBEy+hmpSNuXnPTx7m9+04CzWYOUqWME2A==", + "version": "12.12.53", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.53.tgz", + "integrity": "sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ==", "dev": true }, "bn.js": { @@ -11792,16 +11835,15 @@ "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", "dev": true }, - "elliptic": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", - "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "inherits": "^2.0.1" + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" } }, "ethers": { @@ -11823,10 +11865,22 @@ }, "dependencies": { "@types/node": { - "version": "10.17.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz", - "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw==", + "version": "10.17.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz", + "integrity": "sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==", "dev": true + }, + "elliptic": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", + "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "inherits": "^2.0.1" + } } } }, @@ -12542,6 +12596,12 @@ "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=", "dev": true }, + "setimmediate": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", + "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=", + "dev": true + }, "web3": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.6.tgz", @@ -12571,9 +12631,9 @@ }, "dependencies": { "@types/node": { - "version": "10.17.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz", - "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw==", + "version": "10.17.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz", + "integrity": "sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==", "dev": true } } @@ -12702,21 +12762,6 @@ "web3-utils": "1.2.6" }, "dependencies": { - "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", - "dev": true, - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - }, "eth-lib": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz", @@ -13212,11 +13257,6 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" - }, "url-parse-lax": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", @@ -13228,9 +13268,9 @@ } }, "systeminformation": { - "version": "4.26.9", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.26.9.tgz", - "integrity": "sha512-69MTIX9j//wnteJzQWuGL6FiMxlfS3wTWyhROI6pNUaQALYqJb3W9VtLVcEcKFOjO1vrGRgilJVFzJeRRi//Pg==", + "version": "4.26.10", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.26.10.tgz", + "integrity": "sha512-bO4FIzrjESAfh4KHwkUJym3jvKtJ4oJ2PG0BBQGBmKa0pF2oanpkB7CF4ZsSX7vfp3+GKaLzioVwpV/3Tyk+lQ==", "dev": true, "optional": true }, @@ -13854,15 +13894,25 @@ }, "dependencies": { "@types/node": { - "version": "12.12.47", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.47.tgz", - "integrity": "sha512-yzBInQFhdY8kaZmqoL2+3U5dSTMrKaYcb561VU+lDzAYvqt+2lojvBEy+hmpSNuXnPTx7m9+04CzWYOUqWME2A==" + "version": "12.12.53", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.53.tgz", + "integrity": "sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ==" }, "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -13892,9 +13942,9 @@ }, "dependencies": { "@types/node": { - "version": "10.17.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz", - "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw==" + "version": "10.17.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz", + "integrity": "sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==" } } }, @@ -13912,15 +13962,25 @@ }, "dependencies": { "@types/node": { - "version": "12.12.47", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.47.tgz", - "integrity": "sha512-yzBInQFhdY8kaZmqoL2+3U5dSTMrKaYcb561VU+lDzAYvqt+2lojvBEy+hmpSNuXnPTx7m9+04CzWYOUqWME2A==" + "version": "12.12.53", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.53.tgz", + "integrity": "sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ==" }, "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -13953,6 +14013,16 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -13987,6 +14057,16 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -14060,6 +14140,16 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -14088,9 +14178,9 @@ }, "dependencies": { "@types/node": { - "version": "10.17.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz", - "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw==" + "version": "10.17.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz", + "integrity": "sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==" }, "elliptic": { "version": "6.3.3", @@ -14103,6 +14193,32 @@ "inherits": "^2.0.1" } }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + }, + "dependencies": { + "elliptic": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", + "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + } + } + }, "ethers": { "version": "4.0.0-beta.3", "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", @@ -14139,6 +14255,11 @@ "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" }, + "setimmediate": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", + "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=" + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -14182,10 +14303,15 @@ "web3-utils": "1.2.2" }, "dependencies": { - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } }, "uuid": { "version": "3.3.2", @@ -14205,6 +14331,13 @@ "randombytes": "^2.1.0", "underscore": "1.9.1", "utf8": "3.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + } } } } @@ -14230,6 +14363,16 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -14267,6 +14410,16 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -14298,6 +14451,16 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -14329,15 +14492,25 @@ }, "dependencies": { "@types/node": { - "version": "12.12.47", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.47.tgz", - "integrity": "sha512-yzBInQFhdY8kaZmqoL2+3U5dSTMrKaYcb561VU+lDzAYvqt+2lojvBEy+hmpSNuXnPTx7m9+04CzWYOUqWME2A==" + "version": "12.12.53", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.53.tgz", + "integrity": "sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ==" }, "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -14370,6 +14543,16 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, "web3-utils": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", @@ -14449,25 +14632,18 @@ } }, "web3-utils": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.9.tgz", - "integrity": "sha512-9hcpuis3n/LxFzEVjwnVgvJzTirS2S9/MiNAa7l4WOEoywY+BSNwnRX4MuHnjkh9NY25B6QOjuNG6FNnSjTw1w==", + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.11.tgz", + "integrity": "sha512-3Tq09izhD+ThqHEaWYX4VOT7dNPdZiO+c/1QMA0s5X2lDFKK/xHJb7cyTRRVzN2LvlHbR7baS1tmQhSua51TcQ==", "requires": { - "bn.js": "4.11.8", - "eth-lib": "0.2.7", + "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" - }, - "dependencies": { - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" - } } }, "websocket": { diff --git a/package.json b/package.json index c127d615..ae2e2152 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ }, "homepage": "https://daostack.io", "dependencies": { - "@daostack/infra-experimental": "0.1.1-rc.20", + "@daostack/infra-experimental": "0.1.1-rc.21", "@daostack/upgrades": "2.8.0-rc.1", "@openzeppelin/contracts-ethereum-package": "3.0.0", "math": "0.0.3", From 5c07978e7a9f2c6465a881156878314475eb8706 Mon Sep 17 00:00:00 2001 From: Oren Sokolowsky Date: Thu, 30 Jul 2020 16:20:37 +0300 Subject: [PATCH 7/7] solc 0.6.12 --- .solhint.json | 2 +- buidler.config.js | 2 +- contracts/controller/Avatar.sol | 2 +- contracts/controller/Controller.sol | 2 +- contracts/controller/DAOToken.sol | 2 +- contracts/controller/Vault.sol | 2 +- contracts/globalConstraints/GlobalConstraintInterface.sol | 2 +- contracts/globalConstraints/TokenCapGC.sol | 2 +- contracts/libs/Bytes32ToStr.sol | 2 +- contracts/libs/BytesLib.sol | 2 +- contracts/libs/StringUtil.sol | 2 +- contracts/misc/CommonToken.sol | 2 +- contracts/misc/NFTManager.sol | 2 +- contracts/misc/NectarRepAllocation.sol | 2 +- contracts/misc/PolkaCurve.sol | 2 +- contracts/registry/App.sol | 2 +- contracts/registry/ImplementationDirectory.sol | 2 +- contracts/registry/ImplementationProvider.sol | 2 +- contracts/registry/Package.sol | 2 +- contracts/schemes/Agreement.sol | 2 +- contracts/schemes/ArcScheme.sol | 2 +- contracts/schemes/Auction4Reputation.sol | 2 +- contracts/schemes/CommonInterface.sol | 2 +- contracts/schemes/Competition.sol | 2 +- contracts/schemes/ContinuousLocking4Reputation.sol | 2 +- contracts/schemes/ContributionReward.sol | 2 +- contracts/schemes/ContributionRewardExt.sol | 2 +- contracts/schemes/ControllerUpgradeScheme.sol | 2 +- contracts/schemes/CurveInterface.sol | 2 +- contracts/schemes/Dictator.sol | 2 +- contracts/schemes/ExternalLocking4Reputation.sol | 2 +- contracts/schemes/FixedReputationAllocation.sol | 2 +- contracts/schemes/FundingRequest.sol | 2 +- contracts/schemes/GenericScheme.sol | 2 +- contracts/schemes/GlobalConstraintRegistrar.sol | 2 +- contracts/schemes/JoinAndQuit.sol | 2 +- contracts/schemes/Locking4Reputation.sol | 2 +- contracts/schemes/LockingEth4Reputation.sol | 2 +- contracts/schemes/LockingToken4Reputation.sol | 2 +- contracts/schemes/PriceOracleInterface.sol | 2 +- contracts/schemes/ReputationAdmin.sol | 2 +- contracts/schemes/ReputationFromToken.sol | 2 +- contracts/schemes/SchemeFactory.sol | 2 +- contracts/schemes/SchemeRegistrar.sol | 2 +- contracts/schemes/SignalScheme.sol | 2 +- contracts/schemes/TokenTrade.sol | 2 +- contracts/schemes/UpgradeScheme.sol | 2 +- contracts/schemes/VoteInOrganizationScheme.sol | 2 +- contracts/test/ARCDebug.sol | 2 +- contracts/test/ARCGenesisProtocolCallbacksMock.sol | 2 +- contracts/test/ActionMock.sol | 2 +- contracts/test/AgreementMock.sol | 2 +- contracts/test/ERC20Mock.sol | 2 +- contracts/test/ERC721Mock.sol | 2 +- contracts/test/ExternalTokenLockerMock.sol | 2 +- contracts/test/GlobalConstraintMock.sol | 2 +- contracts/test/IERC721NonReceiverMock.sol | 2 +- contracts/test/IERC721ReceiverMock.sol | 2 +- contracts/test/PriceOracleMock.sol | 2 +- contracts/test/RewarderMock.sol | 2 +- contracts/test/SchemeMock.sol | 2 +- contracts/test/Wallet.sol | 2 +- contracts/utils/DAOFactory.sol | 2 +- contracts/utils/Redeemer.sol | 2 +- contracts/utils/RepAllocation.sol | 2 +- contracts/votingMachines/VotingMachineCallbacks.sol | 2 +- package-lock.json | 6 +++--- package.json | 2 +- truffle.js | 2 +- 69 files changed, 71 insertions(+), 71 deletions(-) diff --git a/.solhint.json b/.solhint.json index b688e174..e29b948f 100644 --- a/.solhint.json +++ b/.solhint.json @@ -8,6 +8,6 @@ "two-lines-top-level-separator": "off", "mark-callable-contracts": "off", "reason-string": "off", - "compiler-version": ["error","^0.6.10"] + "compiler-version": ["error","^0.6.12"] } } diff --git a/buidler.config.js b/buidler.config.js index 6a5a1625..9dc4eed1 100644 --- a/buidler.config.js +++ b/buidler.config.js @@ -124,7 +124,7 @@ module.exports = { } }, solc: { - version: "0.6.10", // Fetch exact version from solc-bin (default: truffle's version) + version: "0.6.12", // Fetch exact version from solc-bin (default: truffle's version) optimizer: { enabled: true, runs: 200 diff --git a/contracts/controller/Avatar.sol b/contracts/controller/Avatar.sol index c908fc92..f81d03f5 100644 --- a/contracts/controller/Avatar.sol +++ b/contracts/controller/Avatar.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/Reputation.sol"; diff --git a/contracts/controller/Controller.sol b/contracts/controller/Controller.sol index 0ac75547..2724208c 100644 --- a/contracts/controller/Controller.sol +++ b/contracts/controller/Controller.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "./Avatar.sol"; diff --git a/contracts/controller/DAOToken.sol b/contracts/controller/DAOToken.sol index 26f9976b..4d50f38f 100644 --- a/contracts/controller/DAOToken.sol +++ b/contracts/controller/DAOToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20Burnable.sol"; diff --git a/contracts/controller/Vault.sol b/contracts/controller/Vault.sol index b0e662e5..d5fcf298 100644 --- a/contracts/controller/Vault.sol +++ b/contracts/controller/Vault.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol"; diff --git a/contracts/globalConstraints/GlobalConstraintInterface.sol b/contracts/globalConstraints/GlobalConstraintInterface.sol index 9755a21a..885d2eb4 100644 --- a/contracts/globalConstraints/GlobalConstraintInterface.sol +++ b/contracts/globalConstraints/GlobalConstraintInterface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 // solhint-disable-next-line indent diff --git a/contracts/globalConstraints/TokenCapGC.sol b/contracts/globalConstraints/TokenCapGC.sol index fa20f351..8681a0b7 100644 --- a/contracts/globalConstraints/TokenCapGC.sol +++ b/contracts/globalConstraints/TokenCapGC.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol"; diff --git a/contracts/libs/Bytes32ToStr.sol b/contracts/libs/Bytes32ToStr.sol index 8a993083..799ad3e7 100644 --- a/contracts/libs/Bytes32ToStr.sol +++ b/contracts/libs/Bytes32ToStr.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 library Bytes32ToStr { diff --git a/contracts/libs/BytesLib.sol b/contracts/libs/BytesLib.sol index 7f55be1c..f15132b8 100644 --- a/contracts/libs/BytesLib.sol +++ b/contracts/libs/BytesLib.sol @@ -6,7 +6,7 @@ * The library lets you concatenate, slice and type cast bytes arrays both in memory and storage. */ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 diff --git a/contracts/libs/StringUtil.sol b/contracts/libs/StringUtil.sol index 93400a02..d09faf18 100644 --- a/contracts/libs/StringUtil.sol +++ b/contracts/libs/StringUtil.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 diff --git a/contracts/misc/CommonToken.sol b/contracts/misc/CommonToken.sol index ca0b29da..acc37986 100644 --- a/contracts/misc/CommonToken.sol +++ b/contracts/misc/CommonToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol"; diff --git a/contracts/misc/NFTManager.sol b/contracts/misc/NFTManager.sol index 63a1967c..9ec0531f 100644 --- a/contracts/misc/NFTManager.sol +++ b/contracts/misc/NFTManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721.sol"; diff --git a/contracts/misc/NectarRepAllocation.sol b/contracts/misc/NectarRepAllocation.sol index aa57a619..600dcae4 100644 --- a/contracts/misc/NectarRepAllocation.sol +++ b/contracts/misc/NectarRepAllocation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol"; diff --git a/contracts/misc/PolkaCurve.sol b/contracts/misc/PolkaCurve.sol index 6d6a39f7..07875687 100644 --- a/contracts/misc/PolkaCurve.sol +++ b/contracts/misc/PolkaCurve.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../schemes/CurveInterface.sol"; diff --git a/contracts/registry/App.sol b/contracts/registry/App.sol index a14f8b44..6a86b798 100644 --- a/contracts/registry/App.sol +++ b/contracts/registry/App.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "./ImplementationProvider.sol"; diff --git a/contracts/registry/ImplementationDirectory.sol b/contracts/registry/ImplementationDirectory.sol index d949a9f5..82959aa8 100644 --- a/contracts/registry/ImplementationDirectory.sol +++ b/contracts/registry/ImplementationDirectory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "./ImplementationProvider.sol"; diff --git a/contracts/registry/ImplementationProvider.sol b/contracts/registry/ImplementationProvider.sol index dd209c8e..b7df70e0 100644 --- a/contracts/registry/ImplementationProvider.sol +++ b/contracts/registry/ImplementationProvider.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 diff --git a/contracts/registry/Package.sol b/contracts/registry/Package.sol index 62e28890..08d31719 100644 --- a/contracts/registry/Package.sol +++ b/contracts/registry/Package.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/upgrades/contracts/ownership/Ownable.sol"; diff --git a/contracts/schemes/Agreement.sol b/contracts/schemes/Agreement.sol index 9a7ee6db..2b729556 100644 --- a/contracts/schemes/Agreement.sol +++ b/contracts/schemes/Agreement.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 /** diff --git a/contracts/schemes/ArcScheme.sol b/contracts/schemes/ArcScheme.sol index bd5fc6a9..52c5cb3a 100644 --- a/contracts/schemes/ArcScheme.sol +++ b/contracts/schemes/ArcScheme.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../controller/Avatar.sol"; diff --git a/contracts/schemes/Auction4Reputation.sol b/contracts/schemes/Auction4Reputation.sol index fa8eb58d..ed9536ef 100644 --- a/contracts/schemes/Auction4Reputation.sol +++ b/contracts/schemes/Auction4Reputation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol"; diff --git a/contracts/schemes/CommonInterface.sol b/contracts/schemes/CommonInterface.sol index 92db5986..87ab240e 100644 --- a/contracts/schemes/CommonInterface.sol +++ b/contracts/schemes/CommonInterface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 diff --git a/contracts/schemes/Competition.sol b/contracts/schemes/Competition.sol index 3932858d..61c988b0 100644 --- a/contracts/schemes/Competition.sol +++ b/contracts/schemes/Competition.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "./ContributionRewardExt.sol"; diff --git a/contracts/schemes/ContinuousLocking4Reputation.sol b/contracts/schemes/ContinuousLocking4Reputation.sol index f19e5408..a12db278 100644 --- a/contracts/schemes/ContinuousLocking4Reputation.sol +++ b/contracts/schemes/ContinuousLocking4Reputation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol"; diff --git a/contracts/schemes/ContributionReward.sol b/contracts/schemes/ContributionReward.sol index 203fd650..f97fc4ad 100644 --- a/contracts/schemes/ContributionReward.sol +++ b/contracts/schemes/ContributionReward.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../votingMachines/VotingMachineCallbacks.sol"; diff --git a/contracts/schemes/ContributionRewardExt.sol b/contracts/schemes/ContributionRewardExt.sol index 65bfc7d5..1928242b 100644 --- a/contracts/schemes/ContributionRewardExt.sol +++ b/contracts/schemes/ContributionRewardExt.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../votingMachines/VotingMachineCallbacks.sol"; diff --git a/contracts/schemes/ControllerUpgradeScheme.sol b/contracts/schemes/ControllerUpgradeScheme.sol index 9d412737..8f056b0f 100644 --- a/contracts/schemes/ControllerUpgradeScheme.sol +++ b/contracts/schemes/ControllerUpgradeScheme.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol"; diff --git a/contracts/schemes/CurveInterface.sol b/contracts/schemes/CurveInterface.sol index 12f37526..e02a57ec 100644 --- a/contracts/schemes/CurveInterface.sol +++ b/contracts/schemes/CurveInterface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 interface CurveInterface { diff --git a/contracts/schemes/Dictator.sol b/contracts/schemes/Dictator.sol index e136ae4d..7ef5ad43 100644 --- a/contracts/schemes/Dictator.sol +++ b/contracts/schemes/Dictator.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../controller/Avatar.sol"; diff --git a/contracts/schemes/ExternalLocking4Reputation.sol b/contracts/schemes/ExternalLocking4Reputation.sol index 03477c20..59d73f92 100644 --- a/contracts/schemes/ExternalLocking4Reputation.sol +++ b/contracts/schemes/ExternalLocking4Reputation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "./Locking4Reputation.sol"; diff --git a/contracts/schemes/FixedReputationAllocation.sol b/contracts/schemes/FixedReputationAllocation.sol index dab95055..02d34aaf 100644 --- a/contracts/schemes/FixedReputationAllocation.sol +++ b/contracts/schemes/FixedReputationAllocation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../controller/Controller.sol"; diff --git a/contracts/schemes/FundingRequest.sol b/contracts/schemes/FundingRequest.sol index 55fa6bf1..01429553 100644 --- a/contracts/schemes/FundingRequest.sol +++ b/contracts/schemes/FundingRequest.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../votingMachines/VotingMachineCallbacks.sol"; diff --git a/contracts/schemes/GenericScheme.sol b/contracts/schemes/GenericScheme.sol index 231b5561..f881b884 100644 --- a/contracts/schemes/GenericScheme.sol +++ b/contracts/schemes/GenericScheme.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol"; diff --git a/contracts/schemes/GlobalConstraintRegistrar.sol b/contracts/schemes/GlobalConstraintRegistrar.sol index 10d00a8d..76583fb6 100644 --- a/contracts/schemes/GlobalConstraintRegistrar.sol +++ b/contracts/schemes/GlobalConstraintRegistrar.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol"; diff --git a/contracts/schemes/JoinAndQuit.sol b/contracts/schemes/JoinAndQuit.sol index f5b9d5b5..a728328d 100644 --- a/contracts/schemes/JoinAndQuit.sol +++ b/contracts/schemes/JoinAndQuit.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../votingMachines/VotingMachineCallbacks.sol"; diff --git a/contracts/schemes/Locking4Reputation.sol b/contracts/schemes/Locking4Reputation.sol index 69152220..b40403ee 100644 --- a/contracts/schemes/Locking4Reputation.sol +++ b/contracts/schemes/Locking4Reputation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../controller/Controller.sol"; diff --git a/contracts/schemes/LockingEth4Reputation.sol b/contracts/schemes/LockingEth4Reputation.sol index 325f53f0..8dd82cfc 100644 --- a/contracts/schemes/LockingEth4Reputation.sol +++ b/contracts/schemes/LockingEth4Reputation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "./Locking4Reputation.sol"; diff --git a/contracts/schemes/LockingToken4Reputation.sol b/contracts/schemes/LockingToken4Reputation.sol index 8864a433..0002271d 100644 --- a/contracts/schemes/LockingToken4Reputation.sol +++ b/contracts/schemes/LockingToken4Reputation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "./Locking4Reputation.sol"; diff --git a/contracts/schemes/PriceOracleInterface.sol b/contracts/schemes/PriceOracleInterface.sol index fb2ba3ca..d0c877dc 100644 --- a/contracts/schemes/PriceOracleInterface.sol +++ b/contracts/schemes/PriceOracleInterface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 interface PriceOracleInterface { diff --git a/contracts/schemes/ReputationAdmin.sol b/contracts/schemes/ReputationAdmin.sol index 08e4fef2..76672e31 100644 --- a/contracts/schemes/ReputationAdmin.sol +++ b/contracts/schemes/ReputationAdmin.sol @@ -1,4 +1,4 @@ -pragma solidity 0.6.10; +pragma solidity 0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol"; diff --git a/contracts/schemes/ReputationFromToken.sol b/contracts/schemes/ReputationFromToken.sol index af28e5a1..899bee3e 100644 --- a/contracts/schemes/ReputationFromToken.sol +++ b/contracts/schemes/ReputationFromToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../controller/Controller.sol"; diff --git a/contracts/schemes/SchemeFactory.sol b/contracts/schemes/SchemeFactory.sol index c619b417..196a0abe 100644 --- a/contracts/schemes/SchemeFactory.sol +++ b/contracts/schemes/SchemeFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol"; diff --git a/contracts/schemes/SchemeRegistrar.sol b/contracts/schemes/SchemeRegistrar.sol index 6f1ac6a3..0b883e10 100644 --- a/contracts/schemes/SchemeRegistrar.sol +++ b/contracts/schemes/SchemeRegistrar.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/votingMachines/VotingMachineCallbacksInterface.sol"; diff --git a/contracts/schemes/SignalScheme.sol b/contracts/schemes/SignalScheme.sol index 9dd423e1..a65ac085 100644 --- a/contracts/schemes/SignalScheme.sol +++ b/contracts/schemes/SignalScheme.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol"; diff --git a/contracts/schemes/TokenTrade.sol b/contracts/schemes/TokenTrade.sol index 91ccc21c..bad06791 100644 --- a/contracts/schemes/TokenTrade.sol +++ b/contracts/schemes/TokenTrade.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../votingMachines/VotingMachineCallbacks.sol"; diff --git a/contracts/schemes/UpgradeScheme.sol b/contracts/schemes/UpgradeScheme.sol index 5884961f..14650f19 100644 --- a/contracts/schemes/UpgradeScheme.sol +++ b/contracts/schemes/UpgradeScheme.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol"; diff --git a/contracts/schemes/VoteInOrganizationScheme.sol b/contracts/schemes/VoteInOrganizationScheme.sol index 33291dab..85e4e813 100644 --- a/contracts/schemes/VoteInOrganizationScheme.sol +++ b/contracts/schemes/VoteInOrganizationScheme.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../votingMachines/VotingMachineCallbacks.sol"; diff --git a/contracts/test/ARCDebug.sol b/contracts/test/ARCDebug.sol index f116c4ec..8ae4add3 100644 --- a/contracts/test/ARCDebug.sol +++ b/contracts/test/ARCDebug.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@daostack/infra-experimental/contracts/votingMachines/GenesisProtocol.sol"; diff --git a/contracts/test/ARCGenesisProtocolCallbacksMock.sol b/contracts/test/ARCGenesisProtocolCallbacksMock.sol index 02bd5a59..c6202161 100644 --- a/contracts/test/ARCGenesisProtocolCallbacksMock.sol +++ b/contracts/test/ARCGenesisProtocolCallbacksMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../votingMachines/VotingMachineCallbacks.sol"; diff --git a/contracts/test/ActionMock.sol b/contracts/test/ActionMock.sol index 93f3407b..ef3aa3cf 100644 --- a/contracts/test/ActionMock.sol +++ b/contracts/test/ActionMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../controller/Avatar.sol"; diff --git a/contracts/test/AgreementMock.sol b/contracts/test/AgreementMock.sol index 5a2fcfe2..7c387366 100644 --- a/contracts/test/AgreementMock.sol +++ b/contracts/test/AgreementMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../schemes/Agreement.sol"; diff --git a/contracts/test/ERC20Mock.sol b/contracts/test/ERC20Mock.sol index d72d8dc6..e2d216a5 100644 --- a/contracts/test/ERC20Mock.sol +++ b/contracts/test/ERC20Mock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol"; diff --git a/contracts/test/ERC721Mock.sol b/contracts/test/ERC721Mock.sol index 978b0877..3a2d2a84 100644 --- a/contracts/test/ERC721Mock.sol +++ b/contracts/test/ERC721Mock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol"; diff --git a/contracts/test/ExternalTokenLockerMock.sol b/contracts/test/ExternalTokenLockerMock.sol index 261c990b..2217a661 100644 --- a/contracts/test/ExternalTokenLockerMock.sol +++ b/contracts/test/ExternalTokenLockerMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol"; diff --git a/contracts/test/GlobalConstraintMock.sol b/contracts/test/GlobalConstraintMock.sol index 3148b198..b5a82f16 100644 --- a/contracts/test/GlobalConstraintMock.sol +++ b/contracts/test/GlobalConstraintMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../globalConstraints/GlobalConstraintInterface.sol"; diff --git a/contracts/test/IERC721NonReceiverMock.sol b/contracts/test/IERC721NonReceiverMock.sol index 1e1f2415..8da1c6cb 100644 --- a/contracts/test/IERC721NonReceiverMock.sol +++ b/contracts/test/IERC721NonReceiverMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721Receiver.sol"; diff --git a/contracts/test/IERC721ReceiverMock.sol b/contracts/test/IERC721ReceiverMock.sol index 32f0167a..f84603e0 100644 --- a/contracts/test/IERC721ReceiverMock.sol +++ b/contracts/test/IERC721ReceiverMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721Receiver.sol"; diff --git a/contracts/test/PriceOracleMock.sol b/contracts/test/PriceOracleMock.sol index a2415f59..22a43eb5 100644 --- a/contracts/test/PriceOracleMock.sol +++ b/contracts/test/PriceOracleMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../schemes/PriceOracleInterface.sol"; diff --git a/contracts/test/RewarderMock.sol b/contracts/test/RewarderMock.sol index 5377ae65..93a5360a 100644 --- a/contracts/test/RewarderMock.sol +++ b/contracts/test/RewarderMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../schemes/ContributionRewardExt.sol"; diff --git a/contracts/test/SchemeMock.sol b/contracts/test/SchemeMock.sol index 0b0c1079..82d1007c 100644 --- a/contracts/test/SchemeMock.sol +++ b/contracts/test/SchemeMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../controller/Controller.sol"; diff --git a/contracts/test/Wallet.sol b/contracts/test/Wallet.sol index 06103769..b47ddc99 100644 --- a/contracts/test/Wallet.sol +++ b/contracts/test/Wallet.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol"; diff --git a/contracts/utils/DAOFactory.sol b/contracts/utils/DAOFactory.sol index 7af3ce22..01146c5e 100644 --- a/contracts/utils/DAOFactory.sol +++ b/contracts/utils/DAOFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 pragma experimental ABIEncoderV2; diff --git a/contracts/utils/Redeemer.sol b/contracts/utils/Redeemer.sol index 7ba58af9..0ee9109d 100644 --- a/contracts/utils/Redeemer.sol +++ b/contracts/utils/Redeemer.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../schemes/ContributionReward.sol"; diff --git a/contracts/utils/RepAllocation.sol b/contracts/utils/RepAllocation.sol index 5633e620..519a37ca 100644 --- a/contracts/utils/RepAllocation.sol +++ b/contracts/utils/RepAllocation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol"; diff --git a/contracts/votingMachines/VotingMachineCallbacks.sol b/contracts/votingMachines/VotingMachineCallbacks.sol index a14c1cec..b39bb121 100644 --- a/contracts/votingMachines/VotingMachineCallbacks.sol +++ b/contracts/votingMachines/VotingMachineCallbacks.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.6.10; +pragma solidity ^0.6.12; // SPDX-License-Identifier: GPL-3.0 import "../controller/Avatar.sol"; diff --git a/package-lock.json b/package-lock.json index 5a0ef4aa..ee6b589a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -174,9 +174,9 @@ } }, "@daostack/infra-experimental": { - "version": "0.1.1-rc.21", - "resolved": "https://registry.npmjs.org/@daostack/infra-experimental/-/infra-experimental-0.1.1-rc.21.tgz", - "integrity": "sha512-tFosUdUgnDRIxO8RJC5Zzh8pry64CcyWr8AG2vgmMQPMFIPrDJKc3eBCytjklMRxSG2r2lQ9R8VLL+fZe/zQ8w==", + "version": "0.1.1-rc.22", + "resolved": "https://registry.npmjs.org/@daostack/infra-experimental/-/infra-experimental-0.1.1-rc.22.tgz", + "integrity": "sha512-VHu19QGBp4T721dTgHD4820+qX/G8srF/NDA3oq3koBAWhNcOxC4s0k/wYr0YM9P/ArQpqDlq3BHyRDDLUo5mg==", "requires": { "@openzeppelin/contracts-ethereum-package": "3.0.0", "ethereumjs-abi": "^0.6.8", diff --git a/package.json b/package.json index ae2e2152..0792f2bf 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ }, "homepage": "https://daostack.io", "dependencies": { - "@daostack/infra-experimental": "0.1.1-rc.21", + "@daostack/infra-experimental": "0.1.1-rc.22", "@daostack/upgrades": "2.8.0-rc.1", "@openzeppelin/contracts-ethereum-package": "3.0.0", "math": "0.0.3", diff --git a/truffle.js b/truffle.js index bf487d89..8d4d2b51 100644 --- a/truffle.js +++ b/truffle.js @@ -56,7 +56,7 @@ module.exports = { }, compilers: { solc: { - version: "0.6.10", // Fetch exact version from solc-bin (default: truffle's version) + version: "0.6.12", // Fetch exact version from solc-bin (default: truffle's version) // docker: true, // Use "0.5.1" you've installed locally with docker (default: false) optimizer: { enabled: true,