OSDN Git Service

bytom/bytom.git
6 years agoMerge pull request #664 from Bytom/dev_modify_datadir
Paladz [Mon, 16 Apr 2018 11:41:44 +0000 (19:41 +0800)]
Merge pull request #664 from Bytom/dev_modify_datadir

modify data dir

6 years agomodify data dir
wz [Mon, 16 Apr 2018 07:35:02 +0000 (15:35 +0800)]
modify data dir

6 years agoMerge pull request #665 from Bytom/dev-gas
Paladz [Mon, 16 Apr 2018 11:21:01 +0000 (19:21 +0800)]
Merge pull request #665 from Bytom/dev-gas

add api estimate-transaction-gas

6 years agoMerge pull request #651 from Bytom/crazy-miner
Paladz [Mon, 16 Apr 2018 11:13:36 +0000 (19:13 +0800)]
Merge pull request #651 from Bytom/crazy-miner

Crazy miner

6 years agoMerge pull request #644 from Bytom/wallet_optimise
Yongfeng LI [Mon, 16 Apr 2018 09:27:00 +0000 (17:27 +0800)]
Merge pull request #644 from Bytom/wallet_optimise

fix create-asset definition is nil, issue asset transaction display wrong

6 years agooptimise
oysheng [Mon, 16 Apr 2018 09:19:35 +0000 (17:19 +0800)]
optimise

6 years agomodify api name
oysheng [Mon, 16 Apr 2018 09:10:01 +0000 (17:10 +0800)]
modify api name

6 years agoMerge branch 'dev' into dev-gas
oysheng [Mon, 16 Apr 2018 08:43:07 +0000 (16:43 +0800)]
Merge branch 'dev' into dev-gas

6 years agoadd api calculate-transaction-gas
oysheng [Mon, 16 Apr 2018 08:40:55 +0000 (16:40 +0800)]
add api calculate-transaction-gas

6 years agoMerge pull request #662 from Bytom/network_info
Yongfeng LI [Mon, 16 Apr 2018 07:46:34 +0000 (15:46 +0800)]
Merge pull request #662 from Bytom/network_info

Add NetWorkID to GetNodeInfo api

6 years agoMerge remote-tracking branch 'origin/dev' into network_info
Yahtoo Ma [Mon, 16 Apr 2018 07:39:58 +0000 (15:39 +0800)]
Merge remote-tracking branch 'origin/dev' into network_info

6 years agoMerge pull request #663 from Bytom/remove-modules
Yongfeng LI [Mon, 16 Apr 2018 07:39:22 +0000 (15:39 +0800)]
Merge pull request #663 from Bytom/remove-modules

remove .gitmodules

6 years agoremove .gitmodules
Yongfeng LI [Mon, 16 Apr 2018 07:35:39 +0000 (15:35 +0800)]
remove .gitmodules

6 years agoAdd NetWorkID to GetNodeInfo api
Yahtoo Ma [Mon, 16 Apr 2018 06:55:43 +0000 (14:55 +0800)]
Add NetWorkID to GetNodeInfo api

6 years agoMerge pull request #659 from Bytom/dev_parse_env
Yongfeng LI [Mon, 16 Apr 2018 05:20:52 +0000 (13:20 +0800)]
Merge pull request #659 from Bytom/dev_parse_env

add parse env for url

6 years agoadd parse env for url
wz [Mon, 16 Apr 2018 01:48:27 +0000 (09:48 +0800)]
add parse env for url

6 years agoMerge branch 'dev' into wallet_optimise
oysheng [Mon, 16 Apr 2018 01:47:14 +0000 (09:47 +0800)]
Merge branch 'dev' into wallet_optimise

6 years agocrazy
haoyuAThz [Sun, 15 Apr 2018 00:11:16 +0000 (08:11 +0800)]
crazy

6 years agomerge
haoyuAThz [Sat, 14 Apr 2018 23:58:43 +0000 (07:58 +0800)]
merge

