Merge pull request #18 from fei-protocol/POZ-Fix-Core-Deploy-Gas

Joeysantoro · web-flow · commit 7dc9ae382172 · 2021-02-06T11:44:28.000-08:00
fix deploy gas coreOrchestrator
diff --git a/contracts/core/Core.sol b/contracts/core/Core.sol
@@ -20,6 +20,9 @@ contract Core is ICore, Permissions {
 
 	constructor() public {
 		_setupGovernor(msg.sender);
+	}
+
+	function init() external onlyGovernor {
 		Fei _fei = new Fei(address(this));
 		fei = IFei(address(_fei));
 
diff --git a/contracts/orchestration/CoreOrchestrator.sol b/contracts/orchestration/CoreOrchestrator.sol
@@ -214,8 +214,6 @@ contract CoreOrchestrator is Ownable {
 		address _admin
 	) public {
 		core = new Core();
-		tribe = address(core.tribe());
-		fei = address(core.fei());
 
 		core.grantRevoker(_admin);
 
@@ -229,12 +227,20 @@ contract CoreOrchestrator is Ownable {
 		routerOrchestrator = IRouterOrchestrator(_routerOrchestrator);
 
 		admin = _admin;
-		tribeSupply = IERC20(tribe).totalSupply();
 		if (TEST_MODE) {
 			core.grantGovernor(_admin);
 		}
 	}
 
+	function initCore() public onlyOwner {
+		core.init();
+
+		tribe = address(core.tribe());
+		fei = address(core.fei());
+		tribeSupply = IERC20(tribe).totalSupply();
+	}
+
+
 	function initPairs() public onlyOwner {
 		ethFeiPair = UNISWAP_FACTORY.createPair(fei, WETH);
 		tribeFeiPair = UNISWAP_FACTORY.createPair(tribe, fei);
diff --git a/migrations/2_deploy.js b/migrations/2_deploy.js
@@ -46,7 +46,8 @@ module.exports = function(deployer, network, accounts) {
 	 		genesis.address, 
 	 		gov.address,
 	 		routerOrchestrator.address, 
-	 		accounts[0]
+	 		accounts[0],
+	 		{gas: 8000000}
 	 	);
 	}).then(function(instance) {
 		core = instance;
@@ -65,6 +66,8 @@ module.exports = function(deployer, network, accounts) {
 	 	return pcvo.transferOwnership(core.address);
 	}).then(function(instance) {
 	 	return routerOrchestrator.transferOwnership(core.address);
+	}).then(function(instance) {
+	 	return core.initCore();
 	}).then(function(instance) {
 	 	return core.initPairs();
 	}).then(function(instance) {
diff --git a/test/bondingcurve/EthBondingCurve.test.js b/test/bondingcurve/EthBondingCurve.test.js
@@ -21,7 +21,10 @@ const {
 describe('EthBondingCurve', function () {
 
   beforeEach(async function () {
+    
     this.core = await getCore(true);
+    await this.core.init({from: governorAddress});
+
     this.fei = await Fei.at(await this.core.fei());
     
     this.oracle = await MockOracle.new(500); // 500 USD per ETH exchange rate 
diff --git a/test/core/Core.test.js b/test/core/Core.test.js
@@ -20,6 +20,8 @@ describe('Core', function () {
 
   beforeEach(async function () {
     this.core = await getCore(false);
+    await this.core.init({from: governorAddress});
+    
     this.tribe = await Tribe.at(await this.core.tribe());
     this.coreRef = await MockCoreRef.new(this.core.address);
 
diff --git a/test/genesis/GenesisGroup.test.js b/test/genesis/GenesisGroup.test.js
@@ -24,6 +24,8 @@ describe('GenesisGroup', function () {
 
   beforeEach(async function () {
     this.core = await getCore(false);
+    await this.core.init({from: governorAddress});
+    
     this.fei = await Fei.at(await this.core.fei());
     this.tribe = await Tribe.at(await this.core.tribe());
     this.bc = await MockBondingCurve.new(false, 10);
diff --git a/test/genesis/IDO.test.js b/test/genesis/IDO.test.js
@@ -24,8 +24,11 @@ describe('IDO', function () {
   const LIQUIDITY_INCREMENT = 10000; // amount of liquidity created by mock for each deposit
 
   beforeEach(async function () {
-    this.core = await getCore();
-    await this.core.setGenesisGroup(genesisGroup, {from: governorAddress});
+    
+    this.core = await getCore(true);
+    await this.core.init({from: governorAddress});
+
+
     this.fei = await Fei.at(await this.core.fei());
     this.tribe = await Tribe.at(await this.core.tribe());
 
diff --git a/test/pcv/EthUniswapPCVController.test.js b/test/pcv/EthUniswapPCVController.test.js
@@ -20,6 +20,8 @@ describe('EthUniswapPCVController', function () {
 
   beforeEach(async function () {
     this.core = await Core.new({from: governorAddress});
+    await this.core.init({from: governorAddress});
+
     await this.core.setGenesisGroup(genesisGroup, {from: governorAddress});
     await this.core.completeGenesisGroup({from: genesisGroup});
 
diff --git a/test/pcv/EthUniswapPCVDeposit.test.js b/test/pcv/EthUniswapPCVDeposit.test.js
@@ -18,6 +18,8 @@ describe('EthUniswapPCVDeposit', function () {
 
   beforeEach(async function () {
     this.core = await Core.new({from: governorAddress});
+    await this.core.init({from: governorAddress});
+
     await this.core.setGenesisGroup(genesisGroup, {from: governorAddress});
     await this.core.completeGenesisGroup({from: genesisGroup});
 
diff --git a/test/pool/FeiPool.test.js b/test/pool/FeiPool.test.js
@@ -13,6 +13,8 @@ describe('Pool', function () {
 
   beforeEach(async function () {
     this.core = await Core.new({from: governorAddress});
+    await this.core.init({from: governorAddress});
+
     this.window = new BN(2 * 365 * 24 * 60 * 60);
     this.tribe = await Tribe.at(await this.core.tribe());
     this.fei = await Fei.at(await this.core.fei());
diff --git a/test/router/FeiRouter.js b/test/router/FeiRouter.js
@@ -17,6 +17,8 @@ describe('FeiRouter', function () {
 
   beforeEach(async function () {
     this.core = await Core.new();
+    await this.core.init();
+
     this.fei = await Fei.at(await this.core.fei());
     await this.core.grantMinter(minterAddress);
 
diff --git a/test/token/Fei.test.js b/test/token/Fei.test.js
@@ -14,6 +14,8 @@ describe('Fei', function () {
 
   beforeEach(async function () {
     this.core = await MockCore.new();
+    await this.core.init();
+
     this.fei = await Fei.at(await this.core.fei());
     await this.core.grantMinter(minterAddress);
     await this.core.grantBurner(burnerAddress);
diff --git a/test/token/UniswapIncentive.test.js b/test/token/UniswapIncentive.test.js
@@ -17,6 +17,8 @@ describe('UniswapIncentive', function () {
   beforeEach(async function () {
 
     this.core = await Core.new({from: governorAddress});
+    await this.core.init({from: governorAddress});
+    
     this.fei = await Fei.at(await this.core.fei());
     this.oracle = await MockOracle.new(500); // 500:1 USD/ETH exchange rate
 
