Skip to content
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

Integrate gas abstraction client #79

Merged
merged 24 commits into from
Jan 28, 2025
Merged
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
60 changes: 60 additions & 0 deletions Example/ExampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
847F08012A25DBFF00B2A5A4 /* XPlatformW3WTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847F08002A25DBFF00B2A5A4 /* XPlatformW3WTests.swift */; };
8486EDD32B4F2EA6008E53C3 /* SwiftMessages in Frameworks */ = {isa = PBXBuildFile; productRef = 8486EDD22B4F2EA6008E53C3 /* SwiftMessages */; };
8487A9482A83AD680003D5AF /* LoggingService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8487A9472A83AD680003D5AF /* LoggingService.swift */; };
848BD1DA2D34DF5E007C2AEF /* SmartAccountSigner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848BD1D92D34DF5E007C2AEF /* SmartAccountSigner.swift */; };
848BD1DC2D34DF72007C2AEF /* GasAbstractionSigner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848BD1DB2D34DF72007C2AEF /* GasAbstractionSigner.swift */; };
848BD1DE2D34DF8F007C2AEF /* EOASigner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848BD1DD2D34DF8F007C2AEF /* EOASigner.swift */; };
84943C7B2A9BA206007EBAC2 /* Mixpanel in Frameworks */ = {isa = PBXBuildFile; productRef = 84943C7A2A9BA206007EBAC2 /* Mixpanel */; };
84943C7D2A9BA328007EBAC2 /* Mixpanel in Frameworks */ = {isa = PBXBuildFile; productRef = 84943C7C2A9BA328007EBAC2 /* Mixpanel */; };
849D7A93292E2169006A2BD4 /* NotifyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849D7A92292E2169006A2BD4 /* NotifyTests.swift */; };
Expand All @@ -70,6 +73,14 @@
84AEC24F2B4D1EE400E27A5B /* ActivityIndicatorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEC24E2B4D1EE400E27A5B /* ActivityIndicatorManager.swift */; };
84AEC2512B4D42C100E27A5B /* AlertPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEC2502B4D42C100E27A5B /* AlertPresenter.swift */; };
84AEC2542B4D43CD00E27A5B /* SwiftMessages in Frameworks */ = {isa = PBXBuildFile; productRef = 84AEC2532B4D43CD00E27A5B /* SwiftMessages */; };
84AEF0162D3DD8CA006E43E5 /* SendStableCoinView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEF0152D3DD8CA006E43E5 /* SendStableCoinView.swift */; };
84AEF0192D3DD9C0006E43E5 /* SendStableCoinModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEF0182D3DD9C0006E43E5 /* SendStableCoinModule.swift */; };
84AEF01B2D3DD9F1006E43E5 /* SendStableCoinRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEF01A2D3DD9F1006E43E5 /* SendStableCoinRouter.swift */; };
84AEF01D2D3DDA0A006E43E5 /* SendStableCoinPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEF01C2D3DDA0A006E43E5 /* SendStableCoinPresenter.swift */; };
84AEF01F2D3DE7A0006E43E5 /* UpgradeToSmartAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEF01E2D3DE7A0006E43E5 /* UpgradeToSmartAccountView.swift */; };
84AEF0222D3DE7C8006E43E5 /* UpgradeToSmartAccountPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEF0212D3DE7C8006E43E5 /* UpgradeToSmartAccountPresenter.swift */; };
84AEF0242D3DE7D4006E43E5 /* UpgradeToSmartAccountModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEF0232D3DE7D4006E43E5 /* UpgradeToSmartAccountModule.swift */; };
84AEF0262D3DE7E0006E43E5 /* UpgradeToSmartAccountRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEF0252D3DE7E0006E43E5 /* UpgradeToSmartAccountRouter.swift */; };
84B8154E2991099000FAD54E /* BuildConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B8154D2991099000FAD54E /* BuildConfiguration.swift */; };
84B8155B2992A18D00FAD54E /* NotifyMessageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B8155A2992A18D00FAD54E /* NotifyMessageViewModel.swift */; };
84CA52172C88965C0069BB33 /* ReownRouter in Frameworks */ = {isa = PBXBuildFile; productRef = 84CA52162C88965C0069BB33 /* ReownRouter */; };
Expand Down Expand Up @@ -368,13 +379,24 @@
847F08002A25DBFF00B2A5A4 /* XPlatformW3WTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XPlatformW3WTests.swift; sourceTree = "<group>"; };
8487A92E2A7BD2F30003D5AF /* XPlatformProtocolTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = XPlatformProtocolTests.xctestplan; path = ../XPlatformProtocolTests.xctestplan; sourceTree = "<group>"; };
8487A9472A83AD680003D5AF /* LoggingService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingService.swift; sourceTree = "<group>"; };
848BD1D92D34DF5E007C2AEF /* SmartAccountSigner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartAccountSigner.swift; sourceTree = "<group>"; };
848BD1DB2D34DF72007C2AEF /* GasAbstractionSigner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GasAbstractionSigner.swift; sourceTree = "<group>"; };
848BD1DD2D34DF8F007C2AEF /* EOASigner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EOASigner.swift; sourceTree = "<group>"; };
849A4F18298281E300E61ACE /* WalletAppRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WalletAppRelease.entitlements; sourceTree = "<group>"; };
849A4F19298281F100E61ACE /* PNDecryptionServiceRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PNDecryptionServiceRelease.entitlements; sourceTree = "<group>"; };
849D7A92292E2169006A2BD4 /* NotifyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotifyTests.swift; sourceTree = "<group>"; };
84A6E3C22A386BBC008A0571 /* Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Publisher.swift; sourceTree = "<group>"; };
84AA01DA28CF0CD7005D48D8 /* XCTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCTest.swift; sourceTree = "<group>"; };
84AEC24E2B4D1EE400E27A5B /* ActivityIndicatorManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityIndicatorManager.swift; sourceTree = "<group>"; };
84AEC2502B4D42C100E27A5B /* AlertPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertPresenter.swift; sourceTree = "<group>"; };
84AEF0152D3DD8CA006E43E5 /* SendStableCoinView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendStableCoinView.swift; sourceTree = "<group>"; };
84AEF0182D3DD9C0006E43E5 /* SendStableCoinModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendStableCoinModule.swift; sourceTree = "<group>"; };
84AEF01A2D3DD9F1006E43E5 /* SendStableCoinRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendStableCoinRouter.swift; sourceTree = "<group>"; };
84AEF01C2D3DDA0A006E43E5 /* SendStableCoinPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendStableCoinPresenter.swift; sourceTree = "<group>"; };
84AEF01E2D3DE7A0006E43E5 /* UpgradeToSmartAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradeToSmartAccountView.swift; sourceTree = "<group>"; };
84AEF0212D3DE7C8006E43E5 /* UpgradeToSmartAccountPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradeToSmartAccountPresenter.swift; sourceTree = "<group>"; };
84AEF0232D3DE7D4006E43E5 /* UpgradeToSmartAccountModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradeToSmartAccountModule.swift; sourceTree = "<group>"; };
84AEF0252D3DE7E0006E43E5 /* UpgradeToSmartAccountRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradeToSmartAccountRouter.swift; sourceTree = "<group>"; };
84B8154D2991099000FAD54E /* BuildConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildConfiguration.swift; sourceTree = "<group>"; };
84B8155A2992A18D00FAD54E /* NotifyMessageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotifyMessageViewModel.swift; sourceTree = "<group>"; };
84CE641C27981DED00142511 /* DApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -828,6 +850,28 @@
path = Push;
sourceTree = "<group>";
};
84AEF0172D3DD8D3006E43E5 /* SendStableCoin */ = {
isa = PBXGroup;
children = (
84AEF0152D3DD8CA006E43E5 /* SendStableCoinView.swift */,
84AEF0182D3DD9C0006E43E5 /* SendStableCoinModule.swift */,
84AEF01C2D3DDA0A006E43E5 /* SendStableCoinPresenter.swift */,
84AEF01A2D3DD9F1006E43E5 /* SendStableCoinRouter.swift */,
);
path = SendStableCoin;
sourceTree = "<group>";
};
84AEF0202D3DE7B1006E43E5 /* UpgradeToSmartAccount */ = {
isa = PBXGroup;
children = (
84AEF01E2D3DE7A0006E43E5 /* UpgradeToSmartAccountView.swift */,
84AEF0212D3DE7C8006E43E5 /* UpgradeToSmartAccountPresenter.swift */,
84AEF0232D3DE7D4006E43E5 /* UpgradeToSmartAccountModule.swift */,
84AEF0252D3DE7E0006E43E5 /* UpgradeToSmartAccountRouter.swift */,
);
path = UpgradeToSmartAccount;
sourceTree = "<group>";
};
84B815592991217F00FAD54E /* PushMessages */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -963,6 +1007,9 @@
isa = PBXGroup;
children = (
84F568C1279582D200D0A289 /* Signer.swift */,
848BD1D92D34DF5E007C2AEF /* SmartAccountSigner.swift */,
848BD1DB2D34DF72007C2AEF /* GasAbstractionSigner.swift */,
848BD1DD2D34DF8F007C2AEF /* EOASigner.swift */,
A57E71A5291CF76400325797 /* ETHSigner.swift */,
A57E71A7291CF8A500325797 /* SOLSigner.swift */,
);
Expand Down Expand Up @@ -1175,6 +1222,8 @@
847BD1E9298A807000076C90 /* Notifications */,
84B815592991217F00FAD54E /* PushMessages */,
84D88C802CE751EE003A6C16 /* CATransactionModal */,
84AEF0172D3DD8D3006E43E5 /* SendStableCoin */,
84AEF0202D3DE7B1006E43E5 /* UpgradeToSmartAccount */,
);
path = Wallet;
sourceTree = "<group>";
Expand Down Expand Up @@ -1960,11 +2009,13 @@
C56EE241293F566D004840D1 /* WalletModule.swift in Sources */,
C58099352A543CD000AB58F5 /* BlinkAnimation.swift in Sources */,
C56EE245293F566D004840D1 /* WalletPresenter.swift in Sources */,
848BD1DA2D34DF5E007C2AEF /* SmartAccountSigner.swift in Sources */,
C56EE240293F566D004840D1 /* ScanQRView.swift in Sources */,
A51606FB2A2F47BD00CACB92 /* DefaultBIP44Provider.swift in Sources */,
C56EE250293F566D004840D1 /* ScanTargetView.swift in Sources */,
C56EE28F293F5757004840D1 /* MigrationConfigurator.swift in Sources */,
A5A0844029D2F626000B9B17 /* DefaultCryptoProvider.swift in Sources */,
84AEF0262D3DE7E0006E43E5 /* UpgradeToSmartAccountRouter.swift in Sources */,
847BD1DD2989494F00076C90 /* TabPage.swift in Sources */,
A50D53C42ABA055700A4FD8B /* NotifyPreferencesInteractor.swift in Sources */,
A50D53C22ABA055700A4FD8B /* NotifyPreferencesPresenter.swift in Sources */,
Expand All @@ -1979,6 +2030,7 @@
C5B2F71029705827000DBA0E /* EthereumTransaction.swift in Sources */,
A50D53C32ABA055700A4FD8B /* NotifyPreferencesRouter.swift in Sources */,
A5D610C82AB31EE800C20083 /* SegmentedPicker.swift in Sources */,
84AEF01F2D3DE7A0006E43E5 /* UpgradeToSmartAccountView.swift in Sources */,
C56EE271293F56D7004840D1 /* View.swift in Sources */,
A5B4F7C62ABB20AE0099AF7C /* SubscriptionView.swift in Sources */,
C5B2F6FD297055B0000DBA0E /* Signer.swift in Sources */,
Expand All @@ -1999,8 +2051,10 @@
A74D32BA2A1E25AD00CB8536 /* QueryParameters.swift in Sources */,
C56EE270293F56D7004840D1 /* String.swift in Sources */,
A51811A12A52E83100A52B15 /* SettingsRouter.swift in Sources */,
84AEF0222D3DE7C8006E43E5 /* UpgradeToSmartAccountPresenter.swift in Sources */,
C56EE279293F56D7004840D1 /* Color.swift in Sources */,
847BD1E6298A806800076C90 /* NotificationsRouter.swift in Sources */,
848BD1DE2D34DF8F007C2AEF /* EOASigner.swift in Sources */,
C579FEBA2AFCDFA6008855EB /* ConnectedSheetView.swift in Sources */,
C55D3483295DD7140004314A /* AuthRequestView.swift in Sources */,
C56EE243293F566D004840D1 /* ScanView.swift in Sources */,
Expand All @@ -2014,6 +2068,7 @@
C55D34B02965FB750004314A /* SessionProposalRouter.swift in Sources */,
C55D3495295DFA750004314A /* WelcomeRouter.swift in Sources */,
C5B2F6F729705293000DBA0E /* SessionRequestRouter.swift in Sources */,
84AEF01B2D3DD9F1006E43E5 /* SendStableCoinRouter.swift in Sources */,
C56EE24F293F566D004840D1 /* WalletView.swift in Sources */,
C55D34B22965FB750004314A /* SessionProposalView.swift in Sources */,
C56EE248293F566D004840D1 /* ScanQR.swift in Sources */,
Expand All @@ -2023,6 +2078,7 @@
C56EE289293F5757004840D1 /* Application.swift in Sources */,
C56EE273293F56D7004840D1 /* UIColor.swift in Sources */,
A51811982A52E21A00A52B15 /* ConfigurationService.swift in Sources */,
848BD1DC2D34DF72007C2AEF /* GasAbstractionSigner.swift in Sources */,
C5F32A322954816C00A6476E /* ConnectionDetailsPresenter.swift in Sources */,
A5B4F7C32ABB20AE0099AF7C /* SubscriptionInteractor.swift in Sources */,
A50D53C52ABA055700A4FD8B /* NotifyPreferencesView.swift in Sources */,
Expand All @@ -2038,9 +2094,11 @@
C55D3494295DFA750004314A /* WelcomePresenter.swift in Sources */,
C5B2F6F929705293000DBA0E /* SessionRequestPresenter.swift in Sources */,
A57879712A4EDC8100F8D10B /* TextFieldView.swift in Sources */,
84AEF01D2D3DDA0A006E43E5 /* SendStableCoinPresenter.swift in Sources */,
A5D610CA2AB3249100C20083 /* ListingViewModel.swift in Sources */,
84DB38F32983CDAE00BFEE37 /* PushRegisterer.swift in Sources */,
A5D610CE2AB3594100C20083 /* ListingsAPI.swift in Sources */,
84AEF0162D3DD8CA006E43E5 /* SendStableCoinView.swift in Sources */,
84D88C7F2CE751E7003A6C16 /* CATransactionView.swift in Sources */,
C5B2F6FB297055B0000DBA0E /* ETHSigner.swift in Sources */,
C56EE274293F56D7004840D1 /* SceneViewController.swift in Sources */,
Expand All @@ -2051,6 +2109,7 @@
A50B6A382B06697B00162B01 /* ProfilingService.swift in Sources */,
A5B4F7C52ABB20AE0099AF7C /* SubscriptionRouter.swift in Sources */,
C55D3496295DFA750004314A /* WelcomeInteractor.swift in Sources */,
84AEF0242D3DE7D4006E43E5 /* UpgradeToSmartAccountModule.swift in Sources */,
C5B2F6FC297055B0000DBA0E /* SOLSigner.swift in Sources */,
A518119F2A52E83100A52B15 /* SettingsModule.swift in Sources */,
84D88C842CE754CC003A6C16 /* CATransactionModule.swift in Sources */,
Expand All @@ -2061,6 +2120,7 @@
C5F32A2C2954814200A6476E /* ConnectionDetailsModule.swift in Sources */,
C56EE249293F566D004840D1 /* ScanInteractor.swift in Sources */,
C56EE28A293F5757004840D1 /* AppDelegate.swift in Sources */,
84AEF0192D3DD9C0006E43E5 /* SendStableCoinModule.swift in Sources */,
C5FFEA762ADD8956007282A2 /* BrowserModule.swift in Sources */,
C56EE2A3293F6BAF004840D1 /* UIPasteboardWrapper.swift in Sources */,
C5B2F6F629705293000DBA0E /* SessionRequestModule.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@
"repositoryURL": "https://github.com/reown-com/yttrium",
"state": {
"branch": null,
"revision": "eb6e3f8351fc3972df37c9b72c04cd606e01bac9",
"version": "0.5.1"
"revision": "d5bea698587d8163b3fdc858539456f1573aabda",
"version": "0.6.2"
}
}
]
Expand Down
29 changes: 29 additions & 0 deletions Example/Shared/Signer/EOASigner.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import Foundation
import Commons
import WalletConnectSign
import ReownWalletKit
import Web3

final class EOASigner {
func sign(request: Request, importAccount: ImportAccount) async throws -> AnyCodable {
let signer = ETHSigner(importAccount: importAccount)

switch request.method {
case "personal_sign":
return signer.personalSign(request.params)

case "eth_signTypedData":
return signer.signTypedData(request.params)

case "eth_sendTransaction":
return try signer.sendTransaction(request.params)

case "solana_signTransaction":
return SOLSigner.signTransaction(request.params)

default:
// If something is not supported, throw an error or handle it
throw Signer.Errors.notImplemented
}
}
}
86 changes: 86 additions & 0 deletions Example/Shared/Signer/GasAbstractionSigner.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import Foundation
import Commons
import WalletConnectSign
import ReownWalletKit
import Web3

final class GasAbstractionSigner {
func sign(request: Request, importAccount: ImportAccount, chainId: Blockchain) async throws -> AnyCodable {
print("[GasAbstractionSigner] sign() called with request method: \(request.method)")

switch request.method {
case "personal_sign":
print("[GasAbstractionSigner] personal_sign route called — not implemented yet")
throw Signer.Errors.notImplemented

case "eth_sendTransaction":
print("[GasAbstractionSigner] eth_sendTransaction route called")

let calls = try request.params.get([Tx].self)
.map {
print("[GasAbstractionSigner] Tx: \($0)")
return Call(to: $0.to, value: $0.value ?? "", input: $0.data)
}
print("[GasAbstractionSigner] Prepared \(calls.count) calls")

let eoa = try! Account(blockchain: chainId, accountAddress: importAccount.account.address)
let preparedGasAbstraction = try await WalletKit.instance.prepare7702(
EOA: eoa,
calls: calls
)
print("[GasAbstractionSigner] preparedGasAbstraction: \(preparedGasAbstraction)")

let signer = ETHSigner(importAccount: importAccount)

switch preparedGasAbstraction {
case .deploymentRequired(auth: let auth, prepareDeployParams: let prepareDeployParams):
print("[GasAbstractionSigner] Deployment is required")
print("[GasAbstractionSigner] auth hash: \(auth.hash)")

let signature = try signer.signHash(auth.hash)

let authSig = SignedAuthorization(auth: auth.auth, signature: signature)

let preparedSend = try await WalletKit.instance.prepareDeploy(
EOA: eoa,
authSig: authSig,
params: prepareDeployParams
)

let userOpSignature = try signer.signHash(preparedSend.hash)

let userOpReceipt = try await WalletKit.instance.send(
EOA: eoa,
signature: userOpSignature,
params: preparedSend.sendParams
)
print("[GasAbstractionSigner] userOpReceipt: \(userOpReceipt)")

return AnyCodable(userOpReceipt)

case .deploymentNotRequired(preparedSend: let preparedSend):
print("[GasAbstractionSigner] Deployment not required")
print("[GasAbstractionSigner] preparedSend hash: \(preparedSend.hash)")

let signature = try signer.signHash(preparedSend.hash)

let userOpReceipt = try await WalletKit.instance.send(
EOA: eoa,
signature: signature,
params: preparedSend.sendParams
)
print("[GasAbstractionSigner] userOpReceipt: \(userOpReceipt)")

return AnyCodable(userOpReceipt)
}

case "wallet_sendCalls":
print("[GasAbstractionSigner] wallet_sendCalls route called — not implemented yet")
throw Signer.Errors.notImplemented

default:
print("[GasAbstractionSigner] Unsupported method: \(request.method)")
throw Signer.Errors.notImplemented
}
}
}
Loading
Loading