WIP
This commit is contained in:
Oskar Thoren
parent
bfe68e53f6
commit
73f2bfd55c
|
|
@ -0,0 +1,133 @@
|
|||
from web3 import Web3, HTTPProvider
|
||||
from threading import Thread
|
||||
import time, sys
|
||||
|
||||
# Constant
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
#host = 'http://localhost:8545'
|
||||
|
||||
# XXX
|
||||
a_keyPair = "0x57083392b29bdf24512c93cfdf45d38c87d9d882da3918c59f4406445ea976a4"
|
||||
b_keyPair= "0x7b5c5af9736d9f1773f2020dd0fef0bc3c8aeaf147d2bf41961e766588e086e7"
|
||||
|
||||
# Derived, used for addressing
|
||||
a_pubKey = "0x04d94a1a01872b598c7cdc5aca2358d35eb91cd8a91eaea8da277451bb71d45c0d1eb87a31ea04e32f537e90165c870b3e115a12438c754d507ac75bddd6ecacd5"
|
||||
b_pubKey = "0x04ff921ddf78b5ed4537402f59a150caf9d96a83f2a345a1ddf9df12e99e7778f314c9ca72e8285eb213af84f5a7b01aabb62c67e46657976ded6658e1b9e83c73"
|
||||
|
||||
#(def discovery-topic "0xf8946aac")
|
||||
topic="0xf8946aac"
|
||||
#topic = '0x00000000'
|
||||
|
||||
# API
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
# XXX: Hacky
|
||||
def newKeyPair():
|
||||
raw_keyPair = web3.shh.newKeyPair()
|
||||
keyPair = "0x" + raw_keyPair
|
||||
return keyPair
|
||||
|
||||
# privateKeyID - String: ID of private (asymmetric) key for message decryption.
|
||||
def pollFilter(topic, keyPair):
|
||||
kId = web3.shh.addPrivateKey(keyPair)
|
||||
pubKey = web3.shh.getPublicKey(kId)
|
||||
print("***PUBKEY", pubKey)
|
||||
myFilter = web3.shh.newMessageFilter({'topic': topic,
|
||||
'privateKeyID': kId})
|
||||
myFilter.poll_interval = 600;
|
||||
return myFilter
|
||||
|
||||
def sendMessage(address_to, topic, msg):
|
||||
#print("address_to", address_to)
|
||||
web3.shh.post({
|
||||
'pubKey': address_to,
|
||||
'topic': topic,
|
||||
'powTarget': 2.01,
|
||||
'powTime': 2,
|
||||
'ttl': 10,
|
||||
'payload': web3.toHex(text=msg)
|
||||
});
|
||||
|
||||
def getMessages(myFilter):
|
||||
filterID = myFilter.filter_id
|
||||
retreived_messages = web3.shh.getMessages(filterID)
|
||||
|
||||
for i in range(0, len(retreived_messages)):
|
||||
#print(retreived_messages[i]['payload'])
|
||||
print("\nRECV " + retreived_messages[i]['payload'].decode("utf-8"))
|
||||
#print(retreived_messages[i])
|
||||
|
||||
# Run
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
class Daemon:
|
||||
def __init__(self):
|
||||
self.id = "x"
|
||||
|
||||
def run(self):
|
||||
while True:
|
||||
#sendMessage(address_to, topic, "hello")
|
||||
getMessages(myFilter)
|
||||
#print("tick")
|
||||
time.sleep(1)
|
||||
|
||||
# Args
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
if len(sys.argv) < 2:
|
||||
print("Missing argument")
|
||||
sys.exit(0)
|
||||
|
||||
node = sys.argv[1]
|
||||
|
||||
# what
|
||||
oskar="0x04d94a1a01872b598c7cdc5aca2358d35eb91cd8a91eaea8da277451bb71d45c0d1eb87a31ea04e32f537e90165c870b3e115a12438c754d507ac75bddd6ecacd5"
|
||||
# contact code
|
||||
#oskar="0x04cfc3a0f6c1cb824823164603959c639f99680485da2446dc316969faca00421b20dba3996bf99b8b5db7745eace60545a77e54784e91e440aa1af931161de3a6"
|
||||
|
||||
if(node == "a"):
|
||||
print("a")
|
||||
keyPair = a_keyPair
|
||||
# XXX: Seems weird, should be b_pubkey?
|
||||
#address_to = oskar
|
||||
address_to = a_pubKey # Works
|
||||
#address_to = b_pubKey
|
||||
host = "http://localhost:8500"
|
||||
elif(node == "b"):
|
||||
print("b")
|
||||
keyPair = b_keyPair
|
||||
#address_to = oskar
|
||||
# XXX
|
||||
#address_to = a_pubKey
|
||||
address_to = b_pubKey
|
||||
#address_to = a_pubKey
|
||||
host = "http://localhost:8500"
|
||||
#host = "http://localhost:8501"
|
||||
else:
|
||||
print("Unknown node")
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
# Connection
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
print("host", host)
|
||||
web3 = Web3(HTTPProvider(host))
|
||||
from web3.shh import Shh
|
||||
Shh.attach(web3, "shh")
|
||||
|
||||
#kId = web3.shh.addPrivateKey(keyPair)
|
||||
#pubKey = web3.shh.getPublicKey(kId)
|
||||
|
||||
# A sending messages to B and B then checking
|
||||
|
||||
# keyPair used for decryption
|
||||
print("keyPair for filter", keyPair)
|
||||
myFilter = pollFilter(topic, keyPair)
|
||||
|
||||
# Take address_to and filter as args?
|
||||
threads = []
|
||||
daemon = Thread(target=Daemon().run())
|
||||
threads.append(daemon)
|
||||
daemon.start()
|
||||
|
|
@ -0,0 +1,116 @@
|
|||
from web3 import Web3, HTTPProvider
|
||||
from web3.shh import Shh
|
||||
import random
|
||||
|
||||
# XXX use these
|
||||
a_keyPair = "0x57083392b29bdf24512c93cfdf45d38c87d9d882da3918c59f4406445ea976a4"
|
||||
b_keyPair= "0x7b5c5af9736d9f1773f2020dd0fef0bc3c8aeaf147d2bf41961e766588e086e7"
|
||||
|
||||
# Derived, used for addressing
|
||||
a_pubKey = "0x04d94a1a01872b598c7cdc5aca2358d35eb91cd8a91eaea8da277451bb71d45c0d1eb87a31ea04e32f537e90165c870b3e115a12438c754d507ac75bddd6ecacd5"
|
||||
b_pubKey = "0x04ff921ddf78b5ed4537402f59a150caf9d96a83f2a345a1ddf9df12e99e7778f314c9ca72e8285eb213af84f5a7b01aabb62c67e46657976ded6658e1b9e83c73"
|
||||
|
||||
|
||||
# XXX: This assumes a node is actually running - shell out to boot geth?
|
||||
# At least error if proc not running
|
||||
class WhisperNodeHelper():
|
||||
def __init__(self):
|
||||
# XXX: Whisper specific, but this host should be unique per node
|
||||
self.host = "http://localhost:8500"
|
||||
web3 = Web3(HTTPProvider(host))
|
||||
Shh.attach(web3, "shh")
|
||||
|
||||
self.topic="0xf8946aac" # discovery-topic
|
||||
|
||||
self.keyPair = "XXX"
|
||||
self.myFilter = self.pollFilter(self.topic, self.keyPair)
|
||||
|
||||
# XXX: Prune this
|
||||
self.nodes = []
|
||||
self.time = 0
|
||||
self.queue = {}
|
||||
self.peers = {}
|
||||
# Global network reliability
|
||||
self.reliability = 1 # 0.95? Dunno.
|
||||
|
||||
def poll_filter(self, topic, keyPair):
|
||||
# XXX: Doesn't belong here
|
||||
kId = web3.shh.addPrivateKey(keyPair)
|
||||
pubKey = web3.shh.getPublicKey(kId)
|
||||
#print("***PUBKEY", pubKey)
|
||||
myFilter = web3.shh.newMessageFilter({'topic': topic,
|
||||
'privateKeyID': kId})
|
||||
# Purpose of this if we do getMessages?
|
||||
myFilter.poll_interval = 600;
|
||||
return myFilter
|
||||
|
||||
def tick(self):
|
||||
myFilter = "XXX"
|
||||
filterID = myFilter.filter_id
|
||||
retreived_messages = web3.shh.getMessages(filterID)
|
||||
|
||||
# TODO: Deal with these messages similar to simulation
|
||||
# receiver.on_receive(sender, msg)
|
||||
for i in range(0, len(retreived_messages)):
|
||||
#print(retreived_messages[i]['payload'])
|
||||
print("\nRECV " + retreived_messages[i]['payload'].decode("utf-8"))
|
||||
#print(retreived_messages[i])
|
||||
#print ""
|
||||
print("tick", self.time + 1)
|
||||
#print "-----------"
|
||||
for n in self.nodes:
|
||||
n.tick()
|
||||
self.time += 1
|
||||
|
||||
# NetworkSim stub
|
||||
# def tick(self):
|
||||
# if self.time in self.queue:
|
||||
# # XXX: Should sender be here?
|
||||
# for sender, receiver, msg in self.queue[self.time]:
|
||||
# if random.random() < self.reliability:
|
||||
# #print "*** message ok", sender.name, "->", receiver.name
|
||||
# receiver.on_receive(sender, msg)
|
||||
# #else:
|
||||
# #print "*** message dropped", sender.name, "->", receiver.name
|
||||
# #print ""
|
||||
# print "tick", self.time + 1
|
||||
# #print "-----------"
|
||||
# for n in self.nodes:
|
||||
# n.tick()
|
||||
# self.time += 1
|
||||
|
||||
# sender id / pubkey not needed for now
|
||||
# topic assumed to be hardcoded
|
||||
def send_message(self, sender_id, address_to, msg):
|
||||
print("*** (whisper-network) send_message", address_to)
|
||||
topic = self.topic
|
||||
web3.shh.post({
|
||||
'pubKey': address_to,
|
||||
'topic': topic,
|
||||
'powTarget': 2.01,
|
||||
'powTime': 2,
|
||||
'ttl': 10,
|
||||
'payload': web3.toHex(text=msg)
|
||||
});
|
||||
|
||||
# NetworkSim stub
|
||||
# def send_message(self, sender_id, receiver_id, message):
|
||||
# #print "*** (network) send_message", sender_id, receiver_id
|
||||
# # XXX: Assuming sender exists
|
||||
# sender = self.peers[sender_id]
|
||||
# receiver = self.peers[receiver_id]
|
||||
# recv_time = self.time + self.latency_uniform_random()
|
||||
# if recv_time not in self.queue:
|
||||
# self.queue[recv_time] = []
|
||||
# self.queue[recv_time].append((sender, receiver, message))
|
||||
|
||||
# XXX: This should be normal distribution or Poisson
|
||||
# NetworkSim stub; not needed for Whisper probably
|
||||
# def latency_uniform_random(self):
|
||||
# # XXX: Hardcode for now, easier analyze
|
||||
# latency = 1
|
||||
# #latency = random.randint(1,3)
|
||||
# return latency
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue