Update strategies for imports from contracts and oracles.

package.json

@@ -102,8 +102,8 @@
     "lint-staged": "^7.2.0",
     "module-alias": "^2.1.0",
     "openzeppelin-solidity": "^2.2",
-    "set-protocol-contracts": "^1.3.13-beta",
-    "set-protocol-oracles": "^1.0.1",
+    "set-protocol-contracts": "^1.3.35-beta",
+    "set-protocol-oracles": "^1.0.5",
     "set-protocol-utils": "^1.0.0-beta.45",
     "tiny-promisify": "^1.0.0",
     "truffle-flattener": "^1.4.2",

test/contracts/managers/allocators/binaryAllocator.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   Core,
@@ -48,7 +48,7 @@ import { getWeb3 } from '@utils/web3Helper';
 
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();

test/contracts/managers/allocators/socialAllocator.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   Core,
@@ -43,9 +43,10 @@ import { expectRevertError } from '@utils/tokenAssertions';
 import { extractNewSetTokenAddressFromLogs } from '@utils/contract_logs/core';
 import { getWeb3 } from '@utils/web3Helper';
 
+import { CoreHelper } from 'set-protocol-contracts';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();
@@ -90,6 +91,7 @@ contract('SocialAllocator', accounts => {
   const erc20Helper = new ERC20Helper(deployerAccount);
   const managerHelper = new ManagerHelper(deployerAccount);
   const oracleHelper = new OracleHelper(deployerAccount);
+  const coreHelper = new CoreHelper(deployerAccount, deployerAccount);
 
   before(async () => {
     ABIDecoder.addABI(Core.abi);
@@ -158,7 +160,7 @@ contract('SocialAllocator', accounts => {
       btcLegacyMakerOracleAdapter.address,
     );
 
-    oracleWhiteList = await protocolHelper.deployOracleWhiteListAsync(
+    oracleWhiteList = await coreHelper.deployOracleWhiteListAsync(
       [wrappedETH.address, wrappedBTC.address, usdcMock.address],
       [ethOracleProxy.address, btcOracleProxy.address, usdcOracle.address],
     );

test/contracts/managers/assetPairManager.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   Core,

test/contracts/managers/btcDaiRebalancingManager.spec.ts

@@ -28,7 +28,7 @@ import {
 import {
   BTCDaiRebalancingManagerContract,
 } from '@utils/contracts';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   DEFAULT_GAS,
@@ -40,7 +40,7 @@ import { LogManagerProposal } from '@utils/contract_logs/btcDaiRebalancingManage
 
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
 
 BigNumberSetup.configure();

test/contracts/managers/btcEthRebalancingManager.spec.ts

@@ -29,7 +29,7 @@ import {
   BTCETHRebalancingManagerContract,
 } from '@utils/contracts';
 
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   DEFAULT_GAS,
@@ -42,7 +42,7 @@ import { LogManagerProposal } from '@utils/contract_logs/btcEthRebalancingManage
 
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
 
 BigNumberSetup.configure();

test/contracts/managers/ethDaiRebalancingManager.spec.ts

@@ -28,7 +28,7 @@ import {
 } from 'set-protocol-oracles';
 
 import { ETHDaiRebalancingManagerContract } from '@utils/contracts';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   DEFAULT_GAS,
@@ -40,7 +40,7 @@ import { LogManagerProposal } from '@utils/contract_logs/ethDaiRebalancingManage
 
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
 
 BigNumberSetup.configure();

test/contracts/managers/inverseMacoStrategyManager.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   Core,
@@ -52,7 +52,7 @@ import { LogManagerProposal } from '@utils/contract_logs/macoStrategyManager';
 
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();

test/contracts/managers/lib/flexibleTimingManagerLibraryMock.spec.ts

@@ -9,7 +9,7 @@ import { BigNumberSetup } from '@utils/bigNumberSetup';
 import {
   FlexibleTimingManagerLibraryMockContract
 } from '@utils/contracts';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import { expectRevertError } from '@utils/tokenAssertions';
 import { getWeb3 } from '@utils/web3Helper';

test/contracts/managers/lib/managerLibraryMock.spec.ts

@@ -9,7 +9,7 @@ import { BigNumberSetup } from '@utils/bigNumberSetup';
 import {
   ManagerLibraryMockContract
 } from '@utils/contracts';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { getWeb3 } from '@utils/web3Helper';
 import { DEFAULT_AUCTION_PRICE_DIVISOR } from '@utils/constants';
 

test/contracts/managers/macoStrategyManager.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   Core,
@@ -49,7 +49,7 @@ import { LogManagerProposal } from '@utils/contract_logs/macoStrategyManager';
 
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();

test/contracts/managers/macoStrategyManagerV2.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   Core,
@@ -52,7 +52,7 @@ import { LogManagerProposal } from '@utils/contract_logs/macoStrategyManager';
 
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();

test/contracts/managers/socialTradingManager.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   Core,
@@ -41,7 +41,8 @@ import {
   ONE_DAY_IN_SECONDS,
   UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
   WBTC_DECIMALS,
-  ZERO
+  ZERO,
+  ONE_HOUR_IN_SECONDS
 } from '@utils/constants';
 
 import { expectRevertError } from '@utils/tokenAssertions';
@@ -53,9 +54,16 @@ import {
 } from '@utils/contract_logs/socialTradingManager';
 import { getWeb3 } from '@utils/web3Helper';
 
+import {
+  CoreHelper,
+  FeeCalculatorHelper,
+  LiquidatorHelper,
+  ValuationHelper
+} from 'set-protocol-contracts';
+import { ERC20Helper as ERC20Contracts } from 'set-protocol-contracts';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();
@@ -113,6 +121,12 @@ contract('SocialTradingManager', accounts => {
   const managerHelper = new ManagerHelper(deployerAccount);
   const oracleHelper = new OracleHelper(deployerAccount);
 
+  const coreHelper = new CoreHelper(deployerAccount, deployerAccount);
+  const feeCalculatorHelper = new FeeCalculatorHelper(deployerAccount);
+  const ercContracts = new ERC20Contracts(deployerAccount);
+  const valuationHelper = new ValuationHelper(deployerAccount, coreHelper, ercContracts, oracleHelper);
+  const liquidatorHelper = new LiquidatorHelper(deployerAccount, ercContracts, valuationHelper);
+
   before(async () => {
     ABIDecoder.addABI(Core.abi);
     ABIDecoder.addABI(SocialTradingManager.abi);
@@ -174,21 +188,25 @@ contract('SocialTradingManager', accounts => {
       btcLegacyMakerOracleAdapter.address,
     );
 
-    oracleWhiteList = await protocolHelper.deployOracleWhiteListAsync(
+    oracleWhiteList = await coreHelper.deployOracleWhiteListAsync(
       [wrappedETH.address, wrappedBTC.address],
       [ethOracleProxy.address, btcOracleProxy.address],
     );
 
-    liquidator = await protocolHelper.deployLinearLiquidatorAsync(
+    liquidator = await liquidatorHelper.deployLinearAuctionLiquidatorAsync(
       core.address,
-      oracleWhiteList.address
+      oracleWhiteList.address,
+      ONE_HOUR_IN_SECONDS.mul(4),
+      new BigNumber(3),
+      new BigNumber(21),
+      'LinearAuctionLiquidator'
     );
-    liquidatorWhiteList = await protocolHelper.deployWhiteListAsync([liquidator.address, newLiquidator]);
+    liquidatorWhiteList = await coreHelper.deployWhiteListAsync([liquidator.address, newLiquidator]);
 
-    feeCalculator = await protocolHelper.deployFixedFeeCalculatorAsync();
-    feeCalculatorWhiteList = await protocolHelper.deployWhiteListAsync([feeCalculator.address]);
+    feeCalculator = await feeCalculatorHelper.deployFixedFeeCalculatorAsync();
+    feeCalculatorWhiteList = await coreHelper.deployWhiteListAsync([feeCalculator.address]);
 
-    rebalancingFactory = await protocolHelper.deployRebalancingSetTokenV2FactoryAsync(
+    rebalancingFactory = await coreHelper.deployRebalancingSetTokenV2FactoryAsync(
       core.address,
       rebalancingComponentWhiteList.address,
       liquidatorWhiteList.address,

test/contracts/managers/triggers/movingAverageCrossoverTrigger.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 
 import {
@@ -33,7 +33,7 @@ import {
 import { getWeb3 } from '@utils/web3Helper';
 
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();

test/contracts/managers/triggers/rsiTrendingTrigger.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 
 import {
@@ -35,7 +35,7 @@ import { expectRevertError } from '@utils/tokenAssertions';
 import { getWeb3 } from '@utils/web3Helper';
 
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();

test/integrations/assetPairManager.spec.ts

@@ -10,7 +10,7 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { ether } from '@utils/units';
 import {
   Core,
@@ -57,7 +57,7 @@ import { getWeb3 } from '@utils/web3Helper';
 
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 
 BigNumberSetup.configure();

test/scenarios/btc-eth/btcEthMultipleRebalance.spec.ts

@@ -12,7 +12,7 @@ import {
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { getWeb3 } from '@utils/web3Helper';
 
 import { getScenarioData } from './scenarioData';

test/scenarios/btc-eth/btcEthMultipleRebalanceHelper.ts

@@ -45,7 +45,7 @@ import {
 
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
 
 BigNumberSetup.configure();

test/scenarios/btc-eth/btcEthRebalancing.spec.ts

@@ -33,12 +33,12 @@ import {
   DEFAULT_GAS,
   UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
 } from '@utils/constants';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { getWeb3 } from '@utils/web3Helper';
 
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
 
 BigNumberSetup.configure();

test/scenarios/maco-strategy/macoManagerMultipleRebalance.spec.ts

@@ -12,7 +12,7 @@ import {
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import { Blockchain } from '@utils/blockchain';
+import { Blockchain } from 'set-protocol-contracts';
 import { getWeb3 } from '@utils/web3Helper';
 
 import { getScenarioData } from './scenarioData';

test/scenarios/maco-strategy/macoStrategyMultipleRebalanceHelper.ts

@@ -51,7 +51,7 @@ import {
 
 import { ProtocolHelper } from '@utils/helpers/protocolHelper';
 import { ERC20Helper } from '@utils/helpers/erc20Helper';
-import { OracleHelper } from '@utils/helpers/oracleHelper';
+import { OracleHelper } from 'set-protocol-oracles';
 import { ManagerHelper } from '@utils/helpers/managerHelper';
 
 BigNumberSetup.configure();