6 years agofix #626
haoyuAThz [Sat, 14 Apr 2018 23:56:40 +0000 (07:56 +0800)]
fix #626

6 years agoupdate echo
HAOYUatHZ [Tue, 10 Apr 2018 23:22:59 +0000 (07:22 +0800)]
update echo

6 years agoMerge pull request #647 from Bytom/tags
Yongfeng LI [Sat, 14 Apr 2018 10:32:02 +0000 (18:32 +0800)]
Merge pull request #647 from Bytom/tags

remove tags

6 years agoupdate bytomcli and README
Yongfeng LI [Sat, 14 Apr 2018 09:59:06 +0000 (17:59 +0800)]
update bytomcli and README

6 years agoupdate dashboard
Yongfeng LI [Sat, 14 Apr 2018 09:40:08 +0000 (17:40 +0800)]
update dashboard

6 years agoremove Asset tags
Yongfeng LI [Sat, 14 Apr 2018 09:16:47 +0000 (17:16 +0800)]
remove Asset tags

6 years agoremove Account tags
Yongfeng LI [Sat, 14 Apr 2018 08:52:46 +0000 (16:52 +0800)]
remove Account tags

6 years agoMerge pull request #645 from Bytom/update-readme-examples
Yongfeng LI [Sat, 14 Apr 2018 09:40:56 +0000 (17:40 +0800)]
Merge pull request #645 from Bytom/update-readme-examples

update readme

6 years agoMerge pull request #646 from Bytom/utxo-change-address
Yongfeng LI [Sat, 14 Apr 2018 08:11:49 +0000 (16:11 +0800)]
Merge pull request #646 from Bytom/utxo-change-address

separate normal and change addresses

6 years agoupdate dashboard
Yongfeng LI [Sat, 14 Apr 2018 07:53:14 +0000 (15:53 +0800)]
update dashboard

6 years agoshow whether it is change for unspent utxos
Yongfeng LI [Sat, 14 Apr 2018 07:36:12 +0000 (15:36 +0800)]
show whether it is change for unspent utxos

6 years agomodify func instruction
oysheng [Sat, 14 Apr 2018 07:34:15 +0000 (15:34 +0800)]
modify func instruction

6 years agofix unit test
oysheng [Sat, 14 Apr 2018 07:04:39 +0000 (15:04 +0800)]
fix unit test

6 years agoRevert "remove CtrlProgram#Change and accountOutput#change (#600)"
Yongfeng LI [Sat, 14 Apr 2018 05:48:02 +0000 (13:48 +0800)]
Revert "remove CtrlProgram#Change and accountOutput#change (#600)"

This reverts commit 6baed9deec77c8267b80412efdefd411e3f98fb5.

6 years agoadd wallet test when create asset definition is nil
oysheng [Sat, 14 Apr 2018 05:47:18 +0000 (13:47 +0800)]
add wallet test when create asset definition is nil

6 years agoMerge branch 'dev' into wallet_optimise
oysheng [Sat, 14 Apr 2018 05:42:04 +0000 (13:42 +0800)]
Merge branch 'dev' into wallet_optimise

6 years agoMerge pull request #643 from Bytom/export-key
Yongfeng LI [Sat, 14 Apr 2018 05:26:53 +0000 (13:26 +0800)]
Merge pull request #643 from Bytom/export-key

fix import key and add change password

6 years agofix import key and add change password
Yongfeng LI [Sat, 14 Apr 2018 05:23:24 +0000 (13:23 +0800)]
fix import key and add change password

6 years agofix definition is nil, issue asset transaction display wrong
oysheng [Sat, 14 Apr 2018 04:28:13 +0000 (12:28 +0800)]
fix definition is nil, issue asset transaction display wrong
fix golint

6 years agoupdate readme
lbqds [Sat, 14 Apr 2018 03:16:31 +0000 (11:16 +0800)]
update readme

