Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
f7e2ab2
fix: platon test don't add transactions_suite in tcase_entry.c
xunzhu0507 Oct 8, 2022
81416cd
test: add platone test main file and header file
xunzhu0507 Oct 8, 2022
5fe6cc7
test: add platone test pri_key
xunzhu0507 Oct 8, 2022
db27f5e
test: add test case test_001CreateWallet_0001CreateOneTimeWalletSuccess
xunzhu0507 Oct 8, 2022
8811031
test: add makefile
xunzhu0507 Oct 8, 2022
7fc1cd9
fix: platon test missing hrp
xunzhu0507 Oct 8, 2022
65d5d94
fix: fix the issue #1177
xunzhu0507 Oct 8, 2022
f078fad
fix: fix the issue #1177
xunzhu0507 Oct 8, 2022
05160ad
fix: fix the issue #1177
xunzhu0507 Oct 8, 2022
9b3fd4e
fix: fix the issue #1178
xunzhu0507 Oct 8, 2022
e34b329
fix: fix the issue #1179
xunzhu0507 Oct 8, 2022
a766888
fix: fix the issue #1141
xunzhu0507 Oct 8, 2022
1a3f363
Merge pull request #1180 from xunzhu0507/boatiotsdk_2_0-dev
PanHH Oct 9, 2022
76cbc0f
docs: update the document paragraph display format
PanHH Oct 9, 2022
57541ee
refactor:
zt222 Oct 9, 2022
b267138
Merge branch 'boatiotsdk_2_0-dev' of https://github.com/aitos-io/BoAT…
zt222 Oct 9, 2022
ecaf3dc
docs: update a paragraph display format
PanHH Oct 9, 2022
a8e69fc
test: add platone test case test_001CreateWallet_0002CreateOneTimeWal…
xunzhu0507 Oct 9, 2022
89af7d5
test: add platone test case test_001CreateWallet_0003CreatePersistWal…
xunzhu0507 Oct 9, 2022
b31f88c
test: add platone test case test_001CreateWallet_0004CreateLoadWallet…
xunzhu0507 Oct 9, 2022
90437d6
test: add platone test case test_001CreateWallet_0005CreateLoadWallet…
xunzhu0507 Oct 9, 2022
a7f585c
test: add platone test case test_001CreateWallet_0006CreateOneTimeWal…
xunzhu0507 Oct 9, 2022
199080e
test: add platone test case test_001CreateWallet_0007CreateOneTimeWal…
xunzhu0507 Oct 9, 2022
536c640
test: add platone test case test_001CreateWallet_0008CreateOneTimeWal…
xunzhu0507 Oct 9, 2022
eaaee0a
test: add platone test case test_001CreateWallet_0009CreateWalletWith…
xunzhu0507 Oct 9, 2022
aecb632
test: add platone test case test_001CreateWallet_0010CreateSixWallet
xunzhu0507 Oct 9, 2022
6d840cb
test: add platone test case test_001CreateWallet_0011CreateSevenWallet
xunzhu0507 Oct 9, 2022
0d58217
test: add platone test case test_001CreateWallet_0012CreateOnetimeWal…
xunzhu0507 Oct 9, 2022
2442d2f
test: add platone test case test_001CreateWallet_0014UnloadInexistent…
xunzhu0507 Oct 9, 2022
58ae7ba
test: add platone test case test_001CreateWallet_0015CreateSixWalletU…
xunzhu0507 Oct 9, 2022
c972fb1
test: add platone test case test_001CreateWallet_0016CreateSixWalletU…
xunzhu0507 Oct 9, 2022
3b6d32a
test: add platone test case test_001CreateWallet_0017CreateSixWalletU…
xunzhu0507 Oct 9, 2022
ae43b22
test: add platone test case test_001CreateWallet_0018DeletePersistWal…
xunzhu0507 Oct 9, 2022
2352375
test: add platone test case test_002InitWallet_0001SetEIP155CompSuccess
xunzhu0507 Oct 9, 2022
85a4975
test: add platone test case test_002InitWallet_0002SetEIP155CompFailu…
xunzhu0507 Oct 9, 2022
bb12beb
test: add platone test case test_002InitWallet_0003SetChainIdSuccess
xunzhu0507 Oct 9, 2022
6f69375
test: add platone test case test_002InitWallet_0004SetChainIdFailureN…
xunzhu0507 Oct 9, 2022
e395b24
test: add platone test case test_002InitWallet_0005SetNodeUrlSuccess
xunzhu0507 Oct 9, 2022
b63b369
test: add platone test case test_002InitWallet_0006SetNodeUrlFailureN…
xunzhu0507 Oct 9, 2022
ea03ddb
test: add platone test case test_002InitWallet_0007SetNodeUrlFailureE…
xunzhu0507 Oct 9, 2022
ec10c6f
test: add platone test case test_002InitWallet_0008SetNodeUrlFailureN…
xunzhu0507 Oct 9, 2022
b0ea91b
test: add platone test case test_002InitWallet_0009InitPlatoneWalletW…
xunzhu0507 Oct 9, 2022
fce9ec3
test: add platone test case test_002InitWallet_0011InitPlatoneWalletW…
xunzhu0507 Oct 9, 2022
a6a3940
test: add platone test case test_002InitWallet_0012InitPlatoneWalletS…
xunzhu0507 Oct 9, 2022
590eeff
test: add platone test case test_002InitWallet_0013InitPlatoneWalletG…
xunzhu0507 Oct 9, 2022
e791ce5
test: add platone test case test_002InitWallet_0014InitPlatoneWalletW…
xunzhu0507 Oct 9, 2022
ca6db16
test: add platone test case test_002InitWallet_0015InitPlatoneWalletW…
xunzhu0507 Oct 9, 2022
1642f98
test: add platone test case test_002InitWallet_0016InitPlatoneWalletW…
xunzhu0507 Oct 9, 2022
680b64d
test: add platone test case test_003DeleteWallet_0002DeleteWalletFail…
xunzhu0507 Oct 9, 2022
f376061
test: add platone test case test_003DeleteWallet_0003DeleteWalletSuce…
xunzhu0507 Oct 9, 2022
532dea3
Merge branch 'aitos-io:boatiotsdk_2_0-dev' into boatiotsdk_2_0-dev
xunzhu0507 Oct 9, 2022
e508993
perf:
zt222 Oct 10, 2022
8eb65ae
perf:
zt222 Oct 10, 2022
19cf64e
perf:
zt222 Oct 10, 2022
914f442
Merge pull request #1184 from xunzhu0507/boatiotsdk_2_0-dev
PanHH Oct 10, 2022
83cc6c7
test: add platone test case test_004ParametersInit_0001TxInitSuccess
xunzhu0507 Oct 11, 2022
6923efd
test: add platone test case test_004ParametersInit_0002TxInitFailureN…
xunzhu0507 Oct 11, 2022
5de99d7
test: add platone test case test_004ParametersInit_0003~0006
xunzhu0507 Oct 11, 2022
5634ec7
test: add platone test case test_004ParametersInit_0007~0010
xunzhu0507 Oct 11, 2022
7a34fb6
test: add platone test case test_005ParametersSet_0001~0004
xunzhu0507 Oct 11, 2022
9ac4209
test: add platone test case test_005ParametersSet_0005~0006
xunzhu0507 Oct 11, 2022
7ecd82c
Merge branch 'boatiotsdk_2_0-dev' of https://github.com/xunzhu0507/Bo…
xunzhu0507 Oct 11, 2022
c16602c
Merge branch 'aitos-io:boatiotsdk_2_0-dev' into boatiotsdk_2_0-dev
xunzhu0507 Oct 11, 2022
de67c3a
[quorum][#1187]modify incorrect note
Cavalierliu Oct 11, 2022
2dbde33
[quorum][#1186]modify incorrect log info
Cavalierliu Oct 11, 2022
2000e67
test: add platone test case test_006GetBalance_0001~0003
xunzhu0507 Oct 11, 2022
9400758
Merge branch 'boatiotsdk_2_0-dev' of https://github.com/xunzhu0507/Bo…
xunzhu0507 Oct 11, 2022
72db312
Merge branch 'aitos-io:boatiotsdk_2_0-dev' into boatiotsdk_2_0-dev
xunzhu0507 Oct 12, 2022
ef172b4
test: add platone test case test_007Transfer_0001~0004
xunzhu0507 Oct 12, 2022
12883af
test: add platon test case test_007Transfer_0003~0004
xunzhu0507 Oct 12, 2022
af087eb
Merge branch 'boatiotsdk_2_0-dev' of https://github.com/xunzhu0507/Bo…
xunzhu0507 Oct 12, 2022
ec10bc7
feat[#1190]:Type conversion of enum variables
zzqAlex Oct 12, 2022
453bae8
test: add platone test case test_009CallMycontract_0001~0003
xunzhu0507 Oct 12, 2022
8b48913
feat[#1191]:Response code type conversion
zzqAlex Oct 12, 2022
3d8f039
feat[#1191]:Response code type conversion
zzqAlex Oct 12, 2022
cbbf4c4
feat[#1192]:Cancel Initialization of wallet_config
zzqAlex Oct 12, 2022
89c18d1
feat[#1192]:init the wallet_config in main
zzqAlex Oct 12, 2022
ced18c8
Merge pull request #1188 from xunzhu0507/boatiotsdk_2_0-dev
PanHH Oct 12, 2022
99a0d0e
[Cita][#1193]add cita type
Cavalierliu Oct 13, 2022
75cc078
[Cita][#1193]add demo files
Cavalierliu Oct 13, 2022
1daf6d6
[Cita][#1193]add contract files
Cavalierliu Oct 13, 2022
80bf206
[Cita][#1193]add boatcita proto files
Cavalierliu Oct 14, 2022
2a2d1b3
[Cita][#1193]update demo file
Cavalierliu Oct 18, 2022
09b4d3d
[Cita][#1193]add CMakeList.txt file
Cavalierliu Oct 18, 2022
aaace34
[Cita][#1193]add boatcita Makefile
Cavalierliu Oct 18, 2022
b16d183
[Cita][#1193]add cita api file
Cavalierliu Oct 18, 2022
c32d851
[Cita][#1193]update boatcita.c
Cavalierliu Oct 18, 2022
859493d
perf(warrning):
zt222 Oct 19, 2022
bc10b25
[Cita][#1193]update boatcita.c
Cavalierliu Oct 19, 2022
ee27a23
perf(error):
zt222 Oct 19, 2022
3f308b9
[Cita][#1193]add main Makefile
Cavalierliu Oct 19, 2022
0ba247f
[Cita][#1193]add cita cita2c.py file
Cavalierliu Oct 19, 2022
c1a210c
docs: update one words format.
PanHH Oct 19, 2022
57f08df
docs: update a description
PanHH Oct 19, 2022
1c1797b
[Cita][#1193]modify web3intf files
Cavalierliu Oct 19, 2022
1d5f22e
docs: update the link.
PanHH Oct 19, 2022
9ff5aee
docs: update the link
PanHH Oct 19, 2022
be30238
docs: update a link
PanHH Oct 19, 2022
ef08fb6
docs: update the link
PanHH Oct 19, 2022
c02c545
feat[#1201]:fix the issue
zzqAlex Oct 19, 2022
c8e34a9
feat[#1201]:fix the issue
zzqAlex Oct 19, 2022
09708c1
feat[#1202]:fix the issue
zzqAlex Oct 19, 2022
1bf9c89
feat[#1202]:fix the issue
zzqAlex Oct 19, 2022
535153b
[Cita][#1193]protocol add cita
Cavalierliu Oct 24, 2022
4fd2978
[Cita][#1193]main Makefile add cita
Cavalierliu Oct 24, 2022
a3bd34e
[Cita][#1193]boatwallet add cita create wallet
Cavalierliu Oct 24, 2022
409f310
[Cita][#1193]updatedemo_cita_SimpleStorage.c file
Cavalierliu Oct 24, 2022
035c390
[Cita][#1193]update boatcita file
Cavalierliu Oct 24, 2022
2b5bd10
[Cita][#1193]update api_cita.c file
Cavalierliu Oct 24, 2022
d2994d9
[Cita][#1193]update Maekfile
Cavalierliu Oct 24, 2022
68215e2
[Cita][#1193]add cita sdk make
Cavalierliu Oct 25, 2022
66e85e1
[Cita][#1193]add cita wallet make
Cavalierliu Oct 25, 2022
db2c5c1
[Cita][#1193]update cita2c.py
Cavalierliu Oct 25, 2022
482021c
[Cita][#1193]update pai_cita.h struct
Cavalierliu Oct 25, 2022
f1c70a5
[Cita][#1193]update privatekey and address
Cavalierliu Oct 25, 2022
1c706da
[Cita][#1193]add api_cita.h include
Cavalierliu Oct 25, 2022
139728c
[Cita][#1193]add third-party cita protobuf make
Cavalierliu Oct 25, 2022
5203b62
[Cita][#1193]modify web3_cita_call request str
Cavalierliu Oct 25, 2022
041140d
[Cita][#1193]add cita protos make
Cavalierliu Oct 25, 2022
dcc1955
[Cita][#1193]add ciat demo Makefile
Cavalierliu Oct 25, 2022
8ffbb46
[Cita][#1193]add cita prtotocl make
Cavalierliu Oct 25, 2022
43dda65
[Cita][#1193]modify demo contract content
Cavalierliu Oct 25, 2022
e61294f
docs: Modify the error format
wsdhrtjl Oct 25, 2022
1fb176d
[Cita][#1193]modify valid_until_block function
Cavalierliu Oct 25, 2022
3c57f4c
[Cita][#1193]add BoatCitaTxSetChainID function
Cavalierliu Oct 25, 2022
11d1c6d
perf(fabric):
zt222 Oct 26, 2022
be69f94
perf(hebcs):
zt222 Oct 26, 2022
227f1f9
perf(hebcs):
zt222 Oct 26, 2022
8d18cf6
docs: update the error format
PanHH Oct 26, 2022
876b9ee
Merge branch 'boatiotsdk_2_0-dev' of github.com:aitos-io/BoAT-X-Frame…
zt222 Oct 26, 2022
4f35661
perf(fabric):
zt222 Oct 26, 2022
a4cbbf4
docs: update a format
PanHH Oct 26, 2022
ce77132
docs: update a format
PanHH Oct 26, 2022
8521c24
perf:
zt222 Oct 26, 2022
360753e
Merge branch 'boatiotsdk_2_0-dev' of github.com:aitos-io/BoAT-X-Frame…
zt222 Oct 26, 2022
348b36c
[Cita][#1193]modify wallet and tx data
Cavalierliu Oct 26, 2022
f085330
[Cita][#1193]modify version set
Cavalierliu Oct 26, 2022
c84c604
[Cita][#1193]modify chainid and version assignment
Cavalierliu Oct 26, 2022
6b9c0f7
[Cita][#1193]add json parse function
Cavalierliu Oct 26, 2022
dd1f3d7
[Cita][#1193]modify cjson log info
Cavalierliu Oct 26, 2022
4653a59
[Cita][#1193]modify Makefile cita not depend on eth
Cavalierliu Oct 26, 2022
f12a1df
[Cita][#1193]add cita wallt deinit
Cavalierliu Oct 26, 2022
b0d6d6c
[Cita][#1193]add malloc ptr free
Cavalierliu Oct 26, 2022
1dd57d4
[Cita][#1193]remove eth filed
Cavalierliu Oct 26, 2022
8a35a1b
[Cita][#1193]modify api_cita.c note
Cavalierliu Oct 26, 2022
78312e4
[Cita][#1193]modify chainid function name and paramters
Cavalierliu Oct 27, 2022
3811614
[Cita][#1193]add recipient_str check
Cavalierliu Oct 27, 2022
b9850c9
[Cita][#1193]modify getblocknumber implementation
Cavalierliu Oct 27, 2022
4b82a97
[Cita][#1193]add block_number ptr check
Cavalierliu Oct 28, 2022
3a3a904
[Cita][#1193]add value init
Cavalierliu Oct 28, 2022
58bdc32
[Cita][#1193]modify BoatPort_keyCreate test err
Cavalierliu Oct 28, 2022
4be654b
[Cita][#1193]mofify tests makefile for cita
Cavalierliu Oct 31, 2022
886f26a
[Cita][#1193]add cita test directory and Makefile
Cavalierliu Oct 31, 2022
78b3444
[Cita][#1193]add cita entry function
Cavalierliu Oct 31, 2022
57b5144
[Cita][#1193]add pri_key
Cavalierliu Oct 31, 2022
5f61a98
[Cita][#1193]add contarct files
Cavalierliu Oct 31, 2022
05cd09c
[Cita][#1193]add wallet tests cases
Cavalierliu Oct 31, 2022
eddebc5
[Cita][#1193]add parameters tests cases
Cavalierliu Oct 31, 2022
4687b36
[Cita][#1193]add contract tests cases
Cavalierliu Oct 31, 2022
db2f590
[Chainmaker][#1217]resolve chainmaker test compile err
Cavalierliu Oct 31, 2022
88ddf5d
Merge pull request #1236 from aitos-io/boatiotsdk_cita-dev
zt222 Nov 2, 2022
aa087bc
fix: Reduce warnings during compilation
wsdhrtjl Nov 3, 2022
e9ca3f5
fix: Reduce warnings during compilation
wsdhrtjl Nov 3, 2022
64c71b1
fix: Reduce warnings during compilation
wsdhrtjl Nov 3, 2022
a403bd8
fix: Reduce warnings during compilation
wsdhrtjl Nov 3, 2022
ee192e7
fix: Reduce warnings during compilation
wsdhrtjl Nov 3, 2022
85aa484
fix: Reduce warnings during compilation
wsdhrtjl Nov 3, 2022
e7f9cf2
[Cita][#1246]remove unused variable retval_str
Cavalierliu Nov 7, 2022
0c74204
[Cita][#1247]modify result data type and check result value
Cavalierliu Nov 7, 2022
391bf42
[Cita][#1249]add return value at the endof code
Cavalierliu Nov 7, 2022
1929a3c
[Cita][#1248]add function declaration in boatcita.h
Cavalierliu Nov 7, 2022
fc66b64
[Chainmaker][#1260]add function in api_chainmaker.h
Cavalierliu Nov 11, 2022
217f33a
[Chainmaker][#1260]remove url format check
Cavalierliu Nov 11, 2022
2f4eb88
[Chainmaker][#1260]modify cert and prikey
Cavalierliu Nov 11, 2022
4db09bd
[Chainmaker][#1260]modify test err cases
Cavalierliu Nov 11, 2022
64a8e24
[Platon][#1261]modify key format test err
Cavalierliu Nov 11, 2022
a716404
[Platon][#1261]modify test case
Cavalierliu Nov 11, 2022
3914ab6
[Platon][#1261]add params check
Cavalierliu Nov 11, 2022
476e703
[tests][fabric]modify include files
Cavalierliu Nov 11, 2022
e75e906
[tests][eth]modify include files
Cavalierliu Nov 11, 2022
a34fa83
docs: Fix a syntax error
wsdhrtjl Nov 23, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ BOAT_PROTOCOL_USE_CHAINMAKER ?= 1
BOAT_DISCOVERY_PEER_QUERY ?= 1
BOAT_PROTOCOL_USE_VENACHAIN ?= 1
BOAT_PROTOCOL_USE_QUORUM ?= 1
BOAT_PROTOCOL_USE_CITA ?= 1

# Chain config check
ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM)_$(BOAT_PROTOCOL_USE_PLATON)_$(BOAT_PROTOCOL_USE_PLATONE)_$(BOAT_PROTOCOL_USE_FISCOBCOS)_$(BOAT_PROTOCOL_USE_HLFABRIC)_$(BOAT_PROTOCOL_USE_HWBCS)_$(BOAT_PROTOCOL_USE_CHAINMAKER)_$(BOAT_PROTOCOL_USE_VENACHAIN)_$(BOAT_PROTOCOL_USE_QUORUM), 0_0_0_0_0_0_0_0)
ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM)_$(BOAT_PROTOCOL_USE_PLATON)_$(BOAT_PROTOCOL_USE_PLATONE)_$(BOAT_PROTOCOL_USE_FISCOBCOS)_$(BOAT_PROTOCOL_USE_HLFABRIC)_$(BOAT_PROTOCOL_USE_HWBCS)_$(BOAT_PROTOCOL_USE_CHAINMAKER)_$(BOAT_PROTOCOL_USE_VENACHAIN)_$(BOAT_PROTOCOL_USE_QUORUM)_$(BOAT_PROTOCOL_USE_CITA), 0_0_0_0_0_0_0_0_0)
$(error Select at least one chain)
endif
ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM)_$(BOAT_PROTOCOL_USE_FISCOBCOS), 0_1)
Expand All @@ -40,7 +41,6 @@ ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM)_$(BOAT_PROTOCOL_USE_QUORUM), 0_1)
$(error QUORUM depends on ETHEREUM, set 'BOAT_PROTOCOL_USE_ETHEREUM' to 1 if enable QUORUM)
endif


# Set parameter to scripts
SCRIPTS_PARAM += "BOAT_PROTOCOL_USE_ETHEREUM=$(BOAT_PROTOCOL_USE_ETHEREUM)" \
"BOAT_PROTOCOL_USE_PLATON=$(BOAT_PROTOCOL_USE_PLATON)" \
Expand All @@ -51,7 +51,8 @@ SCRIPTS_PARAM += "BOAT_PROTOCOL_USE_ETHEREUM=$(BOAT_PROTOCOL_USE_ETHEREUM)" \
"BOAT_PROTOCOL_USE_CHAINMAKER=$(BOAT_PROTOCOL_USE_CHAINMAKER)" \
"BOAT_DISCOVERY_PEER_QUERY=$(BOAT_DISCOVERY_PEER_QUERY)" \
"BOAT_PROTOCOL_USE_VENACHAIN=$(BOAT_PROTOCOL_USE_VENACHAIN)" \
"BOAT_PROTOCOL_USE_QUORUM=$(BOAT_PROTOCOL_USE_QUORUM)"
"BOAT_PROTOCOL_USE_QUORUM=$(BOAT_PROTOCOL_USE_QUORUM)" \
"BOAT_PROTOCOL_USE_CITA=$(BOAT_PROTOCOL_USE_CITA)"


# Platform target
Expand Down Expand Up @@ -115,6 +116,8 @@ BOAT_INCLUDE := -I$(BOAT_BASE_DIR)/include \
-I$(BOAT_SDK_DIR)/protocol/boatvenachain \
-I$(BOAT_SDK_DIR)/protocol/boatfiscobcos \
-I$(BOAT_SDK_DIR)/protocol/boatquorum \
-I$(BOAT_SDK_DIR)/protocol/boatcita/protos \
-I$(BOAT_SDK_DIR)/protocol/boatcita \
-I$(BOAT_SDK_DIR)/third-party/nghttp2/include \
-I$(BOAT_SDK_DIR)/third-party/protobuf-c/include \
-I$(BOAT_BASE_DIR)/vendor/platform/include \
Expand Down Expand Up @@ -256,6 +259,7 @@ export BOAT_PROTOCOL_USE_HWBCS
export BOAT_PROTOCOL_USE_CHAINMAKER
export BOAT_PROTOCOL_USE_VENACHAIN
export BOAT_PROTOCOL_USE_QUORUM
export BOAT_PROTOCOL_USE_CITA
export BOAT_DISCOVERY_PEER_QUERY
export BOAT_USE_DEFAULT_CJSON

Expand Down
14 changes: 12 additions & 2 deletions demo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Generate sub-directory list
OBJECTS_DIR = $(BOAT_BUILD_DIR)/demo

.PHONY: all demo_ethereum demo_platon demo_platone demo_fiscobcos demo_fabric demo_hw_bcs demo_chainmaker demo_venachain demo_quorum
all: $(OBJECTS_DIR) demo_ethereum demo_platon demo_platone demo_fiscobcos demo_fabric demo_hw_bcs demo_chainmaker demo_venachain demo_quorum
.PHONY: all demo_ethereum demo_platon demo_platone demo_fiscobcos demo_fabric demo_hw_bcs demo_chainmaker demo_venachain demo_quorum demo_cita
all: $(OBJECTS_DIR) demo_ethereum demo_platon demo_platone demo_fiscobcos demo_fabric demo_hw_bcs demo_chainmaker demo_venachain demo_quorum demo_cita

demo_ethereum:
ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM), 1)
Expand Down Expand Up @@ -51,6 +51,11 @@ ifeq ($(BOAT_PROTOCOL_USE_QUORUM), 1)
make -C $(BOAT_BASE_DIR)/demo/demo_quorum all
endif

demo_cita:
ifeq ($(BOAT_PROTOCOL_USE_CITA), 1)
make -C $(BOAT_BASE_DIR)/demo/demo_cita all
endif

$(OBJECTS_DIR):
$(BOAT_MKDIR) -p $(OBJECTS_DIR)

Expand Down Expand Up @@ -81,5 +86,10 @@ ifeq ($(BOAT_PROTOCOL_USE_VENACHAIN), 1)
endif
ifeq ($(BOAT_PROTOCOL_USE_QUORUM), 1)
make -C $(BOAT_BASE_DIR)/demo/demo_quorum clean
endif
ifeq ($(BOAT_PROTOCOL_USE_CITA), 1)
make -C $(BOAT_BASE_DIR)/demo/demo_cita clean
endif
-$(BOAT_RM) $(BOAT_BUILD_DIR)/demo


2 changes: 1 addition & 1 deletion demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,5 @@ $file \<lib或obj文件名\>
mkdir… 命令语法不正确。
FIND: 参数格式不正确

该问题一般是因为在Windows下进行编译,但未安装Cygwin,或者未在Makefile中正确配置BOAT_RM、BOAT_MKDIR、BOAT_FIND的路径。请参照[以Windows为编译环境](####以Windows为编译环境)章节安装Cygwin和配置Makefile。
该问题一般是因为在Windows下进行编译,但未安装Cygwin,或者未在Makefile中正确配置BOAT_RM、BOAT_MKDIR、BOAT_FIND的路径。请参照[BoAT用户手册中以Windows为编译环境](../docs/zh-cn/BoAT_User_Guide_cn.md#以Windows为编译环境)章节安装Cygwin和配置Makefile。

2 changes: 1 addition & 1 deletion demo/README_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,5 @@ Common tips:
mkdir… command syntax is incorrect.
FIND: The parameter format is incorrect

This problem is generally caused by compiling under Windows, but Cygwin is not installed, or the paths of BOAT_RM, BOAT_MKDIR, and BOAT_FIND are not correctly configured in the Makefile. Please refer to section [Use Windows as Compiler Environment](#Use-Windows-as-Compiler-Environment) to install Cygwin and configure Makefile.
This problem is generally caused by compiling under Windows, but Cygwin is not installed, or the paths of BOAT_RM, BOAT_MKDIR, and BOAT_FIND are not correctly configured in the Makefile. Please refer to the section [Use Windows as Compiler Environment](../docs/en-us/BoAT_User_Guide_en.md#use-windows-as-the-compilation-environment) in BoAT User Guide to install Cygwin and configure Makefile.

4 changes: 3 additions & 1 deletion demo/demo_chainmaker/demo_chainmaker.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ BCHAR *chainmaker_chain_id = "chain1";
BCHAR *chainmaker_org_id = "wx-org1.chainmaker.org";

BoatHlchainmakerWallet *g_chaninmaker_wallet_ptr;
BoatHlchainmakerWalletConfig wallet_config = {0};
BoatHlchainmakerWalletConfig wallet_config;

__BOATSTATIC BOAT_RESULT chainmakerWalletPrepare(void)
{
Expand Down Expand Up @@ -140,6 +140,8 @@ int main(int argc, char *argv[])
BoatResponseData response_data;
boat_try_declare;

memset(&wallet_config,0U,sizeof(BoatHlchainmakerWalletConfig));

/* step-1: Boat SDK initialization */
BoatIotSdkInit();

Expand Down
84 changes: 84 additions & 0 deletions demo/demo_cita/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@



set(CITA_DEMO_SRC demo_cita_SimpleStorage.c)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/demo/demo_cita/runtime)

if(BOAT_PYTHON_EXECUTABLE)
execute_process(COMMAND ${BOAT_PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/cita2c.py ${PROJECT_SOURCE_DIR}/demo/demo_cita/demo_contract/SimpleStorage.json
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/demo/demo_cita/demo_contract
RESULT_VARIABLE result)
if(${result} EQUAL 1)
message(FATAL_ERROR "run python gen.py boatconfig.h error")
endif()
else()
message(FATAL_ERROR "not fund python3, please install python3")
endif()

include_directories(${PROJECT_SOURCE_DIR}/include)
include_directories(${PROJECT_SOURCE_DIR}/vendor/platform/include)
add_subdirectory(demo_contract)

##############

add_executable(demo_cita_SimpleStorage_onetime_internalGen ${CITA_DEMO_SRC})
target_compile_options(demo_cita_SimpleStorage_onetime_internalGen PRIVATE -DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_INTERNAL_GENERATION)
target_link_libraries(demo_cita_SimpleStorage_onetime_internalGen
boatwallet
boatvendor
curl
cita_obj)

add_executable(demo_cita_SimpleStorage_onetime_pkcs ${CITA_DEMO_SRC})
target_compile_options(demo_cita_SimpleStorage_onetime_pkcs PRIVATE -DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_PKCS)
target_link_libraries(demo_ecita_SimpleStorage_onetime_pkcs
boatwallet
boatvendor
curl
cita_obj)

add_executable(demo_cita_SimpleStorage_onetime_native ${CITA_DEMO_SRC})
target_compile_options(demo_cita_SimpleStorage_onetime_native PRIVATE -DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_NATIVE)
target_link_libraries(demo_cita_SimpleStorage_onetime_native
boatwallet
boatvendor
curl
cita_obj)

add_executable(demo_cita_SimpleStorage_create_internalGen ${CITA_DEMO_SRC})
target_compile_options(demo_cita_SimpleStorage_create_internalGen PRIVATE -DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_INTERNAL_GENERATION)
target_link_libraries(demo_cita_SimpleStorage_create_internalGen
boatwallet
boatvendor
curl
cita_obj)

add_executable(demo_cita_SimpleStorage_create_pkcs ${CITA_DEMO_SRC})
target_compile_options(demo_cita_SimpleStorage_create_pkcs PRIVATE -DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_PKCS )
target_link_libraries(demo_cita_SimpleStorage_create_pkcs
boatwallet
boatvendor
curl
cita_obj)

add_executable(demo_cita_SimpleStorage_create_native ${CITA_DEMO_SRC})
target_compile_options(demo_cita_SimpleStorage_create_native PRIVATE -DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_NATIVE)
target_link_libraries(demo_cita_SimpleStorage_create_native
boatwallet
boatvendor
curl
cita_obj)

add_executable(demo_cita_SimpleStorage_load ${CITA_DEMO_SRC})
target_compile_options(demo_cita_SimpleStorage_load PRIVATE -DUSE_LOAD_PERSIST_WALLET)
target_link_libraries(demo_cita_SimpleStorage_load
boatwallet
boatvendor
curl
cita_obj)





51 changes: 51 additions & 0 deletions demo/demo_cita/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Source and Objects

# Specify demo folder name
DEMO_FOLDER = demo_cita

# Source and Objects
CONTRACT_SRC_DIR = $(BOAT_BASE_DIR)/demo/$(DEMO_FOLDER)/demo_contract
OBJECTS_DIR = $(BOAT_BUILD_DIR)/demo/$(DEMO_FOLDER)
CONTRACT_OBJECTS_DIR = $(BOAT_BUILD_DIR)/demo/$(DEMO_FOLDER)/demo_contract
DEMO_SOURCES = $(wildcard *.c)
CONTRACT_SOURCES = $(wildcard $(CONTRACT_OBJECTS_DIR)/*.c)
CONTRACT_INCLUDE = -I$(BOAT_BUILD_DIR)/demo/$(DEMO_FOLDER)/demo_contract

#dependence libs
DEPENDENCE_LIBS = $(BOAT_LIB_DIR)/libboatwallet.a \
$(BOAT_LIB_DIR)/libboatvendor.a \
$(LINK_LIBS)

.PHONY: all contract_generate
all: $(OBJECTS_DIR) contract_generate
$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
-DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_INTERNAL_GENERATION \
$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_onetime_internalGen
$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
-DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_PKCS \
$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_onetime_pkcs
$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
-DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_NATIVE \
$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_onetime_native
$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
-DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_INTERNAL_GENERATION \
$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_create_internalGen
$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
-DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_PKCS \
$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_create_pkcs
$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
-DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_NATIVE \
$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_create_native
$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
-DUSE_LOAD_PERSIST_WALLET \
$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_load

contract_generate:
make -C $(CONTRACT_SRC_DIR) all

$(OBJECTS_DIR):
$(BOAT_MKDIR) -p $(OBJECTS_DIR)
$(BOAT_MKDIR) -p $(OBJECTS_DIR)/demo_contract

clean:
-$(BOAT_RM) $(OBJECTS_DIR)/*
Loading