wip

dfinity · Jan 14, 2025 · 5f4a90d · 5f4a90d
1 parent ad6df00
commit 5f4a90d
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 27 deletions.
diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "8fd8fccec5a57eefbac6e6bc61cde6077b347dc896dd713bf649cb70bb4778b1",
+  "checksum": "55d21e221a8354860cd329805d7c397c26fcc886275d4f294fa946cdaef314be",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -5775,6 +5775,54 @@
       ],
       "license_file": "LICENSE-APACHE"
     },
+    "base64-compat 1.0.0": {
+      "name": "base64-compat",
+      "version": "1.0.0",
+      "package_url": "https://github.com/stevenroose/rust-base64-compat",
+      "repository": {
+        "Http": {
+          "url": "https://static.crates.io/crates/base64-compat/1.0.0/download",
+          "sha256": "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7"
+        }
+      },
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "base64",
+            "crate_root": "src/lib.rs",
+            "srcs": {
+              "allow_empty": true,
+              "include": [
+                "**/*.rs"
+              ]
+            }
+          }
+        }
+      ],
+      "library_target_name": "base64",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "deps": {
+          "common": [
+            {
+              "id": "byteorder 1.5.0",
+              "target": "byteorder"
+            }
+          ],
+          "selects": {}
+        },
+        "edition": "2015",
+        "version": "1.0.0"
+      },
+      "license": "MIT/Apache-2.0",
+      "license_ids": [
+        "Apache-2.0",
+        "MIT"
+      ],
+      "license_file": "LICENSE-APACHE"
+    },
     "base64-url 2.0.0": {
       "name": "base64-url",
       "version": "2.0.0",
@@ -36086,11 +36134,9 @@
       "version": "0.12.1",
       "package_url": "https://github.com/apoelstra/rust-jsonrpc/",
       "repository": {
-        "Git": {
-          "remote": "https://github.com/apoelstra/rust-jsonrpc",
-          "commitish": {
-            "Rev": "e42044d8e0896317488dfbd65eb5563d76e937fe"
-          }
+        "Http": {
+          "url": "https://static.crates.io/crates/jsonrpc/0.12.1/download",
+          "sha256": "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8"
         }
       },
       "targets": [
@@ -36114,7 +36160,7 @@
         ],
         "crate_features": {
           "common": [
-            "base64",
+            "base64-compat",
             "default",
             "simple_http",
             "simple_tcp"
@@ -36124,7 +36170,7 @@
         "deps": {
           "common": [
             {
-              "id": "base64 0.13.1",
+              "id": "base64-compat 1.0.0",
               "target": "base64"
             },
             {
@@ -36138,7 +36184,16 @@
           ],
           "selects": {}
         },
-        "edition": "2018",
+        "edition": "2015",
+        "proc_macro_deps": {
+          "common": [
+            {
+              "id": "serde_derive 1.0.217",
+              "target": "serde_derive"
+            }
+          ],
+          "selects": {}
+        },
         "version": "0.12.1"
       },
       "license": "CC0-1.0",

diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock
@@ -1024,6 +1024,15 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64-compat"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "base64-url"
 version = "2.0.0"
@@ -6074,10 +6083,12 @@ dependencies = [
 [[package]]
 name = "jsonrpc"
 version = "0.12.1"
-source = "git+https://github.com/apoelstra/rust-jsonrpc?rev=e42044d#e42044d8e0896317488dfbd65eb5563d76e937fe"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8"
 dependencies = [
- "base64 0.13.1",
+ "base64-compat",
  "serde",
+ "serde_derive",
  "serde_json",
 ]
 

diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "194342fc37fdddbf3dceb1e96cdf4ce10a63ff4ec17867d1a241e3e034c1ad0c",
+  "checksum": "187a33b1d9b02feb5733eb6beb7b797058aa1a31f8c11268afd52a5ae007833b",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -5776,6 +5776,54 @@
       ],
       "license_file": "LICENSE-APACHE"
     },
+    "base64-compat 1.0.0": {
+      "name": "base64-compat",
+      "version": "1.0.0",
+      "package_url": "https://github.com/stevenroose/rust-base64-compat",
+      "repository": {
+        "Http": {
+          "url": "https://static.crates.io/crates/base64-compat/1.0.0/download",
+          "sha256": "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7"
+        }
+      },
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "base64",
+            "crate_root": "src/lib.rs",
+            "srcs": {
+              "allow_empty": true,
+              "include": [
+                "**/*.rs"
+              ]
+            }
+          }
+        }
+      ],
+      "library_target_name": "base64",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "deps": {
+          "common": [
+            {
+              "id": "byteorder 1.5.0",
+              "target": "byteorder"
+            }
+          ],
+          "selects": {}
+        },
+        "edition": "2015",
+        "version": "1.0.0"
+      },
+      "license": "MIT/Apache-2.0",
+      "license_ids": [
+        "Apache-2.0",
+        "MIT"
+      ],
+      "license_file": "LICENSE-APACHE"
+    },
     "base64-url 2.0.2": {
       "name": "base64-url",
       "version": "2.0.2",
@@ -35920,11 +35968,9 @@
       "version": "0.12.1",
       "package_url": "https://github.com/apoelstra/rust-jsonrpc/",
       "repository": {
-        "Git": {
-          "remote": "https://github.com/apoelstra/rust-jsonrpc",
-          "commitish": {
-            "Rev": "e42044d8e0896317488dfbd65eb5563d76e937fe"
-          }
+        "Http": {
+          "url": "https://static.crates.io/crates/jsonrpc/0.12.1/download",
+          "sha256": "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8"
         }
       },
       "targets": [
@@ -35948,7 +35994,7 @@
         ],
         "crate_features": {
           "common": [
-            "base64",
+            "base64-compat",
             "default",
             "simple_http",
             "simple_tcp"
@@ -35958,7 +36004,7 @@
         "deps": {
           "common": [
             {
-              "id": "base64 0.13.1",
+              "id": "base64-compat 1.0.0",
               "target": "base64"
             },
             {
@@ -35972,7 +36018,16 @@
           ],
           "selects": {}
         },
-        "edition": "2018",
+        "edition": "2015",
+        "proc_macro_deps": {
+          "common": [
+            {
+              "id": "serde_derive 1.0.217",
+              "target": "serde_derive"
+            }
+          ],
+          "selects": {}
+        },
         "version": "0.12.1"
       },
       "license": "CC0-1.0",

diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock
@@ -1025,6 +1025,15 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64-compat"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "base64-url"
 version = "2.0.2"
@@ -6064,10 +6073,12 @@ dependencies = [
 [[package]]
 name = "jsonrpc"
 version = "0.12.1"
-source = "git+https://github.com/apoelstra/rust-jsonrpc?rev=e42044d#e42044d8e0896317488dfbd65eb5563d76e937fe"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8"
 dependencies = [
- "base64 0.13.1",
+ "base64-compat",
  "serde",
+ "serde_derive",
  "serde_json",
 ]
 

diff --git a/bazel/cargo.config b/bazel/cargo.config
diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl
@@ -163,7 +163,6 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
         isolated = True,
         cargo_lockfile = cargo_lockfile,
         lockfile = lockfile,
-        cargo_config = "//:bazel/cargo.config",
         annotations = CRATE_ANNOTATIONS,
         packages = {
             "actix-rt": crate.spec(