Skip to content

Smart contract merge #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 99 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
1b37bb4
add poe
cjcchen Oct 9, 2023
e29afbc
add
cjcchen Oct 9, 2023
9275940
update workflo
cjcchen Oct 9, 2023
ea17960
Merge branch 'poe' of https://github.com/msadoghi/resilientdb-expolab…
cjcchen Oct 9, 2023
fd1c355
add log
cjcchen Oct 9, 2023
f1cfc56
change github name
cjcchen Oct 9, 2023
14a70c0
change img files
cjcchen Oct 9, 2023
8e24c4c
fix workflow
cjcchen Oct 9, 2023
36b579b
Merge pull request #99 from msadoghi/poe
cjcchen Oct 27, 2023
3df0b0e
fix communicator
Nov 20, 2023
4b50ac6
rm log
Nov 27, 2023
4de98d3
add base fairdag
cjcchen Jan 13, 2024
75b5f44
add fairdag
cjcchen Jan 14, 2024
328098a
add hs
cjcchen Jan 19, 2024
da8cc30
add hs
cjcchen Jan 19, 2024
d555ba8
add ooohs
cjcchen Jan 21, 2024
4c5167e
add tusk
cjcchen Jan 31, 2024
200669c
add rcc
cjcchen Jan 31, 2024
8eb772d
add rcc
cjcchen Feb 2, 2024
a7b0ee5
add config
cjcchen Feb 2, 2024
752662d
add cassandra
cjcchen Feb 2, 2024
9a219e9
Merge branch 'tusk' of https://github.com/msadoghi/asf-resilientdb in…
cjcchen Feb 2, 2024
bf516bb
add cassandra
cjcchen Feb 2, 2024
e4b6cc4
add prepare
cjcchen Feb 2, 2024
cc5e90f
add prepare
cjcchen Feb 3, 2024
2d294c3
add cass 256
cjcchen Feb 4, 2024
38dec1c
add ooowq
cjcchen Feb 13, 2024
2861bc4
rcc done
cjcchen Feb 19, 2024
bfeae55
done
cjcchen Feb 20, 2024
388c066
rcc done
cjcchen Feb 21, 2024
b07929b
add
cjcchen Feb 22, 2024
259ee94
add fair
cjcchen Feb 27, 2024
5159b68
add cass
cjcchen Mar 11, 2024
7072f19
add poe
cjcchen Mar 11, 2024
9b6a88a
Merge pull request #1 from msadoghi/tusk
cjcchen Mar 11, 2024
84b4b3a
fix execution response
cjcchen Mar 18, 2024
4e2d4ec
remove smallbank
cjcchen May 2, 2024
a8c5c85
fix performance script
cjcchen May 11, 2024
e617313
add fairdag rl
May 24, 2024
cc1f607
add graph
May 25, 2024
290bdfb
add fair
May 26, 2024
ccc8506
add
May 30, 2024
7f220fa
done
Jun 5, 2024
7a04869
done
Jun 5, 2024
a267832
done
Jun 6, 2024
f9655dc
Merge pull request #3 from msadoghi/fairdag_al
cjcchen Jun 6, 2024
2c46ed8
fix build
Jun 15, 2024
72b5659
Merge branch 'master' of https://github.com/msadoghi/asf-resilientdb
Jun 21, 2024
db962d7
add perf
Jun 22, 2024
4f70b69
Merge branch 'poe' of https://github.com/msadoghi/asf-resilientdb int…
Jun 22, 2024
e926e1b
linear poe
Jun 27, 2024
d19708a
add
Jun 27, 2024
350b665
update
Jul 18, 2024
7d95a21
fix
cjcchen Aug 11, 2024
b5217bc
update
cjcchen Aug 15, 2024
9a107cb
update
cjcchen Aug 15, 2024
800c7a4
update
cjcchen Sep 29, 2024
8d1b7dc
update
cjcchen Oct 1, 2024
1ec58c0
add log
cjcchen Nov 17, 2024
b0cf4f9
revert
cjcchen Nov 22, 2024
974cc46
revert
cjcchen Nov 22, 2024
0656760
rm
cjcchen Nov 22, 2024
f3e911f
Merge pull request #11 from msadoghi/poe_merge
cjcchen Nov 22, 2024
13e1560
fix
Feb 8, 2025
3c2bc44
add storage
cjcchen Feb 8, 2025
e2467cb
add sm in kv
cjcchen Feb 9, 2025
1da668d
add kv cmd for sm
cjcchen Feb 10, 2025
37a6584
update
cjcchen Feb 12, 2025
8bc584f
add contact kv
cjcchen Feb 13, 2025
45c9dcb
format
cjcchen Feb 13, 2025
2c4de9c
merge master
cjcchen Feb 13, 2025
9a57c3d
merge master
cjcchen Feb 13, 2025
e664bc3
merge master
cjcchen Feb 13, 2025
e569529
merge master
cjcchen Feb 13, 2025
0440770
merge master
cjcchen Feb 13, 2025
6d6c9f7
merge master
cjcchen Feb 13, 2025
60e4116
merge master
cjcchen Feb 13, 2025
23a3103
merge master
cjcchen Feb 13, 2025
99d2028
merge master
Feb 13, 2025
0beac2a
merge master
Feb 13, 2025
1dd7a5e
merge master
Feb 13, 2025
13e716a
merge master
Feb 13, 2025
01eb08b
merge master
Feb 13, 2025
2a7bcdc
merge master
Feb 13, 2025
55e74ae
merge master
Feb 13, 2025
f2f157a
merge master
Feb 13, 2025
4021a97
merge master
cjcchen Feb 13, 2025
e31b255
merge master
cjcchen Feb 13, 2025
8329eec
merge master
cjcchen Feb 13, 2025
5f27180
merge master
cjcchen Feb 13, 2025
70ea664
merge master
cjcchen Feb 13, 2025
ccec5ba
merge master
cjcchen Feb 13, 2025
fc6602e
add license
cjcchen Feb 13, 2025
0b8d22b
fix build
cjcchen Feb 14, 2025
d294cd8
add boost
cjcchen Feb 14, 2025
9bbcc38
add deps
cjcchen Feb 14, 2025
4b0fede
change para
cjcchen Feb 14, 2025
b2b416f
merge master
cjcchen Feb 14, 2025
79e9854
add readme
cjcchen Feb 14, 2025
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
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -387,3 +387,8 @@ Then re-run the start script:
./service/tools/kv/server_tools/start_kv_service.sh
```



## Smart Contract ##
If you want to use smart contracts, please go to:
https://blog.resilientdb.com/2025/02/14/GettingStartedSmartContract.html
4 changes: 3 additions & 1 deletion executor/kv/kv_executor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ std::unique_ptr<std::string> KVExecutor::ExecuteRequest(
const google::protobuf::Message& request) {
KVResponse kv_response;
const KVRequest& kv_request = dynamic_cast<const KVRequest&>(request);
// LOG(ERROR)<<"execute request:";

if (kv_request.cmd() == KVRequest::SET) {
Set(kv_request.key(), kv_request.value());
Expand Down Expand Up @@ -95,6 +94,7 @@ std::unique_ptr<std::string> KVExecutor::ExecuteData(
return nullptr;
}

LOG(ERROR)<<" execute cmd:"<<kv_request.cmd();
if (kv_request.cmd() == KVRequest::SET) {
Set(kv_request.key(), kv_request.value());
} else if (kv_request.cmd() == KVRequest::GET) {
Expand Down Expand Up @@ -135,10 +135,12 @@ std::unique_ptr<std::string> KVExecutor::ExecuteData(
}

void KVExecutor::Set(const std::string& key, const std::string& value) {
LOG(ERROR)<<" set key:"<<key;
storage_->SetValue(key, value);
}

std::string KVExecutor::Get(const std::string& key) {
LOG(ERROR)<<" get key:"<<key;
return storage_->GetValue(key);
}

Expand Down
2 changes: 1 addition & 1 deletion service/tools/kv/api_tools/contract_service_tools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ int main(int argc, char** argv) {

contract_path = GetValue(js, "contract_path");
contract_name = GetValue(js, "contract_name");
contract_address = GetValue(js, "contract_address");
contract_address = GetValue(js, "owner_address");
params = GetValue(js, "init_params");

printf("contract path %s cmd %s contract name %s caller_address %s init params %s\n", contract_path.c_str(), cmd.c_str(), contract_name.c_str(), contract_address.c_str(), params.c_str());
Expand Down
Loading