Skip to content
This repository was archived by the owner on Mar 19, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
e4deeb6
solidity 0.4.23
Apr 20, 2018
2a1228e
turn on experimental "v0.5.0"
Apr 20, 2018
63fb034
use ABIEncoderV2 and v0.5.0 experimental features
Apr 20, 2018
df07a34
Refactor submitRing (#314)
dong77 Apr 21, 2018
8b0a7f5
Set margin split to 50% (#315)
dong77 Apr 21, 2018
3c28eb4
V1.6 broker (#317)
dong77 Apr 21, 2018
4c27949
modify RingMined event (#319)
dong77 Apr 21, 2018
547eafc
V1.6 broker apply (#318)
dong77 Apr 21, 2018
92fd81e
minor changes
Apr 21, 2018
856debc
minor changes
Apr 21, 2018
b23bcb8
minor changes
Apr 21, 2018
8c8b9b2
minor changes
Apr 21, 2018
c64dfa5
batch update fill history (#325)
dong77 Apr 23, 2018
806e407
added boilerplate code for multihash (#320)
dong77 Apr 23, 2018
4e36009
add address field to OrderCancelled
Apr 23, 2018
1f32058
Security enhancement v1.6 (#327)
kongliangzhong Apr 23, 2018
bc91d3e
fix issue
Apr 23, 2018
5de3d59
more security fix (#329)
dong77 Apr 23, 2018
74c23ca
fix lint issue
Apr 24, 2018
1afc1bb
Update Dockerfile.test
dong77 Apr 24, 2018
e576621
Update Dockerfile.testrpc
dong77 Apr 24, 2018
65b6276
Improve the definition of RingMined event (#330)
dong77 Apr 24, 2018
2abba8b
support all-or-none order option (#333)
dong77 Apr 24, 2018
fe5ba83
fix minor issue
Apr 24, 2018
e9aebe0
not allow fillAmountS to be 0 (#336)
dong77 Apr 28, 2018
a28f30f
V1.6 interceptors (#338)
dong77 Apr 29, 2018
b3cb507
rename (#339)
dong77 Apr 29, 2018
38c9d0f
fix issues (#342)
dong77 Apr 30, 2018
05f1974
rename
Apr 30, 2018
25e1509
move ITransferableMultsig to lib/
Apr 30, 2018
44394dc
clean up IBrokerRegistry
Apr 30, 2018
1701876
support agencies in token registry
Apr 30, 2018
271d6ae
update
Apr 30, 2018
4838c98
optimize
May 1, 2018
c4c3a6e
optimize IBrokerRegistry
May 1, 2018
603281c
optimize MinerRegistry
May 1, 2018
1d0327e
minor changes
May 1, 2018
a7ff26d
optimize TokenRegistry
May 1, 2018
548a97a
add NoDefault.sol
May 1, 2018
793cf1c
minor fix
May 1, 2018
62a5883
batch cancel orders by hash
dong77 May 2, 2018
bd24e8b
disabled self-trading (#347)
dong77 May 3, 2018
2dcc6c1
formatting
May 5, 2018
f8d24d8
Multiring (#355)
dong77 Jun 1, 2018
bc7fd31
update solidity to 0.4.24 and upgrade some dependency packages
kongliangzhong Jun 6, 2018
a3e6684
fix compile error
kongliangzhong Jun 6, 2018
2a14099
update migration script
kongliangzhong Jun 7, 2018
bb71889
change function modifier from public to internal in libraries
kongliangzhong Jun 7, 2018
6960503
fix truffle migrate failure
kongliangzhong Jun 8, 2018
32e6806
fix 'stack too deep' error
kongliangzhong Jun 8, 2018
f3126c1
formatting
kongliangzhong Jun 8, 2018
2d63f99
fix test
kongliangzhong Jun 8, 2018
5323227
add testExchange.ts
kongliangzhong Jun 8, 2018
c4e7f23
update and delete unused util classes
kongliangzhong Jun 14, 2018
8d1da05
test
kongliangzhong Jun 15, 2018
97264f7
params encoding
kongliangzhong Jun 20, 2018
abd237b
rename doc to docs
Jun 20, 2018
3601fe0
delete doxs
Jun 20, 2018
4760967
encode spec impl
kongliangzhong Jun 21, 2018
a9375b8
Update README.md
dong77 Jun 21, 2018
cfec894
parse address
kongliangzhong Jun 22, 2018
f94c814
fix a bug in EncodeSpec
kongliangzhong Jun 22, 2018
5611ab3
update
kongliangzhong Jun 26, 2018
b50e5ea
fix a bug in EncodeSpec
kongliangzhong Jun 28, 2018
028408e
fix a bug in RingSpecs.sol
kongliangzhong Jun 28, 2018
6cbbb5f
update
kongliangzhong Jun 28, 2018
6830bb6
bug fix in orderHelper
kongliangzhong Jul 2, 2018
4289adb
update
kongliangzhong Jul 10, 2018
7018501
Merge pull request #356 from Loopring/version2-scratch
kongliangzhong Jul 10, 2018
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
17 changes: 9 additions & 8 deletions .soliumrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"extends": "solium:recommended",
"rules": {
"imports-on-top": 0,
"variable-declarations": 0,
"indentation": ["error", 4],
"quotes": ["error", "double"]
}
}
"extends": "solium:recommended",
"rules":
{
"imports-on-top": 0,
"variable-declarations": 0,
"indentation": ["error", 4],
"quotes": ["error", "double"]
}
}
6 changes: 3 additions & 3 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM mhart/alpine-node:9.7
FROM mhart/alpine-node:9.11.1

RUN apk add --no-cache git curl make gcc g++ python linux-headers

RUN npm install -g truffle@4.0.1 typescript@2.4.2
RUN npm install -g truffle@4.1.7 typescript@2.7.1

ADD package.json package.json

Expand All @@ -16,4 +16,4 @@ ADD . .

RUN npm run compile

CMD npm run testdocker
CMD npm run testdocker
6 changes: 3 additions & 3 deletions Dockerfile.testrpc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM mhart/alpine-node:9.7
FROM mhart/alpine-node:9.11.1

RUN npm install -g ganache-cli@6.0.3
RUN npm install -g ganache-cli@6.1.0

ADD ganache.sh ganache.sh

RUN chmod +x ganache.sh

EXPOSE 8545

CMD sh ganache.sh
CMD sh ganache.sh
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,15 @@ npm install --global --production windows-build-tools
```

Then run the following commands from project's root directory:

```
npm install
npm run compile
```

## Deployment on Ethereum Mainnet:
- LRC - https://github.com/Loopring/token-listing/blob/master/ethereum/deployment.md#protocol-token---lrc
- Protocol deployments: https://github.com/Loopring/token-listing/blob/master/ethereum/deployment.md#protocol

## Run Unit Tests
* run `npm run testrpc` from project's root directory in terminal.
* run `npm run test` from project's root directory in another terminal window.
## Run Unit Tests
* run `npm run testrpc` from project's root directory in terminal.
* run `npm run test` from project's root directory in another terminal window.
* run single test: `npm run test -- transpiled/test/xxx.js`

## Run Unit Tests inside Docker
Expand All @@ -40,3 +36,6 @@ docker-compose logs -f test
```

The logs command is optional but will give you an easy to read output of the tests without the output from testrpc mixed in (though the combination of both is good for debugging and is why they're not being silenced.)

## More
For more information, please check out https://loopring.github.io/protocol.
Empty file added assets/css/style.scss
Empty file.
136 changes: 0 additions & 136 deletions contracts/LoopringProtocol.sol

This file was deleted.

Loading