@leofcoin/chain 1.4.43 → 1.4.44

package/exports/browser/chain.js

@@ -1,4 +1,4 @@
-import { B as BigNumber, L as Logger, v as version$1, h as hexZeroPad, i as isBigNumberish, a as arrayify, b as isBytes, C as ContractMessage, T as TransactionMessage, c as CodecHash, d as BlockMessage, e as BWMessage, f as BWRequestMessage } from './contract-32687834.js';
+import { B as BigNumber, L as Logger, v as version$1, h as hexZeroPad, i as isBigNumberish, a as arrayify, b as isBytes, C as ContractMessage, T as TransactionMessage, c as CodecHash, d as BlockMessage, e as BWMessage, f as BWRequestMessage } from './contract-f76383c3.js';
 
 const logger$1 = new Logger(version$1);
 const _constructorGuard = {};
@@ -7778,7 +7778,6 @@ class Transaction extends Protocol {
             throw new Error(`transaction not signed`);
         if (message.decoded.nonce === undefined)
             throw new Error(`nonce required`);
-        message = new TransactionMessage(message.encoded);
         try {
             await this.validateNonce(message.decoded.from, message.decoded.nonce);
             // todo check if signature is valid
@@ -8121,7 +8120,7 @@ class Chain extends Contract {
         return this;
     }
     async #invalidTransaction(hash) {
-        await transactionPoolStore.delete(hash);
+        await globalThis.transactionPoolStore.delete(hash);
         console.log(`removed invalid transaction: ${hash}`);
     }
     async #validatorTimeout(validatorInfo) {
@@ -8264,9 +8263,12 @@ class Chain extends Contract {
      * @param {Block[]} blocks
      */
     async #loadBlocks(blocks) {
+        let poolTransactionKeys = await globalThis.transactionPoolStore.keys();
         for (const block of blocks) {
             if (block && !block.loaded) {
                 for (const transaction of block.transactions) {
+                    if (poolTransactionKeys.includes(transaction.hash))
+                        await globalThis.transactionPoolStore.delete(transaction.hash);
                     try {
                         await this.#machine.execute(transaction.to, transaction.method, transaction.params);
                         if (transaction.to === nativeToken$1) {
@@ -8394,18 +8396,25 @@ class Chain extends Contract {
         transactions = transactions.sort((a, b) => a.nonce - b.nonce);
         for (let transaction of transactions) {
             const hash = await transaction.hash();
-            try {
-                const result = await this.#executeTransaction({ ...transaction.decoded, hash });
-                console.log({ result });
-                block.transactions.push({ hash, ...transaction.decoded });
-                block.fees = block.fees.add(await calculateFee(transaction.decoded));
-                await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
-            }
-            catch (e) {
-                console.log(keys.includes(hash));
-                console.log({ e });
-                console.log(hash);
+            const doubleTransaction = this.#blocks.filter(({ transaction }) => transaction.hash === hash);
+            if (doubleTransaction.length > 0) {
                 await globalThis.transactionPoolStore.delete(hash);
+                await globalThis.peernet.publish('invalid-transaction', hash);
+            }
+            else {
+                try {
+                    const result = await this.#executeTransaction({ ...transaction.decoded, hash });
+                    console.log({ result });
+                    block.transactions.push({ hash, ...transaction.decoded });
+                    block.fees = block.fees.add(await calculateFee(transaction.decoded));
+                    await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
+                }
+                catch (e) {
+                    console.log(keys.includes(hash));
+                    console.log({ e });
+                    console.log(hash);
+                    await globalThis.transactionPoolStore.delete(hash);
+                }
             }
         }
         console.log(block.transactions);
@@ -8473,7 +8482,6 @@ class Chain extends Contract {
             await Promise.all(block.transactions
                 .map(async (transaction) => globalThis.transactionPoolStore.delete(transaction.hash)));
             let blockMessage = await new BlockMessage(block);
-            blockMessage = await new BlockMessage(blockMessage.encoded);
             const hash = await blockMessage.hash();
             await globalThis.peernet.put(hash, blockMessage.encoded, 'block');
             await this.#updateState(blockMessage);
@@ -8490,7 +8498,6 @@ class Chain extends Contract {
     async #addTransaction(transaction) {
         try {
             transaction = await new TransactionMessage(transaction);
-            transaction = await new TransactionMessage(transaction.encoded);
             const hash = await transaction.hash();
             const has = await globalThis.transactionPoolStore.has(hash);
             if (!has)

package/exports/browser/{client-91364a04-ef77946f.js → client-91364a04-457da758.js}

@@ -1,5 +1,5 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-35d521b9.js';
-import './contract-32687834.js';
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-cf761de2.js';
+import './contract-f76383c3.js';
 
 function commonjsRequire(path) {
 	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');

package/exports/browser/{contract-32687834.js → contract-f76383c3.js}

@@ -4799,12 +4799,13 @@ const isUint8Array = (type) => type === 'uint8Array';
 const isBigNumber = (type) => type === 'bigNumber';
 const tokenize = (key, value) => {
     const optional = key.endsWith('?');
-    let type = value;
-    type = Array.isArray(type) ? 'array' : typeof type;
-    if (value instanceof Uint8Array)
+    let type = value === undefined ? key : value;
+    if (type instanceof Uint8Array)
         type = 'uint8Array';
-    else if (value._isBigNumber)
+    else if (type?._isBigNumber || type.isBigNumber)
         type = 'bigNumber';
+    else
+        type = Array.isArray(type) ? 'array' : typeof type;
     const parts = key.split('?');
     const minimumLength = parts[2]?.includes('min') ? parts[2].split['min:'][1] : 0;
     return { type, optional, key: parts[0], minimumLength };
@@ -4816,6 +4817,7 @@ const toType = (data) => {
     // returns the ArrayBuffer as a UintArray
     if (data instanceof ArrayBuffer)
         return new Uint8Array(data);
+    // returns the bigNumbers hex as a UintArray
     if (data._isBigNumber)
         return new TextEncoder().encode(data._hex || data.toHexString());
     // returns the string as a UintArray
@@ -4829,11 +4831,11 @@ const toType = (data) => {
         return new TextEncoder().encode(data.toString());
     throw new Error(`unsuported type ${typeof data || data}`);
 };
-const encode = (proto, input) => {
+const encode = (proto, input, compress) => {
     const keys = Object.keys(proto);
     const values = Object.values(proto);
     const set = [];
-    for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < values.length; i++) {
         const token = tokenize(keys[i], values[i]);
         const data = input[token.key];
         if (!token.optional && data === undefined)
@@ -4846,14 +4848,14 @@ const encode = (proto, input) => {
     }
     return index$5(set);
 };
-const decode = (proto, uint8Array) => {
+const decode = (proto, uint8Array, compressed) => {
     let deconcated = index$4(uint8Array);
     const output = {};
     const keys = Object.keys(proto);
     const values = Object.values(proto);
     if (keys.length !== deconcated.length)
         console.warn(`length mismatch: expected  ${keys.length} got ${uint8Array.length}`);
-    for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < values.length; i++) {
         const token = tokenize(keys[i], values[i]);
         if (isUint8Array(token.type))
             output[token.key] = deconcated[i];
@@ -5822,7 +5824,7 @@ let FormatInterface$1 = class FormatInterface extends BasicInterface$1 {
             this.fromUint8Array(buffer);
         else if (buffer instanceof ArrayBuffer)
             this.fromArrayBuffer(buffer);
-        else if (buffer instanceof FormatInterface$1 && buffer?.name === this.name)
+        else if (buffer instanceof FormatInterface && buffer?.name === this.name)
             return buffer;
         else if (typeof buffer === 'string') {
             if (this.isHex(buffer))
@@ -5964,7 +5966,7 @@ class TransactionMessage extends FormatInterface {
 
 var proto$4 = {
   address: String(),
-  reward: String()
+  reward: BigNumber.from(0)
 };
 
 class ValidatorMessage extends FormatInterface {
@@ -5981,8 +5983,8 @@ var proto$3 = {
   index: Number(),
   previousHash: String(),
   timestamp: Number(),
-  reward: String(),
-  fees: String(),
+  reward: BigNumber.from(0),
+  fees: BigNumber.from(0),
   transactions: new Uint8Array(),
   validators: new Uint8Array()
 };

package/exports/browser/{index-2c7d7136-110b02cd.js → index-2c7d7136-ba66b864.js}

@@ -1,5 +1,5 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-35d521b9.js';
-import './contract-32687834.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-cf761de2.js';
+import './contract-f76383c3.js';
 
 /**
  * @params {String} network

package/exports/browser/{messages-bcb7873b-d8249d98.js → messages-bcb7873b-22fd727d.js}

@@ -1,5 +1,5 @@
-import { F as FormatInterface } from './node-browser-35d521b9.js';
-import './contract-32687834.js';
+import { F as FormatInterface } from './node-browser-cf761de2.js';
+import './contract-f76383c3.js';
 
 var proto$b = {
     data: new Uint8Array(),

package/exports/browser/{node-browser-35d521b9.js → node-browser-cf761de2.js}

@@ -1,4 +1,4 @@
-import { C as ContractMessage, T as TransactionMessage, d as BlockMessage, e as BWMessage, f as BWRequestMessage, V as ValidatorMessage } from './contract-32687834.js';
+import { C as ContractMessage, T as TransactionMessage, d as BlockMessage, e as BWMessage, f as BWRequestMessage, V as ValidatorMessage } from './contract-f76383c3.js';
 
 var nodeConfig = async (config = {
     network: 'leofcoin:peach',
@@ -20263,7 +20263,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-2c7d7136-110b02cd.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-2c7d7136-ba66b864.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -20434,7 +20434,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-bcb7873b-d8249d98.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-bcb7873b-22fd727d.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -20506,7 +20506,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-91364a04-ef77946f.js');
+        const importee = await import('./client-91364a04-457da758.js');
         /**
          * @access public
          * @type {PeernetClient}

package/exports/browser/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-35d521b9.js';
-import './contract-32687834.js';
+export { N as default } from './node-browser-cf761de2.js';
+import './contract-f76383c3.js';

package/exports/browser/workers/block-worker.js

@@ -4732,12 +4732,13 @@ const isUint8Array = (type) => type === 'uint8Array';
 const isBigNumber = (type) => type === 'bigNumber';
 const tokenize = (key, value) => {
     const optional = key.endsWith('?');
-    let type = value;
-    type = Array.isArray(type) ? 'array' : typeof type;
-    if (value instanceof Uint8Array)
+    let type = value === undefined ? key : value;
+    if (type instanceof Uint8Array)
         type = 'uint8Array';
-    else if (value._isBigNumber)
+    else if (type?._isBigNumber || type.isBigNumber)
         type = 'bigNumber';
+    else
+        type = Array.isArray(type) ? 'array' : typeof type;
     const parts = key.split('?');
     const minimumLength = parts[2]?.includes('min') ? parts[2].split['min:'][1] : 0;
     return { type, optional, key: parts[0], minimumLength };
@@ -4749,6 +4750,7 @@ const toType = (data) => {
     // returns the ArrayBuffer as a UintArray
     if (data instanceof ArrayBuffer)
         return new Uint8Array(data);
+    // returns the bigNumbers hex as a UintArray
     if (data._isBigNumber)
         return new TextEncoder().encode(data._hex || data.toHexString());
     // returns the string as a UintArray
@@ -4762,11 +4764,11 @@ const toType = (data) => {
         return new TextEncoder().encode(data.toString());
     throw new Error(`unsuported type ${typeof data || data}`);
 };
-const encode = (proto, input) => {
+const encode = (proto, input, compress) => {
     const keys = Object.keys(proto);
     const values = Object.values(proto);
     const set = [];
-    for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < values.length; i++) {
         const token = tokenize(keys[i], values[i]);
         const data = input[token.key];
         if (!token.optional && data === undefined)
@@ -4779,14 +4781,14 @@ const encode = (proto, input) => {
     }
     return index$5(set);
 };
-const decode = (proto, uint8Array) => {
+const decode = (proto, uint8Array, compressed) => {
     let deconcated = index$4(uint8Array);
     const output = {};
     const keys = Object.keys(proto);
     const values = Object.values(proto);
     if (keys.length !== deconcated.length)
         console.warn(`length mismatch: expected  ${keys.length} got ${uint8Array.length}`);
-    for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < values.length; i++) {
         const token = tokenize(keys[i], values[i]);
         if (isUint8Array(token.type))
             output[token.key] = deconcated[i];
@@ -5755,7 +5757,7 @@ let FormatInterface$1 = class FormatInterface extends BasicInterface$1 {
             this.fromUint8Array(buffer);
         else if (buffer instanceof ArrayBuffer)
             this.fromArrayBuffer(buffer);
-        else if (buffer instanceof FormatInterface$1 && buffer?.name === this.name)
+        else if (buffer instanceof FormatInterface && buffer?.name === this.name)
             return buffer;
         else if (typeof buffer === 'string') {
             if (this.isHex(buffer))
@@ -5896,7 +5898,7 @@ class TransactionMessage extends FormatInterface {
 
 var proto$1 = {
   address: String(),
-  reward: String()
+  reward: BigNumber.from(0)
 };
 
 class ValidatorMessage extends FormatInterface {
@@ -5913,8 +5915,8 @@ var proto = {
   index: Number(),
   previousHash: String(),
   timestamp: Number(),
-  reward: String(),
-  fees: String(),
+  reward: BigNumber.from(0),
+  fees: BigNumber.from(0),
   transactions: new Uint8Array(),
   validators: new Uint8Array()
 };

package/exports/browser/workers/machine-worker.js

@@ -4732,12 +4732,13 @@ const isUint8Array = (type) => type === 'uint8Array';
 const isBigNumber = (type) => type === 'bigNumber';
 const tokenize = (key, value) => {
     const optional = key.endsWith('?');
-    let type = value;
-    type = Array.isArray(type) ? 'array' : typeof type;
-    if (value instanceof Uint8Array)
+    let type = value === undefined ? key : value;
+    if (type instanceof Uint8Array)
         type = 'uint8Array';
-    else if (value._isBigNumber)
+    else if (type?._isBigNumber || type.isBigNumber)
         type = 'bigNumber';
+    else
+        type = Array.isArray(type) ? 'array' : typeof type;
     const parts = key.split('?');
     const minimumLength = parts[2]?.includes('min') ? parts[2].split['min:'][1] : 0;
     return { type, optional, key: parts[0], minimumLength };
@@ -4749,6 +4750,7 @@ const toType = (data) => {
     // returns the ArrayBuffer as a UintArray
     if (data instanceof ArrayBuffer)
         return new Uint8Array(data);
+    // returns the bigNumbers hex as a UintArray
     if (data._isBigNumber)
         return new TextEncoder().encode(data._hex || data.toHexString());
     // returns the string as a UintArray
@@ -4762,11 +4764,11 @@ const toType = (data) => {
         return new TextEncoder().encode(data.toString());
     throw new Error(`unsuported type ${typeof data || data}`);
 };
-const encode = (proto, input) => {
+const encode = (proto, input, compress) => {
     const keys = Object.keys(proto);
     const values = Object.values(proto);
     const set = [];
-    for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < values.length; i++) {
         const token = tokenize(keys[i], values[i]);
         const data = input[token.key];
         if (!token.optional && data === undefined)
@@ -4779,14 +4781,14 @@ const encode = (proto, input) => {
     }
     return index$5(set);
 };
-const decode = (proto, uint8Array) => {
+const decode = (proto, uint8Array, compressed) => {
     let deconcated = index$4(uint8Array);
     const output = {};
     const keys = Object.keys(proto);
     const values = Object.values(proto);
     if (keys.length !== deconcated.length)
         console.warn(`length mismatch: expected  ${keys.length} got ${uint8Array.length}`);
-    for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < values.length; i++) {
         const token = tokenize(keys[i], values[i]);
         if (isUint8Array(token.type))
             output[token.key] = deconcated[i];
@@ -5755,7 +5757,7 @@ let FormatInterface$1 = class FormatInterface extends BasicInterface$1 {
             this.fromUint8Array(buffer);
         else if (buffer instanceof ArrayBuffer)
             this.fromArrayBuffer(buffer);
-        else if (buffer instanceof FormatInterface$1 && buffer?.name === this.name)
+        else if (buffer instanceof FormatInterface && buffer?.name === this.name)
             return buffer;
         else if (typeof buffer === 'string') {
             if (this.isHex(buffer))
@@ -5896,7 +5898,7 @@ class TransactionMessage extends FormatInterface {
 
 var proto$2 = {
   address: String(),
-  reward: String()
+  reward: BigNumber.from(0)
 };
 
 class ValidatorMessage extends FormatInterface {
@@ -5913,8 +5915,8 @@ var proto$1 = {
   index: Number(),
   previousHash: String(),
   timestamp: Number(),
-  reward: String(),
-  fees: String(),
+  reward: BigNumber.from(0),
+  fees: BigNumber.from(0),
   transactions: new Uint8Array(),
   validators: new Uint8Array()
 };

package/exports/chain.js

@@ -373,7 +373,6 @@ class Transaction extends Protocol {
             throw new Error(`transaction not signed`);
         if (message.decoded.nonce === undefined)
             throw new Error(`nonce required`);
-        message = new TransactionMessage(message.encoded);
         try {
             await this.validateNonce(message.decoded.from, message.decoded.nonce);
             // todo check if signature is valid
@@ -716,7 +715,7 @@ class Chain extends Contract {
         return this;
     }
     async #invalidTransaction(hash) {
-        await transactionPoolStore.delete(hash);
+        await globalThis.transactionPoolStore.delete(hash);
         console.log(`removed invalid transaction: ${hash}`);
     }
     async #validatorTimeout(validatorInfo) {
@@ -859,9 +858,12 @@ class Chain extends Contract {
      * @param {Block[]} blocks
      */
     async #loadBlocks(blocks) {
+        let poolTransactionKeys = await globalThis.transactionPoolStore.keys();
         for (const block of blocks) {
             if (block && !block.loaded) {
                 for (const transaction of block.transactions) {
+                    if (poolTransactionKeys.includes(transaction.hash))
+                        await globalThis.transactionPoolStore.delete(transaction.hash);
                     try {
                         await this.#machine.execute(transaction.to, transaction.method, transaction.params);
                         if (transaction.to === nativeToken) {
@@ -989,18 +991,25 @@ class Chain extends Contract {
         transactions = transactions.sort((a, b) => a.nonce - b.nonce);
         for (let transaction of transactions) {
             const hash = await transaction.hash();
-            try {
-                const result = await this.#executeTransaction({ ...transaction.decoded, hash });
-                console.log({ result });
-                block.transactions.push({ hash, ...transaction.decoded });
-                block.fees = block.fees.add(await calculateFee(transaction.decoded));
-                await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
-            }
-            catch (e) {
-                console.log(keys.includes(hash));
-                console.log({ e });
-                console.log(hash);
+            const doubleTransaction = this.#blocks.filter(({ transaction }) => transaction.hash === hash);
+            if (doubleTransaction.length > 0) {
                 await globalThis.transactionPoolStore.delete(hash);
+                await globalThis.peernet.publish('invalid-transaction', hash);
+            }
+            else {
+                try {
+                    const result = await this.#executeTransaction({ ...transaction.decoded, hash });
+                    console.log({ result });
+                    block.transactions.push({ hash, ...transaction.decoded });
+                    block.fees = block.fees.add(await calculateFee(transaction.decoded));
+                    await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
+                }
+                catch (e) {
+                    console.log(keys.includes(hash));
+                    console.log({ e });
+                    console.log(hash);
+                    await globalThis.transactionPoolStore.delete(hash);
+                }
             }
         }
         console.log(block.transactions);
@@ -1068,7 +1077,6 @@ class Chain extends Contract {
             await Promise.all(block.transactions
                 .map(async (transaction) => globalThis.transactionPoolStore.delete(transaction.hash)));
             let blockMessage = await new BlockMessage(block);
-            blockMessage = await new BlockMessage(blockMessage.encoded);
             const hash = await blockMessage.hash();
             await globalThis.peernet.put(hash, blockMessage.encoded, 'block');
             await this.#updateState(blockMessage);
@@ -1085,7 +1093,6 @@ class Chain extends Contract {
     async #addTransaction(transaction) {
         try {
             transaction = await new TransactionMessage(transaction);
-            transaction = await new TransactionMessage(transaction.encoded);
             const hash = await transaction.hash();
             const has = await globalThis.transactionPoolStore.has(hash);
             if (!has)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.43",
+  "version": "1.4.44",
   "description": "Official javascript implementation",
   "exports": {
     "./node": "./exports/node.js",