No commit message

assets/keys/miner.json

@@ -1,5 +1,5 @@
 {
-	"publicKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAaix8hwAcEhpuYg+Mjcb2TdzAfr2pQqMPT5+zqCwGrRU=\n-----END PUBLIC KEY-----\n",
-	"privateKey": "-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEIGHnA5XP1UNWPIJXgSf2R84ZzicGESUG2xPGXKjFyy1Q\n-----END PRIVATE KEY-----\n",
-	"publicKeyString": "MCowBQYDK2VwAyEAaix8hwAcEhpuYg+Mjcb2TdzAfr2pQqMPT5+zqCwGrRU=\n"
+	"publicKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAhyP0w4jZGRf3Ffov7TDGlMIYe5SGZ+ofO+VzCCxz+M4=\n-----END PUBLIC KEY-----\n",
+	"privateKey": "-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEIFvJp8GFrfqa9US55EkrqhgF+pDdty2BieIHnkeIhvc5\n-----END PRIVATE KEY-----\n",
+	"publicKeyString": "MCowBQYDK2VwAyEAhyP0w4jZGRf3Ffov7TDGlMIYe5SGZ+ofO+VzCCxz+M4=\n"
 }

assets/keys/user.json

@@ -1,5 +1,5 @@
 {
-	"publicKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAUEsB5UeZFR/OHNDLFjGMN/gcJ6u9gs1Rx6diNimhD80=\n-----END PUBLIC KEY-----\n",
-	"privateKey": "-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEICFfkDwB+8SKdN9ZnYYZ6tTFytxRW6EP+/Mu+ECnsCev\n-----END PRIVATE KEY-----\n",
-	"publicKeyString": "MCowBQYDK2VwAyEAUEsB5UeZFR/OHNDLFjGMN/gcJ6u9gs1Rx6diNimhD80=\n"
+	"publicKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAeih1vk1WjEOdJ7FLffnU432Pm1rS8zmW4hl8T0wIco8=\n-----END PUBLIC KEY-----\n",
+	"privateKey": "-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEIAHfKeAY8PNy8GYthLziLqEyrRChfTFSxcWhgtzf3DMl\n-----END PRIVATE KEY-----\n",
+	"publicKeyString": "MCowBQYDK2VwAyEAeih1vk1WjEOdJ7FLffnU432Pm1rS8zmW4hl8T0wIco8=\n"
 }

library/chain.js

@@ -15,6 +15,11 @@ class ChainStore
 		fs.writeFileSync( this.folderPath + block.index, JSON.stringify( block, null, "\t" ) );
 	}
 
+	get length ()
+	{
+		return fs.readdirSync( this.folderPath ).length;
+	}
+
 	checkDB ( proposedBlock )
 	{
 		const [ lastBlock, secondLastBlock ] = [ this.get( proposedBlock.index - 1 ), this.get( proposedBlock.index - 2 ) ];
@@ -36,6 +41,12 @@ class ChainStore
 		return JSON.parse( fs.readFileSync( this.blockFilePath( blockNumber ) ) );
 	}
 
+	lastBlock ()
+	{
+		const files = fs.readdirSync( this.folderPath );
+		const lastFile = files.sort().pop();
+		return JSON.parse( fs.readFileSync( this.blockFilePath( lastFile ) ) );
+	}
 	lastTwoBlocks ()
 	{
 		const files = fs.readdirSync( this.folderPath );

library/db-git.js

@@ -5,6 +5,7 @@
 
 
 const { execSync } = require( "child_process" );
+const { createFolder } = require( "./utils" );
 
 class GitDatabase
 {
@@ -20,21 +21,16 @@ class GitDatabase
 		// };
 		// this.git = simpleGit( options );
 		// this.git.clean( simpleGit.CleanOptions.FORCE )
+		this.repoPath = repoPath;
 		this.initGitRepo( repoPath );
 	}
 
-	initGitRepo ( folderPath )
+	initGitRepo ( )
 	{
-		try
-		{
-			const output = execSync( "git init .", { cwd: folderPath }).toString();
-			console.log( "Git repository initialized ", output );
-		}
-		catch ( error )
-		{
-			console.error( `Failed to initialize Git repository in ${folderPath}:`, error );
-		}
-	  }
+		createFolder( this.repoPath );
+		const output = execSync( "git init .", { cwd: this.repoPath }).toString();
+		console.log( "Git repository initialized ", output );
+	}
 
 	async commit ( blockNumber )
 	{

library/main.js

@@ -67,7 +67,6 @@ class Blockchain
 	{
 		Block.verify( block, this.latestBlock )
 		this.consensus.validate( block, this.latestBlock );
-		this.simulateTransactions( block.transactions )
 		return true
 	}
 

library/utils.js

@@ -63,6 +63,31 @@ exports.deleteFile = function ( filePath )
 	}
 }
 
