Skip to content

Commit

Permalink
Merge branch 'develop' into current branch
Browse files Browse the repository at this point in the history
  • Loading branch information
yangby-cryptape committed Nov 29, 2019
2 parents 621dc8b + 7320d2a commit 15ceb68
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion devtools/azure/windows-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ steps:
displayName: Install LLVM
- script: choco install -y msys2
displayName: Install msys2
- script: choco install -y yasm
- script: choco install --allow-empty-checksums -y yasm
displayName: Install yasm
- script: |
curl -sSf -o rustup-init.exe https://win.rustup.rs
Expand Down
11 changes: 10 additions & 1 deletion devtools/doc/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import sys
import json


def newline(n):
for i in range(0, n):
print("")
Expand All @@ -11,6 +12,7 @@ def newline(n):
def sort_cases_by_module(cases):
return sorted(cases, key=lambda case: case["module"])


def print_title(case):
print("### `{}`".format(case["method"]))
newline(1)
Expand All @@ -29,7 +31,8 @@ def print_types(case):
newline(1)
for item in case["types"]:
if len(item) != 1:
raise Exception("Invalid `types` format, expect one map for only one type: {}".format(item))
raise Exception(
"Invalid `types` format, expect one map for only one type: {}".format(item))
for (key, val) in item.items():
print(" {} - {}".format(key, val))

Expand Down Expand Up @@ -117,6 +120,12 @@ def main():
print("# CKB JSON-RPC Protocols")
newline(1)
print("NOTE: This file is auto-generated. Please don't update this file directly; instead make changes to `rpc/json/rpc.json` and re-run `make gen-rpc-doc`")
newline(1)
print("The RPC interface shares the version of the node version, which is returned in `local_node_info`. The interface is fully compactible between patch versions, for example, a client for 0.25.0 should work with 0.25.x for any x.")
newline(1)
print("Allowing arbitrary machines to access the JSON-RPC port (using the `rpc.listen_address` configuration option) is **dangerous and strongly discouraged**. Please strictly limit the access to only trusted machines.")
newline(1)
print("CKB JSON-RPC only supports HTTP now. If you need SSL, please setup a proxy via Nginx or other HTTP servers.")
newline(2)

print_toc(cases)
Expand Down
6 changes: 6 additions & 0 deletions rpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

NOTE: This file is auto-generated. Please don't update this file directly; instead make changes to `rpc/json/rpc.json` and re-run `make gen-rpc-doc`

The RPC interface shares the version of the node version, which is returned in `local_node_info`. The interface is fully compactible between patch versions, for example, a client for 0.25.0 should work with 0.25.x for any x.

Allowing arbitrary machines to access the JSON-RPC port (using the `rpc.listen_address` configuration option) is **dangerous and strongly discouraged**. Please strictly limit the access to only trusted machines.

CKB JSON-RPC only supports HTTP now. If you need SSL, please setup a proxy via Nginx or other HTTP servers.


* [`Chain`](#chain)
* [`get_tip_block_number`](#get_tip_block_number)
Expand Down

0 comments on commit 15ceb68

Please sign in to comment.