@leofcoin/chain 1.4.40 → 1.4.42

package/exports/browser/chain.js

@@ -7778,6 +7778,7 @@ 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
@@ -8082,6 +8083,7 @@ class Chain extends Contract {
         await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
         globalThis.peernet.subscribe('add-block', this.#addBlock.bind(this));
+        globalThis.peernet.subscribe('invalid-transaction', this.#invalidTransaction.bind(this));
         globalThis.peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
         globalThis.peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
         globalThis.pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
@@ -8118,6 +8120,10 @@ class Chain extends Contract {
         globalThis.globalThis.pubsub.publish('chain:ready', true);
         return this;
     }
+    async #invalidTransaction(hash) {
+        await transactionPoolStore.delete(hash);
+        console.log(`removed invalid transaction: ${hash}`);
+    }
     async #validatorTimeout(validatorInfo) {
         setTimeout(() => {
             this.#jail.splice(this.#jail.indexOf(validatorInfo.address), 1);
@@ -8180,7 +8186,7 @@ class Chain extends Contract {
         await Promise.all(pool.map(async ({ hash }) => {
             const result = await globalThis.peernet.get(hash);
             const node = await new TransactionMessage(result);
-            await globalThis.transactionPoolStore.put(hash, node.encoded);
+            await globalThis.transactionPoolStore.put(await node.hash(), node.encoded);
         }));
         if (pool.length > 0)
             this.#runEpoch();
@@ -8292,6 +8298,7 @@ class Chain extends Contract {
         }
         catch (error) {
             console.log({ error });
+            globalThis.peernet.pubsub.publish('invalid-transaction', hash);
             globalThis.pubsub.publish(`transaction.completed.${hash}`, { status: 'fail', hash, error: error });
             throw { error, hash, from, to, params, nonce };
         }
@@ -8483,6 +8490,7 @@ 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-de444350-a666f9b6.js → client-91364a04-ef77946f.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-bd6a5de3.js';
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-35d521b9.js';
 import './contract-32687834.js';
 
 function commonjsRequire(path) {

package/exports/browser/{index-712688fc-ad40bdec.js → index-2c7d7136-110b02cd.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-bd6a5de3.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-35d521b9.js';
 import './contract-32687834.js';
 
 /**

package/exports/browser/{messages-3f370680-fb7e5b5b.js → messages-bcb7873b-d8249d98.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-bd6a5de3.js';
+import { F as FormatInterface } from './node-browser-35d521b9.js';
 import './contract-32687834.js';
 
 var proto$b = {

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

@@ -20263,7 +20263,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-712688fc-ad40bdec.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-2c7d7136-110b02cd.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-3f370680-fb7e5b5b.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-bcb7873b-d8249d98.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-de444350-a666f9b6.js');
+        const importee = await import('./client-91364a04-ef77946f.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -20517,7 +20517,7 @@ class Peernet {
     }
     #peerLeft(peer) {
         for (const [id, _peer] of Object.entries(this.#connections)) {
-            if (peer.id === peer.id) {
+            if (_peer.id === peer.id) {
                 delete this.#connections[id];
                 this.removePeer(_peer);
             }

package/exports/browser/node-browser.js

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

package/exports/chain.js

@@ -373,6 +373,7 @@ 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
@@ -677,6 +678,7 @@ class Chain extends Contract {
         await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
         globalThis.peernet.subscribe('add-block', this.#addBlock.bind(this));
+        globalThis.peernet.subscribe('invalid-transaction', this.#invalidTransaction.bind(this));
         globalThis.peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
         globalThis.peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
         globalThis.pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
@@ -713,6 +715,10 @@ class Chain extends Contract {
         globalThis.globalThis.pubsub.publish('chain:ready', true);
         return this;
     }
+    async #invalidTransaction(hash) {
+        await transactionPoolStore.delete(hash);
+        console.log(`removed invalid transaction: ${hash}`);
+    }
     async #validatorTimeout(validatorInfo) {
         setTimeout(() => {
             this.#jail.splice(this.#jail.indexOf(validatorInfo.address), 1);
@@ -775,7 +781,7 @@ class Chain extends Contract {
         await Promise.all(pool.map(async ({ hash }) => {
             const result = await globalThis.peernet.get(hash);
             const node = await new TransactionMessage(result);
-            await globalThis.transactionPoolStore.put(hash, node.encoded);
+            await globalThis.transactionPoolStore.put(await node.hash(), node.encoded);
         }));
         if (pool.length > 0)
             this.#runEpoch();
@@ -887,6 +893,7 @@ class Chain extends Contract {
         }
         catch (error) {
             console.log({ error });
+            globalThis.peernet.pubsub.publish('invalid-transaction', hash);
             globalThis.pubsub.publish(`transaction.completed.${hash}`, { status: 'fail', hash, error: error });
             throw { error, hash, from, to, params, nonce };
         }
@@ -1078,6 +1085,7 @@ 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.40",
+  "version": "1.4.42",
   "description": "Official javascript implementation",
   "exports": {
     "./node": "./exports/node.js",