diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index f4b271e5d..000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: "Web3swift CI"
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-      - hotfix
-    paths:
-      - Packag*.swift
-      - web3swift.podspec
-      - Cartfile
-      - Sources/**
-      - 'Tests/**'
-      - 'web3swift*/**'
-      - '.github/workflows/**'
-  pull_request:
-    branches:
-      - master
-      - develop
-
-jobs:
-  spm:
-    name: Swift Package Manager 5.4
-    runs-on: macOS-11
-    concurrency: 
-      group: spm-${{ github.run_id }}
-      cancel-in-progress: false
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
-    steps:
-      - uses: actions/checkout@v2
-      - 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
-        run: swift test --skip-build -c debug --filter remoteTests
-  carthage:
-    name: Carthage
-    runs-on: macOS-11
-    concurrency: 
-      group: carthage-${{ github.run_id }}
-      cancel-in-progress: false
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      matrix:
-        destination: ['OS=14.5,name=iPhone 12']
-    steps:
-      - uses: actions/checkout@v2
-      - name: Resolving dependencies
-        run: carthage checkout
-      - name: Building dependencies
-        run: carthage build --no-use-binaries --platform iOS Simulator --use-xcframeworks
-      - name: Building framework
-        run: xcodebuild build-for-testing -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}"
-      - 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: xcodebuild test-without-building -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan LocalTests
-      - name: Run remote tests
-        run: xcodebuild test-without-building -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan RemoteTests
diff --git a/Package 2.resolved b/Package 2.resolved
new file mode 100644
index 000000000..e660c3666
--- /dev/null
+++ b/Package 2.resolved	
@@ -0,0 +1,25 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "BigInt",
+        "repositoryURL": "https://github.com/attaswift/BigInt.git",
+        "state": {
+          "branch": null,
+          "revision": "0ed110f7555c34ff468e72e1686e59721f2b0da6",
+          "version": "5.3.0"
+        }
+      },
+      {
+        "package": "CryptoSwift",
+        "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "db51c407d3be4a051484a141bf0bff36c43d3b1e",
+          "version": "1.8.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package 3.resolved b/Package 3.resolved
new file mode 100755
index 000000000..5849fb7ca
--- /dev/null
+++ b/Package 3.resolved	
@@ -0,0 +1,43 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "BigInt",
+        "repositoryURL": "https://github.com/attaswift/BigInt.git",
+        "state": {
+          "branch": null,
+          "revision": "0ed110f7555c34ff468e72e1686e59721f2b0da6",
+          "version": "5.3.0"
+        }
+      },
+      {
+        "package": "CryptoSwift",
+        "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "039f56c5d7960f277087a0be51f5eb04ed0ec073",
+          "version": "1.5.1"
+        }
+      },
+      {
+        "package": "PromiseKit",
+        "repositoryURL": "https://github.com/mxcl/PromiseKit.git",
+        "state": {
+          "branch": null,
+          "revision": "7b07b214dacecb22ca4b680531c7e981d52483f9",
+          "version": "6.16.3"
+        }
+      },
+      {
+        "package": "Starscream",
+        "repositoryURL": "https://github.com/daltoniam/Starscream.git",
+        "state": {
+          "branch": null,
+          "revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
+          "version": "4.0.4"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package 4.resolved b/Package 4.resolved
new file mode 100644
index 000000000..002edb776
--- /dev/null
+++ b/Package 4.resolved	
@@ -0,0 +1,25 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "BigInt",
+        "repositoryURL": "https://github.com/attaswift/BigInt.git",
+        "state": {
+          "branch": null,
+          "revision": "0ed110f7555c34ff468e72e1686e59721f2b0da6",
+          "version": "5.3.0"
+        }
+      },
+      {
+        "package": "CryptoSwift",
+        "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "039f56c5d7960f277087a0be51f5eb04ed0ec073",
+          "version": "1.5.1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Sources/web3swift/Transaction/EIP712Envelope.swift b/Sources/web3swift/Transaction/EIP712Envelope.swift
index a61197127..ea7b10a1c 100644
--- a/Sources/web3swift/Transaction/EIP712Envelope.swift
+++ b/Sources/web3swift/Transaction/EIP712Envelope.swift
@@ -277,7 +277,7 @@ extension EIP712Envelope {
         #if canImport(web3swift_zksync2)
         self.EIP712Meta = web3swift_zksync2.EIP712Meta(gasPerPubdata: gasPerPubdata, customSignature: customSignature, paymasterParams: paymasterParams, factoryDeps: factoryDeps)
         #else
-        self.EIP712Meta = EIP712Meta(gasPerPubdata: gasPerPubdata, customSignature: customSignature, paymasterParams: paymasterParams, factoryDeps: factoryDeps)
+        self.EIP712Meta = web3swift.EIP712Meta(gasPerPubdata: gasPerPubdata, customSignature: customSignature, paymasterParams: paymasterParams, factoryDeps: factoryDeps)
         #endif
         
         switch rlpItem[RlpKey.from.rawValue]!.content {