Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
simon-jentzsch committed Feb 27, 2021
2 parents 27a803c + 5d8e75c commit ea93a7d
Show file tree
Hide file tree
Showing 284 changed files with 1,688 additions and 2,311 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
###############################################################################
# This file is part of the Incubed project.
# Sources: https://github.com/slockit/in3-c
# Sources: https://github.com/blockchainsllc/in3
#
# Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
#
Expand Down
79 changes: 38 additions & 41 deletions CONTRIBUTING.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
###############################################################################
# This file is part of the Incubed project.
# Sources: https://github.com/slockit/in3-c
# Sources: https://github.com/blockchainsllc/in3
#
# Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
#
Expand Down
292 changes: 147 additions & 145 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion c/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
###############################################################################
# This file is part of the Incubed project.
# Sources: https://github.com/slockit/in3-c
# Sources: https://github.com/blockchainsllc/in3
#
# Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
#
Expand Down
4 changes: 2 additions & 2 deletions c/ci-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ pages:
- echo "" >> debian/changelog
- echo "in3 (${VERSION:1}~${DISTRO}) ${DISTRO}; urgency=medium" >> debian/changelog
- echo "" >> debian/changelog
- echo " * Check https://github.com/slockit/in3 for changelog " >> debian/changelog
- echo " * Check https://github.com/blockchainsllc/in3 for changelog " >> debian/changelog
- echo "" >> debian/changelog
- echo " -- devops_slock.it <[email protected]> " $(date -R) >> debian/changelog
- echo "" >> debian/changelog
Expand Down Expand Up @@ -365,7 +365,7 @@ debian_package_deploy_focal:
- echo "" >> debian/changelog
- echo "in3-dev (${VERSION:1}~${DISTRO}) ${DISTRO}; urgency=medium" >> debian/changelog
- echo "" >> debian/changelog
- echo " * Check https://github.com/slockit/in3 for changelog " >> debian/changelog
- echo " * Check https://github.com/blockchainsllc/in3 for changelog " >> debian/changelog
- echo "" >> debian/changelog
- echo " -- devops_slock.it <[email protected]> " $(date -R) >> debian/changelog
- echo "" >> debian/changelog
Expand Down
2 changes: 1 addition & 1 deletion c/compiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if(MSVC)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -funsigned-char -std=c99 -D__FILENAME__=none")
else(MSVC)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Wall -funsigned-char -Wextra -std=c99")
if (NOT DEFINED ANDROID_ABI)
if (NOT DEFINED ANDROID_ABI AND NOT ${CMAKE_GENERATOR} MATCHES "Ninja")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -funsigned-char -Wextra -std=c99 -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
else()
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -funsigned-char -Wextra -std=c99 -D__FILENAME__=none")
Expand Down
51 changes: 18 additions & 33 deletions c/docs/2_examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

### btc_transaction

