<commit_before><html>
  <body>
    <script src="ethlightjs.min.js"></script>
    <script>
      var helpers = ethlightjs.helpers
      var web3api = new ethlightjs.blockchainapi.web3api("http://172.16.58.3:8545")
      var password = '<PASSWORD>'
      var keystore = undefined
      var addresses = undefined

      function setSeed() {
<<<<<<< HEAD
    var seed = document.getElementById('seed').value
    keystore = new ethlightjs.keystore(seed, password)
    for (var i=0; i<3; i++) {
        var addr = keystore.generateNewAddress(password)
        var bal = web3api.getBalance(addr)
        document.getElementById('addr'+i).innerHTML = addr + ' (' + (bal / 1.0e18) + ' ETH)'
    }
    addresses = keystore.getAddresses()
=======
	  var seed = document.getElementById('seed').value
	  keystore = new ethlightjs.keystore(seed, password)
	  for (var i=0; i<3; i++) {
	      var addr = keystore.generateNewAddress(password)
	      var bal = web3api.getBalance(addr)
	      document.getElementById('addr'+i).innerHTML = addr + ' (' + (bal / 1.0e18) + ' ETH)'
	  }
	  addresses = keystore.getAddresses()
>>>>>>> 21f33443b0f31d917a66db2603002d58bfe7d9f0
      }

      function randomSeed() {
    var randomSeed = ethlightjs.keystore.generateRandomSeed()
    document.getElementById('seed').value = randomSeed
      }

      function sendEth() {
    var fromAddr = document.getElementById('sendFrom').value
    var toAddr = document.getElementById('sendTo').value
    var valueEth = document.getElementById('sendValueAmount').value
    var value = parseFloat(valueEth)*1.0e18
    console.log('**' + fromAddr + '**')
    txObj = {gasLimit: 30000}
    helpers.sendValueTx (fromAddr, toAddr, value, txObj, web3api, keystore, password)
      }
      
    </script>
    <h1>LightWallet</h1>
    <h2>Seed</h2>
    <div><input type="text" id="seed"></input><button onclick="setSeed()">Set Seed</button><button onclick="randomSeed()">Random Seed</button></div>
    <h2>Addresses</h2>
    <div id="addr0"></div>
    <div id="addr1"></div>
    <div id="addr2"></div>
    <div id="signedTx"></div>
    <h2>Send Ether</h2>
    <div>From: <input type="text" id="sendFrom"></input></div>
    <div>To: <input type="text" id="sendTo"></input></div>
    <div>Ether: <input type="text" id="sendValueAmount"></div>
    <div><button onclick="sendEth()">Send Ether</button></div>

  </body><commit_msg>Remove some merging artefacts from example_web.html<commit_after><html>
  <body>
    <script src="ethlightjs.min.js"></script>
    <script>
      var helpers = ethlightjs.helpers
      var web3api = new ethlightjs.blockchainapi.web3api("http://172.16.58.3:8545")
      var password = '<PASSWORD>'
      var keystore = undefined
      var addresses = undefined

      function setSeed() {
	  var seed = document.getElementById('seed').value
	  keystore = new ethlightjs.keystore(seed, password)
	  for (var i=0; i<3; i++) {
	      var addr = keystore.generateNewAddress(password)
	      var bal = web3api.getBalance(addr)
	      document.getElementById('addr'+i).innerHTML = addr + ' (' + (bal / 1.0e18) + ' ETH)'
	  }
	  addresses = keystore.getAddresses()
      }

      function randomSeed() {
	  var randomSeed = ethlightjs.keystore.generateRandomSeed()
	  document.getElementById('seed').value = randomSeed
      }

      function sendEth() {
	  var fromAddr = document.getElementById('sendFrom').value
	  var toAddr = document.getElementById('sendTo').value
	  var valueEth = document.getElementById('sendValueAmount').value
	  var value = parseFloat(valueEth)*1.0e18
	  console.log('**' + fromAddr + '**')
	  txObj = {gasLimit: 30000}
	  helpers.sendValueTx (fromAddr, toAddr, value, txObj, web3api, keystore, password)
      }

    </script>
    <h1>LightWallet</h1>
    <h2>Seed</h2>
    <div><input type="text" id="seed"></input><button onclick="setSeed()">Set Seed</button><button onclick="randomSeed()">Random Seed</button></div>
    <h2>Addresses</h2>
    <div id="addr0"></div>
    <div id="addr1"></div>
    <div id="addr2"></div>
    <div id="signedTx"></div>
    <h2>Send Ether</h2>
    <div>From: <input type="text" id="sendFrom"></input></div>
    <div>To: <input type="text" id="sendTo"></input></div>
    <div>Ether: <input type="text" id="sendValueAmount"></div>
    <div><button onclick="sendEth()">Send Ether</button></div>

  </body>
{'fraction_non_alphanumeric': 0.1698939603503919, 'fraction_numerical': 0.027201475334255418, 'mean_word_length': 3.601272534464475, 'pattern_counts': {'":': 0, '<': 107, '<?xml version=': 0, '>': 104, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 2, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2831724', 'n_tokens_mistral': 1540, 'n_tokens_neox': 1427, 'n_words': 269}