[#10414] Implement support for latest version of eip-1193

This commit is contained in:
Andrey Shovkoplyas 2020-05-05 07:43:55 +02:00
parent 2140a9867b
commit 41bde61212
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
5 changed files with 237 additions and 243 deletions

View File

@ -1,14 +0,0 @@
const m = require('module');
const originalLoader = m._load;
/*
Hook `require` so that RN abuse of require does not break when running tests in nodejs.
*/
m._load = function hookedLoader(request, parent, isMain) {
if (request.match(/.jpeg|.jpg|.png$/)) {
return { uri: request };
}
return originalLoader(request, parent, isMain);
};

View File

@ -1,8 +1,9 @@
(function(){
if(typeof EthereumProvider === "undefined"){ if(typeof EthereumProvider === "undefined"){
var callbackId = 0; var callbackId = 0;
var callbacks = {}; var callbacks = {};
bridgeSend = function (data) { var bridgeSend = function (data) {
ReactNativeWebView.postMessage(JSON.stringify(data)); ReactNativeWebView.postMessage(JSON.stringify(data));
} }
@ -46,6 +47,7 @@ function qrCodeResponse(data, callback){
function Unauthorized() { function Unauthorized() {
this.name = "Unauthorized"; this.name = "Unauthorized";
this.id = 4100; this.id = 4100;
this.code = 4100;
this.message = "The requested method and/or account has not been authorized by the user."; this.message = "The requested method and/or account has not been authorized by the user.";
} }
Unauthorized.prototype = Object.create(Error.prototype); Unauthorized.prototype = Object.create(Error.prototype);
@ -53,10 +55,10 @@ Unauthorized.prototype = Object.create(Error.prototype);
function UserRejectedRequest() { function UserRejectedRequest() {
this.name = "UserRejectedRequest"; this.name = "UserRejectedRequest";
this.id = 4001; this.id = 4001;
this.code = 4001;
this.message = "The user rejected the request."; this.message = "The user rejected the request.";
} }
UserRejectedRequest.prototype = Object.create(Error.prototype); UserRejectedRequest.prototype = Object.create(Error.prototype);
ReactNativeWebView.onMessage = function (message) ReactNativeWebView.onMessage = function (message)
{ {
data = JSON.parse(message); data = JSON.parse(message);
@ -69,7 +71,7 @@ ReactNativeWebView.onMessage = function (message)
qrCodeResponse(data, callback); qrCodeResponse(data, callback);
} else if (data.isAllowed) { } else if (data.isAllowed) {
if (data.permission == 'web3') { if (data.permission == 'web3') {
currentAccountAddress = data.data[0]; window.statusAppcurrentAccountAddress = data.data[0];
} }
callback.resolve(data.data); callback.resolve(data.data);
} else { } else {
@ -85,13 +87,10 @@ ReactNativeWebView.onMessage = function (message)
if (data.error.code == 4100) if (data.error.code == 4100)
callback.reject(new Unauthorized()); callback.reject(new Unauthorized());
else else
//TODO probably if rpc returns empty result we need to call resolve with empty data?
callback.reject(data.error); callback.reject(data.error);
} }
else{ else
// TODO : according to https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1193.md#examples {
// TODO : we need to return data.result.result here, but for some reason some dapps (uniswap)
// TODO : expects jsonrpc
callback.resolve(data.result); callback.resolve(data.result);
} }
} }
@ -116,12 +115,12 @@ function web3Response (payload, result){
} }
function getSyncResponse (payload) { function getSyncResponse (payload) {
if (payload.method == "eth_accounts" && (typeof currentAccountAddress !== "undefined")) { if (payload.method == "eth_accounts" && (typeof window.statusAppcurrentAccountAddress !== "undefined")) {
return web3Response(payload, [currentAccountAddress]) return web3Response(payload, [window.statusAppcurrentAccountAddress])
} else if (payload.method == "eth_coinbase" && (typeof currentAccountAddress !== "undefined")) { } else if (payload.method == "eth_coinbase" && (typeof window.statusAppcurrentAccountAddress !== "undefined")) {
return web3Response(payload, currentAccountAddress) return web3Response(payload, window.statusAppcurrentAccountAddress)
} else if (payload.method == "net_version" || payload.method == "eth_chainId"){ } else if (payload.method == "net_version" || payload.method == "eth_chainId"){
return web3Response(payload, networkId) return web3Response(payload, window.statusAppNetworkId)
} else if (payload.method == "eth_uninstallFilter"){ } else if (payload.method == "eth_uninstallFilter"){
return web3Response(payload, true); return web3Response(payload, true);
} else { } else {
@ -149,28 +148,15 @@ EthereumProvider.prototype.scanQRCode = function (regex) {
return sendAPIrequest('qr-code', {regex: regex}); return sendAPIrequest('qr-code', {regex: regex});
}; };
//Support for legacy send method EthereumProvider.prototype.request = function (requestArguments)
EthereumProvider.prototype.sendSync = function (payload)
{ {
if (payload.method == "eth_uninstallFilter"){ if (!requestArguments) {
this.sendAsync(payload, function (res, err) {})
}
var syncResponse = getSyncResponse(payload);
if (syncResponse){
return syncResponse;
} else {
return web3Response(payload, null);
}
};
EthereumProvider.prototype.send = function (method, params = [])
{
if (!method) {
return new Error('Request is not valid.'); return new Error('Request is not valid.');
} }
var method = requestArguments.method;
if (!(params instanceof Array)) { if (!method) {
return new Error('Params is not a valid array.'); return new Error('Request is not valid.');
} }
//Support for legacy send method //Support for legacy send method
@ -206,7 +192,27 @@ EthereumProvider.prototype.send = function (method, params = [])
}); });
}; };
//Support for legacy sendAsync method // (DEPRECATED) Support for legacy send method
EthereumProvider.prototype.send = function (method, params = [])
{
return this.request({method: method, params: params});
}
// (DEPRECATED) Support for legacy sendSync method
EthereumProvider.prototype.sendSync = function (payload)
{
if (payload.method == "eth_uninstallFilter"){
this.sendAsync(payload, function (res, err) {})
}
var syncResponse = getSyncResponse(payload);
if (syncResponse){
return syncResponse;
} else {
return web3Response(payload, null);
}
};
// (DEPRECATED) Support for legacy sendAsync method
EthereumProvider.prototype.sendAsync = function (payload, callback) EthereumProvider.prototype.sendAsync = function (payload, callback)
{ {
var syncResponse = getSyncResponse(payload); var syncResponse = getSyncResponse(payload);
@ -239,4 +245,5 @@ EthereumProvider.prototype.sendAsync = function (payload, callback)
}; };
} }
ethereum = new EthereumProvider(); window.ethereum = new EthereumProvider();
})();

View File

@ -10,4 +10,4 @@
}, 100); }, 100);
return pushState.apply(history, arguments); return pushState.apply(history, arguments);
}; };
}()); })();

View File

@ -30,6 +30,8 @@
:http {:port 3449 :http {:port 3449
:host "0.0.0.0"} :host "0.0.0.0"}
:cache-blockers #{status-im.utils.js-resources}
:builds {:android :builds {:android
{:target :react-native {:target :react-native
:output-dir "app" :output-dir "app"

View File

@ -3,7 +3,6 @@
(def webview-js (slurp "resources/js/webview.js")) (def webview-js (slurp "resources/js/webview.js"))
(def provider-file (slurp "resources/js/provider.js")) (def provider-file (slurp "resources/js/provider.js"))
(defn ethereum-provider [network-id] (defn ethereum-provider [network-id]
(str "var networkId = \"" network-id "\";" (str "window.statusAppNetworkId = \"" network-id "\";"
provider-file)) provider-file))