[CHANGE] Restructure Swift Package

- Moved source files to Sources/Web3Swift
- Moved test files to Tests/Web3SwiftTests
- Moved libs on root
- Moved ZKSync source files to Sources/Web3ZkSync

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.6
 import PackageDescription
 
 let package = Package(
@@ -13,11 +13,11 @@ let package = Package(
         .library(name: "web3-zksync.swift", targets: ["web3-zksync"])
     ],
     dependencies: [
-        .package(name: "BigInt", url: "https://github.com/attaswift/BigInt", from: "5.3.0"),
-        .package(name: "GenericJSON", url: "https://github.com/iwill/generic-json-swift", .upToNextMajor(from: "2.0.0")),
+        .package(url: "https://github.com/attaswift/BigInt", .upToNextMajor(from: "5.3.0")),
+        .package(url: "https://github.com/iwill/generic-json-swift", .upToNextMajor(from: "2.0.0")),
         .package(url: "https://github.com/GigaBitcoin/secp256k1.swift.git", .upToNextMajor(from: "0.6.0")),
-        .package(url: "https://github.com/vapor/websocket-kit.git", from: "2.0.0"),
-        .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0")
+        .package(url: "https://github.com/vapor/websocket-kit.git", .upToNextMajor(from: "2.0.0")),
+        .package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.0.0"))
     ],
     targets: [
         .target(
@@ -27,44 +27,43 @@ let package = Package(
                     .target(name: "keccaktiny"),
                     .target(name: "aes"),
                     .target(name: "Internal_CryptoSwift_PBDKF2"),
-                    "BigInt",
-                    "GenericJSON",
+                    .product(name: "BigInt", package: "BigInt"),
+                    .product(name: "GenericJSON", package: "generic-json-swift"),
                     .product(name: "secp256k1", package: "secp256k1.swift"),
                     .product(name: "WebSocketKit", package: "websocket-kit"),
                     .product(name: "Logging", package: "swift-log")
                 ],
-            path: "web3swift/src",
-            exclude: ["ZKSync"]
+            path: "Sources/Web3Swift"
         ),
          .target(
             name: "web3-zksync",
             dependencies:
                 [
                     .target(name: "web3")
                 ],
-            path: "web3swift/src/ZKSync"
+            path: "Sources/Web3ZKSync"
         ),
         .target(
             name: "keccaktiny",
             dependencies: [],
-            path: "web3swift/lib/keccak-tiny",
+            path: "libs/keccak-tiny",
             exclude: ["module.map"]
         ),
         .target(
             name: "aes",
             dependencies: [],
-            path: "web3swift/lib/aes",
+            path: "libs/aes",
             exclude: ["module.map"]
         ),
         .target(
             name: "Internal_CryptoSwift_PBDKF2",
             dependencies: [],
-            path: "web3swift/lib/CryptoSwift"
+            path: "libs/CryptoSwift"
         ),
         .testTarget(
             name: "web3swiftTests",
             dependencies: ["web3", "web3-zksync"],
-            path: "web3sTests",
+            path: "Tests/Web3SwiftTests",
             resources: [
                 .copy("Resources/rlptests.json"),
                 .copy("Account/cryptofights_712.json"),

scripts/prepareForPush.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-SWIFT_VERSION=5.3
-
 cd "$(dirname "$0")"
 
 ./runSwiftFormat.sh

scripts/runSwiftFormat.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SWIFT_VERSION=5.3
+SWIFT_VERSION=5.10
 
 cd "$(dirname "$0")"
 
@@ -17,8 +17,8 @@ if ! which bin/swiftformat >/dev/null; then
     cd bin
     rm -r ./*
 
-    downloadAndUnzip "SwiftFormatTmp" "https://github.com/nicklockwood/SwiftFormat/releases/download/0.50.3/swiftformat.artifactbundle.zip"
-    mv -f ./SwiftFormatTmp/swiftformat.artifactbundle/swiftformat-0.50.3-macos/bin/swiftformat .
+    downloadAndUnzip "SwiftFormatTmp" "https://github.com/nicklockwood/SwiftFormat/releases/download/0.54.3/swiftformat.artifactbundle.zip"
+    mv -f ./SwiftFormatTmp/swiftformat.artifactbundle/swiftformat-0.54.3-macos/bin/swiftformat .
     find . -name "*Tmp" -type d -prune -exec rm -rf '{}' +
     for entry in ./*
     do

scripts/setupKey.sh

@@ -1,4 +1,7 @@
 #!/bin/sh
 
-# write first argument to a Test
-echo "extension TestConfig {\nstatic let privateKey = \"$1\"\nstatic let publicKey = \"0xE78e5ecb061fE3DD1672dDDA7b5116213B23B99A\"\n}" > web3sTests/TestConfig_private.swift
+# Move one directory up from the script directory
+cd "$(dirname "$0")/.."
+
+# Write the first argument to TestConfig_private.swift
+echo "extension TestConfig {\nstatic let privateKey = \"$1\"\nstatic let publicKey = \"0xE78e5ecb061fE3DD1672dDDA7b5116213B23B99A\"\n}" > Tests/Web3SwiftTests/TestConfigPrivate.swift