No commit message

mlibre · Mar 29, 2024 · ace6249 · ace6249
1 parent 2a91acb
commit ace6249
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/assets/bruno/goodchain/block/add.bru b/assets/bruno/goodchain/block/add.bru
@@ -12,7 +12,7 @@ post {
 
 body:json {
   {
-    "index": 5,
+    "index": 4,
     "chainName": "GoodChain",
     "timestamp": 1707760793668,
     "transactions": [

diff --git a/library/chain.js b/library/chain.js
@@ -12,14 +12,18 @@ class ChainStore
 		createFolder( this.folderPath );
 	}
 
-	push ( block )
+	get length ()
 	{
-		fs.writeFileSync( `${this.blockFilePath( block.index )}.json`, JSON.stringify( block, null, "\t" ) );
+		return fs.readdirSync( this.folderPath ).length;
 	}
 
-	get length ()
+	get all ()
 	{
-		return fs.readdirSync( this.folderPath ).length;
+		return fs.readdirSync( this.folderPath ).map( ( fileName ) =>
+		{
+			const filePath = path.join( this.folderPath, fileName );
+			return JSON.parse( fs.readFileSync( filePath ) );
+		});
 	}
 
 	get ( blockNumber )
@@ -58,6 +62,19 @@ class ChainStore
 		return JSON.parse( fs.readFileSync( this.blockFilePath( lastFile ) ) );
 	}
 
+	push ( block )
+	{
+		fs.writeFileSync( `${this.blockFilePath( block.index )}.json`, JSON.stringify( block, null, "\t" ) );
+	}
+
+	replaceBlocks ( blocks )
+	{
+		for ( const block of blocks )
+		{
+			this.push( block );
+		}
+	}
+
 	lastTwoBlocks ()
 	{
 		const lastBlock = this.latestBlock

diff --git a/library/main.js b/library/main.js
@@ -136,10 +136,17 @@ class Blockchain
 
 	replaceChain ( newChain )
 	{
-		this.chain = newChain;
-		updateFile( this.filePath, this.chain )
-		this.wallet.reCalculateWallet( this.chain )
-		return newChain
+		try
+		{
+			this.chain.replaceBlocks( newChain );
+			this.wallet.reCalculateWallet( this.chain )
+		}
+		catch ( error )
+		{
+			this.db.reset()
+			this.wallet.reloadDB()
+		}
+		return this.chain.all
 	}
 
 	addBlocks ( blocks )

diff --git a/restAPI/routes/chain.js b/restAPI/routes/chain.js
@@ -6,7 +6,7 @@ const { isEqualBlock } = require( "../utils" )
 
 router.get( "/", function ( req, res, next )
 {
-	res.send( blockchain.chain );
+	res.send( blockchain.chain.all );
 });
 
 router.post( "/update", async function ( req, res, next )