ethspecify 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

ethspecify/core.py

@@ -83,23 +83,23 @@ def diff(a_name, a_content, b_name, b_content):
 
 
 @functools.lru_cache()
-def get_links():
-    url = f"https://raw.githubusercontent.com/jtraglia/ethspecify/main/links.json"
+def get_links(version="nightly"):
+    url = f"https://raw.githubusercontent.com/jtraglia/ethspecify/main/pyspec/{version}/links.json"
     response = requests.get(url)
     response.raise_for_status()
     return response.json()
 
 
 @functools.lru_cache()
-def get_pyspec():
-    url = f"https://raw.githubusercontent.com/jtraglia/ethspecify/main/pyspec.json"
+def get_pyspec(version="nightly"):
+    url = f"https://raw.githubusercontent.com/jtraglia/ethspecify/main/pyspec/{version}/pyspec.json"
     response = requests.get(url)
     response.raise_for_status()
     return response.json()
 
 
-def get_previous_forks(fork):
-    pyspec = get_pyspec()
+def get_previous_forks(fork, version="nightly"):
+    pyspec = get_pyspec(version)
     config_vars = pyspec["mainnet"][fork]["config_vars"]
     previous_forks = ["phase0"]
     for key in config_vars.keys():
@@ -111,8 +111,8 @@ def get_previous_forks(fork):
     return list(reversed(previous_forks))
 
 
-def get_spec(attributes, preset, fork):
-    pyspec = get_pyspec()
+def get_spec(attributes, preset, fork, version="nightly"):
+    pyspec = get_pyspec(version)
     spec = None
     if "function" in attributes or "fn" in attributes:
         if "function" in attributes and "fn" in attributes:
@@ -197,9 +197,9 @@ def get_spec(attributes, preset, fork):
         raise Exception("invalid spec tag")
     return spec
 
-def get_latest_fork():
+def get_latest_fork(version="nightly"):
     """A helper function to get the latest non-eip fork."""
