Uniswap v4 support #340

ErikBjare · 2023-07-04T09:23:27Z

Just a PR with all the changes in the dev/v4 branch.

Closes #337

v4 support pre-alpha

Poolid function fix; Splitting methods to contract's calls wraps and market functions.

Pool manager ABI added; Poolid function fix; Splitting methods to contract's calls wraps and market functions.

UniswapV4 alpha

fix p1

and more

and more!

codecov · 2024-01-09T16:21:56Z

Codecov Report

Attention: Patch coverage is 34.74576% with 154 lines in your changes missing coverage. Please review.

Project coverage is 46.75%. Comparing base (4f15d2e) to head (3dbb914).

❗ Current head 3dbb914 differs from pull request most recent head f7297f9

Please upload reports for the commit f7297f9 to get more accurate results.

Files	Patch %	Lines
uniswap/uniswap4.py	24.61%	147 Missing ⚠️
uniswap/util.py	20.00%	4 Missing ⚠️
uniswap/types.py	90.32%	3 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           master     #340       +/-   ##
===========================================
- Coverage   71.22%   46.75%   -24.48%     
===========================================
  Files          11       12        +1     
  Lines        1074     1309      +235     
===========================================
- Hits          765      612      -153     
- Misses        309      697      +388

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

fix p.2

fix p2.1

fix p2.3

fix pt2.4

fix p2.5

1

price fetching refactored; custom gas pricing; misc

typing fixes

typing fix 2

typing fixes

some more fixes

liquid-8 · 2024-06-06T06:46:26Z

@ErikBjare ^^

ABIs update

final fixes and clean-ups

typing fix

2

more stupidity fix

1

ErikBjare · 2024-06-10T16:24:45Z

uniswap/constants.py

+# need to replace with actual addresses after release
+_poolmanager_contract_addresses = {
+    "mainnet": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "ropsten": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "rinkeby": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "görli": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "xdai": "0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7",
+    "binance": "0xcA143Ce32Fe78f1f7019d7d551a6402fC5350c73",
+    "binance_testnet": "0x6725F303b657a9451d8BA641348b6761A6CC7a17",
+}
+
+# need to replace with actual addresses after release
+_quoter_contract_addresses = {
+    "mainnet": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "ropsten": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "rinkeby": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "görli": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "xdai": "0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7",
+    "binance": "0xcA143Ce32Fe78f1f7019d7d551a6402fC5350c73",
+    "binance_testnet": "0x6725F303b657a9451d8BA641348b6761A6CC7a17",
+}


Suggested change

# need to replace with actual addresses after release

_poolmanager_contract_addresses = {

"mainnet": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"ropsten": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"rinkeby": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"görli": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"xdai": "0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7",

"binance": "0xcA143Ce32Fe78f1f7019d7d551a6402fC5350c73",

"binance_testnet": "0x6725F303b657a9451d8BA641348b6761A6CC7a17",

}

# need to replace with actual addresses after release

_quoter_contract_addresses = {

"mainnet": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"ropsten": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"rinkeby": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"görli": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"xdai": "0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7",

"binance": "0xcA143Ce32Fe78f1f7019d7d551a6402fC5350c73",

"binance_testnet": "0x6725F303b657a9451d8BA641348b6761A6CC7a17",

}

# TODO: replace with actual addresses after official deployment

_poolmanager_contract_addresses = {

#"mainnet": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"ropsten": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"rinkeby": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"görli": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

#"xdai": "0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7",

#"binance": "0xcA143Ce32Fe78f1f7019d7d551a6402fC5350c73",

"binance_testnet": "0x6725F303b657a9451d8BA641348b6761A6CC7a17",

}

# TODO: replace with actual addresses after official deployment

_quoter_contract_addresses = {

#"mainnet": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"ropsten": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"rinkeby": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

"görli": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",

#"xdai": "0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7",

#"binance": "0xcA143Ce32Fe78f1f7019d7d551a6402fC5350c73",

"binance_testnet": "0x6725F303b657a9451d8BA641348b6761A6CC7a17",

}

ErikBjare · 2024-06-10T16:26:06Z

uniswap/uniswap4.py

+    def get_token(self, address: AddressLike, abi_name: str = "erc20") -> ERC20Token:
+        """
+        Retrieves metadata from the ERC20 contract of a given token, like its name, symbol, and decimals.
+        """
+        # FIXME: This function should always return the same output for the same input
+        #        and would therefore benefit from caching
+        if address == ETH_ADDRESS:
+            return ERC20Token("ETH", address, "Ether", 18)
+        token_contract = _load_contract(self.w3, abi_name, address=address)
+        try:
+            _name = token_contract.functions.name().call()
+            _symbol = token_contract.functions.symbol().call()
+            decimals = token_contract.functions.decimals().call()
+        except Exception as e:
+            logger.warning(
+                f"Exception occurred while trying to get token {_addr_to_str(address)}: {e}"
+            )
+            raise InvalidToken(address)
+        try:
+            name = _name.decode()
+        except:
+            name = _name
+        try:
+            symbol = _symbol.decode()
+        except:
+            symbol = _symbol
+        return ERC20Token(symbol, address, name, decimals)


