Bump contracts and strategies versions and fix import paths

package.json

@@ -1,6 +1,6 @@
 {
   "name": "set-protocol-viewers",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "main": "dist/artifacts/index.js",
   "typings": "dist/typings/artifacts/index.d.ts",
   "files": [
@@ -99,8 +99,8 @@
     "minify-all": "^1.2.2",
     "module-alias": "^2.1.0",
     "openzeppelin-solidity": "^2.2",
-    "set-protocol-contracts": "^1.3.55-beta",
-    "set-protocol-strategies": "^1.1.34",
+    "set-protocol-contracts": "^1.4.0-beta",
+    "set-protocol-strategies": "^1.1.35",
     "set-protocol-oracles": "^1.0.15",
     "set-protocol-utils": "^1.1.2",
     "tiny-promisify": "^1.0.0",

test/contracts/viewer/lib/cTokenViewer.spec.ts

@@ -7,9 +7,6 @@ import { BigNumber } from 'bignumber.js';
 
 import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
-import {
-  CoreMock,
-} from 'set-protocol-contracts';
 import {
   CTokenViewerContract,
 } from '@utils/contracts';
@@ -22,6 +19,9 @@ import {
 } from 'set-protocol-contracts';
 import { ProtocolViewerHelper } from '@utils/helpers/protocolViewerHelper';
 
+const CoreMock =
+  require('set-protocol-contracts/dist/artifacts/ts/CoreMock').CoreMock;
+
 BigNumberSetup.configure();
 ChaiSetup.configure();
 const blockchain = new Blockchain(web3);

test/contracts/viewer/lib/erc20Viewer.spec.ts

@@ -9,7 +9,6 @@ import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
 import {
   ConstantAuctionPriceCurveContract,
-  CoreMock,
   CoreMockContract,
   RebalancingSetTokenContract,
   RebalancingSetTokenFactoryContract,
@@ -39,6 +38,9 @@ import {
 } from 'set-protocol-contracts';
 import { ProtocolViewerHelper } from '@utils/helpers/protocolViewerHelper';
 
+const CoreMock =
+  require('set-protocol-contracts/dist/artifacts/ts/CoreMock').CoreMock;
+
 BigNumberSetup.configure();
 ChaiSetup.configure();
 const blockchain = new Blockchain(web3);

test/contracts/viewer/lib/rebalancingSetTokenViewer.spec.ts

@@ -10,7 +10,6 @@ import ChaiSetup from '@utils/chaiSetup';
 import { BigNumberSetup } from '@utils/bigNumberSetup';
 import {
   ConstantAuctionPriceCurveContract,
-  CoreMock,
   CoreMockContract,
   RebalancingSetTokenContract,
   RebalancingSetTokenFactoryContract,
@@ -42,6 +41,9 @@ import {
 } from 'set-protocol-contracts';
 import { ProtocolViewerHelper } from '@utils/helpers/protocolViewerHelper';
 
+const CoreMock =
+  require('set-protocol-contracts/dist/artifacts/ts/CoreMock').CoreMock;
+
 BigNumberSetup.configure();
 ChaiSetup.configure();
 const { SetProtocolUtils: SetUtils } = setProtocolUtils;

test/contracts/viewer/lib/tradingPoolViewer.spec.ts

@@ -12,7 +12,6 @@ import {
   UpdatableOracleMockContract
 } from 'set-protocol-oracles';
 import {
-  CoreMock,
   CoreMockContract,
   FixedFeeCalculatorContract,
   LinearAuctionLiquidatorContract,
@@ -58,6 +57,9 @@ import {
 } from 'set-protocol-oracles';
 import { ProtocolViewerHelper } from '@utils/helpers/protocolViewerHelper';
 
+const CoreMock =
+  require('set-protocol-contracts/dist/artifacts/ts/CoreMock').CoreMock;
+
 BigNumberSetup.configure();
 ChaiSetup.configure();
 const web3 = getWeb3();

test/contracts/viewer/protocolViewer.spec.ts

@@ -14,7 +14,6 @@ import {
 } from 'set-protocol-oracles';
 import {
   ConstantAuctionPriceCurveContract,
-  CoreMock,
   CoreMockContract,
   FixedFeeCalculatorContract,
   LinearAuctionLiquidatorContract,
@@ -66,6 +65,9 @@ import {
 } from 'set-protocol-oracles';
 import { ProtocolViewerHelper } from '@utils/helpers/protocolViewerHelper';
 
+const CoreMock =
+  require('set-protocol-contracts/dist/artifacts/ts/CoreMock').CoreMock;
+
 BigNumberSetup.configure();
 ChaiSetup.configure();
 const { SetProtocolUtils: SetUtils } = setProtocolUtils;

utils/helpers/protocolViewerHelper.ts

@@ -16,12 +16,17 @@ import {
   ONE_DAY_IN_SECONDS,
   DEFAULT_GAS,
 } from '../constants';
-import {
-  RebalancingSetTokenV3Factory,
-  RebalancingSetTokenV3FactoryContract,
-  FactoryUtilsLibrary,
-  Bytes32Library
-} from 'set-protocol-contracts';
+import { RebalancingSetTokenV3FactoryContract } from 'set-protocol-contracts';
+
+const RebalancingSetTokenV3Factory =
+  require(
+    'set-protocol-contracts/dist/artifacts/ts/RebalancingSetTokenV3Factory'
+  ).RebalancingSetTokenV3Factory;
+const FactoryUtilsLibrary =
+  require('set-protocol-contracts/dist/artifacts/ts/FactoryUtilsLibrary').FactoryUtilsLibrary;
+const Bytes32Library =
+  require('set-protocol-contracts/dist/artifacts/ts/Bytes32Library').Bytes32Library;
+
 
 const CTokenViewer = artifacts.require('CTokenViewer');
 const ERC20Viewer = artifacts.require('ERC20Viewer');
@@ -210,4 +215,4 @@ export class ProtocolViewerHelper {
 
     return truffleContract;
   }
-}
+}

yarn.lock

@@ -6380,10 +6380,10 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
-set-protocol-contracts@^1.3.55-beta:
-  version "1.3.55-beta"
-  resolved "https://registry.yarnpkg.com/set-protocol-contracts/-/set-protocol-contracts-1.3.55-beta.tgz#8bc25960b9118c32206afc60314bc02d0fa518b0"
-  integrity sha512-BpGN+B+zG61UYeEC+Iz6orz3BDpQd+LVbhWPla7ChOwMbk0kyzMkAVMNUmvrTKsgPI/o81wTbQ7FAUGtUj13zQ==
+set-protocol-contracts@^1.4.0-beta:
+  version "1.4.0-beta"
+  resolved "https://registry.yarnpkg.com/set-protocol-contracts/-/set-protocol-contracts-1.4.0-beta.tgz#b7f482dfaba596c180b4efb2a51aafee02f56082"
+  integrity sha512-zYczLu+8JA4zhvWK6LyzyVx58navvAxF9WcBEhQI2Tpt7DLdkzs2Chy/3iFjjFbn7u+Ar1NJe6yEmLSbDUgMXQ==
   dependencies:
     bn-chai "^1.0.1"
     canonical-weth "^1.3.1"
@@ -6435,10 +6435,10 @@ set-protocol-oracles@^1.0.15:
     web3 "1.0.0-beta.36"
     web3-utils "1.0.0-beta.36"
 
-set-protocol-strategies@^1.1.34:
-  version "1.1.34"
-  resolved "https://registry.yarnpkg.com/set-protocol-strategies/-/set-protocol-strategies-1.1.34.tgz#e25c0d4eeb023b1ae9d5feb7f539467a89372554"
-  integrity sha512-TkpWJMptkjW9qf/Izqnu541G031/1YpHFjLQoDzn4Jsszi4T3B1ViCWpghfmSfc1SrrY6XK90YY11vSBMcbNZw==
+set-protocol-strategies@^1.1.35:
+  version "1.1.35"
+  resolved "https://registry.yarnpkg.com/set-protocol-strategies/-/set-protocol-strategies-1.1.35.tgz#0ee43ec1e350fcfe5fd257c2bb23e410e337b6f7"
+  integrity sha512-1iixB3dLgK1YBIZfGjUtv+zr5dQTn0ED6nHjJ4ZRz6Un8bIdshjdvlQIZZDx63cV28aKmM+xclpXCSCHINsl2w==
   dependencies:
     bn-chai "^1.0.1"
     canonical-weth "^1.3.1"
@@ -6452,7 +6452,7 @@ set-protocol-strategies@^1.1.34:
     minify-all "^1.2.2"
     module-alias "^2.1.0"
     openzeppelin-solidity "^2.2"
-    set-protocol-contracts "^1.3.55-beta"
+    set-protocol-contracts "^1.4.0-beta"
     set-protocol-oracles "^1.0.15"
     set-protocol-utils "^1.1.2"
     tiny-promisify "^1.0.0"