Merge branch 'develop' into 'master'

Develop See merge request papers/airgap/airgap-wallet!635
airgap-it · Jan 19, 2023 · 258c062 · 258c062
2 parents a1c2183 + 77008c1
commit 258c062
Show file tree

Hide file tree

Showing 83 changed files with 1,848 additions and 572 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,7 +38,7 @@ airgap_cordova_secure_storage_deploy.pub
 Thumbs.db
 UserInterfaceState.xcuserstate
 
-src/assets/libs/airgap-coin-lib.browserify.js
+src/assets/libs/**/*.browserify.js
 
 .env
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -168,13 +168,11 @@ build-windows:
 
 build-web:
   stage: platform_build
+  when: manual
   tags:
     - docker
   script:
     - docker build -f build/web/Dockerfile -t $GOOGLE_TAG -t $GOOGLE_TAG_DEV .
-  only:
-    - develop
-    - master
   tags:
     - docker
 
@@ -192,6 +190,7 @@ publish-ios:
 
 publish-web-dev:
   stage: publish
+  when: manual
   needs:
     - build-web
   image: google/cloud-sdk
@@ -206,8 +205,6 @@ publish-web-dev:
     - docker tag $GOOGLE_TAG_DEV $GOOGLE_TAG_LATEST_DEV
     - docker push $GOOGLE_TAG_DEV
     - docker push $GOOGLE_TAG_LATEST_DEV
-  only:
-    - develop
   tags:
     - docker
 

diff --git a/Dockerfile b/Dockerfile
@@ -31,6 +31,7 @@ COPY config /app/config
 COPY apply-diagnostic-modules.js /app
 COPY fix-qrscanner-gradle.js /app
 COPY patch-dependency-versions.js /app
+COPY patch-coinlib.js /app
 
 # install dependencies
 RUN npm install

diff --git a/build/android/Dockerfile b/build/android/Dockerfile
@@ -20,12 +20,13 @@ RUN npm install -g n
 RUN n 15.14.0
 
 # Install app dependencies, using wildcard if package-lock exists
-COPY package.json /app/package.json
-COPY package-lock.json /app/package-lock.json
+COPY package.json /app
+COPY package-lock.json /app
 COPY config /app/config
 COPY apply-diagnostic-modules.js /app
 COPY fix-qrscanner-gradle.js /app
 COPY patch-dependency-versions.js /app
+COPY patch-coinlib.js /app
 
 # install dependencies
 RUN npm i
@@ -49,7 +50,7 @@ RUN node config/patch_crypto.js
 ARG BUILD_NR
 RUN sed -i -e "s/versionCode 1/versionCode $BUILD_NR/g" /app/android/app/build.gradle
 
-# disable pure getters due to https://github.com/angular/angular-cli/issues/11439 
+# disable pure getters due to https://github.com/angular/angular-cli/issues/11439
 # configure mangle (keep_fnames) for bitcoinjs https://github.com/bitcoinjs/bitcoinjs-lib/issues/959
 RUN npm run prepare-prod-build
 

diff --git a/build/web/Dockerfile b/build/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:15.14.0 as build
+FROM node:16.13.1 as build
 
 # create app directory
 RUN mkdir /app
@@ -11,6 +11,7 @@ COPY config /app/config
 COPY apply-diagnostic-modules.js /app
 COPY fix-qrscanner-gradle.js /app
 COPY patch-dependency-versions.js /app
+COPY patch-coinlib.js /app
 
 # install dependencies
 RUN npm install

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -7,9 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0DE4BBC3293631C900CE6A51 /* Sapling in Frameworks */ = {isa = PBXBuildFile; productRef = 0DE4BBC2293631C900CE6A51 /* Sapling */; };
 		2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
-		49D642662629CBDC0066C013 /* SaplingFFI in Frameworks */ = {isa = PBXBuildFile; productRef = 49D642652629CBDC0066C013 /* SaplingFFI */; };
-		49D642682629CBDC0066C013 /* Sapling in Frameworks */ = {isa = PBXBuildFile; productRef = 49D642672629CBDC0066C013 /* Sapling */; };
 		50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
 		504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
 		504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
@@ -53,9 +52,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				49D642682629CBDC0066C013 /* Sapling in Frameworks */,
 				A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
-				49D642662629CBDC0066C013 /* SaplingFFI in Frameworks */,
+				0DE4BBC3293631C900CE6A51 /* Sapling in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -171,8 +169,7 @@
 			);
 			name = App;
 			packageProductDependencies = (
-				49D642652629CBDC0066C013 /* SaplingFFI */,
-				49D642672629CBDC0066C013 /* Sapling */,
+				0DE4BBC2293631C900CE6A51 /* Sapling */,
 			);
 			productName = App;
 			productReference = 504EC3041FED79650016851F /* App.app */;
@@ -420,14 +417,15 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 7VLXNQ52UC;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = "$()";
+				MARKETING_VERSION = 1.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = it.airgap.wallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -447,14 +445,15 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 7VLXNQ52UC;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = "$()";
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = it.airgap.wallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -499,12 +498,7 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		49D642652629CBDC0066C013 /* SaplingFFI */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 49D642642629CBDC0066C013 /* XCRemoteSwiftPackageReference "airgap-sapling" */;
-			productName = SaplingFFI;
-		};
-		49D642672629CBDC0066C013 /* Sapling */ = {
+		0DE4BBC2293631C900CE6A51 /* Sapling */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 49D642642629CBDC0066C013 /* XCRemoteSwiftPackageReference "airgap-sapling" */;
 			productName = Sapling;

diff --git a/ios/App/App/SaplingNative/SaplingNative.swift b/ios/App/App/SaplingNative/SaplingNative.swift
@@ -8,22 +8,22 @@
 import Foundation
 import Capacitor
 
-#if (arch(x86_64) || arch(arm64))
+#if (arch(x86_64) || arch(arm64)) && !targetEnvironment(simulator)
 import Sapling
 #endif
 
 @objc(SaplingNative)
 public class SaplingNative: CAPPlugin {
 
     @objc func isSupported(_ call: CAPPluginCall) {
-        #if (arch(x86_64) || arch(arm64))
+        #if (arch(x86_64) || arch(arm64)) && !targetEnvironment(simulator)
         call.resolve([Key.IS_SUPPORTED: true])
         #else
         call.resolve([Key.IS_SUPPORTED: false])
         #endif
     }
 
-    #if (arch(x86_64) || arch(arm64))
+    #if (arch(x86_64) || arch(arm64)) && !targetEnvironment(simulator)
     private lazy var sapling = Sapling()
 
     @objc func initParameters(_ call: CAPPluginCall) {