From 81cd500ff9d307c57a38d0527b704f7ec8596ecb Mon Sep 17 00:00:00 2001 From: Felipe Forbeck Date: Mon, 12 Jul 2021 16:04:23 -0300 Subject: [PATCH] always deploy extensions --- truffle-config.js | 5 +++-- utils/TruffleUtil.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/truffle-config.js b/truffle-config.js index b9e7a3890..7d7f2c574 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -30,11 +30,12 @@ module.exports = { }, rinkeby: { provider: function () { + let HDWalletProvider = require("@truffle/hdwallet-provider"); + let infuraKey = process.env.INFURA_KEY; let alchemyKey = process.env.ALCHEMY_KEY; - - let HDWalletProvider = require("@truffle/hdwallet-provider"); let mnemonic = process.env.TRUFFLE_MNEMONIC; + let url; if (alchemyKey) { url = `wss://eth-rinkeby.ws.alchemyapi.io/v2/${alchemyKey}`; diff --git a/utils/TruffleUtil.js b/utils/TruffleUtil.js index f4eb3cfae..fee8d29da 100644 --- a/utils/TruffleUtil.js +++ b/utils/TruffleUtil.js @@ -66,6 +66,7 @@ const deployFunction = (deployer, daoArtifacts, allContracts) => { if ( // Always deploy core and test contracts contractConfig.type === ContractType.Core || + contractConfig.type === ContractType.Extension || contractConfig.type === ContractType.Test ) { return deploy(contractInterface, args); @@ -93,9 +94,8 @@ const deployFunction = (deployer, daoArtifacts, allContracts) => { const deployedContract = await deploy(contractInterface, args); if ( - // Add the new contract to DaoArtifacts, should not store Core & Test contracts + // Add the new contract to DaoArtifacts, should not store Core, Extension & Test contracts contractConfig.type === ContractType.Factory || - contractConfig.type === ContractType.Extension || contractConfig.type === ContractType.Adapter || contractConfig.type === ContractType.Util ) {