From c5d61e199a6f458aa5e70a9459b0481c420b7981 Mon Sep 17 00:00:00 2001 From: Kyon <32325790+kyonRay@users.noreply.github.com> Date: Tue, 27 Jun 2023 19:33:50 +0800 Subject: [PATCH 1/4] (console): add bcos3 wasm type support. (#184) * (console): add bcos3 wasm type support. * (console): add deploy wasm feature. --- build.gradle | 4 +- release_note.txt | 2 +- .../wecross/console/common/ConsoleUtils.java | 15 ++++- .../wecross/console/common/HelpInfo.java | 29 ++++++--- .../wecross/console/common/Version.java | 2 +- .../wecross/console/custom/BCOSCommand.java | 60 ++++++++++------- .../contracts/liquid/hello_world/.gitignore | 10 +++ .../hello_world/.liquid/abi_gen/Cargo.toml | 27 ++++++++ .../hello_world/.liquid/abi_gen/main.rs | 39 +++++++++++ .../contracts/liquid/hello_world/Cargo.toml | 61 ++++++++++++++++++ .../liquid/hello_world/hello_world.abi | 1 + .../liquid/hello_world/hello_world.wasm | Bin 0 -> 11778 bytes .../liquid/hello_world/hello_world_gm.wasm | Bin 0 -> 11778 bytes .../contracts/liquid/hello_world/src/lib.rs | 49 ++++++++++++++ 14 files changed, 263 insertions(+), 36 deletions(-) create mode 100755 src/main/resources/contracts/liquid/hello_world/.gitignore create mode 100755 src/main/resources/contracts/liquid/hello_world/.liquid/abi_gen/Cargo.toml create mode 100755 src/main/resources/contracts/liquid/hello_world/.liquid/abi_gen/main.rs create mode 100755 src/main/resources/contracts/liquid/hello_world/Cargo.toml create mode 100644 src/main/resources/contracts/liquid/hello_world/hello_world.abi create mode 100644 src/main/resources/contracts/liquid/hello_world/hello_world.wasm create mode 100644 src/main/resources/contracts/liquid/hello_world/hello_world_gm.wasm create mode 100755 src/main/resources/contracts/liquid/hello_world/src/lib.rs diff --git a/build.gradle b/build.gradle index d2e89c9..bb43144 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'java' apply plugin: 'jacoco' group = 'com.webank' -version = '1.3.0' +version = '1.3.1' sourceCompatibility = '1.8' repositories { @@ -47,7 +47,7 @@ dependencies { compile logger compile 'org.jline:jline:3.15.0' compile 'org.codehaus.groovy:groovy-all:3.0.10' - compile 'com.webank:wecross-java-sdk:1.3.0' + compile 'com.webank:wecross-java-sdk:1.3.1-SNAPSHOT' compile 'org.apache.commons:commons-compress:1.21' compile 'commons-io:commons-io:2.8.0' compile 'com.moandjiezana.toml:toml4j:0.7.2' diff --git a/release_note.txt b/release_note.txt index 8b3a022..23c38c2 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v1.3.0 \ No newline at end of file +v1.3.1 \ No newline at end of file diff --git a/src/main/java/com/webank/wecross/console/common/ConsoleUtils.java b/src/main/java/com/webank/wecross/console/common/ConsoleUtils.java index 8b14ca1..a0a9fe9 100644 --- a/src/main/java/com/webank/wecross/console/common/ConsoleUtils.java +++ b/src/main/java/com/webank/wecross/console/common/ConsoleUtils.java @@ -22,10 +22,21 @@ public class ConsoleUtils { public static final String BCOSGMType = "GM_BCOS2.0"; public static final String BCOSType3 = "BCOS3_ECDSA_EVM"; public static final String BCOSGMType3 = "BCOS3_GM_EVM"; + public static final String BCOSWASMType3 = "BCOS3_ECDSA_WASM"; + public static final String BCOSWASMGMType3 = "BCOS3_GM_WASM"; public static final List bcosChainList = - Arrays.asList(BCOSType, BCOSGMType, BCOSType3, BCOSGMType3); + Arrays.asList( + BCOSType, BCOSGMType, BCOSType3, BCOSGMType3, BCOSWASMType3, BCOSWASMGMType3); public static final List supportChainList = - Arrays.asList(fabricType, BCOSType, BCOSGMType, fabricType2, BCOSType3, BCOSGMType3); + Arrays.asList( + fabricType, + BCOSType, + BCOSGMType, + fabricType2, + BCOSType3, + BCOSGMType3, + BCOSWASMType3, + BCOSWASMGMType3); private static final Logger logger = LoggerFactory.getLogger(ConsoleUtils.class); public static boolean isValidPath(String path) { diff --git a/src/main/java/com/webank/wecross/console/common/HelpInfo.java b/src/main/java/com/webank/wecross/console/common/HelpInfo.java index 14bd815..245393a 100644 --- a/src/main/java/com/webank/wecross/console/common/HelpInfo.java +++ b/src/main/java/com/webank/wecross/console/common/HelpInfo.java @@ -350,17 +350,30 @@ public static void getCurrentTransactionIDHelp() { public static void BCOSDeployHelp() { ConsoleUtils.singleLine(); - System.out.println("Deploy contract and register contract info to CNS in BCOS chain "); - System.out.println("Usage: bcosDeploy [Path] [Source file path] [Class name] [Version]"); - System.out.println("Path -- e.g: [zone.chain.res], specify which the path to be deployed"); + System.out.println("Deploy contract and register contract info to CNS/BFS in BCOS chain "); + System.out.println("If you deploy Solidity contract:"); + System.out.println("\tUsage: bcosDeploy [Path] [Source file path] [Class name] [Version]"); System.out.println( - "Source file path from conf/ -- The solidity source code file path, e.g: HelloWorld.sol"); - System.out.println("Contract name -- The contract to be deploy"); - System.out.println("Version -- The contract version"); - System.out.println("Example:"); + "\tPath -- e.g: [zone.chain.res], specify which the path to be deployed"); System.out.println( - " bcosDeploy payment.bcos.HelloWorld contracts/solidity/HelloWorld.sol HelloWorld 1.0"); + "\tSource file path from conf/ -- The solidity source code file path, e.g: HelloWorld.sol"); + System.out.println("\tContract name -- The contract to be deploy"); + System.out.println("\tVersion -- The contract version"); + System.out.println("\tExample:"); + System.out.println( + " \tbcosDeploy payment.bcos.HelloWorld contracts/solidity/HelloWorld.sol HelloWorld 1.0"); ConsoleUtils.singleLine(); + System.out.println("If you deploy WASM contract:"); + System.out.println("\tUsage: bcosDeploy [Path] [BIN file path] [ABI file path]"); + System.out.println( + "\tPath -- e.g: [zone.chain.res], specify which the path to be deployed"); + System.out.println( + "\tBIN file path from conf/ -- The binary file after contract being compiled via cargo-liquid, e.g: hello_world.wasm"); + System.out.println( + "\tABI file path from conf/ -- The ABI file after contract being compiled via cargo-liquid, e.g: hello_world.abi"); + System.out.println("\tExample:"); + System.out.println( + " \tbcosDeploy payment.bcos3.HelloWorld contracts/liquid/hello_world.wasm contracts/liquid/hello_world.abi"); } public static void BCOSRegisterHelp() { diff --git a/src/main/java/com/webank/wecross/console/common/Version.java b/src/main/java/com/webank/wecross/console/common/Version.java index 69dd893..d93e36d 100644 --- a/src/main/java/com/webank/wecross/console/common/Version.java +++ b/src/main/java/com/webank/wecross/console/common/Version.java @@ -2,5 +2,5 @@ public class Version { - public static final String Version = "v1.3.0"; + public static final String Version = "v1.3.1"; } diff --git a/src/main/java/com/webank/wecross/console/custom/BCOSCommand.java b/src/main/java/com/webank/wecross/console/custom/BCOSCommand.java index 00b8719..1f2b855 100644 --- a/src/main/java/com/webank/wecross/console/custom/BCOSCommand.java +++ b/src/main/java/com/webank/wecross/console/custom/BCOSCommand.java @@ -8,6 +8,7 @@ import com.webank.wecross.console.exception.WeCrossConsoleException; import com.webank.wecrosssdk.rpc.WeCrossRPC; import com.webank.wecrosssdk.rpc.methods.response.CommandResponse; +import com.webank.wecrosssdk.rpc.methods.response.ResourceDetailResponse; import com.webank.wecrosssdk.utils.RPCUtils; import java.io.File; import java.util.*; @@ -36,40 +37,55 @@ public void deploy(String[] params) throws Exception { HelpInfo.BCOSDeployHelp(); return; } - if (params.length < 5) { + if (params.length < 4) { throw new WeCrossConsoleException(ErrorCode.PARAM_MISSING, "bcosDeploy"); } String path = params[1]; RPCUtils.checkPath(path); - String cnsName = path.split("\\.")[2]; - String sourcePath = params[2]; - String contractName = params[3]; - String version = params[4]; - + ResourceDetailResponse detail = weCrossRPC.detail(path).send(); + String stubType = detail.getResourceDetail().getStubType(); PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - org.springframework.core.io.Resource resource = resolver.getResource("file:" + sourcePath); - if (!resource.exists()) { - resource = resolver.getResource("classpath:" + sourcePath); + List args = new ArrayList<>(); + // BCOSDeployWasm [path] [abi] [bin] + if (stubType.contains("WASM")) { + String name = path.split("\\.")[2]; + String binContent = FileUtils.readFileContent(params[2]); + String abiContent = FileUtils.readFileContent(params[3]); + args.addAll(Arrays.asList(name, abiContent, binContent)); + for (int i = 4; i < params.length; i++) { + // for constructor + args.add(ConsoleUtils.parseString(params[i])); + } + } else { + String cnsName = path.split("\\.")[2]; + String sourcePath = params[2]; + String contractName = params[3]; + String version = params[4]; + + org.springframework.core.io.Resource resource = + resolver.getResource("file:" + sourcePath); if (!resource.exists()) { - logger.error("Source file: {} not exists", sourcePath); - throw new Exception("Source file: " + sourcePath + " not exists"); + resource = resolver.getResource("classpath:" + sourcePath); + if (!resource.exists()) { + logger.error("Source file: {} not exists", sourcePath); + throw new Exception("Source file: " + sourcePath + " not exists"); + } } - } - String filename = resource.getFilename(); - String realPath = resource.getFile().getAbsolutePath(); - String dir = realPath.substring(0, realPath.lastIndexOf(File.separator)) + File.separator; + String filename = resource.getFilename(); + String realPath = resource.getFile().getAbsolutePath(); + String dir = + realPath.substring(0, realPath.lastIndexOf(File.separator)) + File.separator; - String sourceContent = FileUtils.mergeSource(dir, filename, resolver, new HashSet<>()); + String sourceContent = FileUtils.mergeSource(dir, filename, resolver, new HashSet<>()); - List args = - new ArrayList<>(Arrays.asList(cnsName, sourceContent, contractName, version)); - for (int i = 5; i < params.length; i++) { - // for constructor - args.add(ConsoleUtils.parseString(params[i])); + args.addAll(Arrays.asList(cnsName, sourceContent, contractName, version)); + for (int i = 5; i < params.length; i++) { + // for constructor + args.add(ConsoleUtils.parseString(params[i])); + } } - CommandResponse response = weCrossRPC.customCommand("deploy", path, args.toArray()).send(); PrintUtils.printCommandResponse(response); } diff --git a/src/main/resources/contracts/liquid/hello_world/.gitignore b/src/main/resources/contracts/liquid/hello_world/.gitignore new file mode 100755 index 0000000..088ba6b --- /dev/null +++ b/src/main/resources/contracts/liquid/hello_world/.gitignore @@ -0,0 +1,10 @@ +# Generated by Cargo +# will have compiled files and executables +/target/ + +# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries +# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html +Cargo.lock + +# These are backup files generated by rustfmt +**/*.rs.bk diff --git a/src/main/resources/contracts/liquid/hello_world/.liquid/abi_gen/Cargo.toml b/src/main/resources/contracts/liquid/hello_world/.liquid/abi_gen/Cargo.toml new file mode 100755 index 0000000..84506b7 --- /dev/null +++ b/src/main/resources/contracts/liquid/hello_world/.liquid/abi_gen/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "abi-gen" +version = "1.0.0-rc2" +authors = ["vita-dounai "] +edition = "2018" +publish = false + +[[bin]] +name = "abi-gen" +path = "main.rs" + +[dependencies.contract] +path = "../../" +package = "hello_world" +default-features = false +features = ["liquid-abi-gen"] + +[dependencies.liquid_lang] +git = "https://github.com/WeBankBlockchain/liquid" +branch = "dev" +package = "liquid_lang" +default-features = false +features = ["contract-abi-gen"] + +[dependencies] +serde = "1.0" +serde_json = "1.0" \ No newline at end of file diff --git a/src/main/resources/contracts/liquid/hello_world/.liquid/abi_gen/main.rs b/src/main/resources/contracts/liquid/hello_world/.liquid/abi_gen/main.rs new file mode 100755 index 0000000..e09f403 --- /dev/null +++ b/src/main/resources/contracts/liquid/hello_world/.liquid/abi_gen/main.rs @@ -0,0 +1,39 @@ +use std::{collections::HashMap, env}; + +fn main() -> Result<(), std::io::Error> { + let mut abi = HashMap::new(); + + let contract_abi = ::generate_abi(); + + let mut local_abi = + Vec::with_capacity(contract_abi.event_abis.len() + contract_abi.fn_abis.len() + 1); + local_abi.extend( + contract_abi + .event_abis + .iter() + .map(|event_abi| liquid_lang::AbiKind::Event(event_abi.clone())), + ); + local_abi.push(liquid_lang::AbiKind::Constructor( + contract_abi.constructor_abi, + )); + local_abi.extend( + contract_abi + .fn_abis + .iter() + .map(|fn_abi| liquid_lang::AbiKind::ExternalFn(fn_abi.clone())), + ); + abi.insert(String::from("$local"), local_abi); + + for (iface_name, fn_abis) in contract_abi.iface_abis { + let fn_abis = fn_abis + .iter() + .map(|fn_abi| liquid_lang::AbiKind::ExternalFn(fn_abi.clone())) + .collect::>(); + abi.insert(iface_name, fn_abis); + } + + let target_dir = env::var("CARGO_TARGET_DIR").unwrap_or("target".into()); + std::fs::create_dir(&target_dir).ok(); + std::fs::write("hello_world.abi", serde_json::to_string(&abi).unwrap())?; + Ok(()) +} diff --git a/src/main/resources/contracts/liquid/hello_world/Cargo.toml b/src/main/resources/contracts/liquid/hello_world/Cargo.toml new file mode 100755 index 0000000..e82010a --- /dev/null +++ b/src/main/resources/contracts/liquid/hello_world/Cargo.toml @@ -0,0 +1,61 @@ +[package] +name = "hello_world" +version = "0.1.0" +authors = ["[your_name] "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +scale = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive", "full"] } + +liquid_lang = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", branch = "dev", package = "liquid_lang", default-features = false, features = ["contract"] } +liquid_primitives = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", branch = "dev", package = "liquid_primitives", default-features = false } +liquid_prelude = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", branch = "dev", package = "liquid_prelude", default-features = false } +liquid_macro = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", branch = "dev", package = "liquid_macro", default-features = false } +liquid_abi_gen = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", branch = "dev", package = "liquid_abi_gen", default-features = false, optional = true } + +[dev-dependencies] +predicates = "1.0.5" + +[lib] +name = "hello_world" +crate-type = [ + # Used for normal contract Wasm blobs. + "cdylib", + # Used for ABI generation. + "rlib", +] + +[features] +default = ["std"] +std = [ + "liquid_lang/std", + "scale/std", + "liquid_primitives/std", + "liquid_prelude/std", + "liquid_macro/std", +] +liquid-abi-gen = [ + "std", + "liquid_abi_gen", + "liquid_lang/contract-abi-gen", +] +gm = [ + "liquid_lang/gm", + "liquid_primitives/gm", +] + +[profile.release] +panic = "abort" +lto = true +opt-level = "z" +overflow-checks = true + +[workspace] +members = [ + ".liquid/abi_gen", +] +exclude = [ + ".liquid", +] diff --git a/src/main/resources/contracts/liquid/hello_world/hello_world.abi b/src/main/resources/contracts/liquid/hello_world/hello_world.abi new file mode 100644 index 0000000..f722f16 --- /dev/null +++ b/src/main/resources/contracts/liquid/hello_world/hello_world.abi @@ -0,0 +1 @@ +[{"inputs":[],"type":"constructor"},{"constant":true,"inputs":[],"name":"get","outputs":[{"internalType":"string","type":"string"}],"type":"function"},{"conflictFields":[{"kind":0,"path":[],"read_only":false,"slot":0}],"constant":false,"inputs":[{"internalType":"string","name":"name","type":"string"}],"name":"set","outputs":[],"type":"function"}] \ No newline at end of file diff --git a/src/main/resources/contracts/liquid/hello_world/hello_world.wasm b/src/main/resources/contracts/liquid/hello_world/hello_world.wasm new file mode 100644 index 0000000000000000000000000000000000000000..c4630677ed83c2e785a5ee13c697c1e67b87ea23 GIT binary patch literal 11778 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/contracts/liquid/hello_world/src/lib.rs b/src/main/resources/contracts/liquid/hello_world/src/lib.rs new file mode 100755 index 0000000..71d5170 --- /dev/null +++ b/src/main/resources/contracts/liquid/hello_world/src/lib.rs @@ -0,0 +1,49 @@ +#![cfg_attr(not(feature = "std"), no_std)] + +use liquid::storage; +use liquid_lang as liquid; + +#[liquid::contract] +mod hello_world { + use super::*; + + #[liquid(storage)] + struct HelloWorld { + name: storage::Value, + } + + #[liquid(methods)] + impl HelloWorld { + pub fn new(&mut self) { + self.name.initialize(String::from("Alice")); + } + + pub fn get(&self) -> String { + self.name.clone() + } + + pub fn set(&mut self, name: String) { + self.name.set(name) + } + } + + #[cfg(test)] + mod tests { + use super::*; + + #[test] + fn get_works() { + let contract = HelloWorld::new(); + assert_eq!(contract.get(), "Alice"); + } + + #[test] + fn set_works() { + let mut contract = HelloWorld::new(); + + let new_name = String::from("Bob"); + contract.set(new_name.clone()); + assert_eq!(contract.get(), "Bob"); + } + } +} From d3e3d64e9d7740d72b0a510227ce742e572a3490 Mon Sep 17 00:00:00 2001 From: Kyon <32325790+kyonRay@users.noreply.github.com> Date: Tue, 18 Jul 2023 21:31:04 +0800 Subject: [PATCH 2/4] (bcosCommand): fix wasm deploy bug. (#185) * (bcosCommand): fix wasm deploy bug. * (custom): fix bcos deploy wasm bug. --- .../com/webank/wecross/console/Shell.java | 2 +- .../wecross/console/common/FileUtils.java | 22 +++++++++++ .../wecross/console/common/HelpInfo.java | 3 +- .../wecross/console/common/PrintUtils.java | 1 + .../wecross/console/custom/BCOSCommand.java | 38 ++++++++++++++----- 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/webank/wecross/console/Shell.java b/src/main/java/com/webank/wecross/console/Shell.java index 0c5f343..ccdeaad 100644 --- a/src/main/java/com/webank/wecross/console/Shell.java +++ b/src/main/java/com/webank/wecross/console/Shell.java @@ -279,7 +279,7 @@ public static void main(String[] args) { case "bcosDeploy": { bcosCommand.deploy(params); - if (params.length >= 6 && isPath(params[1])) { + if (params.length >= 4 && isPath(params[1])) { JlineUtils.addPathCompleters(completers, params[1]); } break; diff --git a/src/main/java/com/webank/wecross/console/common/FileUtils.java b/src/main/java/com/webank/wecross/console/common/FileUtils.java index da0c2f3..07dabb4 100644 --- a/src/main/java/com/webank/wecross/console/common/FileUtils.java +++ b/src/main/java/com/webank/wecross/console/common/FileUtils.java @@ -19,6 +19,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.bouncycastle.util.encoders.Hex; import org.jline.reader.Completer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -125,6 +126,27 @@ public static String readFileContent(String fileName) throws IOException { } } + public static String readFileContentToHexString(String fileName) throws IOException { + try { + // to avoid path manipulation + fileName = fileName.replace("..", ""); + Path path; + + if (fileName.indexOf("classpath:") != 0) { + path = Paths.get(fileName); + } else { + // Start with "classpath:" + PathMatchingResourcePatternResolver resolver = + new PathMatchingResourcePatternResolver(); + path = Paths.get(resolver.getResource(fileName).getURI()); + } + return Hex.toHexString(Files.readAllBytes(path)); + } catch (Exception e) { + logger.error("Read file error: ", e); + throw new IOException("Read file error: " + e); + } + } + public static String readFileToBytesString(String filePath) throws Exception { String content = readFileContent(filePath); return Base64.getEncoder().encodeToString(content.getBytes(StandardCharsets.UTF_8)); diff --git a/src/main/java/com/webank/wecross/console/common/HelpInfo.java b/src/main/java/com/webank/wecross/console/common/HelpInfo.java index 245393a..6d84383 100644 --- a/src/main/java/com/webank/wecross/console/common/HelpInfo.java +++ b/src/main/java/com/webank/wecross/console/common/HelpInfo.java @@ -358,7 +358,8 @@ public static void BCOSDeployHelp() { System.out.println( "\tSource file path from conf/ -- The solidity source code file path, e.g: HelloWorld.sol"); System.out.println("\tContract name -- The contract to be deploy"); - System.out.println("\tVersion -- The contract version"); + System.out.println( + "\tVersion -- The contract version, if chain version is BCOS3.0, should not use version"); System.out.println("\tExample:"); System.out.println( " \tbcosDeploy payment.bcos.HelloWorld contracts/solidity/HelloWorld.sol HelloWorld 1.0"); diff --git a/src/main/java/com/webank/wecross/console/common/PrintUtils.java b/src/main/java/com/webank/wecross/console/common/PrintUtils.java index a548803..a447012 100644 --- a/src/main/java/com/webank/wecross/console/common/PrintUtils.java +++ b/src/main/java/com/webank/wecross/console/common/PrintUtils.java @@ -163,6 +163,7 @@ public static void printRoutineIDResponse(XATransactionListResponse response) th public static void printCommandResponse(CommandResponse response) throws WeCrossConsoleException { + logger.debug("response: {}", response.getResult()); if (response == null) { throw new WeCrossConsoleException(ErrorCode.NO_RESPONSE, "Error: no response"); } else if (response.getErrorCode() != StatusCode.SUCCESS) { diff --git a/src/main/java/com/webank/wecross/console/custom/BCOSCommand.java b/src/main/java/com/webank/wecross/console/custom/BCOSCommand.java index 1f2b855..3decaca 100644 --- a/src/main/java/com/webank/wecross/console/custom/BCOSCommand.java +++ b/src/main/java/com/webank/wecross/console/custom/BCOSCommand.java @@ -7,8 +7,9 @@ import com.webank.wecross.console.exception.ErrorCode; import com.webank.wecross.console.exception.WeCrossConsoleException; import com.webank.wecrosssdk.rpc.WeCrossRPC; +import com.webank.wecrosssdk.rpc.common.ResourceDetail; import com.webank.wecrosssdk.rpc.methods.response.CommandResponse; -import com.webank.wecrosssdk.rpc.methods.response.ResourceDetailResponse; +import com.webank.wecrosssdk.rpc.methods.response.ResourceResponse; import com.webank.wecrosssdk.utils.RPCUtils; import java.io.File; import java.util.*; @@ -42,15 +43,25 @@ public void deploy(String[] params) throws Exception { } String path = params[1]; + String chain = path.substring(0, path.lastIndexOf('.') + 1); RPCUtils.checkPath(path); - ResourceDetailResponse detail = weCrossRPC.detail(path).send(); - String stubType = detail.getResourceDetail().getStubType(); + String stubType = ""; + ResourceResponse resources = weCrossRPC.listResources(false).send(); + for (ResourceDetail resourceDetail : resources.getResources().getResourceDetails()) { + if (resourceDetail.getPath().startsWith(chain)) { + stubType = resourceDetail.getStubType(); + break; + } + } + if (stubType.equals("")) { + throw new WeCrossConsoleException(ErrorCode.INVALID_PATH, path); + } PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); List args = new ArrayList<>(); // BCOSDeployWasm [path] [abi] [bin] if (stubType.contains("WASM")) { String name = path.split("\\.")[2]; - String binContent = FileUtils.readFileContent(params[2]); + String binContent = FileUtils.readFileContentToHexString(params[2]); String abiContent = FileUtils.readFileContent(params[3]); args.addAll(Arrays.asList(name, abiContent, binContent)); for (int i = 4; i < params.length; i++) { @@ -58,10 +69,10 @@ public void deploy(String[] params) throws Exception { args.add(ConsoleUtils.parseString(params[i])); } } else { + // Solidity String cnsName = path.split("\\.")[2]; String sourcePath = params[2]; String contractName = params[3]; - String version = params[4]; org.springframework.core.io.Resource resource = resolver.getResource("file:" + sourcePath); @@ -80,10 +91,19 @@ public void deploy(String[] params) throws Exception { String sourceContent = FileUtils.mergeSource(dir, filename, resolver, new HashSet<>()); - args.addAll(Arrays.asList(cnsName, sourceContent, contractName, version)); - for (int i = 5; i < params.length; i++) { - // for constructor - args.add(ConsoleUtils.parseString(params[i])); + if (stubType.contains("BCOS3")) { + args.addAll(Arrays.asList(cnsName, sourceContent, contractName)); + for (int i = 4; i < params.length; i++) { + // for constructor + args.add(ConsoleUtils.parseString(params[i])); + } + } else { + String version = params[4]; + args.addAll(Arrays.asList(cnsName, sourceContent, contractName, version)); + for (int i = 5; i < params.length; i++) { + // for constructor + args.add(ConsoleUtils.parseString(params[i])); + } } } CommandResponse response = weCrossRPC.customCommand("deploy", path, args.toArray()).send(); From 90def9b635ff9d08ec7cdf0e313069c24ac0f371 Mon Sep 17 00:00:00 2001 From: kyonRay Date: Tue, 25 Jul 2023 10:52:46 +0800 Subject: [PATCH 3/4] (project): update version to 1.3.1. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bb43144..55cb973 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { compile logger compile 'org.jline:jline:3.15.0' compile 'org.codehaus.groovy:groovy-all:3.0.10' - compile 'com.webank:wecross-java-sdk:1.3.1-SNAPSHOT' + compile 'com.webank:wecross-java-sdk:1.3.1' compile 'org.apache.commons:commons-compress:1.21' compile 'commons-io:commons-io:2.8.0' compile 'com.moandjiezana.toml:toml4j:0.7.2' From 62259552da586e5127e333874cf3e2b5882bcde9 Mon Sep 17 00:00:00 2001 From: kyonRay Date: Mon, 31 Jul 2023 18:51:36 +0800 Subject: [PATCH 4/4] (changelog): add change log of 1.3.1. --- Changelog.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Changelog.md b/Changelog.md index 985efbf..10f7913 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,12 @@ +### v1.3.1 + +(2023-07-31) + +**新增** + +* 支持FISCO BCOS 3.+ WASM执行版本，支持WASM合约部署、调用等功能。 + + ### v1.3.0 (2023-03-15)