Skip to content
This repository has been archived by the owner on Jun 7, 2019. It is now read-only.

Create dapp deposit and withdraw transactions #196

Closed
wants to merge 105 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
2654255
Adds broadcastSignedTransaction function
toschdev May 31, 2017
4c3b9cf
Adds broadcastSignedTransaction to documentation
toschdev May 31, 2017
0e8dafd
Formatting - spaces and tabs
toschdev Jun 2, 2017
d058ea1
Merge branch 'development' into 124-broadcast-transaction
Jun 2, 2017
7d9f529
hide private methods
alepop Jun 4, 2017
252a1b1
Merge branch 'development' into 77-hide-private-methods
alepop Jun 4, 2017
ef6e17c
Merge branch 'development' into 77-hide-private-methods
alepop Jun 12, 2017
6961ea1
Merge branch 'development' into 124-broadcast-transaction
Jun 14, 2017
a83edf4
remove semicolons
alepop Jun 14, 2017
cfd8104
Merge branch 'development' into 124-broadcast-transaction
Jun 21, 2017
2af9ef0
Merge branch 'development' into 77-hide-private-methods
alepop Jun 21, 2017
7c0332e
implement bip39 mnemonic generation
alepop Jun 22, 2017
434092b
Merge branch 'development' into 124-broadcast-transaction
Jun 22, 2017
dd23ce8
add api generateAccount method
alepop Jun 22, 2017
6594836
Use crypto method to get pub/private key instead of call http request
alepop Jun 23, 2017
98cb8e6
Merge pull request #138 from alepop/implement-bip39-account-generation
Jun 26, 2017
0ceaf39
Merge branch 'development' into 124-broadcast-transaction
Jun 26, 2017
c15cfea
Merge remote-tracking branch 'upstream/development' into 77-hide-priv…
alepop Jun 26, 2017
0612529
Merge pull request #125 from LiskHQ/124-broadcast-transaction
Jun 26, 2017
ac2fb10
Merge remote-tracking branch 'upstream/development' into 77-hide-priv…
alepop Jun 26, 2017
f946fd1
Merge pull request #130 from alepop/77-hide-private-methods
Jun 27, 2017
094ecd6
Adds and refines tests, adds bitpay MIT license, adds coveralls command
toschdev Jun 27, 2017
dc5e409
Adds coveralls to gitignore
toschdev Jun 27, 2017
8cc00de
Adds coveralls to gitignore
toschdev Jun 27, 2017
d4cb4bc
Removes unneccessary test
toschdev Jun 27, 2017
cb4b5d3
Fixes linting errors
toschdev Jun 27, 2017
9875cea
Updates browser version, adds one eslint skip
toschdev Jun 27, 2017
75a656f
Merge pull request #141 from LiskHQ/140-peer-review
Jun 28, 2017
39566a6
Expose options and peers to config.json file
alepop Jun 29, 2017
802af67
Merge remote-tracking branch 'upstream/development' into 111-expose-p…
alepop Jun 29, 2017
00be86c
add yarn lockfile
willclarktech Jul 3, 2017
f5fea6d
add coverage dir to .gitignore
willclarktech Jul 3, 2017
0ac3ad0
fix trimObj name
willclarktech Jul 3, 2017
4d783d6
lint console statements
willclarktech Jul 4, 2017
c9ec0f2
remove console.log from test file
willclarktech Jul 4, 2017
bdf1ab8
update docs for getBlock
willclarktech Jul 4, 2017
1439dcc
Move fixedPoint into constants
willclarktech Jul 4, 2017
1798b73
Remove fixedPoint from docs
willclarktech Jul 4, 2017
ac45095
Remove nonsense variable assignments from docs examples
willclarktech Jul 5, 2017
39a8afc
Merge pull request #150 from LiskHQ/coverage-gitignore
willclarktech Jul 5, 2017
7463594
add test:now npm script
willclarktech Jul 3, 2017
2def5de
Merge branch 'development' into console-log
willclarktech Jul 5, 2017
7e7aed2
Merge pull request #154 from LiskHQ/console-log
willclarktech Jul 5, 2017
ea4a8c1
Merge branch 'development' into 159-fixed_point
willclarktech Jul 5, 2017
c62b414
Merge pull request #166 from LiskHQ/159-fixed_point
willclarktech Jul 5, 2017
ca912e0
Merge branch 'development' into docs-getblock
willclarktech Jul 5, 2017
7fc5e6c
Merge pull request #158 from LiskHQ/docs-getblock
willclarktech Jul 5, 2017
2e93ae3
Merge branch 'development' into rename-trimobj
willclarktech Jul 5, 2017
767ea55
Merge pull request #151 from LiskHQ/rename-trimobj
willclarktech Jul 5, 2017
b308a05
Merge branch 'development' into 167-docs_variable_assignment
willclarktech Jul 5, 2017
0a0767f
Merge pull request #168 from LiskHQ/167-docs_variable_assignment
willclarktech Jul 5, 2017
a11bde0
Move eslint config to standard location
willclarktech Jul 5, 2017
5f5ad7b
Merge pull request #173 from LiskHQ/172-eslint_config_location
willclarktech Jul 5, 2017
043a888
Remove chai dependencies
willclarktech Jul 5, 2017
d136187
Correct requirements and exports in test common
willclarktech Jul 5, 2017
bada289
Replace chai assertions with should
willclarktech Jul 5, 2017
c1e4ada
Update eslint globals to include should not expect
willclarktech Jul 5, 2017
f115785
Merge remote-tracking branch 'upstream/development' into 111-expose-p…
alepop Jul 6, 2017
51c538f
Merge branch 'development' into yarn-lockfile
Jul 6, 2017
c963418
Merge pull request #152 from LiskHQ/yarn-lockfile
Jul 6, 2017
68c3ec6
Merge branch 'development' into mocha-now
willclarktech Jul 6, 2017
b94da20
Merge pull request #153 from LiskHQ/mocha-now
willclarktech Jul 6, 2017
f87bcbe
Merge branch 'development' into 171-remove_chai
willclarktech Jul 6, 2017
30432f6
Merge pull request #175 from LiskHQ/171-remove_chai
Jul 7, 2017
4da6fba
Merge branch 'development' into 111-expose-peers-and-options-to-confi…
Jul 7, 2017
469a827
Adds jenkins
Jul 7, 2017
42e5eae
Missing comma in package.json
Jul 7, 2017
f6069ac
Remove travis file
Jul 7, 2017
0f942d2
Jenkinsfile modification
Jul 7, 2017
9d69fc4
Fix apple quotes
Jul 10, 2017
c12bc5e
Merge pull request #182 from LiskHQ/180-add-jenkins
Jul 10, 2017
71935b2
Use return instead of done in async tests
willclarktech Jul 5, 2017
668eadb
Merge branch 'development' into 111-expose-peers-and-options-to-confi…
Jul 10, 2017
0dcb27d
Merge pull request #143 from alepop/111-expose-peers-and-options-to-c…
Jul 10, 2017
f7407d2
Merge branch 'development' into 155-mocha_return_promises
Jul 10, 2017
812903f
Merge pull request #170 from LiskHQ/155-mocha_return_promises
Jul 10, 2017
3122bd5
Update eslint new-cap rule for should functions
willclarktech Jul 5, 2017
e882573
Make sure all assertions are called
willclarktech Jul 5, 2017
648f941
Fix broken delegate recipientId test
willclarktech Jul 5, 2017
7b660b7
Merge pull request #179 from LiskHQ/174-fix_test_ok_calls
Jul 10, 2017
f58ed8b
Replace deprecated new Buffer
willclarktech Jul 10, 2017
966868f
Merge pull request #185 from LiskHQ/184-new_buffer
Jul 10, 2017
6f2065a
Allow createTransaction to be called with offset
willclarktech Jul 17, 2017
5444213
Allow createDapp to be called with offset
willclarktech Jul 17, 2017
170f13b
Allow createDelegate to be called with offset
willclarktech Jul 17, 2017
ad2cdab
Allow multisignature transaction creators to be called with offset
willclarktech Jul 17, 2017
4b8ed35
Allow createSignature to be called with offset
willclarktech Jul 17, 2017
540789d
Allow createTransfer to be called with offset
willclarktech Jul 17, 2017
5108dcf
Allow createVote to be called with offset
willclarktech Jul 17, 2017
a177d3b
Retry sendRequest for future timestamp failures
willclarktech Jul 17, 2017
439a239
Use offsets in sendRequest retries
willclarktech Jul 17, 2017
681058f
Add sinon to global eslintrc
willclarktech Jul 17, 2017
2384e1c
Tidy up after review
willclarktech Jul 18, 2017
cc0dcc1
Merge pull request #195 from LiskHQ/191-retry_timestamp_future
willclarktech Jul 18, 2017
136b348
Add yuidoc annotations for timeOffset
willclarktech Jul 18, 2017
225df4d
Merge pull request #198 from LiskHQ/197-yuidoc_time_offset
willclarktech Jul 18, 2017
d8b0714
Add husky dependency
willclarktech Jul 10, 2017
f20003d
Add prepush validation script
willclarktech Jul 10, 2017
85eb0b0
Merge pull request #188 from LiskHQ/187-git_hook_validation
willclarktech Jul 18, 2017
5fbc2f6
Update dapp in transfer creator for schema
willclarktech Jul 18, 2017
d87fb61
Rename dapp createInTransfer function
willclarktech Jul 18, 2017
a2e9af8
Rearrange createInTransfer argument order
willclarktech Jul 18, 2017
b1896ca
Set amount in createInTransfer
willclarktech Jul 18, 2017
a43d4f8
Add createOutTransfer function
willclarktech Jul 18, 2017
237620f
Update yuidoc annotations
willclarktech Jul 18, 2017
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
8 changes: 5 additions & 3 deletions eslint_ecma5.json → .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
"no-eq-null": "error",
"indent": ["error", "tab"],
"no-use-before-define": "error",
"new-cap": ["error", { "newIsCap": true }],
"new-cap": ["error", { "newIsCap": true, "capIsNewExceptionPattern": "should[.(]" }],
"quotes": ["error", "single", { "avoidEscape": true }],
"no-undef": "error",
"no-unused-vars": ["error", { "vars": "all", "args": "after-used" }],
"strict": ["error", "global"],
"semi": ["error", "always"]
"semi": ["error", "always"],
"no-console": ["error", { "allow": ["error", "info"] }]
},
"env": {
"browser": true,
Expand All @@ -31,6 +32,7 @@
"naclInstance": true,
"Promise": true,
"Uint8Array": true,
"expect": true
"should": true,
"sinon": true
}
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ npm-debug.log
.nyc_output
yuidoc
test/.coverage-unit
coveralls
coverage/
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

