status-im
/
status-lib-archived
mirror of https://github.com/status-im/status-lib-archived.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from status-im/send-transaction 

Send transaction
This commit is contained in:
Roman Volosovskyi 2016-08-19 11:50:05 +03:00 committed by GitHub
parent 281a052804 2f734a68e3
commit 0deb67fade
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cljs/status_im/protocol/api.cljs
View File

@ -33,7 +33,8 @@
create-identity
add-identity
stop-listener
stop-watching-filters]]
stop-watching-filters]
:as web3]
[status-im.protocol.handler :refer [handle-incoming-whisper-msg] :as handler]
[status-im.protocol.user-handler :refer [invoke-user-handler]]
[status-im.utils.encryption :refer [new-keypair]]
@ -116,13 +117,14 @@
(let [topic [(user-topic whisper-identity) discovery-topic]]
(listen (connection) handle-incoming-whisper-msg {:topic topic})))
(defn send-user-msg [{:keys [to content msg-id]}]
(defn send-user-msg [{:keys [to content msg-id content-type]}]
(let [{:keys [msg-id msg] :as new-msg}
(make-msg {:from (state/my-identity)
:to to
:msg-id msg-id
:payload {:content content
:content-type default-content-type
:content-type (or content-type
default-content-type)
:type :user-msg}})]
(add-pending-message msg-id msg)
(post-msg (connection) msg)
@ -239,4 +241,4 @@
(defn send-account-update [account]
(let [topics [[(user-topic (my-identity)) discovery-topic]]]
(broadcast-account-update topics account)))
(broadcast-account-update topics account)))

17
src/cljs/status_im/protocol/web3.cljs
View File

@ -1,21 +1,22 @@
(ns status-im.protocol.web3
(:require [cljs.core.async :refer [chan put! close! <!]]
[cljsjs.web3]
[status-im.utils.logging :as log]
[status-im.utils.random :as random]
[status-im.utils.encryption :refer [encrypt]]
[status-im.protocol.state.state :as state]
[status-im.protocol.user-handler :refer [invoke-user-handler]])
[status-im.protocol.user-handler :refer [invoke-user-handler]]
cljsjs.web3)
(:require-macros [cljs.core.async.macros :refer [go]]))
(def web3 js/Web3)
(def status-app-topic "status-app")
(def status-msg-ttl 100)
(defn from-utf8 [s]
(.fromUtf8 js/Web3.prototype s))
(.fromUtf8 web3.prototype s))
(defn to-utf8 [s]
(.toUtf8 js/Web3.prototype s))
(.toUtf8 web3.prototype s))
(defn whisper [web3]
(.-shh web3))
@ -25,8 +26,8 @@
(clj->js)))
(defn make-web3 [rpc-url]
(->> (js/Web3.providers.HttpProvider. rpc-url)
(js/Web3.)))
(->> (web3.providers.HttpProvider. rpc-url)
(web3.)))
(defn make-callback [{:keys [error-msg result-channel]}]
(fn [error result]
@ -40,8 +41,8 @@
(defn new-identity [web3]
(let [result-channel (chan)
callback (make-callback {:error-msg "Call to newIdentity failed"
:result-channel result-channel})]
callback (make-callback {:error-msg "Call to newIdentity failed"
:result-channel result-channel})]
(.newIdentity (.-shh web3) callback)
result-channel))