Skip to content
Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
piavgh committed Mar 13, 2019
2 parents 4af7050 + fc16c8e commit b10f9a4ac91f9415211ba571cd033a87bd23153a
Showing with 32 additions and 19 deletions.
  1. +28 −12 Deployment_step_by_step.md
  2. +2 −2 config/index.js
  3. +2 −5 migrations/3_transfer_tokens.js
@@ -47,17 +47,14 @@ truffle migrate --network tomochain
This command will deploy smart contract to Tomochain Mainnet (but don't use for now)

----------------
## IV. dex-server

## IV. dex-deploy
1. Clone it:
```
git clone git@github.com:tomochain/dex-server.git
```
2. Checkout `develop` branch
3. Install necessary golang packages:
```
yarn install-requirements
git clone git@github.com:tomochain/dex-deploy.git
```
4. Run docker environment

2. Run docker environment
```
yarn start-env
```
@@ -67,24 +64,43 @@ yarn reset-env
```
in case you want to reset MongoDB, Redis, RabbitMQ data

5. Update file `seed-data.sh`
3. Update file `seed-data.sh`
```
Update line 2. NETWORK="development" with your network of choice
It can be "development", "tomochainTestnet" or "tomochain"
```

4. Generate seed and import seed data into mongo
```
yarn seeds
```
----------------
## V. dex-server
1. Clone it:
```
git clone git@github.com:tomochain/dex-server.git
```
2. Checkout `develop` branch

3. Update file `seed-data.sh`
```
Update line 2. NETWORK="development" with your network of choice
It can be "development", "tomochainTestnet" or "tomochain"
```

6. Generate seed and import seed data into mongo
4. Update config.yaml
```
yarn seeds
```
7. Start the server
5. Start the server
```
yarn start
```

----------------
## V. dex-client
## VI. dex-client
1. Clone it:
```
git clone git@github.com:tomochain/dex-client.git
@@ -29,9 +29,9 @@ const getTokenContracts = (artifacts, filters) => {
module.exports = {
NETWORK_ID,
tokens: [
// 'BTC',
'BTC',
'ETH',
// 'USDT',
'USDT',
],
rewardAddresses,
// truffle config
@@ -36,13 +36,10 @@ const mineTx = (promiseOrTx, interval) => {

module.exports = function (deployer, network, accounts) {
deployer.then(async () => {
let addresses
// if (network === 'development') return
const admin = accounts[0]

if (network === 'rinkeby') {
addresses = config.accounts.rinkeby
} else {
let addresses = []
if (network === 'development') {
addresses = config.accounts.development
}
console.log(addresses)

0 comments on commit b10f9a4

Please sign in to comment.
You can’t perform that action at this time.