0.1.11

Version 0.1.11

.gitignore

@@ -32,6 +32,7 @@ npm-debug.log
 .node-xmlhttprequest*
 testem.log
 /typings
+/testFalse
 
 # e2e
 /e2e/*.js
@@ -60,4 +61,11 @@ signer.pass
 .datadir
 
 # Scripts
-/scripts/contributors.json
+/data/contributors.json
+
+# Mocks
+/mocks/deploy-config.json
+/mocks/populate-poa-environment.json
+
+# Coveralls
+.coveralls.yml

.solcover.js

@@ -1,7 +1,6 @@
 module.exports = {
     copyPackages: [
-      'e11-contracts',
-      'zeppelin-solidity',
+      'openzeppelin-solidity',
     ],
     norpc: true,
     skipFiles: [

.travis.yml

@@ -14,20 +14,20 @@ node_js:
 cache:
   directories:
     - node_modules
-env:
-  -
-  - SOLIDITY_COVERAGE=true
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: SOLIDITY_COVERAGE=true
 install:
   - npm install -g truffle
-  - npm install -g ethereumjs-testrpc
+  - npm install -g ganache-cli
   - npm install
+env:
+  global:
+    - SOLIDITY_COVERAGE=true
+    - UPLOAD_COVERALLS=false
 before_script:
   - truffle version
 script:
-  - npm test
-after_script:
-  - npm run coverage && cat coverage/lcov.info | coveralls
+  - npm run test
+notifications:
+    slack: e11io:jpVWDSReCf2l6mZlVI5RY68s
+    on_success: change
+    on_failure: always
+    on_pull_requests: false

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+0.1.11 / 2018-08-8
+==================
+
+  * Village Logs
+  * Battle System
+  * Revenge System
+  * Points System
+  * Game balancing
+  * Upgraded contracts to pragma 0.4.24
+  * Scripts generate-buildings, update-buildings, and populate-poa
+
 0.1.10 / 2018-04-27
 ==================
 
@@ -19,7 +30,7 @@
   * Small improvements on cards design
   * Improvements on the internal ngrx core
   * Changes on how we display and manage the requirements
-  * Upgraded contracts to solidity 0.4.23
+  * Upgraded contracts to pragma 0.4.23
   * Small improvements on the UI
 
 0.1.7 / 2018-03-20

README.md

@@ -4,8 +4,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/e11-io/crypto-wars-solidity/badge.svg?branch=master)](https://coveralls.io/github/e11-io/crypto-wars-solidity?branch=master)
 [![Join the chat at https://gitter.im/e11-io/crypto-wars-solidity](https://badges.gitter.im/e11-io/crypto-wars-solidity.svg)](https://gitter.im/e11-io/crypto-wars-solidity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-This repository holds all the smart contracts that are going to be used on the game [Crypto Wars](https://cryptowars.e11.io).
-Please check the [documentation](https://e11-io.github.io/crypto-wars-solidity/) for more details.
+This repository holds all the smart contracts that are going to be used on the game [Crypto Wars](https://alpha.cryptowars.jp).
 
 ## Requirements
 
@@ -18,10 +17,10 @@ Please check the [documentation](https://e11-io.github.io/crypto-wars-solidity/)
 1. Install truffle and an ethereum client. For local development, try EthereumJS TestRPC.
     ```shell
     npm install -g truffle
-    npm install -g ethereumjs-testrpc # or ganache-cli
+    npm install -g ganache-cli
     truffle version
-    # Truffle v4.1.7 (core: 4.1.7)
-    # Solidity v0.4.23 (solc-js)
+    # Truffle v4.1.11 (core: 4.1.11)
+    # Solidity v0.4.24 (solc-js)
     ```
 
 2. Install dependencies.
@@ -39,76 +38,54 @@ Please check the [documentation](https://e11-io.github.io/crypto-wars-solidity/)
     npm run test
     ```
 
-5. Compile the docs.
-    ```shell
-    npm run doxity init
-    npm run docs
-    ```
-
-6. Run test coverage.
+5. Run test coverage.
     ```shell
     npm run coverage
     ```
 
-7. Run local testrpc.
+6. Run local testrpc.
     ```shell
     npm run rpc
     ```
 
-8. Migrate the contracts.
+7. Migrate the contracts.
     ```shell
     truffle migrate
     ```
 
-9a. Run the web app locally.
-  ```shell
-  npm run start # to use your local RPC network
-  # Open http://localhost:4200 on your favorite web3 browser
-  # Remember to switch your network on Metamask to localhost 8545
-  ```
+8. a. Run the web app locally.
+    ```shell
+    npm run start # to use your local RPC network
+    # Open http://localhost:4200 on your favorite web3 browser
+    # Remember to switch your network on Metamask to localhost 8545
+    ```
 
-9b. To run the web app with the PoA e11 (311) network.
+8. b. To run the web app with the PoA e11 (311) network.
 
-  - Console 1:
-  ```shell
-  ./script/full-node.sh # this will create a local full node of the e11 Proof of Authority chain (311)
-  ```
+    - Console 1:
+    ```shell
+    ./scripts/full-node.sh # this will create a local full node of the e11 Proof of Authority chain (311)
+    ```
 
-  - Console 2:
-  ```shell
-  npm run start:poa # this will start the angular server with the PoA environment.
-  # Remember to switch your network on Metamask to http://localhost:8311
-  ```
+    - Console 2:
+    ```shell
+    npm run start:poa # this will start the angular server with the PoA environment.
+    # Remember to switch your network on Metamask to http://localhost:8311
+    ```
 
   Lastly open http://localhost:4200 and on Metamask connect to http://localhost:8311
 
 
 ## How to migrate new contracts into e11 (311) PoA network
 
-  - `./scripts/full-node.sh` # Console 1
-
-  - `geth attach http://localhost:8311` # Console 2
-    - `personal.importRawKey("secret","password")`
-    - `personal.unlockAccount("0xAddress", "password", 0)`
-
-  - `truffle migrate --network=e11` # Console 3
-
-  - Update contract addresses on `scripts/contracts.json`
-
-  - Copy `build/contracts` folder and paste it on `src/assets/contracts`
+  - `truffle migrate --network=e11`
 
 ## How to send e11 and ether to contributors
 
-  - Duplicate the file `src/script/contributors.sample.json` and name it `contributors.json`
+  - Duplicate the file `src/scripts/contributors.sample.json` and name it `contributors.json`
     - Add all the accounts you want to send to
     - Set the amount of ether and e11 you want to send
 
-  - `./scripts/full-node.sh` # Console 1
-
-  - `geth attach http://localhost:8311` # Console 2
-    - `personal.importRawKey("secret","password")`
-    - `personal.unlockAccount("0xAddress", "password", 0)`
-
-  - `truffle exec ./scripts/send-testnet-tokens.js --network=e11` # Console 3
+  - `truffle exec ./scripts/send-testnet-tokens.js --network=e11`
 
 **NOTE**: This project is still a WIP, we encourage you to create a Pull Request and to participate in the ongoing discussions [here](https://github.com/e11-io/crypto-wars-solidity/issues).