fix bug no create tokenHolder in modifyjson.sh

palletone · Jan 22, 2019 · f4a1acb · f4a1acb
1 parent 514c4e8
commit f4a1acb
Show file tree

Hide file tree

Showing 155 changed files with 22 additions and 12 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/bindatagen.sh b/bindatagen.sh
diff --git a/cmd/deployment/init.sh b/cmd/deployment/init.sh
@@ -7,12 +7,3 @@ send "1\r"
 interact
 
 
-
-
-
-
-
-
-
-
-
diff --git a/cmd/deployment/modifyjson.sh b/cmd/deployment/modifyjson.sh
@@ -26,7 +26,28 @@ else
 fi
 !
 
-add=`cat $filename | jq ".initialMediatorCandidates[$4-1] |= . + {\"account\": \"$1\", \"initPubKey\": \"$2\", \"node\": \"$3\"}"`
+index=$[ $4 - 1 ]
+
+add=`cat $filename | jq ".initialMediatorCandidates[$index] |= . + {\"account\": \"$1\", \"initPubKey\": \"$2\", \"node\": \"$3\"}"`
+
+if [ $index -eq 0 ] ; then
+
+    createaccount=`./createaccount.sh`
+    tempinfo=`echo $createaccount | sed -n '$p'| awk '{print $NF}'`
+    accountlength=35
+    accounttemp=${tempinfo:0:$accountlength}
+    account=`echo ${accounttemp//^M/}`
+
+    add=`echo $add |
+       jq "to_entries |
+       map(if .key == \"tokenHolder\"
+          then . + {\"value\":\"$account\"}
+          else .
+          end
+         ) |
+      from_entries"`
+
+fi
 
     rm $filename
     echo $add >> temp.json
