chore: release version 1.0.0-alpha.2

OneKeyHQ · Aug 20, 2024 · d53f721 · d53f721
1 parent c020c4e
commit d53f721
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 11 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -93,7 +93,7 @@ declare module '@onekeyfe/kaspacore-lib' {
 	export namespace Transaction {
 
 		static class sighash {
-			static sign(transaction, privateKey, sighashType, inputIndex, subscript, satoshisBN, flags, signingMethod);
+			// static sign(transaction, privateKey, sighashType, inputIndex, subscript, satoshisBN, flags, signingMethod);
 			static sighash(transaction, sighashType, inputNumber, subscript, satoshisBN, flags): Buffer;
 		}
 		class UnspentOutput {
@@ -155,7 +155,7 @@ declare module '@onekeyfe/kaspacore-lib' {
 		fee(amount: number): this;
 		setVersion(version: number): this;
 		feePerKb(amount: number): this;
-		sign(privateKey: PrivateKey|PrivateKey[] | string|string[], sigtype:number, signingMethod:string|undefined): this;
+		// sign(privateKey: PrivateKey|PrivateKey[] | string|string[], sigtype:number, signingMethod:string|undefined): this;
 		applySignature(sig: crypto.Signature): this;
 		addInput(input: Transaction.Input): this;
 		addOutput(output: Transaction.Output): this;

diff --git a/lib/crypto/bn.js b/lib/crypto/bn.js
@@ -17,7 +17,6 @@ BN.One = new BN(1);
 BN.Minus1 = new BN(-1);
 
 BN.fromNumber = function(n) {
-  $.checkArgument(_.isNumber(n));
   if (_.isNumber(n)) {
     if (n <= 0x1fffffffffffff) {
       return new BN(n);

diff --git a/lib/transaction/output.js b/lib/transaction/output.js
@@ -160,7 +160,7 @@ Output.prototype.inspect = function() {
 
 Output.fromBufferReader = function(br) {
     var obj = {};
-    obj.satoshis = BN.fromNumber(br.readUInt64LEBN()).toString();
+    obj.satoshis = br.readUInt64LEBN().toString();
     var version = br.readUInt16LE();
     var size = br.readUInt64LEBN().toNumber();
     if (size !== 0) {

diff --git a/lib/transaction/unspentoutput.js b/lib/transaction/unspentoutput.js
@@ -7,6 +7,7 @@ var JSUtil = require('../util/js');
 var Script = require('../script');
 var Address = require('../address');
 var Unit = require('../unit');
+var BN = require('../crypto/bn');
 
 /**
  * Represents an unspent output information: its script, associated amount and address,
@@ -46,8 +47,16 @@ function UnspentOutput(data) {
   var script = new Script(data.scriptPubKey || data.script);
   $.checkArgument(!_.isUndefined(data.amount) || !_.isUndefined(data.satoshis),
                   'Must provide an amount for the output');
-  var amount = !_.isUndefined(data.amount) ? new Unit.fromBTC(data.amount).toSatoshis() : data.satoshis;
-  $.checkArgument(_.isNumber(amount), 'Amount must be a number');
+
+  var amount;
+  if (!_.isUndefined(data.amount)) {
+    amount = BN.fromNumber(data.amount);
+    amount = amount.mul(new BN(1e8)).toString();
+  } else {
+    amount = BN.fromNumber(data.satoshis).toString();
+  }
+  $.checkArgument(!amount.includes('.'), 'Amount must be a number');
+
   JSUtil.defineImmutable(this, {
     address: address,
     txId: txId,

diff --git a/lib/util/js.js b/lib/util/js.js
@@ -2,6 +2,9 @@
 
 var _ = require('lodash');
 var logLevels = require('./log').logLevels;
+var BN = require('../crypto/bn');
+
+const UINT64_MAX = new BN('18446744073709551615');
 
 /**
  * Determines whether a string contains only hexadecimal values
@@ -85,10 +88,22 @@ const JSUtil = {
      * @return {Boolean}
      */
     isNaturalNumber: function isNaturalNumber(value) {
-        return typeof value === 'number' &&
-            isFinite(value) &&
-            Math.floor(value) === value &&
-            value >= 0;
+        if (typeof value === 'string') {
+            if (!/^\d*$/.test(value)) {
+                return false;
+            }
+        }
+
+        if(typeof value === 'number' || typeof value === 'string'){
+            try {
+                var bnValue = BN.fromNumber(value);
+                return bnValue.lte(UINT64_MAX);
+            } catch (e) {
+                return false;
+            }
+        }
+
+        return false;
     }
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/kaspacore-lib",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.5",
   "main": "index.js",
   "authors": [
     {