push

BroProgramerWeb3 · Dec 29, 2023 · 85bb70e · 85bb70e
1 parent c8aecd2
commit 85bb70e
Show file tree

Hide file tree

Showing 19 changed files with 276 additions and 26 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/.DS_Store b/client/.DS_Store
diff --git a/client/dist/index.764980e3.js b/client/dist/index.764980e3.js
diff --git a/client/dist/index.764980e3.js.map b/client/dist/index.764980e3.js.map
diff --git a/client/dist/index.7f1e2dce.css b/client/dist/index.7f1e2dce.css
diff --git a/client/dist/index.7f1e2dce.css.map b/client/dist/index.7f1e2dce.css.map
diff --git a/client/dist/index.html b/client/dist/index.html
@@ -1,9 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+<head><link rel="stylesheet" href="/index.7f1e2dce.css">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Document</title>
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="">
+    <link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@300&display=swap" rel="stylesheet">
 </head>
 <body>
     <div id="root"></div>

diff --git a/client/dist/logo.470e437a.png b/client/dist/logo.470e437a.png
diff --git a/client/src/.DS_Store b/client/src/.DS_Store
diff --git a/client/src/asset/logo.png b/client/src/asset/logo.png
diff --git a/client/src/components/App.js b/client/src/components/App.js
@@ -1,5 +1,6 @@
 import React, { Component } from "react";
 import Blocks from './Blocks';
+import logo from '../asset/logo.png'
 
 class App extends Component {
     state = { walletInfo: {}};
@@ -15,9 +16,12 @@ class App extends Component {
         const { address, balance } = this.state.walletInfo;
         return (
             <div>
+                <img className='logo' src={logo}></img>
+                <br />
                 <div>
                     Welcome to the blockchain...
                 </div>
+                <br />
                 <div>Address: {address}</div>
                 <div>Balance: {balance}</div>
                 <br />

diff --git a/client/src/components/index.css b/client/src/components/index.css
@@ -0,0 +1,13 @@
+body {
+    background-color: #4444;
+    color: #fff;
+    text-align: center;
+    font-size: 20px;
+    font-family: 'Quicksand';
+    padding-top: 5%;
+}
+
+.logo {
+    width: 250px;
+    height: 250px;
+}
diff --git a/client/src/index.html b/client/src/index.html
@@ -4,6 +4,11 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Document</title>
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@300&display=swap" rel="stylesheet">
 </head>
 <body>
     <div id="root"></div>

diff --git a/client/src/index.js b/client/src/index.js
@@ -2,6 +2,7 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
 import App from './components/App';
+import './components/index.css';
 
 // Using createRoot to create a root for rendering, passing the target root element
 const root = createRoot(document.getElementById('root'));

diff --git a/index.js b/index.js
@@ -105,6 +105,45 @@ const syncWithRootState = () => {
   });
 };
 
+const walletFoo = new Wallet();
+const walletBar = new Wallet();
+
+const generateWalletTransaction = ({ wallet, recipient, amount }) => {
+  const transaction = wallet.createTransaction({
+    recipient, amount, chain: blockchain.chain
+  });
+
+  transactionPool.setTransaction(transaction);
+};
+
+const walletAction = () => generateWalletTransaction({
+  wallet, recipient: walletFoo.publicKey, amount: 5
+});
+
+const walletFooAction = () => generateWalletTransaction({
+  wallet: walletFoo, recipient: walletBar.publicKey, amount: 10
+});
+
+const walletBarAction = () => generateWalletTransaction({
+  wallet: walletBar, recipient: wallet.publicKey, amount: 15
+});
+
+for (let i=0; i<10; i++) {
+  if (i%3 === 0) {
+    walletAction();
+    walletFooAction();
+  } else if (i%3 === 1) {
+    walletAction();
+    walletBarAction();
+  } else {
+    walletFooAction();
+    walletBarAction();
+  }
+
+  transactionMiner.mineTransactions();
+}
+
+
 let PEER_PORT;
 
 if (process.env.GENERATE_PEER_PORT === 'true') {