-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #845 from kyonRay/dev
<sync>(code): sync code from master.
- Loading branch information
Showing
65 changed files
with
4,281 additions
and
884 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| #!/bin/bash | ||
|
|
||
| concatenatedString=$1 | ||
|
|
||
| function LOG_ERROR() | ||
| { | ||
| local content=${1} | ||
| echo -e "\033[31m"${content}"\033[0m" | ||
| } | ||
|
|
||
| function LOG_INFO() | ||
| { | ||
| local content=${1} | ||
| echo -e "\033[32m"${content}"\033[0m" | ||
| } | ||
|
|
||
| get_md5sum_cmd() { | ||
| local md5sum_cmd="md5sum" | ||
| if [ "$(uname)" == "Darwin" ]; then | ||
| md5sum_cmd="md5" | ||
| fi | ||
| echo "$md5sum_cmd" | ||
| } | ||
|
|
||
| function checkConcatenatedRareString() { | ||
| local contract_address=${1} | ||
| md5sum_cmd=$(get_md5sum_cmd) | ||
|
|
||
| md5_concatenatedString=$(echo -n "$concatenatedString" | $md5sum_cmd | awk '{print $1}') | ||
|
|
||
| local set_output=$(./dist/console.sh call HelloWorld "${contract_address}" set "${concatenatedString}") | ||
| eventLogsFromSet=$(echo "set_output" | grep -o 'Event: {}' | sed 's/Event: {\(.*\)}/\1/') | ||
| if [ ! -z "$eventLogsFromSet" ]; then | ||
| echo "eventLogsFromSet=${eventLogsFromSet}" | ||
| md5_eventLogsFromSet=$(echo -n "$eventLogsFromSet" | $md5sum_cmd | awk '{print $1}') | ||
| if [ "$md5_concatenatedString" != "$md5_eventLogsFromSet" ]; then | ||
| LOG_ERROR "error: check failed, the md5 values of rareString and eventLogsFromSet are not equal, fail concatenatedString: ${concatenatedString}" | ||
| exit 1 | ||
| fi | ||
| fi | ||
|
|
||
| # compare rare string and stringFromGet | ||
| get_output=$(./dist/console.sh call HelloWorld "${contract_address}" get) | ||
| stringFromGet=$(echo "$get_output" | grep "Return values" | sed 's/Return values:\(.*\)/\1/' | tr -d '()') | ||
| md5_stringFromGet=$(echo -n "$stringFromGet" | $md5sum_cmd | awk '{print $1}') | ||
| if [ "$md5_concatenatedString" != "$md5_stringFromGet" ]; then | ||
| LOG_ERROR "error: check failed, the md5 values of rareString and stringFromGet are not equal, fail concatenatedString: ${concatenatedString}" | ||
| exit 1 | ||
| else | ||
| LOG_INFO "check success, concatenatedString: ${concatenatedString}" | ||
| fi | ||
| } | ||
|
|
||
| main() { | ||
| LOG_INFO "check rare string start, concatenatedString: ${concatenatedString}" | ||
|
|
||
| # deploy HelloWorld contract | ||
| console_output=$(./dist/console.sh deploy HelloWorld) | ||
| contract_address=$(echo "$console_output" | grep -oE 'contract address: 0x[0-9a-fA-F]+' | sed 's/contract address: //') | ||
| if [ -z "$contract_address" ]; then | ||
| LOG_ERROR "deploy HelloWorld contract failed, contract_address: ${contract_address}" | ||
| exit 1 | ||
| fi | ||
|
|
||
| checkConcatenatedRareString $contract_address | ||
| LOG_INFO "check rare string finished!" | ||
| } | ||
|
|
||
| main "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| name: "CodeQL" | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ 'master*', 'dev*', 'release-*' ] | ||
| pull_request: | ||
| # The branches below must be a subset of the branches above | ||
| branches: [ 'master', 'dev*', 'release-*' ] | ||
| schedule: | ||
| - cron: '57 14 * * 0' | ||
|
|
||
| jobs: | ||
| analyze: | ||
| name: Analyze | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| actions: read | ||
| contents: read | ||
| security-events: write | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| language: [ 'java' ] | ||
| # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] | ||
| # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
|
|
||
| # Initializes the CodeQL tools for scanning. | ||
| - name: Initialize CodeQL | ||
| uses: github/codeql-action/init@v2 | ||
| with: | ||
| languages: ${{ matrix.language }} | ||
| # If you wish to specify custom queries, you can do so here or in a config file. | ||
| # By default, queries listed here will override any specified in a config file. | ||
| # Prefix the list here with "+" to use these queries and those in the config file. | ||
|
|
||
| # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs | ||
| queries: +security-and-quality | ||
|
|
||
|
|
||
| # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). | ||
| # If this step fails, then you should remove it and run the build manually (see below) | ||
| - name: Autobuild | ||
| uses: github/codeql-action/autobuild@v2 | ||
|
|
||
| # ℹ️ Command-line programs to run using the OS shell. | ||
| # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun | ||
|
|
||
| # If the Autobuild fails above, remove it and uncomment the following three lines. | ||
| # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. | ||
|
|
||
| # - run: | | ||
| # echo "Run, Build Application using script" | ||
| # ./location_of_script_within_repo/buildscript.sh | ||
|
|
||
| - name: Perform CodeQL Analysis | ||
| uses: github/codeql-action/analyze@v2 | ||
| with: | ||
| category: "/language:${{matrix.language}}" |
Oops, something went wrong.