Merge branch 'develop'

.github/workflows/macOS-tests.yml

@@ -1,4 +1,4 @@
-name: "macOS 12"
+name: "macOS 13"
 
 on:
   push:
@@ -23,38 +23,38 @@ on:
       - develop-4.0
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
 
 jobs:
   spm:
-    name: Swift Package Manager 5.7
-    runs-on: macOS-12
+    name: Swift Package Manager 5.9
+    runs-on: macos-13
     concurrency:
       group: spm-${{ github.run_id }}
       cancel-in-progress: false
     steps:
       - uses: actions/checkout@v3
       - name: Discover typos
         run: |
-          pip3 install --upgrade pip
-          pip3 install codespell
+          pipx install codespell
           codespell  # See .codespellrc for args
       - name: SwiftLint
         run: |
           # 1. Make all automated fixes that are possible
           # 2. git diff to see what (if any) automated fixes were made
           # 3. See https://github.com/realm/SwiftLint#xcode explains why the double run
           swiftlint --fix --quiet && git diff && swiftlint --quiet
+      - name: Install Foundry (includes anvil EVM)
+        run: |
+          curl -L https://foundry.paradigm.xyz | bash
+          source ~/.bashrc
+          foundryup
+      - name: Start anvil in background
+        run: ~/.foundry/bin/anvil -q &
       - name: Resolve dependencies
         run: swift package resolve
       - name: Build
         run: swift build --build-tests
-      - name: Install ganache
-        run: npm install ganache --global
-      - name: Start ganache in background
-        run: ganache &
-      - name: Wait till ganache starts
-        run: sleep 1
       - name: Run local tests
         run: swift test --skip-build -c debug --filter localTests
       - name: Run remote tests

.swiftformat

@@ -0,0 +1,51 @@
+# rules
+--enable isEmpty
+--enable redundantFileprivate
+--enable redundantReturn
+--enable redundantBackticks
+--enable redundantBreak
+--enable redundantClosure
+--enable redundantExtensionACL
+--enable organizeDeclarations
+--enable redundantFileprivate
+--enable redundantGet
+--enable redundantInit
+--enable redundantInternal
+--enable redundantLet
+--enable redundantLetError
+--enable redundantNilInit
+--enable redundantObjc
+--enable redundantOptionalBinding
+--enable redundantParens
+--enable redundantPattern
+--enable redundantStaticSelf
+--enable redundantVoidReturnType
+--disable redundantRawValues
+--disable sortImports
+--disable andOperator
+--disable wrapMultilineStatementBraces
+--disable extensionAccessControl
+
+# format options
+--indentcase true
+--trimwhitespace nonblank-lines
+--maxwidth 130
+--commas inline
+--comments indent
+--decimalgrouping 3,5
+--exponentcase lowercase
+--exponentgrouping disabled
+--extensionacl on-declarations
+--fractiongrouping disabled
+--ifdef no-indent
+--importgrouping testable-top
+--operatorfunc no-space
+--nospaceoperators ..<, ...
+--selfrequired validate
+--stripunusedargs closure-only
+--wraparguments preserve
+--wrapcollections preserve
+--wrapparameters preserve
+
+# organizeDeclarations
+--markcategories false

Package.swift

@@ -12,11 +12,11 @@ let package = Package(
         .library(name: "web3swift", targets: ["web3swift"])
     ],
     dependencies: [
-        .package(url: "https://github.com/attaswift/BigInt.git", .upToNextMinor(from: "5.3.0")),
-        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMinor(from: "1.5.1"))
+        .package(url: "https://github.com/attaswift/BigInt.git", .upToNextMinor(from: "5.4.0")),
+        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.5.1"),
+        .package(name: "secp256k1", url: "https://github.com/GigaBitcoin/secp256k1.swift", .upToNextMinor(from: "0.10.0")),
     ],
     targets: [
-        .target(name: "secp256k1"),
         .target(
             name: "Web3Core",
             dependencies: ["BigInt", "secp256k1", "CryptoSwift"]