Revert to vyper 0.3.10

curvefi · Jan 31, 2024 · 6c671f0 · 6c671f0
1 parent 7c815bc
commit 6c671f0
Show file tree

Hide file tree

Showing 20 changed files with 336 additions and 320 deletions.
diff --git a/contracts/ProxyAdmin.vy b/contracts/ProxyAdmin.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # pragma evm-version paris
 """
 @title ProxyAdmin

diff --git a/contracts/main/CurveStableSwapFactoryNG.vy b/contracts/main/CurveStableSwapFactoryNG.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # pragma evm-version shanghai
 """
 @title CurveStableswapFactoryNG

diff --git a/contracts/main/CurveStableSwapFactoryNGHandler.vy b/contracts/main/CurveStableSwapFactoryNGHandler.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # pragma evm-version shanghai
 """
 @title CurveStableswapFactoryNGHandler

diff --git a/contracts/main/CurveStableSwapMetaNG.vy b/contracts/main/CurveStableSwapMetaNG.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # pragma optimize codesize
 # pragma evm-version paris
 """

diff --git a/contracts/main/CurveStableSwapNG.vy b/contracts/main/CurveStableSwapNG.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # pragma optimize codesize
 # pragma evm-version shanghai
 """

diff --git a/contracts/main/CurveStableSwapNGMath.vy b/contracts/main/CurveStableSwapNGMath.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # pragma optimize gas
 # pragma evm-version shanghai
 """

diff --git a/contracts/main/CurveStableSwapNGViews.vy b/contracts/main/CurveStableSwapNGViews.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # pragma evm-version shanghai
 """
 @title CurveStableSwapNGViews

diff --git a/contracts/main/LiquidityGauge.vy b/contracts/main/LiquidityGauge.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # pragma optimize gas
 # pragma evm-version shanghai
 """

diff --git a/contracts/mocks/CallbackSwap.vy b/contracts/mocks/CallbackSwap.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 """
 @title CurveExchangeWithoutApproval
 @author fiddyresearch.eth

diff --git a/contracts/mocks/CurvePool.vy b/contracts/mocks/CurvePool.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 """
 @title StableSwap
 @author Curve.Fi

diff --git a/contracts/mocks/CurveTokenV3.vy b/contracts/mocks/CurveTokenV3.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 """
 @title Curve LP Token
 @author Curve.Fi

diff --git a/contracts/mocks/ERC20.vy b/contracts/mocks/ERC20.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 
 """
 @notice Mock ERC20 for testing

diff --git a/contracts/mocks/ERC20Oracle.vy b/contracts/mocks/ERC20Oracle.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 
 """
 @notice Mock ERC20 with oracle

diff --git a/contracts/mocks/ERC20Rebasing.vy b/contracts/mocks/ERC20Rebasing.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 
 """
 @notice Rebasing ERC20 mock with rebase by 1% on every transfer

diff --git a/contracts/mocks/ERC20RebasingConditional.vy b/contracts/mocks/ERC20RebasingConditional.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 
 """
 @notice Rebasing ERC20 mock with rebase by 1% on every transfer

diff --git a/contracts/mocks/ERC4626.vy b/contracts/mocks/ERC4626.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 # From: https://github.com/fubuloubu/ERC4626/blob/main/contracts/VyperVault.vy
 from vyper.interfaces import ERC20
 from vyper.interfaces import ERC20Detailed

diff --git a/contracts/mocks/Zap.vy b/contracts/mocks/Zap.vy
@@ -1,4 +1,4 @@
-# pragma version 0.1
+# pragma version 0.3.10
 """
 @title "Zap" Depositer for permissionless USD metapools
 @author Curve.Fi

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,8 +10,8 @@ packages = []
 [tool.poetry.dependencies]
 python = "^3.10"
 poetry = "1.5.1"
-titanoboa = { git = "https://github.com/vyperlang/titanoboa.git", rev = "3fe3585" }
-vyper = { git = "https://github.com/DanielSchiavini/vyper.git", rev = "bcf1142d" }
+titanoboa = {git = "https://github.com/vyperlang/titanoboa.git", rev = "8343f16bd35829421c0953373aa854fc52b41170"}
+vyper = "0.3.10"
 pycryptodome = "^3.18.0"
 pre-commit = "^3.3.3"
 

diff --git a/tests/token/test_token_approve.py b/tests/token/test_token_approve.py
@@ -110,7 +110,7 @@ def test_permit(eth_acc, bob, swap):
 def test_permit_contract(eth_acc, bob, swap):
     # based on https://eips.ethereum.org/EIPS/eip-1271
     src = """
-        # pragma version 0.1
+        # pragma version 0.3.10
         OWNER: public(immutable(address))
 
         @external