base58

Author: xueyuejie

Package.resolved

@@ -16,7 +16,7 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(name: "Base58Swift", url: "https://github.com/mathwallet/Base58Swift.git", from: "3.0.0"),
+        .package(name: "Base58Swift", url: "https://github.com/mathwallet/Base58Swift", from: "0.0.1"),
         .package(name:"Blake2",url: "https://github.com/tesseract-one/Blake2.swift.git", from: "0.1.2"),
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.4.1"),
         .package(name:"BIP39swift", url: "https://github.com/mathwallet/BIP39swift", from: "1.0.1"),

Package.swift

@@ -19,11 +19,11 @@ public struct TezosAddress {
 
     public var address: String {
         let addressBytes = TezosPrefix.tz1 + data.bytes
-        return Base58.base58CheckEncode(addressBytes)
+        return addressBytes.base58CheckEncodedString
     }
 
     public init?(_ address: String) {
-        guard let addressBytes = Base58.base58CheckDecode(address), addressBytes.count == TezosAddress.SIZE + TezosPrefix.tz1.count else {
+        guard let addressBytes = address.base58CheckDecodedData, addressBytes.count == TezosAddress.SIZE + TezosPrefix.tz1.count else {
             return nil
         }
         self.data = Data(addressBytes[3..<addressBytes.endIndex])
@@ -46,7 +46,8 @@ public struct TezosKeypair {
     }
 
     public var privateKey: String {
-        return Base58.base58CheckEncode(TezosPrefix.edsk + secretKey.bytes)
+        let privateKeyBytes = TezosPrefix.edsk + secretKey.bytes
+        return privateKeyBytes.base58CheckEncodedString
     }
 
     public init(secretKey: Data) throws {
@@ -55,7 +56,7 @@ public struct TezosKeypair {
     }
 
     public init(privateKey: String) throws {
-        guard let privateBytes = Base58.base58CheckDecode(privateKey) else {
+        guard let privateBytes = privateKey.base58CheckDecodedData else {
             throw Error.invalidPrivateKey
         }
         try self.init(secretKey:Data(privateBytes[4..<privateBytes.endIndex]))

Sources/TezosSwift/TezosKeypair.swift

@@ -50,7 +50,8 @@ public class TezosTransaction {
 
     public func sign(keypair: TezosKeypair) {
         if let _forgeString = self.forgeString, let signatureData = self.signHexString(keypair: keypair, hexString:_forgeString) {
-            self.signatureString = Base58.base58CheckEncode(TezosPrefix.edsig + signatureData.bytes)
+            let signatureBytes = TezosPrefix.edsig + signatureData.bytes
+            self.signatureString = signatureBytes.base58CheckEncodedString
             self.sendString = _forgeString + signatureData.toHexString()
         }
     }