RET 1.0.9 update (#993)

radixdlt · Jan 22, 2024 · 56b91b6 · 56b91b6
1 parent d67402c
commit 56b91b6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/RadixWallet.xcodeproj/project.pbxproj b/RadixWallet.xcodeproj/project.pbxproj
@@ -9658,7 +9658,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/radixdlt/swift-engine-toolkit";
 			requirement = {
-				branch = 1.7.0_update;
+				branch = 1.0.9_update;
 				kind = branch;
 			};
 		};

diff --git a/RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -239,8 +239,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/radixdlt/swift-engine-toolkit",
       "state" : {
-        "branch" : "1.7.0_update",
-        "revision" : "e1dabb86e8bdfc43f736588283809ce37199438f"
+        "branch" : "1.0.9_update",
+        "revision" : "aa806f3c0ea38784408e70859dc3f17810fd429f"
       }
     },
     {

diff --git a/RadixWallet/EngineKit/HashableExtensions.swift b/RadixWallet/EngineKit/HashableExtensions.swift
@@ -1254,8 +1254,8 @@ extension DetailedManifestClass: Hashable, Equatable {
 		case let (.validatorStake(lhsValidatorAddresses, lhsValidatorStakes), .validatorStake(rhsValidatorAddresses, rhsValidatorStakes)):
 			lhsValidatorAddresses == rhsValidatorAddresses && lhsValidatorStakes == rhsValidatorStakes
 
-		case let (.validatorUnstake(lhsValidatorAddresses, lhsValidatorUnstakes), .validatorUnstake(rhsValidatorAddresses, rhsValidatorUnstakes)):
-			lhsValidatorAddresses == rhsValidatorAddresses && lhsValidatorUnstakes == rhsValidatorUnstakes
+		case let (.validatorUnstake(lhsValidatorAddresses, lhsValidatorUnstakes, lhsClaimsNonFugibleData), .validatorUnstake(rhsValidatorAddresses, rhsValidatorUnstakes, rhsClaimsNonFugibleData)):
+			lhsValidatorAddresses == rhsValidatorAddresses && lhsValidatorUnstakes == rhsValidatorUnstakes && lhsClaimsNonFugibleData == rhsClaimsNonFugibleData
 
 		case let (.validatorClaim(lhsValidatorAddresses, lhsValidatorClaims), .validatorClaim(rhsValidatorAddresses, rhsValidatorClaims)):
 			lhsValidatorAddresses == rhsValidatorAddresses && lhsValidatorClaims == rhsValidatorClaims
@@ -1293,10 +1293,11 @@ extension DetailedManifestClass: Hashable, Equatable {
 			hasher.combine("validatorStake")
 			hasher.combine(validatorAddresses)
 			hasher.combine(validatorStakes)
-		case let .validatorUnstake(validatorAddresses, validatorUnstakes):
+		case let .validatorUnstake(validatorAddresses, validatorUnstakes, claimsNonFugibleData):
 			hasher.combine("validatorUnstake")
 			hasher.combine(validatorAddresses)
 			hasher.combine(validatorUnstakes)
+			hasher.combine(claimsNonFugibleData)
 		case let .validatorClaim(validatorAddresses, validatorClaims):
 			hasher.combine("validatorClaim")
 			hasher.combine(validatorAddresses)
@@ -1311,6 +1312,33 @@ extension DetailedManifestClass: Hashable, Equatable {
 	}
 }
 
+// MARK: - UnstakeDataEntry + Hashable
+extension UnstakeDataEntry: Hashable {
+	public static func == (lhs: UnstakeDataEntry, rhs: UnstakeDataEntry) -> Bool {
+		lhs.nonFungibleGlobalId == rhs.nonFungibleGlobalId && lhs.data == rhs.data
+	}
+
+	public func hash(into hasher: inout Hasher) {
+		hasher.combine(nonFungibleGlobalId)
+		hasher.combine(data)
+	}
+}
+
+// MARK: - UnstakeData + Hashable
+extension UnstakeData: Hashable {
+	public static func == (lhs: UnstakeData, rhs: UnstakeData) -> Bool {
+		lhs.claimAmount == rhs.claimAmount &&
+			lhs.claimEpoch == rhs.claimEpoch &&
+			lhs.name == rhs.name
+	}
+
+	public func hash(into hasher: inout Hasher) {
+		hasher.combine(claimAmount)
+		hasher.combine(claimEpoch)
+		hasher.combine(name)
+	}
+}
+
 // MARK: - TrackedPoolContribution + Hashable, Equatable
 extension TrackedPoolContribution: Hashable, Equatable {
 	public static func == (lhs: TrackedPoolContribution, rhs: TrackedPoolContribution) -> Bool {