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.

Sign up for GitHub

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

Fix vault protocol #5

Merged
merged 2 commits into from
Jul 15, 2024
Merged

Fix vault protocol #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd30b6f
Fix vault protocol
yvebe Jul 12, 2024
f051ab3
Update kt&swift files
yvebe Jul 15, 2024
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
130 changes: 24 additions & 106 deletions Sources/swift/vultisig/vault/v1/vault.pb.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,59 +25,32 @@ public struct VSVault {
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.

public var version: String = String()
public var name: String = String()

public var vault: VSVault.VaultDetail {
get {return _vault ?? VSVault.VaultDetail()}
set {_vault = newValue}
}
/// Returns true if `vault` has been explicitly set.
public var hasVault: Bool {return self._vault != nil}
/// Clears the value of `vault`. Subsequent reads from it will return its default value.
public mutating func clearVault() {self._vault = nil}

public var passwordProtected: Bool = false

public var unknownFields = SwiftProtobuf.UnknownStorage()

public struct VaultDetail {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.

public var name: String = String()

public var publikcKeyEcdsa: String = String()

public var publicKeyEddsa: String = String()

public var signers: [String] = []

public var createdAt: SwiftProtobuf.Google_Protobuf_Timestamp {
get {return _createdAt ?? SwiftProtobuf.Google_Protobuf_Timestamp()}
set {_createdAt = newValue}
}
/// Returns true if `createdAt` has been explicitly set.
public var hasCreatedAt: Bool {return self._createdAt != nil}
/// Clears the value of `createdAt`. Subsequent reads from it will return its default value.
public mutating func clearCreatedAt() {self._createdAt = nil}
public var publicKeyEcdsa: String = String()

public var hexChainCode: String = String()
public var publicKeyEddsa: String = String()

public var keyShares: [VSVault.KeyShare] = []
public var signers: [String] = []

public var localPartyID: String = String()
public var createdAt: SwiftProtobuf.Google_Protobuf_Timestamp {
get {return _createdAt ?? SwiftProtobuf.Google_Protobuf_Timestamp()}
set {_createdAt = newValue}
}
/// Returns true if `createdAt` has been explicitly set.
public var hasCreatedAt: Bool {return self._createdAt != nil}
/// Clears the value of `createdAt`. Subsequent reads from it will return its default value.
public mutating func clearCreatedAt() {self._createdAt = nil}

public var resharePrefix: String = String()
public var hexChainCode: String = String()

public var order: Int64 = 0
public var keyShares: [VSVault.KeyShare] = []

public var unknownFields = SwiftProtobuf.UnknownStorage()
public var localPartyID: String = String()

public init() {}
public var resharePrefix: String = String()

fileprivate var _createdAt: SwiftProtobuf.Google_Protobuf_Timestamp? = nil
}
public var unknownFields = SwiftProtobuf.UnknownStorage()

public struct KeyShare {
// SwiftProtobuf.Message conformance is added in an extension below. See the
Expand All @@ -95,12 +68,11 @@ public struct VSVault {

public init() {}

fileprivate var _vault: VSVault.VaultDetail? = nil
fileprivate var _createdAt: SwiftProtobuf.Google_Protobuf_Timestamp? = nil
}

#if swift(>=5.5) && canImport(_Concurrency)
extension VSVault: @unchecked Sendable {}
extension VSVault.VaultDetail: @unchecked Sendable {}
extension VSVault.KeyShare: @unchecked Sendable {}
#endif // swift(>=5.5) && canImport(_Concurrency)

Expand All @@ -110,65 +82,16 @@ fileprivate let _protobuf_package = "vultisig.vault.v1"

extension VSVault: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
public static let protoMessageName: String = _protobuf_package + ".Vault"
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1: .same(proto: "version"),
2: .same(proto: "vault"),
3: .standard(proto: "password_protected"),
]

public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
// The use of inline closures is to circumvent an issue where the compiler
// allocates stack space for every case branch when no optimizations are
// enabled. https://github.com/apple/swift-protobuf/issues/1034
switch fieldNumber {
case 1: try { try decoder.decodeSingularStringField(value: &self.version) }()
case 2: try { try decoder.decodeSingularMessageField(value: &self._vault) }()
case 3: try { try decoder.decodeSingularBoolField(value: &self.passwordProtected) }()
default: break
}
}
}

