[lib] refs #992 - Update SKY_cli_CreateTxFromWallet to deal with wall…

…et encryption

include/skytypes.h

@@ -115,6 +115,12 @@ typedef struct {
  */
 typedef GoInt64_ Handle;
 
+/**
+ * Memory handle for internal object retrieving password to read
+ * encrypted wallets.
+ */
+typedef Handle PasswordReader__Handle;
+
 #include "cipher.hash.go.h"
 #include "cipher.crypto.go.h"
 #include "cipher.address.go.h"

lib/cgo/api.cli.cli.go

@@ -0,0 +1,20 @@
+package main
+
+/*
+
+  #include <string.h>
+  #include <stdlib.h>
+
+  #include "skytypes.h"
+*/
+import "C"
+
+import (
+	cli "github.com/skycoin/skycoin/src/api/cli"
+)
+
+//export SKY_cli_NewPasswordReader
+func SKY_cli_NewPasswordReader(_p []byte) C.PasswordReader__Handle {
+	pr := cli.NewPasswordReader(_p)
+	return registerPasswordReaderHandle(pr)
+}

lib/cgo/api.cli.create_rawtx.go

@@ -21,21 +21,25 @@ import (
  */
 
 //export SKY_cli_CreateRawTxFromWallet
-func SKY_cli_CreateRawTxFromWallet(_ctx C.Handle, _walletFile, _chgAddr string, _toAddrs []C.cli__SendAmount, _tx *C.coin__Transaction) uint32 {
+func SKY_cli_CreateRawTxFromWallet(_ctx C.Handle, _walletFile, _chgAddr string, _toAddrs []C.cli__SendAmount, _pr C.PasswordReader__Handle, _tx *C.coin__Transaction) uint32 {
 	// TODO: Instantiate _ctx . Not used in cli function
 	toAddrs := (*[]cli.SendAmount)(unsafe.Pointer(&_toAddrs))
-	tx, err := cli.CreateRawTxFromWallet(nil, _walletFile, _chgAddr, *toAddrs)
+	pr, isOk := lookupPasswordReaderHandle(_pr)
+	if !isOk {
+		return SKY_ERROR
+	}
+	tx, err := cli.CreateRawTxFromWallet(nil, _walletFile, _chgAddr, *toAddrs, pr)
 	*_tx = *(*C.coin__Transaction)(unsafe.Pointer(&tx))
 	if err != nil {
-		return 1
+		return SKY_ERROR
 	}
-	return 0
+	return SKY_OK
 }
 
 //export SKY_cli_CreateRawTxFromAddress
 func SKY_cli_CreateRawTxFromAddress(_ctx C.Handle, _addr, _walletFile, _chgAddr string, _toAddrs []C.cli__SendAmount, _tx *C.coin__Transaction) uint32 {
 	// TODO: Implement
-	return 0
+	return SKY_ERROR
 }
 
 //export SKY_cli_CreateRawTx

lib/cgo/libsky_error.go

@@ -1,8 +1,8 @@
 package main
 
 const (
-	SKY_OK    = 0
 	SKY_ERROR = 0xFFFFFFFF
+	SKY_OK    = 0
 )
 
 func libErrorCode(err error) uint32 {

lib/cgo/libsky_handle.go

@@ -0,0 +1,56 @@
+package main
+
+/*
+
+  #include <string.h>
+  #include <stdlib.h>
+
+  #include "skytypes.h"
+*/
+import "C"
+
+import (
+	cli "github.com/skycoin/skycoin/src/api/cli"
+	"unsafe"
+)
+
+type Handle uint64
+
+var (
+	handleMap = make(map[Handle]interface{})
+)
+
+func registerHandle(obj interface{}) Handle {
+	ptr := &obj
+	handle := *(*Handle)(unsafe.Pointer(&ptr))
+	handleMap[handle] = obj
+	return handle
+}
+
+func lookupHandleObj(handle Handle) (interface{}, bool) {
+	obj, ok := handleMap[handle]
+	return obj, ok
+}
+
+func registerPasswordReaderHandle(obj cli.PasswordReader) C.PasswordReader__Handle {
+	return (C.PasswordReader__Handle)(registerHandle(obj))
+}
+
+func lookupPasswordReaderHandle(handle C.PasswordReader__Handle) (cli.PasswordReader, bool) {
+	obj, ok := lookupHandleObj(Handle(handle))
+	if ok {
+		if obj, isOK := (obj).(cli.PasswordReader); isOK {
+			return obj, true
+		}
+	}
+	return nil, false
+}
+
+func closeHandle(handle Handle) {
+	delete(handleMap, handle)
+}
+
+//export SKY_handle_close
+func SKY_handle_close(handle C.Handle) {
+	closeHandle(Handle(handle))
+}

lib/cgo/libsky_mem.go

@@ -36,28 +36,6 @@ const (
 	SizeofUxBalance         = unsafe.Sizeof(C.wallet__UxBalance{})
 )
 
-type Handle uint64
-
-var (
-	handleMap = make(map[Handle]interface{})
-)
-
-func openHandle(obj interface{}) Handle {
-	ptr := &obj
-	handle := *(*Handle)(unsafe.Pointer(&ptr))
-	handleMap[handle] = obj
-	return handle
-}
-
-func lookupHandleObj(handle Handle) (interface{}, bool) {
-	obj, ok := handleMap[handle]
-	return obj, ok
-}
-
-func closeHandle(handle Handle) {
-	delete(handleMap, handle)
-}
-
 /**
  * Inplace memory references
  */