Compare commits
15 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6162721434 | ||
|
|
984fe2edce | ||
|
|
edd142f7e2 | ||
|
|
2212acf422 | ||
|
|
7da69aad85 | ||
|
|
9c4b862581 | ||
|
|
56998c506b | ||
|
|
470fd8134d | ||
|
|
ed5e24cfa0 | ||
|
|
d5c403e3a7 | ||
|
|
ab434e33ec | ||
|
|
4f32d90106 |
||
|
|
1d114ff4ff | ||
|
|
9957d76373 | ||
|
|
b66de71022 |
6 changed files with 28 additions and 61 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1 +1 @@
|
|||
/vyper-[0-9]*.[0-9]*.[0-9]*.tar.gz
|
||||
/vyper-*.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (vyper-0.4.1.tar.gz) = 98d03ae6cd7d268b5292f52ac2b7a7b24e3250674a959afff1cc95ce17cde534416381c80e66d5a29c0b6e970557f5f6e52396e714abfd3c4bd745deb8a02cda
|
||||
SHA512 (vyper-0.4.3.tar.gz) = cda058f58deed9ed5e64179c6ccb880cefa103c93008659e09c699f0d40825eaffa1b5c19ff7f93ef80b926d6c69a43c9dbfb80113e59d6a8a457f8bbbc6fbb4
|
||||
|
|
|
|||
|
|
@ -5,28 +5,28 @@ Subject: [PATCH] Use Cryptodomex
|
|||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index e6d4c576..28ba7ebd 100644
|
||||
index a3cb94c5..4daf01be 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -92,7 +92,7 @@ setup(
|
||||
install_requires=[
|
||||
"cbor2>=5.4.6,<6",
|
||||
"asttokens>=2.0.5,<3",
|
||||
"asttokens>=2.0.5,<4",
|
||||
- "pycryptodome>=3.5.1,<4",
|
||||
+ "pycryptodomex>=3.5.1,<4",
|
||||
"packaging>=23.1,<24",
|
||||
"packaging>=23.1",
|
||||
"lark>=1.0.0,<2",
|
||||
"importlib-metadata",
|
||||
"wheel",
|
||||
diff --git a/vyper/utils.py b/vyper/utils.py
|
||||
index d1327475..9e5f5863 100644
|
||||
index 9b1084ab..2896a1e0 100644
|
||||
--- a/vyper/utils.py
|
||||
+++ b/vyper/utils.py
|
||||
@@ -217,7 +217,7 @@ decimal.setcontext(DecimalContextOverride(prec=78))
|
||||
@@ -11,7 +11,7 @@ import traceback
|
||||
import warnings
|
||||
from typing import Generic, Iterable, Iterator, List, Set, TypeVar, Union
|
||||
|
||||
-from Crypto.Hash import keccak
|
||||
+from Cryptodome.Hash import keccak
|
||||
|
||||
try:
|
||||
- from Crypto.Hash import keccak # type: ignore
|
||||
+ from Cryptodome.Hash import keccak # type: ignore
|
||||
from vyper.exceptions import CompilerPanic, DecimalOverrideException
|
||||
|
||||
keccak256 = lambda x: keccak.new(digest_bits=256, data=x).digest() # noqa: E731
|
||||
except ImportError:
|
||||
|
|
|
|||
|
|
@ -5,18 +5,12 @@ Subject: [PATCH] Ease version requirements
|
|||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 28ba7ebd..2dd2d9b9 100644
|
||||
index 4daf01be..e6613671 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -93,12 +93,12 @@ setup(
|
||||
"cbor2>=5.4.6,<6",
|
||||
"asttokens>=2.0.5,<3",
|
||||
"pycryptodomex>=3.5.1,<4",
|
||||
- "packaging>=23.1,<24",
|
||||
+ "packaging>=23.1",
|
||||
"lark>=1.0.0,<2",
|
||||
"importlib-metadata",
|
||||
@@ -98,7 +98,7 @@ setup(
|
||||
"wheel",
|
||||
"immutables",
|
||||
],
|
||||
- setup_requires=["setuptools_scm>=7.1.0,<8.0.0"],
|
||||
+ setup_requires=["setuptools_scm>=7.1.0"],
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Thu, 25 Jul 2024 23:18:23 +0200
|
||||
Subject: [PATCH] Relax lark dependency
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 2dd2d9b9..0a3367ca 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -15,7 +15,7 @@ extras_require = {
|
||||
"pytest-split>=0.7.0,<1.0",
|
||||
"eth_abi>=5.0.0,<6.0.0",
|
||||
"py-evm>=0.10.1b1,<0.11",
|
||||
- "lark==1.1.9",
|
||||
+ "lark>=1.1.7",
|
||||
"hypothesis[lark]>=6.0,<7.0",
|
||||
"eth-stdlib==0.2.7",
|
||||
"eth-account==0.12.2",
|
||||
32
vyper.spec
32
vyper.spec
|
|
@ -1,47 +1,39 @@
|
|||
%global git_commit 8a93dd27de503b0a3ace36d961a10c9ea4adee8b
|
||||
%global git_commit bff19ea204059290da652854cd634abef10f6c43
|
||||
|
||||
Summary: Pythonic Smart Contract Language for the EVM
|
||||
Name: vyper
|
||||
Version: 0.4.1
|
||||
Version: 0.4.3
|
||||
Release: %autorelease
|
||||
BuildArch: noarch
|
||||
License: Apache-2.0
|
||||
URL: https://vyperlang.org
|
||||
Source0: %{pypi_source %{name}}
|
||||
Patch1: vyper-0001-Use-Cryptodomex.patch
|
||||
Patch2: vyper-0002-Ease-version-requirements.patch
|
||||
Patch3: vyper-0003-Remove-unnecessary-shebang.patch
|
||||
Patch4: vyper-0004-Relax-lark-dependency.patch
|
||||
# Fedora-specific
|
||||
Patch: vyper-0001-Use-Cryptodomex.patch
|
||||
# Reverts https://github.com/vyperlang/vyper/pull/3613
|
||||
Patch: vyper-0002-Ease-version-requirements.patch
|
||||
Patch: vyper-0003-Remove-unnecessary-shebang.patch
|
||||
BuildRequires: git
|
||||
BuildRequires: python3-cached_property
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-eth-abi
|
||||
BuildRequires: python3-eth-keys
|
||||
BuildRequires: python3-eth-stdlib
|
||||
BuildRequires: python3-hypothesis
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-rlp
|
||||
BuildSystem: pyproject
|
||||
BuildOption(install): -l %{name}
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%prep -a
|
||||
echo %{sub %git_commit 0 7} > ./vyper/vyper_git_commithash.txt
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires
|
||||
|
||||
%build
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%pyproject_install
|
||||
%pyproject_save_files -l %{name}
|
||||
%install -a
|
||||
rm -f %{buildroot}/usr/vyper_git_commithash.txt
|
||||
|
||||
%check
|
||||
%pyproject_check_import
|
||||
%check -a
|
||||
# FIXME requires https://github.com/ethereum/py-evm
|
||||
# FIXME requires https://github.com/paradigmxyz/pyrevm
|
||||
#%%pytest
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue