hot fix

2026-06-19 21:31:37 +00:00 · 2018-11-22 15:49:29 +05:30 · 2018-11-22 15:49:29 +05:30 · 8d7572ef1c
commit 8d7572ef1c
parent 2f4ae0f385
74 changed files with 672 additions and 712 deletions
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@ -40,9 +40,7 @@ var dashboardContent = `
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
-
 		<title>{{.NetworkTitle}}: Ethereum Testnet</title>
-
 		<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 		<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
 		<link href="https://cdnjs.cloudflare.com/ajax/libs/gentelella/1.3.0/css/custom.min.css" rel="stylesheet">
@ -64,7 +62,6 @@ var dashboardContent = `
 			}
 		</style>
 	</head>
-
 	<body class="nav-sm" style="overflow-x: hidden">
 		<div class="container body">
 			<div class="main_container">
@ -263,13 +260,11 @@ var dashboardContent = `
 <pre>
 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();
 </pre>
@ -293,16 +288,13 @@ node.start();
 											<pre>import Geth</pre>
 <pre>
 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();
 				</div>
 			</div>
 		</div>
-
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.0/jquery.min.js"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/gentelella/1.3.0/js/custom.min.js"></script>
 		<script>
 			var load = function(hash) {
 				window.location.hash = hash;
-
 				// Fade out all possible pages (yes, ugly, no, don't care)
 				$("#geth").fadeOut(300)
 				$("#mist").fadeOut(300)
@ -451,7 +441,6 @@ try! node?.start();
 				$("#other").fadeOut(300)
 				$("#about").fadeOut(300)
 				$("#frame-wrapper").fadeOut(300);
-
 				// Depending on the hash, resolve it into a local or remote URL
 				var url = hash;
 				switch (hash) {
@ -483,7 +472,6 @@ try! node?.start();
 				var sidebar = $($(".navbar")[0]).width();
 				var limit   = document.body.clientWidth - sidebar;
 				var scale   = limit / 1920;
-
 				$("#frame-wrapper").width(limit);
 				$("#frame-wrapper").height(document.body.clientHeight / scale);
 				$("#frame-wrapper").css({
@ -492,7 +480,6 @@ try! node?.start();
 				});
 			};
 			$(window).resize(resize);
-
 			if (window.location.hash == "") {
 				var item = $(".side-menu").children()[0];
 				$(item).children()[0].click();
@ -517,7 +504,6 @@ var dashboardMascot = []byte("\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x01s\x
 // to aggregate various private network services under one easily accessible page.
 var dashboardDockerfile = `
 FROM mhart/alpine-node:latest
-
 RUN \
 	npm install connect serve-static && \
 	\
@ -526,7 +512,6 @@ RUN \
 	echo 'connect().use(serveStatic("/dashboard")).listen(80, function(){' >> server.js && \
 	echo '    console.log("Server running on 80...");'                     >> server.js && \
 	echo '});'                                                             >> server.js
-
 ADD {{.Network}}.json /dashboard/{{.Network}}.json
 ADD {{.Network}}-cpp.json /dashboard/{{.Network}}-cpp.json
 ADD {{.Network}}-harmony.json /dashboard/{{.Network}}-harmony.json
@ -534,9 +519,7 @@ ADD {{.Network}}-parity.json /dashboard/{{.Network}}-parity.json
 ADD {{.Network}}-python.json /dashboard/{{.Network}}-python.json
 ADD index.html /dashboard/index.html
 ADD puppeth.png /dashboard/puppeth.png
-
 EXPOSE 80
-
 CMD ["node", "/server.js"]
 `

--- a/cmd/puppeth/module_node.go
+++ b/cmd/puppeth/module_node.go
@ -184,7 +184,7 @@ func (info *nodeInfos) Report() map[string]string {
 			report["Miner account"] = info.etherbase
 		}
 		if info.keyJSON != "" {
-			// Clique XDPoS
+			// XDPoS XinFin-DPoS signer
 			var key struct {
 				Address string `json:"address"`
 			}
@ -221,7 +221,7 @@ func checkNode(client *sshClient, network string, boot bool) (*nodeInfos, error)

 	// Container available, retrieve its node ID and its genesis json
 	var out []byte
-	if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 geth --exec admin.nodeInfo.id attach", network, kind)); err != nil {
+	if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 XDC --exec admin.nodeInfo.id attach", network, kind)); err != nil {
 		return nil, ErrServiceUnreachable
 	}
 	id := bytes.Trim(bytes.TrimSpace(out), "\"")
--- a/cmd/puppeth/wizard_genesis.go
+++ b/cmd/puppeth/wizard_genesis.go
@ -63,7 +63,7 @@ func (w *wizard) makeGenesis() {
 	fmt.Println("Which consensus engine to use? (default = XDPoS)")
 	fmt.Println(" 1. Ethash - proof-of-work")
 	fmt.Println(" 2. Clique - proof-of-authority")
-	fmt.Println(" 3. XDPoS - proof-of-stake-voting")
+	fmt.Println(" 3. XDPoS - XinFin-DPoS")

 	choice := w.read()
 	switch {
@ -122,8 +122,8 @@ func (w *wizard) makeGenesis() {
 		genesis.Config.XDPoS.Period = uint64(w.readDefaultInt(2))

 		fmt.Println()
-		fmt.Println("How many Ethers should be rewarded to masternode? (default = 10)")
-		genesis.Config.XDPoS.Reward = uint64(w.readDefaultInt(10))
+		fmt.Println("How many XDC should be rewarded to masternode? (default = 100)")
+		genesis.Config.XDPoS.Reward = uint64(w.readDefaultInt(100))

 		fmt.Println()
 		fmt.Println("Who own the first masternodes? (mandatory)")
@ -152,7 +152,7 @@ func (w *wizard) makeGenesis() {
 			}
 		}
 		validatorCap := new(big.Int)
-		validatorCap.SetString("50000000000000000000000", 10)
+		validatorCap.SetString("10000000000000000000000000", 10)
 		var validatorCaps []*big.Int
 		genesis.ExtraData = make([]byte, 32+len(signers)*common.AddressLength+65)
 		for i, signer := range signers {
@ -161,8 +161,8 @@ func (w *wizard) makeGenesis() {
 		}

 		fmt.Println()
-		fmt.Println("How many blocks per epoch? (default = 900)")
-		epochNumber := uint64(w.readDefaultInt(900))
+		fmt.Println("How many blocks per epoch? (default = 1800)")
+		epochNumber := uint64(w.readDefaultInt(1800))
 		genesis.Config.XDPoS.Epoch = epochNumber
 		genesis.Config.XDPoS.RewardCheckpoint = epochNumber

@ -413,4 +413,4 @@ func (w *wizard) manageGenesis() {
 	default:
 		log.Error("That's not something I can do")
 	}
-}
+}
--- a/contracts/randomize/contract/XDCRandomize.sol
+++ b/contracts/randomize/contract/XDCRandomize.sol
@ -4,20 +4,23 @@ import "./libs/SafeMath.sol";

 contract XDCRandomize {
    using SafeMath for uint256;
-    uint256 public randomNumber;

    mapping (address=>bytes32[]) randomSecret;
    mapping (address=>bytes32) randomOpening;

-    function XDCRandomize (uint256 _randomNumber) public {
-        randomNumber = _randomNumber;
+    function XDCRandomize () public {
    }

    function setSecret(bytes32[] _secret) public {
+        uint secretPoint =  block.number % 900;
+        require(secretPoint >= 800);
+        require(secretPoint < 850);
        randomSecret[msg.sender] = _secret;
    }

    function setOpening(bytes32 _opening) public {
+        uint openingPoint =  block.number % 900;
+        require(openingPoint >= 850);
        randomOpening[msg.sender] = _opening;
    }

@ -28,4 +31,4 @@ contract XDCRandomize {
    function getOpening(address _validator) public view returns(bytes32) {
        return randomOpening[_validator];
    }
-}
+}
--- a/contracts/randomize/contract/libs/SafeMath.sol
+++ b/contracts/randomize/contract/libs/SafeMath.sol
@ -44,4 +44,4 @@ library SafeMath {
    assert(c >= a);
    return c;
  }
-}
+}
--- a/contracts/randomize/contract/randomize.go
+++ b/contracts/randomize/contract/randomize.go
@ -4,7 +4,6 @@
 package contract

 import (
-	"math/big"
 	"strings"

 	"github.com/ethereum/go-ethereum/accounts/abi"
@ -175,18 +174,18 @@ func (_SafeMath *SafeMathTransactorRaw) Transact(opts *bind.TransactOpts, method
 }

 // XDCRandomizeABI is the input ABI used to generate the binding from.
-const XDCRandomizeABI = "[{\"constant\":true,\"inputs\":[{\"name\":\"_validator\",\"type\":\"address\"}],\"name\":\"getSecret\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_secret\",\"type\":\"bytes32[]\"}],\"name\":\"setSecret\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"randomNumber\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_validator\",\"type\":\"address\"}],\"name\":\"getOpening\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_opening\",\"type\":\"bytes32\"}],\"name\":\"setOpening\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"name\":\"_randomNumber\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"}]"
+const XDCRandomizeABI = "[{\"constant\":true,\"inputs\":[{\"name\":\"_validator\",\"type\":\"address\"}],\"name\":\"getSecret\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_secret\",\"type\":\"bytes32[]\"}],\"name\":\"setSecret\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_validator\",\"type\":\"address\"}],\"name\":\"getOpening\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_opening\",\"type\":\"bytes32\"}],\"name\":\"setOpening\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"}]"

 // XDCRandomizeBin is the compiled bytecode used for deploying new contracts.
-const XDCRandomizeBin = `0x608060405234801561001057600080fd5b5060405160208061035b8339810160405251600055610327806100346000396000f30060806040526004361061006c5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663284180fc811461007157806334d38600146100ef578063ccbac9f514610146578063d442d6cc1461016d578063e11f5ba21461019b575b600080fd5b34801561007d57600080fd5b5061009f73ffffffffffffffffffffffffffffffffffffffff600435166101b3565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156100db5781810151838201526020016100c3565b505050509050019250505060405180910390f35b3480156100fb57600080fd5b50604080516020600480358082013583810280860185019096528085526101449536959394602494938501929182918501908490808284375094975061022d9650505050505050565b005b34801561015257600080fd5b5061015b610251565b60408051918252519081900360200190f35b34801561017957600080fd5b5061015b73ffffffffffffffffffffffffffffffffffffffff60043516610257565b3480156101a757600080fd5b5061014460043561027f565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001602090815260409182902080548351818402810184019094528084526060939283018282801561022157602002820191906000526020600020905b8154815260019091019060200180831161020c575b50505050509050919050565b336000908152600160209081526040909120825161024d92840190610291565b5050565b60005481565b73ffffffffffffffffffffffffffffffffffffffff1660009081526002602052604090205490565b33600090815260026020526040902055565b8280548282559060005260206000209081019282156102ce579160200282015b828111156102ce57825182556020909201916001909101906102b1565b506102da9291506102de565b5090565b6102f891905b808211156102da57600081556001016102e4565b905600a165627a7a7230582027c1c755e5d546967a2057a4338eb36cf7ec5972758d7f7a8427abdfc890bd590029`
+const XDCRandomizeBin = `0x6060604052341561000f57600080fd5b6103368061001e6000396000f3006060604052600436106100615763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663284180fc811461006657806334d38600146100d8578063d442d6cc14610129578063e11f5ba21461015a575b600080fd5b341561007157600080fd5b610085600160a060020a0360043516610170565b60405160208082528190810183818151815260200191508051906020019060200280838360005b838110156100c45780820151838201526020016100ac565b505050509050019250505060405180910390f35b34156100e357600080fd5b61012760046024813581810190830135806020818102016040519081016040528093929190818152602001838360200280828437509496506101f395505050505050565b005b341561013457600080fd5b610148600160a060020a0360043516610243565b60405190815260200160405180910390f35b341561016557600080fd5b61012760043561025e565b61017861028e565b60008083600160a060020a0316600160a060020a031681526020019081526020016000208054806020026020016040519081016040528092919081815260200182805480156101e757602002820191906000526020600020905b815481526001909101906020018083116101d2575b50505050509050919050565b610384430661032081101561020757600080fd5b610352811061021557600080fd5b600160a060020a033316600090815260208190526040902082805161023e9291602001906102a0565b505050565b600160a060020a031660009081526001602052604090205490565b610384430661035281101561027257600080fd5b50600160a060020a033316600090815260016020526040902055565b60206040519081016040526000815290565b8280548282559060005260206000209081019282156102dd579160200282015b828111156102dd57825182556020909201916001909101906102c0565b506102e99291506102ed565b5090565b61030791905b808211156102e957600081556001016102f3565b905600a165627a7a7230582034991c8dc4001fc254f3ba2811c05d2e7d29bee3908946ca56d1545b2c852de20029`

 // DeployXDCRandomize deploys a new Ethereum contract, binding an instance of XDCRandomize to it.
-func DeployXDCRandomize(auth *bind.TransactOpts, backend bind.ContractBackend, _randomNumber *big.Int) (common.Address, *types.Transaction, *XDCRandomize, error) {
+func DeployXDCRandomize(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *XDCRandomize, error) {
 	parsed, err := abi.JSON(strings.NewReader(XDCRandomizeABI))
 	if err != nil {
 		return common.Address{}, nil, nil, err
 	}
-	address, tx, contract, err := bind.DeployContract(auth, parsed, common.FromHex(XDCRandomizeBin), backend, _randomNumber)
+	address, tx, contract, err := bind.DeployContract(auth, parsed, common.FromHex(XDCRandomizeBin), backend)
 	if err != nil {
 		return common.Address{}, nil, nil, err
 	}
@ -387,32 +386,6 @@ func (_XDCRandomize *XDCRandomizeCallerSession) GetSecret(_validator common.Addr
 	return _XDCRandomize.Contract.GetSecret(&_XDCRandomize.CallOpts, _validator)
 }

-// RandomNumber is a free data retrieval call binding the contract method 0xccbac9f5.
-//
-// Solidity: function randomNumber() constant returns(uint256)
-func (_XDCRandomize *XDCRandomizeCaller) RandomNumber(opts *bind.CallOpts) (*big.Int, error) {
-	var (
-		ret0 = new(*big.Int)
-	)
-	out := ret0
-	err := _XDCRandomize.contract.Call(opts, out, "randomNumber")
-	return *ret0, err
-}
-
-// RandomNumber is a free data retrieval call binding the contract method 0xccbac9f5.
-//
-// Solidity: function randomNumber() constant returns(uint256)
-func (_XDCRandomize *XDCRandomizeSession) RandomNumber() (*big.Int, error) {
-	return _XDCRandomize.Contract.RandomNumber(&_XDCRandomize.CallOpts)
-}
-
-// RandomNumber is a free data retrieval call binding the contract method 0xccbac9f5.
-//
-// Solidity: function randomNumber() constant returns(uint256)
-func (_XDCRandomize *XDCRandomizeCallerSession) RandomNumber() (*big.Int, error) {
-	return _XDCRandomize.Contract.RandomNumber(&_XDCRandomize.CallOpts)
-}
-
 // SetOpening is a paid mutator transaction binding the contract method 0xe11f5ba2.
 //
 // Solidity: function setOpening(_opening bytes32) returns()
@ -453,4 +426,4 @@ func (_XDCRandomize *XDCRandomizeSession) SetSecret(_secret [][32]byte) (*types.
 // Solidity: function setSecret(_secret bytes32[]) returns()
 func (_XDCRandomize *XDCRandomizeTransactorSession) SetSecret(_secret [][32]byte) (*types.Transaction, error) {
 	return _XDCRandomize.Contract.SetSecret(&_XDCRandomize.TransactOpts, _secret)
-}
+}
--- a/contracts/randomize/randomize.go
+++ b/contracts/randomize/randomize.go
@ -1,4 +1,4 @@
-// Copyright (c) 2018 Xinfin
+// Copyright (c) 2018 XDCchain
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Lesser General Public License as published by
@ -53,4 +53,4 @@ func DeployRandomize(transactOpts *bind.TransactOpts, contractBackend bind.Contr
 	}

 	return randomizeAddr, randomize, nil
-}
+}
--- a/contracts/randomize/randomize_test.go
+++ b/contracts/randomize/randomize_test.go
@ -1,3 +1,18 @@
+// Copyright (c) 2018 XDCchain
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package randomize

 import (
@ -88,7 +103,6 @@ func TestSendTxRandomizeSecretAndOpening(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Can't send tx for create randomize secret: %v", err)
 			}
-			break
 		case 850:
 			// Set opening.
 			tx, err := contracts.BuildTxOpeningRandomize(nonce, randomizeAddr, randomizeKeyValue)
@ -103,7 +117,6 @@ func TestSendTxRandomizeSecretAndOpening(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Can't send tx for create randomize opening: %v", err)
 			}
-			break

 		case 900:
 			// Get randomize secret from SC.
@ -124,7 +137,6 @@ func TestSendTxRandomizeSecretAndOpening(t *testing.T) {
 			if err != nil {
 				t.Error("Can't decrypt secret and opening", err)
 			}
-			break
 		default:
 			tx, err := types.SignTx(types.NewTransaction(nonce, common.Address{}, new(big.Int), 21000, new(big.Int), nil), signer, acc1Key)
 			if err != nil {
@ -134,8 +146,7 @@ func TestSendTxRandomizeSecretAndOpening(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Can't send tx for create randomize: %v", err)
 			}
-			break
 		}
 		backend.Commit()
 	}
-}
+}
--- a/core/blockchain.go
+++ b/core/blockchain.go
@ -57,8 +57,8 @@ var (
 )

 const (
-	bodyCacheLimit      = 2560
-	blockCacheLimit     = 2560
+	bodyCacheLimit      = 256
+	blockCacheLimit     = 256
 	maxFutureBlocks     = 256
 	maxTimeFutureBlocks = 30
 	badBlockLimit       = 10
@ -127,11 +127,11 @@ type BlockChain struct {
 	bodyRLPCache     *lru.Cache     // Cache for the most recent block bodies in RLP encoded format
 	blockCache       *lru.Cache     // Cache for the most recent entire blocks
 	futureBlocks     *lru.Cache     // future blocks are blocks added for later processing
-	resultProcess    *lru.Cache
-	calculatingBlock *lru.Cache
-	downloadingBlock *lru.Cache
-	quit             chan struct{} // blockchain quit channel
-	running          int32         // running must be called atomically
+	resultProcess    *lru.Cache     // Cache for processed blocks
+	calculatingBlock *lru.Cache     // Cache for processing blocks
+	downloadingBlock *lru.Cache     // Cache for downloading blocks (avoid duplication from fetcher)
+	quit             chan struct{}  // blockchain quit channel
+	running          int32          // running must be called atomically
 	// procInterrupt must be atomically called
 	procInterrupt int32          // interrupt signaler for block processing
 	wg            sync.WaitGroup // chain processing wait group for shutting down
@ -981,14 +981,13 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
 	// If the total difficulty is higher than our known, add it to the canonical chain
 	// Second clause in the if statement reduces the vulnerability to selfish mining.
 	// Please refer to http://www.cs.cornell.edu/~ie53/publications/btcProcFC.pdf
-
 	reorg := externTd.Cmp(localTd) > 0
 	currentBlock = bc.CurrentBlock()
 	if !reorg && externTd.Cmp(localTd) == 0 {
 		// Split same-difficulty blocks by number
 		reorg = block.NumberU64() > currentBlock.NumberU64()
 	}
-		if reorg {
+	if reorg {
 		// Reorganise the chain if the parent is not the head block
 		if block.ParentHash() != currentBlock.Hash() {
 			if err := bc.reorg(currentBlock, block); err != nil {
@ -1666,9 +1665,11 @@ func (bc *BlockChain) reportBlock(block *types.Block, receipts types.Receipts, e
 	log.Error(fmt.Sprintf(`
 ########## BAD BLOCK #########
 Chain config: %v
+
 Number: %v
 Hash: 0x%x
 %v
