String payload

status-im · Oct 21, 2019 · 792df32 · 792df32
1 parent 086f7a0
commit 792df32
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/externs.js b/externs.js
@@ -42,6 +42,10 @@ var TopLevel = {
     "charCodeAt" : function () {},
     "checkAddressChecksum" : function () {},
     "checkVideoAuthorizationStatus" : function () {},
+  "author": function() {},
+  "encryptionId": function() {},
+  "chat": function() {},
+  "messageId": function() {},
     "clear" : function () {},
     "clearCookies" : function () {},
     "clearInterval" : function () {},
@@ -53,6 +57,10 @@ var TopLevel = {
     "code" : function () {},
     "concat" : function () {},
     "confirmMessagesProcessed" : function () {},
+  "messages": function() {},
+  "discovery": function() {},
+  "negotiated": function() {},
+  "chatId": function() {},
     "confirmMessagesProcessedByID" : function () {},
     "connectionChange" : function () {},
     "console" : function () {},
@@ -75,6 +83,8 @@ var TopLevel = {
     "DateTimeFormat" : function () {},
     "DEBUG" : function () {},
     "decay" : function () {},
+
+     "dedupId": function() {},
     "DECIMAL_SEP" : function () {},
     "GROUP_SEP" : function () {},
     "PERCENT" : function () {},
@@ -162,6 +172,8 @@ var TopLevel = {
     "getNode" : function () {},
     "getNodesFromContract" : function () {},
     "getPublicKey" : function () {},
+  "publicKey": function() {},
+  "alias": function() {},
     "getSecurityLevel" : function () {},
     "getStateForAction" : function () {},
     "getString" : function () {},
@@ -246,6 +258,7 @@ var TopLevel = {
     "MessagesSeenHandler" : function () {},
     "messaging" : function () {},
     "method" : function () {},
+  "metadata": function() {},
     "minus" : function () {},
     "plus" : function () {},
     "mkdir" : function () {},
@@ -510,6 +523,7 @@ var TopLevel = {
     "toUtf8" : function () {},
     "toWei" : function () {},
     "translations" : function () {},
+  "type": function() {},
     "Uint8Array" : function () {},
     "unblockPin" : function () {},
     "unlink" : function () {},

diff --git a/src/status_im/data_store/messages.cljs b/src/status_im/data_store/messages.cljs
@@ -105,8 +105,8 @@
 
 (re-frame/reg-fx
  ::save-message
- (fn [messages]
-   (save-messages-rpc messages)))
+ (fn [messages]))
+   ;(save-messages-rpc messages)))
 
 (fx/defn save-message [cofx message]
   {::save-message [message]})

diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs
@@ -310,7 +310,6 @@
 (handlers/register-handler-fx
  :bootnodes.ui/custom-bootnodes-switch-toggled
  (fn [cofx [_ value]]
-   (native-module/stop-signals!)
    (bootnodes/toggle-custom-bootnodes cofx value)))
 
 (handlers/register-handler-fx

diff --git a/src/status_im/native_module/core.cljs b/src/status_im/native_module/core.cljs
@@ -53,9 +53,6 @@
 
 (def receive-signals (atom true))
 
-(defn stop-signals! []
-  (reset! receive-signals (not @receive-signals)))
-
 (defonce listener
   (.addListener react/device-event-emitter "gethEvent"
                 #(re-frame/dispatch [:signals/signal-received (.-jsonEvent %)])))

diff --git a/src/status_im/transport/message/core.cljs b/src/status_im/transport/message/core.cljs
@@ -4,6 +4,7 @@
             [re-frame.core :as re-frame]
             [status-im.chat.models.message :as models.message]
             [status-im.contact.device-info :as device-info]
+            [status-im.utils.handlers :as handlers]
             [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.ethereum.core :as ethereum]
             [status-im.transport.message.contact :as contact]
@@ -27,7 +28,7 @@
   in order to stop receiving that message"
   [cofx now-in-s filter-chat-id message-js]
   (let [blocked-contacts (get-in cofx [:db :contacts/blocked] #{})
-        payload (.-payload (.-message message-js))
+        payload (.-payload message-js)
         timestamp (.-timestamp (.-message message-js))
         metadata-js (.-metadata message-js)
         metadata {:author {:publicKey (.-publicKey (.-author metadata-js))
@@ -38,12 +39,8 @@
                   :messageId (.-messageId metadata-js)}
         raw-payload  {:raw-payload message-js}
         status-message (-> payload
-                           ethereum/hex-to-utf8
                            transit/deserialize)
         sig (-> metadata :author :publicKey)]
-    (println "PAYLOAD")
-    (println "METADATA" metadata)
-    (println "RAW PAYLOAD" raw-payload)
     (when (and sig
                status-message
                (not (blocked-contacts sig)))

diff --git a/src/status_im/transport/message/protocol.cljs b/src/status_im/transport/message/protocol.cljs
@@ -74,14 +74,9 @@
     (let [received-message-fx {:chat-received-message/add-fx
                                [(assoc (into {} this)
                                        :message-id
-                                       (or (get-in cofx [:metadata :messageId])
-                                           (transport.utils/message-id
-                                            signature
-                                            (.-payload (:js-obj cofx))))
+                                       (get-in cofx [:metadata :messageId])
                                        :chat-id chat-id
                                        :whisper-timestamp timestamp
-                                       :raw-payload-hash (ethereum/sha3
-                                                          (.-payload (:js-obj cofx)))
                                        :alias (get-in cofx [:metadata :author :alias])
                                        :identicon (get-in cofx [:metadata :author :identicon])
                                        :from signature
@@ -93,6 +88,4 @@
                                 (get-in this [:content :tribute-transaction])
                                 signature)))
   (validate [this]
-    (if (spec/valid? :message/message this)
-      this
-      (log/warn "failed to validate Message" (spec/explain-str :message/message this)))))
+    this))
diff --git a/status-go-version.json b/status-go-version.json
@@ -2,7 +2,7 @@
     "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.34.0-beta.0",
-    "commit-sha1": "94228bce2ee6a7a5f62917e28247a22c37b6699b",
-    "src-sha256": "0f62yh94vn6k4gqa50r3gxzscqabmgc047sng291g5wp6d755fmr"
+    "version": "5f2544f1e8f2ee832bbab95c8d74e26ba0ab2481",
+    "commit-sha1": "5f2544f1e8f2ee832bbab95c8d74e26ba0ab2481",
+    "src-sha256": "0dlkr6056mhyny9k895zs5012ywiz75qm6y7a6hypb3pfxr35931"
 }