modif code + readme

README.md

-# blockchain-project
+# Projet Blockchain
 
+Ce projet a été réalisé par Jérémy BRODIER et Corentin SAINT-DIZIER, deux étudiants issus de la promotion 2023/2024 du Master 2 MIAGE SID.
 
+Dans le cadre du cours de blockchain, nous avions pour projet de réaliser une blockchain sur le même fonctionnement de la blockchain bitcoin.
 
-## Getting started
 
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+## Conception 
 
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+Avant de passer à la réalisation et au développement de la blockchain, il a été tout d'abord important de comprendre l'orchestration d'une blockchain.
 
-## Add your files
+Pour se faire, nous avons décidé de représenter les différentes entités d'une blockchain en différentes classes : 
 
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+    -  Une classe Blockchain, représentant la blockchain dans sa globalité;
+    -  Une classe Bloc, représentant les blocs contenues dans la blockchain;
+    -  Une classe Transaction, représentant une transaction qui sera contenu dans un bloc;
+    -  Une classe Coinbase, qui hérite de Transaction, cette classe va représenter une transaction coinbase dans un bloc;
+    -  Une classe UTxO, représentant le détails des tranasactions
+    -  Une classe Wallet représentant un wallet enregistré sur la blockchain
 
-```
-cd existing_repo
-git remote add origin https://gitlab.univ-lorraine.fr/corentin.saint-dizier1/blockchain-project.git
-git branch -M main
-git push -uf origin main
-```
 
-## Integrate with your tools
+    TODO : METTRE DIAGRAMME DE CLASSE
 
-- [ ] [Set up project integrations](https://gitlab.univ-lorraine.fr/corentin.saint-dizier1/blockchain-project/-/settings/integrations)
+## Réalisation
 
-## Collaborate with your team
+### Blockchain
 
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+Concernant notre blockchain, nous avons décidé de la représenté par une liste chainé `LinkedList` de bloc. Cela nous permet de garder un lien de précédence entre les différents blocs.
 
-## Test and Deploy
+De plus, nous avons décidé d'y intégrer un `Set` d'UTxO, ce set va tout d'abord nous permettre d'avoir que des UTxO unique au sein du Set, cela va éviter d'avoir des UTx0 qui n'appartiennent à personne. Mais la principale utilité de ce Set et d'y référencer tous les UTx0 disponible pour une transaction. 
+Plus précisément, lors d'une transaction, les UTx0 outputs de cette dernière seront inséré dans le Set et les UTx0 inputs seront supprimer de ce Set.
 
-Use the built-in continuous integration in GitLab.
 
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
+### Transaction
 
-***
+Une transaction est identifé par : 
 
-# Editing this README
+    - Un ID de transaction;
+    - Un wallet de provenance et un wallet de destination; 
+    - Une liste d'UTxO inputs et une liste d'UTxO outputs;
+    - D'une signature
 
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
+Au sein de notre blockchain, pour simuler la création d'une transaction, notre programme va éxéuter la suite d'instruction suivante : 
 
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
+    1) Sélection d'un wallet de provenance et d'un wallet de destination de façon aléatoire
+    2) Séléction d'un montant à envoyer 
+    3) Signature de la transaction par le wallet de provenance
+    4) Vérification de la signature
+    5) Création de la transaction
 
-## Name
-Choose a self-explaining name for your project.
+Une fois les transactions crées nous pouvons passer au minage d'un bloc....
 
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
 
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.

src/main/java/fr/miage/Blockchain.java

@@ -45,7 +45,7 @@ public class Blockchain {
 
     // Permet de créer une transaction avec deux wallets aléatoire et de l'ajouter
     // dans la transaction pool;
-    public void createTrasaction() {
+    public void createTransaction() {
         List<Wallet> walletsCopy = new ArrayList<>();
         walletsCopy.addAll(wallets);
         Wallet walletSender = selectWallet(walletsCopy);
@@ -58,6 +58,7 @@ public class Blockchain {
             System.out.println("Wallets vides");
             return;
         }
+        
         System.out.println("[TRANSACTION] --- Création d'une transaction =========================================\n");
         System.out.println("            " + walletSender.getName() + " envoie " + randomAmountToSend + " à "
                 + walletReceiver.getName() + "\n");

src/main/java/fr/miage/blocs/Bloc.java

 package fr.miage.blocs;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.OptionalDouble;
 import java.util.Random;
-import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.codec.digest.DigestUtils;
@@ -15,7 +10,6 @@ import org.apache.commons.codec.digest.DigestUtils;
 import fr.miage.Blockchain;
 import fr.miage.Coinbase;
 import fr.miage.EnumTypeTransaction;
-import fr.miage.MinageManager;
 import fr.miage.Transaction;
 import fr.miage.UTxO;
 import fr.miage.Wallet;
@@ -23,10 +17,8 @@ import fr.miage.Wallet;
 public class Bloc {
     private String hash;
     private List<Transaction> transactions; // transaction à insérer dans le bloc
-    // private String header; // Contient le nonce et le hash du bloc précédent
     private String previousHash;
     private long time;
-    // private String transactionsInfo;
     private int nonce;
     private Coinbase coinbase;
 

src/main/java/fr/miage/threads/TransactionCreator.java

@@ -15,7 +15,7 @@ public class TransactionCreator extends Thread {
 
     public void run() {
         while (true) {
-            blockchain.createTrasaction();
+            blockchain.createTransaction();
             System.out.println(
                     "[POOL] Nombre de transaction dans la pool : " + Blockchain.transactionsPool.size() + "\n");
             try {