public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
// The use of inline closures is to circumvent an issue where the compiler
// allocates stack space for every if/case branch local when no optimizations
// are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
// https://github.com/apple/swift-protobuf/issues/1182
if !self.version.isEmpty {
try visitor.visitSingularStringField(value: self.version, fieldNumber: 1)
}
try { if let v = self._vault {
try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
} }()
if self.passwordProtected != false {
try visitor.visitSingularBoolField(value: self.passwordProtected, fieldNumber: 3)
}
try unknownFields.traverse(visitor: &visitor)
}

public static func ==(lhs: VSVault, rhs: VSVault) -> Bool {
if lhs.version != rhs.version {return false}
if lhs._vault != rhs._vault {return false}
if lhs.passwordProtected != rhs.passwordProtected {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}
}

extension VSVault.VaultDetail: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
public static let protoMessageName: String = VSVault.protoMessageName + ".VaultDetail"
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1: .same(proto: "name"),
2: .standard(proto: "publikc_key_ecdsa"),
2: .standard(proto: "public_key_ecdsa"),
3: .standard(proto: "public_key_eddsa"),
4: .same(proto: "signers"),
5: .standard(proto: "created_at"),
6: .standard(proto: "hex_chain_code"),
7: .standard(proto: "key_shares"),
8: .standard(proto: "local_party_id"),
9: .standard(proto: "reshare_prefix"),
10: .same(proto: "order"),
]