+
 Error: %v
 ##############################
 `, bc.chainConfig, block.Number(), block.Hash(), receiptString, err))
@ -1876,4 +1877,4 @@ func (bc *BlockChain) UpdateM1() error {
 		log.Info("Masternodes are ready for the next epoch")
 	}
 	return nil
-}
+}
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@ -1330,4 +1330,4 @@ func TestLargeReorgTrieGC(t *testing.T) {
 			t.Fatalf("competitor %d: competing chain state missing", i)
 		}
 	}
-}
+}
--- a/core/error.go
+++ b/core/error.go
@ -37,5 +37,5 @@ var (

 	ErrNotFoundM1 = errors.New("list M1 not found ")

-	ErrStopPreparingBlock = errors.New("stop calculate a block not vrified M2")
+	ErrStopPreparingBlock = errors.New("stop calculating a block not verified by M2")
 )
--- a/core/genesis_test.go
+++ b/core/genesis_test.go
@ -42,7 +42,7 @@ func TestDefaultGenesisBlock(t *testing.T) {

 func TestSetupGenesis(t *testing.T) {
 	var (
-		customghash = common.HexToHash("0xaca4cb4e674345d92cee5c9e311a132161a5d6d0a997989394d66f2cbb18be49")
+		customghash = common.HexToHash("0xfc8a143549950b0d3e3e7b70b0067b152e6b903ab5438f1ea87f0448ec93da48")
 		customg     = Genesis{
 			Config: &params.ChainConfig{HomesteadBlock: big.NewInt(3)},
 			Alloc: GenesisAlloc{
--- a/core/state_processor.go
+++ b/core/state_processor.go
@ -1,4 +1,3 @@
-
 // Copyright 2015 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
@ -196,4 +195,4 @@ func InitSignerInTransactions(config *params.ChainConfig, header *types.Header,
 		}(from, to)
 	}
 	wg.Wait()
-}
+}
--- a/core/tx_list.go
+++ b/core/tx_list.go
@ -508,4 +508,4 @@ func (l *txPricedList) Discard(count int, local *accountSet) types.Transactions
 		heap.Push(l.items, tx)
 	}
 	return drop
-}
+}
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@ -1229,4 +1229,4 @@ func (as *accountSet) containsTx(tx *types.Transaction) bool {
 // add inserts a new address into the set to track.
 func (as *accountSet) add(addr common.Address) {
 	as.accounts[addr] = struct{}{}
-}
+}
--- a/core/tx_pool_test.go
+++ b/core/tx_pool_test.go
@ -932,14 +932,14 @@ func TestTransactionPendingLimiting(t *testing.T) {

 	account, _ := deriveSender(transaction(0, 0, key))
 	pool.currentState.AddBalance(account, big.NewInt(1000000))
-
+	testTxPoolConfig.AccountQueue = 10
 	// Keep track of transaction events to ensure all executables get announced
-	events := make(chan TxPreEvent, testTxPoolConfig.AccountQueue+5)
+	events := make(chan TxPreEvent, testTxPoolConfig.AccountQueue)
 	sub := pool.txFeed.Subscribe(events)
 	defer sub.Unsubscribe()

 	// Keep queuing up transactions and make sure all above a limit are dropped
-	for i := uint64(0); i < testTxPoolConfig.AccountQueue+5; i++ {
+	for i := uint64(0); i < testTxPoolConfig.AccountQueue; i++ {
 		if err := pool.AddRemote(transaction(i, 100000, key)); err != nil {
 			t.Fatalf("tx %d: failed to add transaction: %v", i, err)
 		}
@ -950,10 +950,10 @@ func TestTransactionPendingLimiting(t *testing.T) {
 			t.Errorf("tx %d: queue size mismatch: have %d, want %d", i, pool.queue[account].Len(), 0)
 		}
 	}
-	if len(pool.all) != int(testTxPoolConfig.AccountQueue+5) {
+	if len(pool.all) != int(testTxPoolConfig.AccountQueue) {
 		t.Errorf("total transaction mismatch: have %d, want %d", len(pool.all), testTxPoolConfig.AccountQueue+5)
 	}
-	if err := validateEvents(events, int(testTxPoolConfig.AccountQueue+5)); err != nil {
+	if err := validateEvents(events, int(testTxPoolConfig.AccountQueue)); err != nil {
 		t.Fatalf("event firing failed: %v", err)
 	}
 	if err := validateTxPoolInternals(pool); err != nil {
@ -1106,6 +1106,7 @@ func TestTransactionPendingMinimumAllowance(t *testing.T) {
 	blockchain := &testBlockChain{statedb, 1000000, new(event.Feed)}

 	config := testTxPoolConfig
+	config.AccountSlots = 10
 	config.GlobalSlots = 0
 	config.AccountSlots = 5
 	pool := NewTxPool(config, params.TestChainConfig, blockchain)
@ -1777,4 +1778,4 @@ func benchmarkPoolBatchInsert(b *testing.B, size int) {
 	for _, batch := range batches {
 		pool.AddRemotes(batch)
 	}
-}
+}
--- a/core/types.go
+++ b/core/types.go
@ -42,5 +42,6 @@ type Validator interface {
 // of gas used in the process and return an error if any of the internal rules
 // failed.
 type Processor interface {
+	Process(block *types.Block, statedb *state.StateDB, cfg vm.Config) (types.Receipts, []*types.Log, uint64, error)
 	ProcessBlockNoValidator(block *CalculatedBlock, statedb *state.StateDB, cfg vm.Config) (types.Receipts, []*types.Log, uint64, error)
 }
--- a/core/types/block.go
+++ b/core/types/block.go
@ -482,4 +482,4 @@ func (self blockSorter) Swap(i, j int) {
 }
 func (self blockSorter) Less(i, j int) bool { return self.by(self.blocks[i], self.blocks[j]) }

-func Number(b1, b2 *Block) bool { return b1.header.Number.Cmp(b2.header.Number) < 0 }
+func Number(b1, b2 *Block) bool { return b1.header.Number.Cmp(b2.header.Number) < 0 }
--- a/core/types/block_test.go
+++ b/core/types/block_test.go
@ -58,4 +58,4 @@ func TestBlockEncoding(t *testing.T) {
 	if !bytes.Equal(ourBlockEnc, blockEnc) {
 		t.Errorf("encoded block mismatch:\ngot:  %x\nwant: %x", ourBlockEnc, blockEnc)
 	}
-}
+}
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@ -505,4 +505,4 @@ func (m Message) Value() *big.Int      { return m.amount }
 func (m Message) Gas() uint64          { return m.gasLimit }
 func (m Message) Nonce() uint64        { return m.nonce }
 func (m Message) Data() []byte         { return m.data }
-func (m Message) CheckNonce() bool     { return m.checkNonce }
+func (m Message) CheckNonce() bool     { return m.checkNonce }
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@ -268,4 +268,4 @@ func CacheSigner(signer Signer, tx *Transaction) {
 		return
 	}
 	tx.from.Store(sigCache{signer: signer, from: addr})
-}
+}
--- a/core/types/transaction_test.go
+++ b/core/types/transaction_test.go
@ -232,4 +232,4 @@ func TestTransactionJSON(t *testing.T) {
 			t.Errorf("invalid chain id, want %d, got %d", tx.ChainId(), parsedTx.ChainId())
 		}
 	}
-}
+}
--- a/eth/api.go
+++ b/eth/api.go
@ -483,4 +483,4 @@ func (api *PrivateDebugAPI) getModifiedAccounts(startBlock, endBlock *types.Bloc
 		dirty = append(dirty, common.BytesToAddress(key))
 	}
 	return dirty, nil
-}
+}
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@ -18,11 +18,8 @@ package eth

 import (
 	"context"
-	"encoding/json"
 	"github.com/ethereum/go-ethereum/consensus/XDPoS"
-	"io/ioutil"
 	"math/big"
-	"path/filepath"

 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
@ -244,18 +241,6 @@ func (s *EthApiBackend) GetRewardByHash(hash common.Hash) map[string]interface{}
 		if rewards != nil {
 			return rewards
 		}
-	} else {
-		header := s.eth.blockchain.GetHeaderByHash(hash)
-		if header != nil {
-			data, err := ioutil.ReadFile(filepath.Join(s.eth.config.StoreRewardFolder, header.Number.String()+"."+header.Hash().Hex()))
-			if err == nil {
-				rewards := make(map[string]interface{})
-				err = json.Unmarshal(data, &rewards)
-				if err == nil {
-					return rewards
-				}
-			}
-		}
 	}
 	return make(map[string]interface{})
-}
+}
--- a/eth/backend.go
+++ b/eth/backend.go
@ -1,4 +1,3 @@
-
 // Copyright 2014 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
@ -235,13 +234,13 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 		eth.protocolManager.fetcher.SetAppendM2HeaderHook(appendM2HeaderHook)

 		// Hook prepares validators M2 for the current epoch at checkpoint block
-		c.HookValidator = func(header *types.Header, signers []common.Address) ([]byte, error) {	
+		c.HookValidator = func(header *types.Header, signers []common.Address) ([]byte, error) {
 			start := time.Now()
 			validators, err := GetValidators(eth.blockchain, signers)
 			if err != nil {
 				return []byte{}, err
 			}
-			header.Validators = validators	
+			header.Validators = validators
 			log.Debug("Time Calculated HookValidator ", "block", header.Number.Uint64(), "time", common.PrettyDuration(time.Since(start)))
 			return validators, nil
 		}
@ -313,7 +312,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {

 				totalSigner := new(uint64)
 				signers, err := contracts.GetRewardForCheckpoint(chain, addr, number, rCheckpoint, client, totalSigner)
-				fmt.Println("Time Get Signers", "block", header.Number.Uint64(), "time", common.PrettyDuration(time.Since(start)))
 				if err != nil {
 					log.Error("Fail to get signers for reward checkpoint", "error", err)
 					return err, nil
@ -333,20 +331,17 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 				// Add reward for coin holders.
 				voterResults := make(map[common.Address]interface{})
 				if len(signers) > 0 {
-					// vmenv := core.NewRuntimeEVM(state)
 					for signer, calcReward := range rewardSigners {
-						 err, rewards := contracts.CalculateRewardForHolders(foudationWalletAddr, validator, state, signer, calcReward)
-						// err, rewards := contracts.CalculateRewardForHolders2(foudationWalletAddr, vmenv, state, signer, calcReward)
+						err, rewards := contracts.CalculateRewardForHolders(foudationWalletAddr, validator, state, signer, calcReward)
 						if err != nil {
 							log.Error("Fail to calculate reward for holders.", "error", err)
-							return err, nil	
+							return err, nil
 						}
 						voterResults[signer] = rewards
 					}
 				}
 				rewards["rewards"] = voterResults
-							// log.Debug("Time Calculated HookReward ", "block", header.Number.Uint64(), "time", common.PrettyDuration(time.Since(start)))
-							fmt.Println("Time Calculated HookReward ", "block", header.Number.Uint64(), "time", common.PrettyDuration(time.Since(start)))
+				log.Debug("Time Calculated HookReward ", "block", header.Number.Uint64(), "time", common.PrettyDuration(time.Since(start)))
 			}
 			return nil, rewards
 		}
@ -435,7 +430,7 @@ func CreateDB(ctx *node.ServiceContext, config *Config, name string) (ethdb.Data

 // CreateConsensusEngine creates the required type of consensus engine instance for an Ethereum service
 func CreateConsensusEngine(ctx *node.ServiceContext, config *ethash.Config, chainConfig *params.ChainConfig, db ethdb.Database) consensus.Engine {
-	// If proof-of-stake-voting is requested, set it up
+	// If XinFin-DPoS is requested, set it up
 	if chainConfig.XDPoS != nil {
 		return XDPoS.New(chainConfig.XDPoS, db)
 	}
@ -719,4 +714,4 @@ func rewardInflation(chainReward *big.Int, number uint64, blockPerYear uint64) *
 	}

 	return chainReward
-}
+}
--- a/eth/backend_test.go
+++ b/eth/backend_test.go
@ -21,4 +21,4 @@ func TestRewardInflation(t *testing.T) {
 			t.Error("Fail tor calculate reward inflation above 6 years", "chainReward", chainReward)
 		}
 	}
-}
+}
--- a/eth/config.go
+++ b/eth/config.go
@ -43,7 +43,7 @@ var DefaultConfig = Config{
 		DatasetsInMem:  1,
 		DatasetsOnDisk: 2,
 	},
-	NetworkId:     1,
+	NetworkId:     89,
 	LightPeers:    100,
 	DatabaseCache: 768,
 	TrieCache:     256,
@ -80,8 +80,10 @@ type Config struct {

 	// Protocol options
 	NetworkId uint64 // Network ID to use for selecting peers to connect to
-	SyncMode  downloader.SyncMode	NoPruning bool
-    // Light client options
+	SyncMode  downloader.SyncMode
+	NoPruning bool
+
+	// Light client options
 	LightServ  int `toml:",omitempty"` // Maximum percentage of time allowed for serving LES requests
 	LightPeers int `toml:",omitempty"` // Maximum number of LES client peers

@ -96,7 +98,7 @@ type Config struct {
 	Etherbase    common.Address `toml:",omitempty"`
 	MinerThreads int            `toml:",omitempty"`
 	ExtraData    []byte         `toml:",omitempty"`
-	GasPrice     *big.Int		
+	GasPrice     *big.Int

 	// Ethash options
 	Ethash ethash.Config
@ -118,4 +120,4 @@ type Config struct {

 type configMarshaling struct {
 	ExtraData hexutil.Bytes
-}
+}
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@ -1663,4 +1663,4 @@ func (d *Downloader) requestTTL() time.Duration {
 		ttl = ttlLimit
 	}
 	return ttl
-}
+}
--- a/eth/downloader/downloader_test.go
+++ b/eth/downloader/downloader_test.go
@ -1755,4 +1755,4 @@ func testDeliverHeadersHang(t *testing.T, protocol int, mode SyncMode) {
 		// Flush all goroutines to prevent messing with subsequent tests
 		tester.downloader.peers.peers["peer"].peer.(*floodingTestPeer).pend.Wait()
 	}
-}
+}
--- a/eth/fetcher/fetcher.go
+++ b/eth/fetcher/fetcher.go
@ -791,4 +791,4 @@ func (f *Fetcher) SetSignHook(signHook func(*types.Block) error) {
 // Bind append m2 to block header hook when imported into chain.
 func (f *Fetcher) SetAppendM2HeaderHook(appendM2HeaderHook func(*types.Block) (*types.Block, bool, error)) {
 	f.appendM2HeaderHook = appendM2HeaderHook
-}
+}
--- a/eth/fetcher/fetcher_test.go
+++ b/eth/fetcher/fetcher_test.go
@ -842,4 +842,4 @@ func TestBlockMemoryExhaustionAttack(t *testing.T) {
 		verifyImportEvent(t, imported, true)
 	}
 	verifyImportDone(t, imported)
-}
+}
--- a/eth/gasprice/gasprice.go
+++ b/eth/gasprice/gasprice.go
@ -192,4 +192,4 @@ type bigIntArray []*big.Int

 func (s bigIntArray) Len() int           { return len(s) }
 func (s bigIntArray) Less(i, j int) bool { return s[i].Cmp(s[j]) < 0 }
-func (s bigIntArray) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s bigIntArray) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
--- a/eth/handler.go
+++ b/eth/handler.go
@ -665,7 +665,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 			// scenario should easily be covered by the fetcher.
 			currentBlock := pm.blockchain.CurrentBlock()
 			if trueTD.Cmp(pm.blockchain.GetTd(currentBlock.Hash(), currentBlock.NumberU64())) > 0 {
-			go pm.synchronise(p)
+				go pm.synchronise(p)
 			}
 		}

@ -790,4 +790,4 @@ func (self *ProtocolManager) NodeInfo() *NodeInfo {
 		Config:     self.blockchain.Config(),
 		Head:       currentBlock.Hash(),
 	}
-}
+}
--- a/eth/handler_test.go
+++ b/eth/handler_test.go
@ -245,7 +245,8 @@ func testGetBlockBodies(t *testing.T, protocol int) {
 		{1, nil, nil, 1},             // A single random block should be retrievable
 		{10, nil, nil, 10},           // Multiple random blocks should be retrievable
 		{limit, nil, nil, limit},     // The maximum possible blocks should be retrievable
-		{limit + 1, nil, nil, limit}, // No more than the possible block count should be returned		{0, []common.Hash{pm.blockchain.Genesis().Hash()}, []bool{true}, 1},      // The genesis block should be retrievable
+		{limit + 1, nil, nil, limit}, // No more than the possible block count should be returned
+		{0, []common.Hash{pm.blockchain.Genesis().Hash()}, []bool{true}, 1},      // The genesis block should be retrievable
 		{0, []common.Hash{pm.blockchain.CurrentBlock().Hash()}, []bool{true}, 1}, // The chains head block should be retrievable
 		{0, []common.Hash{{}}, []bool{false}, 0},                                 // A non existent block should not be returned

--- a/eth/peer.go
+++ b/eth/peer.go
@ -469,4 +469,4 @@ func (ps *peerSet) Close() {
 		p.Disconnect(p2p.DiscQuitting)
 	}
 	ps.closed = true
-}
+}
--- a/eth/protocol_test.go
+++ b/eth/protocol_test.go
@ -220,4 +220,4 @@ func TestGetBlockHeadersDataEncodeDecode(t *testing.T) {
 			}
 		}
 	}
-}
+}
--- a/eth/tracers/testdata/call_tracer_deep_calls.json
+++ b/eth/tracers/testdata/call_tracer_deep_calls.json
@ -89,7 +89,7 @@
      "chainId": 3,
      "daoForkSupport": true,
      "eip150Block": 0,
-      "eip150Hash": "0x62e0fde86e34c263e250fbcd5ca4598ba8ca10a1d166c8526bb127e10b313311 ",
+      "eip150Hash": "0x62e0fde86e34c263e250fbcd5ca4598ba8ca10a1d166c8526bb127e10b313311",
      "eip155Block": 10,
      "eip158Block": 10,
      "ethash": {},
--- a/internal/build/util.go
+++ b/internal/build/util.go
@ -147,4 +147,4 @@ func ExpandPackagesNoVendor(patterns []string) []string {
 		return packages
 	}
 	return patterns
-}
+}
--- a/internal/debug/flags.go
+++ b/internal/debug/flags.go
@ -87,9 +87,17 @@ var (

 // Flags holds all command-line flags required for debugging.
 var Flags = []cli.Flag{
-	VerbosityFlag, vmoduleFlag, backtraceAtFlag, debugFlag,
-	pprofFlag, pprofAddrFlag, pprofPortFlag,
-	memprofilerateFlag, blockprofilerateFlag, cpuprofileFlag, traceFlag,
+	VerbosityFlag,
+	//vmoduleFlag,
+	//backtraceAtFlag,
+	//debugFlag,
+	//pprofFlag,
+	//pprofAddrFlag,
+	//pprofPortFlag,
+	//memprofilerateFlag,
+	//blockprofilerateFlag,
+	//cpuprofileFlag,
+	//traceFlag,
 }

 var Glogger *log.GlogHandler
@ -149,4 +157,4 @@ func Setup(ctx *cli.Context) error {
 func Exit() {
 	Handler.StopCPUProfile()
 	Handler.StopGoTrace()
-}
+}
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@ -30,8 +30,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/consensus/XDPoS"
 	"github.com/ethereum/go-ethereum/consensus/ethash"
+	"github.com/ethereum/go-ethereum/consensus/XDPoS"
 	"github.com/ethereum/go-ethereum/contracts"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
@ -876,12 +876,12 @@ func (s *PublicBlockChainAPI) rpcOutputBlock(b *types.Block, inclTx bool, fullTx
 			log.Error("Fail to get signers from block signer SC.", "error", err)
 		}
 		// Get block epoc latest.
-		if s.b.ChainConfig().XDPos != nil {
+		if s.b.ChainConfig().XDPoS != nil {
 			engine := s.b.GetEngine()
 			lastCheckpointNumber := rpc.BlockNumber(b.Number().Uint64() - (b.Number().Uint64() % s.b.ChainConfig().XDPoS.Epoch))
 			prevCheckpointBlock, _ := s.b.BlockByNumber(ctx, lastCheckpointNumber)
 			if prevCheckpointBlock != nil {
-				masternodes := engine.(*XDPoS.XDPoS).GetMasternodesFromCheckpointHeader(prevCheckpointBlock.Header(), b.Number().Uint64(), s.b.ChainConfig().Clique.Epoch)
+				masternodes := engine.(*XDPoS.XDPoS).GetMasternodesFromCheckpointHeader(prevCheckpointBlock.Header(), b.Number().Uint64(), s.b.ChainConfig().XDPoS.Epoch)
 				countFinality := 0
 				for _, masternode := range masternodes {
 					for _, signer := range signers {
--- a/internal/ethapi/backend.go
+++ b/internal/ethapi/backend.go
@ -120,4 +120,4 @@ func GetAPIs(apiBackend Backend) []rpc.API {
 			Public:    false,
 		},
 	}
-}
+}
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@ -146,7 +146,6 @@ web3._extend({
 });
 `