@@ -35,5 +56,3 @@ add=`cat $filename | jq ".initialMediatorCandidates[$4-1] |= . + {\"account\": \
 }
 
 
-
-
diff --git a/cmd/gptn/mediatorcmd.go b/cmd/gptn/mediatorcmd.go
diff --git a/common/award/coinday_awards.go b/common/award/coinday_awards.go
diff --git a/common/award/coinday_awards_test.go b/common/award/coinday_awards_test.go
diff --git a/common/hash_test.go b/common/hash_test.go
diff --git a/common/log/logger_test.go b/common/log/logger_test.go
diff --git a/common/log/nothinglogger.go b/common/log/nothinglogger.go
diff --git a/common/util/error.go b/common/util/error.go
diff --git a/consensus/jury/config.go b/consensus/jury/config.go
diff --git a/consensus/jury/contractEvent.go b/consensus/jury/contractEvent.go
diff --git a/consensus/jury/contractProcess.go b/consensus/jury/contractProcess.go
diff --git a/consensus/jury/contractReq.go b/consensus/jury/contractReq.go
diff --git a/consensus/jury/election.go b/consensus/jury/election.go
diff --git a/consensus/jury/event.go b/consensus/jury/event.go
diff --git a/consensus/jury/invokeresult.go b/consensus/jury/invokeresult.go
diff --git a/consensus/jury/service.go b/consensus/jury/service.go
diff --git a/consensus/mediatorplugin/mediator_plugin.go b/consensus/mediatorplugin/mediator_plugin.go
diff --git a/consensus/mediatorplugin/private_api.go b/consensus/mediatorplugin/private_api.go
diff --git a/consensus/mediatorplugin/public_api.go b/consensus/mediatorplugin/public_api.go
diff --git a/consensus/mediatorplugin/sign_share.go b/consensus/mediatorplugin/sign_share.go
diff --git a/contracts/example/go/createToken/account/test.go b/contracts/example/go/createToken/account/test.go
diff --git a/contracts/example/go/createToken/account/tokenCard.go b/contracts/example/go/createToken/account/tokenCard.go
diff --git a/contracts/example/go/createToken/account/user.go b/contracts/example/go/createToken/account/user.go
diff --git a/contracts/example/go/createToken/createToken.go b/contracts/example/go/createToken/createToken.go
diff --git a/contracts/example/go/createToken/customToken.go b/contracts/example/go/createToken/customToken.go
diff --git a/contracts/example/go/demo/userwalletbtc/userwalletbtc.go b/contracts/example/go/demo/userwalletbtc/userwalletbtc.go
diff --git a/contracts/example/go/demo/userwalleteth/userwalleteth.go b/contracts/example/go/demo/userwalleteth/userwalleteth.go
diff --git a/contracts/example/go/deposit/common.go b/contracts/example/go/deposit/common.go
diff --git a/contracts/example/go/deposit/deposit.go b/contracts/example/go/deposit/deposit.go
diff --git a/contracts/example/go/deposit/developer.go b/contracts/example/go/deposit/developer.go
diff --git a/contracts/example/go/deposit/jury.go b/contracts/example/go/deposit/jury.go
diff --git a/contracts/example/go/deposit/mediator.go b/contracts/example/go/deposit/mediator.go
diff --git a/contracts/example/go/prc20/prc20.go b/contracts/example/go/prc20/prc20.go
diff --git a/contracts/manger/ccmanger_test.goo b/contracts/manger/ccmanger_test.goo
diff --git a/contracts/scc/const.go b/contracts/scc/const.go
diff --git a/contracts/syscontract/debugcc/debugcc.go b/contracts/syscontract/debugcc/debugcc.go
diff --git a/core/gen/genesis.go b/core/gen/genesis.go
diff --git a/core/utxo_pickup.go b/core/utxo_pickup.go
diff --git a/core/utxo_pickup_test.go b/core/utxo_pickup_test.go
diff --git a/core/vmContractPub/protos/peer/peer.go b/core/vmContractPub/protos/peer/peer.go
diff --git a/dag/common/mediator_evaluator.go b/dag/common/mediator_evaluator.go
diff --git a/dag/common/prop_cache_repository.go b/dag/common/prop_cache_repository.go
diff --git a/dag/common/prop_cache_repository_test.go b/dag/common/prop_cache_repository_test.go
diff --git a/dag/common/prop_repository.go b/dag/common/prop_repository.go
diff --git a/dag/common/prop_repository_test.go b/dag/common/prop_repository_test.go
diff --git a/dag/common/state_repository.go b/dag/common/state_repository.go
diff --git a/dag/common/transaction_repository.go.del b/dag/common/transaction_repository.go.del
diff --git a/dag/common/utxo_repository.go b/dag/common/utxo_repository.go
diff --git a/dag/common/utxo_repository_test.go b/dag/common/utxo_repository_test.go
diff --git a/dag/constants/prefix_info.go b/dag/constants/prefix_info.go
diff --git a/dag/dag_maintenance.go b/dag/dag_maintenance.go
diff --git a/dag/dag_test.go b/dag/dag_test.go
diff --git a/dag/dag_transaction.go b/dag/dag_transaction.go
diff --git a/dag/dag_unit.go b/dag/dag_unit.go
diff --git a/dag/dag_update.go b/dag/dag_update.go
diff --git a/dag/getter_saver.go b/dag/getter_saver.go
diff --git a/dag/init_manage.go b/dag/init_manage.go
diff --git a/dag/interface.go b/dag/interface.go
diff --git a/dag/memunit/interface.go b/dag/memunit/interface.go
diff --git a/dag/memunit/memdag.go b/dag/memunit/memdag.go
diff --git a/dag/modules/account_info.go b/dag/modules/account_info.go
diff --git a/dag/modules/asset.go b/dag/modules/asset.go
diff --git a/dag/modules/asset_test.go b/dag/modules/asset_test.go
diff --git a/dag/modules/idtype16.go b/dag/modules/idtype16.go
diff --git a/dag/modules/idtype16_test.go b/dag/modules/idtype16_test.go
diff --git a/dag/modules/mediator_info.go b/dag/modules/mediator_info.go
diff --git a/dag/modules/mediator_operation.go b/dag/modules/mediator_operation.go
diff --git a/dag/modules/message.go b/dag/modules/message.go
diff --git a/dag/modules/token.go b/dag/modules/token.go
diff --git a/dag/modules/token_info.go.del b/dag/modules/token_info.go.del
diff --git a/dag/modules/token_test.go b/dag/modules/token_test.go
diff --git a/dag/modules/transaction_json.go b/dag/modules/transaction_json.go
diff --git a/dag/modules/utxo_test.go b/dag/modules/utxo_test.go
diff --git a/dag/palletcache/interface.go b/dag/palletcache/interface.go
diff --git a/dag/rwset/rwsetTxSimulator_test.go b/dag/rwset/rwsetTxSimulator_test.go
diff --git a/dag/storage/README.md b/dag/storage/README.md
diff --git a/dag/storage/dagdb_test.go b/dag/storage/dagdb_test.go
diff --git a/dag/storage/dagdb_tx.go b/dag/storage/dagdb_tx.go
diff --git a/dag/storage/global_property.go b/dag/storage/global_property.go
diff --git a/dag/storage/mediator.go b/dag/storage/mediator.go
diff --git a/dag/storage/mediator_schedule.go b/dag/storage/mediator_schedule.go
diff --git a/dag/storage/propertydb.go b/dag/storage/propertydb.go
diff --git a/dag/storage/statedb_account.go b/dag/storage/statedb_account.go
diff --git a/dag/storage/statedb_account_test.go b/dag/storage/statedb_account_test.go
diff --git a/dag/storage/statedb_config.go b/dag/storage/statedb_config.go
diff --git a/dag/storage/statedb_config_test.go b/dag/storage/statedb_config_test.go
diff --git a/dag/storage/statedb_contract.go b/dag/storage/statedb_contract.go
diff --git a/dag/storage/statedb_contract_test.go b/dag/storage/statedb_contract_test.go
diff --git a/dag/storage/statedb_interface.go b/dag/storage/statedb_interface.go
diff --git a/dag/storage/statedb_vote.go b/dag/storage/statedb_vote.go
diff --git a/dag/storage/statedb_vote_test.go b/dag/storage/statedb_vote_test.go
diff --git a/dag/storage/utxodb_test.go b/dag/storage/utxodb_test.go
diff --git a/dag/txspool/interface.go b/dag/txspool/interface.go
diff --git a/dag/txspool/utxoviewpoint.go b/dag/txspool/utxoviewpoint.go
diff --git a/dag/vote/model_baseVote.go b/dag/vote/model_baseVote.go
diff --git a/dag/vote/model_openVote.go b/dag/vote/model_openVote.go
diff --git a/dag/vote/plugin_deligate.go b/dag/vote/plugin_deligate.go
diff --git a/dag/vote/plugin_privilege.go b/dag/vote/plugin_privilege.go
diff --git a/dag/vote/plugin_process.go b/dag/vote/plugin_process.go
diff --git a/dag/vote/utils_sorter.go b/dag/vote/utils_sorter.go
diff --git a/dag/vote/utils_toy.go b/dag/vote/utils_toy.go
diff --git a/dag/vote/vote_test.go b/dag/vote/vote_test.go
diff --git a/dag/vote/vote_virtual.go b/dag/vote/vote_virtual.go
diff --git a/examples/e2e_cli/docker-compose-e2e.yaml b/examples/e2e_cli/docker-compose-e2e.yaml
diff --git a/examples/e2e_cli/docker-compose-e2e.yaml_template_1 b/examples/e2e_cli/docker-compose-e2e.yaml_template_1
diff --git a/examples/e2e_cli/docker-compose-e2e.yaml_template_3 b/examples/e2e_cli/docker-compose-e2e.yaml_template_3
diff --git a/examples/e2e_cli/generateArtifacts.sh b/examples/e2e_cli/generateArtifacts.sh
diff --git a/images/gptn/Dockerfile.in b/images/gptn/Dockerfile.in
diff --git a/images/gptn/entrypoint.sh b/images/gptn/entrypoint.sh
diff --git a/internal/ptnapi/personal_api.go b/internal/ptnapi/personal_api.go
diff --git a/internal/ptnapi/walletapi_test.go b/internal/ptnapi/walletapi_test.go
diff --git a/internal/web3ext/admin_js.go b/internal/web3ext/admin_js.go
diff --git a/internal/web3ext/dag_js.go b/internal/web3ext/dag_js.go
diff --git a/internal/web3ext/debug_js.go b/internal/web3ext/debug_js.go
diff --git a/internal/web3ext/mediator_js.go b/internal/web3ext/mediator_js.go
diff --git a/internal/web3ext/personal_js.go b/internal/web3ext/personal_js.go
diff --git a/internal/web3ext/ptn_js.go b/internal/web3ext/ptn_js.go
diff --git a/internal/web3ext/wallet_js.go b/internal/web3ext/wallet_js.go
diff --git a/ptn/connect.go b/ptn/connect.go
diff --git a/ptn/contract_exec.go b/ptn/contract_exec.go
diff --git a/ptn/unit_sign.go_mock.go b/ptn/unit_sign.go_mock.go
diff --git a/ptn/vss_groupsign.go b/ptn/vss_groupsign.go
diff --git a/ptnjson/DbRowJson.go b/ptnjson/DbRowJson.go
diff --git a/ptnjson/helper.go b/ptnjson/helper.go
diff --git a/ptnjson/helper_test.go b/ptnjson/helper_test.go
diff --git a/ptnjson/paymentjson.go b/ptnjson/paymentjson.go
diff --git a/ptnjson/paymentjson_test.go b/ptnjson/paymentjson_test.go
diff --git a/ptnjson/rawtxjson.go b/ptnjson/rawtxjson.go
diff --git a/ptnjson/tokeninfojson.go b/ptnjson/tokeninfojson.go
diff --git a/ptnjson/transactionjson.go b/ptnjson/transactionjson.go
diff --git a/ptnjson/txjson.go b/ptnjson/txjson.go
diff --git a/ptnjson/txpooltxjson.go b/ptnjson/txpooltxjson.go
diff --git a/ptnjson/unitjson.go b/ptnjson/unitjson.go
diff --git a/ptnjson/utxojson.go b/ptnjson/utxojson.go
diff --git a/ptnjson/walletjson/assetjson.go b/ptnjson/walletjson/assetjson.go
diff --git a/ptnjson/walletjson/datajson.go b/ptnjson/walletjson/datajson.go
diff --git a/ptnjson/walletjson/txhistoryjson.go b/ptnjson/walletjson/txhistoryjson.go
diff --git a/ptnjson/walletjson/txjson.go b/ptnjson/walletjson/txjson.go
diff --git a/ptnjson/walletjson/utxojson.go b/ptnjson/walletjson/utxojson.go
diff --git a/vendor/github.com/martinlindhe/base36/LICENSE b/vendor/github.com/martinlindhe/base36/LICENSE
diff --git a/vendor/github.com/martinlindhe/base36/README.md b/vendor/github.com/martinlindhe/base36/README.md
diff --git a/vendor/github.com/martinlindhe/base36/base36.go b/vendor/github.com/martinlindhe/base36/base36.go
diff --git a/vendor/github.com/shopspring/decimal/LICENSE b/vendor/github.com/shopspring/decimal/LICENSE
diff --git a/vendor/github.com/shopspring/decimal/README.md b/vendor/github.com/shopspring/decimal/README.md
diff --git a/vendor/github.com/shopspring/decimal/decimal-go.go b/vendor/github.com/shopspring/decimal/decimal-go.go
diff --git a/vendor/github.com/shopspring/decimal/decimal.go b/vendor/github.com/shopspring/decimal/decimal.go
diff --git a/vendor/github.com/shopspring/decimal/rounding.go b/vendor/github.com/shopspring/decimal/rounding.go
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/LICENSE b/vendor/gopkg.in/natefinch/lumberjack.v2/LICENSE
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/README.md b/vendor/gopkg.in/natefinch/lumberjack.v2/README.md
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/chown.go b/vendor/gopkg.in/natefinch/lumberjack.v2/chown.go
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/chown_linux.go b/vendor/gopkg.in/natefinch/lumberjack.v2/chown_linux.go
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack.go b/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack.go