crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge v2-prototype

Browse Source
This commit is contained in:
Fabio Berger
2018-07-25 11:59:29 +02:00
parent 47c0195b07 fac90c446c
commit e5aa03da64
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol vendored
View File

@@ -46,7 +46,7 @@ contract MixinExchangeCore is
mapping (bytes32 => bool) public cancelled;
// Mapping of makerAddress => senderAddress => lowest salt an order can have in order to be fillable
// Orders with specified senderAddress and with a salt less than their epoch to are considered cancelled
// Orders with specified senderAddress and with a salt less than their epoch are considered cancelled
mapping (address => mapping (address => uint256)) public orderEpoch;
/// @dev Cancels all orders created by makerAddress with a salt less than or equal to the targetOrderEpoch

2
packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol vendored
View File

@@ -56,7 +56,7 @@ contract MExchangeCore is
event CancelUpTo(
address indexed makerAddress, // Orders cancelled must have been created by this address.
address indexed senderAddress, // Orders cancelled must have a `senderAddress` equal to this address.
uint256 orderEpoch // Orders specified makerAddress and senderAddress with a salt <= this value are considered cancelled.
uint256 orderEpoch // Orders with specified makerAddress and senderAddress with a salt less than this value are considered cancelled.
);
/// @dev Updates state with results of a fill order.

11
packages/types/CHANGELOG.json
View File

@@ -1,18 +1,9 @@
[
{
"version": "1.0.1-rc.2",
"changes": [
{
"note": "Remove `ECSignatureBuffer`"
}
]
},
{
"timestamp": 1532030860,
"version": "1.0.1-rc.1",
"changes": [
{
"note": "Dependencies updated"
"note": "Remove `ECSignatureBuffer`"
}
]
},

7
packages/website/ts/components/top_bar/top_bar.tsx
View File

@@ -59,6 +59,7 @@ const styles: Styles = {
position: 'relative',
top: 0,
paddingBottom: 1,
zIndex: 1,
},
bottomBar: {
boxShadow: 'rgba(0, 0, 0, 0.187647) 0px 1px 3px',
@@ -481,6 +482,9 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
private _isViewingPortal(): boolean {
return _.includes(this.props.location.pathname, WebsitePaths.Portal);
}
private _isViewingDocs(): boolean {
return _.includes(this.props.location.pathname, WebsitePaths.Docs);
}
private _isViewingFAQ(): boolean {
return _.includes(this.props.location.pathname, WebsitePaths.FAQ);
}
@@ -523,8 +527,9 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
private _shouldDisplayBottomBar(): boolean {
return (
this._isViewingWiki() ||
this._isViewing0xjsDocs() ||
this._isViewingFAQ() ||
this._isViewingDocs() ||
this._isViewing0xjsDocs() ||
this._isViewingSmartContractsDocs() ||
this._isViewingWeb3WrapperDocs() ||
this._isViewingSolCompilerDocs() ||