melis-fork-claimer - npm Package Compare versions

Comparing version 0.5.2 to 0.5.3

package.json

@@ -6,3 +6,3 @@ {
   "license": "ISC",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "main": "src/index.js",
@@ -9,0 +9,0 @@ "scripts": {

src/fork-claimer.js

@@ -218,2 +218,9 @@ //
 
+function deriveAddressKeys(melis, account, unspents) {
+  unspents.forEach(u => {
+    const aa = u.aa
+    u.key = melis.deriveMyHdAccount(account.num, aa.chain, aa.hdindex, account.coin)
+  })
+}
+
 // Explorers for unspents:
@@ -391,17 +398,2 @@ // BTCP: http://explorer.btcprivate.org/api/addr/b1Cg6wsJaaDACjnoLGmmm75bAYCEzN1GTvF/utxo
 
-function writeTxInfo(par) {
-  console.log("=====")
-  console.log("Input transaction: " + par.inputHash + " / " + par.inputOut)
-  console.log("prevOutScript: " + par.prevOutScript.toString('hex'))
-  console.log("unspent address: " + par.unspentAddress)
-  console.log("Signing key: " + par.key.toWIF() + " " + par.key.d.toHex())
-  console.log("Signing public key: " + par.key.getPublicKeyBuffer().toString('hex'))
-  console.log("sourceAddress: " + par.sourceAddress)
-  console.log("targetAddress: " + par.targetAddress + " " + par.targetAddressHash.toString('hex') + " amount: " + par.targetAmount.toString(16))
-  console.log("outscript: " + par.outScript.toString('hex'))
-  console.log("hashForSignature: " + par.hashForSignature.toString('hex'))
-  console.log("scriptSig: " + par.scriptSig.toString('hex'))
-  console.log("=====")
-}
-
 class ForkClaimer {
@@ -478,2 +470,6 @@
 
+  async getPossibleUnspents(melis, account) {
+    return await melis.getUnspentsAtBlock(account, this.getForkHeight())
+  }
+
   convertToCoinAddress(btcAddress) {
@@ -790,10 +786,2 @@ //console.log("Request to convert " + btcAddress + " to format " + this.forkInfo.name + " format")
       console.log("Input Script: " + inputScript.toString('hex'))
-      // if (u.aa.redeemScript)
-      // redeemScript= Buffer.from(u.aa.redeemScript, 'base64')
-      // else {
-      //   const decoded = Bitcoin.address.fromBase58Check(u.aa.address)
-      //   console.log("Decoded address: ", decoded)
-      //   redeemScript = bscript.pubKeyHash.output.encode(decoded.hash)
-      // }
-      //const hashForSignature = this.hashForSignature_legacy(Buffer.from(u.hash, 'hex').reverse(), u.n, inputScript, tx.outs, Bitcoin.Transaction.SIGHASH_ALL)
 
@@ -814,22 +802,2 @@ const ins = [{
       signatures.push(signature.toDER().toString('hex'))
-
-      //   // TODO MULTISIG!?
-      //   const redeemScript = Buffer.from(accountAddress.redeemScript, "hex")
-      //   const decoded = Bitcoin.address.fromBase58Check(u.aa.address)
-      //   console.log("Decoded address: ", decoded)
-      //   scriptSig = bscript.pubKeyHash.output.encode(decoded.hash)
-      // } else
-      //   scriptSig = Buffer.from(u.inputScript, 'base64')
-      // console.log("scriptSig: ", scriptSig.toString('hex'))
-      // const key = info.key
-      // let signature = key.sign(hashForSignature)
-      // if (Buffer.isBuffer(signature))
-      //   signature = Bitcoin.ECSignature.fromRSBuffer(signature)
-      // // console.log("Signature:", signature)
-      // const scriptSignature = toScriptSignature(signature, this.forkInfo.signtype) // Bitcoin.Transaction.SIGHASH_ALL
-      // console.log("scriptSignature:", scriptSignature.toString('hex'))
-      // //const scriptSig = bscript.compile(Bitcoin.script.pubKeyHash.input.encodeStack(scriptSignature, key.getPublicKeyBuffer()))
-      // const scriptSig = bscript.compile([scriptSignature, key.getPublicKeyBuffer()])
-      // //console.log("ScriptSig:", scriptSig.toString('hex'))
-      // tx.setInputScript(i, scriptSig)
     }
@@ -842,4 +810,55 @@ console.log("TX:", tx)
   }
+
+  async scanFork(melis, accounts, doDebug) {
+    const claimer = this
+    const result = []
+    for (let i = 0; i < accounts.length; i++) {
+      const account = accounts[i]
+      console.log("scanning account " + account.pubId + " type: " + account.type + " meta: " + JSON.stringify(account.meta))
+      if (account.type !== '2' && account.type !== 'H') {
+        console.log("Skipping account " + account.pubId + " of unsupported type " + account.type)
+        continue
+      }
+      const possibleUnspents = await claimer.getPossibleUnspents(melis, account)
+      const candidates = possibleUnspents.unspents
+      console.log("scanning " + account.pubId + " " + account.type + " with #candidates: " + candidates.length)
+      if (!candidates || !candidates.length)
+        continue
+      deriveAddressKeys(melis, account, candidates)
+      const res = await claimer.findUnspentTxOuts(candidates, doDebug)
+      const unspents = res.unspents
+      const infos = res.infos
+      if (!unspents || !unspents.length)
+        continue
+      const totSatoshis = unspents.reduce((acc, o) => acc + parseInt(o.satoshis), 0)
+      const claimable = []
+      unspents.forEach(unspent => {
+        const info = infos[unspent.address]
+        //console.log("info:", info)
+        //console.log("unspent:", unspent)
+        claimable.push({
+          hash: unspent.txid,
+          n: unspent.vout,
+          amount: unspent.satoshis,
+          aa: info.aa,
+          address: info.btcAddress
+        })
+      })
+      result.push({
+        claimer,
+        claimable,
+        account,
+        unspents,
+        infos,
+        totSatoshis,
+        numCandidates: candidates.length
+      })
+      console.log("Account #" + i + ": " + account.pubId + " type: " + account.type + " #candidates: " + candidates.length +
+        " #Unspents: " + unspents.length + " total satoshis: " + totSatoshis + " " + (totSatoshis / 100000000) + " " + claimer.getCoin())
+    }
+    return result
+  }
+
 }
 
 module.exports = ForkClaimer

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

773

increased by2.25%

Worsened metrics

Total package byte prevSize

25026

decreased by-0.92%

No dependency changes