diff --git a/ios/Nightly-Info.plist b/ios/Nightly-Info.plist index 74042af732..613d5b7daa 100644 --- a/ios/Nightly-Info.plist +++ b/ios/Nightly-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 297 + 303 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6cf351ea51..85e195fc1e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -283,7 +283,7 @@ PODS: - React-Core - react-native-config (0.12.0): - React - - react-native-haskell-shelley (1.4.0): + - react-native-haskell-shelley (3.0.0): - React - react-native-netinfo (5.9.9): - React-Core @@ -618,7 +618,7 @@ SPEC CHECKSUMS: react-native-ble-plx: caac53ee98151ec81198239d591c203809a1ed6e react-native-camera: e46c64f0d1212124c915bf83ee9b855ac6d35164 react-native-config: f2c2ae45625a068c35681a16b9bfb1ca58b0adc7 - react-native-haskell-shelley: 6feb02a9fdfcd95ee4c0755cdf1e78d95592d218 + react-native-haskell-shelley: 10a6de00bcb31f52344f70364ee1cc869bc795ec react-native-netinfo: 0212ce8604e88edf686f1481b925b17a42a52449 react-native-randombytes: b6677f7d495c27e9ee0dbd77ebc97b3c59173729 react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94 diff --git a/ios/Staging-Info.plist b/ios/Staging-Info.plist index 8210bf3eeb..fcf22c8902 100644 --- a/ios/Staging-Info.plist +++ b/ios/Staging-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 297 + 303 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/emurgo.xcodeproj/project.pbxproj b/ios/emurgo.xcodeproj/project.pbxproj index 6f652c1e95..35fed17b34 100644 --- a/ios/emurgo.xcodeproj/project.pbxproj +++ b/ios/emurgo.xcodeproj/project.pbxproj @@ -5,7 +5,6 @@ }; objectVersion = 46; objects = { - /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* emurgoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* emurgoTests.m */; }; 0364225EA79340159305AC26 /* Rubik-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DB1534F401F64DFEB4584FD0 /* Rubik-MediumItalic.ttf */; }; @@ -580,7 +579,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export DEVELOPMENT_BUILD_CONFIGURATIONS=\"+(Staging.Debug|Debug)\"\nexport NODE_BINARY=node\n../node_modules/react-native-schemes-manager/lib/react-native-xcode.sh\n"; + shellScript = "export DEVELOPMENT_BUILD_CONFIGURATIONS=\"+(Staging.Debug|Debug)\"\nexport NODE_BINARY=node\n../node_modules/react-native-schemes-manager/lib/react-native-xcode.sh"; }; 226AFA2910D45B200EB23E8C /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; @@ -1048,7 +1047,7 @@ BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1072,7 +1071,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1098,7 +1097,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1121,7 +1120,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1144,7 +1143,7 @@ BUNDLE_DISPLAY_NAME = Yoroi; BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1172,7 +1171,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1195,7 +1194,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1223,7 +1222,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1247,8 +1246,8 @@ BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 297; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 303; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1275,7 +1274,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1298,7 +1297,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1325,7 +1324,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1534,7 +1533,7 @@ BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1558,7 +1557,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1682,7 +1681,7 @@ BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1705,7 +1704,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1767,7 +1766,7 @@ BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1791,7 +1790,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1816,7 +1815,7 @@ BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1840,7 +1839,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1866,7 +1865,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1889,7 +1888,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1913,7 +1912,7 @@ BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 297; + CURRENT_PROJECT_VERSION = 303; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1936,7 +1935,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.3.0; + MARKETING_VERSION = 4.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/emurgo/Info.plist b/ios/emurgo/Info.plist index 16cdba2647..385f7724e2 100644 --- a/ios/emurgo/Info.plist +++ b/ios/emurgo/Info.plist @@ -23,7 +23,7 @@ CFBundleSignature ???? CFBundleVersion - 297 + 303 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/emurgoTests/Info.plist b/ios/emurgoTests/Info.plist index 68b736510d..3ae8d25193 100644 --- a/ios/emurgoTests/Info.plist +++ b/ios/emurgoTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 297 + 303 diff --git a/ios/fastlane/README.md b/ios/fastlane/README.md index 8ecead22f8..b1069868fc 100644 --- a/ios/fastlane/README.md +++ b/ios/fastlane/README.md @@ -1,5 +1,5 @@ -# fastlane documentation - +fastlane documentation +================ # Installation Make sure you have the latest version of the Xcode command line tools installed: @@ -9,50 +9,35 @@ xcode-select --install ``` Install _fastlane_ using - ``` [sudo] gem install fastlane -NV ``` - or alternatively using `brew install fastlane` # Available Actions - ## iOS - ### ios staging - ``` fastlane ios staging ``` - Push a new staging build to TestFlight - ### ios nightly - ``` fastlane ios nightly ``` - Push a new nightly build to TestFlight - ### ios mainnet - ``` fastlane ios mainnet ``` - Push a new mainnet build to TestFlight - ### ios build - ``` fastlane ios build ``` - Builds the project. Useful to verify a succesful compilation. ---- +---- This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. More information about fastlane can be found on [fastlane.tools](https://fastlane.tools). diff --git a/src/components/WalletInit/WalletFreshInitScreen.js b/src/components/WalletInit/WalletFreshInitScreen.js index df3b373809..9acf024860 100644 --- a/src/components/WalletInit/WalletFreshInitScreen.js +++ b/src/components/WalletInit/WalletFreshInitScreen.js @@ -61,7 +61,7 @@ const WalletInitScreen = ({intl}: Props) => { navigateInitWallet( CONFIG.NETWORKS.HASKELL_SHELLEY.NETWORK_ID, @@ -73,7 +73,7 @@ const WalletInitScreen = ({intl}: Props) => { navigateInitWallet( CONFIG.NETWORKS.HASKELL_SHELLEY.NETWORK_ID, diff --git a/src/crypto/shelley/transactions.js b/src/crypto/shelley/transactions.js index ee10cd2a24..16af8b0068 100644 --- a/src/crypto/shelley/transactions.js +++ b/src/crypto/shelley/transactions.js @@ -44,8 +44,7 @@ import { cardanoValueFromMultiToken, } from './utils' -import {MAX_TX_SIZE} from '../../config/networks' -import {MAX_VALUE_BYTES} from '../../config/networks' +import { MAX_VALUE_BYTES, MAX_TX_BYTES } from '../../config/networks' import {AssetOverflowError, InsufficientFunds, NoOutputsError} from '../errors' import type { Address,