Skip to content
This repository was archived by the owner on Jan 18, 2023. It is now read-only.

Add asset pair manager type and bump package #376

Merged
merged 2 commits into from
May 15, 2020
Merged

Add asset pair manager type and bump package #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b32ada
Add manager type and bump package
richardliang May 15, 2020
c11809c
Add manager type 6
richardliang May 15, 2020
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
@@ -1,6 +1,6 @@
{
"name": "setprotocol.js",
"version": "1.2.8-rc8",
"version": "1.2.8-rc9",
"description": "A javascript library for interacting with the Set protocol",
"keywords": [
"setProtocol.js",
Expand Down
6 changes: 3 additions & 3 deletions src/api/RebalancingManagerAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export class RebalancingManagerAPI {
macoManager: Address,
txOpts: Tx
): Promise<string> {
if (managerType == ManagerType.PAIR) {
if (managerType == ManagerType.PAIR || managerType == ManagerType.PAIRV2) {
await this.assertAssetPairInitialPropose(macoManager);
} else {
await this.assertInitialPropose(managerType, macoManager);
Expand All @@ -182,7 +182,7 @@ export class RebalancingManagerAPI {
macoManager: Address,
txOpts: Tx
): Promise<string> {
if (managerType == ManagerType.PAIR) {
if (managerType == ManagerType.PAIR || managerType == ManagerType.PAIRV2) {
await this.assertAssetPairConfirmPropose(macoManager);
} else {
await this.assertConfirmPropose(managerType, macoManager);
Expand Down Expand Up @@ -347,7 +347,7 @@ export class RebalancingManagerAPI {
): Promise<BigNumber> {
this.assert.schema.isValidAddress('manager', manager);

if (managerType == ManagerType.PAIR) {
if (managerType == ManagerType.PAIR || managerType == ManagerType.PAIRV2) {
return await this.assetPairManager.recentInitialProposeTimestamp(manager);
}

Expand Down
2 changes: 2 additions & 0 deletions src/types/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ export const ManagerType = {
MACO: new BigNumber(3),
MACOV2: new BigNumber(4),
PAIR: new BigNumber(5),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fill in 6 for posterity?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

TRADING_POOL: new BigNumber(6),
PAIRV2: new BigNumber(7),
};

export interface SetUnits {
Expand Down