From dd30b6f1d411c549aaf37fb0ab8e7e747fd89eb4 Mon Sep 17 00:00:00 2001 From: Yuri Golubev <14962060+YGolybev@users.noreply.github.com> Date: Fri, 12 Jul 2024 11:47:46 +0400 Subject: [PATCH 1/2] Fix vault protocol --- proto/vultisig/vault/v1/vault.proto | 24 +++++++------------ proto/vultisig/vault/v1/vault_container.proto | 14 +++++++++++ 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 proto/vultisig/vault/v1/vault_container.proto diff --git a/proto/vultisig/vault/v1/vault.proto b/proto/vultisig/vault/v1/vault.proto index 947b1ee..b2c45a4 100644 --- a/proto/vultisig/vault/v1/vault.proto +++ b/proto/vultisig/vault/v1/vault.proto @@ -7,21 +7,15 @@ option java_package = "vultisig.vault.v1"; option swift_prefix = "VS"; message Vault { - string version = 1; - VaultDetail vault = 2; - bool password_protected = 3; - - message VaultDetail { - string name = 1; - string public_key_ecdsa = 2; - string public_key_eddsa = 3; - repeated string signers = 4; - google.protobuf.Timestamp created_at = 5; - string hex_chain_code = 6; - repeated KeyShare key_shares = 7; - string local_party_id = 8; - string reshare_prefix = 9; - } + string name = 1; + string public_key_ecdsa = 2; + string public_key_eddsa = 3; + repeated string signers = 4; + google.protobuf.Timestamp created_at = 5; + string hex_chain_code = 6; + repeated KeyShare key_shares = 7; + string local_party_id = 8; + string reshare_prefix = 9; message KeyShare { string public_key = 1; diff --git a/proto/vultisig/vault/v1/vault_container.proto b/proto/vultisig/vault/v1/vault_container.proto new file mode 100644 index 0000000..a351bfa --- /dev/null +++ b/proto/vultisig/vault/v1/vault_container.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +package vultisig.vault.v1; + +option java_package = "vultisig.vault.v1"; +option swift_prefix = "VS"; + +message VaultContainer { + // version of data format + string version = 1; + // vault contained the container + string vault = 2; + // is vault encrypted with password + bool is_encrypted = 3; +} From f051ab37461a995ee6cd3444b4851e310ca667d8 Mon Sep 17 00:00:00 2001 From: Yuri Golubev <14962060+YGolybev@users.noreply.github.com> Date: Mon, 15 Jul 2024 08:36:03 +0400 Subject: [PATCH 2/2] Update kt&swift files --- .../swift/vultisig/vault/v1/vault.pb.swift | 130 +--- .../vault/v1/vault_container.pb.swift | 92 +++ .../vultisig/vault/v1/VaultContainerKt.kt | 110 ++++ .../vault/v1/VaultContainerOuterClassKt.kt | 8 + .../main/kotlin/vultisig/vault/v1/VaultKt.kt | 577 +++++++----------- 5 files changed, 469 insertions(+), 448 deletions(-) create mode 100644 Sources/swift/vultisig/vault/v1/vault_container.pb.swift create mode 100644 kotlin/src/main/kotlin/vultisig/vault/v1/VaultContainerKt.kt create mode 100644 kotlin/src/main/kotlin/vultisig/vault/v1/VaultContainerOuterClassKt.kt diff --git a/Sources/swift/vultisig/vault/v1/vault.pb.swift b/Sources/swift/vultisig/vault/v1/vault.pb.swift index b10b3df..f049873 100644 --- a/Sources/swift/vultisig/vault/v1/vault.pb.swift +++ b/Sources/swift/vultisig/vault/v1/vault.pb.swift @@ -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 @@ -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) @@ -110,57 +82,9 @@ 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(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(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"), @@ -168,7 +92,6 @@ extension VSVault.VaultDetail: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl 7: .standard(proto: "key_shares"), 8: .standard(proto: "local_party_id"), 9: .standard(proto: "reshare_prefix"), - 10: .same(proto: "order"), ] public mutating func decodeMessage(decoder: inout D) throws { @@ -178,7 +101,7 @@ 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) }() @@ -186,7 +109,6 @@ extension VSVault.VaultDetail: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl 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 } } @@ -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) @@ -224,15 +146,12 @@ 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} @@ -240,7 +159,6 @@ extension VSVault.VaultDetail: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl 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 } diff --git a/Sources/swift/vultisig/vault/v1/vault_container.pb.swift b/Sources/swift/vultisig/vault/v1/vault_container.pb.swift new file mode 100644 index 0000000..3402bef --- /dev/null +++ b/Sources/swift/vultisig/vault/v1/vault_container.pb.swift @@ -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(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(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 + } +} diff --git a/kotlin/src/main/kotlin/vultisig/vault/v1/VaultContainerKt.kt b/kotlin/src/main/kotlin/vultisig/vault/v1/VaultContainerKt.kt new file mode 100644 index 0000000..8e3cad6 --- /dev/null +++ b/kotlin/src/main/kotlin/vultisig/vault/v1/VaultContainerKt.kt @@ -0,0 +1,110 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE +// source: vultisig/vault/v1/vault_container.proto + +// Generated files should ignore deprecation warnings +@file:Suppress("DEPRECATION") +package vultisig.vault.v1; + +@kotlin.jvm.JvmName("-initializevaultContainer") +public inline fun vaultContainer(block: vultisig.vault.v1.VaultContainerKt.Dsl.() -> kotlin.Unit): vultisig.vault.v1.VaultContainerOuterClass.VaultContainer = + vultisig.vault.v1.VaultContainerKt.Dsl._create(vultisig.vault.v1.VaultContainerOuterClass.VaultContainer.newBuilder()).apply { block() }._build() +/** + * Protobuf type `vultisig.vault.v1.VaultContainer` + */ +public object VaultContainerKt { + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + @com.google.protobuf.kotlin.ProtoDslMarker + public class Dsl private constructor( + private val _builder: vultisig.vault.v1.VaultContainerOuterClass.VaultContainer.Builder + ) { + public companion object { + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _create(builder: vultisig.vault.v1.VaultContainerOuterClass.VaultContainer.Builder): Dsl = Dsl(builder) + } + + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _build(): vultisig.vault.v1.VaultContainerOuterClass.VaultContainer = _builder.build() + + /** + * ``` + * version of data format + * ``` + * + * `string version = 1 [json_name = "version"];` + */ + public var version: kotlin.String + @JvmName("getVersion") + get() = _builder.getVersion() + @JvmName("setVersion") + set(value) { + _builder.setVersion(value) + } + /** + * ``` + * version of data format + * ``` + * + * `string version = 1 [json_name = "version"];` + */ + public fun clearVersion() { + _builder.clearVersion() + } + + /** + * ``` + * vault contained the container + * ``` + * + * `string vault = 2 [json_name = "vault"];` + */ + public var vault: kotlin.String + @JvmName("getVault") + get() = _builder.getVault() + @JvmName("setVault") + set(value) { + _builder.setVault(value) + } + /** + * ``` + * vault contained the container + * ``` + * + * `string vault = 2 [json_name = "vault"];` + */ + public fun clearVault() { + _builder.clearVault() + } + + /** + * ``` + * is vault encrypted with password + * ``` + * + * `bool is_encrypted = 3 [json_name = "isEncrypted"];` + */ + public var isEncrypted: kotlin.Boolean + @JvmName("getIsEncrypted") + get() = _builder.getIsEncrypted() + @JvmName("setIsEncrypted") + set(value) { + _builder.setIsEncrypted(value) + } + /** + * ``` + * is vault encrypted with password + * ``` + * + * `bool is_encrypted = 3 [json_name = "isEncrypted"];` + */ + public fun clearIsEncrypted() { + _builder.clearIsEncrypted() + } + } +} +@kotlin.jvm.JvmSynthetic +public inline fun vultisig.vault.v1.VaultContainerOuterClass.VaultContainer.copy(block: `vultisig.vault.v1`.VaultContainerKt.Dsl.() -> kotlin.Unit): vultisig.vault.v1.VaultContainerOuterClass.VaultContainer = + `vultisig.vault.v1`.VaultContainerKt.Dsl._create(this.toBuilder()).apply { block() }._build() + diff --git a/kotlin/src/main/kotlin/vultisig/vault/v1/VaultContainerOuterClassKt.kt b/kotlin/src/main/kotlin/vultisig/vault/v1/VaultContainerOuterClassKt.kt new file mode 100644 index 0000000..aa387ba --- /dev/null +++ b/kotlin/src/main/kotlin/vultisig/vault/v1/VaultContainerOuterClassKt.kt @@ -0,0 +1,8 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE +// source: vultisig/vault/v1/vault_container.proto + +// Generated files should ignore deprecation warnings +@file:Suppress("DEPRECATION") +package vultisig.vault.v1; + diff --git a/kotlin/src/main/kotlin/vultisig/vault/v1/VaultKt.kt b/kotlin/src/main/kotlin/vultisig/vault/v1/VaultKt.kt index 1eee61d..e009992 100644 --- a/kotlin/src/main/kotlin/vultisig/vault/v1/VaultKt.kt +++ b/kotlin/src/main/kotlin/vultisig/vault/v1/VaultKt.kt @@ -29,373 +29,273 @@ public object VaultKt { internal fun _build(): vultisig.vault.v1.VaultOuterClass.Vault = _builder.build() /** - * `string version = 1 [json_name = "version"];` + * `string name = 1 [json_name = "name"];` */ - public var version: kotlin.String - @JvmName("getVersion") - get() = _builder.getVersion() - @JvmName("setVersion") + public var name: kotlin.String + @JvmName("getName") + get() = _builder.getName() + @JvmName("setName") set(value) { - _builder.setVersion(value) + _builder.setName(value) } /** - * `string version = 1 [json_name = "version"];` + * `string name = 1 [json_name = "name"];` */ - public fun clearVersion() { - _builder.clearVersion() + public fun clearName() { + _builder.clearName() } /** - * `.vultisig.vault.v1.Vault.VaultDetail vault = 2 [json_name = "vault"];` + * `string public_key_ecdsa = 2 [json_name = "publicKeyEcdsa"];` */ - public var vault: vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail - @JvmName("getVault") - get() = _builder.getVault() - @JvmName("setVault") + public var publicKeyEcdsa: kotlin.String + @JvmName("getPublicKeyEcdsa") + get() = _builder.getPublicKeyEcdsa() + @JvmName("setPublicKeyEcdsa") set(value) { - _builder.setVault(value) + _builder.setPublicKeyEcdsa(value) } /** - * `.vultisig.vault.v1.Vault.VaultDetail vault = 2 [json_name = "vault"];` + * `string public_key_ecdsa = 2 [json_name = "publicKeyEcdsa"];` */ - public fun clearVault() { - _builder.clearVault() + public fun clearPublicKeyEcdsa() { + _builder.clearPublicKeyEcdsa() } - /** - * `.vultisig.vault.v1.Vault.VaultDetail vault = 2 [json_name = "vault"];` - * @return Whether the vault field is set. - */ - public fun hasVault(): kotlin.Boolean { - return _builder.hasVault() - } - public val VaultKt.Dsl.vaultOrNull: vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail? - get() = _builder.vaultOrNull /** - * `bool password_protected = 3 [json_name = "passwordProtected"];` + * `string public_key_eddsa = 3 [json_name = "publicKeyEddsa"];` */ - public var passwordProtected: kotlin.Boolean - @JvmName("getPasswordProtected") - get() = _builder.getPasswordProtected() - @JvmName("setPasswordProtected") + public var publicKeyEddsa: kotlin.String + @JvmName("getPublicKeyEddsa") + get() = _builder.getPublicKeyEddsa() + @JvmName("setPublicKeyEddsa") set(value) { - _builder.setPasswordProtected(value) + _builder.setPublicKeyEddsa(value) } /** - * `bool password_protected = 3 [json_name = "passwordProtected"];` + * `string public_key_eddsa = 3 [json_name = "publicKeyEddsa"];` */ - public fun clearPasswordProtected() { - _builder.clearPasswordProtected() + public fun clearPublicKeyEddsa() { + _builder.clearPublicKeyEddsa() } - } - @kotlin.jvm.JvmName("-initializevaultDetail") - public inline fun vaultDetail(block: vultisig.vault.v1.VaultKt.VaultDetailKt.Dsl.() -> kotlin.Unit): vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail = - vultisig.vault.v1.VaultKt.VaultDetailKt.Dsl._create(vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail.newBuilder()).apply { block() }._build() - /** - * Protobuf type `vultisig.vault.v1.Vault.VaultDetail` - */ - public object VaultDetailKt { - @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) - @com.google.protobuf.kotlin.ProtoDslMarker - public class Dsl private constructor( - private val _builder: vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail.Builder - ) { - public companion object { - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _create(builder: vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail.Builder): Dsl = Dsl(builder) - } + /** + * An uninstantiable, behaviorless type to represent the field in + * generics. + */ + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + public class SignersProxy private constructor() : com.google.protobuf.kotlin.DslProxy() + /** + * `repeated string signers = 4 [json_name = "signers"];` + * @return A list containing the signers. + */ + public val signers: com.google.protobuf.kotlin.DslList @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _build(): vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail = _builder.build() - - /** - * `string name = 1 [json_name = "name"];` - */ - public var name: kotlin.String - @JvmName("getName") - get() = _builder.getName() - @JvmName("setName") - set(value) { - _builder.setName(value) - } - /** - * `string name = 1 [json_name = "name"];` - */ - public fun clearName() { - _builder.clearName() - } - - /** - * `string publikc_key_ecdsa = 2 [json_name = "publikcKeyEcdsa"];` - */ - public var publikcKeyEcdsa: kotlin.String - @JvmName("getPublikcKeyEcdsa") - get() = _builder.getPublikcKeyEcdsa() - @JvmName("setPublikcKeyEcdsa") - set(value) { - _builder.setPublikcKeyEcdsa(value) - } - /** - * `string publikc_key_ecdsa = 2 [json_name = "publikcKeyEcdsa"];` - */ - public fun clearPublikcKeyEcdsa() { - _builder.clearPublikcKeyEcdsa() - } - - /** - * `string public_key_eddsa = 3 [json_name = "publicKeyEddsa"];` - */ - public var publicKeyEddsa: kotlin.String - @JvmName("getPublicKeyEddsa") - get() = _builder.getPublicKeyEddsa() - @JvmName("setPublicKeyEddsa") - set(value) { - _builder.setPublicKeyEddsa(value) - } - /** - * `string public_key_eddsa = 3 [json_name = "publicKeyEddsa"];` - */ - public fun clearPublicKeyEddsa() { - _builder.clearPublicKeyEddsa() - } - - /** - * An uninstantiable, behaviorless type to represent the field in - * generics. - */ - @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) - public class SignersProxy private constructor() : com.google.protobuf.kotlin.DslProxy() - /** - * `repeated string signers = 4 [json_name = "signers"];` - * @return A list containing the signers. - */ - public val signers: com.google.protobuf.kotlin.DslList - @kotlin.jvm.JvmSynthetic - get() = com.google.protobuf.kotlin.DslList( - _builder.getSignersList() - ) - /** - * `repeated string signers = 4 [json_name = "signers"];` - * @param value The signers to add. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("addSigners") - public fun com.google.protobuf.kotlin.DslList.add(value: kotlin.String) { - _builder.addSigners(value) - } - /** - * `repeated string signers = 4 [json_name = "signers"];` - * @param value The signers to add. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("plusAssignSigners") - @Suppress("NOTHING_TO_INLINE") - public inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(value: kotlin.String) { - add(value) - } - /** - * `repeated string signers = 4 [json_name = "signers"];` - * @param values The signers to add. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("addAllSigners") - public fun com.google.protobuf.kotlin.DslList.addAll(values: kotlin.collections.Iterable) { - _builder.addAllSigners(values) - } - /** - * `repeated string signers = 4 [json_name = "signers"];` - * @param values The signers to add. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("plusAssignAllSigners") - @Suppress("NOTHING_TO_INLINE") - public inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(values: kotlin.collections.Iterable) { - addAll(values) - } - /** - * `repeated string signers = 4 [json_name = "signers"];` - * @param index The index to set the value at. - * @param value The signers to set. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("setSigners") - public operator fun com.google.protobuf.kotlin.DslList.set(index: kotlin.Int, value: kotlin.String) { - _builder.setSigners(index, value) - }/** - * `repeated string signers = 4 [json_name = "signers"];` - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("clearSigners") - public fun com.google.protobuf.kotlin.DslList.clear() { - _builder.clearSigners() - } - /** - * `.google.protobuf.Timestamp created_at = 5 [json_name = "createdAt"];` - */ - public var createdAt: com.google.protobuf.Timestamp - @JvmName("getCreatedAt") - get() = _builder.getCreatedAt() - @JvmName("setCreatedAt") - set(value) { - _builder.setCreatedAt(value) - } - /** - * `.google.protobuf.Timestamp created_at = 5 [json_name = "createdAt"];` - */ - public fun clearCreatedAt() { - _builder.clearCreatedAt() - } - /** - * `.google.protobuf.Timestamp created_at = 5 [json_name = "createdAt"];` - * @return Whether the createdAt field is set. - */ - public fun hasCreatedAt(): kotlin.Boolean { - return _builder.hasCreatedAt() + get() = com.google.protobuf.kotlin.DslList( + _builder.getSignersList() + ) + /** + * `repeated string signers = 4 [json_name = "signers"];` + * @param value The signers to add. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("addSigners") + public fun com.google.protobuf.kotlin.DslList.add(value: kotlin.String) { + _builder.addSigners(value) + } + /** + * `repeated string signers = 4 [json_name = "signers"];` + * @param value The signers to add. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("plusAssignSigners") + @Suppress("NOTHING_TO_INLINE") + public inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(value: kotlin.String) { + add(value) + } + /** + * `repeated string signers = 4 [json_name = "signers"];` + * @param values The signers to add. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("addAllSigners") + public fun com.google.protobuf.kotlin.DslList.addAll(values: kotlin.collections.Iterable) { + _builder.addAllSigners(values) + } + /** + * `repeated string signers = 4 [json_name = "signers"];` + * @param values The signers to add. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("plusAssignAllSigners") + @Suppress("NOTHING_TO_INLINE") + public inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(values: kotlin.collections.Iterable) { + addAll(values) + } + /** + * `repeated string signers = 4 [json_name = "signers"];` + * @param index The index to set the value at. + * @param value The signers to set. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("setSigners") + public operator fun com.google.protobuf.kotlin.DslList.set(index: kotlin.Int, value: kotlin.String) { + _builder.setSigners(index, value) + }/** + * `repeated string signers = 4 [json_name = "signers"];` + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("clearSigners") + public fun com.google.protobuf.kotlin.DslList.clear() { + _builder.clearSigners() + } + /** + * `.google.protobuf.Timestamp created_at = 5 [json_name = "createdAt"];` + */ + public var createdAt: com.google.protobuf.Timestamp + @JvmName("getCreatedAt") + get() = _builder.getCreatedAt() + @JvmName("setCreatedAt") + set(value) { + _builder.setCreatedAt(value) } - public val VaultDetailKt.Dsl.createdAtOrNull: com.google.protobuf.Timestamp? - get() = _builder.createdAtOrNull + /** + * `.google.protobuf.Timestamp created_at = 5 [json_name = "createdAt"];` + */ + public fun clearCreatedAt() { + _builder.clearCreatedAt() + } + /** + * `.google.protobuf.Timestamp created_at = 5 [json_name = "createdAt"];` + * @return Whether the createdAt field is set. + */ + public fun hasCreatedAt(): kotlin.Boolean { + return _builder.hasCreatedAt() + } + public val VaultKt.Dsl.createdAtOrNull: com.google.protobuf.Timestamp? + get() = _builder.createdAtOrNull - /** - * `string hex_chain_code = 6 [json_name = "hexChainCode"];` - */ - public var hexChainCode: kotlin.String - @JvmName("getHexChainCode") - get() = _builder.getHexChainCode() - @JvmName("setHexChainCode") - set(value) { - _builder.setHexChainCode(value) - } - /** - * `string hex_chain_code = 6 [json_name = "hexChainCode"];` - */ - public fun clearHexChainCode() { - _builder.clearHexChainCode() + /** + * `string hex_chain_code = 6 [json_name = "hexChainCode"];` + */ + public var hexChainCode: kotlin.String + @JvmName("getHexChainCode") + get() = _builder.getHexChainCode() + @JvmName("setHexChainCode") + set(value) { + _builder.setHexChainCode(value) } + /** + * `string hex_chain_code = 6 [json_name = "hexChainCode"];` + */ + public fun clearHexChainCode() { + _builder.clearHexChainCode() + } - /** - * An uninstantiable, behaviorless type to represent the field in - * generics. - */ - @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) - public class KeySharesProxy private constructor() : com.google.protobuf.kotlin.DslProxy() - /** - * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` - */ - public val keyShares: com.google.protobuf.kotlin.DslList - @kotlin.jvm.JvmSynthetic - get() = com.google.protobuf.kotlin.DslList( - _builder.getKeySharesList() - ) - /** - * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` - * @param value The keyShares to add. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("addKeyShares") - public fun com.google.protobuf.kotlin.DslList.add(value: vultisig.vault.v1.VaultOuterClass.Vault.KeyShare) { - _builder.addKeyShares(value) - } - /** - * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` - * @param value The keyShares to add. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("plusAssignKeyShares") - @Suppress("NOTHING_TO_INLINE") - public inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(value: vultisig.vault.v1.VaultOuterClass.Vault.KeyShare) { - add(value) - } - /** - * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` - * @param values The keyShares to add. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("addAllKeyShares") - public fun com.google.protobuf.kotlin.DslList.addAll(values: kotlin.collections.Iterable) { - _builder.addAllKeyShares(values) - } - /** - * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` - * @param values The keyShares to add. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("plusAssignAllKeyShares") - @Suppress("NOTHING_TO_INLINE") - public inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(values: kotlin.collections.Iterable) { - addAll(values) - } - /** - * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` - * @param index The index to set the value at. - * @param value The keyShares to set. - */ - @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("setKeyShares") - public operator fun com.google.protobuf.kotlin.DslList.set(index: kotlin.Int, value: vultisig.vault.v1.VaultOuterClass.Vault.KeyShare) { - _builder.setKeyShares(index, value) - } - /** - * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` - */ + /** + * An uninstantiable, behaviorless type to represent the field in + * generics. + */ + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + public class KeySharesProxy private constructor() : com.google.protobuf.kotlin.DslProxy() + /** + * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` + */ + public val keyShares: com.google.protobuf.kotlin.DslList @kotlin.jvm.JvmSynthetic - @kotlin.jvm.JvmName("clearKeyShares") - public fun com.google.protobuf.kotlin.DslList.clear() { - _builder.clearKeyShares() - } - + get() = com.google.protobuf.kotlin.DslList( + _builder.getKeySharesList() + ) + /** + * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` + * @param value The keyShares to add. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("addKeyShares") + public fun com.google.protobuf.kotlin.DslList.add(value: vultisig.vault.v1.VaultOuterClass.Vault.KeyShare) { + _builder.addKeyShares(value) + } + /** + * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` + * @param value The keyShares to add. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("plusAssignKeyShares") + @Suppress("NOTHING_TO_INLINE") + public inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(value: vultisig.vault.v1.VaultOuterClass.Vault.KeyShare) { + add(value) + } + /** + * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` + * @param values The keyShares to add. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("addAllKeyShares") + public fun com.google.protobuf.kotlin.DslList.addAll(values: kotlin.collections.Iterable) { + _builder.addAllKeyShares(values) + } + /** + * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` + * @param values The keyShares to add. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("plusAssignAllKeyShares") + @Suppress("NOTHING_TO_INLINE") + public inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(values: kotlin.collections.Iterable) { + addAll(values) + } + /** + * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` + * @param index The index to set the value at. + * @param value The keyShares to set. + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("setKeyShares") + public operator fun com.google.protobuf.kotlin.DslList.set(index: kotlin.Int, value: vultisig.vault.v1.VaultOuterClass.Vault.KeyShare) { + _builder.setKeyShares(index, value) + } + /** + * `repeated .vultisig.vault.v1.Vault.KeyShare key_shares = 7 [json_name = "keyShares"];` + */ + @kotlin.jvm.JvmSynthetic + @kotlin.jvm.JvmName("clearKeyShares") + public fun com.google.protobuf.kotlin.DslList.clear() { + _builder.clearKeyShares() + } - /** - * `string local_party_id = 8 [json_name = "localPartyId"];` - */ - public var localPartyId: kotlin.String - @JvmName("getLocalPartyId") - get() = _builder.getLocalPartyId() - @JvmName("setLocalPartyId") - set(value) { - _builder.setLocalPartyId(value) - } - /** - * `string local_party_id = 8 [json_name = "localPartyId"];` - */ - public fun clearLocalPartyId() { - _builder.clearLocalPartyId() - } - /** - * `string reshare_prefix = 9 [json_name = "resharePrefix"];` - */ - public var resharePrefix: kotlin.String - @JvmName("getResharePrefix") - get() = _builder.getResharePrefix() - @JvmName("setResharePrefix") - set(value) { - _builder.setResharePrefix(value) - } - /** - * `string reshare_prefix = 9 [json_name = "resharePrefix"];` - */ - public fun clearResharePrefix() { - _builder.clearResharePrefix() + /** + * `string local_party_id = 8 [json_name = "localPartyId"];` + */ + public var localPartyId: kotlin.String + @JvmName("getLocalPartyId") + get() = _builder.getLocalPartyId() + @JvmName("setLocalPartyId") + set(value) { + _builder.setLocalPartyId(value) } + /** + * `string local_party_id = 8 [json_name = "localPartyId"];` + */ + public fun clearLocalPartyId() { + _builder.clearLocalPartyId() + } - /** - * `int64 order = 10 [json_name = "order"];` - */ - public var order: kotlin.Long - @JvmName("getOrder") - get() = _builder.getOrder() - @JvmName("setOrder") - set(value) { - _builder.setOrder(value) - } - /** - * `int64 order = 10 [json_name = "order"];` - */ - public fun clearOrder() { - _builder.clearOrder() + /** + * `string reshare_prefix = 9 [json_name = "resharePrefix"];` + */ + public var resharePrefix: kotlin.String + @JvmName("getResharePrefix") + get() = _builder.getResharePrefix() + @JvmName("setResharePrefix") + set(value) { + _builder.setResharePrefix(value) } + /** + * `string reshare_prefix = 9 [json_name = "resharePrefix"];` + */ + public fun clearResharePrefix() { + _builder.clearResharePrefix() } } @kotlin.jvm.JvmName("-initializekeyShare") @@ -460,17 +360,10 @@ public object VaultKt { public inline fun vultisig.vault.v1.VaultOuterClass.Vault.copy(block: `vultisig.vault.v1`.VaultKt.Dsl.() -> kotlin.Unit): vultisig.vault.v1.VaultOuterClass.Vault = `vultisig.vault.v1`.VaultKt.Dsl._create(this.toBuilder()).apply { block() }._build() -@kotlin.jvm.JvmSynthetic -public inline fun vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail.copy(block: `vultisig.vault.v1`.VaultKt.VaultDetailKt.Dsl.() -> kotlin.Unit): vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail = - `vultisig.vault.v1`.VaultKt.VaultDetailKt.Dsl._create(this.toBuilder()).apply { block() }._build() - -public val vultisig.vault.v1.VaultOuterClass.Vault.VaultDetailOrBuilder.createdAtOrNull: com.google.protobuf.Timestamp? - get() = if (hasCreatedAt()) getCreatedAt() else null - @kotlin.jvm.JvmSynthetic public inline fun vultisig.vault.v1.VaultOuterClass.Vault.KeyShare.copy(block: `vultisig.vault.v1`.VaultKt.KeyShareKt.Dsl.() -> kotlin.Unit): vultisig.vault.v1.VaultOuterClass.Vault.KeyShare = `vultisig.vault.v1`.VaultKt.KeyShareKt.Dsl._create(this.toBuilder()).apply { block() }._build() -public val vultisig.vault.v1.VaultOuterClass.VaultOrBuilder.vaultOrNull: vultisig.vault.v1.VaultOuterClass.Vault.VaultDetail? - get() = if (hasVault()) getVault() else null +public val vultisig.vault.v1.VaultOuterClass.VaultOrBuilder.createdAtOrNull: com.google.protobuf.Timestamp? + get() = if (hasCreatedAt()) getCreatedAt() else null