Skip to content

Caip25 link mode #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Example/DApp/Modules/Sign/SignPresenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,25 @@ final class SignPresenter: ObservableObject {
}
}

@MainActor
func connectWalletWithSessionProposeLinkMode() {
Task {
do {
ActivityIndicatorManager.shared.start()
let _ = try await Sign.instance.connectLinkMode(
requiredNamespaces: Proposal.requiredNamespaces,
optionalNamespaces: Proposal.optionalNamespaces,
walletUniversalLink: "https://lab.web3modal.com/wallet"
)
ActivityIndicatorManager.shared.stop()
// router.presentNewPairing(walletConnectUri: walletConnectUri!)
} catch {
AlertPresenter.present(message: error.localizedDescription, type: .error)
ActivityIndicatorManager.shared.stop()
}
}
}

@MainActor
func openConfiguration() {
router.openConfig()
Expand Down
12 changes: 12 additions & 0 deletions Example/DApp/Modules/Sign/SignView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,18 @@ struct SignView: View {
.background(Color(red: 95/255, green: 159/255, blue: 248/255))
.cornerRadius(16)
}

Button {
presenter.connectWalletWithSessionProposeLinkMode()
} label: {
Text("Session Propose Link Mode")
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 10)
.background(Color(red: 95/255, green: 159/255, blue: 248/255))
.cornerRadius(16)
}
}
.padding(.top, 10)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,58 @@ class LinkAuthRequestSubscriber {
}

}

class LinkModeSessionProposalSubscriber {
private let logger: ConsoleLogging
private let kms: KeyManagementServiceProtocol
private var publishers = [AnyCancellable]()
private let envelopesDispatcher: LinkEnvelopesDispatcher
private let verifyClient: VerifyClientProtocol
private let verifyContextStore: CodableStore<VerifyContext>


var onSessionProposal: ((Session.Proposal, VerifyContext?) -> Void)?

init(
logger: ConsoleLogging,
kms: KeyManagementServiceProtocol,
envelopesDispatcher: LinkEnvelopesDispatcher,
verifyClient: VerifyClientProtocol,
verifyContextStore: CodableStore<VerifyContext>
) {
self.logger = logger
self.kms = kms
self.envelopesDispatcher = envelopesDispatcher
self.verifyClient = verifyClient
self.verifyContextStore = verifyContextStore


subscribeForSessionProposal()
}

private func subscribeForSessionProposal() {
envelopesDispatcher
.requestSubscription(on: SessionProposeProtocolMethod.responseApprove().method)
.sink { [unowned self] (payload: RequestSubscriptionPayload<SessionType.ProposeParams>) in


let proposal = payload.request.publicRepresentation(pairingTopic: payload.topic)
let metadata = payload.request.proposer.metadata

guard let redirect = metadata.redirect,
let universalLink = redirect.universal else {
logger.warn("redirect property not present")
return
}

let verifyContext = verifyClient.createVerifyContextForLinkMode(
redirectUniversalLink: universalLink,
domain: metadata.url
)

onSessionProposal?(proposal, verifyContext)
}.store(in: &publishers)
}
}


56 changes: 56 additions & 0 deletions Sources/WalletConnectSign/Services/App/AppProposeService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,59 @@ final class AppProposeService {
try await networkingInteractor.request(request, topic: pairingTopic, protocolMethod: protocolMethod)
}
}


final class LinkAppProposeService {
private let metadata: AppMetadata
private let kms: KeyManagementServiceProtocol
let linkEnvelopesDispatcher: LinkEnvelopesDispatcher

private let logger: ConsoleLogging

init(
metadata: AppMetadata,
linkEnvelopesDispatcher: LinkEnvelopesDispatcher,
kms: KeyManagementServiceProtocol,
logger: ConsoleLogging
) {
self.metadata = metadata
self.linkEnvelopesDispatcher = linkEnvelopesDispatcher
self.kms = kms
self.logger = logger
}

func propose(
namespaces: [String: ProposalNamespace],
optionalNamespaces: [String: ProposalNamespace]? = nil,
sessionProperties: [String: String]? = nil,
scopedProperties: [String: String]? = nil,
walletUniversalLink: String
) async throws -> String {
try Namespace.validate(namespaces)
if let optionalNamespaces {
try Namespace.validate(optionalNamespaces)
}
if let sessionProperties {
try SessionProperties.validate(sessionProperties)
}
let protocolMethod = SessionProposeProtocolMethod.responseApprove()
let publicKey = try! kms.createX25519KeyPair()
let proposer = Participant(
publicKey: publicKey.hexRepresentation,
metadata: metadata)

let proposal = SessionProposal(
relays: [],
proposer: proposer,
requiredNamespaces: namespaces,
optionalNamespaces: optionalNamespaces ?? [:],
sessionProperties: sessionProperties,
scopedProperties: scopedProperties
)

let request = RPCRequest(method: protocolMethod.method, params: proposal)
let envelope = try await linkEnvelopesDispatcher.request(topic: UUID().uuidString,request: request, peerUniversalLink: walletUniversalLink, envelopeType: .type2)

return envelope
}
}
30 changes: 29 additions & 1 deletion Sources/WalletConnectSign/Sign/SignClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ public final class SignClient: SignClientProtocol {
private let sessionResponderDispatcher: SessionResponderDispatcher
private let linkSessionRequestResponseSubscriber: LinkSessionRequestResponseSubscriber
private let messageVerifier: MessageVerifier
private let linkModeSessionProposalSubscriber: LinkModeSessionProposalSubscriber

private var publishers = Set<AnyCancellable>()

Expand Down Expand Up @@ -231,7 +232,9 @@ public final class SignClient: SignClientProtocol {
sessionResponderDispatcher: SessionResponderDispatcher,
linkSessionRequestResponseSubscriber: LinkSessionRequestResponseSubscriber,
authenticateTransportTypeSwitcher: AuthenticateTransportTypeSwitcher,
messageVerifier: MessageVerifier
messageVerifier: MessageVerifier,
linkAppProposeService: LinkAppProposeService,
linkModeSessionProposalSubscriber: LinkModeSessionProposalSubscriber
) {
self.logger = logger
self.networkingClient = networkingClient
Expand Down Expand Up @@ -267,6 +270,8 @@ public final class SignClient: SignClientProtocol {
self.linkSessionRequestResponseSubscriber = linkSessionRequestResponseSubscriber
self.authenticateTransportTypeSwitcher = authenticateTransportTypeSwitcher
self.messageVerifier = messageVerifier
self.linkAppProposeService = linkAppProposeService
self.linkModeSessionProposalSubscriber = linkModeSessionProposalSubscriber

setUpConnectionObserving()
setUpEnginesCallbacks()
Expand Down Expand Up @@ -308,6 +313,26 @@ public final class SignClient: SignClientProtocol {
return try await authenticateTransportTypeSwitcher.authenticate(params, walletUniversalLink: walletUniversalLink)
}

let linkAppProposeService: LinkAppProposeService
#if DEBUG
public func connectLinkMode(
requiredNamespaces: [String: ProposalNamespace],
optionalNamespaces: [String: ProposalNamespace]? = nil,
sessionProperties: [String: String]? = nil,
scopedProperties: [String: String]? = nil,
walletUniversalLink: String
) async throws -> String {
logger.debug("Connecting Application")

return try await linkAppProposeService.propose(
namespaces: requiredNamespaces,
optionalNamespaces: optionalNamespaces,
sessionProperties: sessionProperties,
scopedProperties: scopedProperties,
walletUniversalLink: walletUniversalLink
)
}
#endif

#if DEBUG
@discardableResult public func authenticateLinkMode(
Expand Down Expand Up @@ -523,6 +548,9 @@ public final class SignClient: SignClientProtocol {
approveEngine.onSessionProposal = { [unowned self] (proposal, context) in
sessionProposalPublisherSubject.send((proposal, context))
}
linkModeSessionProposalSubscriber.onSessionProposal = { [unowned self] (proposal, context) in
sessionProposalPublisherSubject.send((proposal, context))
}
approveEngine.onSessionRejected = { [unowned self] proposal, reason in
sessionRejectionPublisherSubject.send((proposal, reason))
}
Expand Down
8 changes: 7 additions & 1 deletion Sources/WalletConnectSign/Sign/SignClientFactory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ public struct SignClientFactory {
let linkSessionRequestResponseSubscriber = LinkSessionRequestResponseSubscriber(envelopesDispatcher: linkEnvelopesDispatcher, eventsClient: eventsClient)

let authenticateTransportTypeSwitcher = AuthenticateTransportTypeSwitcher(linkAuthRequester: linkAuthRequester, pairingClient: pairingClient, logger: logger, appRequestService: appRequestService, appProposeService: appProposerService)

let linkAppProposeService = LinkAppProposeService(metadata: metadata, linkEnvelopesDispatcher: linkEnvelopesDispatcher, kms: kms, logger: logger)

let linkModeSessionProposalSubscriber = LinkModeSessionProposalSubscriber(logger: logger, kms: kms, envelopesDispatcher: linkEnvelopesDispatcher, verifyClient: verifyClient, verifyContextStore: verifyContextStore)

let client = SignClient(
logger: logger,
Expand Down Expand Up @@ -181,7 +185,9 @@ public struct SignClientFactory {
sessionResponderDispatcher: sessionResponderDispatcher,
linkSessionRequestResponseSubscriber: linkSessionRequestResponseSubscriber,
authenticateTransportTypeSwitcher: authenticateTransportTypeSwitcher,
messageVerifier: signatureVerifier
messageVerifier: signatureVerifier,
linkAppProposeService: linkAppProposeService,
linkModeSessionProposalSubscriber: linkModeSessionProposalSubscriber
)
return client
}
Expand Down
Loading