public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
Expand All @@ -178,15 +101,14 @@ extension VSVault.VaultDetail: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
// enabled. https://github.com/apple/swift-protobuf/issues/1034
switch fieldNumber {
case 1: try { try decoder.decodeSingularStringField(value: &self.name) }()
case 2: try { try decoder.decodeSingularStringField(value: &self.publikcKeyEcdsa) }()
case 2: try { try decoder.decodeSingularStringField(value: &self.publicKeyEcdsa) }()
case 3: try { try decoder.decodeSingularStringField(value: &self.publicKeyEddsa) }()
case 4: try { try decoder.decodeRepeatedStringField(value: &self.signers) }()
case 5: try { try decoder.decodeSingularMessageField(value: &self._createdAt) }()
case 6: try { try decoder.decodeSingularStringField(value: &self.hexChainCode) }()
case 7: try { try decoder.decodeRepeatedMessageField(value: &self.keyShares) }()
case 8: try { try decoder.decodeSingularStringField(value: &self.localPartyID) }()
case 9: try { try decoder.decodeSingularStringField(value: &self.resharePrefix) }()
case 10: try { try decoder.decodeSingularInt64Field(value: &self.order) }()
default: break
}
}
Expand All @@ -200,8 +122,8 @@ extension VSVault.VaultDetail: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
if !self.name.isEmpty {
try visitor.visitSingularStringField(value: self.name, fieldNumber: 1)
}
if !self.publikcKeyEcdsa.isEmpty {
try visitor.visitSingularStringField(value: self.publikcKeyEcdsa, fieldNumber: 2)
if !self.publicKeyEcdsa.isEmpty {
try visitor.visitSingularStringField(value: self.publicKeyEcdsa, fieldNumber: 2)
}
if !self.publicKeyEddsa.isEmpty {
try visitor.visitSingularStringField(value: self.publicKeyEddsa, fieldNumber: 3)
Expand All @@ -224,23 +146,19 @@ extension VSVault.VaultDetail: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
if !self.resharePrefix.isEmpty {
try visitor.visitSingularStringField(value: self.resharePrefix, fieldNumber: 9)
}
if self.order != 0 {
try visitor.visitSingularInt64Field(value: self.order, fieldNumber: 10)
}
try unknownFields.traverse(visitor: &visitor)
}

public static func ==(lhs: VSVault.VaultDetail, rhs: VSVault.VaultDetail) -> Bool {
public static func ==(lhs: VSVault, rhs: VSVault) -> Bool {
if lhs.name != rhs.name {return false}
if lhs.publikcKeyEcdsa != rhs.publikcKeyEcdsa {return false}
if lhs.publicKeyEcdsa != rhs.publicKeyEcdsa {return false}
if lhs.publicKeyEddsa != rhs.publicKeyEddsa {return false}
if lhs.signers != rhs.signers {return false}
if lhs._createdAt != rhs._createdAt {return false}
if lhs.hexChainCode != rhs.hexChainCode {return false}
if lhs.keyShares != rhs.keyShares {return false}
if lhs.localPartyID != rhs.localPartyID {return false}
if lhs.resharePrefix != rhs.resharePrefix {return false}
if lhs.order != rhs.order {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}
Expand Down
92 changes: 92 additions & 0 deletions Sources/swift/vultisig/vault/v1/vault_container.pb.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
// DO NOT EDIT.
// swift-format-ignore-file
//
// Generated by the Swift generator plugin for the protocol buffer compiler.
// Source: vultisig/vault/v1/vault_container.proto
//
// For information on using the generated types, please see the documentation:
// https://github.com/apple/swift-protobuf/

import Foundation
import SwiftProtobuf

// If the compiler emits an error on this type, it is because this file
// was generated by a version of the `protoc` Swift plug-in that is
// incompatible with the version of SwiftProtobuf to which you are linking.
// Please ensure that you are building against the same version of the API
// that was used to generate this file.
fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
typealias Version = _2
}

public struct VSVaultContainer {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.

/// version of data format
public var version: String = String()

/// vault contained the container
public var vault: String = String()

/// is vault encrypted with password
public var isEncrypted: Bool = false

public var unknownFields = SwiftProtobuf.UnknownStorage()

public init() {}
}

#if swift(>=5.5) && canImport(_Concurrency)
extension VSVaultContainer: @unchecked Sendable {}
#endif // swift(>=5.5) && canImport(_Concurrency)

// MARK: - Code below here is support for the SwiftProtobuf runtime.

fileprivate let _protobuf_package = "vultisig.vault.v1"

extension VSVaultContainer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
public static let protoMessageName: String = _protobuf_package + ".VaultContainer"
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1: .same(proto: "version"),
2: .same(proto: "vault"),
3: .standard(proto: "is_encrypted"),
]

public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
// The use of inline closures is to circumvent an issue where the compiler
// allocates stack space for every case branch when no optimizations are
// enabled. https://github.com/apple/swift-protobuf/issues/1034
switch fieldNumber {
case 1: try { try decoder.decodeSingularStringField(value: &self.version) }()
case 2: try { try decoder.decodeSingularStringField(value: &self.vault) }()
case 3: try { try decoder.decodeSingularBoolField(value: &self.isEncrypted) }()
default: break
}
}
}

public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
if !self.version.isEmpty {
try visitor.visitSingularStringField(value: self.version, fieldNumber: 1)
}
if !self.vault.isEmpty {
try visitor.visitSingularStringField(value: self.vault, fieldNumber: 2)
}
if self.isEncrypted != false {
try visitor.visitSingularBoolField(value: self.isEncrypted, fieldNumber: 3)
}
try unknownFields.traverse(visitor: &visitor)
}

public static func ==(lhs: VSVaultContainer, rhs: VSVaultContainer) -> Bool {
if lhs.version != rhs.version {return false}
if lhs.vault != rhs.vault {return false}
if lhs.isEncrypted != rhs.isEncrypted {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}
}
Loading