Merge pull request #6843 from bithyve/dev

Release 2.5.4

Author: cakesoft-vaibhav

android/app/build.gradle

@@ -87,8 +87,8 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 563
-        versionName "2.5.3"
+        versionCode 564
+        versionName "2.5.4"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
         multiDexEnabled true

ios/hexa_keeper.xcodeproj/project.pbxproj

@@ -748,7 +748,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 563;
+				CURRENT_PROJECT_VERSION = 564;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -849,7 +849,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 2.5.3;
+				MARKETING_VERSION = 2.5.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -874,7 +874,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: Bithyve UK Ltd (Y5TCB759QL)";
-				CURRENT_PROJECT_VERSION = 563;
+				CURRENT_PROJECT_VERSION = 564;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
@@ -975,7 +975,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 2.5.3;
+				MARKETING_VERSION = 2.5.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1144,7 +1144,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 563;
+				CURRENT_PROJECT_VERSION = 564;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
@@ -1247,7 +1247,7 @@
 					"$(PROJECT_DIR)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 2.5.3;
+				MARKETING_VERSION = 2.5.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1275,7 +1275,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 563;
+				CURRENT_PROJECT_VERSION = 564;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
@@ -1377,7 +1377,7 @@
 					"$(PROJECT_DIR)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 2.5.3;
+				MARKETING_VERSION = 2.5.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

ios/hexa_keeper/Info.plist

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>563</string>
+	<string>564</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>itms-apps</string>

ios/hexa_keeperTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>563</string>
+	<string>564</string>
 </dict>
 </plist>

ios/hexa_keeper_dev-Info.plist

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>563</string>
+	<string>564</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>itms-apps</string>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexa_keeper",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "private": true,
   "scripts": {
     "ios": "npx react-native run-ios --scheme=hexa_keeper_dev --simulator 'iPhone 16' ",

src/utils/utilities.ts

@@ -869,15 +869,20 @@ export const manipulateBitcoinPrices = (data) => {
 };
 
 export const validatePSBT = (unsigned, signed, signer, errorText) => {
-  // TODO: Need conditional check for TapSigner and Specter psbt
-  if ([SignerType.TAPSIGNER, SignerType.SPECTER].includes(signer.type)) return;
+  if (
+    [SignerType.TAPSIGNER, SignerType.SPECTER, SignerType.SEEDSIGNER, SignerType.KRUX].includes(
+      signer.type
+    )
+  )
+    return;
   const unsignedHex = bitcoin.Psbt.fromBase64(unsigned).__CACHE.__TX.toHex();
   const signedPsbtObj = bitcoin.Psbt.fromBase64(signed);
   const signedHex = signedPsbtObj.__CACHE.__TX.toHex();
   if (signedHex !== unsignedHex) {
     throw new Error(errorText.psbtNotMatch);
   }
-  const signerPublicKey = getInputsToSignFromPSBT(signed, signer).map((data) => data.publicKey)[0];
+  let signerPublicKey;
+  signerPublicKey = getInputsToSignFromPSBT(unsigned, signer).map((data) => data.publicKey)[0];
   let isSigned = false;
   const validator = (pubkey: Buffer, msghash: Buffer, signature: Buffer): boolean =>
     ECPair.fromPublicKey(pubkey).verify(msghash, signature);
@@ -894,4 +899,4 @@ export const validatePSBT = (unsigned, signed, signer, errorText) => {
   if (!isSigned) {
     throw new Error(errorText.psbtMissingSignature);
   }
-};
+};