Skip to content

Commit

Permalink
Merge pull request #97 from cryptape/rc/v0.20
Browse files Browse the repository at this point in the history
Rc/v0.20
  • Loading branch information
Keith-CY authored Jan 21, 2019
2 parents 700166e + 0fd959a commit f28feeb
Show file tree
Hide file tree
Showing 207 changed files with 757 additions and 559 deletions.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: Keith-CY

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ node_modules
*.secret.*
debug.*
sign.*
.env


packages/appchain-base/*.html
packages/appchain-base/examples/config.js
packages/cita-sdk/*.html
packages/cita-sdk/examples/config.js
debug
citaSignTransaction.ts
*.brk
Expand Down
14 changes: 7 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "packages/appchain-base/cita-sys-abi"]
path = packages/appchain-base/cita-sys-abi
[submodule "packages/cita-sdk/cita-sys-abi"]
path = packages/cita-sdk/cita-sys-abi
url = https://github.com/cryptape/cita-sys-abi
[submodule "packages/appchain-signer/cita-proto"]
path = packages/appchain-signer/cita-proto
[submodule "packages/cita-signer/cita-proto"]
path = packages/cita-signer/cita-proto
url = https://github.com/cryptape/cita-proto
[submodule "packages/appchain-signer/appchain-tests"]
path = packages/appchain-signer/appchain-tests
url = https://github.com/cryptape/appchain-tests/
[submodule "packages/cita-signer/cita-sdk-tests"]
path = packages/cita-signer/cita-sdk-tests
url = https://github.com/cryptape/cita-sdk-tests
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ node_js:
cache:
directories:
- /*/**/node_modules
before_install:
- git submodule update --init --remote --recursive
install:
# - yarn bootstrap
- travis_retry make ci-install
Expand Down
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# (2019-01-16)


### Bug Fixes

* fix bug of pass private key without 0x to nervos.appchain.accounts.privateKeyToAccount ([2d5d545](https://github.com/cryptape/cita-sdk-js/commit/2d5d545))
* fix chain manage contract address ([12b4558](https://github.com/cryptape/cita-sdk-js/commit/12b4558))
* fix hex to bytes ([2c0fb1b](https://github.com/cryptape/cita-sdk-js/commit/2c0fb1b))
* fix neuron web address error text ([c1cb96d](https://github.com/cryptape/cita-sdk-js/commit/c1cb96d))
* fix quota in test ([e328ef8](https://github.com/cryptape/cita-sdk-js/commit/e328ef8))
* fix setProvider ([f093aa9](https://github.com/cryptape/cita-sdk-js/commit/f093aa9))
* fix sign flow ([9405148](https://github.com/cryptape/cita-sdk-js/commit/9405148))
* fix test for 0.17 fix ([097b823](https://github.com/cryptape/cita-sdk-js/commit/097b823))
* fix travis cache ([75b3068](https://github.com/cryptape/cita-sdk-js/commit/75b3068))
* fix typo ([7f47358](https://github.com/cryptape/cita-sdk-js/commit/7f47358))
* fix typo in listeners ([cfbc2f2](https://github.com/cryptape/cita-sdk-js/commit/cfbc2f2))
* remove console ([875ac8a](https://github.com/cryptape/cita-sdk-js/commit/875ac8a))
* remove package lock ([9fb5a5e](https://github.com/cryptape/cita-sdk-js/commit/9fb5a5e))
* update test cases ([0e28e78](https://github.com/cryptape/cita-sdk-js/commit/0e28e78))


### Features

* add log on debugger ready ([a82ec1d](https://github.com/cryptape/cita-sdk-js/commit/a82ec1d))
* update web3 deps ([b4f6460](https://github.com/cryptape/cita-sdk-js/commit/b4f6460))


### Performance Improvements

* update neuron-web start time ([8b42137](https://github.com/cryptape/cita-sdk-js/commit/8b42137))



4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Travis](https://travis-ci.org/cryptape/appchain.js.svg?branch=develop)](https://travis-ci.org/cryptape/appchain.js)
[![Travis](https://travis-ci.org/cryptape/cita-sdk-js.svg?branch=develop)](https://travis-ci.org/cryptape/cita-sdk-js)
![](https://camo.githubusercontent.com/ecafd86d8356a1adc60fb4fd393bcc7584187f99/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6d61696e7461696e6564253230776974682d6c65726e612d6363303066662e737667)
[![AppChain](https://img.shields.io/badge/made%20for-Nervos%20AppChain-blue.svg)](https://appchain.nervos.org)

Expand All @@ -7,7 +7,7 @@
The `appchain.js` library is a collection of packages which contains specific functionality for the [Nervos AppChain](http://appchain.nervos.org/) ecosystem.

- The `appchain-base` is for interacting with `AppChain` and has been published at [@appchain/base](https://www.npmjs.com/package/@appchain/base)
- The `appchain-signer` is for signing transaction for `AppChain` and has been published at [@appchain/signer](https://www.npmjs.com/package/@appchain/signer)
- The `appchain-signer` is for signing transaction for `AppChain` and has been published at [@cryptape/cita-signer](https://www.npmjs.com/package/@cryptape/cita-signer)

# Version

Expand Down
14 changes: 13 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,21 @@
"private": false,
"scripts": {
"bootstrap": "lerna bootstrap --hoist",
"build": "lerna run build",
"test": "lerna run test",
"precommit": "yarn run test"
"cm": "git-cz",
"precommit": "yarn run test",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
},
"jest": {
"verbose": true,
"testURL": "http://localhost/"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
},
"postinstall": "rm -f node_modules/web3/index.d.ts",
"devDependencies": {
"@types/google-protobuf": "^3.2.7",
Expand All @@ -19,6 +27,10 @@
"babel-minify": "^0.4.3",
"browserify": "^16.2.2",
"chalk": "^2.4.1",
"commitizen": "^3.0.5",
"cross-env": "^5.2.0",
"cz-conventional-changelog": "2.1.0",
"dotenv": "^6.2.0",
"eslint": "^4.19.1",
"eslint-config-airbnb-base": "^12.1.0",
"eslint-config-prettier": "^3.3.0",
Expand Down
13 changes: 0 additions & 13 deletions packages/appchain-base/.travis.yml

This file was deleted.

4 changes: 0 additions & 4 deletions packages/appchain-base/examples/web3.js

This file was deleted.

3 changes: 0 additions & 3 deletions packages/appchain-base/lib/base/listener.d.ts

This file was deleted.

6 changes: 0 additions & 6 deletions packages/appchain-base/lib/browser.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/appchain-base/lib/bundle.js

This file was deleted.

5 changes: 0 additions & 5 deletions packages/appchain-base/lib/index.d.ts

This file was deleted.

13 changes: 0 additions & 13 deletions packages/appchain-base/src/base/proxy/index.ts

This file was deleted.

10 changes: 0 additions & 10 deletions packages/appchain-base/src/browser.ts

This file was deleted.

33 changes: 0 additions & 33 deletions packages/appchain-base/test/config.js

This file was deleted.

99 changes: 0 additions & 99 deletions packages/appchain-base/test/rpc.test.js

This file was deleted.

11 changes: 0 additions & 11 deletions packages/appchain-signer/.travis.yml

This file was deleted.

1 change: 0 additions & 1 deletion packages/appchain-signer/appchain-tests
Submodule appchain-tests deleted from 0ff25d
2 changes: 2 additions & 0 deletions packages/cita-sdk/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SERVER=https://node.cryptape.com
PRIVATE_KEY=0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit f28feeb

Please sign in to comment.