From e0dda66d45fd16524f5ef4e5a8fd78b8bb3a25bb Mon Sep 17 00:00:00 2001 From: Ezerous Date: Thu, 19 Nov 2020 15:48:22 +0200 Subject: [PATCH] Add events to drizzle, bump solc --- packages/concordia-app/src/options/drizzleOptions.js | 1 + packages/concordia-contracts/contracts/Forum.sol | 2 +- packages/concordia-contracts/contracts/Migrations.sol | 2 +- packages/concordia-contracts/contracts/Voting.sol | 2 +- packages/concordia-contracts/test/TestVoting.sol | 2 +- packages/concordia-contracts/truffle-config.js | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/concordia-app/src/options/drizzleOptions.js b/packages/concordia-app/src/options/drizzleOptions.js index aa563f7..0f9f761 100644 --- a/packages/concordia-app/src/options/drizzleOptions.js +++ b/packages/concordia-app/src/options/drizzleOptions.js @@ -9,6 +9,7 @@ const drizzleOptions = { contracts, events: { Forum: ['UserSignedUp', 'UsernameUpdated', 'TopicCreated', 'PostCreated'], + Voting: ['PollCreated', 'UserVoted'], }, reloadWindowOnNetworkChange: true, reloadWindowOnAccountChange: true, // We need it to reinitialize breeze and create new Orbit databases diff --git a/packages/concordia-contracts/contracts/Forum.sol b/packages/concordia-contracts/contracts/Forum.sol index ae6ec07..ab258ad 100644 --- a/packages/concordia-contracts/contracts/Forum.sol +++ b/packages/concordia-contracts/contracts/Forum.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.4; +pragma solidity 0.7.5; contract Forum { diff --git a/packages/concordia-contracts/contracts/Migrations.sol b/packages/concordia-contracts/contracts/Migrations.sol index 503020e..b370d17 100644 --- a/packages/concordia-contracts/contracts/Migrations.sol +++ b/packages/concordia-contracts/contracts/Migrations.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.4; +pragma solidity 0.7.5; contract Migrations { address public owner; diff --git a/packages/concordia-contracts/contracts/Voting.sol b/packages/concordia-contracts/contracts/Voting.sol index a11047e..8b17903 100644 --- a/packages/concordia-contracts/contracts/Voting.sol +++ b/packages/concordia-contracts/contracts/Voting.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.4; +pragma solidity 0.7.5; import "./Forum.sol"; diff --git a/packages/concordia-contracts/test/TestVoting.sol b/packages/concordia-contracts/test/TestVoting.sol index 074abd6..c62998f 100644 --- a/packages/concordia-contracts/test/TestVoting.sol +++ b/packages/concordia-contracts/test/TestVoting.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.7.4; +pragma solidity 0.7.5; import "truffle/Assert.sol"; import "truffle/DeployedAddresses.sol"; diff --git a/packages/concordia-contracts/truffle-config.js b/packages/concordia-contracts/truffle-config.js index 017d737..3a678d2 100644 --- a/packages/concordia-contracts/truffle-config.js +++ b/packages/concordia-contracts/truffle-config.js @@ -8,7 +8,7 @@ module.exports = { // to customize your Truffle configuration! compilers: { solc: { - version: '0.7.4', + version: '0.7.5', }, }, contracts_build_directory: path.join(__dirname, 'build/'), @@ -20,7 +20,7 @@ module.exports = { }, test: { host: GANACHE_HOST || '127.0.0.1', - port: GANACHE_PORT || '8545', + port: GANACHE_PORT || '8546', network_id: '*', }, },