source : [in3-c/c/examples/btc_transaction.c](https://github.com/slockit/in3-c/blob/master/c/examples/btc_transaction.c)
source : [in3-c/c/examples/btc_transaction.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/btc_transaction.c)

checking a Bitcoin transaction data


```c
/// checking a Bitcoin transaction data

Expand Down Expand Up @@ -48,11 +47,10 @@ int main() {

### call_a_function

source : [in3-c/c/examples/call_a_function.c](https://github.com/slockit/in3-c/blob/master/c/examples/call_a_function.c)
source : [in3-c/c/examples/call_a_function.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/call_a_function.c)

This example shows how to call functions on a smart contract eiither directly or using the api to encode the arguments


```c
/// This example shows how to call functions on a smart contract eiither directly or using the api to encode the arguments

Expand Down Expand Up @@ -161,10 +159,9 @@ in3_ret_t call_func_api(in3_t* c, address_t contract) {
### get_balance
source : [in3-c/c/examples/get_balance.c](https://github.com/slockit/in3-c/blob/master/c/examples/get_balance.c)
get the Balance with the API and also as direct RPC-call
source : [in3-c/c/examples/get_balance.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/get_balance.c)
get the Balance with the API and also as direct RPC-call
```c
/// get the Balance with the API and also as direct RPC-call
Expand Down Expand Up @@ -231,10 +228,9 @@ void get_balance_api(in3_t* in3) {

### get_block

source : [in3-c/c/examples/get_block.c](https://github.com/slockit/in3-c/blob/master/c/examples/get_block.c)

using the basic-module to get and verify a Block with the API and also as direct RPC-call
source : [in3-c/c/examples/get_block.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/get_block.c)

using the basic-module to get and verify a Block with the API and also as direct RPC-call

```c
/// using the basic-module to get and verify a Block with the API and also as direct RPC-call
Expand Down Expand Up @@ -303,10 +299,9 @@ void get_block_api(in3_t* in3) {
### get_logs
source : [in3-c/c/examples/get_logs.c](https://github.com/slockit/in3-c/blob/master/c/examples/get_logs.c)
fetching events and verify them with eth_getLogs
source : [in3-c/c/examples/get_logs.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/get_logs.c)
fetching events and verify them with eth_getLogs
```c
/// fetching events and verify them with eth_getLogs
Expand Down Expand Up @@ -407,11 +402,10 @@ void get_logs_api(in3_t* in3) {

### get_transaction

source : [in3-c/c/examples/get_transaction.c](https://github.com/slockit/in3-c/blob/master/c/examples/get_transaction.c)
source : [in3-c/c/examples/get_transaction.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/get_transaction.c)

checking the transaction data


```c
/// checking the transaction data

Expand Down Expand Up @@ -482,10 +476,9 @@ void get_tx_api(in3_t* in3) {
### get_transaction_receipt
source : [in3-c/c/examples/get_transaction_receipt.c](https://github.com/slockit/in3-c/blob/master/c/examples/get_transaction_receipt.c)
validating the result or receipt of an transaction
source : [in3-c/c/examples/get_transaction_receipt.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/get_transaction_receipt.c)
validating the result or receipt of an transaction
```c
/// validating the result or receipt of an transaction
Expand Down Expand Up @@ -558,10 +551,9 @@ void get_tx_receipt_api(in3_t* in3) {

### ipfs_put_get

source : [in3-c/c/examples/ipfs_put_get.c](https://github.com/slockit/in3-c/blob/master/c/examples/ipfs_put_get.c)

using the IPFS module
source : [in3-c/c/examples/ipfs_put_get.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/ipfs_put_get.c)

using the IPFS module

```c
/// using the IPFS module
Expand Down Expand Up @@ -646,9 +638,7 @@ int main() {
### ledger_sign
source : [in3-c/c/examples/ledger_sign.c](https://github.com/slockit/in3-c/blob/master/c/examples/ledger_sign.c)
source : [in3-c/c/examples/ledger_sign.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/ledger_sign.c)
```c
Expand Down Expand Up @@ -705,11 +695,10 @@ void send_tx_api(in3_t* in3) {

### send_transaction

source : [in3-c/c/examples/send_transaction.c](https://github.com/slockit/in3-c/blob/master/c/examples/send_transaction.c)
source : [in3-c/c/examples/send_transaction.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/send_transaction.c)

sending a transaction including signing it with a private key


```c
/// sending a transaction including signing it with a private key

Expand Down Expand Up @@ -799,11 +788,10 @@ void send_tx_api(in3_t* in3) {
### usn_device
source : [in3-c/c/examples/usn_device.c](https://github.com/slockit/in3-c/blob/master/c/examples/usn_device.c)
source : [in3-c/c/examples/usn_device.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/usn_device.c)
a example how to watch usn events and act upon it.
```c
/// a example how to watch usn events and act upon it.
Expand Down Expand Up @@ -871,11 +859,10 @@ int main(int argc, char* argv[]) {

### usn_rent

source : [in3-c/c/examples/usn_rent.c](https://github.com/slockit/in3-c/blob/master/c/examples/usn_rent.c)
source : [in3-c/c/examples/usn_rent.c](https://github.com/blockchainsllc/in3/blob/master/c/examples/usn_rent.c)

how to send a rent transaction to a usn contract usinig the usn-api.


```c
/// how to send a rent transaction to a usn contract usinig the usn-api.

Expand Down Expand Up @@ -954,8 +941,7 @@ int main(int argc, char* argv[]) {
}
```
### Building
### Building
In order to run those examples, you only need a c-compiler (gcc or clang) and curl installed.
Expand All @@ -969,4 +955,3 @@ You can build them individually by executing:
```
gcc -o get_block_api get_block_api.c -lin3 -lcurl
```
2 changes: 1 addition & 1 deletion c/include/in3/api_utils.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/btc_api.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/bytes.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/client.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/colors.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/context.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/data.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/error.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/eth_api.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/ethereum_apdu_client.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/in3_curl.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/in3_http.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/in3_init.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/in3_winhttp.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/ipfs_api.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/ledger_signer.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/mem.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/pay_eth.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/plugin.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/rpc.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/scache.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
2 changes: 1 addition & 1 deletion c/include/in3/signer.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* This file is part of the Incubed project.
* Sources: https://github.com/slockit/in3-c
* Sources: https://github.com/blockchainsllc/in3
*
* Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
*
Expand Down
Loading

0 comments on commit ea93a7d

Please sign in to comment.