Can we reuse this from the other class? Uniswap.get_token(self, address, abi_name)?

Many such cases, not sure what to do about them all.

liquid-8 and others added 6 commits June 27, 2023 22:47

v4 support pre-alpha

b952063

v4 support pre-alpha

38e1d02

v4 support pre-alpha

f64bdee

v4 support pre-alpha

e59ec71

v4 support pre-alpha

8115417

Merge pull request #339 from liquid-8/dev

054c25c

v4 support pre-alpha

ErikBjare mentioned this pull request Jul 4, 2023

Uniswap v4 support #337

Open

liquid-8 and others added 5 commits August 21, 2023 17:29

futhermore

24c3671

Pool manager ABI added;

c91c767

Poolid function fix; Splitting methods to contract's calls wraps and market functions.

Merge pull request #349 from liquid-8/dev

7f7cbe9

Pool manager ABI added; Poolid function fix; Splitting methods to contract's calls wraps and market functions.

UniswapV4 alpha

2f9e012

Merge pull request #365 from liquid-8/dev

dbe104f

UniswapV4 alpha

ErikBjare marked this pull request as ready for review January 8, 2024 08:47

liquid-8 and others added 11 commits January 8, 2024 11:14

Update __init__.py

2109070

Merge branch 'master' into dev/v4

3087004

fix p.1

442771d

and more

5a3e35b

Merge pull request #366 from liquid-8/dev

af83aa3

fix p1

and more

a908abd

Merge pull request #367 from liquid-8/dev

f06e3d1

and more

and more

fd3f932

Merge pull request #368 from liquid-8/dev

8188da6

and more

and more

7309f15

Merge pull request #369 from liquid-8/dev

cd1b348

and more!

liquid-8 and others added 5 commits January 9, 2024 18:41

fix p.2

c5fd61c

Merge pull request #370 from liquid-8/dev

8fc43e7

fix p.2

fix p2.1

de55f29

Merge pull request #371 from liquid-8/dev

b4c8e88

fix p2.1

fix p2.2

b055385

liquid-8 and others added 16 commits January 9, 2024 19:38

Merge pull request #373 from liquid-8/dev

18312f9

fix p2.3

fix pt2.4

bfde21c

Merge pull request #374 from liquid-8/dev

e88e253

fix pt2.4

fix p2.5

00acbe4

Merge pull request #375 from liquid-8/dev

0d2cb41

fix p2.5

Merge pull request #388 from uniswap-python/master

ac9545c

1

price fetching refactored; custom gas pricing; misc

2bc594c

Merge pull request #389 from liquid-8/dev

c1f237a

price fetching refactored; custom gas pricing; misc

typing fixes

14130d1

Merge pull request #390 from liquid-8/dev

0ebdb89

typing fixes

typing fix 2

88e9275

Merge pull request #391 from liquid-8/dev

56be7db

typing fix 2

typing fixes

ab23b04

Merge pull request #392 from liquid-8/dev

3deff6f

typing fixes

123

1a81999

Merge pull request #393 from liquid-8/dev

f277370

some more fixes

liquid-8 and others added 12 commits June 8, 2024 02:53

ABIs update

9444386

Merge pull request #394 from liquid-8/dev

b7bb565

ABIs update

final fixes and clean-ups

7383ee0

Merge pull request #396 from liquid-8/dev

f28ec7e

final fixes and clean-ups

1

890dab5

Merge pull request #397 from liquid-8/dev

740644b

typing fix

2

a252678

Merge pull request #398 from liquid-8/dev

b3a53c5

2

more stupidity fix

70a627b

Merge pull request #399 from liquid-8/dev

3dbb914

more stupidity fix

1

371454b

Merge pull request #400 from liquid-8/dev

f7297f9

1

ErikBjare commented Jun 10, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uniswap v4 support #340

Uniswap v4 support #340

ErikBjare commented Jul 4, 2023

codecov bot commented Jan 9, 2024 •

edited

liquid-8 commented Jun 6, 2024

ErikBjare Jun 10, 2024

ErikBjare Jun 10, 2024

Uniswap v4 support #340

Are you sure you want to change the base?

Uniswap v4 support #340

Conversation

ErikBjare commented Jul 4, 2023

codecov bot commented Jan 9, 2024 • edited

Codecov Report

liquid-8 commented Jun 6, 2024

ErikBjare Jun 10, 2024

Choose a reason for hiding this comment

ErikBjare Jun 10, 2024

Choose a reason for hiding this comment

codecov bot commented Jan 9, 2024 •

edited