From 8f0f7b13addab886b4ea65c7ea9163d058da960c Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 20 Dec 2023 14:08:43 +0000 Subject: [PATCH 01/13] adding a lint GH action --- .github/workflows/lint.yaml | 59 +++++++++++ .idea/aws.xml | 17 +++ .idea/workspace.xml | 204 ++++++++++++++++++++++++++++++++++++ api/doc/thor.yaml | 50 ++++----- 4 files changed, 305 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/lint.yaml create mode 100644 .idea/aws.xml create mode 100644 .idea/workspace.xml diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 000000000..ddd850403 --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,59 @@ +name: Lint + +on: [push, pull_request] + +jobs: + unit_tests: + strategy: + matrix: + go-version: [1.20.x] + os: [ubuntu-latest, macos-latest, windows-latest] + include: + - go-version: 1.17.x + os: ubuntu-latest + - go-version: 1.18.x + os: ubuntu-latest + - go-version: 1.19.x + os: ubuntu-latest + runs-on: ${{ matrix.os }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Install Go + uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go-version }} + + - name: golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + # Require: The version of golangci-lint to use. + # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version. + # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit. + version: v1.54 + + # Optional: working directory, useful for monorepos + # working-directory: somedir + + # Optional: golangci-lint command line arguments. + # + # Note: By default, the `.golangci.yml` file should be at the root of the repository. + # The location of the configuration file can be changed by using `--config=` + # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0 + + # Optional: show only new issues if it's a pull request. The default value is `false`. + # only-new-issues: true + + # Optional: if set to true, then all caching functionality will be completely disabled, + # takes precedence over all other caching options. + # skip-cache: true + + # Optional: if set to true, then the action won't cache or restore ~/go/pkg. + # skip-pkg-cache: true + + # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build. + # skip-build-cache: true + + # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'. + # install-mode: "goinstall" diff --git a/.idea/aws.xml b/.idea/aws.xml new file mode 100644 index 000000000..ec328d0bb --- /dev/null +++ b/.idea/aws.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..6156ca4a4 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,204 @@ + + + + + + + + + + + { + "lastFilter": { + "state": "OPEN", + "assignee": "darrenvechain" + } +} + + + + + + + + + + + + + { + "associatedIndex": 7 +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + file://$PROJECT_DIR$/api/blocks/blocks.go + 121 + + + file://$PROJECT_DIR$/cmd/thor/flags.go + 62 + + + file://$PROJECT_DIR$/api/api.go + 62 + + + file://$PROJECT_DIR$/api/api.go + 61 + + + + + + + + \ No newline at end of file diff --git a/api/doc/thor.yaml b/api/doc/thor.yaml index d9e51ad16..6dd3eb2a6 100644 --- a/api/doc/thor.yaml +++ b/api/doc/thor.yaml @@ -29,7 +29,7 @@ tags: description: Subscribe interested subjects - name: Debug description: Debug utilities - + paths: /accounts/{address}: parameters: @@ -236,7 +236,7 @@ paths: schema: allOf: - $ref: '#/components/schemas/Receipt' - properties: + properties: meta: $ref: '#/components/schemas/ReceiptMeta' @@ -285,7 +285,7 @@ paths: - $ref: '#/components/schemas/IsFinalized' properties: transactions: - description: transaction IDs + description: transaction IDs type: array items: type: string @@ -400,7 +400,7 @@ paths: summary: (Websocket) Subscribe new blocks parameters: - $ref: '#/components/parameters/PositionInQuery' - + responses: '200': description: OK @@ -425,7 +425,7 @@ paths: summary: (Websocket) Subscribe new events description: | which satisfy criteria in query. - + parameters: - $ref: '#/components/parameters/PositionInQuery' - name: addr @@ -470,8 +470,8 @@ paths: properties: meta: $ref: '#/components/schemas/LogMeta' - - + + /subscriptions/transfer: get: tags: @@ -576,7 +576,7 @@ paths: schema: allOf: - $ref: '#/components/schemas/ClauseTracerOption' - - $ref: '#/components/schemas/TracerOption' + - $ref: '#/components/schemas/TracerOption' responses: '200': description: OK @@ -586,7 +586,7 @@ paths: type: object /debug/tracers/call: - post: + post: tags: - Debug summary: Create a tracer @@ -786,7 +786,7 @@ components: txsRoot: type: string format: bytes32 - description: root hash of transactions in the block + description: root hash of transactions in the block example: '0x89dfd9fcd10c9e53d68592cf8b540b280b72d381b868523223992f3e09a806bb' txsFeatures: type: integer @@ -986,7 +986,7 @@ components: gas: 50000 gasPrice: '1000000000000000' caller: '0x7567d83b7b8d80addcb281a71d54fc7b3364ffed' - + ExtendedCallData: properties: provedWork: @@ -1055,11 +1055,11 @@ components: clauses: - to: '0x5034aa590125b64023a0262112b98d72e3c8e40e' value: '0xde0b6b3a7640000' - data: '0x5665436861696e2054686f72' + data: '0x5665436861696e2054686f72' gas: 50000 gasPrice: '1000000000000000' caller: '0x7567d83b7b8d80addcb281a71d54fc7b3364ffed' - + BatchCallResult: type: array items: @@ -1103,12 +1103,12 @@ components: description: | defines the unit of `from` and `to`. `block` means block number, `time` means block timestamp, default to `block`. - + from: type: integer format: uint64 example: 0 - + to: type: integer format: uint64 @@ -1127,7 +1127,7 @@ components: ``` refers to the range from block 10 to block 1000. `null` stands for the full range. - + EventCriteria: properties: address: @@ -1156,7 +1156,7 @@ components: address: "0x0000000000000000000000000000456E65726779" topic0: '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef' topic1: '0x0000000000000000000000005034aa590125b64023a0262112b98d72e3c8e40e' - + EventFilter: properties: range: @@ -1174,7 +1174,7 @@ components: enum: - asc - desc - + TransferCriteria: properties: txOrigin: @@ -1204,7 +1204,7 @@ components: enum: - asc - desc - + PeerStats: properties: name: @@ -1235,15 +1235,15 @@ components: type: string example: id: '0x4de71f2d588aa8a1ea00fe8312d92966da424d9939a511fc0be81e65fad52af8' - - + + Obsolete: properties: obsolete: type: boolean description: | indicates whether the block containing this data become branch block - + ClauseTracerOption: properties: target: @@ -1346,7 +1346,7 @@ components: format: uint32 description: | the number of hash functions for bloom filter - example: 3 + example: 3 Beat2: allOf: @@ -1363,7 +1363,7 @@ components: isTrunk: type: boolean description: whether the block is on the trunk - + IsFinalized: properties: isFinalized: @@ -1452,7 +1452,7 @@ components: schema: type: string example: '0x9bcc6526a76ae560244f698805cc001977246cb92c2b4f1e2b7a204e445409ea' - + PositionInQuery: name: pos in: query From 939c3160f3d92671ddd2a2104e020b03715a2ee5 Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 20 Dec 2023 14:09:13 +0000 Subject: [PATCH 02/13] remove .idea and add to git ignore --- .gitignore | 4 +++- .idea/aws.xml | 17 ----------------- .idea/workspace.xml | 14 +++++++++++--- 3 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 .idea/aws.xml diff --git a/.gitignore b/.gitignore index 0d003a229..9515abbda 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,6 @@ package.json /.vscode/ /vendor/ -.fake_gopath_suffix \ No newline at end of file +.fake_gopath_suffix + +.idea diff --git a/.idea/aws.xml b/.idea/aws.xml deleted file mode 100644 index ec328d0bb..000000000 --- a/.idea/aws.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6156ca4a4..4915941a9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,11 @@