6 years agoMerge pull request #637 from Bytom/wallet_optimise
Paladz [Fri, 13 Apr 2018 12:38:01 +0000 (20:38 +0800)]
Merge pull request #637 from Bytom/wallet_optimise

fix no-BTM asset display

6 years agofix no-BTM asset display
oysheng [Fri, 13 Apr 2018 12:30:06 +0000 (20:30 +0800)]
fix no-BTM asset display

6 years agoMerge pull request #634 from Bytom/multi
Paladz [Fri, 13 Apr 2018 11:39:58 +0000 (19:39 +0800)]
Merge pull request #634 from Bytom/multi

update dashboard to support multi-sign transaction

6 years agoupdate dashboard to support multi-sign transaction
Yongfeng LI [Fri, 13 Apr 2018 11:37:33 +0000 (19:37 +0800)]
update dashboard to support multi-sign transaction

6 years agoMerge pull request #632 from Bytom/dev_fix_param_for_addportmapping
Paladz [Fri, 13 Apr 2018 08:49:44 +0000 (16:49 +0800)]
Merge pull request #632 from Bytom/dev_fix_param_for_addportmapping

fix param for addportmapping

6 years agofix param for addportmapping
wz [Fri, 13 Apr 2018 07:36:40 +0000 (15:36 +0800)]
fix param for addportmapping

6 years agoMerge pull request #631 from Bytom/remove-local
Paladz [Fri, 13 Apr 2018 07:35:13 +0000 (15:35 +0800)]
Merge pull request #631 from Bytom/remove-local

remove Template#Local

6 years agoremove Template#Local
Yongfeng LI [Fri, 13 Apr 2018 07:32:51 +0000 (15:32 +0800)]
remove Template#Local

6 years agoMerge pull request #629 from Bytom/unit_test
Paladz [Fri, 13 Apr 2018 06:30:34 +0000 (14:30 +0800)]
Merge pull request #629 from Bytom/unit_test

add unit test for calcReorganizeNodes

6 years agorename the variable
paladz [Fri, 13 Apr 2018 05:30:49 +0000 (13:30 +0800)]
rename the variable

6 years agoadd unit test for calcReorganizeNodes
paladz [Fri, 13 Apr 2018 05:21:50 +0000 (13:21 +0800)]
add unit test for calcReorganizeNodes

6 years agoMerge pull request #624 from Bytom/test-add-invalid-tx-to-txpool
Paladz [Fri, 13 Apr 2018 01:22:39 +0000 (09:22 +0800)]
Merge pull request #624 from Bytom/test-add-invalid-tx-to-txpool

test add invalid tx to txpool

6 years agoMerge pull request #618 from Bytom/fix_bug
Paladz [Thu, 12 Apr 2018 12:29:45 +0000 (20:29 +0800)]
Merge pull request #618 from Bytom/fix_bug

Closes #604

6 years agoCloses #604
paladz [Thu, 12 Apr 2018 12:27:44 +0000 (20:27 +0800)]
Closes #604

