New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Promises #515

Merged

yaroslavyaroslav merged 46 commits into web3swift-team:unstable from pharms-eth:remove-Promises

Apr 27, 2022

Collaborator

pharms-eth commented Apr 7, 2022 •

edited

This PR removes the Promises dependency and replaces it with Swift Concurrency (async/await)
Due to the nature of this PR it is breaking to the entire code base
my approach in this PR was to minimize other changes and focus on the Promises changes

[web3swiftEventloopTests.swift] has been disabled. It will require a full rewrite by someone


          remove promises

3a4a482

pharms-eth marked this pull request as draft

April 7, 2022 06:37

pharms-eth added 10 commits

April 7, 2022 00:05


          first commit

a9df4c7


          Base and some cleanup

fb5102c

changed URLSession to be async and started some cleanup


          propagate async changes

d712c42


          Migrate from Promise to Async

1008eef


          propagate async

d88a493


          propagate Async changes

4e49d11


          update ERC with Async

6f2d7f2


          propagate async

27f504e


          async

a95bfb5


          add async

544171e

pharms-eth marked this pull request as ready for review

April 13, 2022 06:29

pharms-eth added 3 commits

April 12, 2022 23:33


          Merge branch 'develop' into remove-Promises

ee7e3d9


          resolve confilct

08fe344


          bix fug

ec3d2d3

pharms-eth closed this

pharms-eth reopened this

Mark Loit added 9 commits

April 15, 2022 11:18


          Create EthereumMetadata struct and add it to the project

2bf9639


          Add the new metadata struct to EthereumTransaction

ba9aeea


          Back out the workaround implemented tor gasPrice on EIP-1159 transact…

fbb0726

…ions


          update Oracle to use the new metadata struct

4602cdf


          Create EthereumMetadata struct and add it to the project

45b60f6


          Add the new metadata struct to EthereumTransaction

878c2a9


          Back out the workaround implemented tor gasPrice on EIP-1159 transact…

e164bf6

…ions


          update Oracle to use the new metadata struct

d8a1daa


          Merge branch 'feature/transaction-metadata' of https://github.com/mlo…

f28b306

…it/web3swift into feature/transaction-metadata

* 'feature/transaction-metadata' of https://github.com/mloit/web3swift:
  update Oracle to use the new metadata struct
  Back out the workaround implemented tor gasPrice on EIP-1159 transactions
  Add the new metadata struct to EthereumTransaction
  Create EthereumMetadata struct and add it to the project

Contributor

mloit commented Apr 15, 2022

Now that 2.6.0 is out, please update this so it can be merged in as part of 3.0.

Mark Loit and others added 2 commits

April 15, 2022 17:29


          typo fix

11b8260


          Merge branch 'develop' into remove-Promises

ad3d00d

Contributor

mloit commented Apr 17, 2022

the Carthage Project still cannot find some frameworks on my local machine but are libraries still dependencies for this project

For Carthage to work you need to have the Xcode project up to date. and then run the following from the command line to resolve the dependancies:
carthage checkout

and then build them:
carthage build --no-use-binaries --platform iOS Simulator --use-xcframeworks

note you can set the platform to other targets if you want (macOS, tvOS....) The above is recommended as that is what the automated tests basically use.

Collaborator

yaroslavyaroslav commented Apr 18, 2022

let web3 = try await Web3.new(URL(string: "http://127.0.0.1:8545")!) let allAddresses = try await web3.eth.getAccounts()

is where they fail for me due to not having your test node setup. Can we put on the roadmap testing the Swift code and not the server response? ie Swift Best Practices are to not do network calls and instead mock or stub or swizzle

Please take a look at the ci/cd pipeline for both Carthage and SPM building in ./.github/workflows/ci.yml, there's provied whole pipeline of building testing from scratch.

Also, please take a look at the Building from source chapter in readme.md.

Mark Loit and others added 9 commits

April 18, 2022 23:46


          Added mention of EIP-1559

3f13dbb


          Added EIP-1559, EIP-2718, and EIP-2930 to the list of supported EIP's

Re-ordered the list to be in numerical order


          added some basics for creating transactions with the new types

6bb47dd


          typo fixes

f89cea8


          Merge pull request web3swift-team#530 from mloit/feature/document-1559

ff7ba8f


          Merge pull request web3swift-team#523 from mloit/feature/transaction-…

4b4ab1b

…metadata


          Merge pull request web3swift-team#533 from skywinder/develop

add3342


          Update Cocoapods version

6429bd4


          Merge pull request web3swift-team#534 from skywinder/master

d96ab6d

JeneaVranceanu mentioned this pull request

Swiftlint force try #529

Closed

yaroslavyaroslav requested changes

View reviewed changes

Package.swift Outdated Show resolved Hide resolved

yaroslavyaroslav reviewed

View reviewed changes

Sources/web3swift/Web3/Web3+HttpProvider.swift Outdated Show resolved Hide resolved

pharms-eth added 2 commits