-    pyspec = get_pyspec()
+    pyspec = get_pyspec(version)
     forks = sorted(
         pyspec["mainnet"].keys(),
         key=lambda x: (x != "phase0", x.startswith("eip"), x)
@@ -214,36 +214,41 @@ def parse_common_attributes(attributes):
     except KeyError:
         preset = "mainnet"
 
+    try:
+        version = attributes["version"]
+    except KeyError:
+        version = "nightly"
+
     try:
         fork = attributes["fork"]
     except KeyError:
-        fork = get_latest_fork()
+        fork = get_latest_fork(version)
 
     try:
         style = attributes["style"]
     except KeyError:
         style = "hash"
 
-    return preset, fork, style
+    return preset, fork, style, version
 
 def get_spec_item(attributes):
-    preset, fork, style = parse_common_attributes(attributes)
-    spec = get_spec(attributes, preset, fork)
+    preset, fork, style, version = parse_common_attributes(attributes)
+    spec = get_spec(attributes, preset, fork, version)
 
     if style == "full" or style == "hash":
         return spec
     elif style == "diff":
-        previous_forks = get_previous_forks(fork)
+        previous_forks = get_previous_forks(fork, version)
 
         previous_fork = None
         previous_spec = None
         for i, _ in enumerate(previous_forks):
             previous_fork = previous_forks[i]
-            previous_spec = get_spec(attributes, preset, previous_fork)
+            previous_spec = get_spec(attributes, preset, previous_fork, version)
             if previous_spec != "phase0":
                 try:
                     previous_previous_fork = previous_forks[i+1]
-                    previous_previous_spec = get_spec(attributes, preset, previous_previous_fork)
+                    previous_previous_spec = get_spec(attributes, preset, previous_previous_fork, version)
                     if previous_previous_spec == previous_spec:
                         continue
                 except KeyError:
@@ -263,7 +268,7 @@ def get_spec_item(attributes):
                 function_name = attributes["function"]
             else:
                 function_name = attributes["fn"]
-            for key, value in get_links().items():
+            for key, value in get_links(version).items():
                 if fork in key and key.endswith(function_name):
                     return value
             return "Could not find link"
@@ -322,8 +327,8 @@ def replace_spec_tags(file_path):
 
         attributes = extract_attributes(original_tag_text)
         print(f"spec tag: {attributes}")
-        preset, fork, style = parse_common_attributes(attributes)
-        spec = get_spec(attributes, preset, fork)
+        preset, fork, style, version = parse_common_attributes(attributes)
+        spec = get_spec(attributes, preset, fork, version)
         hash_value = hashlib.sha256(spec.encode('utf-8')).hexdigest()[:8]
 
         if style == "hash":

{ethspecify-0.2.0.dist-info → ethspecify-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethspecify
-Version: 0.2.0
+Version: 0.2.1
 Summary: A utility for processing Ethereum specification tags.
 Home-page: https://github.com/jtraglia/ethspecify
 Author: Justin Traglia
@@ -66,6 +66,20 @@ ethspecify
 
 ## Specification Options
 
+### Version
+
+This attribute specifies which version of the consensus specifications to use. Default is `nightly`.
+
+- `nightly` (default) - Uses the latest nightly build from the master branch
+- `v1.6.0-alpha.2`, `v1.6.0-alpha.3`, etc. - Uses a specific tagged release version
+
+Example:
+```
+/*
+ * <spec fn="apply_deposit" fork="electra" version="v1.6.0-alpha.3" />
+ */
+```
+
 ### Fork
 
 This attribute can be any of the [executable

ethspecify-0.2.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+ethspecify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ethspecify/cli.py,sha256=73NnY6-xvFcxMnpeZ1LqvU02EiNiPx5jOor1KPERenk,6903
+ethspecify/core.py,sha256=Nu5-onBdtmibdO9FkwZL1gGWjRAvZkTPeWZ0H9v2NoI,13292
+ethspecify-0.2.1.dist-info/licenses/LICENSE,sha256=Awxsr73mm9YMBVhBYnzeI7bNdRd-bH6RDtO5ItG0DaM,1071
+ethspecify-0.2.1.dist-info/METADATA,sha256=qYoT3-9O7b2SbY7mDJrDJo7T--VpjkIJTPrD2Ob03rc,9185
+ethspecify-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ethspecify-0.2.1.dist-info/entry_points.txt,sha256=09viGkCg9J3h0c9BFRN-BKaJUEaIc4JyULNgBP5EL_g,51
+ethspecify-0.2.1.dist-info/top_level.txt,sha256=0klaMvlVyOkXW09fwZTijJpdybITEp2c9zQKV5v30VM,11
+ethspecify-0.2.1.dist-info/RECORD,,

ethspecify-0.2.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-ethspecify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ethspecify/cli.py,sha256=73NnY6-xvFcxMnpeZ1LqvU02EiNiPx5jOor1KPERenk,6903
-ethspecify/core.py,sha256=tkkuBXXJtjWZOSvrpohaFa89VsiocgdAm9QrB55dtGE,12963
-ethspecify-0.2.0.dist-info/licenses/LICENSE,sha256=Awxsr73mm9YMBVhBYnzeI7bNdRd-bH6RDtO5ItG0DaM,1071
-ethspecify-0.2.0.dist-info/METADATA,sha256=wE94OOQKuoZL8hGliq93NX7LQRLsU5eGbtD380J1kzc,8812
-ethspecify-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ethspecify-0.2.0.dist-info/entry_points.txt,sha256=09viGkCg9J3h0c9BFRN-BKaJUEaIc4JyULNgBP5EL_g,51
-ethspecify-0.2.0.dist-info/top_level.txt,sha256=0klaMvlVyOkXW09fwZTijJpdybITEp2c9zQKV5v30VM,11
-ethspecify-0.2.0.dist-info/RECORD,,