OPS: Update Realm

2024-11-19 09:50:15 +01:00 · 2021-02-09 08:52:41 -05:00 · 2021-02-09 08:52:41 -05:00 · c3ca89d096
commit c3ca89d096
parent f6c6be0577
4 changed files with 94 additions and 46 deletions
--- a/ios/BlueWallet.xcodeproj/project.pbxproj
+++ b/ios/BlueWallet.xcodeproj/project.pbxproj
@ -86,7 +86,7 @@
 		6DEB4C3B254FBF4800E9F9AA /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4C3A254FBF4800E9F9AA /* Colors.swift */; };
 		6DEB4C3C254FBF4800E9F9AA /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4C3A254FBF4800E9F9AA /* Colors.swift */; };
 		6DF25A9F249DB97E001D06F5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6DF25A9E249DB97E001D06F5 /* LaunchScreen.storyboard */; };
-		6DFC807024EA0B6C007B8700 /* EFQRCode in Frameworks */ = {isa = PBXBuildFile; productRef = 6DFC806F24EA0B6C007B8700 /* EFQRCode */; };
+		6DFC807024EA0B6C007B8700 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */; };
 		6DFC807224EA2FA9007B8700 /* ViewQRCodefaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DFC807124EA2FA9007B8700 /* ViewQRCodefaceController.swift */; };
 		764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B468CC34D5B41F3950078EF /* libsqlite3.0.tbd */; };
 		782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B9D9B3A7B2CB4255876B67AF /* libz.tbd */; };
@ -488,7 +488,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6DFC807024EA0B6C007B8700 /* EFQRCode in Frameworks */,
+				6DFC807024EA0B6C007B8700 /* BuildFile in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -834,6 +834,7 @@
 				2130DE983D1D45AC8FC45F7E /* Upload Debug Symbols to Sentry */,
 				3271B0B6236E2E0700DA766F /* Embed App Extensions */,
 				C18D00A61007A84C9887DEDE /* [CP] Copy Pods Resources */,
+				AE885990F8A27F5155567630 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@ -988,7 +989,7 @@
 			);
 			name = "BlueWalletWatch Extension";
 			packageProductDependencies = (
-				6DFC806F24EA0B6C007B8700 /* EFQRCode */,
+				6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */,
 			);
 			productName = "BlueWalletWatch Extension";
 			productReference = B40D4E3C225841ED00428FCC /* BlueWalletWatch Extension.appex */;
@ -1082,7 +1083,7 @@
 			);
 			mainGroup = 83CBB9F61A601CBA00E9B192;
 			packageReferences = (
-				6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */,
+				6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */,
 			);
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
 			projectDirPath = "";
@ -1277,6 +1278,24 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		AE885990F8A27F5155567630 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		C18D00A61007A84C9887DEDE /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@ -2496,7 +2515,7 @@
 /* End XCConfigurationList section */

 /* Begin XCRemoteSwiftPackageReference section */
