diff --git a/Package.swift b/Package.swift index 62258e6f..9c97098b 100644 --- a/Package.swift +++ b/Package.swift @@ -14,8 +14,8 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.19.1"), - .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.14.1"), + .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.23.0"), + .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.3"), .package(url: "https://github.com/zcash-hackworks/zcash-light-client-ffi", exact: "0.9.1") ], targets: [ diff --git a/Sources/ZcashLightClientKit/DAO/TransactionDao.swift b/Sources/ZcashLightClientKit/DAO/TransactionDao.swift index dfbc435b..70c12e49 100644 --- a/Sources/ZcashLightClientKit/DAO/TransactionDao.swift +++ b/Sources/ZcashLightClientKit/DAO/TransactionDao.swift @@ -10,8 +10,8 @@ import SQLite class TransactionSQLDAO: TransactionRepository { enum NotesTableStructure { - static let transactionID = Expression("tx") - static let memo = Expression("memo") + static let transactionID = SQLite.Expression("tx") + static let memo = SQLite.Expression("memo") } let dbProvider: ConnectionProvider diff --git a/Sources/ZcashLightClientKit/Entity/TransactionEntity.swift b/Sources/ZcashLightClientKit/Entity/TransactionEntity.swift index 2fcccdae..b8eee585 100644 --- a/Sources/ZcashLightClientKit/Entity/TransactionEntity.swift +++ b/Sources/ZcashLightClientKit/Entity/TransactionEntity.swift @@ -102,15 +102,15 @@ public enum ZcashTransaction { extension ZcashTransaction.Output { enum Column { - static let rawID = Expression("txid") - static let pool = Expression("output_pool") - static let index = Expression("output_index") - static let toAccount = Expression("to_account_id") - static let fromAccount = Expression("from_account_id") - static let toAddress = Expression("to_address") - static let value = Expression("value") - static let isChange = Expression("is_change") - static let memo = Expression("memo") + static let rawID = SQLite.Expression("txid") + static let pool = SQLite.Expression("output_pool") + static let index = SQLite.Expression("output_index") + static let toAccount = SQLite.Expression("to_account_id") + static let fromAccount = SQLite.Expression("from_account_id") + static let toAddress = SQLite.Expression("to_address") + static let value = SQLite.Expression("value") + static let isChange = SQLite.Expression("is_change") + static let memo = SQLite.Expression("memo") } init(row: Row) throws { @@ -146,21 +146,21 @@ extension ZcashTransaction.Output { extension ZcashTransaction.Overview { enum Column { - static let accountId = Expression("account_id") - static let minedHeight = Expression("mined_height") - static let index = Expression("tx_index") - static let rawID = Expression("txid") - static let expiryHeight = Expression("expiry_height") - static let raw = Expression("raw") - static let value = Expression("account_balance_delta") - static let fee = Expression("fee_paid") - static let hasChange = Expression("has_change") - static let sentNoteCount = Expression("sent_note_count") - static let receivedNoteCount = Expression("received_note_count") - static let isShielding = Expression("is_shielding") - static let memoCount = Expression("memo_count") - static let blockTime = Expression("block_time") - static let expiredUnmined = Expression("expired_unmined") + static let accountId = SQLite.Expression("account_id") + static let minedHeight = SQLite.Expression("mined_height") + static let index = SQLite.Expression("tx_index") + static let rawID = SQLite.Expression("txid") + static let expiryHeight = SQLite.Expression("expiry_height") + static let raw = SQLite.Expression("raw") + static let value = SQLite.Expression("account_balance_delta") + static let fee = SQLite.Expression("fee_paid") + static let hasChange = SQLite.Expression("has_change") + static let sentNoteCount = SQLite.Expression("sent_note_count") + static let receivedNoteCount = SQLite.Expression("received_note_count") + static let isShielding = SQLite.Expression("is_shielding") + static let memoCount = SQLite.Expression("memo_count") + static let blockTime = SQLite.Expression("block_time") + static let expiredUnmined = SQLite.Expression("expired_unmined") } init(row: Row) throws {