diff --git a/packages/DApp/src/config.ts b/packages/DApp/src/config.ts index 4926716..67cbd3f 100644 --- a/packages/DApp/src/config.ts +++ b/packages/DApp/src/config.ts @@ -1,7 +1,7 @@ import { v4 as uuidv4 } from 'uuid' import { ChainId, OptimismGoerli, Optimism, Config as DAppConfig, Localhost, Hardhat } from '@usedapp/core' -const version = '0.0.5' +const version = '0.0.6' export interface Config { wakuConfig: { @@ -52,12 +52,15 @@ const configs: Record = { preview: { statusWalletRequired: false, wakuConfig: { - environment: 'test', + environment: 'production', wakuTopic: `/communitiesCuration/preview/${version}/directory/proto/`, wakuFeatureTopic: `/communitiesCuration/preview/${version}/featured/proto/`, }, daapConfig: { readOnlyChainId: ChainId.OptimismGoerli, + readOnlyUrls: { + [ChainId.OptimismGoerli]: `https://optimism-goerli.infura.io/v3/${process.env.INFURA_API_KEY}`, + }, networks: [OptimismGoerli], notifications: { checkInterval: 500, diff --git a/packages/DApp/src/constants/contracts.ts b/packages/DApp/src/constants/contracts.ts index fcbe7a7..b458a9d 100644 --- a/packages/DApp/src/constants/contracts.ts +++ b/packages/DApp/src/constants/contracts.ts @@ -5,14 +5,15 @@ export const contracts = { [ChainId.Optimism]: { // TO BE PROVIDED votingContract: '0x0000000000000000000000000000000000000000', + featuredVotingContract: '0x0000000000000000000000000000000000000000', directoryContract: '0x0000000000000000000000000000000000000000', tokenContract: '0x0000000000000000000000000000000000000000', }, [ChainId.OptimismGoerli]: { - // TO BE PROVIDED - votingContract: '0x0000000000000000000000000000000000000000', - directoryContract: '0x0000000000000000000000000000000000000000', - tokenContract: '0x0000000000000000000000000000000000000000', + votingContract: '0x7864aDdE74cFa6Efb2ee8E8d7bd96f9C3dd068b3', + featuredVotingContract: '0x2243f6e24b827bB5Dd8F4F89CC43F8b6902f238B', + directoryContract: '0x7E01b56d0CEa1D2b5D4018E550A2d2A288a38C6B', + tokenContract: '0xfb8dC8748F24F8B155123b0341a762C898511c76', }, [ChainId.Hardhat]: { votingContract: process.env.VOTING_CONTRACT ?? '0x0000000000000000000000000000000000000000', diff --git a/packages/DApp/webpack.config.cjs b/packages/DApp/webpack.config.cjs index 3e2eb58..83e1634 100644 --- a/packages/DApp/webpack.config.cjs +++ b/packages/DApp/webpack.config.cjs @@ -81,6 +81,7 @@ module.exports = () => { 'process.env.DIRECTORY_CONTRACT': JSON.stringify(process.env.DIRECTORY_CONTRACT), 'process.env.MULTICALL_CONTRACT': JSON.stringify(process.env.MULTICALL_CONTRACT), 'process.env.TOKEN_CONTRACT': JSON.stringify(process.env.TOKEN_CONTRACT), + 'process.env.INFURA_API_KEY': JSON.stringify(process.env.INFURA_API_KEY), }), new webpack.ProvidePlugin({ process: 'process/browser.js', diff --git a/packages/contracts/deploy/deploy.ts b/packages/contracts/deploy/deploy.ts index 4cc3108..73b4beb 100644 --- a/packages/contracts/deploy/deploy.ts +++ b/packages/contracts/deploy/deploy.ts @@ -92,11 +92,13 @@ function isTestNetwork(chainId: number) { async function obtainTokenAddress(deployer: any, chainId: number): Promise { let tokenAddress = process.env.TOKEN_CONTRACT - if (!tokenAddress && isTestNetwork(chainId)) { - const tokenContract = await deployERC20MockContract(deployer.address) - tokenAddress = tokenContract.address - } else { - throw new Error('TOKEN_ADDRESS should be provided') + if (!tokenAddress) { + if (isTestNetwork(chainId)) { + const tokenContract = await deployERC20MockContract(deployer.address) + tokenAddress = tokenContract.address + } else { + throw new Error('TOKEN_CONTRACT must be provided') + } } return tokenAddress ? tokenAddress : '' } diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts index cd8df42..c2df66e 100644 --- a/packages/contracts/hardhat.config.ts +++ b/packages/contracts/hardhat.config.ts @@ -3,6 +3,13 @@ import "@nomicfoundation/hardhat-toolbox"; const config: HardhatUserConfig = { solidity: "0.8.18", + networks: { + hardhat: {}, + optimismGoerli: { + url: `https://optimism-goerli.infura.io/v3/${process.env.INFURA_API_KEY}`, + // accounts: [`0x${process.env.ACCOUNT_KEY}`], + } + } }; export default config;