wip

data_sync/README.md

@@ -10,3 +10,19 @@ Initial PoC report: https://notes.status.im/THYDMxSmSSiM5ASdl-syZg
 make
 make run # see sync.py
 ```
+
+## Whisper
+
+Run geth node:
+```
+geth --testnet --syncmode=light --ws --wsport=8546 --wsaddr=localhost --wsorigins=statusjs --rpc --maxpeers=25 --shh --shh.pow=0.002 --wsapi=eth,web3,net,shh,debug,admin,personal
+```
+geth --testnet --rpc --maxpeers=25 --shh --shh.pow=0.002 --rpcport=8501 
+```
+geth --testnet --rpc --maxpeers=25 --shh --shh.pow=0.002 --rpcport=8500 --datadir=/tmp/foo --port=30000
+geth --testnet --rpc --maxpeers=25 --shh --shh.pow=0.002 --rpcport=8501 --datadir=/tmp/bar --port=30001
+
+
+- add nodes to connect
+
+- running whisper node on own nodes?

data_sync/whisper.py

@@ -1,29 +1,22 @@
 from web3 import Web3, HTTPProvider
-import time
+from threading import Thread
+import time, sys
 
 # Constant
 #---------------------------------------------------------------------
 
-host = 'http://localhost:8545'
+#host = 'http://localhost:8545'
+
+# XXX
 a_keyPair = "0x57083392b29bdf24512c93cfdf45d38c87d9d882da3918c59f4406445ea976a4"
 b_keyPair= "0x7b5c5af9736d9f1773f2020dd0fef0bc3c8aeaf147d2bf41961e766588e086e7"
 
 # Derived, used for addressing
 a_pubKey = "0x04d94a1a01872b598c7cdc5aca2358d35eb91cd8a91eaea8da277451bb71d45c0d1eb87a31ea04e32f537e90165c870b3e115a12438c754d507ac75bddd6ecacd5"
-b_pubkey = "0x04ff921ddf78b5ed4537402f59a150caf9d96a83f2a345a1ddf9df12e99e7778f314c9ca72e8285eb213af84f5a7b01aabb62c67e46657976ded6658e1b9e83c73"
+b_pubKey = "0x04ff921ddf78b5ed4537402f59a150caf9d96a83f2a345a1ddf9df12e99e7778f314c9ca72e8285eb213af84f5a7b01aabb62c67e46657976ded6658e1b9e83c73"
 
 topic = '0x00000000'
 
-# Connection
-#---------------------------------------------------------------------
-
-web3 = Web3(HTTPProvider(host))
-from web3.shh import Shh
-Shh.attach(web3, "shh")
-
-#kId = web3.shh.addPrivateKey(keyPair)
-#pubKey = web3.shh.getPublicKey(kId)
-
 # API
 #---------------------------------------------------------------------
 
@@ -33,6 +26,7 @@ def 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)
     myFilter = web3.shh.newMessageFilter({'topic': topic,
@@ -41,6 +35,7 @@ def pollFilter(topic, keyPair):
     return myFilter
 
 def sendMessage(address_to, topic, msg):
+    print("address_to", address_to)
     web3.shh.post({
         'pubKey': address_to,
         'topic': topic,
@@ -61,19 +56,79 @@ def getMessages(myFilter):
 # 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(0.3)
+
+# Args
+#---------------------------------------------------------------------
+
+if len(sys.argv) < 2:
+    print("Missing argument")
+    sys.exit(0)
+
+node = sys.argv[1]
+
+if(node == "a"):
+    print("a")
+    keyPair = a_keyPair
+    # XXX: Seems weird, should be b_pubkey?
+    address_to = a_pubKey
+    #address_to = b_pubKey
+    host = "http://localhost:8500"
+elif(node == "b"):
+    print("b")
+    keyPair = b_keyPair
+    address_to = a_pubKey
+    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
-myFilter = pollFilter(topic, b_keyPair)
+print("keyPair for filter", keyPair)
+myFilter = pollFilter(topic, keyPair)
 
-# XXX: Part of A's state
-sendMessage(b_pubkey, topic, "hello")
-sendMessage(b_pubkey, topic, "hi")
+print("yo sending")
+sendMessage(address_to, topic, "hello")
+sendMessage(address_to, topic, "hi also")
 
-#sendMessage(b_pubkey, topic, "hello b")
+# XXX this works, well hell a does
+# Separate node?
+# XXX: Would expect keypair to be sender and pubkey in sendmsg to b receiver
+# Are they flipped somehow?
+#myFilter = pollFilter(topic, a_keyPair)
+#sendMessage(b_pubKey, topic, "hello b")
+#sendMessage(a_pubKey, topic, "hello a")
+#getMessages(myFilter)
 
-time.sleep(1)
-getMessages(myFilter)
+# Take address_to and filter as args?
+threads = []
+daemon = Thread(target=Daemon().run())
+threads.append(daemon)
+daemon.start()
 
 # TODO
 # Usage: