From 40aff1da8dc29d961ca806d2b81bcb874f7e4223 Mon Sep 17 00:00:00 2001
From: Andrey Shovkoplyas <motor4ik@gmail.com>
Date: Tue, 25 Dec 2018 15:35:03 +0100
Subject: [PATCH] [#7158] EIP1193 (new ethereum provider)

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
---
 resources/js/web3_opt_in.js     | 64 ++++++++++++++++++++++++++++++---
 src/status_im/browser/core.cljs |  2 +-
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/resources/js/web3_opt_in.js b/resources/js/web3_opt_in.js
index c0620eb87d..931102a1b2 100644
--- a/resources/js/web3_opt_in.js
+++ b/resources/js/web3_opt_in.js
@@ -59,13 +59,21 @@ WebViewBridge.onMessage = function (message) {
                 }
                 callback.resolve(data.data);
             } else {
-                callback.reject(new Error("Denied"));
+                callback.reject({code: 4001, message: "User denied authorizing any accounts for the dapp."});
             }
         } else if (data.type === "web3-send-async-callback") {
             var id = data.messageId;
             var callback = callbacks[id];
             if (callback) {
-                if (callback.results) {
+                if (callback.beta){
+                    if (data.error || data.result.error){
+                        callback.reject(data.error || data.result.error);
+                    }
+                    else{
+                        callback.resolve(data.result.result);
+                    }
+                }
+                else if (callback.results) {
                     callback.results.push(data.error || data.result);
                     if (callback.results.length == callback.num)
                         callback.callback(undefined, callback.results);
@@ -133,7 +141,7 @@ ReadOnlyProvider.prototype.send = function (payload) {
     }
 };
 
-ReadOnlyProvider.prototype.sendAsync = function (payload, callback) {
+function sendAsync (payload, callback) {
    var syncResponse = getSyncResponse(payload);
    if (syncResponse && callback){
        callback(null, syncResponse);
@@ -162,7 +170,55 @@ ReadOnlyProvider.prototype.sendAsync = function (payload, callback) {
 
    }
 };
+
+ReadOnlyProvider.prototype.sendAsync = sendAsync;
+
+var ReadOnlyBetaProvider = function () {};
+
+ReadOnlyBetaProvider.prototype.isStatus = true;
+ReadOnlyBetaProvider.prototype.status = new StatusAPI();
+
+//web3.js Backwards Compatibility
+ReadOnlyBetaProvider.prototype.isConnected = function () { return true; };
+ReadOnlyBetaProvider.prototype.sendAsync = sendAsync;
+
+ReadOnlyBetaProvider.prototype.scanQRCode = function (regex) {
+    return sendAPIrequest('qr-code', {regex: regex});
+};
+
+ReadOnlyBetaProvider.prototype.send = function (method, params = []) {
+
+    if (!method || typeof method !== 'string') {
+      return new Error('Method is not a valid string.');
+    }
+
+    if (!(params instanceof Array)) {
+      return new Error('Params is not a valid array.');
+    }
+
+    if (method == 'eth_requestAccounts'){
+        return sendAPIrequest('web3');
+    }
+
+    var messageId = callbackId++;
+    var payload = {id:      messageId,
+                   jsonrpc: "2.0",
+                   method:  method,
+                   params:  params};
+
+    bridgeSend({type:      'web3-send-async-read-only',
+                messageId: messageId,
+                payload:   payload});
+
+    return new Promise(function (resolve, reject) {
+                           callbacks[messageId] = {beta:    true,
+                                                   resolve: resolve,
+                                                   reject:  reject};
+                       });
+};
 }
 
 console.log("ReadOnlyProvider");
-ethereum = new ReadOnlyProvider();
\ No newline at end of file
+ethereum = new ReadOnlyProvider();
+console.log("ReadOnlyBetaProvider");
+ethereumBeta = new ReadOnlyBetaProvider();
\ No newline at end of file
diff --git a/src/status_im/browser/core.cljs b/src/status_im/browser/core.cljs
index 2d11244497..8a97239646 100644
--- a/src/status_im/browser/core.cljs
+++ b/src/status_im/browser/core.cljs
@@ -294,7 +294,7 @@
       (send-to-bridge cofx
                       {:type      constants/web3-send-async-callback
                        :messageId message-id
-                       :error     "Denied"})
+                       :error     {:code 4100 :message "The requested account has not been authorized by the user."}})
       (web3-send-async cofx payload message-id))))
 
 (fx/defn handle-scanned-qr-code