Merge branch 'main' into feature/TRCL-3204-integrate-market-order-fok

# Conflicts: # dydx/Pods/Pods.xcodeproj/project.pbxproj
dydxprotocol · Nov 10, 2023 · e9fe82f · e9fe82f
2 parents a8704d9 + d4d164d
commit e9fe82f
Show file tree

Hide file tree

Showing 423 changed files with 19,998 additions and 35,215 deletions.
diff --git a/Utilities/Utilities/_Utils/WebCrypto.swift b/Utilities/Utilities/_Utils/WebCrypto.swift
@@ -23,6 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 */
+/*
 
 import CryptoSwift
 import WebKit
@@ -299,3 +300,5 @@ private extension WKWebView{
         }
     }
 }
+
+*/
diff --git a/dydx/PodFile b/dydx/PodFile
@@ -56,7 +56,7 @@ end
 
 def util_pods
   pod 'BigInt'
-  pod 'CryptoSwift', '1.5.1'
+  #pod 'CryptoSwift', '1.5.1'
   pod 'libPhoneNumber-iOS'
   pod 'KVOController'
   pod 'SimpleKeychain', '~> 0.12.5'

diff --git a/dydx/Podfile.lock b/dydx/Podfile.lock
@@ -14,7 +14,6 @@ PODS:
   - CocoaLumberjack/Core (3.8.2)
   - CombineExt (1.8.0)
   - COSTouchVisualizer (1.0.6)
-  - CryptoSwift (1.5.1)
   - Differ (1.4.5)
   - DrawerMenu (1.0.1)
   - EasyTipView (2.1.0)
@@ -268,7 +267,6 @@ DEPENDENCIES:
   - Charts (from `https://github.com/dydxprotocol/Charts.git`, branch `releases/3.6.0.3`)
   - CombineExt
   - COSTouchVisualizer
-  - CryptoSwift (= 1.5.1)
   - Differ
   - DrawerMenu
   - EasyTipView
@@ -314,7 +312,6 @@ SPEC REPOS:
     - CocoaLumberjack
     - CombineExt
     - COSTouchVisualizer
-    - CryptoSwift
     - Differ
     - DrawerMenu
     - EasyTipView
@@ -388,7 +385,6 @@ SPEC CHECKSUMS:
   CocoaLumberjack: f8d89a516e7710fdb2e9b8f1560b16ec6040eef0
   CombineExt: c4daa97ef75754d8ef319bd79edeef82652f3eea
   COSTouchVisualizer: a398089327a6c02897823614d7447ccc97198997
-  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   Differ: 3b6bd78e2b20cc795d9a86f7641d087524e4273e
   DrawerMenu: f6ca91901e2b21086e3c19bcca278d3d3127e85f
   EasyTipView: a92b6edc377b81c5ac18e9fd35d5ee78e9409488
@@ -437,6 +433,6 @@ SPEC CHECKSUMS:
   Validator: 80a6f567220c962dfd2d9928ae98a8c1d164f6f4
   ZSWTappableLabel: 92f11d677bb395a8294df48482316c4981783ca0
 
-PODFILE CHECKSUM: 6c6f8513dc35d0af8091105053d372bc13a66241
+PODFILE CHECKSUM: a4f25d50f2991cc8e84eca8d34be23b37908132b
 
 COCOAPODS: 1.13.0
diff --git a/dydx/Pods/CryptoSwift/LICENSE b/dydx/Pods/CryptoSwift/LICENSE
-Original file line number
+Diff line change
@@ Expand Up @@
     SOFTWARE.
     */
+    /*
     import CryptoSwift
     import WebKit
@@ Expand Down Expand Up / @@ -299,3 +300,5 @@ private extension WKWebView{ @@
             }
         }
     }
+    */