-		6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */ = {
+		6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/EFPrefix/EFQRCode.git";
 			requirement = {
@ -2507,9 +2526,9 @@
 /* End XCRemoteSwiftPackageReference section */

 /* Begin XCSwiftPackageProductDependency section */
-		6DFC806F24EA0B6C007B8700 /* EFQRCode */ = {
+		6DFC806F24EA0B6C007B8700 /* SwiftPackageProductDependency */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */;
+			package = 6DFC806E24EA0B6C007B8700 /* RemoteSwiftPackageReference */;
 			productName = EFQRCode;
 		};
 /* End XCSwiftPackageProductDependency section */
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -2,8 +2,7 @@ PODS:
  - boost-for-react-native (1.63.0)
  - BVLinearGradient (2.5.6):
    - React
-  - CocoaAsyncSocket (7.6.4)
-  - CocoaLibEvent (1.0.0)
+  - CocoaAsyncSocket (7.6.5)
  - DoubleConversion (1.1.6)
  - FBLazyVector (0.63.3)
  - FBReactNativeSpec (0.63.3):
@ -17,16 +16,16 @@ PODS:
    - Flipper-Folly (~> 2.2)
    - Flipper-RSocket (~> 1.1)
  - Flipper-DoubleConversion (1.1.7)
-  - Flipper-Folly (2.3.0):
+  - Flipper-Folly (2.5.1):
    - boost-for-react-native
-    - CocoaLibEvent (~> 1.0)
    - Flipper-DoubleConversion
    - Flipper-Glog
-    - OpenSSL-Universal (= 1.0.2.20)
+    - libevent (~> 2.1.12)
+    - OpenSSL-Universal (= 1.1.180)
  - Flipper-Glog (0.3.6)
  - Flipper-PeerTalk (0.0.4)
-  - Flipper-RSocket (1.1.0):
-    - Flipper-Folly (~> 2.2)
+  - Flipper-RSocket (1.3.0):
+    - Flipper-Folly (~> 2.5)
  - FlipperKit (0.54.0):
    - FlipperKit/Core (= 0.54.0)
  - FlipperKit/Core (0.54.0):
@ -72,13 +71,12 @@ PODS:
    - GCDWebServer/Core (= 3.5.4)
  - GCDWebServer/Core (3.5.4)
  - glog (0.3.5)
+  - libevent (2.1.12)
  - lottie-ios (3.1.8)
  - lottie-react-native (3.5.0):
    - lottie-ios (~> 3.1.8)
    - React
-  - OpenSSL-Universal (1.0.2.20):
-    - OpenSSL-Universal/Static (= 1.0.2.20)
-  - OpenSSL-Universal/Static (1.0.2.20)
+  - OpenSSL-Universal (1.1.180)
  - PasscodeAuth (1.0.0):
    - React
  - RCTRequired (0.63.3)
@ -342,7 +340,7 @@ PODS:
    - React-Core (= 0.63.3)
    - React-cxxreact (= 0.63.3)
    - React-jsi (= 0.63.3)
-  - RealmJS (6.1.4):
+  - RealmJS (10.2.0):
    - GCDWebServer
    - React
  - RemobileReactNativeQrcodeLocalImage (1.0.4):
@ -502,7 +500,6 @@ SPEC REPOS:
  trunk:
    - boost-for-react-native
    - CocoaAsyncSocket
-    - CocoaLibEvent
    - Flipper
    - Flipper-DoubleConversion
    - Flipper-Folly
@ -511,6 +508,7 @@ SPEC REPOS:
    - Flipper-RSocket
    - FlipperKit
    - GCDWebServer
+    - libevent
    - OpenSSL-Universal
    - Sentry
    - YogaKit
@ -668,24 +666,24 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
-  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
-  CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
+  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
  DoubleConversion: cde416483dac037923206447da6e1454df403714
  FBLazyVector: 878b59e31113e289e275165efbe4b54fa614d43d
  FBReactNativeSpec: 7da9338acfb98d4ef9e5536805a0704572d33c2f
  Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
  Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
-  Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a
+  Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
  Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
  Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
-  Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
+  Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
  FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
  GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
  lottie-ios: 48fac6be217c76937e36e340e2d09cf7b10b7f5f
  lottie-react-native: 1fb4ce21d6ad37dab8343eaff8719df76035bd93
-  OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd
+  OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
  PasscodeAuth: 1cc99b13d8e4de4716d7e2b4069af2f1a9de30b2
  RCTRequired: 48884c74035a0b5b76dbb7a998bd93bcfc5f2047
  RCTTypeSafety: edf4b618033c2f1c5b7bc3d90d8e085ed95ba2ab
@ -721,7 +719,7 @@ SPEC CHECKSUMS:
  React-RCTText: 65a6de06a7389098ce24340d1d3556015c38f746
  React-RCTVibration: 8e9fb25724a0805107fc1acc9075e26f814df454
  ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3
-  RealmJS: 899b4839a8bee46e248bc277995ad58da855e41f
+  RealmJS: 5195064e9aeccf94ae3756bd9d0f2301b9074b07
  RemobileReactNativeQrcodeLocalImage: 57aadc12896b148fb5e04bc7c6805f3565f5c3fa
  RNCAsyncStorage: 32c7cbe1d43dff5f03f3d0b9e9d2c44d8ec91a3a
  RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3
--- a/package-lock.json
+++ b/package-lock.json
@ -8338,6 +8338,25 @@
        "node-int64": "^0.4.0"
      }
    },
+    "bson": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-4.2.2.tgz",
+      "integrity": "sha512-9fX257PVHAUpiRGmY3356RVWKQxLA73BgjA/x5MGuJkTEMeG7yzjuBrsiFB67EXRJnFVKrbJY9t/M+oElKYktQ==",
+      "requires": {
+        "buffer": "^5.6.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        }
+      }
+    },
    "buffer": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.1.tgz",
@ -17413,9 +17432,9 @@
      "optional": true
    },
    "needle": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz",
-      "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz",
+      "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==",
      "requires": {
        "debug": "^3.2.6",
        "iconv-lite": "^0.4.4",
@ -19671,22 +19690,24 @@
      }
    },
    "realm": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/realm/-/realm-6.1.4.tgz",
-      "integrity": "sha512-5EWKlxYa0JZMl2EnqEz8S5NIFZJswLQ1FPMbOqDWVHbkAZfcrCyGCQdbWwWvyhaa+KK0qg8Q39EY0VXLYuWbqw==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/realm/-/realm-10.2.0.tgz",
+      "integrity": "sha512-MR2oWV4QtYd/aRhNYdniFqXom1hVzXeS2FsYv9JDgkYcxWJlq2cFsI2x3094i+LwNFRJZZtSxahc3xFuRCZcHg==",
      "requires": {
+        "bson": "^4.2.0",
        "command-line-args": "^4.0.6",
        "deepmerge": "2.1.0",
        "deprecated-react-native-listview": "0.0.6",
        "fs-extra": "^4.0.3",
        "https-proxy-agent": "^2.2.4",
-        "ini": "^1.3.5",
-        "node-addon-api": "^3.0.0",
-        "node-fetch": "^1.7.3",
+        "ini": "^1.3.7",
+        "node-addon-api": "^3.1.0",
+        "node-fetch": "^2.6.1",
        "node-machine-id": "^1.1.10",
        "node-pre-gyp": "^0.15.0",
        "progress": "^2.0.3",
        "prop-types": "^15.6.2",
+        "realm-network-transport": "^0.7.0",
        "request": "^2.88.0",
        "stream-counter": "^1.0.0",
        "sync-request": "^3.0.1",
@ -19724,15 +19745,25 @@
            "debug": "^3.1.0"
          }
        },
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+        },
        "node-fetch": {
-          "version": "1.7.3",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-          "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+        }
+      }
+    },
+    "realm-network-transport": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/realm-network-transport/-/realm-network-transport-0.7.0.tgz",
+      "integrity": "sha512-w81+N+YrFBkWZWFlspDPrpot50xCkfr+AB+NCQjsTI6OfVF0igqhLfl3frwrSS61fQiL5XrZrFYFV6BWU0F+iA==",
      "requires": {
-            "encoding": "^0.1.11",
-            "is-stream": "^1.0.1"
-          }
-        }
+        "abort-controller": "^3.0.0",
+        "node-fetch": "^2.6.0"
      }
    },
    "regenerate": {
@ -20150,7 +20181,7 @@
      }
    },
    "scryptsy": {
-      "version": "file:blue_modules/scryptsy",
+      "version": "file:https:/registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz",
      "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w=="
    },
    "secp256k1": {
@ -20907,9 +20938,9 @@
      "integrity": "sha512-QqUMtWlnzArTvGyjVnAE5fAiXEm2Psvk/BlE7vWx2/dIEWMsAhcNPz7iW6WTiSM8h1fjtCkRMsaWBS1j6rpGBg=="
    },
    "tar": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz",
-      "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
+      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
      "requires": {
        "chownr": "^2.0.0",
        "fs-minipass": "^2.0.0",
--- a/package.json
+++ b/package.json
@ -166,7 +166,7 @@
    "react-native-widget-center": "git+https://github.com/BlueWallet/react-native-widget-center.git#e2e9a9038b76d096bf929a87105a97a0a7095001",
    "react-test-render": "1.1.2",
    "readable-stream": "3.6.0",
-    "realm": "6.1.4",
+    "realm": "10.2.0",
    "rn-nodeify": "10.2.0",
    "scryptsy": "file:blue_modules/scryptsy",
    "secure-random": "1.1.2",