-
 const Admin_JS = `
 web3._extend({
 	property: 'admin',
@ -673,4 +672,4 @@ web3._extend({
 		}),
 	]
 });
-`
+`
--- a/miner/miner.go
+++ b/miner/miner.go
@ -94,7 +94,6 @@ func (self *Miner) update() {
 			if shouldStart {
 				self.Start(self.coinbase)
 			}
-
 		}
 	}
 }
--- a/miner/worker.go
+++ b/miner/worker.go
@ -1,4 +1,3 @@
-
 // Copyright 2015 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
@ -498,7 +497,7 @@ func (self *worker) commitNewWork() {
 		if self.config.XDPoS != nil {
 			// get masternodes set from latest checkpoint
 			c := self.engine.(*XDPoS.XDPoS)
-			len, preIndex, curIndex, ok, err := c.YourTurn(self.chain, parent.Header(),self.coinbase)
+			len, preIndex, curIndex, ok, err := c.YourTurn(self.chain, parent.Header(), self.coinbase)
 			if err != nil {
 				log.Warn("Failed when trying to commit new work", "err", err)
 				return
@ -613,13 +612,12 @@ func (self *worker) commitNewWork() {
 			delete(self.possibleUncles, hash)
 		}
 	}
-        if atomic.LoadInt32(&self.mining) == 1 {
-		// Create the new block to seal with the consensus engine
-		if work.Block, err = self.engine.Finalize(self.chain, header, work.state, work.txs, uncles, work.receipts); err != nil {
-			log.Error("Failed to finalize block for sealing", "err", err)
-			return
-		}
-		}
+	// Create the new block to seal with the consensus engine
+	if work.Block, err = self.engine.Finalize(self.chain, header, work.state, work.txs, uncles, work.receipts); err != nil {
+		log.Error("Failed to finalize block for sealing", "err", err)
+		return
+	}
+	if atomic.LoadInt32(&self.mining) == 1 {
 		log.Info("Committing new block", "number", work.Block.Number(), "txs", work.tcount, "special txs", len(specialTxs), "uncles", len(uncles), "elapsed", common.PrettyDuration(time.Since(tstart)))
 		self.unconfirmed.Shift(work.Block.NumberU64() - 1)
 		self.lastParentBlockCommit = parent.Hash().Hex()
@ -790,4 +788,4 @@ func (env *Work) commitTransaction(tx *types.Transaction, bc *core.BlockChain, c
 	env.receipts = append(env.receipts, receipt)

 	return nil, receipt.Logs
-}
+}
--- a/vendor/github.com/btcsuite/btcd/btcec/secp256k1.go
+++ b/vendor/github.com/btcsuite/btcd/btcec/secp256k1.go
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
@ -1998,12 +1998,12 @@ var fileDescriptor0 = []byte{
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x5b, 0x6f, 0xdb, 0xc8,
 	0x15, 0x5e, 0x5d, 0x2d, 0x1d, 0xc9, 0xf2, 0x78, 0xec, 0x4d, 0x18, 0xef, 0x25, 0x8e, 0xf6, 0x12,
 	0x6f, 0xd2, 0xc8, 0x0b, 0xe7, 0xb2, 0x59, 0xa7, 0x48, 0x21, 0x4b, 0x8c, 0x57, 0xa9, 0x2c, 0xa9,
-	0x94, 0xdc, 0x4d, 0xf6, 0x85, 0x18, 0x93, 0x23, 0x99, 0x09, 0x45, 0x72, 0x49, 0x2a, 0x89, 0xf7,
+	0x94, 0XDC, 0x4d, 0xf6, 0x85, 0x18, 0x93, 0x23, 0x99, 0x09, 0x45, 0x72, 0x49, 0x2a, 0x89, 0xf7,
 	0x29, 0x40, 0x9f, 0x0a, 0xf4, 0x07, 0x14, 0x45, 0xd1, 0x87, 0x7d, 0x59, 0xa0, 0x3f, 0xa0, 0xcf,
 	0xfd, 0x05, 0x05, 0xf6, 0xb9, 0x2f, 0x45, 0x51, 0xa0, 0xfd, 0x07, 0x7d, 0x2d, 0x66, 0x86, 0xa4,
 	0x48, 0x5d, 0x12, 0x77, 0x81, 0xec, 0x3e, 0xd9, 0x73, 0xce, 0x77, 0x0e, 0xcf, 0x9c, 0xf9, 0x66,
 	0xce, 0x99, 0x11, 0x6c, 0x8f, 0x6c, 0x7b, 0x64, 0xd2, 0x5d, 0xc7, 0xb5, 0x7d, 0xfb, 0x64, 0x32,
-	0xdc, 0xd5, 0xa9, 0xa7, 0xb9, 0x86, 0xe3, 0xdb, 0x6e, 0x8d, 0xcb, 0xf0, 0x9a, 0x40, 0xd4, 0x42,
+	0XDC, 0xd5, 0xa9, 0xa7, 0xb9, 0x86, 0xe3, 0xdb, 0x6e, 0x8d, 0xcb, 0xf0, 0x9a, 0x40, 0xd4, 0x42,
 	0x44, 0xf5, 0x08, 0xd6, 0x1f, 0x18, 0x26, 0x6d, 0x46, 0xc0, 0x3e, 0xf5, 0xf1, 0x5d, 0xc8, 0x0e,
 	0x0d, 0x93, 0x4a, 0xa9, 0xed, 0xcc, 0x4e, 0x69, 0xef, 0xc3, 0xda, 0x8c, 0x51, 0x2d, 0x69, 0xd1,
 	0x63, 0x62, 0x85, 0x5b, 0x54, 0xff, 0x95, 0x85, 0x8d, 0x05, 0x5a, 0x8c, 0x21, 0x6b, 0x91, 0x31,
@ -2034,7 +2034,7 @@ var fileDescriptor0 = []byte{
 	0x42, 0xce, 0xf3, 0x89, 0xeb, 0x73, 0x16, 0xe6, 0x14, 0x31, 0xc0, 0x08, 0x32, 0xd4, 0xd2, 0xf9,
 	0x29, 0x97, 0x53, 0xd8, 0xbf, 0x5b, 0x9f, 0xc1, 0x6a, 0xe2, 0xf3, 0xe7, 0x35, 0xac, 0xfe, 0x3e,
 	0x0f, 0x9b, 0x8b, 0x38, 0xb7, 0x90, 0xfe, 0x17, 0x20, 0x6f, 0x4d, 0xc6, 0x27, 0xd4, 0x95, 0x32,
-	0xdc, 0x43, 0x30, 0xc2, 0x75, 0xc8, 0x99, 0xe4, 0x84, 0x9a, 0x52, 0x76, 0x3b, 0xb5, 0x53, 0xd9,
+	0XDC, 0x43, 0x30, 0xc2, 0x75, 0xc8, 0x99, 0xe4, 0x84, 0x9a, 0x52, 0x76, 0x3b, 0xb5, 0x53, 0xd9,
 	0xbb, 0x7e, 0x2e, 0x56, 0xd7, 0xda, 0xcc, 0x44, 0x11, 0x96, 0xf8, 0x3e, 0x64, 0x83, 0x23, 0x8e,
 	0x79, 0xb8, 0x76, 0x3e, 0x0f, 0x8c, 0x8b, 0x0a, 0xb7, 0xc3, 0xef, 0x40, 0x91, 0xfd, 0x15, 0xb9,
 	0xcd, 0xf3, 0x98, 0x0b, 0x4c, 0xc0, 0xf2, 0x8a, 0xb7, 0xa0, 0xc0, 0x69, 0xa6, 0xd3, 0xb0, 0x34,
@ -2045,12 +2045,12 @@ var fileDescriptor0 = []byte{
 	0xf5, 0x2f, 0x69, 0xc8, 0xf2, 0xfd, 0xb6, 0x06, 0xa5, 0xc1, 0xe3, 0x9e, 0xac, 0x36, 0xbb, 0xc7,
 	0x07, 0x6d, 0x19, 0xa5, 0x70, 0x05, 0x80, 0x0b, 0x1e, 0xb4, 0xbb, 0xf5, 0x01, 0x4a, 0x47, 0xe3,
 	0x56, 0x67, 0x70, 0xe7, 0x16, 0xca, 0x44, 0x06, 0xc7, 0x42, 0x90, 0x8d, 0x03, 0x6e, 0xee, 0xa1,
-	0x1c, 0x46, 0x50, 0x16, 0x0e, 0x5a, 0x8f, 0xe4, 0xe6, 0x9d, 0x5b, 0x28, 0x9f, 0x94, 0xdc, 0xdc,
+	0x1c, 0x46, 0x50, 0x16, 0x0e, 0x5a, 0x8f, 0xe4, 0xe6, 0x9d, 0x5b, 0x28, 0x9f, 0x94, 0XDC, 0XDC,
 	0x43, 0x2b, 0x78, 0x15, 0x8a, 0x5c, 0x72, 0xd0, 0xed, 0xb6, 0x51, 0x21, 0xf2, 0xd9, 0x1f, 0x28,
 	0xad, 0xce, 0x21, 0x2a, 0x46, 0x3e, 0x0f, 0x95, 0xee, 0x71, 0x0f, 0x41, 0xe4, 0xe1, 0x48, 0xee,
 	0xf7, 0xeb, 0x87, 0x32, 0x2a, 0x45, 0x88, 0x83, 0xc7, 0x03, 0xb9, 0x8f, 0xca, 0x89, 0xb0, 0x6e,
 	0xee, 0xa1, 0xd5, 0xe8, 0x13, 0x72, 0xe7, 0xf8, 0x08, 0x55, 0xf0, 0x3a, 0xac, 0x8a, 0x4f, 0x84,
-	0x41, 0xac, 0xcd, 0x88, 0xee, 0xdc, 0x42, 0x68, 0x1a, 0x88, 0xf0, 0xb2, 0x9e, 0x10, 0xdc, 0xb9,
+	0x41, 0xac, 0xcd, 0x88, 0xee, 0XDC, 0x42, 0x68, 0x1a, 0x88, 0xf0, 0xb2, 0x9e, 0x10, 0XDC, 0xb9,
 	0x85, 0x70, 0xb5, 0x01, 0x39, 0xce, 0x2e, 0x8c, 0xa1, 0xd2, 0xae, 0x1f, 0xc8, 0x6d, 0xb5, 0xdb,
 	0x1b, 0xb4, 0xba, 0x9d, 0x7a, 0x1b, 0xa5, 0xa6, 0x32, 0x45, 0xfe, 0xd5, 0x71, 0x4b, 0x91, 0x9b,
 	0x28, 0x1d, 0x97, 0xf5, 0xe4, 0xfa, 0x40, 0x6e, 0xa2, 0x4c, 0x55, 0x83, 0xcd, 0x45, 0xe7, 0xcc,
@ -2065,7 +2065,7 @@ var fileDescriptor0 = []byte{
 	0x45, 0x2e, 0xe1, 0x7b, 0x9f, 0x9d, 0x3d, 0x13, 0x3f, 0xd2, 0x67, 0xb8, 0x1e, 0x84, 0x88, 0x03,
 	0xee, 0x4e, 0x03, 0xcd, 0xf2, 0x40, 0xdf, 0x5f, 0x32, 0xd3, 0xb9, 0x5a, 0xf7, 0x29, 0x20, 0xcd,
 	0x34, 0xa8, 0xe5, 0xab, 0x9e, 0xef, 0x52, 0x32, 0x36, 0xac, 0x11, 0x3f, 0x80, 0x0b, 0xfb, 0xb9,
-	0x21, 0x31, 0x3d, 0xaa, 0xac, 0x09, 0x75, 0x3f, 0xd4, 0x32, 0x0b, 0x5e, 0x65, 0xdc, 0x98, 0x45,
+	0x21, 0x31, 0x3d, 0xaa, 0xac, 0x09, 0x75, 0x3f, 0xd4, 0x32, 0x0b, 0x5e, 0x65, 0XDC, 0x98, 0x45,
 	0x3e, 0x61, 0x21, 0xd4, 0x91, 0x45, 0xf5, 0xef, 0x2b, 0x50, 0x8a, 0xb5, 0x75, 0xf8, 0x0a, 0x94,
 	0x9f, 0x90, 0x67, 0x44, 0x0d, 0x5b, 0x75, 0x91, 0x89, 0x12, 0x93, 0xf5, 0x82, 0x76, 0xfd, 0x53,
 	0xd8, 0xe4, 0x10, 0x7b, 0xe2, 0x53, 0x57, 0xd5, 0x4c, 0xe2, 0x79, 0x3c, 0x69, 0x05, 0x0e, 0xc5,
@ -2087,12 +2087,12 @@ var fileDescriptor0 = []byte{
 	0x72, 0x1c, 0x5c, 0xd1, 0x34, 0x99, 0x6b, 0xeb, 0x5c, 0x89, 0xaf, 0xc1, 0xba, 0x7d, 0xf2, 0x44,
 	0x13, 0xcc, 0x52, 0x1d, 0x97, 0x0e, 0x8d, 0x17, 0xd2, 0x87, 0x3c, 0x4d, 0x6b, 0x4c, 0xc1, 0x79,
 	0xd5, 0xe3, 0x62, 0xfc, 0x09, 0x20, 0xcd, 0x3b, 0x25, 0xae, 0xc3, 0x4b, 0xbb, 0xe7, 0x10, 0x8d,
-	0x4a, 0x1f, 0x09, 0xa8, 0x90, 0x77, 0x42, 0x31, 0x63, 0xb6, 0xf7, 0xdc, 0x18, 0xfa, 0xa1, 0xc7,
+	0x4a, 0x1f, 0x09, 0xa8, 0x90, 0x77, 0x42, 0x31, 0x63, 0xb6, 0xf7, 0XDC, 0x18, 0xfa, 0xa1, 0xc7,
 	0xab, 0x82, 0xd9, 0x5c, 0x16, 0x78, 0xdb, 0x01, 0xe4, 0x9c, 0x3a, 0xc9, 0x0f, 0xef, 0x70, 0x58,
 	0xc5, 0x39, 0x75, 0xe2, 0xdf, 0x7d, 0x04, 0x9b, 0x13, 0xcb, 0xb0, 0x7c, 0xea, 0x3a, 0x2e, 0x65,
 	0xed, 0xbe, 0xd8, 0xb3, 0xd2, 0xbf, 0x57, 0x96, 0x34, 0xec, 0xc7, 0x71, 0xb4, 0xa0, 0x8a, 0xb2,
 	0x31, 0x99, 0x17, 0x56, 0xf7, 0xa1, 0x1c, 0x67, 0x10, 0x2e, 0x82, 0xe0, 0x10, 0x4a, 0xb1, 0x6a,
-	0xdc, 0xe8, 0x36, 0x59, 0x1d, 0xfd, 0x4a, 0x46, 0x69, 0x56, 0xcf, 0xdb, 0xad, 0x81, 0xac, 0x2a,
+	0XDC, 0xe8, 0x36, 0x59, 0x1d, 0xfd, 0x4a, 0x46, 0x69, 0x56, 0xcf, 0xdb, 0xad, 0x81, 0xac, 0x2a,
 	0xc7, 0x9d, 0x41, 0xeb, 0x48, 0x46, 0x99, 0x6b, 0xc5, 0xc2, 0x7f, 0x56, 0xd0, 0xcb, 0x97, 0x2f,
 	0x5f, 0xa6, 0x1f, 0x66, 0x0b, 0x1f, 0xa3, 0xab, 0xd5, 0xef, 0xd3, 0x50, 0x49, 0x76, 0xd2, 0xf8,
 	0xe7, 0x70, 0x31, 0xbc, 0xf6, 0x7a, 0xd4, 0x57, 0x9f, 0x1b, 0x2e, 0xa7, 0xf6, 0x98, 0x88, 0x5e,
@ -2118,7 +2118,7 @@ var fileDescriptor0 = []byte{
 	0x2b, 0x3f, 0x69, 0x78, 0xff, 0x48, 0xc3, 0x6a, 0xa2, 0x1b, 0x3c, 0x6f, 0x74, 0x5f, 0xc3, 0xba,
 	0xa1, 0xd3, 0xb1, 0x63, 0xfb, 0xd4, 0xd2, 0xce, 0x54, 0x93, 0x3e, 0xa3, 0xa6, 0x54, 0xe5, 0x87,
 	0xc6, 0xee, 0xab, 0xfb, 0xcd, 0x5a, 0x6b, 0x6a, 0xd7, 0x66, 0x66, 0xfb, 0x1b, 0xad, 0xa6, 0x7c,
-	0xd4, 0xeb, 0x0e, 0xe4, 0x4e, 0xe3, 0xb1, 0x7a, 0xdc, 0xf9, 0x65, 0xa7, 0xfb, 0x65, 0x47, 0x41,
+	0xd4, 0xeb, 0x0e, 0xe4, 0x4e, 0xe3, 0xb1, 0x7a, 0XDC, 0xf9, 0x65, 0xa7, 0xfb, 0x65, 0x47, 0x41,
 	0xc6, 0x0c, 0xec, 0x0d, 0x6e, 0xfb, 0x1e, 0xa0, 0xd9, 0xa0, 0xf0, 0x45, 0x58, 0x14, 0x16, 0x7a,
 	0x0b, 0x6f, 0xc0, 0x5a, 0xa7, 0xab, 0xf6, 0x5b, 0x4d, 0x59, 0x95, 0x1f, 0x3c, 0x90, 0x1b, 0x83,
 	0xbe, 0xb8, 0x80, 0x47, 0xe8, 0x41, 0x62, 0x83, 0x57, 0xff, 0x90, 0x81, 0x8d, 0x05, 0x91, 0xe0,
@ -2147,6 +2147,6 @@ var fileDescriptor0 = []byte{
 	0xe6, 0x9e, 0xee, 0x7d, 0x91, 0xfa, 0xea, 0xfe, 0xc8, 0xf0, 0x4f, 0x27, 0x27, 0x35, 0xcd, 0x1e,
 	0xef, 0x8e, 0x6c, 0x93, 0x58, 0xa3, 0xe9, 0xef, 0x60, 0xfc, 0x1f, 0xed, 0xc6, 0x88, 0x5a, 0x37,
 	0x46, 0x76, 0xec, 0x57, 0xb1, 0x7b, 0xd3, 0x7f, 0xbf, 0x4d, 0x67, 0x0e, 0x7b, 0x07, 0x7f, 0x4e,
-	0x6f, 0x1d, 0x8a, 0x6f, 0xf5, 0xc2, 0xdc, 0x28, 0x74, 0x68, 0x52, 0x8d, 0xcd, 0xf7, 0x7f, 0x01,
+	0x6f, 0x1d, 0x8a, 0x6f, 0xf5, 0xc2, 0XDC, 0x28, 0x74, 0x68, 0x52, 0x8d, 0xcd, 0xf7, 0x7f, 0x01,
 	0x00, 0x00, 0xff, 0xff, 0x8e, 0x54, 0xe7, 0xef, 0x60, 0x1b, 0x00, 0x00,
 }
--- a/vendor/github.com/karalabe/hid/libusb/libusb/libusb.h
+++ b/vendor/github.com/karalabe/hid/libusb/libusb/libusb.h
@ -231,7 +231,7 @@ enum libusb_class_code {
 	LIBUSB_CLASS_PERSONAL_HEALTHCARE = 0x0f,

 	/** Diagnostic Device */
-	LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
+	LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0XDC,

 	/** Wireless class */
 	LIBUSB_CLASS_WIRELESS = 0xe0,
--- a/vendor/github.com/mattn/go-runewidth/runewidth.go
+++ b/vendor/github.com/mattn/go-runewidth/runewidth.go
@ -901,7 +901,7 @@ var neutral = table{
 	{0xABE8, 0xABE8}, {0xABE9, 0xABEA}, {0xABEB, 0xABEB},
 	{0xABEC, 0xABEC}, {0xABED, 0xABED}, {0xABF0, 0xABF9},
 	{0xD7B0, 0xD7C6}, {0xD7CB, 0xD7FB}, {0xD800, 0xDB7F},
-	{0xDB80, 0xDBFF}, {0xDC00, 0xDFFF}, {0xFB00, 0xFB06},
+	{0xDB80, 0xDBFF}, {0XDC00, 0xDFFF}, {0xFB00, 0xFB06},
 	{0xFB13, 0xFB17}, {0xFB1D, 0xFB1D}, {0xFB1E, 0xFB1E},
 	{0xFB1F, 0xFB28}, {0xFB29, 0xFB29}, {0xFB2A, 0xFB36},
 	{0xFB38, 0xFB3C}, {0xFB3E, 0xFB3E}, {0xFB40, 0xFB41},
--- a/vendor/github.com/nsf/termbox-go/termbox_windows.go
+++ b/vendor/github.com/nsf/termbox-go/termbox_windows.go
@ -452,7 +452,7 @@ const (
 	replacement_char = '\uFFFD'
 	max_rune         = '\U0010FFFF'
 	surr1            = 0xd800
-	surr2            = 0xdc00
+	surr2            = 0XDC00
 	surr3            = 0xe000
 	surr_self        = 0x10000
 )
--- a/vendor/github.com/robertkrimen/otto/builtin.go
+++ b/vendor/github.com/robertkrimen/otto/builtin.go
@ -197,7 +197,7 @@ func _builtinGlobal_encodeURI(call FunctionCall, escape *regexp.Regexp) Value {
 	for index := 0; index < length; {
 		value := input[index]
 		decode := utf16.Decode(input[index : index+1])
-		if value >= 0xDC00 && value <= 0xDFFF {
+		if value >= 0XDC00 && value <= 0xDFFF {
 			panic(call.runtime.panicURIError("URI malformed"))
 		}
 		if value >= 0xD800 && value <= 0xDBFF {
@ -207,10 +207,10 @@ func _builtinGlobal_encodeURI(call FunctionCall, escape *regexp.Regexp) Value {
 			}
 			// input = ..., value, value1, ...
 			value1 := input[index]
-			if value1 < 0xDC00 || value1 > 0xDFFF {
+			if value1 < 0XDC00 || value1 > 0xDFFF {
 				panic(call.runtime.panicURIError("URI malformed"))
 			}
-			decode = []rune{((rune(value) - 0xD800) * 0x400) + (rune(value1) - 0xDC00) + 0x10000}
+			decode = []rune{((rune(value) - 0xD800) * 0x400) + (rune(value1) - 0XDC00) + 0x10000}
 		}
 		index += 1
 		size := utf8.EncodeRune(encode, decode[0])
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go
@ -219,4 +219,4 @@ func packFile(fd FileDesc) uint64 {

 func unpackFile(x uint64) FileDesc {
 	return FileDesc{FileType(x) & TypeAll, int64(x >> typeShift)}
-}
+}
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util.go
+++ b/vendor/github.com/syndtr/goleveldb/leveldb/util.go
@ -95,4 +95,4 @@ func ensureBuffer(b []byte, n int) []byte {
 		return make([]byte, n)
 	}
 	return b[:n]
-}
+}
--- a/vendor/golang.org/x/crypto/cast5/cast5.go
+++ b/vendor/golang.org/x/crypto/cast5/cast5.go
@ -282,13 +282,13 @@ var sBox = [8][256]uint32{
 		0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0, 0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872,
 		0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79, 0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c,
 		0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298, 0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e,
-		0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571, 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
+		0xbd91e046, 0x9a56456e, 0XDC39200c, 0x20c8c571, 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
 		0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d, 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf,
 	},
 	{
 		0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651,
 		0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3,
-		0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909, 0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
+		0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909, 0XDC440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
 		0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b, 0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806,
 		0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4, 0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b,
 		0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f, 0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359,
@ -309,13 +309,13 @@ var sBox = [8][256]uint32{
 		0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4, 0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6,
 		0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43, 0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58,
 		0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8, 0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906,
-		0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171, 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
+		0xb8da230c, 0x80823028, 0XDCdef3c8, 0xd35fb171, 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
 		0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89, 0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6,
 		0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b, 0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4,
-		0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb, 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
+		0XDC8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb, 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
 		0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e, 0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f,
 		0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea, 0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249,
-		0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea, 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
+		0xb284600c, 0xd835731d, 0XDCb1c647, 0xac4c56ea, 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
 		0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd, 0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9,
 		0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef, 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1,
 	},
@ -413,7 +413,7 @@ var sBox = [8][256]uint32{
 		0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487, 0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7,
 		0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288, 0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5,
 		0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2, 0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e,
-		0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78, 0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
+		0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78, 0XDC0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
 		0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76, 0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801,
 		0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0, 0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad,
 		0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58, 0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0,
@ -440,12 +440,12 @@ var sBox = [8][256]uint32{
 		0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2, 0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289,
 		0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853, 0x20951063, 0x4576698d, 0xb6fad407, 0x592af950,
 		0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa, 0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f,
-		0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9, 0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b,
+		0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9, 0x2b05d08d, 0x48b9d585, 0XDC049441, 0xc8098f9b,
 		0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751, 0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be,
 		0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358, 0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13,
 		0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397, 0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976,
 		0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459, 0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0,
-		0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4, 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
+		0x3007cd3e, 0x74719eef, 0XDC872681, 0x073340d4, 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
 		0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f, 0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da,
 		0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb, 0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc,
 		0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2, 0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084,
--- a/vendor/golang.org/x/net/html/atom/table.go
+++ b/vendor/golang.org/x/net/html/atom/table.go
@ -492,7 +492,7 @@ var table = [1 << 9]Atom{
 	0xd8:  0x1bb07, // caption
 	0xd9:  0x10c08, // disabled
 	0xdb:  0x33808, // menuitem
-	0xdc:  0x62003, // svg
+	0XDC:  0x62003, // svg
 	0xdd:  0x18f05, // small
 	0xde:  0x44a04, // data
 	0xe0:  0x4cb08, // ononline
--- a/vendor/golang.org/x/sys/cpu/cpu.go
+++ b/vendor/golang.org/x/sys/cpu/cpu.go
@ -35,4 +35,4 @@ var X86 struct {
 	HasSSE41     bool // Streaming SIMD extension 4 and 4.1
 	HasSSE42     bool // Streaming SIMD extension 4 and 4.2
 	_            CacheLinePad
-}
+}
--- a/vendor/golang.org/x/sys/cpu/cpu_x86.s
+++ b/vendor/golang.org/x/sys/cpu/cpu_x86.s
@ -24,4 +24,5 @@ TEXT ·xgetbv(SB),NOSPLIT,$0-8
 	XGETBV
 	MOVL AX, eax+0(FP)
 	MOVL DX, edx+4(FP)
-	RET
+	RET
+	
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
@ -393,7 +393,7 @@ const (
 	DLT_TZSP                          = 0x80
 	DLT_USB                           = 0xba
 	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USB_LINUX_MMAPPED             = 0XDC
 	DLT_USER0                         = 0x93
 	DLT_USER1                         = 0x94
 	DLT_USER10                        = 0x9d
@ -912,7 +912,7 @@ const (
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
 	MNT_ASYNC                         = 0x40
-	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_AUXDCUNTED                   = 0x400000
 	MNT_CMDFLAGS                      = 0xf0000
 	MNT_CPROTECT                      = 0x80
 	MNT_DEFWRITE                      = 0x2000000
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
@ -393,7 +393,7 @@ const (
 	DLT_TZSP                          = 0x80
 	DLT_USB                           = 0xba
 	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USB_LINUX_MMAPPED             = 0XDC
 	DLT_USER0                         = 0x93
 	DLT_USER1                         = 0x94
 	DLT_USER10                        = 0x9d
@ -912,7 +912,7 @@ const (
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
 	MNT_ASYNC                         = 0x40
-	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_AUXDCUNTED                   = 0x400000
 	MNT_CMDFLAGS                      = 0xf0000
 	MNT_CPROTECT                      = 0x80
 	MNT_DEFWRITE                      = 0x2000000
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
@ -393,7 +393,7 @@ const (
 	DLT_TZSP                          = 0x80
 	DLT_USB                           = 0xba
 	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USB_LINUX_MMAPPED             = 0XDC
 	DLT_USER0                         = 0x93
 	DLT_USER1                         = 0x94
 	DLT_USER10                        = 0x9d
@ -912,7 +912,7 @@ const (
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
 	MNT_ASYNC                         = 0x40
-	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_AUXDCUNTED                   = 0x400000
 	MNT_CMDFLAGS                      = 0xf0000
 	MNT_CPROTECT                      = 0x80
 	MNT_DEFWRITE                      = 0x2000000
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
@ -393,7 +393,7 @@ const (
 	DLT_TZSP                          = 0x80
 	DLT_USB                           = 0xba
 	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USB_LINUX_MMAPPED             = 0XDC
 	DLT_USER0                         = 0x93
 	DLT_USER1                         = 0x94
 	DLT_USER10                        = 0x9d
@ -912,7 +912,7 @@ const (
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
 	MNT_ASYNC                         = 0x40
-	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_AUXDCUNTED                   = 0x400000
 	MNT_CMDFLAGS                      = 0xf0000
 	MNT_CPROTECT                      = 0x80
 	MNT_DEFWRITE                      = 0x2000000
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
@ -508,7 +508,7 @@ const (
 	DLT_USB                        = 0xba
 	DLT_USBPCAP                    = 0xf9
 	DLT_USB_LINUX                  = 0xbd
-	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USB_LINUX_MMAPPED          = 0XDC
 	DLT_USER0                      = 0x93
 	DLT_USER1                      = 0x94
 	DLT_USER10                     = 0x9d
@ -983,7 +983,7 @@ const (
 	MCL_FUTURE                     = 0x2
 	MNT_ACLS                       = 0x8000000
 	MNT_ASYNC                      = 0x40
-	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_AUXDCUNTED                = 0x200000000
 	MNT_BYFSID                     = 0x8000000
 	MNT_CMDFLAGS                   = 0xd0f0000
 	MNT_DEFEXPORTED                = 0x200
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
@ -508,7 +508,7 @@ const (
 	DLT_USB                        = 0xba
 	DLT_USBPCAP                    = 0xf9
 	DLT_USB_LINUX                  = 0xbd
-	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USB_LINUX_MMAPPED          = 0XDC
 	DLT_USER0                      = 0x93
 	DLT_USER1                      = 0x94
 	DLT_USER10                     = 0x9d
@ -984,7 +984,7 @@ const (
 	MCL_FUTURE                     = 0x2
 	MNT_ACLS                       = 0x8000000
 	MNT_ASYNC                      = 0x40
-	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_AUXDCUNTED                = 0x200000000
 	MNT_BYFSID                     = 0x8000000
 	MNT_CMDFLAGS                   = 0xd0f0000
 	MNT_DEFEXPORTED                = 0x200
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
@ -512,7 +512,7 @@ const (
 	DLT_USBPCAP                    = 0xf9
 	DLT_USB_FREEBSD                = 0xba
 	DLT_USB_LINUX                  = 0xbd
-	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USB_LINUX_MMAPPED          = 0XDC
 	DLT_USER0                      = 0x93
 	DLT_USER1                      = 0x94
 	DLT_USER10                     = 0x9d
@ -991,7 +991,7 @@ const (
 	MCL_FUTURE                     = 0x2
 	MNT_ACLS                       = 0x8000000
 	MNT_ASYNC                      = 0x40
-	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_AUXDCUNTED                = 0x200000000
 	MNT_BYFSID                     = 0x8000000
 	MNT_CMDFLAGS                   = 0xd0f0000
 	MNT_DEFEXPORTED                = 0x200
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
@ -296,7 +296,7 @@ const (
 	DLT_TZSP                          = 0x80
 	DLT_USB                           = 0xba
 	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USB_LINUX_MMAPPED             = 0XDC
 	DLT_WIHART                        = 0xdf
 	DLT_X2E_SERIAL                    = 0xd5
 	DLT_X2E_XORAYA                    = 0xd6
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
@ -296,7 +296,7 @@ const (
 	DLT_TZSP                          = 0x80
 	DLT_USB                           = 0xba
 	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USB_LINUX_MMAPPED             = 0XDC
 	DLT_WIHART                        = 0xdf
 	DLT_X2E_SERIAL                    = 0xd5
 	DLT_X2E_XORAYA                    = 0xd6
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
@ -288,7 +288,7 @@ const (
 	DLT_TZSP                          = 0x80
 	DLT_USB                           = 0xba
 	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USB_LINUX_MMAPPED             = 0XDC
 	DLT_WIHART                        = 0xdf
 	DLT_X2E_SERIAL                    = 0xd5
 	DLT_X2E_XORAYA                    = 0xd6
--- a/vendor/golang.org/x/text/encoding/charmap/tables.go
+++ b/vendor/golang.org/x/text/encoding/charmap/tables.go
@ -178,7 +178,7 @@ var codePage037 = charmap{
 		0x440000e0, 0x450000e1, 0x420000e2, 0x460000e3, 0x430000e4, 0x470000e5, 0x9c0000e6, 0x480000e7,
 		0x540000e8, 0x510000e9, 0x520000ea, 0x530000eb, 0x580000ec, 0x550000ed, 0x560000ee, 0x570000ef,
 		0x8c0000f0, 0x490000f1, 0xcd0000f2, 0xce0000f3, 0xcb0000f4, 0xcf0000f5, 0xcc0000f6, 0xe10000f7,
-		0x700000f8, 0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0xdc0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff,
+		0x700000f8, 0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0XDC0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff,
 	},
 }

@ -353,7 +353,7 @@ var codePage437 = charmap{
 		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
 		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
 		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0XDC002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -528,7 +528,7 @@ var codePage850 = charmap{
 		0xd5000131, 0x9f000192, 0xf2002017, 0xc4002500, 0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514,
 		0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c, 0xc1002534, 0xc500253c, 0xcd002550, 0xba002551,
 		0xc9002554, 0xbb002557, 0xc800255a, 0xbc00255d, 0xcc002560, 0xb9002563, 0xcb002566, 0xca002569,
-		0xce00256c, 0xdf002580, 0xdc002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0xce00256c, 0xdf002580, 0XDC002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -703,7 +703,7 @@ var codePage852 = charmap{
 		0xfa0002d9, 0xf20002db, 0xf10002dd, 0xc4002500, 0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514,
 		0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c, 0xc1002534, 0xc500253c, 0xcd002550, 0xba002551,
 		0xc9002554, 0xbb002557, 0xc800255a, 0xbc00255d, 0xcc002560, 0xb9002563, 0xcb002566, 0xca002569,
-		0xce00256c, 0xdf002580, 0xdc002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0xce00256c, 0xdf002580, 0XDC002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -878,7 +878,7 @@ var codePage855 = charmap{
 		0x9800045e, 0x9a00045f, 0xef002116, 0xc4002500, 0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514,
 		0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c, 0xc1002534, 0xc500253c, 0xcd002550, 0xba002551,
 		0xc9002554, 0xbb002557, 0xc800255a, 0xbc00255d, 0xcc002560, 0xb9002563, 0xcb002566, 0xca002569,
-		0xce00256c, 0xdf002580, 0xdc002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0xce00256c, 0xdf002580, 0XDC002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -1053,7 +1053,7 @@ var codePage858 = charmap{
 		0x9f000192, 0xf2002017, 0xd50020ac, 0xc4002500, 0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514,
 		0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c, 0xc1002534, 0xc500253c, 0xcd002550, 0xba002551,
 		0xc9002554, 0xbb002557, 0xc800255a, 0xbc00255d, 0xcc002560, 0xb9002563, 0xcb002566, 0xca002569,
-		0xce00256c, 0xdf002580, 0xdc002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0xce00256c, 0xdf002580, 0XDC002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -1228,7 +1228,7 @@ var codePage860 = charmap{
 		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
 		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
 		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0XDC002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -1403,7 +1403,7 @@ var codePage862 = charmap{
 		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
 		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
 		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0XDC002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -1578,7 +1578,7 @@ var codePage863 = charmap{
 		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
 		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
 		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0XDC002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -1753,7 +1753,7 @@ var codePage865 = charmap{
 		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
 		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
 		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0XDC002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -1928,7 +1928,7 @@ var codePage866 = charmap{
 		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
 		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
 		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
+		0XDC002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
 	},
 }

@ -2103,7 +2103,7 @@ var codePage1047 = charmap{
 		0x440000e0, 0x450000e1, 0x420000e2, 0x460000e3, 0x430000e4, 0x470000e5, 0x9c0000e6, 0x480000e7,
 		0x540000e8, 0x510000e9, 0x520000ea, 0x530000eb, 0x580000ec, 0x550000ed, 0x560000ee, 0x570000ef,
 		0x8c0000f0, 0x490000f1, 0xcd0000f2, 0xce0000f3, 0xcb0000f4, 0xcf0000f5, 0xcc0000f6, 0xe10000f7,
-		0x700000f8, 0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0xdc0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff,
+		0x700000f8, 0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0XDC0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff,
 	},
 }

@ -2278,7 +2278,7 @@ var codePage1140 = charmap{
 		0x450000e1, 0x420000e2, 0x460000e3, 0x430000e4, 0x470000e5, 0x9c0000e6, 0x480000e7, 0x540000e8,
 		0x510000e9, 0x520000ea, 0x530000eb, 0x580000ec, 0x550000ed, 0x560000ee, 0x570000ef, 0x8c0000f0,
 		0x490000f1, 0xcd0000f2, 0xce0000f3, 0xcb0000f4, 0xcf0000f5, 0xcc0000f6, 0xe10000f7, 0x700000f8,
-		0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0xdc0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff, 0x9f0020ac,
+		0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0XDC0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff, 0x9f0020ac,
 	},
 }

@ -2449,7 +2449,7 @@ var iso8859_1 = charmap{
 		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
 		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
 		0xd00000d0, 0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7,
-		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
+		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0XDC0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
 		0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7,
 		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef,
 		0xf00000f0, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7,
@ -2615,7 +2615,7 @@ var iso8859_2 = charmap{
 		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
 		0xa00000a0, 0xa40000a4, 0xa70000a7, 0xa80000a8, 0xad0000ad, 0xb00000b0, 0xb40000b4, 0xb80000b8,
 		0xc10000c1, 0xc20000c2, 0xc40000c4, 0xc70000c7, 0xc90000c9, 0xcb0000cb, 0xcd0000cd, 0xce0000ce,
-		0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd70000d7, 0xda0000da, 0xdc0000dc, 0xdd0000dd, 0xdf0000df,
+		0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd70000d7, 0xda0000da, 0XDC0000dc, 0xdd0000dd, 0xdf0000df,
 		0xe10000e1, 0xe20000e2, 0xe40000e4, 0xe70000e7, 0xe90000e9, 0xeb0000eb, 0xed0000ed, 0xee0000ee,
 		0xf30000f3, 0xf40000f4, 0xf60000f6, 0xf70000f7, 0xfa0000fa, 0xfc0000fc, 0xfd0000fd, 0xc3000102,
 		0xe3000103, 0xa1000104, 0xb1000105, 0xc6000106, 0xe6000107, 0xc800010c, 0xe800010d, 0xcf00010e,
@ -2792,7 +2792,7 @@ var iso8859_3 = charmap{
 		0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb70000b7, 0xb80000b8, 0xbd0000bd, 0xc00000c0, 0xc10000c1,
 		0xc20000c2, 0xc40000c4, 0xc70000c7, 0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc,
 		0xcd0000cd, 0xce0000ce, 0xcf0000cf, 0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd60000d6,
-		0xd70000d7, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1,
+		0xd70000d7, 0xd90000d9, 0xda0000da, 0xdb0000db, 0XDC0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1,
 		0xe20000e2, 0xe40000e4, 0xe70000e7, 0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec,
 		0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf60000f6,
 		0xf70000f7, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xc6000108, 0xe6000109, 0xc500010a,
@ -2966,7 +2966,7 @@ var iso8859_4 = charmap{
 		0xa00000a0, 0xa40000a4, 0xa70000a7, 0xa80000a8, 0xad0000ad, 0xaf0000af, 0xb00000b0, 0xb40000b4,
 		0xb80000b8, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc90000c9,
 		0xcb0000cb, 0xcd0000cd, 0xce0000ce, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7, 0xd80000d8,
-		0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdf0000df, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4,
+		0xda0000da, 0xdb0000db, 0XDC0000dc, 0xdf0000df, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4,
 		0xe50000e5, 0xe60000e6, 0xe90000e9, 0xeb0000eb, 0xed0000ed, 0xee0000ee, 0xf40000f4, 0xf50000f5,
 		0xf60000f6, 0xf70000f7, 0xf80000f8, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xc0000100, 0xe0000101,
 		0xa1000104, 0xb1000105, 0xc800010c, 0xe800010d, 0xd0000110, 0xf0000111, 0xaa000112, 0xba000113,
@ -3145,7 +3145,7 @@ var iso8859_5 = charmap{
 		0xbf00041f, 0xc0000420, 0xc1000421, 0xc2000422, 0xc3000423, 0xc4000424, 0xc5000425, 0xc6000426,
 		0xc7000427, 0xc8000428, 0xc9000429, 0xca00042a, 0xcb00042b, 0xcc00042c, 0xcd00042d, 0xce00042e,
 		0xcf00042f, 0xd0000430, 0xd1000431, 0xd2000432, 0xd3000433, 0xd4000434, 0xd5000435, 0xd6000436,
-		0xd7000437, 0xd8000438, 0xd9000439, 0xda00043a, 0xdb00043b, 0xdc00043c, 0xdd00043d, 0xde00043e,
+		0xd7000437, 0xd8000438, 0xd9000439, 0xda00043a, 0xdb00043b, 0XDC00043c, 0xdd00043d, 0xde00043e,
 		0xdf00043f, 0xe0000440, 0xe1000441, 0xe2000442, 0xe3000443, 0xe4000444, 0xe5000445, 0xe6000446,
 		0xe7000447, 0xe8000448, 0xe9000449, 0xea00044a, 0xeb00044b, 0xec00044c, 0xed00044d, 0xee00044e,
 		0xef00044f, 0xf1000451, 0xf2000452, 0xf3000453, 0xf4000454, 0xf5000455, 0xf6000456, 0xf7000457,
@ -3494,7 +3494,7 @@ var iso8859_7 = charmap{
 		0xbe00038e, 0xbf00038f, 0xc0000390, 0xc1000391, 0xc2000392, 0xc3000393, 0xc4000394, 0xc5000395,
 		0xc6000396, 0xc7000397, 0xc8000398, 0xc9000399, 0xca00039a, 0xcb00039b, 0xcc00039c, 0xcd00039d,
 		0xce00039e, 0xcf00039f, 0xd00003a0, 0xd10003a1, 0xd30003a3, 0xd40003a4, 0xd50003a5, 0xd60003a6,
-		0xd70003a7, 0xd80003a8, 0xd90003a9, 0xda0003aa, 0xdb0003ab, 0xdc0003ac, 0xdd0003ad, 0xde0003ae,
+		0xd70003a7, 0xd80003a8, 0xd90003a9, 0xda0003aa, 0xdb0003ab, 0XDC0003ac, 0xdd0003ad, 0xde0003ae,
 		0xdf0003af, 0xe00003b0, 0xe10003b1, 0xe20003b2, 0xe30003b3, 0xe40003b4, 0xe50003b5, 0xe60003b6,
 		0xe70003b7, 0xe80003b8, 0xe90003b9, 0xea0003ba, 0xeb0003bb, 0xec0003bc, 0xed0003bd, 0xee0003be,
 		0xef0003bf, 0xf00003c0, 0xf10003c1, 0xf20003c2, 0xf30003c3, 0xf40003c4, 0xf50003c5, 0xf60003c6,
@ -3849,7 +3849,7 @@ var iso8859_9 = charmap{
 		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
 		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
 		0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7, 0xd80000d8,
-		0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2,
+		0xd90000d9, 0xda0000da, 0xdb0000db, 0XDC0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2,
 		0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7, 0xe80000e8, 0xe90000e9, 0xea0000ea,
 		0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1, 0xf20000f2, 0xf30000f3,
 		0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7, 0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb,
@ -4016,7 +4016,7 @@ var iso8859_10 = charmap{
 		0xa00000a0, 0xa70000a7, 0xad0000ad, 0xb00000b0, 0xb70000b7, 0xc10000c1, 0xc20000c2, 0xc30000c3,
 		0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc90000c9, 0xcb0000cb, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
 		0xd00000d0, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd80000d8, 0xda0000da, 0xdb0000db,
-		0xdc0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4,
+		0XDC0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4,
 		0xe50000e5, 0xe60000e6, 0xe90000e9, 0xeb0000eb, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf00000f0,
 		0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf80000f8, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc,
 		0xfd0000fd, 0xfe0000fe, 0xc0000100, 0xe0000101, 0xa1000104, 0xb1000105, 0xc800010c, 0xe800010d,
@ -4192,7 +4192,7 @@ var iso8859_13 = charmap{
 		0xac0000ac, 0xad0000ad, 0xae0000ae, 0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3, 0xb50000b5,
 		0xb60000b6, 0xb70000b7, 0xb90000b9, 0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xc40000c4,
 		0xc50000c5, 0xaf0000c6, 0xc90000c9, 0xd30000d3, 0xd50000d5, 0xd60000d6, 0xd70000d7, 0xa80000d8,
-		0xdc0000dc, 0xdf0000df, 0xe40000e4, 0xe50000e5, 0xbf0000e6, 0xe90000e9, 0xf30000f3, 0xf50000f5,
+		0XDC0000dc, 0xdf0000df, 0xe40000e4, 0xe50000e5, 0xbf0000e6, 0xe90000e9, 0xf30000f3, 0xf50000f5,
 		0xf60000f6, 0xf70000f7, 0xb80000f8, 0xfc0000fc, 0xc2000100, 0xe2000101, 0xc0000104, 0xe0000105,
 		0xc3000106, 0xe3000107, 0xc800010c, 0xe800010d, 0xc7000112, 0xe7000113, 0xcb000116, 0xeb000117,
 		0xc6000118, 0xe6000119, 0xcc000122, 0xec000123, 0xce00012a, 0xee00012b, 0xc100012e, 0xe100012f,
@ -4367,7 +4367,7 @@ var iso8859_14 = charmap{
 		0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7, 0xc80000c8,
 		0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf, 0xd10000d1,
 		0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd80000d8, 0xd90000d9, 0xda0000da,
-		0xdb0000db, 0xdc0000dc, 0xdd0000dd, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3,
+		0xdb0000db, 0XDC0000dc, 0xdd0000dd, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3,
 		0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7, 0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb,
 		0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4,
 		0xf50000f5, 0xf60000f6, 0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xfd0000fd,
@ -4544,7 +4544,7 @@ var iso8859_15 = charmap{
 		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
 		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
 		0xd00000d0, 0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7,
-		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
+		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0XDC0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
 		0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7,
 		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef,
 		0xf00000f0, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7,
@ -4716,7 +4716,7 @@ var iso8859_16 = charmap{
 		0xa00000a0, 0xa70000a7, 0xa90000a9, 0xab0000ab, 0xad0000ad, 0xb00000b0, 0xb10000b1, 0xb60000b6,
 		0xb70000b7, 0xbb0000bb, 0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc40000c4, 0xc60000c6, 0xc70000c7,
 		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
-		0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc,
+		0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd90000d9, 0xda0000da, 0xdb0000db, 0XDC0000dc,
 		0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe40000e4, 0xe60000e6, 0xe70000e7, 0xe80000e8,
 		0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf20000f2,
 		0xf30000f3, 0xf40000f4, 0xf60000f6, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xff0000ff,
@ -4896,7 +4896,7 @@ var koi8R = charmap{
 		0xc2000431, 0xd7000432, 0xc7000433, 0xc4000434, 0xc5000435, 0xd6000436, 0xda000437, 0xc9000438,
 		0xca000439, 0xcb00043a, 0xcc00043b, 0xcd00043c, 0xce00043d, 0xcf00043e, 0xd000043f, 0xd2000440,
 		0xd3000441, 0xd4000442, 0xd5000443, 0xc6000444, 0xc8000445, 0xc3000446, 0xde000447, 0xdb000448,
-		0xdd000449, 0xdf00044a, 0xd900044b, 0xd800044c, 0xdc00044d, 0xc000044e, 0xd100044f, 0xa3000451,
+		0xdd000449, 0xdf00044a, 0xd900044b, 0xd800044c, 0XDC00044d, 0xc000044e, 0xd100044f, 0xa3000451,
 		0x95002219, 0x9600221a, 0x97002248, 0x98002264, 0x99002265, 0x93002320, 0x9b002321, 0x80002500,
 		0x81002502, 0x8200250c, 0x83002510, 0x84002514, 0x85002518, 0x8600251c, 0x87002524, 0x8800252c,
 		0x89002534, 0x8a00253c, 0xa0002550, 0xa1002551, 0xa2002552, 0xa4002553, 0xa5002554, 0xa6002555,
@ -5072,7 +5072,7 @@ var koi8U = charmap{
 		0xc5000435, 0xd6000436, 0xda000437, 0xc9000438, 0xca000439, 0xcb00043a, 0xcc00043b, 0xcd00043c,
 		0xce00043d, 0xcf00043e, 0xd000043f, 0xd2000440, 0xd3000441, 0xd4000442, 0xd5000443, 0xc6000444,
 		0xc8000445, 0xc3000446, 0xde000447, 0xdb000448, 0xdd000449, 0xdf00044a, 0xd900044b, 0xd800044c,
-		0xdc00044d, 0xc000044e, 0xd100044f, 0xa3000451, 0xa4000454, 0xa6000456, 0xa7000457, 0xae00045e,
+		0XDC00044d, 0xc000044e, 0xd100044f, 0xa3000451, 0xa4000454, 0xa6000456, 0xa7000457, 0xae00045e,
 		0xbd000490, 0xad000491, 0x95002219, 0x9600221a, 0x97002248, 0x98002264, 0x99002265, 0x93002320,
 		0x9b002321, 0x80002500, 0x81002502, 0x8200250c, 0x83002510, 0x84002514, 0x85002518, 0x8600251c,
 		0x87002524, 0x8800252c, 0x89002534, 0x8a00253c, 0xa0002550, 0xa1002551, 0xa2002552, 0xa5002554,
@ -5251,7 +5251,7 @@ var macintosh = charmap{
 		0xf5000131, 0xce000152, 0xcf000153, 0xd9000178, 0xc4000192, 0xf60002c6, 0xff0002c7, 0xf90002d8,
 		0xfa0002d9, 0xfb0002da, 0xfe0002db, 0xf70002dc, 0xfd0002dd, 0xbd0003a9, 0xb90003c0, 0xd0002013,
 		0xd1002014, 0xd4002018, 0xd5002019, 0xe200201a, 0xd200201c, 0xd300201d, 0xe300201e, 0xa0002020,
-		0xe0002021, 0xa5002022, 0xc9002026, 0xe4002030, 0xdc002039, 0xdd00203a, 0xda002044, 0xdb0020ac,
+		0xe0002021, 0xa5002022, 0xc9002026, 0xe4002030, 0XDC002039, 0xdd00203a, 0xda002044, 0xdb0020ac,
 		0xaa002122, 0xb6002202, 0xc6002206, 0xb800220f, 0xb7002211, 0xc300221a, 0xb000221e, 0xba00222b,
 		0xc5002248, 0xad002260, 0xb2002264, 0xb3002265, 0xd70025ca, 0xf000f8ff, 0xde00fb01, 0xdf00fb02,
 	},
@ -5427,7 +5427,7 @@ var macintoshCyrillic = charmap{
 		0xfc00044c, 0xfd00044d, 0xfe00044e, 0xdf00044f, 0xde000451, 0xac000452, 0xaf000453, 0xb9000454,
 		0xcf000455, 0xb4000456, 0xbb000457, 0xc0000458, 0xbd000459, 0xbf00045a, 0xcc00045b, 0xce00045c,
 		0xd900045e, 0xdb00045f, 0xa2000490, 0xb6000491, 0xd0002013, 0xd1002014, 0xd4002018, 0xd5002019,
-		0xd200201c, 0xd300201d, 0xd700201e, 0xa0002020, 0xa5002022, 0xc9002026, 0xff0020ac, 0xdc002116,
+		0xd200201c, 0xd300201d, 0xd700201e, 0xa0002020, 0xa5002022, 0xc9002026, 0xff0020ac, 0XDC002116,
 		0xaa002122, 0xc6002206, 0xc300221a, 0xb000221e, 0xc5002248, 0xad002260, 0xb2002264, 0xb3002265,
 	},
 }
@ -5766,7 +5766,7 @@ var windows1250 = charmap{
 		0xa00000a0, 0xa40000a4, 0xa60000a6, 0xa70000a7, 0xa80000a8, 0xa90000a9, 0xab0000ab, 0xac0000ac,
 		0xad0000ad, 0xae0000ae, 0xb00000b0, 0xb10000b1, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7,
 		0xb80000b8, 0xbb0000bb, 0xc10000c1, 0xc20000c2, 0xc40000c4, 0xc70000c7, 0xc90000c9, 0xcb0000cb,
-		0xcd0000cd, 0xce0000ce, 0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd70000d7, 0xda0000da, 0xdc0000dc,
+		0xcd0000cd, 0xce0000ce, 0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd70000d7, 0xda0000da, 0XDC0000dc,
 		0xdd0000dd, 0xdf0000df, 0xe10000e1, 0xe20000e2, 0xe40000e4, 0xe70000e7, 0xe90000e9, 0xeb0000eb,
 		0xed0000ed, 0xee0000ee, 0xf30000f3, 0xf40000f4, 0xf60000f6, 0xf70000f7, 0xfa0000fa, 0xfc0000fc,
 		0xfd0000fd, 0xc3000102, 0xe3000103, 0xa5000104, 0xb9000105, 0xc6000106, 0xe6000107, 0xc800010c,
@ -5945,7 +5945,7 @@ var windows1251 = charmap{
 		0xc3000413, 0xc4000414, 0xc5000415, 0xc6000416, 0xc7000417, 0xc8000418, 0xc9000419, 0xca00041a,
 		0xcb00041b, 0xcc00041c, 0xcd00041d, 0xce00041e, 0xcf00041f, 0xd0000420, 0xd1000421, 0xd2000422,
 		0xd3000423, 0xd4000424, 0xd5000425, 0xd6000426, 0xd7000427, 0xd8000428, 0xd9000429, 0xda00042a,
-		0xdb00042b, 0xdc00042c, 0xdd00042d, 0xde00042e, 0xdf00042f, 0xe0000430, 0xe1000431, 0xe2000432,
+		0xdb00042b, 0XDC00042c, 0xdd00042d, 0xde00042e, 0xdf00042f, 0xe0000430, 0xe1000431, 0xe2000432,
 		0xe3000433, 0xe4000434, 0xe5000435, 0xe6000436, 0xe7000437, 0xe8000438, 0xe9000439, 0xea00043a,
 		0xeb00043b, 0xec00043c, 0xed00043d, 0xee00043e, 0xef00043f, 0xf0000440, 0xf1000441, 0xf2000442,
 		0xf3000443, 0xf4000444, 0xf5000445, 0xf6000446, 0xf7000447, 0xf8000448, 0xf9000449, 0xfa00044a,
@ -6120,7 +6120,7 @@ var windows1252 = charmap{
 		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
 		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
 		0xd00000d0, 0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7,
-		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
+		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0XDC0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
 		0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7,
 		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef,
 		0xf00000f0, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7,
@ -6295,7 +6295,7 @@ var windows1253 = charmap{
 		0xc1000391, 0xc2000392, 0xc3000393, 0xc4000394, 0xc5000395, 0xc6000396, 0xc7000397, 0xc8000398,
 		0xc9000399, 0xca00039a, 0xcb00039b, 0xcc00039c, 0xcd00039d, 0xce00039e, 0xcf00039f, 0xd00003a0,
 		0xd10003a1, 0xd30003a3, 0xd40003a4, 0xd50003a5, 0xd60003a6, 0xd70003a7, 0xd80003a8, 0xd90003a9,
-		0xda0003aa, 0xdb0003ab, 0xdc0003ac, 0xdd0003ad, 0xde0003ae, 0xdf0003af, 0xe00003b0, 0xe10003b1,
+		0xda0003aa, 0xdb0003ab, 0XDC0003ac, 0xdd0003ad, 0xde0003ae, 0xdf0003af, 0xe00003b0, 0xe10003b1,
 		0xe20003b2, 0xe30003b3, 0xe40003b4, 0xe50003b5, 0xe60003b6, 0xe70003b7, 0xe80003b8, 0xe90003b9,
 		0xea0003ba, 0xeb0003bb, 0xec0003bc, 0xed0003bd, 0xee0003be, 0xef0003bf, 0xf00003c0, 0xf10003c1,
 		0xf20003c2, 0xf30003c3, 0xf40003c4, 0xf50003c5, 0xf60003c6, 0xf70003c7, 0xf80003c8, 0xf90003c9,
@ -6470,7 +6470,7 @@ var windows1254 = charmap{
 		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
 		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
 		0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7, 0xd80000d8,
-		0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2,
+		0xd90000d9, 0xda0000da, 0xdb0000db, 0XDC0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2,
 		0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7, 0xe80000e8, 0xe90000e9, 0xea0000ea,
 		0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1, 0xf20000f2, 0xf30000f3,
 		0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7, 0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb,
@ -6822,7 +6822,7 @@ var windows1256 = charmap{
 		0xba00061b, 0xbf00061f, 0xc1000621, 0xc2000622, 0xc3000623, 0xc4000624, 0xc5000625, 0xc6000626,
 		0xc7000627, 0xc8000628, 0xc9000629, 0xca00062a, 0xcb00062b, 0xcc00062c, 0xcd00062d, 0xce00062e,
 		0xcf00062f, 0xd0000630, 0xd1000631, 0xd2000632, 0xd3000633, 0xd4000634, 0xd5000635, 0xd6000636,
-		0xd8000637, 0xd9000638, 0xda000639, 0xdb00063a, 0xdc000640, 0xdd000641, 0xde000642, 0xdf000643,
+		0xd8000637, 0xd9000638, 0xda000639, 0xdb00063a, 0XDC000640, 0xdd000641, 0xde000642, 0xdf000643,
 		0xe1000644, 0xe3000645, 0xe4000646, 0xe5000647, 0xe6000648, 0xec000649, 0xed00064a, 0xf000064b,
 		0xf100064c, 0xf200064d, 0xf300064e, 0xf500064f, 0xf6000650, 0xf8000651, 0xfa000652, 0x8a000679,
 		0x8100067e, 0x8d000686, 0x8f000688, 0x9a000691, 0x8e000698, 0x980006a9, 0x900006af, 0x9f0006ba,
@ -6992,7 +6992,7 @@ var windows1257 = charmap{
 		0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0x9d0000af, 0xb00000b0, 0xb10000b1, 0xb20000b2,
 		0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7, 0x8f0000b8, 0xb90000b9, 0xbb0000bb,
 		0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xc40000c4, 0xc50000c5, 0xaf0000c6, 0xc90000c9, 0xd30000d3,
-		0xd50000d5, 0xd60000d6, 0xd70000d7, 0xa80000d8, 0xdc0000dc, 0xdf0000df, 0xe40000e4, 0xe50000e5,
+		0xd50000d5, 0xd60000d6, 0xd70000d7, 0xa80000d8, 0XDC0000dc, 0xdf0000df, 0xe40000e4, 0xe50000e5,
 		0xbf0000e6, 0xe90000e9, 0xf30000f3, 0xf50000f5, 0xf60000f6, 0xf70000f7, 0xb80000f8, 0xfc0000fc,
 		0xc2000100, 0xe2000101, 0xc0000104, 0xe0000105, 0xc3000106, 0xe3000107, 0xc800010c, 0xe800010d,
 		0xc7000112, 0xe7000113, 0xcb000116, 0xeb000117, 0xc6000118, 0xe6000119, 0xcc000122, 0xec000123,
@ -7169,7 +7169,7 @@ var windows1258 = charmap{
 		0xb80000b8, 0xb90000b9, 0xba0000ba, 0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xbf0000bf,
 		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7, 0xc80000c8,
 		0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcd0000cd, 0xce0000ce, 0xcf0000cf, 0xd10000d1, 0xd30000d3,
-		0xd40000d4, 0xd60000d6, 0xd70000d7, 0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc,
+		0xd40000d4, 0xd60000d6, 0xd70000d7, 0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0XDC0000dc,
 		0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7,
 		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1,
 		0xf30000f3, 0xf40000f4, 0xf60000f6, 0xf70000f7, 0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb,
@ -7351,7 +7351,7 @@ var xUserDefined = charmap{
 		0xc000f7c0, 0xc100f7c1, 0xc200f7c2, 0xc300f7c3, 0xc400f7c4, 0xc500f7c5, 0xc600f7c6, 0xc700f7c7,
 		0xc800f7c8, 0xc900f7c9, 0xca00f7ca, 0xcb00f7cb, 0xcc00f7cc, 0xcd00f7cd, 0xce00f7ce, 0xcf00f7cf,
 		0xd000f7d0, 0xd100f7d1, 0xd200f7d2, 0xd300f7d3, 0xd400f7d4, 0xd500f7d5, 0xd600f7d6, 0xd700f7d7,
-		0xd800f7d8, 0xd900f7d9, 0xda00f7da, 0xdb00f7db, 0xdc00f7dc, 0xdd00f7dd, 0xde00f7de, 0xdf00f7df,
+		0xd800f7d8, 0xd900f7d9, 0xda00f7da, 0xdb00f7db, 0XDC00f7dc, 0xdd00f7dd, 0xde00f7de, 0xdf00f7df,
 		0xe000f7e0, 0xe100f7e1, 0xe200f7e2, 0xe300f7e3, 0xe400f7e4, 0xe500f7e5, 0xe600f7e6, 0xe700f7e7,
 		0xe800f7e8, 0xe900f7e9, 0xea00f7ea, 0xeb00f7eb, 0xec00f7ec, 0xed00f7ed, 0xee00f7ee, 0xef00f7ef,
 		0xf000f7f0, 0xf100f7f1, 0xf200f7f2, 0xf300f7f3, 0xf400f7f4, 0xf500f7f5, 0xf600f7f6, 0xf700f7f7,
--- a/vendor/golang.org/x/text/encoding/korean/tables.go
+++ b/vendor/golang.org/x/text/encoding/korean/tables.go
@ -17079,13 +17079,13 @@ var encode0 = [...]uint16{
 	19977 - 19968: 0xDFB2,
 	19978 - 19968: 0xDFBE,
 	19979 - 19968: 0xF9BB,
-	19981 - 19968: 0xDCF4,
+	19981 - 19968: 0XDCF4,
 	19985 - 19968: 0xF5E4,
 	19988 - 19968: 0xF3A6,
 	19989 - 19968: 0xDDE0,
 	19990 - 19968: 0xE1A6,
 	19992 - 19968: 0xCEF8,
-	19993 - 19968: 0xDCB0,
+	19993 - 19968: 0XDCB0,
 	19998 - 19968: 0xE3AA,
 	20013 - 19968: 0xF1E9,
 	20018 - 19968: 0xCDFA,
@ -17108,7 +17108,7 @@ var encode0 = [...]uint16{
 	20075 - 19968: 0xCAE1,
 	20077 - 19968: 0xD4CC,
 	20083 - 19968: 0xEAE1,
-	20086 - 19968: 0xDCE3,
+	20086 - 19968: 0XDCE3,
 	20087 - 19968: 0xDFAD,
 	20094 - 19968: 0xCBEB,
 	20098 - 19968: 0xD5AF,
@ -17148,7 +17148,7 @@ var encode0 = [...]uint16{
 	20181 - 19968: 0xDEC2,
 	20182 - 19968: 0xF6E2,
 	20183 - 19968: 0xEDDC,
-	20184 - 19968: 0xDCF5,
+	20184 - 19968: 0XDCF5,
 	20185 - 19968: 0xE0B9,
 	20189 - 19968: 0xD4CE,
 	20191 - 19968: 0xF4B5,
@ -17166,7 +17166,7 @@ var encode0 = [...]uint16{
 	20235 - 19968: 0xD0DF,
 	20237 - 19968: 0xE7EA,
 	20238 - 19968: 0xD0EB,
-	20239 - 19968: 0xDCD1,
+	20239 - 19968: 0XDCD1,
 	20240 - 19968: 0xDBE9,
 	20241 - 19968: 0xFDCC,
 	20271 - 19968: 0xDBD7,
@ -17228,18 +17228,18 @@ var encode0 = [...]uint16{
 	20436 - 19968: 0xFAD5,
 	20439 - 19968: 0xE1D4,
 	20442 - 19968: 0xD7D6,
-	20445 - 19968: 0xDCC1,
+	20445 - 19968: 0XDCC1,
 	20447 - 19968: 0xDEC6,
 	20448 - 19968: 0xFAEF,
 	20449 - 19968: 0xE3E1,
 	20462 - 19968: 0xE1F3,
-	20463 - 19968: 0xDCF6,
+	20463 - 19968: 0XDCF6,
 	20465 - 19968: 0xCEFC,
 	20467 - 19968: 0xDBC4,
 	20469 - 19968: 0xF8F1,
-	20472 - 19968: 0xDCE4,
+	20472 - 19968: 0XDCE4,
 	20474 - 19968: 0xE5EF,
-	20482 - 19968: 0xDCB1,
+	20482 - 19968: 0XDCB1,
 	20486 - 19968: 0xD5D6,
 	20489 - 19968: 0xF3DA,
 	20491 - 19968: 0xCBC1,
@ -17277,7 +17277,7 @@ var encode0 = [...]uint16{
 	20598 - 19968: 0xE9CF,
 	20600 - 19968: 0xF7DE,
 	20608 - 19968: 0xCED3,
-	20613 - 19968: 0xDCF7,
+	20613 - 19968: 0XDCF7,
 	20621 - 19968: 0xDBA8,
 	20625 - 19968: 0xCBF8,
 	20632 - 19968: 0xDFA1,
@ -17294,7 +17294,7 @@ var encode0 = [...]uint16{
 	20682 - 19968: 0xE0BA,
 	20687 - 19968: 0xDFC0,
 	20689 - 19968: 0xCEE0,
-	20693 - 19968: 0xDCD2,
+	20693 - 19968: 0XDCD2,
 	20694 - 19968: 0xFDEA,
 	20698 - 19968: 0xD6F6,
 	20702 - 19968: 0xEACA,
@ -17343,7 +17343,7 @@ var encode0 = [...]uint16{
 	20845 - 19968: 0xD7BF,
 	20846 - 19968: 0xFBB1,
 	20849 - 19968: 0xCDEC,
-	20853 - 19968: 0xDCB2,
+	20853 - 19968: 0XDCB2,
 	20854 - 19968: 0xD0EC,
 	20855 - 19968: 0xCEFD,
 	20856 - 19968: 0xEEF0,
@ -17390,7 +17390,7 @@ var encode0 = [...]uint16{
 	21015 - 19968: 0xD6AA,
 	21021 - 19968: 0xF4F8,
 	21028 - 19968: 0xF7F7,
-	21029 - 19968: 0xDCAC,
+	21029 - 19968: 0XDCAC,
 	21033 - 19968: 0xD7D7,
 	21034 - 19968: 0xDFA2,
 	21038 - 19968: 0xCEBE,
@ -17408,13 +17408,13 @@ var encode0 = [...]uint16{
 	21068 - 19968: 0xD5B7,
 	21069 - 19968: 0xEEF1,
 	21076 - 19968: 0xF4A8,
-	21078 - 19968: 0xDCF8,
+	21078 - 19968: 0XDCF8,
 	21083 - 19968: 0xCBA7,
 	21085 - 19968: 0xDACE,
 	21089 - 19968: 0xE0E6,
 	21097 - 19968: 0xEDA5,
 	21098 - 19968: 0xEEF2,
-	21103 - 19968: 0xDCF9,
+	21103 - 19968: 0XDCF9,
 	21106 - 19968: 0xF9DC,
 	21109 - 19968: 0xF3DC,
 	21117 - 19968: 0xF8F2,
@ -17464,7 +17464,7 @@ var encode0 = [...]uint16{
 	21256 - 19968: 0xFDD6,
 	21261 - 19968: 0xF8D1,
 	21263 - 19968: 0xF8D2,
-	21264 - 19968: 0xDCD3,
+	21264 - 19968: 0XDCD3,
 	21269 - 19968: 0xDDE2,
 	21270 - 19968: 0xFBF9,
 	21271 - 19968: 0xDDC1,
@ -17491,8 +17491,8 @@ var encode0 = [...]uint16{
 	21332 - 19968: 0xFAF0,
 	21335 - 19968: 0xD1F5,
 	21338 - 19968: 0xDACF,
-	21340 - 19968: 0xDCD4,
-	21342 - 19968: 0xDCA6,
+	21340 - 19968: 0XDCD4,
+	21342 - 19968: 0XDCA6,
 	21344 - 19968: 0xEFBF,
 	21350 - 19968: 0xCECF,
 	21352 - 19968: 0xE0D9,
@ -17555,7 +17555,7 @@ var encode0 = [...]uint16{
 	21533 - 19968: 0xD7F0,
 	21535 - 19968: 0xEBE1,
 	21536 - 19968: 0xF8C5,
-	21542 - 19968: 0xDCFA,
+	21542 - 19968: 0XDCFA,
 	21545 - 19968: 0xDDC3,
 	21547 - 19968: 0xF9DF,
 	21555 - 19968: 0xE7EF,
@ -17580,7 +17580,7 @@ var encode0 = [...]uint16{
 	21638 - 19968: 0xF8D3,
 	21644 - 19968: 0xFBFA,
 	21646 - 19968: 0xCFA4,
-	21648 - 19968: 0xDCFB,
+	21648 - 19968: 0XDCFB,
 	21668 - 19968: 0xF6E3,
 	21672 - 19968: 0xEDAA,
 	21675 - 19968: 0xF2A1,
@ -17716,7 +17716,7 @@ var encode0 = [...]uint16{
 	22475 - 19968: 0xD8D8,
 	22478 - 19968: 0xE0F2,
 	22495 - 19968: 0xE6B4,
-	22496 - 19968: 0xDCFC,
+	22496 - 19968: 0XDCFC,
 	22512 - 19968: 0xF3F1,
 	22516 - 19968: 0xE3D0,
 	22519 - 19968: 0xF2FB,
@ -17731,13 +17731,13 @@ var encode0 = [...]uint16{
 	22537 - 19968: 0xEBBC,
 	22538 - 19968: 0xE4BE,
 	22558 - 19968: 0xF4DC,
-	22561 - 19968: 0xDCC2,
+	22561 - 19968: 0XDCC2,
 	22564 - 19968: 0xF0A7,
 	22567 - 19968: 0xE6C0,
 	22570 - 19968: 0xCAED,
 	22575 - 19968: 0xE8EB,
 	22576 - 19968: 0xE5E8,
-	22577 - 19968: 0xDCC3,
+	22577 - 19968: 0XDCC3,
 	22580 - 19968: 0xEDDE,
 	22581 - 19968: 0xD3F2,
 	22586 - 19968: 0xCCF7,
@ -17801,7 +17801,7 @@ var encode0 = [...]uint16{
 	22823 - 19968: 0xD3DE,
 	22825 - 19968: 0xF4B8,
 	22826 - 19968: 0xF7BC,
-	22827 - 19968: 0xDCFD,
+	22827 - 19968: 0XDCFD,
 	22829 - 19968: 0xE8EC,
 	22830 - 19968: 0xE4E7,
 	22833 - 19968: 0xE3F7,
@ -17810,7 +17810,7 @@ var encode0 = [...]uint16{
 	22852 - 19968: 0xE5F2,
 	22855 - 19968: 0xD0F4,
 	22856 - 19968: 0xD2AF,
-	22857 - 19968: 0xDCE5,
+	22857 - 19968: 0XDCE5,
 	22862 - 19968: 0xD0A5,
 	22863 - 19968: 0xF1B4,
 	22864 - 19968: 0xFCB1,
@ -17882,7 +17882,7 @@ var encode0 = [...]uint16{
 	23113 - 19968: 0xE8C6,
 	23130 - 19968: 0xFBE6,
 	23138 - 19968: 0xDDE6,
-	23142 - 19968: 0xDCFE,
+	23142 - 19968: 0XDCFE,
 	23186 - 19968: 0xD8DA,
 	23194 - 19968: 0xDAAC,
 	23195 - 19968: 0xEAB0,
@ -17930,7 +17930,7 @@ var encode0 = [...]uint16{
 	23435 - 19968: 0xE1E4,
 	23436 - 19968: 0xE8C7,
 	23439 - 19968: 0xCEDB,
-	23443 - 19968: 0xDCD5,
+	23443 - 19968: 0XDCD5,
 	23445 - 19968: 0xF7B5,
 	23446 - 19968: 0xFCF3,
 	23447 - 19968: 0xF0F3,
@ -17982,10 +17982,10 @@ var encode0 = [...]uint16{
 	23534 - 19968: 0xD6F7,
 	23535 - 19968: 0xF1D9,
 	23541 - 19968: 0xF5C1,
-	23542 - 19968: 0xDCC4,
+	23542 - 19968: 0XDCC4,
 	23544 - 19968: 0xF5BB,
 	23546 - 19968: 0xDED1,
-	23553 - 19968: 0xDCE6,
+	23553 - 19968: 0XDCE6,
 	23556 - 19968: 0xDED2,
 	23559 - 19968: 0xEDE2,
 	23560 - 19968: 0xEEF6,
@ -18017,7 +18017,7 @@ var encode0 = [...]uint16{
 	23630 - 19968: 0xE3BA,
 	23633 - 19968: 0xE0DA,
 	23637 - 19968: 0xEEF7,
-	23643 - 19968: 0xDCB3,
+	23643 - 19968: 0XDCB3,
 	23648 - 19968: 0xD3F5,
 	23650 - 19968: 0xD7A6,
 	23652 - 19968: 0xF6B5,
@ -18043,8 +18043,8 @@ var encode0 = [...]uint16{
 	23769 - 19968: 0xF6B9,
 	23776 - 19968: 0xDFC7,
 	23784 - 19968: 0xE4B1,
-	23791 - 19968: 0xDCE7,
-	23792 - 19968: 0xDCE8,
+	23791 - 19968: 0XDCE7,
+	23792 - 19968: 0XDCE8,
 	23796 - 19968: 0xFAD6,
 	23798 - 19968: 0xD3F6,
 	23803 - 19968: 0xF1DA,
@ -18125,7 +18125,7 @@ var encode0 = [...]uint16{
 	24178 - 19968: 0xCACE,
 	24179 - 19968: 0xF8C1,
 	24180 - 19968: 0xD2B4,
-	24183 - 19968: 0xDCB4,
+	24183 - 19968: 0XDCB4,
 	24184 - 19968: 0xFAB9,
 	24185 - 19968: 0xCACF,
 	24187 - 19968: 0xFCB3,
@ -18169,7 +18169,7 @@ var encode0 = [...]uint16{
 	24311 - 19968: 0xEFD5,
 	24314 - 19968: 0xCBEF,
 	24315 - 19968: 0xFCDF,
-	24321 - 19968: 0xDCA7,
+	24321 - 19968: 0XDCA7,
 	24324 - 19968: 0xD6E7,
 	24330 - 19968: 0xF8C9,
 	24335 - 19968: 0xE3D2,
@ -18227,7 +18227,7 @@ var encode0 = [...]uint16{
 	24480 - 19968: 0xD5D0,
 	24481 - 19968: 0xE5D9,
 	24488 - 19968: 0xFCC7,
-	24489 - 19968: 0xDCD6,
+	24489 - 19968: 0XDCD6,
 	24490 - 19968: 0xE2E0,
 	24494 - 19968: 0xDAB0,
 	24501 - 19968: 0xF3A3,
@ -18486,7 +18486,7 @@ var encode0 = [...]uint16{
 	25423 - 19968: 0xD1F3,
 	25424 - 19968: 0xE6C8,
 	25429 - 19968: 0xF8DA,
-	25447 - 19968: 0xDCE9,
+	25447 - 19968: 0XDCE9,
 	25448 - 19968: 0xDED7,
 	25454 - 19968: 0xCBDF,
 	25458 - 19968: 0xCFEC,
@ -18671,7 +18671,7 @@ var encode0 = [...]uint16{
 	26131 - 19968: 0xE6B6,
 	26132 - 19968: 0xE0AE,
 	26133 - 19968: 0xFDDA,
-	26142 - 19968: 0xDCB5,
+	26142 - 19968: 0XDCB5,
 	26143 - 19968: 0xE0F8,
 	26144 - 19968: 0xE7B1,
 	26149 - 19968: 0xF5F0,
@ -18683,7 +18683,7 @@ var encode0 = [...]uint16{
 	26161 - 19968: 0xE9F0,
 	26164 - 19968: 0xD9DB,
 	26166 - 19968: 0xF3E4,
-	26170 - 19968: 0xDCB6,
+	26170 - 19968: 0XDCB6,
 	26171 - 19968: 0xE4E9,
 	26177 - 19968: 0xF0C5,
 	26178 - 19968: 0xE3C1,
@ -18704,7 +18704,7 @@ var encode0 = [...]uint16{
 	26216 - 19968: 0xE3E7,
 	26217 - 19968: 0xD8B9,
 	26219 - 19968: 0xF6F8,
-	26222 - 19968: 0xDCC5,
+	26222 - 19968: 0XDCC5,
 	26223 - 19968: 0xCCD8,
 	26227 - 19968: 0xE0AF,
 	26228 - 19968: 0xF4E7,
@ -18759,7 +18759,7 @@ var encode0 = [...]uint16{
 	26376 - 19968: 0xEAC5,
 	26377 - 19968: 0xEAF3,
 	26379 - 19968: 0xDDDB,
-	26381 - 19968: 0xDCD7,
+	26381 - 19968: 0XDCD7,
 	26388 - 19968: 0xDEFD,
 	26389 - 19968: 0xF2F9,
 	26391 - 19968: 0xD5C7,
@ -18772,7 +18772,7 @@ var encode0 = [...]uint16{
 	26408 - 19968: 0xD9CA,
 	26410 - 19968: 0xDAB1,
 	26411 - 19968: 0xD8C7,
-	26412 - 19968: 0xDCE2,
+	26412 - 19968: 0XDCE2,
 	26413 - 19968: 0xF3CE,
 	26414 - 19968: 0xF5F4,
 	26417 - 19968: 0xF1B9,
@ -18819,7 +18819,7 @@ var encode0 = [...]uint16{
 	26551 - 19968: 0xCAAE,
 	26552 - 19968: 0xCFAE,
 	26558 - 19968: 0xE3C2,
-	26564 - 19968: 0xDCB7,
+	26564 - 19968: 0XDCB7,
 	26575 - 19968: 0xDBDA,
 	26576 - 19968: 0xD9BB,
 	26577 - 19968: 0xCAF3,
@ -18884,11 +18884,11 @@ var encode0 = [...]uint16{
 	26805 - 19968: 0xDBEF,
 	26806 - 19968: 0xDAB2,
 	26820 - 19968: 0xD1A5,
-	26821 - 19968: 0xDCB8,
+	26821 - 19968: 0XDCB8,
 	26825 - 19968: 0xD8F6,
 	26827 - 19968: 0xD1A4,
 	26829 - 19968: 0xCDE2,
-	26834 - 19968: 0xDCEA,
+	26834 - 19968: 0XDCEA,
 	26837 - 19968: 0xF0F7,
 	26839 - 19968: 0xF0CA,
 	26840 - 19968: 0xD0BE,
@ -19015,7 +19015,7 @@ var encode0 = [...]uint16{
 	27490 - 19968: 0xF2AD,
 	27491 - 19968: 0xEFE1,
 	27492 - 19968: 0xF3AE,
-	27493 - 19968: 0xDCC6,
+	27493 - 19968: 0XDCC6,
 	27494 - 19968: 0xD9EB,
 	27498 - 19968: 0xE8E0,
 	27506 - 19968: 0xE1A8,
@ -19133,7 +19133,7 @@ var encode0 = [...]uint16{
 	27891 - 19968: 0xE7B6,
 	27915 - 19968: 0xE5C7,
 	27916 - 19968: 0xD6AC,
-	27921 - 19968: 0xDCC7,
+	27921 - 19968: 0XDCC7,
 	27927 - 19968: 0xE1A9,
 	27929 - 19968: 0xE2AA,
 	27931 - 19968: 0xD5A6,
@ -19243,7 +19243,7 @@ var encode0 = [...]uint16{
 	28271 - 19968: 0xF7B7,
 	28274 - 19968: 0xEAB8,
 	28275 - 19968: 0xD1F9,
-	28282 - 19968: 0xDCC8,
+	28282 - 19968: 0XDCC8,
 	28304 - 19968: 0xEAB9,
 	28310 - 19968: 0xF1DE,
 	28316 - 19968: 0xD7B6,
@ -19304,7 +19304,7 @@ var encode0 = [...]uint16{
 	28528 - 19968: 0xCFF7,
 	28538 - 19968: 0xEDD2,
 	28540 - 19968: 0xD4D8,
-	28541 - 19968: 0xDCC9,
+	28541 - 19968: 0XDCC9,
 	28542 - 19968: 0xD7F1,
 	28545 - 19968: 0xDFBB,
 	28548 - 19968: 0xF3A5,
@ -19385,7 +19385,7 @@ var encode0 = [...]uint16{
 	28844 - 19968: 0xCBE3,
 	28845 - 19968: 0xF7A9,
 	28847 - 19968: 0xFBA6,
-	28851 - 19968: 0xDCB9,
+	28851 - 19968: 0XDCB9,
 	28855 - 19968: 0xF1C0,
 	28856 - 19968: 0xEDC8,
 	28857 - 19968: 0xEFC3,
@ -19398,7 +19398,7 @@ var encode0 = [...]uint16{
 	28895 - 19968: 0xE6D3,
 	28913 - 19968: 0xCCDE,
 	28921 - 19968: 0xF8B2,
-	28925 - 19968: 0xDCEB,
+	28925 - 19968: 0XDCEB,
 	28932 - 19968: 0xFDB6,
 	28937 - 19968: 0xE5EA,
 	28940 - 19968: 0xF1E0,
@ -19435,7 +19435,7 @@ var encode0 = [...]uint16{
 	29076 - 19968: 0xE9C2,
 	29081 - 19968: 0xFDF7,
 	29087 - 19968: 0xE2D9,
-	29090 - 19968: 0xDCEC,
+	29090 - 19968: 0XDCEC,
 	29100 - 19968: 0xE8A2,
 	29105 - 19968: 0xE6F0,
 	29113 - 19968: 0xFDF8,
@ -19568,7 +19568,7 @@ var encode0 = [...]uint16{
 	29662 - 19968: 0xD5A8,
 	29664 - 19968: 0xF1C1,
 	29667 - 19968: 0xE2E9,
-	29668 - 19968: 0xDCCA,
+	29668 - 19968: 0XDCCA,
 	29669 - 19968: 0xECB4,
 	29670 - 19968: 0xFAC0,
 	29673 - 19968: 0xFBA8,
@ -19593,7 +19593,7 @@ var encode0 = [...]uint16{
 	29734 - 19968: 0xD1AD,
 	29736 - 19968: 0xCDE4,
 	29738 - 19968: 0xD1AE,
-	29739 - 19968: 0xDCED,
+	29739 - 19968: 0XDCED,
 	29740 - 19968: 0xE8CE,
 	29742 - 19968: 0xF0F9,
 	29743 - 19968: 0xCEB5,
@ -19661,7 +19661,7 @@ var encode0 = [...]uint16{
 	29926 - 19968: 0xE8BF,
 	29934 - 19968: 0xE8B7,
 	29943 - 19968: 0xEDB6,
-	29953 - 19968: 0xDCBA,
+	29953 - 19968: 0XDCBA,
 	29956 - 19968: 0xCCB4,
 	29969 - 19968: 0xF1F7,
 	29973 - 19968: 0xE8B8,
@ -19673,7 +19673,7 @@ var encode0 = [...]uint16{
 	29989 - 19968: 0xDFE7,
 	29990 - 19968: 0xE1C1,
 	29992 - 19968: 0xE9C4,
-	29995 - 19968: 0xDCCB,
+	29995 - 19968: 0XDCCB,
 	29996 - 19968: 0xE9C5,
 	30000 - 19968: 0xEFA3,
 	30001 - 19968: 0xEBA6,
@ -19723,7 +19723,7 @@ var encode0 = [...]uint16{
 	30141 - 19968: 0xEEC5,
 	30142 - 19968: 0xF2F0,
 	30146 - 19968: 0xCAB2,
-	30149 - 19968: 0xDCBB,
+	30149 - 19968: 0XDCBB,
 	30151 - 19968: 0xF1F8,
 	30157 - 19968: 0xECB7,
 	30162 - 19968: 0xE5CA,
@ -19819,7 +19819,7 @@ var encode0 = [...]uint16{
 	30603 - 19968: 0xF2D9,
 	30609 - 19968: 0xD9AA,
 	30622 - 19968: 0xD8BE,
-	30629 - 19968: 0xDCAD,
+	30629 - 19968: 0XDCAD,
 	30636 - 19968: 0xE2EB,
 	30637 - 19968: 0xD6FC,
 	30640 - 19968: 0xCAF9,
@ -19861,7 +19861,7 @@ var encode0 = [...]uint16{
 	30865 - 19968: 0xDDF8,
 	30871 - 19968: 0xE8CF,
 	30883 - 19968: 0xCAE5,
-	30887 - 19968: 0xDCA1,
+	30887 - 19968: 0XDCA1,
 	30889 - 19968: 0xE0B5,
 	30906 - 19968: 0xFCAC,
 	30907 - 19968: 0xFCAD,
@ -19907,7 +19907,7 @@ var encode0 = [...]uint16{
 	31105 - 19968: 0xD0D7,
 	31117 - 19968: 0xFCA1,
 	31118 - 19968: 0xEFEE,
-	31119 - 19968: 0xDCD8,
+	31119 - 19968: 0XDCD8,
 	31121 - 19968: 0xE9DF,
 	31142 - 19968: 0xE5DD,
 	31143 - 19968: 0xFDFB,
@ -19921,7 +19921,7 @@ var encode0 = [...]uint16{
 	31167 - 19968: 0xD4BE,
 	31168 - 19968: 0xE2B3,
 	31169 - 19968: 0xDEE7,
-	31177 - 19968: 0xDCBC,
+	31177 - 19968: 0XDCBC,
 	31178 - 19968: 0xD2B6,
 	31179 - 19968: 0xF5D5,
 	31185 - 19968: 0xCEA1,
@ -19991,7 +19991,7 @@ var encode0 = [...]uint16{
 	31435 - 19968: 0xD8A1,
 	31447 - 19968: 0xD9DF,
 	31449 - 19968: 0xF3D7,
-	31453 - 19968: 0xDCBD,
+	31453 - 19968: 0XDCBD,
 	31455 - 19968: 0xCCE5,
 	31456 - 19968: 0xEDF1,
 	31459 - 19968: 0xF1E2,
@ -20184,7 +20184,7 @@ var encode0 = [...]uint16{
 	32287 - 19968: 0xE9B2,
 	32289 - 19968: 0xEEAD,
 	32291 - 19968: 0xFAE3,
-	32299 - 19968: 0xDCEE,
+	32299 - 19968: 0XDCEE,
 	32302 - 19968: 0xF5EA,
 	32303 - 19968: 0xE6E0,
 	32305 - 19968: 0xF0FD,
@ -20353,7 +20353,7 @@ var encode0 = [...]uint16{
 	33136 - 19968: 0xE9A6,
 	33137 - 19968: 0xCBF2,
 	33144 - 19968: 0xEDF3,
-	33145 - 19968: 0xDCD9,
+	33145 - 19968: 0XDCD9,
 	33146 - 19968: 0xE0CD,
 	33151 - 19968: 0xF7DA,
 	33152 - 19968: 0xDBB9,
@ -20470,7 +20470,7 @@ var encode0 = [...]uint16{
 	33559 - 19968: 0xD9AB,
 	33576 - 19968: 0xEDBC,
 	33579 - 19968: 0xD8D4,
-	33583 - 19968: 0xDCDA,
+	33583 - 19968: 0XDCDA,
 	33585 - 19968: 0xE2BC,
 	33588 - 19968: 0xFCED,
 	33589 - 19968: 0xECE0,
@ -20506,7 +20506,7 @@ var encode0 = [...]uint16{
 	33747 - 19968: 0xCEA2,
 	33750 - 19968: 0xF3EE,
 	33756 - 19968: 0xF3F8,
-	33769 - 19968: 0xDCCC,
+	33769 - 19968: 0XDCCC,
 	33771 - 19968: 0xD0CB,
 	33775 - 19968: 0xFCA4,
 	33776 - 19968: 0xCDCA,
@ -20556,13 +20556,13 @@ var encode0 = [...]uint16{
 	33997 - 19968: 0xE3C9,
 	34001 - 19968: 0xDEEE,
 	34010 - 19968: 0xE2BE,
-	34028 - 19968: 0xDCEF,
+	34028 - 19968: 0XDCEF,
 	34030 - 19968: 0xD6A5,
 	34036 - 19968: 0xE2F1,
 	34044 - 19968: 0xD6FE,
 	34065 - 19968: 0xD9A1,
 	34067 - 19968: 0xD8C0,
-	34068 - 19968: 0xDCDB,
+	34068 - 19968: 0XDCDB,
 	34071 - 19968: 0xEDBD,
 	34072 - 19968: 0xDFB8,
 	34074 - 19968: 0xEAA5,
@ -20620,7 +20620,7 @@ var encode0 = [...]uint16{
 	34311 - 19968: 0xE1CC,
 	34314 - 19968: 0xE8B3,
 	34326 - 19968: 0xE5EE,
-	34327 - 19968: 0xDCA2,
+	34327 - 19968: 0XDCA2,
 	34330 - 19968: 0xE0D0,
 	34349 - 19968: 0xD5B5,
 	34367 - 19968: 0xD5A1,
@ -20650,7 +20650,7 @@ var encode0 = [...]uint16{
 	34541 - 19968: 0xF2F4,
 	34558 - 19968: 0xE4B6,
 	34560 - 19968: 0xF5B9,
-	34562 - 19968: 0xDCF0,
+	34562 - 19968: 0XDCF0,
 	34563 - 19968: 0xE3F1,
 	34568 - 19968: 0xE8A5,
 	34584 - 19968: 0xF2BB,
@ -20723,7 +20723,7 @@ var encode0 = [...]uint16{
 	35028 - 19968: 0xE7E0,
 	35029 - 19968: 0xEBAE,
 	35033 - 19968: 0xCFD9,
-	35036 - 19968: 0xDCCD,
+	35036 - 19968: 0XDCCD,
 	35037 - 19968: 0xEDFB,
 	35039 - 19968: 0xDEF0,
 	35041 - 19968: 0xD7EB,
@ -20733,10 +20733,10 @@ var encode0 = [...]uint16{
 	35061 - 19968: 0xDBD1,
 	35064 - 19968: 0xD5A3,
 	35069 - 19968: 0xF0B2,
-	35079 - 19968: 0xDCDC,
+	35079 - 19968: 0XDCDC,
 	35088 - 19968: 0xCAE8,
 	35090 - 19968: 0xF8E6,
-	35091 - 19968: 0xDCCE,
+	35091 - 19968: 0XDCCE,
 	35096 - 19968: 0xEADC,
 	35097 - 19968: 0xDBD2,
 	35109 - 19968: 0xE9B3,
@ -20753,7 +20753,7 @@ var encode0 = [...]uint16{
 	35199 - 19968: 0xE0A4,
 	35201 - 19968: 0xE9A9,
 	35203 - 19968: 0xD3C7,
-	35206 - 19968: 0xDCDD,
+	35206 - 19968: 0XDCDD,
 	35207 - 19968: 0xF8AE,
 	35211 - 19968: 0xCCB8,
 	35215 - 19968: 0xD0AE,
@ -20881,7 +20881,7 @@ var encode0 = [...]uint16{
 	35663 - 19968: 0xD1C1,
 	35672 - 19968: 0xE3DB,
 	35674 - 19968: 0xD3C9,
-	35676 - 19968: 0xDCCF,
+	35676 - 19968: 0XDCCF,
 	35686 - 19968: 0xCCED,
 	35692 - 19968: 0xDEA7,
 	35695 - 19968: 0xE6BB,
@ -20890,7 +20890,7 @@ var encode0 = [...]uint16{
 	35703 - 19968: 0xFBDE,
 	35709 - 19968: 0xE7E2,
 	35712 - 19968: 0xD4C1,
-	35722 - 19968: 0xDCA8,
+	35722 - 19968: 0XDCA8,
 	35728 - 19968: 0xE2C2,
 	35730 - 19968: 0xF3D8,
 	35731 - 19968: 0xE5D3,
@ -21034,7 +21034,7 @@ var encode0 = [...]uint16{
 	36617 - 19968: 0xEEB0,
 	36626 - 19968: 0xF4E5,
 	36627 - 19968: 0xD8C2,
-	36628 - 19968: 0xDCD0,
+	36628 - 19968: 0XDCD0,
 	36629 - 19968: 0xCCEE,
 	36635 - 19968: 0xD5E0,
 	36636 - 19968: 0xF6CA,
@ -21042,14 +21042,14 @@ var encode0 = [...]uint16{
 	36638 - 19968: 0xD8D6,
 	36639 - 19968: 0xF4CF,
 	36646 - 19968: 0xD6A6,
-	36647 - 19968: 0xDCBE,
+	36647 - 19968: 0XDCBE,
 	36649 - 19968: 0xDBD4,
 	36650 - 19968: 0xD7C7,
 	36655 - 19968: 0xF2FE,
 	36659 - 19968: 0xF1CD,
 	36664 - 19968: 0xE2C3,
-	36665 - 19968: 0xDCDE,
-	36667 - 19968: 0xDCDF,
+	36665 - 19968: 0XDCDE,
+	36667 - 19968: 0XDCDF,
 	36670 - 19968: 0xEFAD,
 	36671 - 19968: 0xE6AB,
 	36676 - 19968: 0xF9DD,
@ -21064,9 +21064,9 @@ var encode0 = [...]uint16{
 	36764 - 19968: 0xCDD0,
 	36771 - 19968: 0xD5B8,
 	36774 - 19968: 0xF7FD,
-	36776 - 19968: 0xDCA9,
+	36776 - 19968: 0XDCA9,
 	36781 - 19968: 0xDEF6,
-	36783 - 19968: 0xDCAA,
+	36783 - 19968: 0XDCAA,
 	36784 - 19968: 0xF2E3,
 	36785 - 19968: 0xE9B4,
 	36786 - 19968: 0xD2DC,
@ -21106,7 +21106,7 @@ var encode0 = [...]uint16{
 	36895 - 19968: 0xE1DC,
 	36896 - 19968: 0xF0E3,
 	36897 - 19968: 0xF1E4,
-	36898 - 19968: 0xDCF1,
+	36898 - 19968: 0XDCF1,
 	36899 - 19968: 0xD6A7,
 	36910 - 19968: 0xF4F5,
 	36913 - 19968: 0xF1CE,
@ -21153,7 +21153,7 @@ var encode0 = [...]uint16{
 	36996 - 19968: 0xFCBD,
 	36999 - 19968: 0xECC4,
 	37000 - 19968: 0xD8B1,
-	37002 - 19968: 0xDCAB,
+	37002 - 19968: 0XDCAB,
 	37007 - 19968: 0xD5A4,
 	37009 - 19968: 0xEBE9,
 	37013 - 19968: 0xE8BB,
@ -21261,7 +21261,7 @@ var encode0 = [...]uint16{
 	37561 - 19968: 0xE2C8,
 	37580 - 19968: 0xEFFB,
 	37583 - 19968: 0xFAF9,
-	37586 - 19968: 0xDCF2,
+	37586 - 19968: 0XDCF2,
 	37604 - 19968: 0xE0A7,
 	37610 - 19968: 0xF8E8,
 	37624 - 19968: 0xCBEA,
@ -21344,7 +21344,7 @@ var encode0 = [...]uint16{
 	38358 - 19968: 0xF7E6,
 	38364 - 19968: 0xCEBC,
 	38369 - 19968: 0xF4C5,
-	38370 - 19968: 0xDCA3,
+	38370 - 19968: 0XDCA3,
 	38428 - 19968: 0xDDBD,
 	38433 - 19968: 0xF4C6,
 	38442 - 19968: 0xF8A1,
@ -21434,7 +21434,7 @@ var encode0 = [...]uint16{
 	38695 - 19968: 0xD9F6,
 	38704 - 19968: 0xDFAC,
 	38706 - 19968: 0xD6DA,
-	38713 - 19968: 0xDCA4,
+	38713 - 19968: 0XDCA4,
 	38717 - 19968: 0xF0B8,
 	38722 - 19968: 0xD5FA,
 	38724 - 19968: 0xE4F7,
@ -21522,7 +21522,7 @@ var encode0 = [...]uint16{
 	39187 - 19968: 0xE4BB,
 	39192 - 19968: 0xE6AE,
 	39198 - 19968: 0xEFB6,
-	39200 - 19968: 0xDCBF,
+	39200 - 19968: 0XDCBF,
 	39208 - 19968: 0xCEBD,
 	39237 - 19968: 0xD8C3,
 	39241 - 19968: 0xD0CF,
@ -21536,7 +21536,7 @@ var encode0 = [...]uint16{
 	39318 - 19968: 0xE2CF,
 	39321 - 19968: 0xFAC5,
 	39325 - 19968: 0xF9B8,
-	39333 - 19968: 0xDCE0,
+	39333 - 19968: 0XDCE0,
 	39336 - 19968: 0xFBB0,
 	39340 - 19968: 0xD8A9,
 	39341 - 19968: 0xE5DF,
@ -21557,7 +21557,7 @@ var encode0 = [...]uint16{
 	39409 - 19968: 0xD5AD,
 	39423 - 19968: 0xF1E7,
 	39425 - 19968: 0xDEBE,
-	39432 - 19968: 0xDCC0,
+	39432 - 19968: 0XDCC0,
 	39438 - 19968: 0xD1C8,
 	39439 - 19968: 0xD1C9,
 	39449 - 19968: 0xF8BE,
@ -21610,18 +21610,18 @@ var encode0 = [...]uint16{
 	39912 - 19968: 0xCCF4,
 	39949 - 19968: 0xF5E3,
 	39952 - 19968: 0xE4CA,
-	39954 - 19968: 0xDCE1,
+	39954 - 19968: 0XDCE1,
 	39957 - 19968: 0xF9C8,
 	39973 - 19968: 0xFCBF,
 	39986 - 19968: 0xE8A7,
 	39995 - 19968: 0xD8C4,
 	40007 - 19968: 0xCBBE,
-	40009 - 19968: 0xDCAE,
+	40009 - 19968: 0XDCAE,
 	40023 - 19968: 0xD7F7,
 	40165 - 19968: 0xF0E8,
 	40167 - 19968: 0xDDC0,
 	40169 - 19968: 0xCFCD,
-	40179 - 19968: 0xDCF3,
+	40179 - 19968: 0XDCF3,
 	40180 - 19968: 0xD9B0,
 	40182 - 19968: 0xE6E9,
 	40201 - 19968: 0xE4BC,
@ -21672,7 +21672,7 @@ var encode0 = [...]uint16{
 	40680 - 19968: 0xD3DA,
 	40692 - 19968: 0xDABD,
 	40711 - 19968: 0xE8A8,
-	40712 - 19968: 0xDCAF,
+	40712 - 19968: 0XDCAF,
 	40718 - 19968: 0xF0A3,
 	40723 - 19968: 0xCDD5,
 	40736 - 19968: 0xE0A9,
@ -33877,7 +33877,7 @@ var encode5 = [...]uint16{
 	63842 - 63744: 0xD7E4,
 	63843 - 63744: 0xDBC5,
 	63844 - 63744: 0xDBE4,
-	63845 - 63744: 0xDCA5,
+	63845 - 63744: 0XDCA5,
 	63846 - 63744: 0xDDA5,
 	63847 - 63744: 0xDDD5,
 	63848 - 63744: 0xDDF4,
--- a/vendor/golang.org/x/text/encoding/simplifiedchinese/tables.go
+++ b/vendor/golang.org/x/text/encoding/simplifiedchinese/tables.go
@ -24994,7 +24994,7 @@ var encode0 = [...]uint16{
 	22506 - 11905: 0x88C2,
 	22507 - 11905: 0x88C3,
 	22508 - 11905: 0x88C4,
-	22509 - 11905: 0xDCA4,
+	22509 - 11905: 0XDCA4,
 	22510 - 11905: 0x88C5,
 	22511 - 11905: 0xDBFB,
 	22512 - 11905: 0x88C6,
@ -25010,10 +25010,10 @@ var encode0 = [...]uint16{
 	22522 - 11905: 0xBBF9,
 	22523 - 11905: 0x88CD,
 	22524 - 11905: 0x88CE,
-	22525 - 11905: 0xDCA3,
+	22525 - 11905: 0XDCA3,
 	22526 - 11905: 0x88CF,
 	22527 - 11905: 0x88D0,
-	22528 - 11905: 0xDCA5,
+	22528 - 11905: 0XDCA5,
 	22529 - 11905: 0x88D1,
 	22530 - 11905: 0xCCC3,
 	22531 - 11905: 0x88D2,
@ -25024,9 +25024,9 @@ var encode0 = [...]uint16{
 	22536 - 11905: 0x88D5,
 	22537 - 11905: 0x88D6,
 	22538 - 11905: 0x88D7,
-	22539 - 11905: 0xDCA1,
+	22539 - 11905: 0XDCA1,
 	22540 - 11905: 0x88D8,
-	22541 - 11905: 0xDCA2,
+	22541 - 11905: 0XDCA2,
 	22542 - 11905: 0x88D9,
 	22543 - 11905: 0x88DA,
 	22544 - 11905: 0x88DB,
@ -25038,14 +25038,14 @@ var encode0 = [...]uint16{
 	22550 - 11905: 0x88DF,
 	22551 - 11905: 0x88E0,
 	22552 - 11905: 0x88E1,
-	22553 - 11905: 0xDCA7,
+	22553 - 11905: 0XDCA7,
 	22554 - 11905: 0x88E2,
 	22555 - 11905: 0x88E3,
 	22556 - 11905: 0x88E4,
 	22557 - 11905: 0x88E5,
-	22558 - 11905: 0xDCA6,
+	22558 - 11905: 0XDCA6,
 	22559 - 11905: 0x88E6,
-	22560 - 11905: 0xDCA9,
+	22560 - 11905: 0XDCA9,
 	22561 - 11905: 0xB1A4,
 	22562 - 11905: 0x88E7,
 	22563 - 11905: 0x88E8,
@ -25081,7 +25081,7 @@ var encode0 = [...]uint16{
 	22593 - 11905: 0x8943,
 	22594 - 11905: 0x8944,
 	22595 - 11905: 0x8945,
-	22596 - 11905: 0xDCA8,
+	22596 - 11905: 0XDCA8,
 	22597 - 11905: 0x8946,
 	22598 - 11905: 0x8947,
 	22599 - 11905: 0x8948,
@ -25114,14 +25114,14 @@ var encode0 = [...]uint16{
 	22626 - 11905: 0x895D,
 	22627 - 11905: 0x895E,
 	22628 - 11905: 0x895F,
-	22629 - 11905: 0xDCAA,
+	22629 - 11905: 0XDCAA,
 	22630 - 11905: 0x8960,
 	22631 - 11905: 0x8961,
 	22632 - 11905: 0x8962,
 	22633 - 11905: 0x8963,
 	22634 - 11905: 0x8964,
 	22635 - 11905: 0xCCEE,
-	22636 - 11905: 0xDCAB,
+	22636 - 11905: 0XDCAB,
 	22637 - 11905: 0x8965,
 	22638 - 11905: 0x8966,
 	22639 - 11905: 0x8967,
@ -25141,8 +25141,8 @@ var encode0 = [...]uint16{
 	22653 - 11905: 0x8975,
 	22654 - 11905: 0xDBD3,
 	22655 - 11905: 0x8976,
-	22656 - 11905: 0xDCAF,
-	22657 - 11905: 0xDCAC,
+	22656 - 11905: 0XDCAF,
+	22657 - 11905: 0XDCAC,
 	22658 - 11905: 0x8977,
 	22659 - 11905: 0xBEB3,
 	22660 - 11905: 0x8978,
@ -25150,7 +25150,7 @@ var encode0 = [...]uint16{
 	22662 - 11905: 0x8979,
 	22663 - 11905: 0x897A,
 	22664 - 11905: 0x897B,
-	22665 - 11905: 0xDCAD,
+	22665 - 11905: 0XDCAD,
 	22666 - 11905: 0x897C,
 	22667 - 11905: 0x897D,
 	22668 - 11905: 0x897E,
@ -25167,7 +25167,7 @@ var encode0 = [...]uint16{
 	22679 - 11905: 0x8988,
 	22680 - 11905: 0x8989,
 	22681 - 11905: 0xC7BD,
-	22682 - 11905: 0xDCAE,
+	22682 - 11905: 0XDCAE,
 	22683 - 11905: 0x898A,
 	22684 - 11905: 0x898B,
 	22685 - 11905: 0x898C,
@ -27572,7 +27572,7 @@ var encode0 = [...]uint16{
 	25084 - 11905: 0x91D6,
 	25085 - 11905: 0x91D7,
 	25086 - 11905: 0x91D8,
-	25087 - 11905: 0xDCB2,
+	25087 - 11905: 0XDCB2,
 	25088 - 11905: 0x91D9,
 	25089 - 11905: 0x91DA,
 	25090 - 11905: 0x91DB,
@ -35886,114 +35886,114 @@ var encode0 = [...]uint16{
 	33398 - 11905: 0xC646,
 	33399 - 11905: 0xC647,
 	33400 - 11905: 0xC648,
-	33401 - 11905: 0xDCB3,
+	33401 - 11905: 0XDCB3,
 	33402 - 11905: 0xD2D5,
 	33403 - 11905: 0xC649,
 	33404 - 11905: 0xC64A,
-	33405 - 11905: 0xDCB4,
+	33405 - 11905: 0XDCB4,
 	33406 - 11905: 0xB0AC,
-	33407 - 11905: 0xDCB5,
+	33407 - 11905: 0XDCB5,
 	33408 - 11905: 0xC64B,
 	33409 - 11905: 0xC64C,
 	33410 - 11905: 0xBDDA,
 	33411 - 11905: 0xC64D,
-	33412 - 11905: 0xDCB9,
+	33412 - 11905: 0XDCB9,
 	33413 - 11905: 0xC64E,
 	33414 - 11905: 0xC64F,
 	33415 - 11905: 0xC650,
 	33416 - 11905: 0xD8C2,
 	33417 - 11905: 0xC651,
-	33418 - 11905: 0xDCB7,
+	33418 - 11905: 0XDCB7,
 	33419 - 11905: 0xD3F3,
 	33420 - 11905: 0xC652,
 	33421 - 11905: 0xC9D6,
-	33422 - 11905: 0xDCBA,
-	33423 - 11905: 0xDCB6,
+	33422 - 11905: 0XDCBA,
+	33423 - 11905: 0XDCB6,
 	33424 - 11905: 0xC653,
-	33425 - 11905: 0xDCBB,
+	33425 - 11905: 0XDCBB,
 	33426 - 11905: 0xC3A2,
 	33427 - 11905: 0xC654,
 	33428 - 11905: 0xC655,
 	33429 - 11905: 0xC656,
 	33430 - 11905: 0xC657,
-	33431 - 11905: 0xDCBC,
-	33432 - 11905: 0xDCC5,
-	33433 - 11905: 0xDCBD,
+	33431 - 11905: 0XDCBC,
+	33432 - 11905: 0XDCC5,
+	33433 - 11905: 0XDCBD,
 	33434 - 11905: 0xC658,
 	33435 - 11905: 0xC659,
 	33436 - 11905: 0xCEDF,
 	33437 - 11905: 0xD6A5,
 	33438 - 11905: 0xC65A,
-	33439 - 11905: 0xDCCF,
+	33439 - 11905: 0XDCCF,
 	33440 - 11905: 0xC65B,
-	33441 - 11905: 0xDCCD,
+	33441 - 11905: 0XDCCD,
 	33442 - 11905: 0xC65C,
 	33443 - 11905: 0xC65D,
-	33444 - 11905: 0xDCD2,
+	33444 - 11905: 0XDCD2,
 	33445 - 11905: 0xBDE6,
 	33446 - 11905: 0xC2AB,
 	33447 - 11905: 0xC65E,
-	33448 - 11905: 0xDCB8,
-	33449 - 11905: 0xDCCB,
-	33450 - 11905: 0xDCCE,
-	33451 - 11905: 0xDCBE,
+	33448 - 11905: 0XDCB8,
+	33449 - 11905: 0XDCCB,
+	33450 - 11905: 0XDCCE,
+	33451 - 11905: 0XDCBE,
 	33452 - 11905: 0xB7D2,
 	33453 - 11905: 0xB0C5,
-	33454 - 11905: 0xDCC7,
+	33454 - 11905: 0XDCC7,
 	33455 - 11905: 0xD0BE,
-	33456 - 11905: 0xDCC1,
+	33456 - 11905: 0XDCC1,
 	33457 - 11905: 0xBBA8,
 	33458 - 11905: 0xC65F,
 	33459 - 11905: 0xB7BC,
-	33460 - 11905: 0xDCCC,
+	33460 - 11905: 0XDCCC,
 	33461 - 11905: 0xC660,
 	33462 - 11905: 0xC661,
-	33463 - 11905: 0xDCC6,
-	33464 - 11905: 0xDCBF,
+	33463 - 11905: 0XDCC6,
+	33464 - 11905: 0XDCBF,
 	33465 - 11905: 0xC7DB,
 	33466 - 11905: 0xC662,
 	33467 - 11905: 0xC663,
 	33468 - 11905: 0xC664,
 	33469 - 11905: 0xD1BF,
-	33470 - 11905: 0xDCC0,
+	33470 - 11905: 0XDCC0,
 	33471 - 11905: 0xC665,
 	33472 - 11905: 0xC666,
-	33473 - 11905: 0xDCCA,
+	33473 - 11905: 0XDCCA,
 	33474 - 11905: 0xC667,
 	33475 - 11905: 0xC668,
-	33476 - 11905: 0xDCD0,
+	33476 - 11905: 0XDCD0,
 	33477 - 11905: 0xC669,
 	33478 - 11905: 0xC66A,
 	33479 - 11905: 0xCEAD,
-	33480 - 11905: 0xDCC2,
+	33480 - 11905: 0XDCC2,
 	33481 - 11905: 0xC66B,
-	33482 - 11905: 0xDCC3,
-	33483 - 11905: 0xDCC8,
-	33484 - 11905: 0xDCC9,
+	33482 - 11905: 0XDCC3,
+	33483 - 11905: 0XDCC8,
+	33484 - 11905: 0XDCC9,
 	33485 - 11905: 0xB2D4,
-	33486 - 11905: 0xDCD1,
+	33486 - 11905: 0XDCD1,
 	33487 - 11905: 0xCBD5,
 	33488 - 11905: 0xC66C,
 	33489 - 11905: 0xD4B7,
-	33490 - 11905: 0xDCDB,
-	33491 - 11905: 0xDCDF,
+	33490 - 11905: 0XDCDB,
+	33491 - 11905: 0XDCDF,
 	33492 - 11905: 0xCCA6,
-	33493 - 11905: 0xDCE6,
+	33493 - 11905: 0XDCE6,
 	33494 - 11905: 0xC66D,
 	33495 - 11905: 0xC3E7,
-	33496 - 11905: 0xDCDC,
+	33496 - 11905: 0XDCDC,
 	33497 - 11905: 0xC66E,
 	33498 - 11905: 0xC66F,
 	33499 - 11905: 0xBFC1,
-	33500 - 11905: 0xDCD9,
+	33500 - 11905: 0XDCD9,
 	33501 - 11905: 0xC670,
 	33502 - 11905: 0xB0FA,
 	33503 - 11905: 0xB9B6,
-	33504 - 11905: 0xDCE5,
-	33505 - 11905: 0xDCD3,
+	33504 - 11905: 0XDCE5,
+	33505 - 11905: 0XDCD3,
 	33506 - 11905: 0xC671,
-	33507 - 11905: 0xDCC4,
-	33508 - 11905: 0xDCD6,
+	33507 - 11905: 0XDCC4,
+	33508 - 11905: 0XDCD6,
 	33509 - 11905: 0xC8F4,
 	33510 - 11905: 0xBFE0,
 	33511 - 11905: 0xC672,
@ -36009,14 +36009,14 @@ var encode0 = [...]uint16{
 	33521 - 11905: 0xD3A2,
 	33522 - 11905: 0xC67A,
 	33523 - 11905: 0xC67B,
-	33524 - 11905: 0xDCDA,
+	33524 - 11905: 0XDCDA,
 	33525 - 11905: 0xC67C,
 	33526 - 11905: 0xC67D,
-	33527 - 11905: 0xDCD5,
+	33527 - 11905: 0XDCD5,
 	33528 - 11905: 0xC67E,
 	33529 - 11905: 0xC6BB,
 	33530 - 11905: 0xC680,
-	33531 - 11905: 0xDCDE,
+	33531 - 11905: 0XDCDE,
 	33532 - 11905: 0xC681,
 	33533 - 11905: 0xC682,
 	33534 - 11905: 0xC683,
@ -36027,29 +36027,29 @@ var encode0 = [...]uint16{
 	33539 - 11905: 0xB7B6,
 	33540 - 11905: 0xC7D1,
 	33541 - 11905: 0xC3A9,
-	33542 - 11905: 0xDCE2,
-	33543 - 11905: 0xDCD8,
-	33544 - 11905: 0xDCEB,
-	33545 - 11905: 0xDCD4,
+	33542 - 11905: 0XDCE2,
+	33543 - 11905: 0XDCD8,
+	33544 - 11905: 0XDCEB,
+	33545 - 11905: 0XDCD4,
 	33546 - 11905: 0xC686,
 	33547 - 11905: 0xC687,
-	33548 - 11905: 0xDCDD,
+	33548 - 11905: 0XDCDD,
 	33549 - 11905: 0xC688,
 	33550 - 11905: 0xBEA5,
-	33551 - 11905: 0xDCD7,
+	33551 - 11905: 0XDCD7,
 	33552 - 11905: 0xC689,
-	33553 - 11905: 0xDCE0,
+	33553 - 11905: 0XDCE0,
 	33554 - 11905: 0xC68A,
 	33555 - 11905: 0xC68B,
-	33556 - 11905: 0xDCE3,
-	33557 - 11905: 0xDCE4,
+	33556 - 11905: 0XDCE3,
+	33557 - 11905: 0XDCE4,
 	33558 - 11905: 0xC68C,
-	33559 - 11905: 0xDCF8,
+	33559 - 11905: 0XDCF8,
 	33560 - 11905: 0xC68D,
 	33561 - 11905: 0xC68E,
-	33562 - 11905: 0xDCE1,
+	33562 - 11905: 0XDCE1,
 	33563 - 11905: 0xDDA2,
-	33564 - 11905: 0xDCE7,
+	33564 - 11905: 0XDCE7,
 	33565 - 11905: 0xC68F,
 	33566 - 11905: 0xC690,
 	33567 - 11905: 0xC691,
@ -36066,33 +36066,33 @@ var encode0 = [...]uint16{
 	33578 - 11905: 0xC69A,
 	33579 - 11905: 0xC3A3,
 	33580 - 11905: 0xB2E7,
-	33581 - 11905: 0xDCFA,
+	33581 - 11905: 0XDCFA,
 	33582 - 11905: 0xC69B,
-	33583 - 11905: 0xDCF2,
+	33583 - 11905: 0XDCF2,
 	33584 - 11905: 0xC69C,
-	33585 - 11905: 0xDCEF,
+	33585 - 11905: 0XDCEF,
 	33586 - 11905: 0xC69D,
-	33587 - 11905: 0xDCFC,
-	33588 - 11905: 0xDCEE,
+	33587 - 11905: 0XDCFC,
+	33588 - 11905: 0XDCEE,
 	33589 - 11905: 0xD2F0,
 	33590 - 11905: 0xB2E8,
 	33591 - 11905: 0xC69E,
 	33592 - 11905: 0xC8D7,
 	33593 - 11905: 0xC8E3,
-	33594 - 11905: 0xDCFB,
+	33594 - 11905: 0XDCFB,
 	33595 - 11905: 0xC69F,
-	33596 - 11905: 0xDCED,
+	33596 - 11905: 0XDCED,
 	33597 - 11905: 0xC6A0,
 	33598 - 11905: 0xC740,
 	33599 - 11905: 0xC741,
-	33600 - 11905: 0xDCF7,
+	33600 - 11905: 0XDCF7,
 	33601 - 11905: 0xC742,
 	33602 - 11905: 0xC743,
-	33603 - 11905: 0xDCF5,
+	33603 - 11905: 0XDCF5,
 	33604 - 11905: 0xC744,
 	33605 - 11905: 0xC745,
 	33606 - 11905: 0xBEA3,
-	33607 - 11905: 0xDCF4,
+	33607 - 11905: 0XDCF4,
 	33608 - 11905: 0xC746,
 	33609 - 11905: 0xB2DD,
 	33610 - 11905: 0xC747,
@ -36100,9 +36100,9 @@ var encode0 = [...]uint16{
 	33612 - 11905: 0xC749,
 	33613 - 11905: 0xC74A,
 	33614 - 11905: 0xC74B,
-	33615 - 11905: 0xDCF3,
+	33615 - 11905: 0XDCF3,
 	33616 - 11905: 0xBCF6,
-	33617 - 11905: 0xDCE8,
+	33617 - 11905: 0XDCE8,
 	33618 - 11905: 0xBBC4,
 	33619 - 11905: 0xC74C,
 	33620 - 11905: 0xC0F3,
@ -36112,18 +36112,18 @@ var encode0 = [...]uint16{
 	33624 - 11905: 0xC750,
 	33625 - 11905: 0xC751,
 	33626 - 11905: 0xBCD4,
-	33627 - 11905: 0xDCE9,
-	33628 - 11905: 0xDCEA,
+	33627 - 11905: 0XDCE9,
+	33628 - 11905: 0XDCEA,
 	33629 - 11905: 0xC752,
-	33630 - 11905: 0xDCF1,
-	33631 - 11905: 0xDCF6,
-	33632 - 11905: 0xDCF9,
+	33630 - 11905: 0XDCF1,
+	33631 - 11905: 0XDCF6,
+	33632 - 11905: 0XDCF9,
 	33633 - 11905: 0xB5B4,
 	33634 - 11905: 0xC753,
 	33635 - 11905: 0xC8D9,
 	33636 - 11905: 0xBBE7,
-	33637 - 11905: 0xDCFE,
-	33638 - 11905: 0xDCFD,
+	33637 - 11905: 0XDCFE,
+	33638 - 11905: 0XDCFD,
 	33639 - 11905: 0xD3AB,
 	33640 - 11905: 0xDDA1,
 	33641 - 11905: 0xDDA3,
@ -36167,7 +36167,7 @@ var encode0 = [...]uint16{
 	33679 - 11905: 0xC76A,
 	33680 - 11905: 0xC76B,
 	33681 - 11905: 0xC76C,
-	33682 - 11905: 0xDCEC,
+	33682 - 11905: 0XDCEC,
 	33683 - 11905: 0xDDAE,
 	33684 - 11905: 0xC76D,
 	33685 - 11905: 0xC76E,
@ -36176,7 +36176,7 @@ var encode0 = [...]uint16{
 	33688 - 11905: 0xDDB7,
 	33689 - 11905: 0xC771,
 	33690 - 11905: 0xC772,
-	33691 - 11905: 0xDCF0,
+	33691 - 11905: 0XDCF0,
 	33692 - 11905: 0xDDAF,
 	33693 - 11905: 0xC773,
 	33694 - 11905: 0xDDB8,
@ -38952,120 +38952,120 @@ var encode0 = [...]uint16{
 	36464 - 11905: 0xF5E9,
 	36465 - 11905: 0xDBA0,
 	36466 - 11905: 0xB6D7,
-	36467 - 11905: 0xDC40,
+	36467 - 11905: 0XDC40,
 	36468 - 11905: 0xF5ED,
-	36469 - 11905: 0xDC41,
+	36469 - 11905: 0XDC41,
 	36470 - 11905: 0xF5EA,
-	36471 - 11905: 0xDC42,
-	36472 - 11905: 0xDC43,
-	36473 - 11905: 0xDC44,
-	36474 - 11905: 0xDC45,
-	36475 - 11905: 0xDC46,
+	36471 - 11905: 0XDC42,
+	36472 - 11905: 0XDC43,
+	36473 - 11905: 0XDC44,
+	36474 - 11905: 0XDC45,
+	36475 - 11905: 0XDC46,
 	36476 - 11905: 0xF5EB,
-	36477 - 11905: 0xDC47,
-	36478 - 11905: 0xDC48,
+	36477 - 11905: 0XDC47,
+	36478 - 11905: 0XDC48,
 	36479 - 11905: 0xB4DA,
-	36480 - 11905: 0xDC49,
+	36480 - 11905: 0XDC49,
 	36481 - 11905: 0xD4EA,
-	36482 - 11905: 0xDC4A,
-	36483 - 11905: 0xDC4B,
-	36484 - 11905: 0xDC4C,
+	36482 - 11905: 0XDC4A,
+	36483 - 11905: 0XDC4B,
+	36484 - 11905: 0XDC4C,
 	36485 - 11905: 0xF5EE,
-	36486 - 11905: 0xDC4D,
+	36486 - 11905: 0XDC4D,
 	36487 - 11905: 0xB3F9,
-	36488 - 11905: 0xDC4E,
-	36489 - 11905: 0xDC4F,
-	36490 - 11905: 0xDC50,
-	36491 - 11905: 0xDC51,
-	36492 - 11905: 0xDC52,
-	36493 - 11905: 0xDC53,
-	36494 - 11905: 0xDC54,
+	36488 - 11905: 0XDC4E,
+	36489 - 11905: 0XDC4F,
+	36490 - 11905: 0XDC50,
+	36491 - 11905: 0XDC51,
+	36492 - 11905: 0XDC52,
+	36493 - 11905: 0XDC53,
+	36494 - 11905: 0XDC54,
 	36495 - 11905: 0xF5EF,
 	36496 - 11905: 0xF5F1,
-	36497 - 11905: 0xDC55,
-	36498 - 11905: 0xDC56,
-	36499 - 11905: 0xDC57,
+	36497 - 11905: 0XDC55,
+	36498 - 11905: 0XDC56,
+	36499 - 11905: 0XDC57,
 	36500 - 11905: 0xF5F0,
-	36501 - 11905: 0xDC58,
-	36502 - 11905: 0xDC59,
-	36503 - 11905: 0xDC5A,
-	36504 - 11905: 0xDC5B,
-	36505 - 11905: 0xDC5C,
-	36506 - 11905: 0xDC5D,
-	36507 - 11905: 0xDC5E,
+	36501 - 11905: 0XDC58,
+	36502 - 11905: 0XDC59,
+	36503 - 11905: 0XDC5A,
+	36504 - 11905: 0XDC5B,
+	36505 - 11905: 0XDC5C,
+	36506 - 11905: 0XDC5D,
+	36507 - 11905: 0XDC5E,
 	36508 - 11905: 0xF5F2,
-	36509 - 11905: 0xDC5F,
+	36509 - 11905: 0XDC5F,
 	36510 - 11905: 0xF5F3,
-	36511 - 11905: 0xDC60,
-	36512 - 11905: 0xDC61,
-	36513 - 11905: 0xDC62,
-	36514 - 11905: 0xDC63,
-	36515 - 11905: 0xDC64,
-	36516 - 11905: 0xDC65,
-	36517 - 11905: 0xDC66,
-	36518 - 11905: 0xDC67,
-	36519 - 11905: 0xDC68,
-	36520 - 11905: 0xDC69,
-	36521 - 11905: 0xDC6A,
-	36522 - 11905: 0xDC6B,
+	36511 - 11905: 0XDC60,
+	36512 - 11905: 0XDC61,
+	36513 - 11905: 0XDC62,
+	36514 - 11905: 0XDC63,
+	36515 - 11905: 0XDC64,
+	36516 - 11905: 0XDC65,
+	36517 - 11905: 0XDC66,
+	36518 - 11905: 0XDC67,
+	36519 - 11905: 0XDC68,
+	36520 - 11905: 0XDC69,
+	36521 - 11905: 0XDC6A,
+	36522 - 11905: 0XDC6B,
 	36523 - 11905: 0xC9ED,
 	36524 - 11905: 0xB9AA,
-	36525 - 11905: 0xDC6C,
-	36526 - 11905: 0xDC6D,
+	36525 - 11905: 0XDC6C,
+	36526 - 11905: 0XDC6D,
 	36527 - 11905: 0xC7FB,
-	36528 - 11905: 0xDC6E,
-	36529 - 11905: 0xDC6F,
+	36528 - 11905: 0XDC6E,
+	36529 - 11905: 0XDC6F,
 	36530 - 11905: 0xB6E3,
-	36531 - 11905: 0xDC70,
-	36532 - 11905: 0xDC71,
-	36533 - 11905: 0xDC72,
-	36534 - 11905: 0xDC73,
-	36535 - 11905: 0xDC74,
-	36536 - 11905: 0xDC75,
-	36537 - 11905: 0xDC76,
+	36531 - 11905: 0XDC70,
+	36532 - 11905: 0XDC71,
+	36533 - 11905: 0XDC72,
+	36534 - 11905: 0XDC73,
+	36535 - 11905: 0XDC74,
+	36536 - 11905: 0XDC75,
+	36537 - 11905: 0XDC76,
 	36538 - 11905: 0xCCC9,
-	36539 - 11905: 0xDC77,
-	36540 - 11905: 0xDC78,
-	36541 - 11905: 0xDC79,
-	36542 - 11905: 0xDC7A,
-	36543 - 11905: 0xDC7B,
-	36544 - 11905: 0xDC7C,
-	36545 - 11905: 0xDC7D,
-	36546 - 11905: 0xDC7E,
-	36547 - 11905: 0xDC80,
-	36548 - 11905: 0xDC81,
-	36549 - 11905: 0xDC82,
-	36550 - 11905: 0xDC83,
-	36551 - 11905: 0xDC84,
-	36552 - 11905: 0xDC85,
-	36553 - 11905: 0xDC86,
-	36554 - 11905: 0xDC87,
-	36555 - 11905: 0xDC88,
-	36556 - 11905: 0xDC89,
-	36557 - 11905: 0xDC8A,
+	36539 - 11905: 0XDC77,
+	36540 - 11905: 0XDC78,
+	36541 - 11905: 0XDC79,
+	36542 - 11905: 0XDC7A,
+	36543 - 11905: 0XDC7B,
+	36544 - 11905: 0XDC7C,
+	36545 - 11905: 0XDC7D,
+	36546 - 11905: 0XDC7E,
+	36547 - 11905: 0XDC80,
+	36548 - 11905: 0XDC81,
+	36549 - 11905: 0XDC82,
+	36550 - 11905: 0XDC83,
+	36551 - 11905: 0XDC84,
+	36552 - 11905: 0XDC85,
+	36553 - 11905: 0XDC86,
+	36554 - 11905: 0XDC87,
+	36555 - 11905: 0XDC88,
+	36556 - 11905: 0XDC89,
+	36557 - 11905: 0XDC8A,
 	36558 - 11905: 0xEAA6,
-	36559 - 11905: 0xDC8B,
-	36560 - 11905: 0xDC8C,
-	36561 - 11905: 0xDC8D,
-	36562 - 11905: 0xDC8E,
-	36563 - 11905: 0xDC8F,
-	36564 - 11905: 0xDC90,
-	36565 - 11905: 0xDC91,
-	36566 - 11905: 0xDC92,
-	36567 - 11905: 0xDC93,
-	36568 - 11905: 0xDC94,
-	36569 - 11905: 0xDC95,
-	36570 - 11905: 0xDC96,
-	36571 - 11905: 0xDC97,
-	36572 - 11905: 0xDC98,
-	36573 - 11905: 0xDC99,
-	36574 - 11905: 0xDC9A,
-	36575 - 11905: 0xDC9B,
-	36576 - 11905: 0xDC9C,
-	36577 - 11905: 0xDC9D,
-	36578 - 11905: 0xDC9E,
-	36579 - 11905: 0xDC9F,
-	36580 - 11905: 0xDCA0,
+	36559 - 11905: 0XDC8B,
+	36560 - 11905: 0XDC8C,
+	36561 - 11905: 0XDC8D,
+	36562 - 11905: 0XDC8E,
+	36563 - 11905: 0XDC8F,
+	36564 - 11905: 0XDC90,
+	36565 - 11905: 0XDC91,
+	36566 - 11905: 0XDC92,
+	36567 - 11905: 0XDC93,
+	36568 - 11905: 0XDC94,
+	36569 - 11905: 0XDC95,
+	36570 - 11905: 0XDC96,
+	36571 - 11905: 0XDC97,
+	36572 - 11905: 0XDC98,
+	36573 - 11905: 0XDC99,
+	36574 - 11905: 0XDC9A,
+	36575 - 11905: 0XDC9B,
+	36576 - 11905: 0XDC9C,
+	36577 - 11905: 0XDC9D,
+	36578 - 11905: 0XDC9E,
+	36579 - 11905: 0XDC9F,
+	36580 - 11905: 0XDCA0,
 	36581 - 11905: 0xDD40,
 	36582 - 11905: 0xDD41,
 	36583 - 11905: 0xDD42,
@ -41821,7 +41821,7 @@ var encode0 = [...]uint16{
 	39333 - 11905: 0xF0A5,
 	39334 - 11905: 0xF14D,
 	39335 - 11905: 0xF14E,
-	39336 - 11905: 0xDCB0,
+	39336 - 11905: 0XDCB0,
 	39337 - 11905: 0xF14F,
 	39338 - 11905: 0xF150,
 	39339 - 11905: 0xF151,
@ -43214,7 +43214,7 @@ var encode0 = [...]uint16{
 	40726 - 11905: 0xFC8B,
 	40727 - 11905: 0xD8BB,
 	40728 - 11905: 0xFC8C,
-	40729 - 11905: 0xDCB1,
+	40729 - 11905: 0XDCB1,
 	40730 - 11905: 0xFC8D,
 	40731 - 11905: 0xFC8E,
 	40732 - 11905: 0xFC8F,
--- a/vendor/golang.org/x/text/encoding/traditionalchinese/tables.go
+++ b/vendor/golang.org/x/text/encoding/traditionalchinese/tables.go
@ -21272,8 +21272,8 @@ var encode1 = [...]uint16{
 	20096 - 11904: 0x89D0,
 	20097 - 11904: 0x89CF,
 	20098 - 11904: 0xB6C3,
-	20099 - 11904: 0xDCB1,
-	20100 - 11904: 0xDCB2,
+	20099 - 11904: 0XDCB1,
+	20100 - 11904: 0XDCB2,
 	20101 - 11904: 0xC6C1,
 	20102 - 11904: 0xA446,
 	20103 - 11904: 0x89D1,
@ -21307,7 +21307,7 @@ var encode1 = [...]uint16{
 	20141 - 11904: 0xAB46,
 	20142 - 11904: 0xAB47,
 	20147 - 11904: 0xADBD,
-	20150 - 11904: 0xDCB3,
+	20150 - 11904: 0XDCB3,
 	20151 - 11904: 0xFBF8,
 	20153 - 11904: 0xF6D6,
 	20154 - 11904: 0xA448,
@ -21680,33 +21680,33 @@ var encode1 = [...]uint16{
 	20646 - 11904: 0x9FA8,
 	20652 - 11904: 0xB6CA,
 	20653 - 11904: 0xB6C4,
-	20654 - 11904: 0xDCB7,
+	20654 - 11904: 0XDCB7,
 	20655 - 11904: 0xB6CD,
-	20656 - 11904: 0xDCBD,
-	20657 - 11904: 0xDCC0,
+	20656 - 11904: 0XDCBD,
+	20657 - 11904: 0XDCC0,
 	20658 - 11904: 0xB6C6,
 	20659 - 11904: 0xB6C7,
-	20660 - 11904: 0xDCBA,
+	20660 - 11904: 0XDCBA,
 	20661 - 11904: 0xB6C5,
-	20662 - 11904: 0xDCC3,
+	20662 - 11904: 0XDCC3,
 	20663 - 11904: 0xB6CB,
-	20664 - 11904: 0xDCC4,
-	20666 - 11904: 0xDCBF,
+	20664 - 11904: 0XDCC4,
+	20666 - 11904: 0XDCBF,
 	20667 - 11904: 0xB6CC,
 	20668 - 11904: 0x8C71,
-	20669 - 11904: 0xDCB4,
+	20669 - 11904: 0XDCB4,
 	20670 - 11904: 0xB6C9,
-	20671 - 11904: 0xDCB5,
-	20673 - 11904: 0xDCBE,
-	20674 - 11904: 0xDCBC,
-	20676 - 11904: 0xDCB8,
+	20671 - 11904: 0XDCB5,
+	20673 - 11904: 0XDCBE,
+	20674 - 11904: 0XDCBC,
+	20676 - 11904: 0XDCB8,
 	20677 - 11904: 0xB6C8,
-	20678 - 11904: 0xDCB6,
+	20678 - 11904: 0XDCB6,
 	20679 - 11904: 0xB6CE,
-	20680 - 11904: 0xDCBB,
-	20681 - 11904: 0xDCC2,
-	20682 - 11904: 0xDCB9,
-	20683 - 11904: 0xDCC1,
+	20680 - 11904: 0XDCBB,
+	20681 - 11904: 0XDCC2,
+	20682 - 11904: 0XDCB9,
+	20683 - 11904: 0XDCC1,
 	20685 - 11904: 0x92A1,
 	20686 - 11904: 0xB9B6,
 	20687 - 11904: 0xB9B3,
@ -21906,7 +21906,7 @@ var encode1 = [...]uint16{
 	20946 - 11904: 0x9BB4,
 	20947 - 11904: 0xFAA6,
 	20948 - 11904: 0xD861,
-	20951 - 11904: 0xDCC5,
+	20951 - 11904: 0XDCC5,
 	20952 - 11904: 0xE140,
 	20955 - 11904: 0x89DF,
 	20956 - 11904: 0xBBFE,
@ -22015,11 +22015,11 @@ var encode1 = [...]uint16{
 	21108 - 11904: 0xB3CF,
 	21109 - 11904: 0xB3D0,
 	21111 - 11904: 0xB6D0,
-	21112 - 11904: 0xDCC7,
+	21112 - 11904: 0XDCC7,
 	21113 - 11904: 0x89E3,
-	21114 - 11904: 0xDCC6,
-	21115 - 11904: 0xDCC8,
-	21116 - 11904: 0xDCC9,
+	21114 - 11904: 0XDCC6,
+	21115 - 11904: 0XDCC8,
+	21116 - 11904: 0XDCC9,
 	21117 - 11904: 0xB6D1,
 	21119 - 11904: 0xB6CF,
 	21120 - 11904: 0xE141,
@ -22590,7 +22590,7 @@ var encode1 = [...]uint16{
 	21898 - 11904: 0xB3DB,
 	21899 - 11904: 0xB3E3,
 	21900 - 11904: 0xD876,
-	21901 - 11904: 0xDCD7,
+	21901 - 11904: 0XDCD7,
 	21902 - 11904: 0xD87B,
 	21903 - 11904: 0xD86F,
 	21904 - 11904: 0x8A46,
@ -22629,54 +22629,54 @@ var encode1 = [...]uint16{
 	21946 - 11904: 0x9DF6,
 	21947 - 11904: 0xB3EB,
 	21948 - 11904: 0x9BDA,
-	21951 - 11904: 0xDCD5,
-	21952 - 11904: 0xDCD1,
+	21951 - 11904: 0XDCD5,
+	21952 - 11904: 0XDCD1,
 	21953 - 11904: 0x9D7E,
-	21954 - 11904: 0xDCE0,
-	21955 - 11904: 0xDCCA,
-	21956 - 11904: 0xDCD3,
+	21954 - 11904: 0XDCE0,
+	21955 - 11904: 0XDCCA,
+	21956 - 11904: 0XDCD3,
 	21957 - 11904: 0xB6E5,
 	21958 - 11904: 0xB6E6,
 	21959 - 11904: 0xB6DE,
-	21960 - 11904: 0xDCDC,
+	21960 - 11904: 0XDCDC,
 	21961 - 11904: 0xB6E8,
-	21962 - 11904: 0xDCCF,
-	21963 - 11904: 0xDCCE,
-	21964 - 11904: 0xDCCC,
-	21965 - 11904: 0xDCDE,
+	21962 - 11904: 0XDCCF,
+	21963 - 11904: 0XDCCE,
+	21964 - 11904: 0XDCCC,
+	21965 - 11904: 0XDCDE,
 	21966 - 11904: 0xB6DC,
-	21967 - 11904: 0xDCD8,
-	21968 - 11904: 0xDCCD,
+	21967 - 11904: 0XDCD8,
+	21968 - 11904: 0XDCCD,
 	21969 - 11904: 0xB6DF,
-	21970 - 11904: 0xDCD6,
+	21970 - 11904: 0XDCD6,
 	21971 - 11904: 0xB6DA,
-	21972 - 11904: 0xDCD2,
-	21973 - 11904: 0xDCD9,
-	21974 - 11904: 0xDCDB,
+	21972 - 11904: 0XDCD2,
+	21973 - 11904: 0XDCD9,
+	21974 - 11904: 0XDCDB,
 	21975 - 11904: 0x89FD,
 	21976 - 11904: 0x99E4,
-	21977 - 11904: 0xDCDF,
+	21977 - 11904: 0XDCDF,
 	21978 - 11904: 0xB6E3,
-	21979 - 11904: 0xDCCB,
+	21979 - 11904: 0XDCCB,
 	21980 - 11904: 0xB6DD,
-	21981 - 11904: 0xDCD0,
+	21981 - 11904: 0XDCD0,
 	21982 - 11904: 0x9E43,
 	21983 - 11904: 0xB6D8,
 	21985 - 11904: 0xB6E4,
-	21986 - 11904: 0xDCDA,
+	21986 - 11904: 0XDCDA,
 	21987 - 11904: 0xB6E0,
 	21988 - 11904: 0xB6E1,
 	21989 - 11904: 0xB6E7,
 	21990 - 11904: 0xB6DB,
 	21991 - 11904: 0xA25F,
 	21992 - 11904: 0xB6D9,
-	21993 - 11904: 0xDCD4,
+	21993 - 11904: 0XDCD4,
 	21994 - 11904: 0x9DE9,
 	21996 - 11904: 0x8F52,
 	21999 - 11904: 0xB6E2,
 	22000 - 11904: 0x9DF5,
 	22001 - 11904: 0x9DF0,
-	22002 - 11904: 0xDCDD,
+	22002 - 11904: 0XDCDD,
 	22005 - 11904: 0x99E7,
 	22006 - 11904: 0xB9CD,
 	22007 - 11904: 0xB9C8,
@ -22896,7 +22896,7 @@ var encode1 = [...]uint16{
 	22285 - 11904: 0xB3F2,
 	22290 - 11904: 0xB6E9,
 	22291 - 11904: 0xB6EA,
-	22292 - 11904: 0xDCE1,
+	22292 - 11904: 0XDCE1,
 	22293 - 11904: 0x9CEE,
 	22294 - 11904: 0xB9CF,
 	22296 - 11904: 0xB9CE,
@ -23112,44 +23112,44 @@ var encode1 = [...]uint16{
 	22585 - 11904: 0xD8AF,
 	22586 - 11904: 0x99A2,
 	22587 - 11904: 0xD8B3,
-	22589 - 11904: 0xDCEF,
+	22589 - 11904: 0XDCEF,
 	22591 - 11904: 0xD8AC,
 	22592 - 11904: 0x9ABB,
 	22596 - 11904: 0x9A65,
 	22599 - 11904: 0x944E,
 	22600 - 11904: 0xD8A7,
-	22601 - 11904: 0xDCE7,
+	22601 - 11904: 0XDCE7,
 	22602 - 11904: 0xB6F4,
 	22603 - 11904: 0xB6F7,
 	22604 - 11904: 0xB6F2,
-	22605 - 11904: 0xDCE6,
-	22606 - 11904: 0xDCEA,
-	22607 - 11904: 0xDCE5,
+	22605 - 11904: 0XDCE6,
+	22606 - 11904: 0XDCEA,
+	22607 - 11904: 0XDCE5,
 	22609 - 11904: 0xB6EC,
 	22610 - 11904: 0xB6F6,
-	22611 - 11904: 0xDCE2,
+	22611 - 11904: 0XDCE2,
 	22612 - 11904: 0xB6F0,
-	22613 - 11904: 0xDCE9,
+	22613 - 11904: 0XDCE9,
 	22615 - 11904: 0xB6EE,
 	22616 - 11904: 0xB6ED,
-	22617 - 11904: 0xDCEC,
+	22617 - 11904: 0XDCEC,
 	22618 - 11904: 0xB6EF,
-	22619 - 11904: 0xDCEE,
+	22619 - 11904: 0XDCEE,
 	22620 - 11904: 0xFB6E,
-	22621 - 11904: 0xDCEB,
+	22621 - 11904: 0XDCEB,
 	22622 - 11904: 0xB6EB,
 	22623 - 11904: 0x99DF,
 	22626 - 11904: 0xB6F5,
-	22627 - 11904: 0xDCF0,
-	22628 - 11904: 0xDCE4,
-	22629 - 11904: 0xDCED,
-	22632 - 11904: 0xDCE3,
+	22627 - 11904: 0XDCF0,
+	22628 - 11904: 0XDCE4,
+	22629 - 11904: 0XDCED,
+	22632 - 11904: 0XDCE3,
 	22633 - 11904: 0x98E3,
 	22635 - 11904: 0xB6F1,
 	22636 - 11904: 0x9254,
 	22637 - 11904: 0xB6F3,
-	22639 - 11904: 0xDCE8,
-	22641 - 11904: 0xDCF1,
+	22639 - 11904: 0XDCE8,
+	22641 - 11904: 0XDCF1,
 	22642 - 11904: 0x967B,
 	22643 - 11904: 0x8AAF,
 	22644 - 11904: 0xE15D,
@ -23254,7 +23254,7 @@ var encode1 = [...]uint16{
 	22777 - 11904: 0xB3FC,
 	22778 - 11904: 0xB3FD,
 	22779 - 11904: 0xFB74,
-	22780 - 11904: 0xDCF2,
+	22780 - 11904: 0XDCF2,
 	22781 - 11904: 0xB9D8,
 	22782 - 11904: 0xE169,
 	22783 - 11904: 0xE553,
@ -23588,33 +23588,33 @@ var encode1 = [...]uint16{
 	23212 - 11904: 0xD8BF,
 	23214 - 11904: 0xD8C1,
 	23215 - 11904: 0xD8B5,
-	23216 - 11904: 0xDCFA,
-	23217 - 11904: 0xDCF8,
+	23216 - 11904: 0XDCFA,
+	23217 - 11904: 0XDCF8,
 	23218 - 11904: 0xB742,
 	23219 - 11904: 0xB740,
 	23220 - 11904: 0xDD43,
-	23221 - 11904: 0xDCF9,
+	23221 - 11904: 0XDCF9,
 	23222 - 11904: 0xDD44,
 	23223 - 11904: 0xDD40,
-	23224 - 11904: 0xDCF7,
+	23224 - 11904: 0XDCF7,
 	23225 - 11904: 0xDD46,
-	23226 - 11904: 0xDCF6,
-	23227 - 11904: 0xDCFD,
+	23226 - 11904: 0XDCF6,
+	23227 - 11904: 0XDCFD,
 	23228 - 11904: 0xB6FE,
 	23229 - 11904: 0xB6FD,
 	23230 - 11904: 0xB6FC,
-	23231 - 11904: 0xDCFB,
+	23231 - 11904: 0XDCFB,
 	23232 - 11904: 0xDD41,
 	23233 - 11904: 0xB6F9,
 	23234 - 11904: 0xB741,
 	23235 - 11904: 0x90A7,
-	23236 - 11904: 0xDCF4,
-	23238 - 11904: 0xDCFE,
-	23239 - 11904: 0xDCF3,
-	23240 - 11904: 0xDCFC,
+	23236 - 11904: 0XDCF4,
+	23238 - 11904: 0XDCFE,
+	23239 - 11904: 0XDCF3,
+	23240 - 11904: 0XDCFC,
 	23241 - 11904: 0xB6FA,
 	23242 - 11904: 0xDD42,
-	23243 - 11904: 0xDCF5,
+	23243 - 11904: 0XDCF5,
 	23244 - 11904: 0xB6FB,
 	23245 - 11904: 0xDD45,
 	23246 - 11904: 0x9741,
@ -33663,24 +33663,24 @@ var encode1 = [...]uint16{
 	36577 - 11904: 0xD7E1,
 	36578 - 11904: 0x99EB,
 	36580 - 11904: 0x99EC,
-	36581 - 11904: 0xDC43,
-	36582 - 11904: 0xDC41,
-	36583 - 11904: 0xDC45,
-	36584 - 11904: 0xDC46,
-	36585 - 11904: 0xDC4C,
-	36587 - 11904: 0xDC48,
-	36588 - 11904: 0xDC4A,
+	36581 - 11904: 0XDC43,
+	36582 - 11904: 0XDC41,
+	36583 - 11904: 0XDC45,
+	36584 - 11904: 0XDC46,
+	36585 - 11904: 0XDC4C,
+	36587 - 11904: 0XDC48,
+	36588 - 11904: 0XDC4A,
 	36589 - 11904: 0x99ED,
-	36590 - 11904: 0xDC42,
+	36590 - 11904: 0XDC42,
 	36591 - 11904: 0xDBFC,
-	36593 - 11904: 0xDC49,
+	36593 - 11904: 0XDC49,
 	36594 - 11904: 0x99EE,
-	36596 - 11904: 0xDC4B,
-	36597 - 11904: 0xDC44,
-	36598 - 11904: 0xDC47,
+	36596 - 11904: 0XDC4B,
+	36597 - 11904: 0XDC44,
+	36598 - 11904: 0XDC47,
 	36599 - 11904: 0xDBFD,
 	36600 - 11904: 0xB662,
-	36601 - 11904: 0xDC40,
+	36601 - 11904: 0XDC40,
 	36602 - 11904: 0xDBFE,
 	36603 - 11904: 0xB661,
 	36604 - 11904: 0xB663,
@ -33882,13 +33882,13 @@ var encode1 = [...]uint16{
 	36898 - 11904: 0xB37B,
 	36899 - 11904: 0xB373,
 	36900 - 11904: 0xD7E2,
-	36909 - 11904: 0xDC4D,
+	36909 - 11904: 0XDC4D,
 	36910 - 11904: 0xB665,
-	36911 - 11904: 0xDC4F,
+	36911 - 11904: 0XDC4F,
 	36913 - 11904: 0xB667,
 	36914 - 11904: 0xB669,
 	36915 - 11904: 0x99F3,
-	36916 - 11904: 0xDC4E,
+	36916 - 11904: 0XDC4E,
 	36917 - 11904: 0xB666,
 	36918 - 11904: 0xB66A,
 	36919 - 11904: 0x9062,
@ -34035,22 +34035,22 @@ var encode1 = [...]uint16{
 	37107 - 11904: 0xD7ED,
 	37108 - 11904: 0xD7EB,
 	37109 - 11904: 0xB66C,
-	37113 - 11904: 0xDC56,
+	37113 - 11904: 0XDC56,
 	37114 - 11904: 0xEBD4,
-	37115 - 11904: 0xDC57,
-	37116 - 11904: 0xDC54,
+	37115 - 11904: 0XDC57,
+	37116 - 11904: 0XDC54,
 	37117 - 11904: 0xB3A3,
 	37118 - 11904: 0xB66E,
-	37119 - 11904: 0xDC53,
-	37120 - 11904: 0xDC59,
-	37121 - 11904: 0xDC58,
+	37119 - 11904: 0XDC53,
+	37120 - 11904: 0XDC59,
+	37121 - 11904: 0XDC58,
 	37122 - 11904: 0xB66B,
-	37123 - 11904: 0xDC5C,
-	37124 - 11904: 0xDC52,
-	37125 - 11904: 0xDC5B,
-	37126 - 11904: 0xDC50,
-	37127 - 11904: 0xDC5A,
-	37128 - 11904: 0xDC55,
+	37123 - 11904: 0XDC5C,
+	37124 - 11904: 0XDC52,
+	37125 - 11904: 0XDC5B,
+	37126 - 11904: 0XDC50,
+	37127 - 11904: 0XDC5A,
+	37128 - 11904: 0XDC55,
 	37129 - 11904: 0xB66D,
 	37131 - 11904: 0xE0AA,
 	37133 - 11904: 0xE0A5,
@ -34081,7 +34081,7 @@ var encode1 = [...]uint16{
 	37161 - 11904: 0xE856,
 	37162 - 11904: 0xE857,
 	37163 - 11904: 0xE855,
-	37164 - 11904: 0xDC51,
+	37164 - 11904: 0XDC51,
 	37165 - 11904: 0xBE47,
 	37166 - 11904: 0xE85A,
 	37167 - 11904: 0xE854,
@ -34125,12 +34125,12 @@ var encode1 = [...]uint16{
 	37210 - 11904: 0xD7F4,
 	37212 - 11904: 0x9FB0,
 	37214 - 11904: 0x89AD,
-	37215 - 11904: 0xDC5F,
-	37216 - 11904: 0xDC61,
-	37217 - 11904: 0xDC5D,
-	37218 - 11904: 0xDC60,
+	37215 - 11904: 0XDC5F,
+	37216 - 11904: 0XDC61,
+	37217 - 11904: 0XDC5D,
+	37218 - 11904: 0XDC60,
 	37219 - 11904: 0xB66F,
-	37220 - 11904: 0xDC5E,
+	37220 - 11904: 0XDC5E,
 	37221 - 11904: 0xB670,
 	37223 - 11904: 0x906E,
 	37224 - 11904: 0xDD73,
@ -34253,43 +34253,43 @@ var encode1 = [...]uint16{
 	37368 - 11904: 0xD7FB,
 	37369 - 11904: 0xD7FD,
 	37370 - 11904: 0x94A6,
-	37373 - 11904: 0xDC6D,
+	37373 - 11904: 0XDC6D,
 	37374 - 11904: 0x8FD5,
-	37375 - 11904: 0xDC6C,
-	37376 - 11904: 0xDC6A,
-	37377 - 11904: 0xDC62,
-	37378 - 11904: 0xDC71,
-	37379 - 11904: 0xDC65,
-	37380 - 11904: 0xDC6F,
-	37381 - 11904: 0xDC76,
-	37382 - 11904: 0xDC6E,
+	37375 - 11904: 0XDC6C,
+	37376 - 11904: 0XDC6A,
+	37377 - 11904: 0XDC62,
+	37378 - 11904: 0XDC71,
+	37379 - 11904: 0XDC65,
+	37380 - 11904: 0XDC6F,
+	37381 - 11904: 0XDC76,
+	37382 - 11904: 0XDC6E,
 	37383 - 11904: 0xB679,
 	37384 - 11904: 0x9E73,
 	37385 - 11904: 0xB675,
-	37386 - 11904: 0xDC63,
-	37388 - 11904: 0xDC69,
+	37386 - 11904: 0XDC63,
+	37388 - 11904: 0XDC69,
 	37389 - 11904: 0xB677,
 	37390 - 11904: 0x9075,
-	37391 - 11904: 0xDC68,
+	37391 - 11904: 0XDC68,
 	37392 - 11904: 0xB678,
 	37393 - 11904: 0xB67A,
-	37394 - 11904: 0xDC6B,
+	37394 - 11904: 0XDC6B,
 	37395 - 11904: 0x99F7,
 	37396 - 11904: 0xB672,
 	37397 - 11904: 0xB673,
-	37398 - 11904: 0xDC77,
-	37399 - 11904: 0xDC75,
+	37398 - 11904: 0XDC77,
+	37399 - 11904: 0XDC75,
 	37400 - 11904: 0x87B2,
-	37401 - 11904: 0xDC74,
-	37402 - 11904: 0xDC66,
-	37404 - 11904: 0xDC72,
+	37401 - 11904: 0XDC74,
+	37402 - 11904: 0XDC66,
+	37404 - 11904: 0XDC72,
 	37406 - 11904: 0xB676,
 	37409 - 11904: 0x8CBF,
 	37411 - 11904: 0xB674,
-	37412 - 11904: 0xDC73,
-	37413 - 11904: 0xDC64,
-	37414 - 11904: 0xDC67,
-	37415 - 11904: 0xDC70,
+	37412 - 11904: 0XDC73,
+	37413 - 11904: 0XDC64,
+	37414 - 11904: 0XDC67,
+	37415 - 11904: 0XDC70,
 	37416 - 11904: 0x99F9,
 	37418 - 11904: 0x9663,
 	37419 - 11904: 0x95B9,
@ -34819,7 +34819,7 @@ var encode1 = [...]uint16{
 	38263 - 11904: 0xAAF8,
 	38264 - 11904: 0x8BEA,
 	38266 - 11904: 0xD844,
-	38267 - 11904: 0xDC78,
+	38267 - 11904: 0XDC78,
 	38268 - 11904: 0xE8A5,
 	38269 - 11904: 0xF376,
 	38271 - 11904: 0x8BEB,
@ -34831,11 +34831,11 @@ var encode1 = [...]uint16{
 	38280 - 11904: 0xD846,
 	38281 - 11904: 0xB3AC,
 	38283 - 11904: 0xB67D,
-	38284 - 11904: 0xDC7A,
-	38285 - 11904: 0xDC79,
+	38284 - 11904: 0XDC7A,
+	38285 - 11904: 0XDC79,
 	38286 - 11904: 0xB6A3,
 	38287 - 11904: 0xB67C,
-	38288 - 11904: 0xDC7B,
+	38288 - 11904: 0XDC7B,
 	38289 - 11904: 0xB67E,
 	38290 - 11904: 0xB6A2,
 	38291 - 11904: 0xB6A1,
@ -34976,16 +34976,16 @@ var encode1 = [...]uint16{
 	38523 - 11904: 0x90BE,
 	38524 - 11904: 0xD847,
 	38525 - 11904: 0xB6A7,
-	38526 - 11904: 0xDC7D,
-	38528 - 11904: 0xDCA3,
+	38526 - 11904: 0XDC7D,
+	38528 - 11904: 0XDCA3,
 	38529 - 11904: 0x9FAF,
-	38531 - 11904: 0xDCA2,
+	38531 - 11904: 0XDCA2,
 	38532 - 11904: 0xB6AC,
 	38533 - 11904: 0xB6A8,
 	38534 - 11904: 0xB6A9,
-	38535 - 11904: 0xDC7C,
-	38536 - 11904: 0xDC7E,
-	38537 - 11904: 0xDCA1,
+	38535 - 11904: 0XDC7C,
+	38536 - 11904: 0XDC7E,
+	38537 - 11904: 0XDCA1,
 	38538 - 11904: 0xB6A4,
 	38539 - 11904: 0xB6A6,
 	38541 - 11904: 0xB6AA,
@ -35027,13 +35027,13 @@ var encode1 = [...]uint16{
 	38591 - 11904: 0xD84C,
 	38592 - 11904: 0xB3B6,
 	38593 - 11904: 0xB6AD,
-	38594 - 11904: 0xDCA4,
-	38595 - 11904: 0xDCA6,
+	38594 - 11904: 0XDCA4,
+	38595 - 11904: 0XDCA6,
 	38596 - 11904: 0xB6AF,
 	38597 - 11904: 0xB6AE,
 	38598 - 11904: 0xB6B0,
 	38599 - 11904: 0xB6B1,
-	38600 - 11904: 0xDCA5,
+	38600 - 11904: 0XDCA5,
 	38601 - 11904: 0xB96E,
 	38602 - 11904: 0xB96F,
 	38603 - 11904: 0xB96D,
@ -35062,8 +35062,8 @@ var encode1 = [...]uint16{
 	38633 - 11904: 0xB3B8,
 	38634 - 11904: 0xB3B7,
 	38639 - 11904: 0xB6B2,
-	38640 - 11904: 0xDCA8,
-	38641 - 11904: 0xDCA7,
+	38640 - 11904: 0XDCA8,
+	38641 - 11904: 0XDCA7,
 	38642 - 11904: 0xB6B3,
 	38644 - 11904: 0x92E4,
 	38645 - 11904: 0xE0D9,
@ -35157,10 +35157,10 @@ var encode1 = [...]uint16{
 	38760 - 11904: 0xC5E2,
 	38761 - 11904: 0xADB2,
 	38762 - 11904: 0xD84D,
-	38764 - 11904: 0xDCA9,
+	38764 - 11904: 0XDCA9,
 	38765 - 11904: 0x9E46,
-	38766 - 11904: 0xDCAB,
-	38768 - 11904: 0xDCAA,
+	38766 - 11904: 0XDCAB,
+	38768 - 11904: 0XDCAA,
 	38769 - 11904: 0x9651,
 	38770 - 11904: 0xE0DD,
 	38771 - 11904: 0xE0DA,
@ -35279,7 +35279,7 @@ var encode1 = [...]uint16{
 	38916 - 11904: 0xD84E,
 	38917 - 11904: 0xB6B5,
 	38918 - 11904: 0xB6B6,
-	38919 - 11904: 0xDCAC,
+	38919 - 11904: 0XDCAC,
 	38920 - 11904: 0xB6B7,
 	38922 - 11904: 0xB97A,
 	38924 - 11904: 0xB97C,
@ -35368,7 +35368,7 @@ var encode1 = [...]uint16{
 	39028 - 11904: 0xF9AF,
 	39029 - 11904: 0x8BEF,
 	39080 - 11904: 0xADB7,
-	39081 - 11904: 0xDCAD,
+	39081 - 11904: 0XDCAD,
 	39084 - 11904: 0xE0E1,
 	39085 - 11904: 0xE4CC,
 	39086 - 11904: 0xE4CD,
@ -35413,7 +35413,7 @@ var encode1 = [...]uint16{
 	39143 - 11904: 0xB6B8,
 	39145 - 11904: 0xB6BB,
 	39146 - 11904: 0xB6B9,
-	39147 - 11904: 0xDCAE,
+	39147 - 11904: 0XDCAE,
 	39148 - 11904: 0x914B,
 	39149 - 11904: 0xB6BD,
 	39151 - 11904: 0xB6BA,
@ -36027,7 +36027,7 @@ var encode1 = [...]uint16{
 	40059 - 11904: 0x96AF,
 	40060 - 11904: 0x8BF4,
 	40165 - 11904: 0xB3BE,
-	40166 - 11904: 0xDCAF,
+	40166 - 11904: 0XDCAF,
 	40167 - 11904: 0xE0ED,
 	40169 - 11904: 0xB9A7,
 	40170 - 11904: 0xE0EB,
@ -36397,7 +36397,7 @@ var encode1 = [...]uint16{
 	40694 - 11904: 0xF97D,
 	40695 - 11904: 0xC675,
 	40696 - 11904: 0x9AB1,
-	40697 - 11904: 0xDCB0,
+	40697 - 11904: 0XDCB0,
 	40698 - 11904: 0xECB6,
 	40699 - 11904: 0xEFB0,
 	40700 - 11904: 0xF3F5,
--- a/vendor/golang.org/x/text/encoding/unicode/unicode.go
+++ b/vendor/golang.org/x/text/encoding/unicode/unicode.go
@ -357,7 +357,7 @@ func (u *utf16Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, e
 }

 func isHighSurrogate(r rune) bool {
-	return 0xDC00 <= r && r <= 0xDFFF
+	return 0XDC00 <= r && r <= 0xDFFF
 }

 type utf16Encoder struct {
--- a/vendor/golang.org/x/text/language/tables.go
+++ b/vendor/golang.org/x/text/language/tables.go
@ -294,9 +294,9 @@ var langNoIndex = [2197]uint8{
 	0xb0, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03,
 	0x40, 0x00, 0x40, 0x92, 0x21, 0x50, 0xb1, 0x5d,
 	// Entry 100 - 13F
-	0xfd, 0xdc, 0xbe, 0x5e, 0x00, 0x00, 0x02, 0x64,
+	0xfd, 0XDC, 0xbe, 0x5e, 0x00, 0x00, 0x02, 0x64,
 	0x0d, 0x19, 0x41, 0xdf, 0x79, 0x22, 0x00, 0x00,
-	0x00, 0x5e, 0x64, 0xdc, 0x24, 0xe5, 0xd9, 0xe3,
+	0x00, 0x5e, 0x64, 0XDC, 0x24, 0xe5, 0xd9, 0xe3,
 	0xfe, 0xff, 0xfd, 0xcb, 0x9f, 0x14, 0x01, 0x0c,
 	0x86, 0x00, 0xd1, 0x00, 0xf0, 0xc5, 0x67, 0x5f,
 	0x56, 0x89, 0x5e, 0xb5, 0x6c, 0xaf, 0x03, 0x00,
@ -407,7 +407,7 @@ var langNoIndex = [2197]uint8{
 	0xdf, 0xdf, 0x9b, 0x7f, 0xff, 0xff, 0x7f, 0x6f,
 	0xf7, 0xfb, 0xeb, 0xdf, 0xbc, 0xff, 0xbf, 0x6b,
 	0x7b, 0xfb, 0xff, 0xce, 0x76, 0xbd, 0xf7, 0xf7,
-	0xdf, 0xdc, 0xf7, 0xf7, 0xff, 0xdf, 0xf3, 0xfe,
+	0xdf, 0XDC, 0xf7, 0xf7, 0xff, 0xdf, 0xf3, 0xfe,
 	0xef, 0xff, 0xff, 0xff, 0xb6, 0x7f, 0x7f, 0xde,
 	0xf7, 0xb9, 0xeb, 0x77, 0xff, 0xfb, 0xbf, 0xdf,
 	// Entry 440 - 47F
@ -503,7 +503,7 @@ var langNoIndex = [2197]uint8{
 	// Entry 6C0 - 6FF
 	0x14, 0x4d, 0xf1, 0x16, 0x44, 0xd1, 0x42, 0x08,
 	0x40, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00,
-	0x00, 0xdc, 0xfb, 0xcb, 0x0e, 0x58, 0x08, 0x41,
+	0x00, 0XDC, 0xfb, 0xcb, 0x0e, 0x58, 0x08, 0x41,
 	0x04, 0x20, 0x04, 0x00, 0x30, 0x12, 0x40, 0x00,
 	0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x01, 0x00, 0x00, 0x00, 0x80, 0x10, 0x10, 0xab,
@ -626,7 +626,7 @@ var langAliasMap = [161]fromTo{
 	40:  {from: 0xcae, to: 0xf0},
 	41:  {from: 0xcfd, to: 0xf6},
 	42:  {from: 0xdbd, to: 0x116},
-	43:  {from: 0xdcc, to: 0x324},
+	43:  {from: 0XDCc, to: 0x324},
 	44:  {from: 0xded, to: 0xdf0},
 	45:  {from: 0xdf3, to: 0x526},
 	46:  {from: 0xed4, to: 0x204f},
@ -1213,7 +1213,7 @@ var fromM49 = [332]uint16{
 	0x3852, 0x3d2d, 0x445b, 0x4c49, 0x5453, 0x5ca7, 0x5f5e, 0x644c,
 	0x684a, 0x704f, 0x7855, 0x7e8f, 0x8058, 0x885c, 0x965d, 0x983a,
 	0xa062, 0xa863, 0xac64, 0xb468, 0xbd19, 0xc485, 0xcc6e, 0xce6e,
-	0xd06c, 0xd269, 0xd475, 0xdc73, 0xde87, 0xe472, 0xec71, 0xf030,
+	0xd06c, 0xd269, 0xd475, 0XDC73, 0xde87, 0xe472, 0xec71, 0xf030,
 	0xf278, 0xf477, 0xfc7d, 0x04e4, 0x0920, 0x0c61, 0x1479, 0x187c,
 	0x1c82, 0x26ec, 0x285f, 0x2c5e, 0x305f, 0x407f, 0x4880, 0x50a6,
 	0x5886, 0x6081, 0x687b, 0x7084, 0x7889, 0x8088, 0x8883, 0x908b,
@ -2310,7 +2310,7 @@ var likelyLang = [1319]likelyScriptRegion{
 	818:  {region: 0x164, script: 0x52, flags: 0x0},
 	819:  {region: 0x164, script: 0x52, flags: 0x0},
 	820:  {region: 0x164, script: 0x52, flags: 0x0},
-	821:  {region: 0xdc, script: 0x52, flags: 0x0},
+	821:  {region: 0XDC, script: 0x52, flags: 0x0},
 	822:  {region: 0x164, script: 0x52, flags: 0x0},
 	823:  {region: 0x164, script: 0x52, flags: 0x0},
 	825:  {region: 0x164, script: 0x52, flags: 0x0},
@ -3537,7 +3537,7 @@ type parentRel struct {

 // Size: 412 bytes, 5 elements
 var parents = [5]parentRel{
-	0: {lang: 0x134, script: 0x0, maxScript: 0x52, toRegion: 0x1, fromRegion: []uint16{0x1a, 0x24, 0x25, 0x2e, 0x33, 0x35, 0x3c, 0x41, 0x45, 0x47, 0x48, 0x49, 0x4f, 0x51, 0x5b, 0x5c, 0x60, 0x63, 0x6c, 0x72, 0x73, 0x74, 0x7a, 0x7b, 0x7e, 0x7f, 0x80, 0x82, 0x8b, 0x8c, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9e, 0x9f, 0xa3, 0xa6, 0xa8, 0xac, 0xb0, 0xb3, 0xb4, 0xbe, 0xc5, 0xc9, 0xca, 0xcb, 0xcd, 0xcf, 0xd1, 0xd4, 0xd5, 0xdc, 0xde, 0xdf, 0xe5, 0xe6, 0xe7, 0xea, 0xef, 0x106, 0x108, 0x109, 0x10a, 0x10c, 0x10d, 0x111, 0x116, 0x11a, 0x11c, 0x11e, 0x124, 0x128, 0x12b, 0x12c, 0x12e, 0x130, 0x138, 0x13b, 0x13e, 0x141, 0x160, 0x161, 0x163}},
+	0: {lang: 0x134, script: 0x0, maxScript: 0x52, toRegion: 0x1, fromRegion: []uint16{0x1a, 0x24, 0x25, 0x2e, 0x33, 0x35, 0x3c, 0x41, 0x45, 0x47, 0x48, 0x49, 0x4f, 0x51, 0x5b, 0x5c, 0x60, 0x63, 0x6c, 0x72, 0x73, 0x74, 0x7a, 0x7b, 0x7e, 0x7f, 0x80, 0x82, 0x8b, 0x8c, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9e, 0x9f, 0xa3, 0xa6, 0xa8, 0xac, 0xb0, 0xb3, 0xb4, 0xbe, 0xc5, 0xc9, 0xca, 0xcb, 0xcd, 0xcf, 0xd1, 0xd4, 0xd5, 0XDC, 0xde, 0xdf, 0xe5, 0xe6, 0xe7, 0xea, 0xef, 0x106, 0x108, 0x109, 0x10a, 0x10c, 0x10d, 0x111, 0x116, 0x11a, 0x11c, 0x11e, 0x124, 0x128, 0x12b, 0x12c, 0x12e, 0x130, 0x138, 0x13b, 0x13e, 0x141, 0x160, 0x161, 0x163}},
 	1: {lang: 0x134, script: 0x0, maxScript: 0x52, toRegion: 0x1a, fromRegion: []uint16{0x2d, 0x4d, 0x5f, 0x62, 0x71, 0xd8, 0x10b, 0x10e}},
 	2: {lang: 0x139, script: 0x0, maxScript: 0x52, toRegion: 0x1e, fromRegion: []uint16{0x2b, 0x3e, 0x40, 0x50, 0x53, 0x55, 0x58, 0x64, 0x68, 0x88, 0x8e, 0xce, 0xd7, 0xe1, 0xe3, 0xeb, 0xf0, 0x119, 0x134, 0x135, 0x13a}},
 	3: {lang: 0x3b7, script: 0x0, maxScript: 0x52, toRegion: 0xed, fromRegion: []uint16{0x29, 0x4d, 0x59, 0x85, 0x8a, 0xb6, 0xc5, 0xd0, 0x117, 0x125}},
--- a/vendor/gopkg.in/olebedev/go-duktape.v3/duktape.c
+++ b/vendor/gopkg.in/olebedev/go-duktape.v3/duktape.c
@ -11685,7 +11685,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_encode_cesu8(duk_ucodepoint_t cp, duk_u
 		 *
 		 *    x = 0b00000000 0000AAAA AAAAAABB BBBBBBBB
 		 *  sp1 = 0b110110AA AAAAAAAA  (0xd800 + ((x >> 10) & 0x3ff))
-		 *  sp2 = 0b110111BB BBBBBBBB  (0xdc00 + (x & 0x3ff))
+		 *  sp2 = 0b110111BB BBBBBBBB  (0XDC00 + (x & 0x3ff))
 		 *
 		 *  Encoded into CESU-8:
 		 *
@ -31431,7 +31431,7 @@ DUK_LOCAL void duk__utf8_encode_char(void *udata, duk_codepoint_t codepoint) {
 		} else {
 			/* low surrogate */
 			if (enc_ctx->lead != 0x0000L) {
-				codepoint = (duk_codepoint_t) (0x010000L + ((enc_ctx->lead - 0xd800L) << 10) + (codepoint - 0xdc00L));
+				codepoint = (duk_codepoint_t) (0x010000L + ((enc_ctx->lead - 0xd800L) << 10) + (codepoint - 0XDC00L));
 				enc_ctx->lead = 0x0000L;
 			} else {
 				/* unpaired low surrogate */
@ -32785,18 +32785,18 @@ DUK_LOCAL void duk__transform_callback_encode_uri(duk__transform_context *tfm_ct
 	} else if ((cp < 0x80L) && DUK__CHECK_BITMASK(unescaped_table, cp)) {
 		DUK_BW_WRITE_RAW_U8(tfm_ctx->thr, &tfm_ctx->bw, (duk_uint8_t) cp);
 		return;
-	} else if (cp >= 0xdc00L && cp <= 0xdfffL) {
+	} else if (cp >= 0XDC00L && cp <= 0xdfffL) {
 		goto uri_error;
 	} else if (cp >= 0xd800L && cp <= 0xdbffL) {
 		/* Needs lookahead */
 		if (duk_unicode_decode_xutf8(tfm_ctx->thr, &tfm_ctx->p, tfm_ctx->p_start, tfm_ctx->p_end, (duk_ucodepoint_t *) &cp2) == 0) {
 			goto uri_error;
 		}
-		if (!(cp2 >= 0xdc00L && cp2 <= 0xdfffL)) {
+		if (!(cp2 >= 0XDC00L && cp2 <= 0xdfffL)) {
 			goto uri_error;
 		}
 		cp1 = cp;
-		cp = (duk_codepoint_t) (((cp1 - 0xd800L) << 10) + (cp2 - 0xdc00L) + 0x10000L);
+		cp = (duk_codepoint_t) (((cp1 - 0xd800L) << 10) + (cp2 - 0XDC00L) + 0x10000L);
 	} else if (cp > 0x10ffffL) {
 		/* Although we can allow non-BMP characters (they'll decode
 		 * back into surrogate pairs), we don't allow extended UTF-8
@ -32954,7 +32954,7 @@ DUK_LOCAL void duk__transform_callback_decode_uri(duk__transform_context *tfm_ct
 			DUK_ASSERT(cp < 0x100000L);

 			DUK_BW_WRITE_RAW_XUTF8(tfm_ctx->thr, &tfm_ctx->bw, ((cp >> 10) + 0xd800L));
-			DUK_BW_WRITE_RAW_XUTF8(tfm_ctx->thr, &tfm_ctx->bw, ((cp & 0x03ffL) + 0xdc00L));
+			DUK_BW_WRITE_RAW_XUTF8(tfm_ctx->thr, &tfm_ctx->bw, ((cp & 0x03ffL) + 0XDC00L));
 		} else {
 			DUK_BW_WRITE_RAW_XUTF8(tfm_ctx->thr, &tfm_ctx->bw, cp);
 		}
@ -33457,7 +33457,7 @@ DUK_LOCAL const duk_uint8_t duk__json_quotestr_lookup[256] = {
 	0x20, 0x21, 0xa2, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
 	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
 	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0xdc, 0x5d, 0x5e, 0x5f,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0XDC, 0x5d, 0x5e, 0x5f,
 	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
 	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x81,
 	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
@ -33496,7 +33496,7 @@ DUK_LOCAL const duk_uint8_t duk__json_decstr_lookup[256] = {
 	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
 	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
 	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0XDC, 0xdd, 0xde, 0xdf,
 	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
 	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 };
@ -59325,8 +59325,8 @@ DUK_INTERNAL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr, duk
 			 */
 			cp2 = 0;  /* If call fails, this is left untouched and won't match cp2 check. */
 			(void) duk_unicode_decode_xutf8(thr, &p, p_start, p_end, &cp2);
-			if (cp2 >= 0xdc00UL && cp2 <= 0xdfffUL) {
-				cp1 = (duk_ucodepoint_t) (((cp1 - 0xd800UL) << 10) + (cp2 - 0xdc00UL) + 0x10000UL);
+			if (cp2 >= 0XDC00UL && cp2 <= 0xdfffUL) {
+				cp1 = (duk_ucodepoint_t) (((cp1 - 0xd800UL) << 10) + (cp2 - 0XDC00UL) + 0x10000UL);
 			}
 		}
 	} else {
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@ -779,4 +779,4 @@
 		}
 	],
 	"rootPath": "github.com/ethereum/go-ethereum"
-}
+}