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

v0.14.0: Add ExpiryV2 Contract #305

Merged
merged 7 commits into from
Aug 27, 2019
Merged

v0.14.0: Add ExpiryV2 Contract #305

merged 7 commits into from
Aug 27, 2019

Conversation

BrendanChou
Copy link

No description provided.

uint256 marketId,
uint32 expiryTime
) = parseCallArgs(data);
ExpiryArg[] memory expiries = abi.decode(data, (ExpiryArg[]));
Copy link
Author

Choose a reason for hiding this comment

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

Ethlint (aka solium) fails on this line, ruining the whole file duaraghav8/Ethlint#261

Copy link
Member

Choose a reason for hiding this comment

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

"fixed in next release" - Apr 25 😢

Copy link
Member

Choose a reason for hiding this comment

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

@BrendanChou BrendanChou force-pushed the bc_conclude branch 2 times, most recently from 63f4d07 to dd3c3a1 Compare August 21, 2019 00:30
contracts/external/traders/Concluder.sol Outdated Show resolved Hide resolved
uint256 marketId,
uint32 expiryTime
) = parseCallArgs(data);
ExpiryArg[] memory expiries = abi.decode(data, (ExpiryArg[]));
Copy link
Member

Choose a reason for hiding this comment

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

"fixed in next release" - Apr 25 😢

contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
uint256 marketId,
uint32 expiryTime
) = parseCallArgs(data);
ExpiryArg[] memory expiries = abi.decode(data, (ExpiryArg[]));
Copy link
Member

Choose a reason for hiding this comment

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

contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
@BrendanChou BrendanChou force-pushed the bc_conclude branch 5 times, most recently from 85659f1 to 6eb2976 Compare August 22, 2019 22:18
@BrendanChou BrendanChou changed the title Add concluder contract Add ExpiryV2 Contract Aug 22, 2019
contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
continue;
} else {
// bound the time by the minimum approved timeDelta
timeDelta = Math.max(minApprovedTimeDelta, exp.timeDelta).to32();
Copy link
Member

Choose a reason for hiding this comment

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

Hmm... I wonder if this should do nothing instead of setting it to minApprovedTimeDelta

contracts/external/traders/Expiry.sol Outdated Show resolved Hide resolved
@BrendanChou BrendanChou force-pushed the bc_conclude branch 6 times, most recently from fef6bdd to 1d74247 Compare August 26, 2019 20:56

// ============ Approval Functions ============

function approveSender(
Copy link
Member

Choose a reason for hiding this comment

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

it's weird you also have to use the "approveSender" function to unapprove someone (by setting minTimeDelta to 0)

Copy link
Author

Choose a reason for hiding this comment

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

would it better as "setApproval"?

contracts/external/traders/ExpiryV2.sol Outdated Show resolved Hide resolved
contracts/external/traders/ExpiryV2.sol Outdated Show resolved Hide resolved
contracts/external/traders/ExpiryV2.sol Show resolved Hide resolved
src/modules/operate/AccountOperation.ts Show resolved Hide resolved
AntonioJuliano
AntonioJuliano previously approved these changes Aug 26, 2019
AntonioJuliano
AntonioJuliano previously approved these changes Aug 27, 2019
@BrendanChou BrendanChou changed the title Add ExpiryV2 Contract v0.14.0: Add ExpiryV2 Contract Aug 27, 2019
@AntonioJuliano AntonioJuliano merged commit fde1eed into master Aug 27, 2019
@AntonioJuliano AntonioJuliano deleted the bc_conclude branch August 27, 2019 22:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants