OSDN Git Service

bytom/bytom.git
5 years agofix the coinbase generate bug (#1136) v1.0.3-hotfix-f53cde9
yahtoo [Sat, 14 Jul 2018 10:30:45 +0000 (18:30 +0800)]
fix the coinbase generate bug (#1136)

5 years agoMerge pull request #1128 from Bytom/dev
Paladz [Mon, 9 Jul 2018 09:31:30 +0000 (17:31 +0800)]
Merge pull request #1128 from Bytom/dev

Dev

5 years agomodify equity to available (#1127)
oysheng [Mon, 9 Jul 2018 08:36:16 +0000 (16:36 +0800)]
modify equity to available  (#1127)

* modify function name from greater/less to below/above

* modify CHECKOUTPUT instruction

* modify path

* modify ivy to equity

* add func IsPushdata

5 years agoadd contract template LoanCollateral (#1125)
oysheng [Fri, 6 Jul 2018 08:07:30 +0000 (16:07 +0800)]
add contract template LoanCollateral (#1125)

add contract template CallOption

5 years agofix the file path bug (#1124)
Paladz [Thu, 5 Jul 2018 14:45:33 +0000 (22:45 +0800)]
fix the file path bug (#1124)

5 years agoinit push for spend 0 confirm utxo (#1112)
Paladz [Thu, 5 Jul 2018 13:02:37 +0000 (21:02 +0800)]
init push for spend 0 confirm utxo (#1112)

* init push for spend 0 confirm utxo

* elegant the code

* add unit test for utxo_keeper

* add unit test for wallet/utxo.go

* fix a unit test bug

* delete the unused control_receiver

5 years agothe struct of node_info add json field (#1120)
muscle_boy [Wed, 4 Jul 2018 08:55:09 +0000 (16:55 +0800)]
the struct of node_info add json field (#1120)

* the transaction output amout prohibit set zero

* add network access control api

* format import code style

* refactor

* code refactor

* bug fix

* the struct node_info add json field

5 years agoadd network access control api (#1118)
muscle_boy [Wed, 4 Jul 2018 08:05:40 +0000 (16:05 +0800)]
add network access control api (#1118)

* the transaction output amout prohibit set zero

* add network access control api

* format import code style

* refactor

* code refactor

* bug fix

5 years agodelete equity time type (#1119)
oysheng [Wed, 4 Jul 2018 07:30:50 +0000 (15:30 +0800)]
delete equity time type (#1119)

* delete equity time type
add blockHeight field and add internal function greater and less

* delete time related

5 years agoadd contract template escrow (#1117)
oysheng [Tue, 3 Jul 2018 07:48:23 +0000 (15:48 +0800)]
add contract template escrow (#1117)

5 years agoAdd bytomd command line param about setting log level (#1115)
successli [Tue, 3 Jul 2018 06:47:17 +0000 (14:47 +0800)]
Add bytomd command line param about setting log level (#1115)

* add bytomd command line param about log level

* default set to info and rm pre-setting for log level

5 years agoadd contract TradeOffer template (#1116)
oysheng [Tue, 3 Jul 2018 06:14:12 +0000 (14:14 +0800)]
add contract TradeOffer template (#1116)

* add contract TradeOffer template

* refactor template contract

* fix error result

5 years agoMerge pull request #1113 from Bytom/dev
Paladz [Mon, 2 Jul 2018 13:34:58 +0000 (21:34 +0800)]
Merge pull request #1113 from Bytom/dev

Dev

5 years agodelete time waiter (#1111)
oysheng [Mon, 2 Jul 2018 09:04:04 +0000 (17:04 +0800)]
delete time waiter (#1111)

5 years agothe transaction output amout prohibit set zero (#1109)
muscle_boy [Mon, 2 Jul 2018 08:49:16 +0000 (16:49 +0800)]
the transaction output amout prohibit set zero (#1109)

5 years agofix rescan wallet (#1108)
oysheng [Mon, 2 Jul 2018 08:45:16 +0000 (16:45 +0800)]
fix rescan wallet (#1108)

* fix rescan wallet

* optimise

5 years agomiss return when error (#1100)
broadroad [Fri, 29 Jun 2018 03:07:31 +0000 (11:07 +0800)]
miss return when error (#1100)

5 years agoelegant the code for utxo reserver (#1105)
Paladz [Fri, 29 Jun 2018 02:47:52 +0000 (10:47 +0800)]
elegant the code for utxo reserver (#1105)

* elegant the code for utxo reserver

* fix bug

5 years agoadd contract template LockWithPublicKeyHash and RevealPreimage (#1101)
oysheng [Thu, 28 Jun 2018 08:23:20 +0000 (16:23 +0800)]
add contract template LockWithPublicKeyHash and RevealPreimage (#1101)

adjust contract template structure

5 years agorescan-wallet capture rescan signal (#1102)
oysheng [Thu, 28 Jun 2018 08:13:48 +0000 (16:13 +0800)]
rescan-wallet capture rescan signal (#1102)

* rescan-wallet capture rescan signal

* optimise

5 years agoadd multisig contract template (#1095)
oysheng [Wed, 27 Jun 2018 06:41:45 +0000 (14:41 +0800)]
add multisig contract template (#1095)

5 years agoadd getWalletInfo API to acquire rescan wallet schedule (#1098)
oysheng [Wed, 27 Jun 2018 06:30:04 +0000 (14:30 +0800)]
add getWalletInfo API to acquire rescan wallet schedule (#1098)

5 years agoadd checkpoint into the block keeper (#1093)
Paladz [Tue, 26 Jun 2018 07:52:55 +0000 (15:52 +0800)]
add checkpoint into the block keeper (#1093)

* add checkpoint into the block keeper

* edit for code review

5 years agorefactor spend_account_unspent_output struct for add contract arguments (#1089)
oysheng [Mon, 25 Jun 2018 12:05:05 +0000 (20:05 +0800)]
refactor spend_account_unspent_output struct for add contract arguments (#1089)

* refactor spend_account_unspent_output struct for add contract arguments
add the contract template LockWithPublicKey for build-transaction

* optimise arguments
add unit test

* optimise unit test

* optimise struct

5 years agoMerge pull request #1090 from Bytom/add_fastsync_flag
yahtoo [Mon, 25 Jun 2018 12:03:11 +0000 (20:03 +0800)]
Merge pull request #1090 from Bytom/add_fastsync_flag

enable the fast sync server flag

5 years agoenable the fast sync server flag
paladz [Mon, 25 Jun 2018 11:37:06 +0000 (19:37 +0800)]
enable the fast sync server flag

5 years agoGm (#1085)
Chengcheng Zhang [Fri, 22 Jun 2018 01:48:43 +0000 (09:48 +0800)]
Gm (#1085)

* update .gitignore

* add OP_SM3

* add OP_SM3 test

5 years agoadd list-pubkeys API (#1086)
oysheng [Thu, 21 Jun 2018 13:43:06 +0000 (21:43 +0800)]
add list-pubkeys API (#1086)

* add list-pubkeys API

* modify response of list-pubkeys

5 years agoUpdate release-notes-1.0.3.md (#1079)
RockerFlower [Thu, 21 Jun 2018 05:36:15 +0000 (13:36 +0800)]
Update release-notes-1.0.3.md (#1079)

Fix the link of Bytom User Manual.

5 years agomodify MergeSpendAction order by origin action list (#1048)
oysheng [Thu, 21 Jun 2018 02:38:28 +0000 (10:38 +0800)]
modify MergeSpendAction order by origin action list (#1048)

* modify MergeSpendAction order by origin action list

* optimise

5 years agoAPI list-unspent-outputs add filter for contract (#1076)
oysheng [Wed, 20 Jun 2018 13:40:27 +0000 (21:40 +0800)]
API list-unspent-outputs add filter for contract (#1076)

5 years agoadd arbitrary for retire (#1065)
Derek [Wed, 20 Jun 2018 10:15:57 +0000 (18:15 +0800)]
add arbitrary for retire (#1065)

* add rescan-blocks api

* rename rescan-blocks to rescan-wallet

* rename rescanWallet to rescanWallet

* add arbitrary for retire

* retireAction needs a program

* retireAction used address

* add RetireProgram for script

* update RetireProgram for script

5 years agoMerge pull request #1081 from Bytom/equity-origin
Paladz [Wed, 20 Jun 2018 08:15:29 +0000 (16:15 +0800)]
Merge pull request #1081 from Bytom/equity-origin

equity origin compiler

5 years agoequity origin compiler
oysheng [Wed, 20 Jun 2018 06:17:30 +0000 (14:17 +0800)]
equity origin compiler

5 years agoMerge pull request #1077 from Bytom/dev-discv-temp
Paladz [Tue, 19 Jun 2018 06:29:15 +0000 (14:29 +0800)]
Merge pull request #1077 from Bytom/dev-discv-temp

gofmt

5 years agogofmt
HAOYUatHZ [Tue, 19 Jun 2018 06:21:19 +0000 (14:21 +0800)]
gofmt

5 years agoMerge pull request #1075 from Bytom/prod v1.0.3
Paladz [Tue, 19 Jun 2018 03:15:10 +0000 (11:15 +0800)]
Merge pull request #1075 from Bytom/prod

Prod

5 years agoMerge pull request #1074 from Bytom/dev
Paladz [Tue, 19 Jun 2018 03:13:50 +0000 (11:13 +0800)]
Merge pull request #1074 from Bytom/dev

Dev

5 years agoMerge pull request #1073 from Bytom/p2p_disv
Paladz [Tue, 19 Jun 2018 03:11:27 +0000 (11:11 +0800)]
Merge pull request #1073 from Bytom/p2p_disv

Change peer discv resp timeout

5 years agoChange peer discv resp timeout
Yahtoo Ma [Tue, 19 Jun 2018 02:29:51 +0000 (10:29 +0800)]
Change peer discv resp timeout

5 years agoMerge pull request #1072 from Bytom/prod
Paladz [Tue, 19 Jun 2018 02:20:49 +0000 (10:20 +0800)]
Merge pull request #1072 from Bytom/prod

prod - master

5 years agoMerge pull request #1071 from Bytom/dev
Paladz [Tue, 19 Jun 2018 02:17:33 +0000 (10:17 +0800)]
Merge pull request #1071 from Bytom/dev

Dev

5 years agoMerge pull request #1062 from Bytom/release_note
Paladz [Tue, 19 Jun 2018 02:07:51 +0000 (10:07 +0800)]
Merge pull request #1062 from Bytom/release_note

add unit release note for v1.0.3

5 years agoMerge pull request #1070 from Bytom/dev-filter
Paladz [Tue, 19 Jun 2018 02:03:39 +0000 (10:03 +0800)]
Merge pull request #1070 from Bytom/dev-filter

add filter related unconfirmed transaction

5 years agomodify func name
oysheng [Tue, 19 Jun 2018 01:59:10 +0000 (09:59 +0800)]
modify func name

5 years agoadd filter related unconfirmed transaction
oysheng [Tue, 19 Jun 2018 01:52:00 +0000 (09:52 +0800)]
add filter related unconfirmed transaction

5 years agoMerge pull request #1064 from Bytom/dev
Paladz [Fri, 15 Jun 2018 07:28:46 +0000 (15:28 +0800)]
Merge pull request #1064 from Bytom/dev

Dev

5 years agoedit the config (#1063)
Paladz [Fri, 15 Jun 2018 07:25:30 +0000 (15:25 +0800)]
edit the config (#1063)

5 years agoadd unit release note for v1.0.3
paladz [Thu, 14 Jun 2018 13:12:21 +0000 (21:12 +0800)]
add unit release note for v1.0.3

5 years agoadd rescan-blocks api (#1055)
Derek [Thu, 14 Jun 2018 11:52:14 +0000 (19:52 +0800)]
add rescan-blocks api (#1055)

* add rescan-blocks api

* rename rescan-blocks to rescan-wallet

* rename rescanWallet to rescanWallet

5 years ago Add udp upnp port mapping (#1060)
yahtoo [Thu, 14 Jun 2018 09:58:20 +0000 (17:58 +0800)]
 Add udp upnp port mapping (#1060)

* Fix nodeID encode bug

* Add udp upnp port mapping

5 years agoMerge pull request #1058 from Bytom/edit_chain_id
Paladz [Thu, 14 Jun 2018 05:03:23 +0000 (13:03 +0800)]
Merge pull request #1058 from Bytom/edit_chain_id

edit testnet chain_id

5 years agoedit testnet chain_id
paladz [Thu, 14 Jun 2018 05:01:42 +0000 (13:01 +0800)]
edit testnet chain_id

5 years agoedit the config (#1057)
Paladz [Thu, 14 Jun 2018 03:04:46 +0000 (11:04 +0800)]
edit the config (#1057)

5 years agodon't dial self (#1056)
Paladz [Thu, 14 Jun 2018 02:03:36 +0000 (10:03 +0800)]
don't dial self (#1056)

* don't dial self

* edit the dial code

5 years agoMerge pull request #1053 from Bytom/dev-error
Paladz [Wed, 13 Jun 2018 10:04:32 +0000 (18:04 +0800)]
Merge pull request #1053 from Bytom/dev-error

fix default error response struct

5 years agoMerge pull request #1052 from Bytom/fix_bug
Paladz [Wed, 13 Jun 2018 07:03:11 +0000 (15:03 +0800)]
Merge pull request #1052 from Bytom/fix_bug

handle node is nil bug

5 years agofix default error response struct
oysheng [Wed, 13 Jun 2018 07:02:41 +0000 (15:02 +0800)]
fix default error response struct

5 years agohandle node is nil bug
paladz [Wed, 13 Jun 2018 06:58:40 +0000 (14:58 +0800)]
handle node is nil bug

5 years agoMerge pull request #1051 from Bytom/fix_bug
Paladz [Wed, 13 Jun 2018 06:39:03 +0000 (14:39 +0800)]
Merge pull request #1051 from Bytom/fix_bug

fix the over range crash bug

5 years agofix the over range crash bug
paladz [Wed, 13 Jun 2018 06:35:08 +0000 (14:35 +0800)]
fix the over range crash bug

5 years agoMerge pull request #1050 from Bytom/dev-error
Paladz [Wed, 13 Jun 2018 03:17:30 +0000 (11:17 +0800)]
Merge pull request #1050 from Bytom/dev-error

fix map error for "hash of unhashable type"

5 years agofix map error for "hash of unhashable type"
oysheng [Wed, 13 Jun 2018 03:04:34 +0000 (11:04 +0800)]
fix map error for "hash of unhashable type"

5 years agoMerge pull request #1049 from Bytom/edit_version
Paladz [Wed, 13 Jun 2018 02:29:49 +0000 (10:29 +0800)]
Merge pull request #1049 from Bytom/edit_version

edit version to 1.0.3

5 years agoedit version to 1.0.3
paladz [Wed, 13 Jun 2018 02:28:18 +0000 (10:28 +0800)]
edit version to 1.0.3

5 years agoMerge pull request #1041 from Bytom/dev-utxo-tx
Paladz [Tue, 12 Jun 2018 12:08:55 +0000 (20:08 +0800)]
Merge pull request #1041 from Bytom/dev-utxo-tx

add unit test for build-transaction by utxo

5 years agoAdd node discover function (#1032)
yahtoo [Tue, 12 Jun 2018 12:06:51 +0000 (20:06 +0800)]
Add node discover function (#1032)

* Add node discover function

* Add dependent libraries

* Change discover nodeID to edd25519 pubkey

* Del unused secp256k1 lib

* Add discover debug info

* Del unused sha3 lib

* Del unused math function

* remove address book from switch level

* use discover to replace addrbook

* Chane discover rlp encode to go-wire encode

* Add test discover seed

* edit the log from info to debug

* edit the code

* remove pex call seed

* edit for fix bug

* edit the solonet config

* edit for debug

* make udp listen to config address

* handle error on start switch fail

* move discover outof switch

* handle the empty seed case

* edit the node select

* Ma's order

* remove a unused function

5 years agoMerge pull request #1046 from Bytom/dev
Paladz [Tue, 12 Jun 2018 08:18:58 +0000 (16:18 +0800)]
Merge pull request #1046 from Bytom/dev

Dev

5 years agoMerge pull request #1045 from Bytom/merge-master
Paladz [Tue, 12 Jun 2018 08:15:22 +0000 (16:15 +0800)]
Merge pull request #1045 from Bytom/merge-master

Merge master

5 years agoMerge pull request #1042 from Bytom/dev
Paladz [Mon, 11 Jun 2018 14:27:54 +0000 (22:27 +0800)]
Merge pull request #1042 from Bytom/dev

Dev

5 years agoadd unit test for build-transaction by utxo
oysheng [Mon, 11 Jun 2018 10:52:12 +0000 (18:52 +0800)]
add unit test for build-transaction by utxo

5 years agomodify error response (#1039)
oysheng [Sat, 9 Jun 2018 10:25:18 +0000 (18:25 +0800)]
modify error response (#1039)

* modify error response

* optimise

5 years agoupdate dashboard (#1038)
Zhiting Lin [Sat, 9 Jun 2018 07:42:49 +0000 (15:42 +0800)]
update dashboard (#1038)

5 years agofix list-transactions unconfirmed transactions sorting by time (#1037)
oysheng [Sat, 9 Jun 2018 07:26:07 +0000 (15:26 +0800)]
fix list-transactions unconfirmed transactions sorting by time (#1037)

* list-transactions result order by time desc

* optimise list-transactions unconfirmed transaction order

* optimise

5 years agogenesis block support mutil net (#1036)
Paladz [Fri, 8 Jun 2018 11:23:25 +0000 (19:23 +0800)]
genesis block support mutil net (#1036)

5 years agoupdate dashboard (#1035)
Zhiting Lin [Fri, 8 Jun 2018 02:50:39 +0000 (10:50 +0800)]
update dashboard (#1035)

5 years agoreduce the unused info in node_info (#1033)
Paladz [Thu, 7 Jun 2018 13:27:44 +0000 (21:27 +0800)]
reduce the unused info in node_info (#1033)

5 years agoadd service flag (#1030)
Paladz [Thu, 7 Jun 2018 09:55:56 +0000 (17:55 +0800)]
add service flag (#1030)

5 years agoget-transaction by tx_id add annotateTxsAsset (#1029)
oysheng [Thu, 7 Jun 2018 09:26:55 +0000 (17:26 +0800)]
get-transaction by tx_id add annotateTxsAsset (#1029)

* optmise list-transactions query by tx_id

* get-transaction by tx_id add annotateTxsAsset

5 years agooptmise list-transactions query by tx_id (#1028)
oysheng [Thu, 7 Jun 2018 08:53:49 +0000 (16:53 +0800)]
optmise list-transactions query by tx_id (#1028)

5 years agocheck the switch level logic (#1026)
Paladz [Thu, 7 Jun 2018 05:33:02 +0000 (13:33 +0800)]
check the switch level logic (#1026)

* check the switch level logic

* edit for code review

5 years agoMerge pull request #1025 from Bytom/dev
Paladz [Wed, 6 Jun 2018 11:48:04 +0000 (19:48 +0800)]
Merge pull request #1025 from Bytom/dev

Dev

5 years agoMerge pull request #1022 from Bytom/dev-unconfirmed
Paladz [Tue, 5 Jun 2018 13:26:27 +0000 (21:26 +0800)]
Merge pull request #1022 from Bytom/dev-unconfirmed

add unconfirmed transaction for account

5 years agofix format
oysheng [Tue, 5 Jun 2018 13:00:59 +0000 (21:00 +0800)]
fix format

5 years agomodify list-transactions
oysheng [Tue, 5 Jun 2018 12:55:52 +0000 (20:55 +0800)]
modify list-transactions

5 years agooptimise
oysheng [Tue, 5 Jun 2018 12:49:32 +0000 (20:49 +0800)]
optimise

5 years agooptimise test
oysheng [Tue, 5 Jun 2018 12:29:23 +0000 (20:29 +0800)]
optimise test

5 years agoadd unit test for unconfirmed transaction
oysheng [Tue, 5 Jun 2018 12:18:27 +0000 (20:18 +0800)]
add unit test for unconfirmed transaction

5 years agooptimise
oysheng [Tue, 5 Jun 2018 11:31:12 +0000 (19:31 +0800)]
optimise

5 years agofix bytomcli list-transactions
oysheng [Tue, 5 Jun 2018 08:15:38 +0000 (16:15 +0800)]
fix bytomcli list-transactions

5 years agoMerge pull request #1023 from Bytom/getwork
Paladz [Tue, 5 Jun 2018 08:08:06 +0000 (16:08 +0800)]
Merge pull request #1023 from Bytom/getwork

get-work-json & submit-work-json

5 years agofix get-transaction
oysheng [Tue, 5 Jun 2018 08:03:12 +0000 (16:03 +0800)]
fix get-transaction

5 years agomove back BlockHeaderJSON into api package
HAOYUatHZ [Tue, 5 Jun 2018 08:01:35 +0000 (16:01 +0800)]
move back BlockHeaderJSON into api package

5 years agorefactor list-transactions
oysheng [Tue, 5 Jun 2018 07:30:47 +0000 (15:30 +0800)]
refactor list-transactions

5 years agomove BlockHeaderJSON type
HAOYUatHZ [Tue, 5 Jun 2018 07:23:05 +0000 (15:23 +0800)]
move BlockHeaderJSON type

5 years agofix suggestion
oysheng [Tue, 5 Jun 2018 05:29:11 +0000 (13:29 +0800)]
fix suggestion

5 years agogo formattted
HAOYUatHZ [Tue, 5 Jun 2018 03:37:11 +0000 (11:37 +0800)]
go formattted

5 years agoclean up
HAOYUatHZ [Tue, 5 Jun 2018 03:29:58 +0000 (11:29 +0800)]
clean up

5 years agomerge unconfirmed trsanction into transactions
oysheng [Tue, 5 Jun 2018 03:29:25 +0000 (11:29 +0800)]
merge unconfirmed trsanction into transactions

5 years agosubmit-work-json works
HAOYUatHZ [Tue, 5 Jun 2018 03:05:28 +0000 (11:05 +0800)]
submit-work-json works