9 changes: 3 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ module.exports = function (grunt) {

grunt.initConfig({
eslint: {
options: {
configFile: 'eslint_ecma5.json',
reset: true
},
target: ['lib/**', 'test/**', '!test/mocha.opts', 'Gruntfile.js', 'index.js']
},

Expand Down Expand Up @@ -56,7 +52,7 @@ module.exports = function (grunt) {
src: 'test/.coverage-unit/*.info'
}
});

grunt.registerTask('eslint-fix', 'Run eslint and fix formatting', function () {
grunt.config.set('eslint.options.fix', true);
grunt.task.run('eslint');
Expand All @@ -67,7 +63,8 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-force');
grunt.loadNpmTasks('grunt-coveralls');
grunt.registerTask('travis', ['eslint', 'exec:coverageSingle', 'coveralls']);
grunt.registerTask('jenkins', ['exec:coverageSingle', 'coveralls']);
grunt.registerTask('eslint-ci', ['eslint']);
grunt.registerTask('default', [
'force:on',
'browserify',
Expand Down
50 changes: 50 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
node('lisk-js-01'){
lock(resource: "lisk-js-01", inversePrecedence: true) {
stage ('Prepare Workspace') {
deleteDir()
checkout scm
}

stage ('Build Dependencies') {
try {
sh '''#!/bin/bash
# Install Deps
npm install --verbose
cp ~/.coveralls.yml .
'''
} catch (err) {
currentBuild.result = 'FAILURE'
error('Stopping build, installation failed')
}
}

stage ('Run Eslint') {
try {
sh '''#!/bin/bash
# Run Tests
grunt eslint-ci
'''
} catch (err) {
currentBuild.result = 'FAILURE'
error('Stopping build, tests failed')
}
}

stage ('Run tests') {
try {
sh '''#!/bin/bash
# Run Tests
npm run jenkins
'''
} catch (err) {
currentBuild.result = 'FAILURE'
error('Stopping build, tests failed')
}
}

stage ('Set milestone') {
milestone 1
currentBuild.result = 'SUCCESS'
}
}
}
26 changes: 26 additions & 0 deletions config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"peers": {
"mainnet": [
"node01.lisk.io",
"node02.lisk.io",
"node03.lisk.io",
"node04.lisk.io",
"node05.lisk.io",
"node06.lisk.io",
"node07.lisk.io",
"node08.lisk.io"
],
"testnet": [
"testnet.lisk.io"
]
},
"options": {
"testnet": false,
"ssl": false,
"randomPeer": true,
"node": null,
"port": null,
"nethash": null,
"bannedPeers": []
}
}
Loading