lil-org/tokenary
1
1
Fork 0
mirror of https://github.com/lil-org/tokenary.git synced 2024-12-02 09:33:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Display dapp name when confirming extension actions

Browse Source
This commit is contained in:
Ivan Grachev 2021-11-28 13:02:38 +03:00
parent 7c7f38fe46
commit 465b8f85af
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Encrypted Ink/Agent.swift
View File

@ -88,9 +88,9 @@ class Agent: NSObject {
}
}
func showApprove(transaction: Transaction, chain: EthereumChain, peerMeta: WCPeerMeta?, completion: @escaping (Transaction?) -> Void) {
func showApprove(transaction: Transaction, chain: EthereumChain, peerMeta: PeerMeta?, completion: @escaping (Transaction?) -> Void) {
let windowController = Window.showNew()
let approveViewController = ApproveTransactionViewController.with(transaction: transaction, chain: chain, peerMeta: PeerMeta(wcPeerMeta: peerMeta)) { [weak self] transaction in
let approveViewController = ApproveTransactionViewController.with(transaction: transaction, chain: chain, peerMeta: peerMeta) { [weak self] transaction in
if transaction != nil {
self?.askAuthentication(on: windowController.window, onStart: false, reason: .sendTransaction) { success in
completion(success ? transaction : nil)
@ -104,9 +104,9 @@ class Agent: NSObject {
windowController.contentViewController = approveViewController
}
func showApprove(subject: ApprovalSubject, meta: String, peerMeta: WCPeerMeta?, completion: @escaping (Bool) -> Void) {
func showApprove(subject: ApprovalSubject, meta: String, peerMeta: PeerMeta?, completion: @escaping (Bool) -> Void) {
let windowController = Window.showNew()
let approveViewController = ApproveViewController.with(subject: subject, meta: meta, peerMeta: PeerMeta(wcPeerMeta: peerMeta)) { [weak self] result in
let approveViewController = ApproveViewController.with(subject: subject, meta: meta, peerMeta: peerMeta) { [weak self] result in
if result {
self?.askAuthentication(on: windowController.window, onStart: false, reason: subject.asAuthenticationReason) { success in
completion(success)
@ -309,6 +309,8 @@ class Agent: NSObject {
// TODO: should receive account address from content script here.
// content script should know it since it injets it
private func processSafariRequest(_ safariRequest: SafariRequest) {
// TODO: pass favicon url
let peerMeta = PeerMeta(title: safariRequest.host, iconURLString: nil)
switch safariRequest.method {
case .switchEthereumChain:
if let chain = safariRequest.switchToChain {
@ -322,7 +324,7 @@ class Agent: NSObject {
return // TODO: respond with error
}
// TODO: display meta and peerMeta
showApprove(subject: .signPersonalMessage, meta: text, peerMeta: nil) { [weak self] approved in
showApprove(subject: .signPersonalMessage, meta: text, peerMeta: peerMeta) { [weak self] approved in
if approved {
self?.signPersonalMessage(address: safariRequest.address, data: data, request: safariRequest)
// TODO: sign and respond
@ -355,7 +357,7 @@ class Agent: NSObject {
}
// TODO: display meta and peerMeta
showApprove(subject: .signMessage, meta: data.hexString, peerMeta: nil) { [weak self] approved in
showApprove(subject: .signMessage, meta: data.hexString, peerMeta: peerMeta) { [weak self] approved in
if approved {
self?.signMessage(address: safariRequest.address, data: data, request: safariRequest)
// TODO: sign and respond
@ -371,7 +373,7 @@ class Agent: NSObject {
print("yoyoyo raw:", raw)
// TODO: display meta and peerMeta
showApprove(subject: .signTypedData, meta: raw, peerMeta: nil) { [weak self] approved in
showApprove(subject: .signTypedData, meta: raw, peerMeta: peerMeta) { [weak self] approved in
if approved {
self?.signTypedData(address: safariRequest.address, raw: raw, request: safariRequest)
// TODO: sign and respond
@ -383,8 +385,7 @@ class Agent: NSObject {
guard let transaction = safariRequest.transaction, let chain = safariRequest.chain else {
return // TODO: respond with error
}
let peer = WCPeerMeta(name: "Unknown", url: "") // TODO: pass valid peer meta
showApprove(transaction: transaction, chain: chain, peerMeta: peer) { [weak self] transaction in
showApprove(transaction: transaction, chain: chain, peerMeta: peerMeta) { [weak self] transaction in
if let transaction = transaction {
self?.sendTransaction(transaction, address: safariRequest.address, chain: chain, request: safariRequest)
// TODO: show some kind of spinner

5
Encrypted Ink/Models/PeerMeta.swift
View File

@ -17,4 +17,9 @@ struct PeerMeta {
self.iconURLString = wcPeerMeta?.icons.first
}
init(title: String?, iconURLString: String?) {
self.title = title
self.iconURLString = iconURLString
}
}

4
Encrypted Ink/WalletConnect.swift
View File

@ -130,7 +130,7 @@ class WalletConnect {
return
}
let peer = getPeerOfInteractor(interactor)
let peer = PeerMeta(wcPeerMeta: getPeerOfInteractor(interactor))
let transaction = Transaction(from: wct.from, to: to, nonce: wct.nonce, gasPrice: wct.gasPrice, gas: wct.gas, value: wct.value, data: wct.data)
Agent.shared.showApprove(transaction: transaction, chain: chain, peerMeta: peer) { [weak self, weak interactor] transaction in
if let transaction = transaction {
@ -158,7 +158,7 @@ class WalletConnect {
}
}
let peer = getPeerOfInteractor(interactor)
let peer = PeerMeta(wcPeerMeta: getPeerOfInteractor(interactor))
Agent.shared.showApprove(subject: approvalSubject, meta: message ?? "", peerMeta: peer) { [weak self, weak interactor] approved in
if approved {
self?.sign(id: id, payload: payload, walletId: walletId, interactor: interactor)