Skip to content

Commit

Permalink
Update RET from develop -
Browse files Browse the repository at this point in the history
  • Loading branch information
Anka authored and Anka committed Oct 15, 2024
1 parent 061be7a commit 392ad6f
Show file tree
Hide file tree
Showing 8 changed files with 159 additions and 37 deletions.
94 changes: 78 additions & 16 deletions Sources/EngineToolkit/radix_engine_toolkit_uniffi.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4234,7 +4234,6 @@ public protocol ManifestV2BuilderProtocol {
func packagePublishAdvanced(ownerRole: OwnerRole, code: Data, definition: Data, metadata: [String: MetadataInitEntry], packageAddress: ManifestBuilderAddressReservation?) throws -> ManifestV2Builder
func popFromAuthZone(intoProof: ManifestBuilderProof) throws -> ManifestV2Builder
func pushToAuthZone(proof: ManifestBuilderProof) throws -> ManifestV2Builder
func registerSubintent(subintent: IntentCoreV2, name: ManifestBuilderIntent) throws -> ManifestV2Builder
func returnToWorktop(bucket: ManifestBuilderBucket) throws -> ManifestV2Builder
func roleAssignmentGet(address: Address, module: ModuleId, roleKey: String) throws -> ManifestV2Builder
func roleAssignmentLockOwner(address: Address) throws -> ManifestV2Builder
Expand All @@ -4253,6 +4252,7 @@ public protocol ManifestV2BuilderProtocol {
func twoResourcePoolProtectedDeposit(address: Address, bucket: ManifestBuilderBucket) throws -> ManifestV2Builder
func twoResourcePoolProtectedWithdraw(address: Address, resourceAddress: Address, amount: Decimal, withdrawStrategy: WithdrawStrategy) throws -> ManifestV2Builder
func twoResourcePoolRedeem(address: Address, bucket: ManifestBuilderBucket) throws -> ManifestV2Builder
func useChild(subintentHash: TransactionHash, name: ManifestBuilderIntent) throws -> ManifestV2Builder
func validatorAcceptsDelegatedStake(address: Address) throws -> ManifestV2Builder
func validatorClaimXrd(address: Address, bucket: ManifestBuilderBucket) throws -> ManifestV2Builder
func validatorFinishUnlockOwnerStakeUnits(address: Address) throws -> ManifestV2Builder
Expand Down Expand Up @@ -5686,18 +5686,6 @@ public class ManifestV2Builder: ManifestV2BuilderProtocol {
)
}

public func registerSubintent(subintent: IntentCoreV2, name: ManifestBuilderIntent) throws -> ManifestV2Builder {
return try FfiConverterTypeManifestV2Builder.lift(
try
rustCallWithError(FfiConverterTypeRadixEngineToolkitError.lift) {
uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_register_subintent(self.pointer,
FfiConverterTypeIntentCoreV2.lower(subintent),
FfiConverterTypeManifestBuilderIntent.lower(name),$0
)
}
)
}

public func returnToWorktop(bucket: ManifestBuilderBucket) throws -> ManifestV2Builder {
return try FfiConverterTypeManifestV2Builder.lift(
try
Expand Down Expand Up @@ -5920,6 +5908,18 @@ public class ManifestV2Builder: ManifestV2BuilderProtocol {
)
}

public func useChild(subintentHash: TransactionHash, name: ManifestBuilderIntent) throws -> ManifestV2Builder {
return try FfiConverterTypeManifestV2Builder.lift(
try
rustCallWithError(FfiConverterTypeRadixEngineToolkitError.lift) {
uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_use_child(self.pointer,
FfiConverterTypeTransactionHash.lower(subintentHash),
FfiConverterTypeManifestBuilderIntent.lower(name),$0
)
}
)
}

public func validatorAcceptsDelegatedStake(address: Address) throws -> ManifestV2Builder {
return try FfiConverterTypeManifestV2Builder.lift(
try
Expand Down Expand Up @@ -9287,6 +9287,10 @@ public func FfiConverterTypeTransactionV2Builder_lower(_ value: TransactionV2Bui


public protocol TransactionV2BuilderSignatureStepProtocol {
func notarizeWithPrivateKey(privateKey: PrivateKey) throws -> NotarizedTransactionV2
func notarizeWithSigner(privateKey: Signer) throws -> NotarizedTransactionV2
func signWithPrivateKey(privateKey: PrivateKey) -> TransactionV2BuilderSignatureStep
func signWithSigner(signer: Signer) -> TransactionV2BuilderSignatureStep

}

Expand All @@ -9308,6 +9312,52 @@ public class TransactionV2BuilderSignatureStep: TransactionV2BuilderSignatureSte




public func notarizeWithPrivateKey(privateKey: PrivateKey) throws -> NotarizedTransactionV2 {
return try FfiConverterTypeNotarizedTransactionV2.lift(
try
rustCallWithError(FfiConverterTypeRadixEngineToolkitError.lift) {
uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_notarize_with_private_key(self.pointer,
FfiConverterTypePrivateKey.lower(privateKey),$0
)
}
)
}

public func notarizeWithSigner(privateKey: Signer) throws -> NotarizedTransactionV2 {
return try FfiConverterTypeNotarizedTransactionV2.lift(
try
rustCallWithError(FfiConverterTypeRadixEngineToolkitError.lift) {
uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_notarize_with_signer(self.pointer,
FfiConverterCallbackInterfaceSigner.lower(privateKey),$0
)
}
)
}

public func signWithPrivateKey(privateKey: PrivateKey) -> TransactionV2BuilderSignatureStep {
return try! FfiConverterTypeTransactionV2BuilderSignatureStep.lift(
try!
rustCall() {

uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_sign_with_private_key(self.pointer,
FfiConverterTypePrivateKey.lower(privateKey),$0
)
}
)
}

public func signWithSigner(signer: Signer) -> TransactionV2BuilderSignatureStep {
return try! FfiConverterTypeTransactionV2BuilderSignatureStep.lift(
try!
rustCall() {

uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_sign_with_signer(self.pointer,
FfiConverterCallbackInterfaceSigner.lower(signer),$0
)
}
)
}
}

public struct FfiConverterTypeTransactionV2BuilderSignatureStep: FfiConverter {
Expand Down Expand Up @@ -25596,9 +25646,6 @@ private var initializationResult: InitializationResult {
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_push_to_auth_zone() != 38749) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_register_subintent() != 44269) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_return_to_worktop() != 3045) {
return InitializationResult.apiChecksumMismatch
}
Expand Down Expand Up @@ -25653,6 +25700,9 @@ private var initializationResult: InitializationResult {
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_two_resource_pool_redeem() != 8311) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_use_child() != 25776) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_validator_accepts_delegated_stake() != 63270) {
return InitializationResult.apiChecksumMismatch
}
Expand Down Expand Up @@ -26082,6 +26132,18 @@ private var initializationResult: InitializationResult {
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2builder_transaction_header() != 42344) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_notarize_with_private_key() != 48137) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_notarize_with_signer() != 25051) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_sign_with_private_key() != 12688) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_sign_with_signer() != 49560) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_radix_engine_toolkit_uniffi_checksum_constructor_accessrule_allow_all() != 26074) {
return InitializationResult.apiChecksumMismatch
}
Expand Down
12 changes: 6 additions & 6 deletions Sources/RadixEngineToolkit/RadixEngineToolkit.xcframework/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<key>BinaryPath</key>
<string>RadixEngineToolkit.framework/RadixEngineToolkit</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>RadixEngineToolkit.framework</string>
<key>SupportedArchitectures</key>
Expand All @@ -17,9 +17,7 @@
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>macos</string>
</dict>
<dict>
<key>BinaryPath</key>
Expand All @@ -39,7 +37,7 @@
<key>BinaryPath</key>
<string>RadixEngineToolkit.framework/RadixEngineToolkit</string>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>RadixEngineToolkit.framework</string>
<key>SupportedArchitectures</key>
Expand All @@ -48,7 +46,9 @@
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
30 changes: 25 additions & 5 deletions ...framework/ios-arm64/RadixEngineToolkit.framework/Headers/radix_engine_toolkit_uniffiFFI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,8 +812,6 @@ void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_pop
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_push_to_auth_zone(void*_Nonnull ptr, RustBuffer proof, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_register_subintent(void*_Nonnull ptr, void*_Nonnull subintent, RustBuffer name, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_return_to_worktop(void*_Nonnull ptr, RustBuffer bucket, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_role_assignment_get(void*_Nonnull ptr, void*_Nonnull address, RustBuffer module, RustBuffer role_key, RustCallStatus *_Nonnull out_status
Expand Down Expand Up @@ -850,6 +848,8 @@ void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_two
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_two_resource_pool_redeem(void*_Nonnull ptr, void*_Nonnull address, RustBuffer bucket, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_use_child(void*_Nonnull ptr, void*_Nonnull subintent_hash, RustBuffer name, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_validator_accepts_delegated_stake(void*_Nonnull ptr, void*_Nonnull address, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_validator_claim_xrd(void*_Nonnull ptr, void*_Nonnull address, RustBuffer bucket, RustCallStatus *_Nonnull out_status
Expand Down Expand Up @@ -1259,6 +1259,14 @@ void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2builder_
);
void uniffi_radix_engine_toolkit_uniffi_fn_free_transactionv2buildersignaturestep(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_notarize_with_private_key(void*_Nonnull ptr, void*_Nonnull private_key, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_notarize_with_signer(void*_Nonnull ptr, uint64_t private_key, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_sign_with_private_key(void*_Nonnull ptr, void*_Nonnull private_key, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_sign_with_signer(void*_Nonnull ptr, uint64_t signer, RustCallStatus *_Nonnull out_status
);
void uniffi_radix_engine_toolkit_uniffi_fn_init_callback_signer(ForeignCallback _Nonnull callback_stub, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_func_derive_olympia_account_address_from_public_key(RustBuffer public_key, RustBuffer olympia_network, RustCallStatus *_Nonnull out_status
Expand Down Expand Up @@ -2486,9 +2494,6 @@ uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_po
);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_push_to_auth_zone(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_register_subintent(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_return_to_worktop(void

Expand Down Expand Up @@ -2543,6 +2548,9 @@ uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_tw
);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_two_resource_pool_redeem(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_use_child(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_validator_accepts_delegated_stake(void

Expand Down Expand Up @@ -2972,6 +2980,18 @@ uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2builder
);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2builder_transaction_header(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_notarize_with_private_key(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_notarize_with_signer(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_sign_with_private_key(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_sign_with_signer(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_constructor_accessrule_allow_all(void

Expand Down
Binary file modified .../RadixEngineToolkit.xcframework/ios-arm64/RadixEngineToolkit.framework/RadixEngineToolkit
View file
Binary file not shown.
30 changes: 25 additions & 5 deletions ...64_x86_64-simulator/RadixEngineToolkit.framework/Headers/radix_engine_toolkit_uniffiFFI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,8 +812,6 @@ void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_pop
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_push_to_auth_zone(void*_Nonnull ptr, RustBuffer proof, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_register_subintent(void*_Nonnull ptr, void*_Nonnull subintent, RustBuffer name, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_return_to_worktop(void*_Nonnull ptr, RustBuffer bucket, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_role_assignment_get(void*_Nonnull ptr, void*_Nonnull address, RustBuffer module, RustBuffer role_key, RustCallStatus *_Nonnull out_status
Expand Down Expand Up @@ -850,6 +848,8 @@ void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_two
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_two_resource_pool_redeem(void*_Nonnull ptr, void*_Nonnull address, RustBuffer bucket, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_use_child(void*_Nonnull ptr, void*_Nonnull subintent_hash, RustBuffer name, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_validator_accepts_delegated_stake(void*_Nonnull ptr, void*_Nonnull address, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_manifestv2builder_validator_claim_xrd(void*_Nonnull ptr, void*_Nonnull address, RustBuffer bucket, RustCallStatus *_Nonnull out_status
Expand Down Expand Up @@ -1259,6 +1259,14 @@ void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2builder_
);
void uniffi_radix_engine_toolkit_uniffi_fn_free_transactionv2buildersignaturestep(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_notarize_with_private_key(void*_Nonnull ptr, void*_Nonnull private_key, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_notarize_with_signer(void*_Nonnull ptr, uint64_t private_key, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_sign_with_private_key(void*_Nonnull ptr, void*_Nonnull private_key, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_method_transactionv2buildersignaturestep_sign_with_signer(void*_Nonnull ptr, uint64_t signer, RustCallStatus *_Nonnull out_status
);
void uniffi_radix_engine_toolkit_uniffi_fn_init_callback_signer(ForeignCallback _Nonnull callback_stub, RustCallStatus *_Nonnull out_status
);
void*_Nonnull uniffi_radix_engine_toolkit_uniffi_fn_func_derive_olympia_account_address_from_public_key(RustBuffer public_key, RustBuffer olympia_network, RustCallStatus *_Nonnull out_status
Expand Down Expand Up @@ -2486,9 +2494,6 @@ uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_po
);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_push_to_auth_zone(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_register_subintent(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_return_to_worktop(void

Expand Down Expand Up @@ -2543,6 +2548,9 @@ uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_tw
);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_two_resource_pool_redeem(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_use_child(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_manifestv2builder_validator_accepts_delegated_stake(void

Expand Down Expand Up @@ -2972,6 +2980,18 @@ uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2builder
);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2builder_transaction_header(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_notarize_with_private_key(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_notarize_with_signer(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_sign_with_private_key(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_method_transactionv2buildersignaturestep_sign_with_signer(void

);
uint16_t uniffi_radix_engine_toolkit_uniffi_checksum_constructor_accessrule_allow_all(void

Expand Down
Binary file modified ...it.xcframework/ios-arm64_x86_64-simulator/RadixEngineToolkit.framework/RadixEngineToolkit
View file
Binary file not shown.
Loading

0 comments on commit 392ad6f

Please sign in to comment.