+exports.recreateFolder = function ( folderPath )
+{
+	if ( fs.existsSync( folderPath ) )
+	{
+		fs.rmdirSync( folderPath, { recursive: true });
+		console.log( `Folder ${folderPath} Deleted` );
+	}
+	fs.mkdirSync( folderPath );
+	console.log( `Folder ${folderPath} Created` );
+}
+
+exports.createFolder = function ( folderPath )
+{
+	if ( !fs.existsSync( folderPath ) )
+	{
+		fs.mkdirSync( folderPath );
+		console.log( `Folder ${folderPath} Created` );
+	}
+	else
+	{
+		console.log( `Folder ${folderPath} already exists` );
+		return false;
+	}
+}
+
 exports.uuid = function ()
 {
 	return uuidv4();

library/wallet.js

@@ -26,15 +26,15 @@ class Wallet
 			const trx = new Transaction( tmpTrx );
 			if ( trx.isCoinBase( ) )
 			{
-				this.wallet.addBalance( trx.to, trx.amount );
+				this.addBalance( trx.to, trx.amount );
 				continue
 			}
-			this.wallet.minusBalance( trx.from, trx.amount + trx.fee );
-			this.wallet.incrementTN( trx.from );
-			this.wallet.addBalance( trx.to, trx.amount );
+			this.minusBalance( trx.from, trx.amount + trx.fee );
+			this.incrementTN( trx.from );
+			this.addBalance( trx.to, trx.amount );
 		}
-		this.wallet.blockNumber = this.wallet.blockNumber + 1
-		this.wallet.updateDB()
+		this.wallet.blockNumber = ( this.wallet.blockNumber || -1 ) + 1
+		this.updateDB()
 		return transactionList;
 	}
 

main.js

@@ -3,18 +3,18 @@ const Transaction = require( "./library/transactions" )
 const Consensus = require( "./library/pow-consensus" );
 const consensus = new Consensus()
 
-const { deleteFile, initJsonFile, createKeyPair } = require( "./library/utils" )
-deleteFile( "./assets/db/blockchain.json" );
-deleteFile( "./assets/db/wallets.json" );
-deleteFile( "./assets/db/nodes.json" );
+const { deleteFile, recreateFolder, initJsonFile, createKeyPair } = require( "./library/utils" )
+recreateFolder( "./assets/db/chain/" );
+deleteFile( "./assets/db/wallet/wallet.json" );
+deleteFile( "./assets/db/nodes/nodes.json" );
 deleteFile( "./assets/keys/miner.json" );
 deleteFile( "./assets/keys/user.json" );
 
 const userKeys = initJsonFile( "./assets/keys/user.json", createKeyPair() );
 const minerKeys = initJsonFile( "./assets/keys/miner.json", createKeyPair() );
 const blockchain = new Blockchain({
 	dbFolderPath: "./assets/db/",
-	chainFolderPath: "./assets/db/chain/chain.json",
+	chainFolderPath: "./assets/db/chain/",
 	walletFilePath: "./assets/db/wallet/wallet.json",
 	nodes: {
 		filePath: "./assets/db/nodes/nodes.json",