Skip to content

Use latest contracts version and update TWAP deploy for new construct… #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use latest contracts version and update TWAP deploy for new construct… #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"minify-all": "^1.2.2",
"module-alias": "^2.1.0",
"openzeppelin-solidity": "^2.2",
"set-protocol-contracts": "^1.4.9-beta",
"set-protocol-contracts": "^1.4.11-beta",
"set-protocol-strategies": "^1.1.37",
"set-protocol-oracles": "^1.0.16",
"set-protocol-utils": "^1.1.2",
Expand Down
17 changes: 10 additions & 7 deletions test/contracts/viewer/lib/rebalancingSetTokenViewer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,19 +486,22 @@ contract('RebalancingSetTokenViewer', accounts => {
rangeEnd,
'LinearLiquidator',
);
const assetPairHashes = [
liquidatorHelper.generateAssetPairHashes(wrappedETH.address, wrappedBTC.address),
];

const twapRangeStart = ether(.01);
const twapRangeEnd = ether(.23);
const assetPairBounds = [
{min: ether(10 ** 4).toString(), max: ether(10 ** 6).toString()},
{
assetOne: wrappedETH.address,
assetTwo: wrappedBTC.address,
bounds: {lower: ether(10 ** 4).toString(), upper: ether(10 ** 6).toString()},
},
];
twapLiquidator = await viewerHelper.deployTWAPLiquidatorAsync(
coreMock.address,
oracleWhiteList.address,
auctionPeriod,
rangeStart,
rangeEnd,
assetPairHashes,
twapRangeStart,
twapRangeEnd,
assetPairBounds,
'TWAPLiquidator',
);
Expand Down
18 changes: 11 additions & 7 deletions test/contracts/viewer/lib/tradingPoolViewer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ contract('TradingPoolViewer', accounts => {
let auctionPeriod: BigNumber;
let rangeStart: BigNumber;
let rangeEnd: BigNumber;
let twapRangeStart: BigNumber;
let twapRangeEnd: BigNumber;
let oracleWhiteList: OracleWhiteListContract;

let component1: StandardTokenMockContract;
Expand Down Expand Up @@ -220,19 +222,21 @@ contract('TradingPoolViewer', accounts => {
);
await coreHelper.addAddressToWhiteList(liquidator.address, liquidatorWhitelist);

const assetPairHashes = [
liquidatorHelper.generateAssetPairHashes(component1.address, component2.address),
];
twapRangeStart = ether(.01);
twapRangeEnd = ether(.23);
const assetPairBounds = [
{min: ether(10 ** 4).toString(), max: ether(10 ** 6).toString()},
{
assetOne: component1.address,
assetTwo: component2.address,
bounds: {lower: ether(10 ** 4).toString(), upper: ether(10 ** 6).toString()},
},
];
twapLiquidator = await viewerHelper.deployTWAPLiquidatorAsync(
coreMock.address,
oracleWhiteList.address,
auctionPeriod,
rangeStart,
rangeEnd,
assetPairHashes,
twapRangeStart,
twapRangeEnd,
assetPairBounds,
name,
);
Expand Down
18 changes: 11 additions & 7 deletions test/contracts/viewer/protocolViewer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,8 @@ contract('ProtocolViewer', accounts => {
let auctionPeriod: BigNumber;
let rangeStart: BigNumber;
let rangeEnd: BigNumber;
let twapRangeStart: BigNumber;
let twapRangeEnd: BigNumber;
let oracleWhiteList: OracleWhiteListContract;

let component1: StandardTokenMockContract;
Expand Down Expand Up @@ -533,19 +535,21 @@ contract('ProtocolViewer', accounts => {
);
await coreHelper.addAddressToWhiteList(liquidator.address, liquidatorWhitelist);

const assetPairHashes = [
liquidatorHelper.generateAssetPairHashes(component1.address, component2.address),
];
twapRangeStart = ether(.01);
twapRangeEnd = ether(.23);
const assetPairBounds = [
{min: ether(10 ** 4).toString(), max: ether(10 ** 6).toString()},
{
assetOne: component1.address,
assetTwo: component2.address,
bounds: {lower: ether(10 ** 4).toString(), upper: ether(10 ** 6).toString()},
},
];
twapLiquidator = await viewerHelper.deployTWAPLiquidatorAsync(
coreMock.address,
oracleWhiteList.address,
auctionPeriod,
rangeStart,
rangeEnd,
assetPairHashes,
twapRangeStart,
twapRangeEnd,
assetPairBounds,
name,
);
Expand Down
10 changes: 2 additions & 8 deletions utils/helpers/protocolViewerHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,24 +228,18 @@ export class ProtocolViewerHelper {
auctionPeriod: BigNumber,
rangeStart: BigNumber,
rangeEnd: BigNumber,
assetPairHashes: string[],
assetPairBounds: {}[],
assetPairVolumeBounds: {}[],
name: string,
from: Address = this._contractOwnerAddress
): Promise<TWAPLiquidatorContract> {
const assetPairBoundsStr = [];
for (let i = 0; i < assetPairBounds.length; i++) {
assetPairBoundsStr.push(assetPairBounds[i]);
}
const truffleLiquidator = this.setDefaultTruffleContract(web3, TWAPLiquidator);
const twapLiquidator = await truffleLiquidator.new(
core,
oracleWhiteList,
auctionPeriod,
rangeStart,
rangeEnd,
assetPairHashes,
assetPairBoundsStr,
assetPairVolumeBounds,
name,
txnFrom(from)
);
Expand Down
44 changes: 35 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6406,10 +6406,36 @@ set-protocol-contract-utils@^1.0.3:
web3-utils "1.0.0-beta.36"
zos-lib "^2.4.2"

set-protocol-contracts@^1.4.5-beta:
version "1.4.5-beta"
resolved "https://registry.yarnpkg.com/set-protocol-contracts/-/set-protocol-contracts-1.4.5-beta.tgz#6d03e5ad12eaace1f9852a3d3f03cf1b0c5419af"
integrity sha512-if2qgYMnqRwcld/cF+lYnkhZ+52FgLo9Iqgt8v8P+2zanUi/5mj3cVml4EwoenCRuNzZcDlLSGGZ6j3yms0fmQ==
set-protocol-contract-utils@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/set-protocol-contract-utils/-/set-protocol-contract-utils-1.0.4.tgz#ed70ce3b4fa187d6cde83f618100772ee7a854bd"
integrity sha512-+nqc/+OEbMFgq4f1l11Vvfq2ax9GT81xoyyr6owwAsf0p4uRGHEdrFKujlIBEDoEUCnkLzF3yvsU1j7VTTEnLA==
dependencies:
bn-chai "^1.0.1"
canonical-weth "^1.3.1"
dotenv "^6.2.0"
eth-gas-reporter "^0.1.10"
ethlint "^1.2.3"
expect "^24.1.0"
fs-extra "^5.0.0"
husky "^0.14.3"
lint-staged "^7.2.0"
module-alias "^2.1.0"
openzeppelin-solidity "^2.2"
set-protocol-utils "^1.0.0-beta.45"
tiny-promisify "^1.0.0"
truffle-flattener "^1.4.2"
ts-mocha "^6.0.0"
ts-node "^8.0.2"
tslint-eslint-rules "^5.3.1"
web3 "1.0.0-beta.36"
web3-utils "1.0.0-beta.36"
zos-lib "^2.4.2"

set-protocol-contracts@^1.4.11-beta:
version "1.4.11-beta"
resolved "https://registry.yarnpkg.com/set-protocol-contracts/-/set-protocol-contracts-1.4.11-beta.tgz#d7620308ba6b2d44b5bb4d7fa959445085f8db6e"
integrity sha512-irCc6hf37b24BlLNPCTCzkH1nwjGipITdw7w7QAr85lg45FJVYwd1LGsZ7hibd5JiPHz432fhPzhCZlQXuWm2w==
dependencies:
bn-chai "^1.0.1"
canonical-weth "^1.3.1"
Expand All @@ -6423,7 +6449,7 @@ set-protocol-contracts@^1.4.5-beta:
minify-all "^1.2.2"
module-alias "^2.1.0"
openzeppelin-solidity "^2.2"
set-protocol-contract-utils "^1.0.3"
set-protocol-contract-utils "^1.0.4"
set-protocol-oracles "^1.0.16"
set-protocol-utils "^1.1.2"
tiny-promisify "^1.0.0"
Expand All @@ -6435,10 +6461,10 @@ set-protocol-contracts@^1.4.5-beta:
web3-utils "1.0.0-beta.36"
zos-lib "^2.4.2"

set-protocol-contracts@^1.4.9-beta:
version "1.4.9-beta"
resolved "https://registry.yarnpkg.com/set-protocol-contracts/-/set-protocol-contracts-1.4.9-beta.tgz#7907185d61451552916efa606b4a25e1d8df9ca6"
integrity sha512-D186K1DhlhRmIDRyHMmok/NtKZZqA2CSkkjTKYA0JDzuwgiASR5s4+LwRyRSZ7qJS+wnSRVMSUxOSo//c6kPNw==
set-protocol-contracts@^1.4.5-beta:
version "1.4.5-beta"
resolved "https://registry.yarnpkg.com/set-protocol-contracts/-/set-protocol-contracts-1.4.5-beta.tgz#6d03e5ad12eaace1f9852a3d3f03cf1b0c5419af"
integrity sha512-if2qgYMnqRwcld/cF+lYnkhZ+52FgLo9Iqgt8v8P+2zanUi/5mj3cVml4EwoenCRuNzZcDlLSGGZ6j3yms0fmQ==
dependencies:
bn-chai "^1.0.1"
canonical-weth "^1.3.1"
Expand Down