Merge pull request #118 from ipfs-force-community/feat/add_frc46_cmds

feat: 增加命令行用于计算方法数 / add cmd to calc method number

Author: diwufeiwen

.github/workflows/go.yml

@@ -24,7 +24,6 @@ jobs:
       - name: setup rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
           target: wasm32-unknown-unknown
           override: true
           components: rustfmt, clippy

.github/workflows/rust_check.yml

@@ -18,7 +18,6 @@ jobs:
       - name: setup rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
           target: wasm32-unknown-unknown
           override: true
           components: rustfmt, clippy

Cargo.lock

@@ -0,0 +1 @@
+1.64.0

rust-toolchain

@@ -28,6 +28,9 @@ xshell = "0.2"
 walkdir = "2"
 regex = "1"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
+frc42_dispatch = "2.0.0"
+frc42_hasher = "1.2.0"
+blake2b_simd = "1.0.0"
 
 actors-v10 = { package = "fil_builtin_actors_bundle", git = "https://github.com/filecoin-project/builtin-actors", branch = "next", features = ["m2-native"] }
 fvm = {  git = "https://github.com/ipfs-force-community/ref-fvm",rev="fa791e9726443c526800f0e90334137bdd80edcf",  features = ["m2-native"]}

tools/sdk_tool/Cargo.toml

@@ -0,0 +1,25 @@
+use anyhow::Result;
+use blake2b_simd::blake2b;
+use clap::Parser;
+use frc42_dispatch::hash::MethodResolver;
+use frc42_hasher::hash::Hasher;
+
+#[derive(Parser, Debug)]
+pub struct Frc42Config {
+    #[clap(last = true)]
+    pub name: String,
+}
+
+pub struct Blake2bHasher {}
+impl Hasher for Blake2bHasher {
+    fn hash(&self, bytes: &[u8]) -> Vec<u8> {
+        blake2b(bytes).as_bytes().to_vec()
+    }
+}
+
+pub fn compute_frc46(cfg: &Frc42Config) -> Result<()> {
+    let resolver = MethodResolver::new(Blake2bHasher {});
+    let method_number = resolver.method_number(&cfg.name)?;
+    println!("{}: {:#x} {}", cfg.name, method_number, method_number);
+    Ok(())
+}

tools/sdk_tool/src/frc42.rs

@@ -1,3 +1,4 @@
+mod frc42;
 mod patch;
 mod template;
 mod testing;
@@ -23,6 +24,8 @@ enum Commands {
     Test(testing::TestConfig),
     /// create new template project by module name
     New(template::NewTemplateConfig),
+    /// calculate method number by name
+    Frc42(frc42::Frc42Config),
     /// apply path for go/tinygo
     /// if your go and tinygo install in user home directory, just run./fvm_go_sdk patch
     /// if you go and tinygo is installed in /usr/local/go, use sudo ./fvm_go_sdk patch
@@ -55,6 +58,12 @@ fn main() {
                 std::process::exit(1);
             }
         }
+        Commands::Frc42(cfg) => {
+            if let Err(e) = frc42::compute_frc46(cfg) {
+                println!("run frc42 command fail {e}");
+                std::process::exit(1);
+            }
+        }
         Commands::Patch(cfg) => {
             if let Err(e) = patch::apply_patch(cfg) {
                 println!("apply patch command fail {e}");

tools/sdk_tool/src/main.rs

@@ -27,7 +27,6 @@ pub fn get_tinygo_env() -> Result<HashMap<String, String>> {
         Ok(output) => Ok(HashMap::from_iter(
             String::from_utf8(output.stdout)?
                 .split('\n')
-                .into_iter()
                 .map(|v| v.trim())
                 .filter(|v| !v.is_empty())
                 .map(|v| {