Merge branch 'Guy_Network'

mx · mx · commit 23e939831766 · 2019-11-02T18:55:11.000+01:00
diff --git a/Network/Network.py b/Network/Network.py
@@ -0,0 +1,78 @@
+import socket
+import jsonpickle
+from threading import Thread
+from Node import Node
+
+class Network:
+  
+	def __init__(self, Node_):  
+		self.node = node_
+		self.nodes = []
+		self.blockchain = None
+		node.init_node()
+
+	def set_blockchain(self, blockchain_): #Done
+		self.blockchain = blockchain_
+
+	def broadcast_transaction(self, str_transaction_): #Done
+		for nodeList in self.nodes:
+			node.send("-t ", node.s, nodeList, str_transaction_)
+    
+	def broadcast_block(self, str_block_): #Done
+		for nodeList in self.nodes:
+			node.send("-b ", node.s, nodeList, str_block_)
+
+	def broadcast_ask_chain(self): #Done
+		for nodeList in self.nodes:
+			node.send("-c ", node.s, nodeList, "")
+
+	#Une fonction pour broadcast ping 
+
+	def receiv(self):
+		print("ready to receiv")
+    
+		while True:
+			data, addr = mode.s.recvfrom(1024)
+			curentNode = node(str(addr))
+
+			myData = str(data)
+
+			if myData[:3] == "-c ": #Done
+				#Retourne le JSON de la chaine
+				nodes.send("-ac", node.s, cureNode, self.blockchain.chain_for_network)
+
+			elif myData[:3] == "-n ": #Done
+				#Parcourir la liste de noeud et les envois a l'emmeteur
+				for nodeList in self.nodes:
+					nodeToSend = jsonpickle.encode(nodeList)
+					node.send("-an", node.s, cureNode, nodeToSend)
+
+			elif myData[:3] == "-t ": #Done
+				#Reception d'une transaction
+				self.blockchain.submit_block(myData[3:length(myData)])
+
+			elif myData[:3] == "-b ": #Done
+				#Reception d'un block
+				self.blockchain.submit_transaction(myData[3:length(myData)])
+
+			elif myData[:3] == "-p ": #Done
+				#Repond present 
+				nodeToSend = jsonpickle.encode(self.node)
+				node.send("-an", node, cureNode, nodeToSend)
+
+			elif myData[:3] == "-ac": #En suspend
+				some = None 
+
+			elif myData[:3] == "-an": #Done
+				node = jsonpickle.decode(myData[3:length(myData)])
+
+				notFind = True
+				for nodeList in self.nodes:
+					if nodeList.host == node.host:
+						notFind = False
+
+				if notFind:
+					self.nodes.append(node)
+					notFind = False
+		
+		c.close()
diff --git a/Network/Node.py b/Network/Node.py
@@ -0,0 +1,19 @@
+import socket
+from threading import Thread
+
+class Node:
+	def __init__(self, host_):
+		self.host = host_ #Adresse du pc
+		self.port = 5000
+		self.s = None
+
+	def init_node(self):
+		self.s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+		self.s.bind((self.host, self.port))
+
+	def ping(self, node_to_ping): 
+		send("-p ", self.s, node_to_ping, "");
+
+	def send(self, command_, s_, node_, message_):
+		server = (node_.host, node_.port) #Server 
+		self.s_.sendto(command_ + message_, servers)
diff --git a/Network/Node.pyc b/Network/Node.pyc
diff --git a/Network/test.py b/Network/test.py
@@ -0,0 +1,43 @@
+import socket
+from threading import Thread
+
+'''
+Faire la fonction de broadcast
+un tableau qui contiendra les IP des personnes du reseau et les gens qui ont deja ete connectes en p2p
+'''
+
+def Main():
+    host = '192.168.1.82' #Adresse du pc
+    port = 5000
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.bind((host,port))
+    server = ('192.168.1.82',5001) #Adresse de l'autre pc
+
+    t1 = Thread(target=receiv, args=("ready to receive", s))
+    t1.start()
+
+    message = raw_input()
+
+    while message != "q":
+
+        t2 = Thread(target=send, args=("ready to send", s, server, message))
+        t2.start()
+
+        message = raw_input()
+
+    t1._Thread__stop()
+
+def receiv(a, s):
+    
+    print(a)
+    while True:
+        data, addr = s.recvfrom(1024)
+        print (str(data))
+    c.close()
+
+def send(a_, s_, server_, message_):
+
+    s_.sendto("recu : " + message_, server_)
+
+if __name__ == '__main__':
+    Main()
diff --git a/README.md b/README.md
@@ -6,3 +6,14 @@ Work in progress. This is a toy blockchain to learn.
 
 Because: "Prior to Python 3.7, dict was not guaranteed to be ordered, so inputs and outputs were typically scrambled unless collections.OrderedDict was specifically requested. Starting with Python 3.7, the regular dict became order preserving, so it is no longer necessary to specify collections.OrderedDict for JSON generation and parsing.". Source: 
 https://docs.python.org/fr/3/library/json.html
+
+## Protocol to comunicate
+
+### Command
+	"-c " ask the blockchain to a node
+	"-ac" is an answer to the command -c
+	"-n " ask to a node his all connections
+	"-an" is an answer to the command -n or -p
+	"-t " specify that the node will receiv a transaction
+	"-b " specify that the node will receiv a block
+	"-p " it's a commande to know all the nodes in the same network
