Merge pull request #57 from Ellipsis-Labs/jarry/push-1.17.23

update 1.17.23

Author: jarry-xiao

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "solana-verify"
-version = "0.2.9"
+version = "0.2.10"
 edition = "2021"
 description = "A CLI tool for building verifiable Solana programs"
 license = "MIT"

Cargo.toml

@@ -10,10 +10,13 @@
 parser = argparse.ArgumentParser()
 parser.add_argument("--upload", action="store_true")
 parser.add_argument("--skip_cache", action="store_true")
+parser.add_argument("--version")
 args = parser.parse_args()
 
 # Array of Solana version mapped to rust version hashes
-RUST_DOCKER_IMAGESHA_MAP = {}
+RUST_DOCKER_IMAGESHA_MAP = {
+    "1.68.0": "sha256:79892de83d1af9109c47a4566a24a0b240348bb8c088f1bccc52645c4c70ec39"
+}
 
 
 RUST_VERSION_PLACEHOLDER = "$RUST_VERSION"
@@ -87,9 +90,9 @@ def get_toolchain(version_tag):
         print(f"Failed to fetch rust version for {release}")
         continue
 
-    if rust_version not in RUST_DOCKER_IMAGESHA_MAP:
+    if rust_version not in RUST_DOCKER_IMAGESHA_MAP and rust_version != "1.68.0":
         response = requests.get(
-            f"https://hub.docker.com/v2/namespaces/library/repositories/rust/tags/{rust_version}-bullseye"
+            f"https://hub.docker.com/v2/namespaces/library/repositories/rust/tags/{rust_version}"
         )
 
         if response.status_code == 200:
@@ -125,6 +128,8 @@ def get_toolchain(version_tag):
         f.write(dockerfile)
     dockerfiles[release] = path
 
+print(RUST_DOCKER_IMAGESHA_MAP)
+
 if args.upload:
     digest_set = set()
     if not args.skip_cache:
@@ -144,6 +149,22 @@ def get_toolchain(version_tag):
     for tag, dockerfile in dockerfiles.items():
         # Strip the `v` from the tag to keep the versions consistent in Docker
         stripped_tag = tag.strip("v")
+
+        (major, minor, patch) = stripped_tag.split(".")
+
+        print(stripped_tag, args.version)
+
+        if args.version is not None:
+            ver = args.version.split(".")
+            if len(ver) == 2:
+                a_major, a_minor = ver
+                a_patch = patch
+            if len(ver) == 3:
+                a_major, a_minor, a_patch = ver
+            if major != a_major or minor != a_minor or a_patch != patch:
+                print(f"Skipping {stripped_tag}")
+                continue
+
         if stripped_tag in digest_set and stripped_tag not in dirty_set:
             print(f"Already built image for {stripped_tag}, skipping")
             continue

generate_dockerfiles.py

@@ -61,8 +61,8 @@ lazy_static! {
         m.insert((1, 16, 25), "sha256:c48298cbb97dbd6a493ee9592d4c3700e214b34788ea67e0bca58ff388179340");
         m.insert((1, 16, 26), "sha256:9a28b2961396c1fba8855744eaea125640b3dbda7a86fc0a7ae375824338144d");
         m.insert((1, 16, 27), "sha256:d3f39f5e1d2fbf798149416bbcb050ae8c03ea8ce18c559fc64beb7547f5c96b");
-        m.insert((1, 17, 0), "sha256:8e5593ea91d20e4ec24eda8ea2065333f6e7c4ae5496947b9910b93889c78a03");
-        m.insert((1, 17, 1), "sha256:3a522b734f7a260769d9daf2049c70172808285aedd3700d7f73ba5164e0b939");
+        m.insert((1, 17, 0), "sha256:5384f5ba77081d57e5b9c925bf1143315141fccd4fa19bb76210d50ad0a87c9d");
+        m.insert((1, 17, 1), "sha256:33a99de6e0441b5e40bc74c37201f69e6d94225f3df12ab492f41c2372d919ce");
         m.insert((1, 17, 2), "sha256:4d862e20ab6b1fafdc59cbb9b7cd3200b4c0e4c66de767fac3a49f871baa4e3d");
         m.insert((1, 17, 3), "sha256:c58cf31748b19f03aa21f2d677db0296d98ddc52889953096ab85586b537a770");
         m.insert((1, 17, 4), "sha256:d7cbe13c49ae3a23205d0a6c0d6410e2b4deb69c7b2d6ccc8bf9ca3fc322d649");
@@ -84,7 +84,7 @@ lazy_static! {
         m.insert((1, 17, 20), "sha256:7914649a71b10819dbb1f9d5ae440217b83af3f55e8454ff3a1f92e5174148d5");
         m.insert((1, 17, 21), "sha256:6f8c4364e7bd95b08b341caf13046841d6fe2b7e41d8bb6ca89edea479b8d59d");
         m.insert((1, 17, 22), "sha256:73a7160507ba99b97948aae6c45bb19639e9b0be0885149927b1cd24e3541b53");
-        m.insert((1, 17, 23), "sha256:51784aead1d36253443a7b23cbf7f8b949a1f88926edfa9bb3931fce2da45a66");
+        m.insert((1, 17, 23), "sha256:be370005dedc49f5997beffe2fe628e1337601836a25d9ef38f5d1cc39f086f7");
         m.insert((1, 17, 24), "sha256:113205a16988d9d5201d5be0a325bbaa7bf951198b64bde0889eb666ca8d25be");
         m.insert((1, 17, 25), "sha256:6b6a24b4f7bf9a4ec1a01a836fd225fea7acecf7a5ddb69789175ba394e11bcd");
         m.insert((1, 17, 26), "sha256:f4dd1b25607cc26c3831b4585171dffce69cd29350548cc3680e598200901c50");