6 years agoChange files name in tensority package. (#614)
HAOYUatHZ [Thu, 12 Apr 2018 11:51:46 +0000 (19:51 +0800)]
Change files name in tensority package. (#614)

* change files name

* Update .gitignore

* change files name

* update echo for make

6 years agoupdate dashboard (#613)
Yongfeng LI [Thu, 12 Apr 2018 11:04:50 +0000 (19:04 +0800)]
update dashboard (#613)

6 years agotest add invalid tx to txpool
lbqds [Thu, 12 Apr 2018 10:24:01 +0000 (18:24 +0800)]
test add invalid tx to txpool

6 years agoadd omitempty for AssetDefinition (#610)
Yongfeng LI [Thu, 12 Apr 2018 09:10:29 +0000 (17:10 +0800)]
add omitempty for AssetDefinition (#610)

6 years agoBytomcli control account (#609)
WangYifu [Thu, 12 Apr 2018 09:02:59 +0000 (04:02 -0500)]
Bytomcli control account (#609)

* remove control account

* fix cli sign-submit-transaction

6 years agotemporary fix for make clean (#608)
HAOYUatHZ [Thu, 12 Apr 2018 08:51:14 +0000 (16:51 +0800)]
temporary fix for make clean (#608)

6 years agofix bug for err tx should not goes into txpool (#605)
Paladz [Thu, 12 Apr 2018 06:46:55 +0000 (14:46 +0800)]
fix bug for err tx should not goes into txpool (#605)

6 years agoFix sign api (#603)
Yongfeng LI [Thu, 12 Apr 2018 06:39:48 +0000 (14:39 +0800)]
Fix sign api (#603)

* return error when sign-submit-transaction has no sign

* upgrade version

* correct the way to check sign

* Revert "correct the way to check sign"

This reverts commit 04484a82a540bf705a9ebecc8f1cdb373f98e801.

* fix the way to check sign

6 years agoChange testnet seed peer (#602)
yahtoo [Thu, 12 Apr 2018 03:27:16 +0000 (11:27 +0800)]
Change testnet seed peer (#602)

6 years agoremove CtrlProgram#Change and accountOutput#change (#600)
Yongfeng LI [Thu, 12 Apr 2018 03:26:33 +0000 (11:26 +0800)]
remove CtrlProgram#Change and accountOutput#change (#600)

6 years agoFix p2p peer duplicate dail error (#599)
yahtoo [Thu, 12 Apr 2018 03:07:22 +0000 (11:07 +0800)]
Fix p2p peer duplicate dail error (#599)

* Fix p2p peer duplicate connection error

* Optimization debug log print

6 years agoFunctional tests (#543)
WangYifu [Thu, 12 Apr 2018 01:54:39 +0000 (20:54 -0500)]
Functional tests (#543)

* add integration test

* tiny refactor

* add chain tests

* update wallet tests

* add wallet rollback test

* mock utxo, create asset, account

* fix can't find btm asset

* fix verify control program failed

* add tx tests

* tx test, output large than input

* add gas used test

* validate tx when gen block

* add tx version tests

* add gas only tx, spend immature coinbase output tests

* add block header tests

* spent retire, insufficient assets tests

* add coinbase tx test

* golint

* add double spend tests

* tx have no outputs test

* chain fork tests

* GenerateGenesisBlock for tests

* separate unit tests and functional tests

* update status with ProcessBlock

* fix tests

* gofmt

* add tx pool tests

* simplify code

* fix typo

* add max block gas test

* remove useless code

* fix chain tests

* serialize tx manually

* remove mux vm verify

* tmp save

* change the code style

* edit code format

* rename the file

* mv validate block to right folder

* delete unused from validation package

* add unit test for checkBlockTime && checkCoinbaseAmount

* delete unused test_file

* update the blockindex import

* fix tests

* format protocol level

* fix for golint

* edit for fix bug

* fix chain rollback tests

6 years agoset password and show tx output address (#591)
Yongfeng LI [Wed, 11 Apr 2018 13:48:04 +0000 (21:48 +0800)]
set password and show tx output address (#591)

* simplify sign-submit-transaction parameters

* add address to list-transactions output

* add address to transaction inputs

* update dashboard

* correct address for tx inputs and outputs

* remove useless code to get address from db

6 years agoFrozen vm (#577)
Paladz [Wed, 11 Apr 2018 13:12:48 +0000 (21:12 +0800)]
Frozen vm (#577)

* remove mux vm verify

* tmp save

* change the code style

* edit code format

* rename the file

* mv validate block to right folder

* delete unused from validation package

* add unit test for checkBlockTime && checkCoinbaseAmount

* delete unused test_file

* update the blockindex import

* format protocol level

* fix for golint

* edit for fix bug

6 years agofix Makefile (#586)
HAOYUatHZ [Wed, 11 Apr 2018 13:06:43 +0000 (21:06 +0800)]
fix Makefile (#586)

6 years agoOptimized mining api (#585)
wz [Wed, 11 Apr 2018 08:35:29 +0000 (16:35 +0800)]
Optimized mining api (#585)

6 years agoBroadcast new status when sync complete (#583)
yahtoo [Wed, 11 Apr 2018 07:46:41 +0000 (15:46 +0800)]
Broadcast new status when sync complete (#583)

* Broadcast new status when sync complete

* Fix peerset access thread safety bug

6 years agoMerge pull request #582 from Bytom/dev_mining_api
Yongfeng LI [Wed, 11 Apr 2018 07:33:24 +0000 (15:33 +0800)]
Merge pull request #582 from Bytom/dev_mining_api

add mining api

6 years agoadd mining api
wz [Wed, 11 Apr 2018 03:17:56 +0000 (11:17 +0800)]
add mining api

6 years agoMerge pull request #581 from Bytom/control-account
Yongfeng LI [Wed, 11 Apr 2018 03:24:26 +0000 (11:24 +0800)]
Merge pull request #581 from Bytom/control-account

remove control_account action

6 years agoremove control_account action
Yongfeng LI [Wed, 11 Apr 2018 03:16:30 +0000 (11:16 +0800)]
remove control_account action

6 years agoupdate echo
HAOYUatHZ [Tue, 10 Apr 2018 23:22:59 +0000 (07:22 +0800)]
update echo

6 years agoFix check network type bug (#578)
yahtoo [Tue, 10 Apr 2018 14:06:11 +0000 (22:06 +0800)]
Fix check network type bug (#578)

* Fix check network type bug

* Del useless code

6 years agoMerge pull request #576 from Bytom/config
Yongfeng LI [Tue, 10 Apr 2018 11:03:51 +0000 (19:03 +0800)]
Merge pull request #576 from Bytom/config

remove useless configuration

6 years agoremove useless configuration
Yongfeng LI [Tue, 10 Apr 2018 10:16:40 +0000 (18:16 +0800)]
remove useless configuration

6 years agofix submit block on same height bug (#575)
Paladz [Tue, 10 Apr 2018 09:53:49 +0000 (17:53 +0800)]
fix submit block on same height bug (#575)

6 years agochange the config for test net (#573)
Paladz [Tue, 10 Apr 2018 09:35:49 +0000 (17:35 +0800)]
change the config for test net (#573)

6 years agoMerge pull request #572 from Bytom/list-addresses
Yongfeng LI [Tue, 10 Apr 2018 08:24:55 +0000 (16:24 +0800)]
Merge pull request #572 from Bytom/list-addresses

show addresses on account detail page

6 years agoshow addresses on account detail page
Yongfeng LI [Tue, 10 Apr 2018 08:14:20 +0000 (16:14 +0800)]
show addresses on account detail page

6 years agofix the bug (#570)
Paladz [Tue, 10 Apr 2018 07:04:53 +0000 (15:04 +0800)]
fix the bug (#570)

6 years agoMerge pull request #568 from Bytom/edit_version
Yongfeng LI [Tue, 10 Apr 2018 05:52:58 +0000 (13:52 +0800)]
Merge pull request #568 from Bytom/edit_version

update verion

6 years agoupdate verion
paladz [Tue, 10 Apr 2018 05:51:47 +0000 (13:51 +0800)]
update verion

6 years agofix coinbase tx lens bug (#567)
Paladz [Tue, 10 Apr 2018 05:22:03 +0000 (13:22 +0800)]
fix coinbase tx lens bug (#567)

6 years agoupdate version (#565)
Yongfeng LI [Tue, 10 Apr 2018 02:58:12 +0000 (10:58 +0800)]
update version (#565)

6 years agofix the tx size bug (#563)
Paladz [Tue, 10 Apr 2018 02:48:36 +0000 (10:48 +0800)]
fix the tx size bug (#563)

* fix the tx size bug

* fix small garmmar

6 years agoprevent tx size is 0 (#562)
Paladz [Mon, 9 Apr 2018 11:26:16 +0000 (19:26 +0800)]
prevent tx size is 0 (#562)

* prevent tx size is 0

* make unit test pass

6 years agoMerge pull request #561 from Bytom/p2p-bug
Yongfeng LI [Mon, 9 Apr 2018 09:09:53 +0000 (17:09 +0800)]
Merge pull request #561 from Bytom/p2p-bug

fix stop peer when request block failed

6 years agofix stop peer when request block failed
Yongfeng LI [Mon, 9 Apr 2018 08:40:50 +0000 (16:40 +0800)]
fix stop peer when request block failed

6 years agofix SyncManager Peer and Switch peer not match (#560)
Yongfeng LI [Mon, 9 Apr 2018 07:49:46 +0000 (15:49 +0800)]
fix SyncManager Peer and Switch peer not match (#560)

6 years agofix the store block header index bug (#559)
Paladz [Mon, 9 Apr 2018 07:01:39 +0000 (15:01 +0800)]
fix the store block header index bug (#559)

6 years agoFrozen bc (#552)
Paladz [Mon, 9 Apr 2018 06:15:05 +0000 (14:15 +0800)]
Frozen bc (#552)

* first step clean the nonce

* clean the map.go

* clean the data from bc.go

* finish clean the data from bc level

* add unit test for map

* add comment for golint

6 years agochmod -x for source files (#557)
HAOYUatHZ [Mon, 9 Apr 2018 05:07:34 +0000 (13:07 +0800)]
chmod -x for source files (#557)

keep `x` for `.pl`, `.sh`, `.bash` and `.git/hooks/*.sample`

```
find . -type f -perm -111

find . -name "*.go" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.s" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.h" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.c" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.f" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.f90" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.json.deflate" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.dat" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.txt" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.md" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.html" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.xml" -type f -perm -111 -exec chmod -x {} \;
find . -name "Makefile" -type f -perm -111 -exec chmod -x {} \;
find . -name "Dockerfile" -type f -perm -111 -exec chmod -x {} \;
find . -name "README" -type f -perm -111 -exec chmod -x {} \;
find . -name "AUTHORS" -type f -perm -111 -exec chmod -x {} \;
find . -name "LICENSE" -type f -perm -111 -exec chmod -x {} \;
find . -name "PATENTS" -type f -perm -111 -exec chmod -x {} \;
find . -name "CONTRIBUTORS" -type f -perm -111 -exec chmod -x {} \;
find . -name "AUTHORS" -type f -perm -111 -exec chmod -x {} \;
find . -name ".gitignore" -type f -perm -111 -exec chmod -x {} \;
find . -name ".gitattributes" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.gz" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.cfg" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.pem" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.key" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.srl" -type f -perm -111 -exec chmod -x {} \;
find . -name "*.crt" -type f -perm -111 -exec chmod -x {} \;
```

6 years agofix keys not update when reloading with some keys deleted (#556)
Yongfeng LI [Mon, 9 Apr 2018 05:02:54 +0000 (13:02 +0800)]
fix keys not update when reloading with some keys deleted (#556)

6 years agoMerge pull request #551 from Bytom/update-readme
Yongfeng LI [Sun, 8 Apr 2018 14:24:48 +0000 (22:24 +0800)]
Merge pull request #551 from Bytom/update-readme

fix grammar error. #530

6 years agoMerge pull request #550 from Bytom/fix-maxNonce-comment
Yongfeng LI [Sun, 8 Apr 2018 14:21:34 +0000 (22:21 +0800)]
Merge pull request #550 from Bytom/fix-maxNonce-comment

fix maxNonce comment

6 years agofix grammar error. #530
HAOYUatHZ [Sun, 8 Apr 2018 11:37:44 +0000 (19:37 +0800)]
fix grammar error. #530

6 years agofix-maxNonce-comment
HAOYUatHZ [Sun, 8 Apr 2018 11:27:33 +0000 (19:27 +0800)]
fix-maxNonce-comment