@btc-vision/transaction 1.0.114 → 1.0.116

package/browser/keypair/Address.d.ts

@@ -11,8 +11,8 @@ export declare class Address extends Uint8Array {
     static wrap(bytes: ArrayLike<number>): Address;
     toHex(): string;
     equals(a: Address): boolean;
-    isBiggerThan(a: Address): boolean;
-    isSmallerThan(a: Address): boolean;
+    lessThan(a: Address): boolean;
+    greaterThan(a: Address): boolean;
     set(publicKey: ArrayLike<number>): void;
     isValid(network: Network): boolean;
     p2wpkh(network: Network): string;

package/browser/utils/types.d.ts

@@ -4,6 +4,7 @@ export type MemorySlotPointer = bigint;
 export type BufferLike = Uint8Array | Buffer;
 export type MemorySlotData<T> = T;
 export type PointerStorage = DeterministicMap<MemorySlotPointer, MemorySlotData<bigint>>;
+export type BlockchainStorage = DeterministicMap<string, PointerStorage>;
 export type i32 = number;
 export type u8 = number;
 export type u16 = number;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.114";
+export declare const version = "1.0.116";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.114';
+export const version = '1.0.116';

package/build/deterministic/AddressMap.d.ts

@@ -5,6 +5,7 @@ export declare class AddressMap<V> extends Map<Address, V> {
     set(key: Address, value: V): void;
     indexOf(address: Address): i32;
     has(key: Address): boolean;
-    get(key: Address): V;
+    get(key: Address): V | undefined;
     delete(key: Address): boolean;
+    [Symbol.iterator](): IterableIterator<[Address, V]>;
 }

package/build/deterministic/AddressMap.js

@@ -30,7 +30,7 @@ export class AddressMap extends Map {
     get(key) {
         const index = this.indexOf(key);
         if (index == -1) {
-            throw new Error('Key not found in map');
+            return;
         }
         return this._values[index];
     }
@@ -43,4 +43,9 @@ export class AddressMap extends Map {
         this._values.splice(index, 1);
         return true;
     }
+    *[Symbol.iterator]() {
+        for (const key of this._keys) {
+            yield [key, this.get(key)];
+        }
+    }
 }

package/build/deterministic/AddressSet.d.ts

@@ -1,13 +1,13 @@
-import { i32 } from '../utils/types.js';
 import { Address } from '../keypair/Address.js';
 export declare class AddressSet {
     private keys;
     constructor(keys?: Address[]);
+    get size(): number;
     add(address: Address): void;
-    contains(address: Address): boolean;
+    has(address: Address): boolean;
     remove(address: Address): void;
-    size(): i32;
     clone(): AddressSet;
     clear(): void;
     combine(set: AddressSet): AddressSet;
+    [Symbol.iterator](): Generator<Address, void, unknown>;
 }

package/build/deterministic/AddressSet.js

@@ -2,12 +2,15 @@ export class AddressSet {
     constructor(keys = []) {
         this.keys = keys;
     }
+    get size() {
+        return this.keys.length;
+    }
     add(address) {
-        if (!this.contains(address)) {
+        if (!this.has(address)) {
             this.keys.push(address);
         }
     }
-    contains(address) {
+    has(address) {
         for (let i = 0; i < this.keys.length; i++) {
             if (this.keys[i].equals(address)) {
                 return true;
@@ -21,9 +24,6 @@ export class AddressSet {
             this.keys.splice(index, 1);
         }
     }
-    size() {
-        return this.keys.length;
-    }
     clone() {
         const clone = new AddressSet();
         for (let i = 0; i < this.keys.length; i++) {
@@ -41,4 +41,9 @@ export class AddressSet {
         }
         return clone;
     }
+    *[Symbol.iterator]() {
+        for (let i = 0; i < this.keys.length; i++) {
+            yield this.keys[i];
+        }
+    }
 }

package/build/deterministic/Map.d.ts

@@ -7,7 +7,7 @@ export declare class Map<K, V> {
     values(): V[];
     set(key: K, value: V): void;
     indexOf(key: K): i32;
-    get(key: K): V;
+    get(key: K): V | undefined;
     has(key: K): boolean;
     delete(key: K): boolean;
     clear(): void;

package/build/deterministic/Map.js

@@ -33,7 +33,7 @@ export class Map {
     get(key) {
         const index = this.indexOf(key);
         if (index == -1) {
-            throw new Error('Key not found in map');
+            return undefined;
         }
         return this._values[index];
     }

package/build/keypair/Address.d.ts

@@ -11,8 +11,8 @@ export declare class Address extends Uint8Array {
     static wrap(bytes: ArrayLike<number>): Address;
     toHex(): string;
     equals(a: Address): boolean;
-    isBiggerThan(a: Address): boolean;
-    isSmallerThan(a: Address): boolean;
+    lessThan(a: Address): boolean;
+    greaterThan(a: Address): boolean;
     set(publicKey: ArrayLike<number>): void;
     isValid(network: Network): boolean;
     p2wpkh(network: Network): string;

package/build/keypair/Address.js

@@ -57,21 +57,31 @@ export class Address extends Uint8Array {
         }
         return true;
     }
-    isBiggerThan(a) {
-        for (let i = 0; i < this.length; i++) {
-            if (this[i] < a[i]) {
+    lessThan(a) {
+        for (let i = 0; i < 32; i++) {
+            const thisByte = this[i];
+            const aByte = a[i];
+            if (thisByte < aByte) {
+                return true;
+            }
+            else if (thisByte > aByte) {
                 return false;
             }
         }
-        return true;
-    }
-    isSmallerThan(a) {
-        for (let i = 0; i < this.length; i++) {
-            if (this[i] > a[i]) {
+        return false;
+    }
+    greaterThan(a) {
+        for (let i = 0; i < 32; i++) {
+            const thisByte = this[i];
+            const aByte = a[i];
+            if (thisByte > aByte) {
+                return true;
+            }
+            else if (thisByte < aByte) {
                 return false;
             }
         }
-        return true;
+        return false;
     }
     set(publicKey) {
         if (publicKey.length !== 33 && publicKey.length !== 32 && publicKey.length !== 65) {

package/build/keypair/AddressVerificator.js

@@ -100,6 +100,7 @@ export class AddressVerificator {
             }
         }
         catch (error) {
+            console.log(error);
         }
         return null;
     }

package/build/utils/types.d.ts

@@ -4,6 +4,7 @@ export type MemorySlotPointer = bigint;
 export type BufferLike = Uint8Array | Buffer;
 export type MemorySlotData<T> = T;
 export type PointerStorage = DeterministicMap<MemorySlotPointer, MemorySlotData<bigint>>;
+export type BlockchainStorage = DeterministicMap<string, PointerStorage>;
 export type i32 = number;
 export type u8 = number;
 export type u16 = number;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.114",
+    "version": "1.0.116",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.114';
+export const version = '1.0.116';

package/src/deterministic/AddressMap.ts

@@ -35,10 +35,10 @@ export class AddressMap<V> extends Map<Address, V> {
         return false;
     }
 
-    public get(key: Address): V {
+    public get(key: Address): V | undefined {
         const index: i32 = this.indexOf(key);
         if (index == -1) {
-            throw new Error('Key not found in map');
+            return;
         }
         return this._values[index];
     }
@@ -54,4 +54,10 @@ export class AddressMap<V> extends Map<Address, V> {
 
         return true;
     }
+
+    *[Symbol.iterator](): IterableIterator<[Address, V]> {
+        for (const key of this._keys) {
+            yield [key, this.get(key) as V];
+        }
+    }
 }

package/src/deterministic/AddressSet.ts

@@ -1,4 +1,3 @@
-import { i32 } from '../utils/types.js';
 import { Address } from '../keypair/Address.js';
 
 export class AddressSet {
@@ -8,13 +7,17 @@ export class AddressSet {
         this.keys = keys;
     }
 
+    public get size(): number {
+        return this.keys.length;
+    }
+
     public add(address: Address): void {
-        if (!this.contains(address)) {
+        if (!this.has(address)) {
             this.keys.push(address);
         }
     }
 
-    public contains(address: Address): boolean {
+    public has(address: Address): boolean {
         for (let i = 0; i < this.keys.length; i++) {
             if (this.keys[i].equals(address)) {
                 return true;
@@ -32,10 +35,6 @@ export class AddressSet {
         }
     }
 
-    public size(): i32 {
-        return this.keys.length;
-    }
-
     public clone(): AddressSet {
         const clone = new AddressSet();
 
@@ -59,4 +58,10 @@ export class AddressSet {
 
         return clone;
     }
+
+    *[Symbol.iterator]() {
+        for (let i = 0; i < this.keys.length; i++) {
+            yield this.keys[i];
+        }
+    }
 }

package/src/deterministic/Map.ts

@@ -36,10 +36,10 @@ export class Map<K, V> {
         return -1;
     }
 
-    public get(key: K): V {
+    public get(key: K): V | undefined {
         const index: i32 = this.indexOf(key);
         if (index == -1) {
-            throw new Error('Key not found in map');
+            return undefined;
         }
         return this._values[index];
     }

package/src/keypair/Address.ts

@@ -87,28 +87,40 @@ export class Address extends Uint8Array {
      * Check if the address is bigger than another address
      * @returns {boolean} If bigger
      */
-    public isBiggerThan(a: Address): boolean {
-        for (let i = 0; i < this.length; i++) {
-            if (this[i] < a[i]) {
-                return false;
+    public lessThan(a: Address): boolean {
+        // Compare the two addresses byte-by-byte, treating them as big-endian uint256
+        for (let i = 0; i < 32; i++) {
+            const thisByte = this[i];
+            const aByte = a[i];
+
+            if (thisByte < aByte) {
+                return true; // this is less than a
+            } else if (thisByte > aByte) {
+                return false; // this is greater than or equal to a
             }
         }
 
-        return true;
+        return false;
     }
 
     /**
      * Check if the address is smaller than another address
      * @returns {boolean} If smaller
      */
-    public isSmallerThan(a: Address): boolean {
-        for (let i = 0; i < this.length; i++) {
-            if (this[i] > a[i]) {
-                return false;
+    public greaterThan(a: Address): boolean {
+        // Compare the two addresses byte-by-byte, treating them as big-endian uint256
+        for (let i = 0; i < 32; i++) {
+            const thisByte = this[i];
+            const aByte = a[i];
+
+            if (thisByte > aByte) {
+                return true; // this is greater than a
+            } else if (thisByte < aByte) {
+                return false; // this is less than or equal to a
             }
         }
 
-        return true;
+        return false;
     }
 
     /**
@@ -127,27 +139,6 @@ export class Address extends Uint8Array {
             const buf = Buffer.alloc(32);
             buf.set(publicKey);
 
-            /*let lowByte: number = 0;
-            try {
-                EcKeyPair.tweakPublicKey('02' + buf.toString('hex'));
-                lowByte = 2;
-            } catch (e) {
-                console.log(`Invalid pubkey (2) ${e}`);
-            }
-
-            try {
-                EcKeyPair.tweakPublicKey('03' + buf.toString('hex'));
-                lowByte = 3;
-            } catch (e) {
-                console.log(`Invalid pubkey (3) ${e}`);
-            }
-
-            if (lowByte === 0) {
-                console.log(AddressGenerator.generateTaprootAddress(buf, networks.regtest));
-
-                throw new Error('Invalid public key');
-            }*/
-
             super.set(publicKey);
         } else {
             this._keyPair = EcKeyPair.fromPublicKey(Uint8Array.from(publicKey));

package/src/keypair/AddressVerificator.ts

@@ -175,6 +175,7 @@ export class AddressVerificator {
                 }
             }
         } catch (error) {
+            console.log(error);
             // Ignore errors from Bech32/Bech32m decoding
         }
 

package/src/metadata/tokens.ts

@@ -7,7 +7,6 @@ function deadAddress(): Address {
 
 // Addresses Regtest
 export const FACTORY_ADDRESS_REGTEST: Address = deadAddress();
-
 export const POOL_ADDRESS_REGTEST: Address = deadAddress();
 export const WBTC_ADDRESS_REGTEST: Address = deadAddress();
 export const MOTO_ADDRESS_REGTEST: Address = deadAddress();

package/src/utils/types.ts

@@ -8,6 +8,7 @@ export type BufferLike = Uint8Array | Buffer;
 
 export type MemorySlotData<T> = T;
 export type PointerStorage = DeterministicMap<MemorySlotPointer, MemorySlotData<bigint>>;
+export type BlockchainStorage = DeterministicMap<string, PointerStorage>;
 
 export type i32 = number;
 export type u8 = number;