#39 test tls

.gitignore

@@ -143,3 +143,5 @@ demo/rbatis_demo/target
 /demo/grpc_dart/app/.metadata
 /demo/grpc_dart/app/pubspec.lock
 /packages/services/CHANGELOG.md
+/packages/services/test/greeter/greeter_go/go.sum
+/packages/services/test/greeter/greeter_go/greeter_go/greeter_go.exe

bc/wallets/src/chain.rs

@@ -525,20 +525,20 @@ impl EeeChainTrait for EeeChain {
         let helper = eee::chain_helper::ChainHelper::init(&basic_info.metadata, &genesis_byte, runtime_version as u32, tx_version as u32, None)?;
 
         let event_res = helper.decode_events(&extrinsic_ctx.event, None)?;
-        let extrinsics_map = helper.decode_extrinsics(&extrinsic_ctx.extrinsics, &extrinsic_ctx.account)?;
-
-        //Block transaction events There must be a time stamp setting
-        let tx_time = extrinsics_map.get(&0).unwrap();//Get timestamp
-
-        for (index, transfer_detail) in extrinsics_map.iter() {
-            if transfer_detail.signer.is_none() {
-                continue;
-            }
-            log::info!("tx index:{}", index);
-            if let Some(is_successful) = event_res.get(index) {
-                Self::save_transfer_detail(data_rb, extrinsic_ctx, transfer_detail, tx_time.timestamp.unwrap(), *is_successful).await?;
-            }
-        }
+        // let extrinsics_map = helper.decode_extrinsics(&extrinsic_ctx.extrinsics, &extrinsic_ctx.account)?;
+        //
+        // //Block transaction events There must be a time stamp setting
+        // let tx_time = extrinsics_map.get(&0).unwrap();//Get timestamp
+        //
+        // for (index, transfer_detail) in extrinsics_map.iter() {
+        //     if transfer_detail.signer.is_none() {
+        //         continue;
+        //     }
+        //     log::info!("tx index:{}", index);
+        //     if let Some(is_successful) = event_res.get(index) {
+        //         Self::save_transfer_detail(data_rb, extrinsic_ctx, transfer_detail, tx_time.timestamp.unwrap(), *is_successful).await?;
+        //     }
+        // }
         Ok(())
     }
     async fn update_default_tokens(&self, context: &dyn ContextTrait, default_tokens: Vec<EeeChainTokenDefault>) -> Result<(), WalletError> {

bc/wallets_cdl/script/all.sh

@@ -7,5 +7,7 @@ bash $batPath/build_x86_64-linux-android.sh
 bash $batPath/build_i686-linux-android.sh
 bash $batPath/build_armv7-linux-androideabi.sh
 
+bash $batPath/build_x86_64-pc-windows-gnu.sh
+
 cd $cuPath
 

bc/wallets_cdl/src/parameters.rs

@@ -10,6 +10,7 @@ use wallets_types::{
 };
 
 use crate::kits::{to_c_char, to_str, CMark, CStruct, CR};
+use crate::CArray;
 
 #[repr(C)]
 #[derive(Debug, DlStruct, DlDefault, DlCR)]
@@ -107,7 +108,8 @@ pub struct CExtrinsicContext {
     pub blockHash: *mut c_char,
     pub blockNumber: *mut c_char,
     pub event: *mut c_char,
-    pub extrinsics: *mut c_char,
+
+    pub extrinsics: *mut CArray<*mut c_char>
 }
 
 

bc/wallets_cdl/src/wallets_c.rs

@@ -10,8 +10,9 @@ use wallets::{Contexts, Wallets};
 use wallets_types::{Context, Error};
 
 use crate::kits::{to_c_char, to_str, CArray, CBool, CFalse, CStruct, CTrue, CR};
-use crate::parameters::{CContext, CCreateWalletParameters, CDbName, CInitParameters};
+use crate::parameters::{CContext, CCreateWalletParameters, CDbName, CInitParameters, CExtrinsicContext};
 use crate::types::{CError, CWallet};
+use std::ptr::null_mut;
 
 /// 生成数据库文件名，只有数据库文件名不存在（为null或“”）时才创建文件名
 /// 如果成功返回 [wallets_types::Error::SUCCESS()]
@@ -600,6 +601,12 @@ pub unsafe extern "C" fn Wallets_saveCurrentWalletChain(
 build_const::build_const!("constants");
 #[no_mangle]
 pub unsafe extern "C" fn Wallets_appPlatformType() -> *const c_char {
+    {
+        // let ptr :*mut CExtrinsicContext = null_mut();
+        // let data = CExtrinsicContext::ptr_rust(ptr);
+        let ptr : *mut CArray<*mut c_char> = null_mut();
+        let data: *mut CArray<*mut c_char> = CArray::<*mut c_char>::to_c_ptr(&vec!["".to_owned()]);
+    }
     log::debug!("enter Wallets_appPlatformType");
     let plat = CARGO_BUILD_TARGET.replace("-","_");
     let platType = {

bc/wallets_types/src/parameters.rs

@@ -83,7 +83,7 @@ pub struct ExtrinsicContext {
     pub block_hash: String,
     pub block_number: String,
     pub event: String,
-    pub extrinsics: String,
+    pub extrinsics: Vec<String>,
 }
 
 #[derive(Debug, Default, Clone)]

packages/services/test/greeter/client.key

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHn46MgkeCFXXdX0A+Bs5qiAPJS5alX9fPBCNoQEgM3KoAoGCCqGSM49
+AwEHoUQDQgAE9gGlbLy43uYWH33mhbMOj36KcCFc2CPn4yC/wzzRIaCvIH9mrLSt
+ylwLcfimt982rWgRwfZ6FPuwR/A+xvT8XA==
+-----END EC PRIVATE KEY-----

packages/services/test/greeter/client.pem

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICETCCAbegAwIBAgIRAM/UubXbdNRsFaAkYXZbjrMwCgYIKoZIzj0EAwIwZzEL
+MAkGA1UEBhMCY24xDTALBgNVBAgTBHNjcnkxDTALBgNVBAcTBHNjcnkxDTALBgNV
+BAkTBHNjcnkxDTALBgNVBBETBHNjcnkxDTALBgNVBAoTBHNjcnkxDTALBgNVBAMT
+BHNjcnkwIBcNMjEwMTI3MDgzNTE5WhgPMjEyMTAxMjcwODM1MTlaMGcxCzAJBgNV
+BAYTAmNuMQ0wCwYDVQQIEwRzY3J5MQ0wCwYDVQQHEwRzY3J5MQ0wCwYDVQQJEwRz
+Y3J5MQ0wCwYDVQQREwRzY3J5MQ0wCwYDVQQKEwRzY3J5MQ0wCwYDVQQDEwRzY3J5
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9gGlbLy43uYWH33mhbMOj36KcCFc
+2CPn4yC/wzzRIaCvIH9mrLStylwLcfimt982rWgRwfZ6FPuwR/A+xvT8XKNCMEAw
+DgYDVR0PAQH/BAQDAgKkMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAP
+BgNVHREECDAGggRzY3J5MAoGCCqGSM49BAMCA0gAMEUCIQC7IPbiYyY/MLcKRpzu
+/YmRz+IaDyl6vfpWySLJju/y7QIgJXdctUVRkVLd48JRlE7gnOQzOQY+eJEawD5I
++uBUQAE=
+-----END CERTIFICATE-----

packages/services/test/greeter/generate_go.bat

@@ -0,0 +1,13 @@
+
+Setlocal
+@echo on
+set batPath=%~dp0
+cd %batPath%
+%~d0
+cd %batPath%
+
+protoc --go_out=plugins=grpc:./greeter_go greeter.proto
+cd ./greeter_go/ & go build
+
+cd %batPath%
+EndLocal

packages/services/test/greeter/greeter.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 
+option go_package= ".;greeter_go";
 package greeter;
 
 // The greeting service definition.

packages/services/test/greeter/greeter_go/go.mod

@@ -0,0 +1,12 @@
+module github.com/scryinfo/cashbox/packages/services/test/greeter/greeter_go
+
+go 1.15
+
+require (
+	github.com/golang/protobuf v1.4.3
+	github.com/scryinfo/dot v0.2.0
+	github.com/scryinfo/scryg v0.1.3
+	go.uber.org/zap v1.15.0
+	google.golang.org/grpc v1.29.1
+	google.golang.org/protobuf v1.25.0
+)