April 23, 2022 17:16


          Merge branch 'develop' into remove-Promises

f42f197


          add backward compatibility support

c4c5a7f

iOS 15, macOS 12 use the new data(for:
older version fall back on a older implementation

Collaborator Author

pharms-eth commented Apr 24, 2022

added support to iOS 13 and macOS 10.15


          updated carthage

d37ad4d

Collaborator Author

pharms-eth commented Apr 24, 2022

I have updated the Carthage configurations however it is still giving errors

yaroslavyaroslav mentioned this pull request

Add SwiftLinter #524

Closed

Collaborator

yaroslavyaroslav commented Apr 25, 2022

@pharms-eth github actions checks wouldn't pass on current ci/cd config you have. Please pull unstable branch to your to get new one, which is updated to work with your merge.

yaroslavyaroslav requested changes

View reviewed changes

Sources/Linting.xcodeproj/project.xcworkspace/contents.xcworkspacedata

    
            @@ -0,0 +1,7 @@
          
              <?xml version="1.0" encoding="UTF-8"?>

Collaborator

yaroslavyaroslav Apr 25, 2022

Please delete this file

yaroslavyaroslav reviewed

View reviewed changes

web3swift.xcodeproj/project.pbxproj

@@ @@ -1522,7 +1512,7 @@ @@
               				GCC_WARN_UNUSED_VARIABLE = YES;
               				INFOPLIST_FILE = web3swift.xcodeproj/Info.plist;
               				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-              				MACOSX_DEPLOYMENT_TARGET = 10.11;
+              				MACOSX_DEPLOYMENT_TARGET = 12.0;

Collaborator

yaroslavyaroslav Apr 25, 2022

Please change it to 10.15 (through Carthage project settings)

yaroslavyaroslav reviewed

View reviewed changes

web3swift.xcodeproj/project.pbxproj

@@ @@ -1586,7 +1576,7 @@ @@
               				GCC_WARN_UNUSED_VARIABLE = YES;
               				INFOPLIST_FILE = web3swift.xcodeproj/Info.plist;
               				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-              				MACOSX_DEPLOYMENT_TARGET = 10.11;
+              				MACOSX_DEPLOYMENT_TARGET = 12.0;

Collaborator

yaroslavyaroslav Apr 25, 2022

Please change it to 10.15 (through Carthage project settings)

yaroslavyaroslav reviewed

View reviewed changes

web3swift.xcodeproj/project.pbxproj

               				LD_RUNPATH_SEARCH_PATHS = (
               					"$(inherited)",
               					"@executable_path/../Frameworks",
               					"@loader_path/Frameworks",
               				);
-              				MACOSX_DEPLOYMENT_TARGET = 10.11;
+              				MACOSX_DEPLOYMENT_TARGET = 12.0;

Collaborator

yaroslavyaroslav Apr 25, 2022

Please change it to 10.15 (through Carthage project settings)

yaroslavyaroslav reviewed

View reviewed changes

web3swift.xcodeproj/project.pbxproj

               				LD_RUNPATH_SEARCH_PATHS = (
               					"$(inherited)",
               					"@executable_path/../Frameworks",
               					"@loader_path/Frameworks",
               				);
-              				MACOSX_DEPLOYMENT_TARGET = 10.11;
+              				MACOSX_DEPLOYMENT_TARGET = 12.0;

Collaborator

yaroslavyaroslav Apr 25, 2022

Please change it to 10.15 (through Carthage project settings)

yaroslavyaroslav reviewed

View reviewed changes

web3swift.xcodeproj/project.pbxproj

               				LD_RUNPATH_SEARCH_PATHS = (
               					"$(inherited)",
               					"@executable_path/../Frameworks",
               					"@loader_path/Frameworks",
               				);
-              				MACOSX_DEPLOYMENT_TARGET = 10.11;
+              				MACOSX_DEPLOYMENT_TARGET = 12.0;

Collaborator

yaroslavyaroslav Apr 25, 2022

Please change it to 10.15 (through Carthage project settings)

yaroslavyaroslav reviewed

View reviewed changes

web3swift.xcodeproj/project.pbxproj

               				LD_RUNPATH_SEARCH_PATHS = (
               					"$(inherited)",
               					"@executable_path/../Frameworks",
               					"@loader_path/Frameworks",
               				);
-              				MACOSX_DEPLOYMENT_TARGET = 10.11;
+              				MACOSX_DEPLOYMENT_TARGET = 12.0;

Collaborator

yaroslavyaroslav Apr 25, 2022

Please change it to 10.15 (through Carthage project settings)

Collaborator

yaroslavyaroslav commented Apr 25, 2022 •

edited

After fixing version issues i'm about to merge that massive PR in.

I've ran both tests suits locally and while remoteTests are all green 'localTests` have some issues, i thinks it's better than possible starting point of 3.0.0 release.

So i suggest to merge this boi and move further to make all tests green and then to start public API redesign.

yaroslavyaroslav merged commit 3126c04 into web3swift-team:unstable

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment