-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Properly expose transaction proofs (#185)
* wip * wip * wip * wip
- Loading branch information
1 parent
d189ab8
commit 6aafb21
Showing
15 changed files
with
214 additions
and
9 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "sargon" | ||
version = "1.0.25" | ||
version = "1.0.26" | ||
edition = "2021" | ||
build = "build.rs" | ||
|
||
|
7 changes: 7 additions & 0 deletions
7
apple/Sources/Sargon/Extensions/Methods/RET/ResourceSpecifier+Warp+Functions.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
import SargonUniFFI | ||
|
||
extension ResourceSpecifier { | ||
public var resourceAddress: ResourceAddress { | ||
resourceSpecifierGetAddress(specifier: self) | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
apple/Sources/Sargon/Extensions/SampleValues/RET/ResourceSpecifier+SampleValues.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import SargonUniFFI | ||
|
||
#if DEBUG | ||
extension ResourceSpecifier { | ||
public static let sample: Self = newResourceSpecifierSample() | ||
public static let sampleOther: Self = newResourceSpecifierSampleOther() | ||
} | ||
#endif |
3 changes: 3 additions & 0 deletions
3
apple/Sources/Sargon/Extensions/Swiftified/RET/ResourceSpecifier+Swiftified.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import SargonUniFFI | ||
|
||
extension ResourceSpecifier: SargonModel {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import CustomDump | ||
import Foundation | ||
import Sargon | ||
import SargonUniFFI | ||
import XCTest | ||
|
||
final class ResourceSpecifierTests: Test<ResourceSpecifier> { | ||
func test_resource_address() { | ||
let sut = SUT.sample | ||
switch sut { | ||
case let .fungible(resourceAddress, _): | ||
XCTAssertEqual(resourceAddress, sut.resourceAddress) | ||
case .nonFungible: XCTFail("Expected fungible") | ||
} | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/ResourceSpecifier.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
|
||
package com.radixdlt.sargon.extensions | ||
|
||
import com.radixdlt.sargon.ResourceAddress | ||
import com.radixdlt.sargon.ResourceSpecifier | ||
import com.radixdlt.sargon.resourceSpecifierGetAddress | ||
|
||
val ResourceSpecifier.address: ResourceAddress | ||
get() = resourceSpecifierGetAddress(specifier = this) |
15 changes: 15 additions & 0 deletions
15
jvm/sargon-android/src/main/java/com/radixdlt/sargon/samples/ResourceSpecifierSample.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
|
||
package com.radixdlt.sargon.samples | ||
|
||
import com.radixdlt.sargon.ResourceSpecifier | ||
import com.radixdlt.sargon.annotation.UsesSampleValues | ||
import com.radixdlt.sargon.newResourceSpecifierSample | ||
import com.radixdlt.sargon.newResourceSpecifierSampleOther | ||
|
||
@UsesSampleValues | ||
val ResourceSpecifier.Companion.sample: Sample<ResourceSpecifier> | ||
get() = object: Sample<ResourceSpecifier> { | ||
override fun invoke(): ResourceSpecifier = newResourceSpecifierSample() | ||
|
||
override fun other(): ResourceSpecifier = newResourceSpecifierSampleOther() | ||
} |
23 changes: 23 additions & 0 deletions
23
jvm/sargon-android/src/test/java/com/radixdlt/sargon/ResourceSpecifierTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.radixdlt.sargon | ||
|
||
import com.radixdlt.sargon.extensions.address | ||
import com.radixdlt.sargon.samples.Sample | ||
import com.radixdlt.sargon.samples.sample | ||
import org.junit.jupiter.api.Assertions.assertEquals | ||
import org.junit.jupiter.api.Assertions.assertInstanceOf | ||
import org.junit.jupiter.api.Test | ||
|
||
class ResourceSpecifierTest: SampleTestable<ResourceSpecifier> { | ||
override val samples: List<Sample<ResourceSpecifier>> | ||
get() = listOf(ResourceSpecifier.sample) | ||
|
||
@Test | ||
fun testIds() { | ||
val sample = ResourceSpecifier.sample() | ||
assertEquals( | ||
(sample as ResourceSpecifier.Fungible).resourceAddress, | ||
sample.address | ||
) | ||
assertInstanceOf(ResourceSpecifier.Fungible::class.java, sample) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
src/wrapped_radix_engine_toolkit/low_level/execution_summary/resource_specifier/mod.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
mod resource_specifier; | ||
mod resource_specifier_uniffi; | ||
|
||
pub use resource_specifier::*; | ||
pub use resource_specifier_uniffi::*; |
80 changes: 80 additions & 0 deletions
80
...radix_engine_toolkit/low_level/execution_summary/resource_specifier/resource_specifier.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
use crate::prelude::*; | ||
|
||
#[derive(Clone, Debug, PartialEq, Eq, uniffi::Enum)] | ||
pub enum ResourceSpecifier { | ||
Fungible { | ||
resource_address: ResourceAddress, | ||
amount: Decimal, | ||
}, | ||
NonFungible { | ||
resource_address: ResourceAddress, | ||
ids: Vec<NonFungibleLocalId>, | ||
}, | ||
} | ||
|
||
impl ResourceSpecifier { | ||
pub fn get_address(&self) -> ResourceAddress { | ||
match self { | ||
ResourceSpecifier::Fungible { | ||
resource_address, | ||
amount: _, | ||
} => *resource_address, | ||
ResourceSpecifier::NonFungible { | ||
resource_address, | ||
ids: _, | ||
} => *resource_address, | ||
} | ||
} | ||
} | ||
|
||
impl ResourceSpecifier { | ||
pub fn fungible( | ||
resource_address: impl Into<ResourceAddress>, | ||
amount: impl Into<Decimal>, | ||
) -> Self { | ||
Self::Fungible { | ||
resource_address: resource_address.into(), | ||
amount: amount.into(), | ||
} | ||
} | ||
|
||
pub fn non_fungible( | ||
resource_address: impl Into<ResourceAddress>, | ||
ids: Vec<NonFungibleLocalId>, | ||
) -> Self { | ||
Self::NonFungible { | ||
resource_address: resource_address.into(), | ||
ids, | ||
} | ||
} | ||
} | ||
|
||
impl From<(ScryptoResourceSpecifier, NetworkID)> for ResourceSpecifier { | ||
fn from(value: (ScryptoResourceSpecifier, NetworkID)) -> Self { | ||
let (scrypto_value, network_id) = value; | ||
match scrypto_value { | ||
ScryptoResourceSpecifier::Amount(resource_address, amount) => { | ||
Self::fungible((resource_address, network_id), amount) | ||
} | ||
ScryptoResourceSpecifier::Ids(resource_address, ids) => { | ||
Self::non_fungible( | ||
(resource_address, network_id), | ||
ids.into_iter().map(NonFungibleLocalId::from).collect(), | ||
) | ||
} | ||
} | ||
} | ||
} | ||
|
||
impl HasSampleValues for ResourceSpecifier { | ||
fn sample() -> Self { | ||
Self::fungible(ResourceAddress::sample(), 3) | ||
} | ||
|
||
fn sample_other() -> Self { | ||
Self::non_fungible( | ||
ResourceAddress::sample_other(), | ||
vec![NonFungibleLocalId::sample_other()], | ||
) | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
...ngine_toolkit/low_level/execution_summary/resource_specifier/resource_specifier_uniffi.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
use crate::prelude::*; | ||
|
||
#[uniffi::export] | ||
pub fn new_resource_specifier_sample() -> ResourceSpecifier { | ||
ResourceSpecifier::sample() | ||
} | ||
|
||
#[uniffi::export] | ||
pub fn new_resource_specifier_sample_other() -> ResourceSpecifier { | ||
ResourceSpecifier::sample_other() | ||
} | ||
|
||
#[uniffi::export] | ||
pub fn resource_specifier_get_address( | ||
specifier: &ResourceSpecifier, | ||
) -> ResourceAddress { | ||
specifier.get_address() | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
|
||
#[allow(clippy::upper_case_acronyms)] | ||
type SUT = ResourceSpecifier; | ||
|
||
#[test] | ||
fn inequality() { | ||
assert_ne!( | ||
new_resource_indicator_sample(), | ||
new_resource_indicator_sample_other() | ||
); | ||
} | ||
|
||
#[test] | ||
fn get_address() { | ||
let sut = SUT::sample(); | ||
assert_eq!(sut.get_address(), resource_specifier_get_address(&sut)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters