Merge remote-tracking branch 'origin/bip32_bip44'

.gitignore

@@ -4,9 +4,13 @@
 storage/
 storage-testnet/
 *.dat
+*.bin
 main
 goXdagWallet
 go_build_goXdagWallet
+goXdagWallet.exe
+goXdagWallet.exe~
+libxdag_*.a
 *.exe
 *.apk
 *.app

README.md

@@ -7,6 +7,37 @@ Fyne is a cross-platform GUI in Go inspired by Material Design.
 The wallet can run on Windows, Linux, Mac now.
 
 Mobile version is coming.
+## usage
+- usage: by command-line parameter -help
+- 3 run modes: gui(default), cli, server, by commnad-line parameter -mode
+- cli commands:
+  - help -- display commands list
+  - exit -- exit cli wallet
+  - account -- display address of wallet account
+  - balance -- display balance of wallet account
+  - xfer V A R -- transfer V coins to address A with remark R
+  - mnemonic -- display mnemonic of wallet account
+  - export P -- export mnemonic to file P
+- jsonrpc server: by command-line parameter -mode server -ip \<ip address\> -port \<port number\>
+  - method: Xdag.Unlock
+    - params: ["\<wallet password\>"]
+    - response: {"id":1,"result":"success","error":null}
+  - method: Xdag.Lock
+    - params: ["\<wallet password\>"]
+    - response: {"id":1,"result":"success","error":null}
+  - method: Xdag.Account
+    - params: [""]
+    - response: {"id":1,"result": "\<wallet address\>","error":null}
+  - method: Xdag.Balance
+    - params: [""]
+    - response: {"id":1,"result": "\<wallet balance\>","error":null}
+  - method: Xdag.Balance
+    - params: ["\<wallet address\>"]
+    - response: {"id":1,"result": "\<balance of the address\>","error":null}
+  - method: Xdag.Transfer
+    - params: [{"amount":"\<amount\>","address":"\<to address\>","remark":"\<remark\>"}]
+    - response: {"id":1,"result": "success","error":null}
+
 ## repo structure
  - clib - a wrapper of XDAG Wallet C library
    - xDagWallet - XDAG wallet C library
@@ -18,6 +49,9 @@ Mobile version is coming.
    - config - wallet config
    - wallet_state - wallet state
    - xlog - wallet log
+   - xdago - bip32,bip39,bip44
+   - cli - command line mode
+   - server - rpc server mode
 
 ## build
 enter /clib

clib/.gitignore

@@ -1,2 +1,4 @@
 cmake-build-debug/
-cmake-build-release/
+cmake-build-release/
+build/
+*.a

clib/CMakeLists.txt

@@ -25,18 +25,14 @@ endif()
 file(GLOB_RECURSE DAGGER_SOURCES
         xDagWallet/src/client/*.c
         xDagWallet/src/client/utils/*.c
-        xDagWallet/src/dnet/*.c
         xDagWallet/src/dus/*.c
-        xDagWallet/src/ldus/*.c
         )
 
 
 file(GLOB_RECURSE DAGGER_HEADERS
         xDagWallet/src/client/*.h
         xDagWallet/src/client/utils/*.h
-        xDagWallet/src/dnet/*.h
         xDagWallet/src/dus/*.h
-        xDagWallet/src/ldus/*.h
         )