From 8d7572ef1c9bcf43cfa08d1be017a937c86053f9 Mon Sep 17 00:00:00 2001 From: parmarrushabh Date: Thu, 22 Nov 2018 15:49:29 +0530 Subject: [PATCH] hot fix --- cmd/puppeth/module_dashboard.go | 17 - cmd/puppeth/module_node.go | 4 +- cmd/puppeth/wizard_genesis.go | 14 +- contracts/randomize/contract/XDCRandomize.sol | 11 +- .../randomize/contract/libs/SafeMath.sol | 2 +- contracts/randomize/contract/randomize.go | 37 +- contracts/randomize/randomize.go | 4 +- contracts/randomize/randomize_test.go | 21 +- core/blockchain.go | 21 +- core/blockchain_test.go | 2 +- core/error.go | 2 +- core/genesis_test.go | 2 +- core/state_processor.go | 3 +- core/tx_list.go | 2 +- core/tx_pool.go | 2 +- core/tx_pool_test.go | 13 +- core/types.go | 1 + core/types/block.go | 2 +- core/types/block_test.go | 2 +- core/types/transaction.go | 2 +- core/types/transaction_signing.go | 2 +- core/types/transaction_test.go | 2 +- eth/api.go | 2 +- eth/api_backend.go | 17 +- eth/backend.go | 19 +- eth/backend_test.go | 2 +- eth/config.go | 12 +- eth/downloader/downloader.go | 2 +- eth/downloader/downloader_test.go | 2 +- eth/fetcher/fetcher.go | 2 +- eth/fetcher/fetcher_test.go | 2 +- eth/gasprice/gasprice.go | 2 +- eth/handler.go | 4 +- eth/handler_test.go | 3 +- eth/peer.go | 2 +- eth/protocol_test.go | 2 +- .../testdata/call_tracer_deep_calls.json | 2 +- internal/build/util.go | 2 +- internal/debug/flags.go | 16 +- internal/ethapi/api.go | 6 +- internal/ethapi/backend.go | 2 +- internal/web3ext/web3ext.go | 3 +- miner/miner.go | 1 - miner/worker.go | 18 +- .../btcsuite/btcd/btcec/secp256k1.go | 2 +- .../protoc-gen-go/descriptor/descriptor.pb.go | 20 +- .../karalabe/hid/libusb/libusb/libusb.h | 2 +- .../mattn/go-runewidth/runewidth.go | 2 +- .../nsf/termbox-go/termbox_windows.go | 2 +- .../github.com/robertkrimen/otto/builtin.go | 6 +- .../goleveldb/leveldb/storage/mem_storage.go | 2 +- .../syndtr/goleveldb/leveldb/util.go | 2 +- vendor/golang.org/x/crypto/cast5/cast5.go | 16 +- vendor/golang.org/x/net/html/atom/table.go | 2 +- vendor/golang.org/x/sys/cpu/cpu.go | 2 +- vendor/golang.org/x/sys/cpu/cpu_x86.s | 3 +- .../x/sys/unix/zerrors_darwin_386.go | 4 +- .../x/sys/unix/zerrors_darwin_amd64.go | 4 +- .../x/sys/unix/zerrors_darwin_arm.go | 4 +- .../x/sys/unix/zerrors_darwin_arm64.go | 4 +- .../x/sys/unix/zerrors_freebsd_386.go | 4 +- .../x/sys/unix/zerrors_freebsd_amd64.go | 4 +- .../x/sys/unix/zerrors_freebsd_arm.go | 4 +- .../x/sys/unix/zerrors_netbsd_386.go | 2 +- .../x/sys/unix/zerrors_netbsd_amd64.go | 2 +- .../x/sys/unix/zerrors_netbsd_arm.go | 2 +- .../x/text/encoding/charmap/tables.go | 76 ++-- .../x/text/encoding/korean/tables.go | 188 ++++----- .../text/encoding/simplifiedchinese/tables.go | 380 +++++++++--------- .../encoding/traditionalchinese/tables.go | 314 +++++++-------- .../x/text/encoding/unicode/unicode.go | 2 +- vendor/golang.org/x/text/language/tables.go | 16 +- .../gopkg.in/olebedev/go-duktape.v3/duktape.c | 20 +- vendor/vendor.json | 2 +- 74 files changed, 672 insertions(+), 712 deletions(-) diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 3832b247f8..05150f2a3b 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -40,9 +40,7 @@ var dashboardContent = ` - {{.NetworkTitle}}: Ethereum Testnet - @@ -64,7 +62,6 @@ var dashboardContent = ` } -
@@ -263,13 +260,11 @@ var dashboardContent = `
 Enodes bootnodes = new Enodes();{{range .Bootnodes}}
 bootnodes.append(new Enode("{{.}}"));{{end}}
-
 NodeConfig config = new NodeConfig();
 config.setBootstrapNodes(bootnodes);
 config.setEthereumNetworkID({{.NetworkID}});
 config.setEthereumGenesis(genesis);{{if .Ethstats}}
 config.setEthereumNetStats("{{.Ethstats}}");{{end}}
-
 Node node = new Node(getFilesDir() + "/.{{.Network}}", config);
 node.start();
 
@@ -293,16 +288,13 @@ node.start();
import Geth
 var error: NSError?
-
 let bootnodes = GethNewEnodesEmpty(){{range .Bootnodes}}
 bootnodes?.append(GethNewEnode("{{.}}", &error)){{end}}
-
 let config = GethNewNodeConfig()
 config?.setBootstrapNodes(bootnodes)
 config?.setEthereumNetworkID({{.NetworkID}})
 config?.setEthereumGenesis(genesis){{if .Ethstats}}
 config?.setEthereumNetStats("{{.Ethstats}}"){{end}}
-
 let datadir = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0]
 let node = GethNewNode(datadir + "/.{{.Network}}", config, &error);
 try! node?.start();
@@ -436,14 +428,12 @@ try! node?.start();
 				
-