diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 35a27cfe7..05357c87c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,7 +7,7 @@
# global owners are only requested if there isn't a more specific
# codeowner specified below. For this reason, the global codeowners
# are often repeated in package-level definitions.
-* @ebuchman @cmwaters @tychoish @williambanfield @creachadair @sergio-mena @jmalicevic @thanethomson @ancazamfir
+* @ebuchman @cmwaters @tychoish @williambanfield @creachadair @sergio-mena @jmalicevic @thanethomson @ancazamfir @samricotta
# Spec related changes can be approved by the protocol design team
-/spec @josef-widder @milosevic @cason
+/spec @josef-widder @milosevic @cason @sergio-mena @jmalicevic
diff --git a/.github/workflows/e2e-manual.yml b/.github/workflows/e2e-manual.yml
index 6da4c3342..56a406b7a 100644
--- a/.github/workflows/e2e-manual.yml
+++ b/.github/workflows/e2e-manual.yml
@@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- group: ['00', '01', '02', '03']
+ group: ['00', '01', '02', '03', '04']
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
@@ -29,7 +29,7 @@ jobs:
- name: Generate testnets
working-directory: test/e2e
# When changing -g, also change the matrix groups above
- run: ./build/generator -g 4 -d networks/nightly/
+ run: ./build/generator -g 5 -d networks/nightly/
- name: Run ${{ matrix.p2p }} p2p testnets
working-directory: test/e2e
diff --git a/.github/workflows/e2e-nightly-36x.yml b/.github/workflows/e2e-nightly-36x.yml
index 2067602e7..9ac797146 100644
--- a/.github/workflows/e2e-nightly-36x.yml
+++ b/.github/workflows/e2e-nightly-36x.yml
@@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- group: ['00', '01', '02', '03']
+ group: ['00', '01', '02', '03', '04']
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
@@ -35,7 +35,7 @@ jobs:
- name: Generate testnets
working-directory: test/e2e
# When changing -g, also change the matrix groups above
- run: ./build/generator -g 4 -d networks/nightly
+ run: ./build/generator -g 5 -d networks/nightly
- name: Run testnets in group ${{ matrix.group }}
working-directory: test/e2e
diff --git a/.github/workflows/e2e-nightly-master.yml b/.github/workflows/e2e-nightly-master.yml
index 7fac05f2d..367364efb 100644
--- a/.github/workflows/e2e-nightly-master.yml
+++ b/.github/workflows/e2e-nightly-master.yml
@@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- group: ['00', '01', '02', '03']
+ group: ['00', '01', '02', '03', "04"]
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
@@ -34,7 +34,7 @@ jobs:
- name: Generate testnets
working-directory: test/e2e
# When changing -g, also change the matrix groups above
- run: ./build/generator -g 4 -d networks/nightly/
+ run: ./build/generator -g 5 -d networks/nightly/
- name: Run ${{ matrix.p2p }} p2p testnets
working-directory: test/e2e
diff --git a/.github/workflows/janitor.yml b/.github/workflows/janitor.yml
index e6bc45ec1..ceb21941d 100644
--- a/.github/workflows/janitor.yml
+++ b/.github/workflows/janitor.yml
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- - uses: styfle/cancel-workflow-action@0.9.1
+ - uses: styfle/cancel-workflow-action@0.10.0
with:
workflow_id: 1041851,1401230,2837803
access_token: ${{ github.token }}
diff --git a/.github/workflows/proto-lint.yml b/.github/workflows/proto-lint.yml
index f8fff89cc..377e43ca6 100644
--- a/.github/workflows/proto-lint.yml
+++ b/.github/workflows/proto-lint.yml
@@ -15,7 +15,7 @@ jobs:
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- - uses: bufbuild/buf-setup-action@v1.5.0
+ - uses: bufbuild/buf-setup-action@v1.6.0
- uses: bufbuild/buf-lint-action@v1
with:
input: 'proto'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e9e47e25b..26c7f4c50 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,44 +32,3 @@ jobs:
run: |
make test-group-${{ matrix.part }} NUM_SPLIT=6
if: env.GIT_DIFF
- - uses: actions/upload-artifact@v3
- with:
- name: "${{ github.sha }}-${{ matrix.part }}-coverage"
- path: ./build/${{ matrix.part }}.profile.out
-
- upload-coverage-report:
- runs-on: ubuntu-latest
- needs: tests
- steps:
- - uses: actions/checkout@v3
- - uses: technote-space/get-diff-action@v6
- with:
- PATTERNS: |
- **/**.go
- "!test/"
- go.mod
- go.sum
- Makefile
- - uses: actions/download-artifact@v3
- with:
- name: "${{ github.sha }}-00-coverage"
- if: env.GIT_DIFF
- - uses: actions/download-artifact@v3
- with:
- name: "${{ github.sha }}-01-coverage"
- if: env.GIT_DIFF
- - uses: actions/download-artifact@v3
- with:
- name: "${{ github.sha }}-02-coverage"
- if: env.GIT_DIFF
- - uses: actions/download-artifact@v3
- with:
- name: "${{ github.sha }}-03-coverage"
- if: env.GIT_DIFF
- - run: |
- cat ./*profile.out | grep -v "mode: set" >> coverage.txt
- if: env.GIT_DIFF
- - uses: codecov/codecov-action@v3.1.0
- with:
- file: ./coverage.txt
- if: env.GIT_DIFF
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b30abf02..127763e3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,88 @@
Friendly reminder: We have a [bug bounty program](https://hackerone.com/cosmos).
+## v0.35.9
+
+July 20, 2022
+
+This release fixes a deadlock that could occur in some cases when using the
+priority mempool with the ABCI socket client.
+
+### BUG FIXES
+
+- [mempool] [\#9030](https://github.com/tendermint/tendermint/pull/9030) rework lock discipline to mitigate callback deadlocks (@creachadair)
+
+
+## v0.35.8
+
+July 12, 2022
+
+Special thanks to external contributors on this release: @joeabbey
+
+This release fixes an unbounded heap growth issue in the implementation of the
+priority mempool, as well as some configuration, logging, and peer dialing
+improvements in the non-legacy p2p stack. It also adds a new opt-in
+"simple-priority" value for the `p2p.queue-type` setting, that should improve
+gossip performance for non-legacy peer networks.
+
+### BREAKING CHANGES
+
+- CLI/RPC/Config
+
+ - [node] [\#8902](https://github.com/tendermint/tendermint/pull/8902) Always start blocksync and avoid misconfiguration (@tychoish)
+
+### FEATURES
+
+- [cli] [\#8675](https://github.com/tendermint/tendermint/pull/8675) Add command to force compact goleveldb databases (@cmwaters)
+
+### IMPROVEMENTS
+
+- [p2p] [\#8914](https://github.com/tendermint/tendermint/pull/8914) [\#8875](https://github.com/tendermint/tendermint/pull/8875) Improvements to peer dialing (backported). (@tychoish)
+- [p2p] [\#8820](https://github.com/tendermint/tendermint/pull/8820) add eviction metrics and cleanup dialing error handling (backport #8819) (@tychoish)
+- [logging] [\#8896](https://github.com/tendermint/tendermint/pull/8896) Do not pre-process log results (backport #8895). (@tychoish)
+- [p2p] [\#8956](https://github.com/tendermint/tendermint/pull/8956) Simpler priority queue (backport #8929). (@tychoish)
+
+### BUG FIXES
+
+- [mempool] [\#8944](https://github.com/tendermint/tendermint/pull/8944) Fix unbounded heap growth in the priority mempool. (@creachadair)
+- [p2p] [\#8869](https://github.com/tendermint/tendermint/pull/8869) Set empty timeouts to configed values. (backport #8847). (@williambanfield)
+
+
+## v0.35.7
+
+June 16, 2022
+
+### BUG FIXES
+
+- [p2p] [\#8692](https://github.com/tendermint/tendermint/pull/8692) scale the number of stored peers by the configured maximum connections (#8684)
+- [rpc] [\#8715](https://github.com/tendermint/tendermint/pull/8715) always close http bodies (backport #8712)
+- [p2p] [\#8760](https://github.com/tendermint/tendermint/pull/8760) accept should not abort on first error (backport #8759)
+
+### BREAKING CHANGES
+
+- P2P Protocol
+
+ - [p2p] [\#8737](https://github.com/tendermint/tendermint/pull/8737) Introduce "inactive" peer label to avoid re-dialing incompatible peers. (@tychoish)
+ - [p2p] [\#8737](https://github.com/tendermint/tendermint/pull/8737) Increase frequency of dialing attempts to reduce latency for peer acquisition. (@tychoish)
+ - [p2p] [\#8737](https://github.com/tendermint/tendermint/pull/8737) Improvements to peer scoring and sorting to gossip a greater variety of peers during PEX. (@tychoish)
+ - [p2p] [\#8737](https://github.com/tendermint/tendermint/pull/8737) Track incoming and outgoing peers separately to ensure more peer slots open for incoming connections. (@tychoish)
+
+## v0.35.6
+
+June 3, 2022
+
+### FEATURES
+
+- [migrate] [\#8672](https://github.com/tendermint/tendermint/pull/8672) provide function for database production (backport #8614) (@tychoish)
+
+### BUG FIXES
+
+- [consensus] [\#8651](https://github.com/tendermint/tendermint/pull/8651) restructure peer catchup sleep (@tychoish)
+- [pex] [\#8657](https://github.com/tendermint/tendermint/pull/8657) align max address thresholds (@cmwaters)
+- [cmd] [\#8668](https://github.com/tendermint/tendermint/pull/8668) don't used global config for reset commands (@cmwaters)
+- [p2p] [\#8681](https://github.com/tendermint/tendermint/pull/8681) shed peers from store from other networks (backport #8678) (@tychoish)
+
+
## v0.35.5
May 26, 2022
@@ -665,7 +747,7 @@ Special thanks to external contributors on this release: @james-ray, @fedekunze,
- [light] [\#5347](https://github.com/tendermint/tendermint/pull/5347) `NewClient`, `NewHTTPClient`, `VerifyHeader` and `VerifyLightBlockAtHeight` now accept `context.Context` as 1st param (@melekes)
- [merkle] [\#5193](https://github.com/tendermint/tendermint/pull/5193) `HashFromByteSlices` and `ProofsFromByteSlices` now return a hash for empty inputs, following RFC6962 (@erikgrinaker)
- [proto] [\#5025](https://github.com/tendermint/tendermint/pull/5025) All proto files have been moved to `/proto` directory. (@marbar3778)
- - Using the recommended the file layout from buf, [see here for more info](https://buf.build/docs/lint-checkers#file_layout)
+ - Using the recommended the file layout from buf, [see here for more info](https://docs.buf.build/lint/rules)
- [rpc/client] [\#4947](https://github.com/tendermint/tendermint/pull/4947) `Validators`, `TxSearch` `page`/`per_page` params become pointers (@melekes)
- `UnconfirmedTxs` `limit` param is a pointer
- [rpc/jsonrpc/server] [\#5141](https://github.com/tendermint/tendermint/pull/5141) Remove `WriteRPCResponseArrayHTTP` (use `WriteRPCResponseHTTP` instead) (@melekes)
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index c3e191e7e..9936e1309 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -31,12 +31,19 @@ Special thanks to external contributors on this release:
- [abci] \#7984 Remove the locks preventing concurrent use of ABCI applications by Tendermint. (@tychoish)
- [abci] \#8605 Remove info, log, events, gasUsed and mempoolError fields from ResponseCheckTx as they are not used by Tendermint. (@jmalicevic)
- [abci] \#8664 Move `app_hash` parameter from `Commit` to `FinalizeBlock`. (@sergio-mena)
+ - [abci] \#8656 Added cli command for `PrepareProposal`. (@jmalicevic)
+ - [sink/psql] \#8637 tx_results emitted from psql sink are now json encoded, previously they were protobuf encoded
+ - [abci] \#8901 Added cli command for `ProcessProposal`. (@hvanz)
- P2P Protocol
- [p2p] \#7035 Remove legacy P2P routing implementation and associated configuration options. (@tychoish)
- [p2p] \#7265 Peer manager reduces peer score for each failed dial attempts for peers that have not successfully dialed. (@tychoish)
- [p2p] [\#7594](https://github.com/tendermint/tendermint/pull/7594) always advertise self, to enable mutual address discovery. (@altergui)
+ - [p2p] \#8737 Introduce "inactive" peer label to avoid re-dialing incompatible peers. (@tychoish)
+ - [p2p] \#8737 Increase frequency of dialing attempts to reduce latency for peer acquisition. (@tychoish)
+ - [p2p] \#8737 Improvements to peer scoring and sorting to gossip a greater variety of peers during PEX. (@tychoish)
+ - [p2p] \#8737 Track incoming and outgoing peers separately to ensure more peer slots open for incoming connections. (@tychoish)
- Go API
@@ -94,3 +101,4 @@ Special thanks to external contributors on this release:
- [cli] \#8276 scmigrate: ensure target key is correctly renamed. (@creachadair)
- [cli] \#8294 keymigrate: ensure block hash keys are correctly translated. (@creachadair)
- [cli] \#8352 keymigrate: ensure transaction hash keys are correctly translated. (@creachadair)
+- (indexer) \#8625 Fix overriding tx index of duplicated txs.
diff --git a/UPGRADING.md b/UPGRADING.md
index 13582e75b..f9122a5de 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -17,9 +17,9 @@ by Tendermint itself. Right now, we return a regular error when this happens.
#### ABCI++
For information on how ABCI++ works, see the
-[Specification](https://github.com/tendermint/tendermint/blob/master/spec/abci%2B%2B/README.md).
+[Specification](spec/abci%2B%2B/README.md).
In particular, the simplest way to upgrade your application is described
-[here](https://github.com/tendermint/tendermint/blob/master/spec/abci%2B%2B/abci++_tmint_expected_behavior_002_draft.md#adapting-existing-applications-that-use-abci).
+[here](spec/abci%2B%2B/abci++_tmint_expected_behavior.md#adapting-existing-applications-that-use-abci).
#### Moving the `app_hash` parameter
diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go
index b09f3c9a7..824bbb360 100644
--- a/abci/cmd/abci-cli/abci-cli.go
+++ b/abci/cmd/abci-cli/abci-cli.go
@@ -2,6 +2,7 @@ package main
import (
"bufio"
+ "bytes"
"encoding/hex"
"errors"
"fmt"
@@ -78,10 +79,11 @@ func RootCmmand(logger log.Logger) *cobra.Command {
// Structure for data passed to print response.
type response struct {
// generic abci response
- Data []byte
- Code uint32
- Info string
- Log string
+ Data []byte
+ Code uint32
+ Info string
+ Log string
+ Status int32
Query *queryResponse
}
@@ -130,6 +132,8 @@ func addCommands(cmd *cobra.Command, logger log.Logger) {
cmd.AddCommand(commitCmd)
cmd.AddCommand(versionCmd)
cmd.AddCommand(testCmd)
+ cmd.AddCommand(prepareProposalCmd)
+ cmd.AddCommand(processProposalCmd)
cmd.AddCommand(getQueryCmd())
// examples
@@ -170,7 +174,7 @@ This command opens an interactive console for running any of the other commands
without opening a new connection each time
`,
Args: cobra.ExactArgs(0),
- ValidArgs: []string{"echo", "info", "finalize_block", "check_tx", "commit", "query"},
+ ValidArgs: []string{"echo", "info", "query", "check_tx", "prepare_proposal", "process_proposal", "finalize_block", "commit"},
RunE: cmdConsole,
}
@@ -193,7 +197,7 @@ var finalizeBlockCmd = &cobra.Command{
Use: "finalize_block",
Short: "deliver a block of transactions to the application",
Long: "deliver a block of transactions to the application",
- Args: cobra.MinimumNArgs(1),
+ Args: cobra.MinimumNArgs(0),
RunE: cmdFinalizeBlock,
}
@@ -224,6 +228,22 @@ var versionCmd = &cobra.Command{
},
}
+var prepareProposalCmd = &cobra.Command{
+ Use: "prepare_proposal",
+ Short: "prepare proposal",
+ Long: "prepare proposal",
+ Args: cobra.MinimumNArgs(0),
+ RunE: cmdPrepareProposal,
+}
+
+var processProposalCmd = &cobra.Command{
+ Use: "process_proposal",
+ Short: "process proposal",
+ Long: "process proposal",
+ Args: cobra.MinimumNArgs(0),
+ RunE: cmdProcessProposal,
+}
+
func getQueryCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "query",
@@ -335,6 +355,18 @@ func cmdTest(cmd *cobra.Command, args []string) error {
}, nil, []byte{0, 0, 0, 0, 0, 0, 0, 5})
},
func() error { return servertest.Commit(ctx, client) },
+ func() error {
+ return servertest.PrepareProposal(ctx, client, [][]byte{
+ {0x01},
+ }, []types.TxRecord_TxAction{
+ types.TxRecord_UNMODIFIED,
+ }, nil)
+ },
+ func() error {
+ return servertest.ProcessProposal(ctx, client, [][]byte{
+ {0x01},
+ }, types.ResponseProcessProposal_ACCEPT)
+ },
})
}
@@ -435,6 +467,10 @@ func muxOnCommands(cmd *cobra.Command, pArgs []string) error {
return cmdInfo(cmd, actualArgs)
case "query":
return cmdQuery(cmd, actualArgs)
+ case "prepare_proposal":
+ return cmdPrepareProposal(cmd, actualArgs)
+ case "process_proposal":
+ return cmdProcessProposal(cmd, actualArgs)
default:
return cmdUnimplemented(cmd, pArgs)
}
@@ -498,13 +534,6 @@ const codeBad uint32 = 10
// Append new txs to application
func cmdFinalizeBlock(cmd *cobra.Command, args []string) error {
- if len(args) == 0 {
- printResponse(cmd, args, response{
- Code: codeBad,
- Log: "Must provide at least one transaction",
- })
- return nil
- }
txs := make([][]byte, len(args))
for i, arg := range args {
txBytes, err := stringOrHexToBytes(arg)
@@ -605,6 +634,81 @@ func cmdQuery(cmd *cobra.Command, args []string) error {
return nil
}
+func inTxArray(txByteArray [][]byte, tx []byte) bool {
+ for _, txTmp := range txByteArray {
+ if bytes.Equal(txTmp, tx) {
+ return true
+ }
+
+ }
+ return false
+}
+
+func cmdPrepareProposal(cmd *cobra.Command, args []string) error {
+ txsBytesArray := make([][]byte, len(args))
+
+ for i, arg := range args {
+ txBytes, err := stringOrHexToBytes(arg)
+ if err != nil {
+ return err
+ }
+ txsBytesArray[i] = txBytes
+ }
+
+ res, err := client.PrepareProposal(cmd.Context(), &types.RequestPrepareProposal{
+ Txs: txsBytesArray,
+ // kvstore has to have this parameter in order not to reject a tx as the default value is 0
+ MaxTxBytes: 65536,
+ })
+ if err != nil {
+ return err
+ }
+ resps := make([]response, 0, len(res.TxResults)+1)
+ for _, tx := range res.TxRecords {
+ existingTx := inTxArray(txsBytesArray, tx.Tx)
+ if tx.Action == types.TxRecord_UNKNOWN ||
+ (existingTx && tx.Action == types.TxRecord_ADDED) ||
+ (!existingTx && (tx.Action == types.TxRecord_UNMODIFIED || tx.Action == types.TxRecord_REMOVED)) {
+ resps = append(resps, response{
+ Code: codeBad,
+ Log: "Failed. Tx: " + string(tx.GetTx()) + " action: " + tx.Action.String(),
+ })
+ } else {
+ resps = append(resps, response{
+ Code: code.CodeTypeOK,
+ Log: "Succeeded. Tx: " + string(tx.Tx) + " action: " + tx.Action.String(),
+ })
+ }
+ }
+
+ printResponse(cmd, args, resps...)
+ return nil
+}
+
+func cmdProcessProposal(cmd *cobra.Command, args []string) error {
+ txsBytesArray := make([][]byte, len(args))
+
+ for i, arg := range args {
+ txBytes, err := stringOrHexToBytes(arg)
+ if err != nil {
+ return err
+ }
+ txsBytesArray[i] = txBytes
+ }
+
+ res, err := client.ProcessProposal(cmd.Context(), &types.RequestProcessProposal{
+ Txs: txsBytesArray,
+ })
+ if err != nil {
+ return err
+ }
+
+ printResponse(cmd, args, response{
+ Status: int32(res.Status),
+ })
+ return nil
+}
+
func makeKVStoreCmd(logger log.Logger) func(*cobra.Command, []string) error {
return func(cmd *cobra.Command, args []string) error {
// Create the application - in memory or persisted to disk
@@ -649,7 +753,6 @@ func printResponse(cmd *cobra.Command, args []string, rsps ...response) {
fmt.Printf("-> code: OK\n")
} else {
fmt.Printf("-> code: %d\n", rsp.Code)
-
}
if len(rsp.Data) != 0 {
@@ -663,6 +766,9 @@ func printResponse(cmd *cobra.Command, args []string, rsps ...response) {
if rsp.Log != "" {
fmt.Printf("-> log: %s\n", rsp.Log)
}
+ if cmd.Use == "process_proposal" {
+ fmt.Printf("-> status: %s\n", types.ResponseProcessProposal_ProposalStatus_name[rsp.Status])
+ }
if rsp.Query != nil {
fmt.Printf("-> height: %d\n", rsp.Query.Height)
diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go
index bbb2fbe34..c1005eb86 100644
--- a/abci/example/kvstore/kvstore.go
+++ b/abci/example/kvstore/kvstore.go
@@ -175,7 +175,7 @@ func (app *Application) FinalizeBlock(_ context.Context, req *types.RequestFinal
app.ValUpdates = make([]types.ValidatorUpdate, 0)
// Punish validators who committed equivocation.
- for _, ev := range req.ByzantineValidators {
+ for _, ev := range req.Misbehavior {
if ev.Type == types.MisbehaviorType_DUPLICATE_VOTE {
addr := string(ev.Validator.Address)
if pubKey, ok := app.valAddrToPubKeyMap[addr]; ok {
@@ -293,7 +293,7 @@ func (app *Application) PrepareProposal(_ context.Context, req *types.RequestPre
func (*Application) ProcessProposal(_ context.Context, req *types.RequestProcessProposal) (*types.ResponseProcessProposal, error) {
for _, tx := range req.Txs {
- if len(tx) == 0 {
+ if len(tx) == 0 || isPrepareTx(tx) {
return &types.ResponseProcessProposal{Status: types.ResponseProcessProposal_REJECT}, nil
}
}
diff --git a/abci/tests/server/client.go b/abci/tests/server/client.go
index cddb42ec0..eb5649d9e 100644
--- a/abci/tests/server/client.go
+++ b/abci/tests/server/client.go
@@ -70,6 +70,32 @@ func FinalizeBlock(ctx context.Context, client abciclient.Client, txBytes [][]by
return nil
}
+func PrepareProposal(ctx context.Context, client abciclient.Client, txBytes [][]byte, codeExp []types.TxRecord_TxAction, dataExp []byte) error {
+ res, _ := client.PrepareProposal(ctx, &types.RequestPrepareProposal{Txs: txBytes})
+ for i, tx := range res.TxRecords {
+ if tx.Action != codeExp[i] {
+ fmt.Println("Failed test: PrepareProposal")
+ fmt.Printf("PrepareProposal response code was unexpected. Got %v expected %v.",
+ tx.Action, codeExp)
+ return errors.New("PrepareProposal error")
+ }
+ }
+ fmt.Println("Passed test: PrepareProposal")
+ return nil
+}
+
+func ProcessProposal(ctx context.Context, client abciclient.Client, txBytes [][]byte, statusExp types.ResponseProcessProposal_ProposalStatus) error {
+ res, _ := client.ProcessProposal(ctx, &types.RequestProcessProposal{Txs: txBytes})
+ if res.Status != statusExp {
+ fmt.Println("Failed test: ProcessProposal")
+ fmt.Printf("ProcessProposal response status was unexpected. Got %v expected %v.",
+ res.Status, statusExp)
+ return errors.New("ProcessProposal error")
+ }
+ fmt.Println("Passed test: ProcessProposal")
+ return nil
+}
+
func CheckTx(ctx context.Context, client abciclient.Client, txBytes []byte, codeExp uint32, dataExp []byte) error {
res, _ := client.CheckTx(ctx, &types.RequestCheckTx{Tx: txBytes})
code, data := res.Code, res.Data
diff --git a/abci/tests/test_cli/ex1.abci b/abci/tests/test_cli/ex1.abci
index 56355dc94..eba06028a 100644
--- a/abci/tests/test_cli/ex1.abci
+++ b/abci/tests/test_cli/ex1.abci
@@ -1,5 +1,7 @@
echo hello
info
+prepare_proposal "abc"
+process_proposal "abc"
finalize_block "abc"
commit
info
@@ -7,3 +9,10 @@ query "abc"
finalize_block "def=xyz" "ghi=123"
commit
query "def"
+prepare_proposal "preparedef"
+process_proposal "def"
+process_proposal "preparedef"
+prepare_proposal
+process_proposal
+finalize_block
+commit
\ No newline at end of file
diff --git a/abci/tests/test_cli/ex1.abci.out b/abci/tests/test_cli/ex1.abci.out
index 9a35290b0..fb3ababfa 100644
--- a/abci/tests/test_cli/ex1.abci.out
+++ b/abci/tests/test_cli/ex1.abci.out
@@ -8,6 +8,14 @@
-> data: {"size":0}
-> data.hex: 0x7B2273697A65223A307D
+> prepare_proposal "abc"
+-> code: OK
+-> log: Succeeded. Tx: abc action: UNMODIFIED
+
+> process_proposal "abc"
+-> code: OK
+-> status: ACCEPT
+
> finalize_block "abc"
-> code: OK
-> code: OK
@@ -48,3 +56,30 @@
-> value: xyz
-> value.hex: 78797A
+> prepare_proposal "preparedef"
+-> code: OK
+-> log: Succeeded. Tx: def action: ADDED
+-> code: OK
+-> log: Succeeded. Tx: preparedef action: REMOVED
+
+> process_proposal "def"
+-> code: OK
+-> status: ACCEPT
+
+> process_proposal "preparedef"
+-> code: OK
+-> status: REJECT
+
+> prepare_proposal
+
+> process_proposal
+-> code: OK
+-> status: ACCEPT
+
+> finalize_block
+-> code: OK
+-> data.hex: 0x0600000000000000
+
+> commit
+-> code: OK
+
diff --git a/abci/tests/test_cli/test.sh b/abci/tests/test_cli/test.sh
index 9c02ce6f5..d160d59c9 100755
--- a/abci/tests/test_cli/test.sh
+++ b/abci/tests/test_cli/test.sh
@@ -30,6 +30,8 @@ function testExample() {
cat "${INPUT}.out.new"
echo "Expected:"
cat "${INPUT}.out"
+ echo "Diff:"
+ diff "${INPUT}.out" "${INPUT}.out.new"
exit 1
fi
diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go
index 946cfa6af..9ce88f045 100644
--- a/abci/types/types.pb.go
+++ b/abci/types/types.pb.go
@@ -1120,12 +1120,12 @@ type RequestPrepareProposal struct {
MaxTxBytes int64 `protobuf:"varint,1,opt,name=max_tx_bytes,json=maxTxBytes,proto3" json:"max_tx_bytes,omitempty"`
// txs is an array of transactions that will be included in a block,
// sent to the app for possible modifications.
- Txs [][]byte `protobuf:"bytes,2,rep,name=txs,proto3" json:"txs,omitempty"`
- LocalLastCommit ExtendedCommitInfo `protobuf:"bytes,3,opt,name=local_last_commit,json=localLastCommit,proto3" json:"local_last_commit"`
- ByzantineValidators []Misbehavior `protobuf:"bytes,4,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"`
- Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
- Time time.Time `protobuf:"bytes,6,opt,name=time,proto3,stdtime" json:"time"`
- NextValidatorsHash []byte `protobuf:"bytes,7,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"`
+ Txs [][]byte `protobuf:"bytes,2,rep,name=txs,proto3" json:"txs,omitempty"`
+ LocalLastCommit ExtendedCommitInfo `protobuf:"bytes,3,opt,name=local_last_commit,json=localLastCommit,proto3" json:"local_last_commit"`
+ Misbehavior []Misbehavior `protobuf:"bytes,4,rep,name=misbehavior,proto3" json:"misbehavior"`
+ Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
+ Time time.Time `protobuf:"bytes,6,opt,name=time,proto3,stdtime" json:"time"`
+ NextValidatorsHash []byte `protobuf:"bytes,7,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"`
// address of the public key of the validator proposing the block.
ProposerAddress []byte `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"`
}
@@ -1184,9 +1184,9 @@ func (m *RequestPrepareProposal) GetLocalLastCommit() ExtendedCommitInfo {
return ExtendedCommitInfo{}
}
-func (m *RequestPrepareProposal) GetByzantineValidators() []Misbehavior {
+func (m *RequestPrepareProposal) GetMisbehavior() []Misbehavior {
if m != nil {
- return m.ByzantineValidators
+ return m.Misbehavior
}
return nil
}
@@ -1220,9 +1220,9 @@ func (m *RequestPrepareProposal) GetProposerAddress() []byte {
}
type RequestProcessProposal struct {
- Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
- ProposedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=proposed_last_commit,json=proposedLastCommit,proto3" json:"proposed_last_commit"`
- ByzantineValidators []Misbehavior `protobuf:"bytes,3,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"`
+ Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
+ ProposedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=proposed_last_commit,json=proposedLastCommit,proto3" json:"proposed_last_commit"`
+ Misbehavior []Misbehavior `protobuf:"bytes,3,rep,name=misbehavior,proto3" json:"misbehavior"`
// hash is the merkle root hash of the fields of the proposed block.
Hash []byte `protobuf:"bytes,4,opt,name=hash,proto3" json:"hash,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
@@ -1279,9 +1279,9 @@ func (m *RequestProcessProposal) GetProposedLastCommit() CommitInfo {
return CommitInfo{}
}
-func (m *RequestProcessProposal) GetByzantineValidators() []Misbehavior {
+func (m *RequestProcessProposal) GetMisbehavior() []Misbehavior {
if m != nil {
- return m.ByzantineValidators
+ return m.Misbehavior
}
return nil
}
@@ -1444,10 +1444,10 @@ func (m *RequestVerifyVoteExtension) GetVoteExtension() []byte {
}
type RequestFinalizeBlock struct {
- Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
- DecidedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=decided_last_commit,json=decidedLastCommit,proto3" json:"decided_last_commit"`
- ByzantineValidators []Misbehavior `protobuf:"bytes,3,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"`
- // hash is the merkle root hash of the fields of the proposed block.
+ Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
+ DecidedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=decided_last_commit,json=decidedLastCommit,proto3" json:"decided_last_commit"`
+ Misbehavior []Misbehavior `protobuf:"bytes,3,rep,name=misbehavior,proto3" json:"misbehavior"`
+ // hash is the merkle root hash of the fields of the decided block.
Hash []byte `protobuf:"bytes,4,opt,name=hash,proto3" json:"hash,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
Time time.Time `protobuf:"bytes,6,opt,name=time,proto3,stdtime" json:"time"`
@@ -1503,9 +1503,9 @@ func (m *RequestFinalizeBlock) GetDecidedLastCommit() CommitInfo {
return CommitInfo{}
}
-func (m *RequestFinalizeBlock) GetByzantineValidators() []Misbehavior {
+func (m *RequestFinalizeBlock) GetMisbehavior() []Misbehavior {
if m != nil {
- return m.ByzantineValidators
+ return m.Misbehavior
}
return nil
}
@@ -2381,7 +2381,6 @@ func (m *ResponseDeliverTx) GetCodespace() string {
}
type ResponseCommit struct {
- // reserve 1
RetainHeight int64 `protobuf:"varint,3,opt,name=retain_height,json=retainHeight,proto3" json:"retain_height,omitempty"`
}
@@ -3829,211 +3828,211 @@ func init() {
func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) }
var fileDescriptor_252557cfdd89a31a = []byte{
- // 3253 bytes of a gzipped FileDescriptorProto
+ // 3257 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x73, 0x23, 0xd5,
- 0x11, 0xd7, 0xe8, 0x5b, 0xad, 0xaf, 0xf1, 0xb3, 0x59, 0xb4, 0x62, 0xd7, 0x36, 0x43, 0x01, 0xcb,
- 0x02, 0x36, 0xf1, 0x66, 0x61, 0xc9, 0x42, 0x28, 0x5b, 0xd6, 0x46, 0xf6, 0x7a, 0x6d, 0x33, 0x96,
- 0x4d, 0x91, 0x0f, 0x86, 0xb1, 0xf4, 0x6c, 0x0d, 0x2b, 0x69, 0x86, 0x99, 0x91, 0x91, 0x39, 0x26,
- 0xc5, 0x85, 0x43, 0x8a, 0x4b, 0x2a, 0x49, 0x55, 0xb8, 0x25, 0x55, 0xc9, 0x7f, 0x90, 0x5c, 0x72,
- 0xca, 0x81, 0x43, 0x0e, 0x9c, 0x52, 0x39, 0x91, 0x14, 0xdc, 0xf8, 0x07, 0x72, 0x4b, 0xa5, 0xde,
- 0xc7, 0x7c, 0x49, 0x33, 0xfa, 0x00, 0x8a, 0xaa, 0x54, 0x71, 0x9b, 0xd7, 0xd3, 0xdd, 0xef, 0xab,
- 0x5f, 0x77, 0xff, 0xfa, 0x3d, 0x78, 0xcc, 0xc6, 0xfd, 0x36, 0x36, 0x7b, 0x5a, 0xdf, 0x5e, 0x57,
- 0x4f, 0x5b, 0xda, 0xba, 0x7d, 0x69, 0x60, 0x6b, 0xcd, 0x30, 0x75, 0x5b, 0x47, 0x65, 0xef, 0xe7,
- 0x1a, 0xf9, 0x59, 0xbd, 0xee, 0xe3, 0x6e, 0x99, 0x97, 0x86, 0xad, 0xaf, 0x1b, 0xa6, 0xae, 0x9f,
- 0x31, 0xfe, 0xea, 0xb5, 0xf1, 0xdf, 0x0f, 0xf1, 0x25, 0xd7, 0x16, 0x10, 0xa6, 0xbd, 0xac, 0x1b,
- 0xaa, 0xa9, 0xf6, 0x9c, 0xdf, 0x2b, 0xe7, 0xba, 0x7e, 0xde, 0xc5, 0xeb, 0xb4, 0x75, 0x3a, 0x38,
- 0x5b, 0xb7, 0xb5, 0x1e, 0xb6, 0x6c, 0xb5, 0x67, 0x70, 0x86, 0xa5, 0x73, 0xfd, 0x5c, 0xa7, 0x9f,
- 0xeb, 0xe4, 0x8b, 0x51, 0xa5, 0xbf, 0xe4, 0x20, 0x23, 0xe3, 0x77, 0x07, 0xd8, 0xb2, 0xd1, 0x06,
- 0x24, 0x71, 0xab, 0xa3, 0x57, 0x84, 0x55, 0xe1, 0x46, 0x7e, 0xe3, 0xda, 0xda, 0xc8, 0xf0, 0xd7,
- 0x38, 0x5f, 0xbd, 0xd5, 0xd1, 0x1b, 0x31, 0x99, 0xf2, 0xa2, 0xdb, 0x90, 0x3a, 0xeb, 0x0e, 0xac,
- 0x4e, 0x25, 0x4e, 0x85, 0xae, 0x47, 0x09, 0xdd, 0x23, 0x4c, 0x8d, 0x98, 0xcc, 0xb8, 0x49, 0x57,
- 0x5a, 0xff, 0x4c, 0xaf, 0x24, 0x26, 0x77, 0xb5, 0xd3, 0x3f, 0xa3, 0x5d, 0x11, 0x5e, 0xb4, 0x05,
- 0xa0, 0xf5, 0x35, 0x5b, 0x69, 0x75, 0x54, 0xad, 0x5f, 0x49, 0x52, 0xc9, 0xc7, 0xa3, 0x25, 0x35,
- 0xbb, 0x46, 0x18, 0x1b, 0x31, 0x39, 0xa7, 0x39, 0x0d, 0x32, 0xdc, 0x77, 0x07, 0xd8, 0xbc, 0xac,
- 0xa4, 0x26, 0x0f, 0xf7, 0x75, 0xc2, 0x44, 0x86, 0x4b, 0xb9, 0xd1, 0x2b, 0x90, 0x6d, 0x75, 0x70,
- 0xeb, 0xa1, 0x62, 0x0f, 0x2b, 0x19, 0x2a, 0xb9, 0x12, 0x25, 0x59, 0x23, 0x7c, 0xcd, 0x61, 0x23,
- 0x26, 0x67, 0x5a, 0xec, 0x13, 0xdd, 0x81, 0x74, 0x4b, 0xef, 0xf5, 0x34, 0xbb, 0x02, 0x54, 0x76,
- 0x39, 0x52, 0x96, 0x72, 0x35, 0x62, 0x32, 0xe7, 0x47, 0xfb, 0x50, 0xea, 0x6a, 0x96, 0xad, 0x58,
- 0x7d, 0xd5, 0xb0, 0x3a, 0xba, 0x6d, 0x55, 0xf2, 0x54, 0xc3, 0x93, 0x51, 0x1a, 0xf6, 0x34, 0xcb,
- 0x3e, 0x72, 0x98, 0x1b, 0x31, 0xb9, 0xd8, 0xf5, 0x13, 0x88, 0x3e, 0xfd, 0xec, 0x0c, 0x9b, 0xae,
- 0xc2, 0x4a, 0x61, 0xb2, 0xbe, 0x03, 0xc2, 0xed, 0xc8, 0x13, 0x7d, 0xba, 0x9f, 0x80, 0x7e, 0x02,
- 0x8b, 0x5d, 0x5d, 0x6d, 0xbb, 0xea, 0x94, 0x56, 0x67, 0xd0, 0x7f, 0x58, 0x29, 0x52, 0xa5, 0xcf,
- 0x44, 0x0e, 0x52, 0x57, 0xdb, 0x8e, 0x8a, 0x1a, 0x11, 0x68, 0xc4, 0xe4, 0x85, 0xee, 0x28, 0x11,
- 0xbd, 0x05, 0x4b, 0xaa, 0x61, 0x74, 0x2f, 0x47, 0xb5, 0x97, 0xa8, 0xf6, 0x9b, 0x51, 0xda, 0x37,
- 0x89, 0xcc, 0xa8, 0x7a, 0xa4, 0x8e, 0x51, 0x51, 0x13, 0x44, 0xc3, 0xc4, 0x86, 0x6a, 0x62, 0xc5,
- 0x30, 0x75, 0x43, 0xb7, 0xd4, 0x6e, 0xa5, 0x4c, 0x75, 0x3f, 0x1d, 0xa5, 0xfb, 0x90, 0xf1, 0x1f,
- 0x72, 0xf6, 0x46, 0x4c, 0x2e, 0x1b, 0x41, 0x12, 0xd3, 0xaa, 0xb7, 0xb0, 0x65, 0x79, 0x5a, 0xc5,
- 0x69, 0x5a, 0x29, 0x7f, 0x50, 0x6b, 0x80, 0x84, 0xea, 0x90, 0xc7, 0x43, 0x22, 0xae, 0x5c, 0xe8,
- 0x36, 0xae, 0x2c, 0x50, 0x85, 0x52, 0xe4, 0x09, 0xa5, 0xac, 0x27, 0xba, 0x8d, 0x1b, 0x31, 0x19,
- 0xb0, 0xdb, 0x42, 0x2a, 0x3c, 0x72, 0x81, 0x4d, 0xed, 0xec, 0x92, 0xaa, 0x51, 0xe8, 0x1f, 0x4b,
- 0xd3, 0xfb, 0x15, 0x44, 0x15, 0x3e, 0x1b, 0xa5, 0xf0, 0x84, 0x0a, 0x11, 0x15, 0x75, 0x47, 0xa4,
- 0x11, 0x93, 0x17, 0x2f, 0xc6, 0xc9, 0xc4, 0xc4, 0xce, 0xb4, 0xbe, 0xda, 0xd5, 0xde, 0xc7, 0xca,
- 0x69, 0x57, 0x6f, 0x3d, 0xac, 0x2c, 0x4e, 0x36, 0xb1, 0x7b, 0x9c, 0x7b, 0x8b, 0x30, 0x13, 0x13,
- 0x3b, 0xf3, 0x13, 0xb6, 0x32, 0x90, 0xba, 0x50, 0xbb, 0x03, 0xbc, 0x9b, 0xcc, 0xa6, 0xc5, 0xcc,
- 0x6e, 0x32, 0x9b, 0x15, 0x73, 0xbb, 0xc9, 0x6c, 0x4e, 0x04, 0xe9, 0x69, 0xc8, 0xfb, 0x5c, 0x12,
- 0xaa, 0x40, 0xa6, 0x87, 0x2d, 0x4b, 0x3d, 0xc7, 0xd4, 0x83, 0xe5, 0x64, 0xa7, 0x29, 0x95, 0xa0,
- 0xe0, 0x77, 0x43, 0xd2, 0x47, 0x82, 0x2b, 0x49, 0x3c, 0x0c, 0x91, 0xbc, 0xc0, 0x26, 0x5d, 0x08,
- 0x2e, 0xc9, 0x9b, 0xe8, 0x09, 0x28, 0xd2, 0x49, 0x28, 0xce, 0x7f, 0xe2, 0xe6, 0x92, 0x72, 0x81,
- 0x12, 0x4f, 0x38, 0xd3, 0x0a, 0xe4, 0x8d, 0x0d, 0xc3, 0x65, 0x49, 0x50, 0x16, 0x30, 0x36, 0x0c,
- 0x87, 0xe1, 0x71, 0x28, 0x90, 0x19, 0xbb, 0x1c, 0x49, 0xda, 0x49, 0x9e, 0xd0, 0x38, 0x8b, 0xf4,
- 0xf7, 0x38, 0x88, 0xa3, 0xae, 0x0b, 0xdd, 0x81, 0x24, 0xf1, 0xe2, 0xdc, 0x21, 0x57, 0xd7, 0x98,
- 0x8b, 0x5f, 0x73, 0x5c, 0xfc, 0x5a, 0xd3, 0x71, 0xf1, 0x5b, 0xd9, 0x4f, 0x3e, 0x5b, 0x89, 0x7d,
- 0xf4, 0xaf, 0x15, 0x41, 0xa6, 0x12, 0xe8, 0x2a, 0x71, 0x58, 0xaa, 0xd6, 0x57, 0xb4, 0x36, 0x1d,
- 0x72, 0x8e, 0x78, 0x23, 0x55, 0xeb, 0xef, 0xb4, 0xd1, 0x1e, 0x88, 0x2d, 0xbd, 0x6f, 0xe1, 0xbe,
- 0x35, 0xb0, 0x14, 0x16, 0x42, 0xb8, 0x1b, 0x0e, 0x38, 0x53, 0x16, 0xc8, 0x6a, 0x0e, 0xe7, 0x21,
- 0x65, 0x94, 0xcb, 0xad, 0x20, 0x01, 0xdd, 0x03, 0xb8, 0x50, 0xbb, 0x5a, 0x5b, 0xb5, 0x75, 0xd3,
- 0xaa, 0x24, 0x57, 0x13, 0x37, 0xf2, 0x1b, 0xab, 0x63, 0x5b, 0x7d, 0xe2, 0xb0, 0x1c, 0x1b, 0x6d,
- 0xd5, 0xc6, 0x5b, 0x49, 0x32, 0x5c, 0xd9, 0x27, 0x89, 0x9e, 0x82, 0xb2, 0x6a, 0x18, 0x8a, 0x65,
- 0xab, 0x36, 0x56, 0x4e, 0x2f, 0x6d, 0x6c, 0x51, 0x17, 0x5d, 0x90, 0x8b, 0xaa, 0x61, 0x1c, 0x11,
- 0xea, 0x16, 0x21, 0xa2, 0x27, 0xa1, 0x44, 0xbc, 0xb9, 0xa6, 0x76, 0x95, 0x0e, 0xd6, 0xce, 0x3b,
- 0x76, 0x25, 0xbd, 0x2a, 0xdc, 0x48, 0xc8, 0x45, 0x4e, 0x6d, 0x50, 0xa2, 0xd4, 0x76, 0x77, 0x9c,
- 0x7a, 0x72, 0x84, 0x20, 0xd9, 0x56, 0x6d, 0x95, 0xae, 0x64, 0x41, 0xa6, 0xdf, 0x84, 0x66, 0xa8,
- 0x76, 0x87, 0xaf, 0x0f, 0xfd, 0x46, 0x57, 0x20, 0xcd, 0xd5, 0x26, 0xa8, 0x5a, 0xde, 0x42, 0x4b,
- 0x90, 0x32, 0x4c, 0xfd, 0x02, 0xd3, 0xad, 0xcb, 0xca, 0xac, 0x21, 0xc9, 0x50, 0x0a, 0x7a, 0x7d,
- 0x54, 0x82, 0xb8, 0x3d, 0xe4, 0xbd, 0xc4, 0xed, 0x21, 0x7a, 0x01, 0x92, 0x64, 0x21, 0x69, 0x1f,
- 0xa5, 0x90, 0x38, 0xc7, 0xe5, 0x9a, 0x97, 0x06, 0x96, 0x29, 0xa7, 0x54, 0x86, 0x62, 0x20, 0x1a,
- 0x48, 0x57, 0x60, 0x29, 0xcc, 0xb9, 0x4b, 0x1d, 0x97, 0x1e, 0x70, 0xd2, 0xe8, 0x36, 0x64, 0x5d,
- 0xef, 0xce, 0x0c, 0xe7, 0xea, 0x58, 0xb7, 0x0e, 0xb3, 0xec, 0xb2, 0x12, 0x8b, 0x21, 0x1b, 0xd0,
- 0x51, 0x79, 0x2c, 0x2f, 0xc8, 0x19, 0xd5, 0x30, 0x1a, 0xaa, 0xd5, 0x91, 0xde, 0x86, 0x4a, 0x94,
- 0xe7, 0xf6, 0x2d, 0x98, 0x40, 0xcd, 0xde, 0x59, 0xb0, 0x2b, 0x90, 0x3e, 0xd3, 0xcd, 0x9e, 0x6a,
- 0x53, 0x65, 0x45, 0x99, 0xb7, 0xc8, 0x42, 0x32, 0x2f, 0x9e, 0xa0, 0x64, 0xd6, 0x90, 0x14, 0xb8,
- 0x1a, 0xe9, 0xbd, 0x89, 0x88, 0xd6, 0x6f, 0x63, 0xb6, 0xac, 0x45, 0x99, 0x35, 0x3c, 0x45, 0x6c,
- 0xb0, 0xac, 0x41, 0xba, 0xb5, 0xe8, 0x5c, 0xa9, 0xfe, 0x9c, 0xcc, 0x5b, 0xd2, 0x9f, 0x12, 0x70,
- 0x25, 0xdc, 0x87, 0xa3, 0x55, 0x28, 0xf4, 0xd4, 0xa1, 0x62, 0x0f, 0xb9, 0xd9, 0x09, 0x74, 0xe3,
- 0xa1, 0xa7, 0x0e, 0x9b, 0x43, 0x66, 0x73, 0x22, 0x24, 0xec, 0xa1, 0x55, 0x89, 0xaf, 0x26, 0x6e,
- 0x14, 0x64, 0xf2, 0x89, 0x8e, 0x61, 0xa1, 0xab, 0xb7, 0xd4, 0xae, 0xd2, 0x55, 0x2d, 0x5b, 0xe1,
- 0xc1, 0x9d, 0x1d, 0xa2, 0x27, 0xc6, 0x16, 0x9b, 0x79, 0x63, 0xdc, 0x66, 0xfb, 0x49, 0x1c, 0x0e,
- 0xb7, 0xff, 0x32, 0xd5, 0xb1, 0xa7, 0x3a, 0x5b, 0x8d, 0x8e, 0x61, 0xe9, 0xf4, 0xf2, 0x7d, 0xb5,
- 0x6f, 0x6b, 0x7d, 0xac, 0x8c, 0x1d, 0xab, 0x71, 0xeb, 0x79, 0xa0, 0x59, 0xa7, 0xb8, 0xa3, 0x5e,
- 0x68, 0xba, 0xc9, 0x55, 0x2e, 0xba, 0xf2, 0x27, 0xde, 0xd9, 0xf2, 0xf6, 0x28, 0x15, 0x30, 0x6a,
- 0xc7, 0xbd, 0xa4, 0xe7, 0x76, 0x2f, 0x2f, 0xc0, 0x52, 0x1f, 0x0f, 0x6d, 0xdf, 0x18, 0x99, 0xe1,
- 0x64, 0xe8, 0x5e, 0x20, 0xf2, 0xcf, 0xeb, 0x9f, 0xd8, 0x10, 0x7a, 0x86, 0x86, 0x45, 0x43, 0xb7,
- 0xb0, 0xa9, 0xa8, 0xed, 0xb6, 0x89, 0x2d, 0xab, 0x92, 0xa5, 0xdc, 0x65, 0x87, 0xbe, 0xc9, 0xc8,
- 0xd2, 0x6f, 0xfd, 0x7b, 0x15, 0x0c, 0x83, 0x7c, 0x27, 0x04, 0x6f, 0x27, 0x8e, 0x60, 0x89, 0xcb,
- 0xb7, 0x03, 0x9b, 0xc1, 0xd2, 0xd1, 0xc7, 0xc6, 0x0f, 0xdc, 0xe8, 0x26, 0x20, 0x47, 0x7c, 0x86,
- 0x7d, 0x48, 0x7c, 0xbd, 0x7d, 0x40, 0x90, 0xa4, 0xab, 0x94, 0x64, 0x4e, 0x88, 0x7c, 0xff, 0xbf,
- 0xed, 0xcd, 0x6b, 0xb0, 0x30, 0x96, 0x63, 0xb8, 0xf3, 0x12, 0x42, 0xe7, 0x15, 0xf7, 0xcf, 0x4b,
- 0xfa, 0x9d, 0x00, 0xd5, 0xe8, 0xa4, 0x22, 0x54, 0xd5, 0xb3, 0xb0, 0xe0, 0xce, 0xc5, 0x1d, 0x1f,
- 0x3b, 0xf5, 0xa2, 0xfb, 0x83, 0x0f, 0x30, 0xd2, 0x81, 0x3f, 0x09, 0xa5, 0x91, 0x94, 0x87, 0xed,
- 0x42, 0xf1, 0xc2, 0xdf, 0xbf, 0xf4, 0xab, 0x84, 0xeb, 0x55, 0x03, 0x79, 0x49, 0x88, 0xe5, 0xbd,
- 0x0e, 0x8b, 0x6d, 0xdc, 0xd2, 0xda, 0x5f, 0xd5, 0xf0, 0x16, 0xb8, 0xf4, 0x77, 0x76, 0x37, 0x83,
- 0xdd, 0xfd, 0x12, 0x20, 0x2b, 0x63, 0xcb, 0x20, 0xd9, 0x07, 0xda, 0x82, 0x1c, 0x1e, 0xb6, 0xb0,
- 0x61, 0x3b, 0x09, 0x5b, 0x78, 0x2a, 0xcc, 0xb8, 0xeb, 0x0e, 0x27, 0x01, 0x82, 0xae, 0x18, 0xba,
- 0xc5, 0xb1, 0x6e, 0x34, 0x6c, 0xe5, 0xe2, 0x7e, 0xb0, 0xfb, 0xa2, 0x03, 0x76, 0x13, 0x91, 0x38,
- 0x8e, 0x49, 0x8d, 0xa0, 0xdd, 0x5b, 0x1c, 0xed, 0x26, 0xa7, 0x74, 0x16, 0x80, 0xbb, 0xb5, 0x00,
- 0xdc, 0x4d, 0x4d, 0x99, 0x66, 0x04, 0xde, 0x7d, 0xd1, 0xc1, 0xbb, 0xe9, 0x29, 0x23, 0x1e, 0x01,
- 0xbc, 0xaf, 0xfa, 0x00, 0x6f, 0x96, 0x8a, 0xae, 0x46, 0x8a, 0x86, 0x20, 0xde, 0x97, 0x5d, 0xc4,
- 0x9b, 0x8f, 0x44, 0xcb, 0x5c, 0x78, 0x14, 0xf2, 0x1e, 0x8c, 0x41, 0x5e, 0x06, 0x51, 0x9f, 0x8a,
- 0x54, 0x31, 0x05, 0xf3, 0x1e, 0x8c, 0x61, 0xde, 0xe2, 0x14, 0x85, 0x53, 0x40, 0xef, 0x4f, 0xc3,
- 0x41, 0x6f, 0x34, 0x2c, 0xe5, 0xc3, 0x9c, 0x0d, 0xf5, 0x2a, 0x11, 0xa8, 0xb7, 0x1c, 0x89, 0xd0,
- 0x98, 0xfa, 0x99, 0x61, 0xef, 0x71, 0x08, 0xec, 0x65, 0x00, 0xf5, 0x46, 0xa4, 0xf2, 0x19, 0x70,
- 0xef, 0x71, 0x08, 0xee, 0x5d, 0x98, 0xaa, 0x76, 0x2a, 0xf0, 0xbd, 0x17, 0x04, 0xbe, 0x28, 0x22,
- 0xc7, 0xf2, 0x4e, 0x7b, 0x04, 0xf2, 0x3d, 0x8d, 0x42, 0xbe, 0x0c, 0x9d, 0x3e, 0x17, 0xa9, 0x71,
- 0x0e, 0xe8, 0x7b, 0x30, 0x06, 0x7d, 0x97, 0xa6, 0x58, 0xda, 0xec, 0xd8, 0x37, 0x23, 0x66, 0x19,
- 0xea, 0xdd, 0x4d, 0x66, 0x41, 0xcc, 0x4b, 0xcf, 0x90, 0x40, 0x3c, 0xe2, 0xe1, 0x48, 0x4e, 0x8c,
- 0x4d, 0x53, 0x37, 0x39, 0x8a, 0x65, 0x0d, 0xe9, 0x06, 0xc1, 0x42, 0x9e, 0x37, 0x9b, 0x80, 0x93,
- 0x29, 0xf6, 0xf0, 0x79, 0x30, 0xe9, 0xcf, 0x82, 0x27, 0x4b, 0x91, 0xb2, 0x1f, 0x47, 0xe5, 0x38,
- 0x8e, 0xf2, 0xa1, 0xe7, 0x78, 0x10, 0x3d, 0xaf, 0x40, 0x9e, 0x60, 0x8a, 0x11, 0x60, 0xac, 0x1a,
- 0x2e, 0x30, 0xbe, 0x09, 0x0b, 0x34, 0x76, 0x32, 0x8c, 0xcd, 0x03, 0x52, 0x92, 0x06, 0xa4, 0x32,
- 0xf9, 0xc1, 0xd6, 0x85, 0x45, 0xa6, 0xe7, 0x61, 0xd1, 0xc7, 0xeb, 0x62, 0x15, 0x86, 0x12, 0x45,
- 0x97, 0x7b, 0x93, 0x83, 0x96, 0xbf, 0x09, 0xde, 0x0a, 0x79, 0x88, 0x3a, 0x0c, 0xfc, 0x0a, 0xdf,
- 0x10, 0xf8, 0x8d, 0x7f, 0x65, 0xf0, 0xeb, 0xc7, 0x5e, 0x89, 0x20, 0xf6, 0xfa, 0x8f, 0xe0, 0xed,
- 0x89, 0x0b, 0x65, 0x5b, 0x7a, 0x1b, 0x73, 0x34, 0x44, 0xbf, 0x49, 0x76, 0xd2, 0xd5, 0xcf, 0x39,
- 0xe6, 0x21, 0x9f, 0x84, 0xcb, 0x0d, 0x39, 0x39, 0x1e, 0x51, 0x5c, 0x20, 0xc5, 0x42, 0x3e, 0x07,
- 0x52, 0x22, 0x24, 0x1e, 0x62, 0x16, 0x20, 0x0a, 0x32, 0xf9, 0x24, 0x7c, 0xd4, 0xec, 0x78, 0xe8,
- 0x66, 0x0d, 0x74, 0x07, 0x72, 0xb4, 0x58, 0xad, 0xe8, 0x86, 0xc5, 0x63, 0x42, 0x20, 0xcb, 0x61,
- 0x15, 0xeb, 0xb5, 0x43, 0xc2, 0x73, 0x60, 0x58, 0x72, 0xd6, 0xe0, 0x5f, 0xbe, 0x5c, 0x23, 0x17,
- 0xc8, 0x35, 0xae, 0x41, 0x8e, 0x8c, 0xde, 0x32, 0xd4, 0x16, 0xa6, 0xa5, 0xd1, 0x9c, 0xec, 0x11,
- 0xa4, 0x4f, 0x04, 0x28, 0x8f, 0x84, 0x98, 0xd0, 0xb9, 0x3b, 0x26, 0x19, 0xf7, 0x41, 0xfb, 0xeb,
- 0x00, 0xe7, 0xaa, 0xa5, 0xbc, 0xa7, 0xf6, 0x6d, 0xdc, 0xe6, 0xd3, 0xcd, 0x9d, 0xab, 0xd6, 0x1b,
- 0x94, 0x10, 0xec, 0x38, 0x3b, 0xd2, 0xb1, 0x0f, 0x43, 0xe6, 0xfc, 0x18, 0x12, 0x55, 0x21, 0x6b,
- 0x98, 0x9a, 0x6e, 0x6a, 0xf6, 0x25, 0x1d, 0x6d, 0x42, 0x76, 0xdb, 0xbb, 0xc9, 0x6c, 0x42, 0x4c,
- 0xee, 0x26, 0xb3, 0x49, 0x31, 0xe5, 0x16, 0xaa, 0xd8, 0x91, 0xcd, 0x8b, 0x05, 0xe9, 0x83, 0xb8,
- 0x67, 0x8b, 0xdb, 0xb8, 0xab, 0x5d, 0x60, 0x73, 0x8e, 0xc9, 0xcc, 0xb6, 0xb9, 0xcb, 0x21, 0x53,
- 0xf6, 0x51, 0xc8, 0xe8, 0x49, 0x6b, 0x60, 0xe1, 0x36, 0x2f, 0x99, 0xb8, 0x6d, 0xd4, 0x80, 0x34,
- 0xbe, 0xc0, 0x7d, 0xdb, 0xaa, 0x64, 0xa8, 0x0d, 0x5f, 0x19, 0xc7, 0xb0, 0xe4, 0xf7, 0x56, 0x85,
- 0x58, 0xee, 0x97, 0x9f, 0xad, 0x88, 0x8c, 0xfb, 0x39, 0xbd, 0xa7, 0xd9, 0xb8, 0x67, 0xd8, 0x97,
- 0x32, 0x97, 0x9f, 0xbc, 0xb2, 0xd2, 0x6d, 0x28, 0x05, 0xe3, 0x3e, 0x7a, 0x02, 0x8a, 0x26, 0xb6,
- 0x55, 0xad, 0xaf, 0x04, 0xb2, 0xf6, 0x02, 0x23, 0xf2, 0x62, 0xce, 0x21, 0x3c, 0x12, 0x1a, 0xeb,
- 0xd1, 0x4b, 0x90, 0xf3, 0xd2, 0x04, 0x81, 0x0e, 0x7d, 0x42, 0xad, 0xc3, 0xe3, 0x95, 0xfe, 0x2a,
- 0x78, 0x2a, 0x83, 0xd5, 0x93, 0x3a, 0xa4, 0x4d, 0x6c, 0x0d, 0xba, 0xac, 0x9e, 0x51, 0xda, 0x78,
- 0x7e, 0xb6, 0x2c, 0x81, 0x50, 0x07, 0x5d, 0x5b, 0xe6, 0xc2, 0xd2, 0x5b, 0x90, 0x66, 0x14, 0x94,
- 0x87, 0xcc, 0xf1, 0xfe, 0xfd, 0xfd, 0x83, 0x37, 0xf6, 0xc5, 0x18, 0x02, 0x48, 0x6f, 0xd6, 0x6a,
- 0xf5, 0xc3, 0xa6, 0x28, 0xa0, 0x1c, 0xa4, 0x36, 0xb7, 0x0e, 0xe4, 0xa6, 0x18, 0x27, 0x64, 0xb9,
- 0xbe, 0x5b, 0xaf, 0x35, 0xc5, 0x04, 0x5a, 0x80, 0x22, 0xfb, 0x56, 0xee, 0x1d, 0xc8, 0x0f, 0x36,
- 0x9b, 0x62, 0xd2, 0x47, 0x3a, 0xaa, 0xef, 0x6f, 0xd7, 0x65, 0x31, 0x25, 0x7d, 0x0f, 0xae, 0x46,
- 0xe6, 0x15, 0x5e, 0x69, 0x44, 0xf0, 0x95, 0x46, 0xa4, 0xdf, 0xc4, 0x09, 0xf2, 0x8a, 0x4a, 0x16,
- 0xd0, 0xee, 0xc8, 0xc4, 0x37, 0xe6, 0xc8, 0x34, 0x46, 0x66, 0x4f, 0xc0, 0x96, 0x89, 0xcf, 0xb0,
- 0xdd, 0xea, 0xb0, 0xe4, 0x85, 0xf9, 0xc6, 0xa2, 0x5c, 0xe4, 0x54, 0x2a, 0x64, 0x31, 0xb6, 0x77,
- 0x70, 0xcb, 0x56, 0xd8, 0x09, 0x63, 0x40, 0x27, 0x47, 0xd8, 0x08, 0xf5, 0x88, 0x11, 0xa5, 0xb7,
- 0xe7, 0x5a, 0xcb, 0x1c, 0xa4, 0xe4, 0x7a, 0x53, 0x7e, 0x53, 0x4c, 0x20, 0x04, 0x25, 0xfa, 0xa9,
- 0x1c, 0xed, 0x6f, 0x1e, 0x1e, 0x35, 0x0e, 0xc8, 0x5a, 0x2e, 0x42, 0xd9, 0x59, 0x4b, 0x87, 0x98,
- 0x92, 0xfe, 0x11, 0x87, 0x47, 0x23, 0x52, 0x1d, 0x74, 0x07, 0xc0, 0x1e, 0x2a, 0x26, 0x6e, 0xe9,
- 0x66, 0x3b, 0xda, 0xc8, 0x9a, 0x43, 0x99, 0x72, 0xc8, 0x39, 0x9b, 0x7f, 0x59, 0x13, 0x2a, 0x6a,
- 0xe8, 0x15, 0xae, 0x94, 0xcc, 0xca, 0x81, 0x77, 0xd7, 0x43, 0x0a, 0x47, 0xb8, 0x45, 0x14, 0xd3,
- 0xb5, 0xa5, 0x8a, 0x29, 0x3f, 0x7a, 0xe0, 0x07, 0xc4, 0x03, 0x1a, 0x54, 0x66, 0x2e, 0xbd, 0xfa,
- 0x20, 0x33, 0x23, 0x58, 0xe8, 0x4d, 0x78, 0x74, 0x24, 0x26, 0xba, 0x4a, 0x53, 0xb3, 0x86, 0xc6,
- 0x47, 0x82, 0xa1, 0x91, 0xab, 0x96, 0x7e, 0x9f, 0xf0, 0x2f, 0x6c, 0x30, 0xb3, 0x3b, 0x80, 0xb4,
- 0x65, 0xab, 0xf6, 0xc0, 0xe2, 0x06, 0xf7, 0xd2, 0xac, 0x69, 0xe2, 0x9a, 0xf3, 0x71, 0x44, 0xc5,
- 0x65, 0xae, 0xe6, 0xbb, 0xf5, 0xb6, 0x88, 0x83, 0x0d, 0x2e, 0x4e, 0xf4, 0x91, 0xf1, 0x7c, 0x4e,
- 0x5c, 0xba, 0x0b, 0x68, 0x3c, 0x81, 0x0e, 0x29, 0x99, 0x08, 0x61, 0x25, 0x93, 0x3f, 0x08, 0xf0,
- 0xd8, 0x84, 0x64, 0x19, 0xbd, 0x3e, 0xb2, 0xcf, 0x2f, 0xcf, 0x93, 0x6a, 0xaf, 0x31, 0x5a, 0x70,
- 0xa7, 0xa5, 0x5b, 0x50, 0xf0, 0xd3, 0x67, 0x9b, 0xe4, 0x97, 0x71, 0xcf, 0xe7, 0x07, 0x6b, 0x3b,
- 0x5e, 0xf8, 0x13, 0xbe, 0x66, 0xf8, 0x0b, 0xda, 0x59, 0x7c, 0x4e, 0x3b, 0x3b, 0x0a, 0xb3, 0xb3,
- 0xc4, 0x5c, 0x59, 0xe5, 0x5c, 0xd6, 0x96, 0xfc, 0x7a, 0xd6, 0x16, 0x38, 0x70, 0xa9, 0x60, 0xda,
- 0xfa, 0x26, 0x80, 0x57, 0xf0, 0x22, 0x01, 0xc9, 0xd4, 0x07, 0xfd, 0x36, 0xb5, 0x80, 0x94, 0xcc,
- 0x1a, 0xe8, 0x36, 0xa4, 0x88, 0x25, 0x39, 0xeb, 0x34, 0xee, 0x54, 0x89, 0x25, 0xf8, 0x0a, 0x66,
- 0x8c, 0x5b, 0xd2, 0x00, 0x8d, 0x57, 0xd4, 0x23, 0xba, 0x78, 0x35, 0xd8, 0xc5, 0xe3, 0x91, 0xb5,
- 0xf9, 0xf0, 0xae, 0xde, 0x87, 0x14, 0xdd, 0x79, 0x92, 0x70, 0xd1, 0x6b, 0x1c, 0x0e, 0x7b, 0xc8,
- 0x37, 0xfa, 0x19, 0x80, 0x6a, 0xdb, 0xa6, 0x76, 0x3a, 0xf0, 0x3a, 0x58, 0x09, 0xb7, 0x9c, 0x4d,
- 0x87, 0x6f, 0xeb, 0x1a, 0x37, 0xa1, 0x25, 0x4f, 0xd4, 0x67, 0x46, 0x3e, 0x85, 0xd2, 0x3e, 0x94,
- 0x82, 0xb2, 0x4e, 0xa2, 0xce, 0xc6, 0x10, 0x4c, 0xd4, 0x19, 0xee, 0xe2, 0x89, 0xba, 0x9b, 0xe6,
- 0x27, 0xd8, 0x5d, 0x15, 0x6d, 0x48, 0xff, 0x15, 0xa0, 0xe0, 0x37, 0xbc, 0x6f, 0x38, 0xfd, 0x9c,
- 0x92, 0x71, 0x5f, 0x1d, 0xcb, 0x3e, 0x33, 0xe7, 0xaa, 0x75, 0xfc, 0x6d, 0x26, 0x9f, 0x1f, 0x08,
- 0x90, 0x75, 0x27, 0x1f, 0xbc, 0xb6, 0x0a, 0xdc, 0xf3, 0xb1, 0xb5, 0x8b, 0xfb, 0xef, 0x9a, 0xd8,
- 0xad, 0x5e, 0xc2, 0xbd, 0xd5, 0xbb, 0xeb, 0xe6, 0x4a, 0x51, 0x15, 0x3d, 0xff, 0x4a, 0x73, 0x9b,
- 0x72, 0x52, 0xc3, 0x5f, 0xf3, 0x71, 0x90, 0x24, 0x01, 0xfd, 0x00, 0xd2, 0x6a, 0xcb, 0xad, 0x63,
- 0x96, 0x42, 0x0a, 0x7c, 0x0e, 0xeb, 0x5a, 0x73, 0xb8, 0x49, 0x39, 0x65, 0x2e, 0xc1, 0x47, 0x15,
- 0x77, 0x46, 0x25, 0xbd, 0x46, 0xf4, 0x32, 0x9e, 0xa0, 0x47, 0x2c, 0x01, 0x1c, 0xef, 0x3f, 0x38,
- 0xd8, 0xde, 0xb9, 0xb7, 0x53, 0xdf, 0xe6, 0xd9, 0xd2, 0xf6, 0x76, 0x7d, 0x5b, 0x8c, 0x13, 0x3e,
- 0xb9, 0xfe, 0xe0, 0xe0, 0xa4, 0xbe, 0x2d, 0x26, 0xa4, 0xbb, 0x90, 0x73, 0xbd, 0x0a, 0x41, 0xf5,
- 0x4e, 0x4d, 0x56, 0xe0, 0x67, 0x9b, 0x97, 0xd8, 0x97, 0x20, 0x65, 0xe8, 0xef, 0xf1, 0x2b, 0xb6,
- 0x84, 0xcc, 0x1a, 0x52, 0x1b, 0xca, 0x23, 0x2e, 0x09, 0xdd, 0x85, 0x8c, 0x31, 0x38, 0x55, 0x1c,
- 0xa3, 0x1d, 0xa9, 0x60, 0x3b, 0x78, 0x71, 0x70, 0xda, 0xd5, 0x5a, 0xf7, 0xf1, 0xa5, 0xb3, 0x4c,
- 0xc6, 0xe0, 0xf4, 0x3e, 0xb3, 0x6d, 0xd6, 0x4b, 0xdc, 0xdf, 0xcb, 0x05, 0x64, 0x9d, 0xa3, 0x8a,
- 0x7e, 0x08, 0x39, 0xd7, 0xdb, 0xb9, 0x57, 0xe4, 0x91, 0x6e, 0x92, 0xab, 0xf7, 0x44, 0xd0, 0x4d,
- 0x58, 0xb0, 0xb4, 0xf3, 0xbe, 0x53, 0xbf, 0x67, 0x15, 0x9b, 0x38, 0x3d, 0x33, 0x65, 0xf6, 0x63,
- 0xcf, 0x29, 0x2a, 0x90, 0x20, 0x27, 0x8e, 0xfa, 0x8a, 0x6f, 0x73, 0x00, 0x21, 0xc1, 0x38, 0x11,
- 0x16, 0x8c, 0x7f, 0x11, 0x87, 0xbc, 0xef, 0x56, 0x00, 0x7d, 0xdf, 0xe7, 0xb8, 0x4a, 0x21, 0x51,
- 0xc4, 0xc7, 0xeb, 0xdd, 0x41, 0x07, 0x27, 0x16, 0x9f, 0x7f, 0x62, 0x51, 0x97, 0x30, 0xce, 0xe5,
- 0x42, 0x72, 0xee, 0xcb, 0x85, 0xe7, 0x00, 0xd9, 0xba, 0xad, 0x76, 0x95, 0x0b, 0xdd, 0xd6, 0xfa,
- 0xe7, 0x0a, 0x33, 0x0d, 0xe6, 0x66, 0x44, 0xfa, 0xe7, 0x84, 0xfe, 0x38, 0xa4, 0x56, 0xf2, 0x73,
- 0x01, 0xb2, 0x2e, 0xa2, 0x9b, 0xf7, 0x86, 0xfa, 0x0a, 0xa4, 0x39, 0x68, 0x61, 0x57, 0xd4, 0xbc,
- 0x15, 0x7a, 0x8b, 0x52, 0x85, 0x6c, 0x0f, 0xdb, 0x2a, 0xf5, 0x99, 0x2c, 0x02, 0xba, 0xed, 0x9b,
- 0x2f, 0x43, 0xde, 0x77, 0xbb, 0x4f, 0xdc, 0xe8, 0x7e, 0xfd, 0x0d, 0x31, 0x56, 0xcd, 0x7c, 0xf8,
- 0xf1, 0x6a, 0x62, 0x1f, 0xbf, 0x47, 0x4e, 0x98, 0x5c, 0xaf, 0x35, 0xea, 0xb5, 0xfb, 0xa2, 0x50,
- 0xcd, 0x7f, 0xf8, 0xf1, 0x6a, 0x46, 0xc6, 0xb4, 0x80, 0x7e, 0xf3, 0x3e, 0x94, 0x47, 0x36, 0x26,
- 0x78, 0xa0, 0x11, 0x94, 0xb6, 0x8f, 0x0f, 0xf7, 0x76, 0x6a, 0x9b, 0xcd, 0xba, 0x72, 0x72, 0xd0,
- 0xac, 0x8b, 0x02, 0x7a, 0x14, 0x16, 0xf7, 0x76, 0x7e, 0xd4, 0x68, 0x2a, 0xb5, 0xbd, 0x9d, 0xfa,
- 0x7e, 0x53, 0xd9, 0x6c, 0x36, 0x37, 0x6b, 0xf7, 0xc5, 0xf8, 0xc6, 0x1f, 0xf3, 0x50, 0xde, 0xdc,
- 0xaa, 0xed, 0x10, 0xd8, 0xa6, 0xb5, 0x54, 0xea, 0x1e, 0x6a, 0x90, 0xa4, 0xa5, 0xc0, 0x89, 0x6f,
- 0xfc, 0xaa, 0x93, 0x6f, 0x45, 0xd0, 0x3d, 0x48, 0xd1, 0x2a, 0x21, 0x9a, 0xfc, 0xe8, 0xaf, 0x3a,
- 0xe5, 0x9a, 0x84, 0x0c, 0x86, 0x1e, 0xa7, 0x89, 0xaf, 0x00, 0xab, 0x93, 0x6f, 0x4d, 0xd0, 0x1e,
- 0x64, 0x9c, 0x22, 0xd1, 0xb4, 0xa7, 0x79, 0xd5, 0xa9, 0x57, 0x19, 0x64, 0x6a, 0xac, 0xd8, 0x36,
- 0xf9, 0x81, 0x60, 0x75, 0xca, 0x7d, 0x0a, 0xda, 0x81, 0x34, 0x2f, 0x74, 0x4c, 0x79, 0xf3, 0x57,
- 0x9d, 0x76, 0x43, 0x82, 0x64, 0xc8, 0x79, 0x65, 0xcc, 0xe9, 0xcf, 0x1e, 0xab, 0x33, 0x5c, 0x15,
- 0xa1, 0xb7, 0xa0, 0x18, 0x2c, 0xa8, 0xcc, 0xf6, 0xae, 0xb0, 0x3a, 0xe3, 0x5d, 0x0c, 0xd1, 0x1f,
- 0xac, 0xae, 0xcc, 0xf6, 0xce, 0xb0, 0x3a, 0xe3, 0xd5, 0x0c, 0x7a, 0x07, 0x16, 0xc6, 0xab, 0x1f,
- 0xb3, 0x3f, 0x3b, 0xac, 0xce, 0x71, 0x59, 0x83, 0x7a, 0x80, 0x42, 0xaa, 0x26, 0x73, 0xbc, 0x42,
- 0xac, 0xce, 0x73, 0x77, 0x83, 0xda, 0x50, 0x1e, 0xad, 0x44, 0xcc, 0xfa, 0x2a, 0xb1, 0x3a, 0xf3,
- 0x3d, 0x0e, 0xeb, 0x25, 0x08, 0xcb, 0x67, 0x7d, 0xa5, 0x58, 0x9d, 0xf9, 0x5a, 0x07, 0x1d, 0x03,
- 0xf8, 0x60, 0xe5, 0x0c, 0xaf, 0x16, 0xab, 0xb3, 0x5c, 0xf0, 0x20, 0x03, 0x16, 0xc3, 0xf0, 0xe6,
- 0x3c, 0x8f, 0x18, 0xab, 0x73, 0xdd, 0xfb, 0x10, 0x7b, 0x0e, 0x22, 0xc7, 0xd9, 0x1e, 0x35, 0x56,
- 0x67, 0xbc, 0x00, 0xda, 0xaa, 0x7f, 0xf2, 0xf9, 0xb2, 0xf0, 0xe9, 0xe7, 0xcb, 0xc2, 0xbf, 0x3f,
- 0x5f, 0x16, 0x3e, 0xfa, 0x62, 0x39, 0xf6, 0xe9, 0x17, 0xcb, 0xb1, 0x7f, 0x7e, 0xb1, 0x1c, 0xfb,
- 0xf1, 0xb3, 0xe7, 0x9a, 0xdd, 0x19, 0x9c, 0xae, 0xb5, 0xf4, 0xde, 0xba, 0xff, 0x1d, 0x78, 0xd8,
- 0xeb, 0xf3, 0xd3, 0x34, 0x0d, 0xa8, 0xb7, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x4c, 0xb4, 0x7f,
- 0x53, 0x9d, 0x2e, 0x00, 0x00,
+ 0x11, 0xd7, 0xe8, 0x5b, 0x2d, 0x4b, 0x1a, 0x3f, 0x9b, 0x45, 0x2b, 0x76, 0x6d, 0x33, 0x14, 0xb0,
+ 0x2c, 0x60, 0x13, 0x6f, 0x16, 0x96, 0x2c, 0x84, 0x92, 0x65, 0x6d, 0x64, 0xaf, 0xd7, 0x36, 0x63,
+ 0xd9, 0x14, 0xf9, 0x60, 0x18, 0x4b, 0xcf, 0xd6, 0xb0, 0x92, 0x66, 0x98, 0x19, 0x19, 0x99, 0x63,
+ 0x12, 0xaa, 0x52, 0x1c, 0x52, 0xdc, 0xc2, 0x21, 0xdc, 0x92, 0xaa, 0xfc, 0x09, 0xc9, 0x25, 0xa7,
+ 0x1c, 0x38, 0xe4, 0xc0, 0x29, 0x95, 0x13, 0x49, 0xc1, 0x8d, 0x7f, 0x20, 0xb7, 0x54, 0xea, 0x7d,
+ 0xcc, 0x97, 0x34, 0xa3, 0x0f, 0xa0, 0xa8, 0x4a, 0x15, 0xb7, 0x79, 0x3d, 0xdd, 0xfd, 0xbe, 0xfa,
+ 0x75, 0xf7, 0xaf, 0xdf, 0x83, 0xc7, 0x6c, 0xdc, 0x6f, 0x63, 0xb3, 0xa7, 0xf5, 0xed, 0x0d, 0xf5,
+ 0xb4, 0xa5, 0x6d, 0xd8, 0x97, 0x06, 0xb6, 0xd6, 0x0d, 0x53, 0xb7, 0x75, 0x54, 0xf2, 0x7e, 0xae,
+ 0x93, 0x9f, 0x95, 0xeb, 0x3e, 0xee, 0x96, 0x79, 0x69, 0xd8, 0xfa, 0x86, 0x61, 0xea, 0xfa, 0x19,
+ 0xe3, 0xaf, 0x5c, 0x1b, 0xff, 0xfd, 0x10, 0x5f, 0x72, 0x6d, 0x01, 0x61, 0xda, 0xcb, 0x86, 0xa1,
+ 0x9a, 0x6a, 0xcf, 0xf9, 0xbd, 0x7a, 0xae, 0xeb, 0xe7, 0x5d, 0xbc, 0x41, 0x5b, 0xa7, 0x83, 0xb3,
+ 0x0d, 0x5b, 0xeb, 0x61, 0xcb, 0x56, 0x7b, 0x06, 0x67, 0x58, 0x3e, 0xd7, 0xcf, 0x75, 0xfa, 0xb9,
+ 0x41, 0xbe, 0x18, 0x55, 0xfa, 0x4b, 0x0e, 0x32, 0x32, 0x7e, 0x77, 0x80, 0x2d, 0x1b, 0x6d, 0x42,
+ 0x12, 0xb7, 0x3a, 0x7a, 0x59, 0x58, 0x13, 0x6e, 0xe4, 0x37, 0xaf, 0xad, 0x8f, 0x0c, 0x7f, 0x9d,
+ 0xf3, 0xd5, 0x5b, 0x1d, 0xbd, 0x11, 0x93, 0x29, 0x2f, 0xba, 0x0d, 0xa9, 0xb3, 0xee, 0xc0, 0xea,
+ 0x94, 0xe3, 0x54, 0xe8, 0x7a, 0x94, 0xd0, 0x3d, 0xc2, 0xd4, 0x88, 0xc9, 0x8c, 0x9b, 0x74, 0xa5,
+ 0xf5, 0xcf, 0xf4, 0x72, 0x62, 0x72, 0x57, 0x3b, 0xfd, 0x33, 0xda, 0x15, 0xe1, 0x45, 0x5b, 0x00,
+ 0x5a, 0x5f, 0xb3, 0x95, 0x56, 0x47, 0xd5, 0xfa, 0xe5, 0x24, 0x95, 0x7c, 0x3c, 0x5a, 0x52, 0xb3,
+ 0x6b, 0x84, 0xb1, 0x11, 0x93, 0x73, 0x9a, 0xd3, 0x20, 0xc3, 0x7d, 0x77, 0x80, 0xcd, 0xcb, 0x72,
+ 0x6a, 0xf2, 0x70, 0x5f, 0x27, 0x4c, 0x64, 0xb8, 0x94, 0x1b, 0xbd, 0x02, 0xd9, 0x56, 0x07, 0xb7,
+ 0x1e, 0x2a, 0xf6, 0xb0, 0x9c, 0xa1, 0x92, 0xab, 0x51, 0x92, 0x35, 0xc2, 0xd7, 0x1c, 0x36, 0x62,
+ 0x72, 0xa6, 0xc5, 0x3e, 0xd1, 0x1d, 0x48, 0xb7, 0xf4, 0x5e, 0x4f, 0xb3, 0xcb, 0x40, 0x65, 0x57,
+ 0x22, 0x65, 0x29, 0x57, 0x23, 0x26, 0x73, 0x7e, 0xb4, 0x0f, 0xc5, 0xae, 0x66, 0xd9, 0x8a, 0xd5,
+ 0x57, 0x0d, 0xab, 0xa3, 0xdb, 0x56, 0x39, 0x4f, 0x35, 0x3c, 0x19, 0xa5, 0x61, 0x4f, 0xb3, 0xec,
+ 0x23, 0x87, 0xb9, 0x11, 0x93, 0x0b, 0x5d, 0x3f, 0x81, 0xe8, 0xd3, 0xcf, 0xce, 0xb0, 0xe9, 0x2a,
+ 0x2c, 0x2f, 0x4c, 0xd6, 0x77, 0x40, 0xb8, 0x1d, 0x79, 0xa2, 0x4f, 0xf7, 0x13, 0xd0, 0xcf, 0x60,
+ 0xa9, 0xab, 0xab, 0x6d, 0x57, 0x9d, 0xd2, 0xea, 0x0c, 0xfa, 0x0f, 0xcb, 0x05, 0xaa, 0xf4, 0x99,
+ 0xc8, 0x41, 0xea, 0x6a, 0xdb, 0x51, 0x51, 0x23, 0x02, 0x8d, 0x98, 0xbc, 0xd8, 0x1d, 0x25, 0xa2,
+ 0xb7, 0x60, 0x59, 0x35, 0x8c, 0xee, 0xe5, 0xa8, 0xf6, 0x22, 0xd5, 0x7e, 0x33, 0x4a, 0x7b, 0x95,
+ 0xc8, 0x8c, 0xaa, 0x47, 0xea, 0x18, 0x15, 0x35, 0x41, 0x34, 0x4c, 0x6c, 0xa8, 0x26, 0x56, 0x0c,
+ 0x53, 0x37, 0x74, 0x4b, 0xed, 0x96, 0x4b, 0x54, 0xf7, 0xd3, 0x51, 0xba, 0x0f, 0x19, 0xff, 0x21,
+ 0x67, 0x6f, 0xc4, 0xe4, 0x92, 0x11, 0x24, 0x31, 0xad, 0x7a, 0x0b, 0x5b, 0x96, 0xa7, 0x55, 0x9c,
+ 0xa6, 0x95, 0xf2, 0x07, 0xb5, 0x06, 0x48, 0xa8, 0x0e, 0x79, 0x3c, 0x24, 0xe2, 0xca, 0x85, 0x6e,
+ 0xe3, 0xf2, 0x22, 0x55, 0x28, 0x45, 0x9e, 0x50, 0xca, 0x7a, 0xa2, 0xdb, 0xb8, 0x11, 0x93, 0x01,
+ 0xbb, 0x2d, 0xa4, 0xc2, 0x23, 0x17, 0xd8, 0xd4, 0xce, 0x2e, 0xa9, 0x1a, 0x85, 0xfe, 0xb1, 0x34,
+ 0xbd, 0x5f, 0x46, 0x54, 0xe1, 0xb3, 0x51, 0x0a, 0x4f, 0xa8, 0x10, 0x51, 0x51, 0x77, 0x44, 0x1a,
+ 0x31, 0x79, 0xe9, 0x62, 0x9c, 0x4c, 0x4c, 0xec, 0x4c, 0xeb, 0xab, 0x5d, 0xed, 0x7d, 0xac, 0x9c,
+ 0x76, 0xf5, 0xd6, 0xc3, 0xf2, 0xd2, 0x64, 0x13, 0xbb, 0xc7, 0xb9, 0xb7, 0x08, 0x33, 0x31, 0xb1,
+ 0x33, 0x3f, 0x61, 0x2b, 0x03, 0xa9, 0x0b, 0xb5, 0x3b, 0xc0, 0xbb, 0xc9, 0x6c, 0x5a, 0xcc, 0xec,
+ 0x26, 0xb3, 0x59, 0x31, 0xb7, 0x9b, 0xcc, 0xe6, 0x44, 0x90, 0x9e, 0x86, 0xbc, 0xcf, 0x25, 0xa1,
+ 0x32, 0x64, 0x7a, 0xd8, 0xb2, 0xd4, 0x73, 0x4c, 0x3d, 0x58, 0x4e, 0x76, 0x9a, 0x52, 0x11, 0x16,
+ 0xfc, 0x6e, 0x48, 0xfa, 0x48, 0x70, 0x25, 0x89, 0x87, 0x21, 0x92, 0x17, 0xd8, 0xa4, 0x0b, 0xc1,
+ 0x25, 0x79, 0x13, 0x3d, 0x01, 0x05, 0x3a, 0x09, 0xc5, 0xf9, 0x4f, 0xdc, 0x5c, 0x52, 0x5e, 0xa0,
+ 0xc4, 0x13, 0xce, 0xb4, 0x0a, 0x79, 0x63, 0xd3, 0x70, 0x59, 0x12, 0x94, 0x05, 0x8c, 0x4d, 0xc3,
+ 0x61, 0x78, 0x1c, 0x16, 0xc8, 0x8c, 0x5d, 0x8e, 0x24, 0xed, 0x24, 0x4f, 0x68, 0x9c, 0x45, 0xfa,
+ 0x7b, 0x1c, 0xc4, 0x51, 0xd7, 0x85, 0xee, 0x40, 0x92, 0x78, 0x71, 0xee, 0x90, 0x2b, 0xeb, 0xcc,
+ 0xc5, 0xaf, 0x3b, 0x2e, 0x7e, 0xbd, 0xe9, 0xb8, 0xf8, 0xad, 0xec, 0xa7, 0x9f, 0xaf, 0xc6, 0x3e,
+ 0xfa, 0xd7, 0xaa, 0x20, 0x53, 0x09, 0x74, 0x95, 0x38, 0x2c, 0x55, 0xeb, 0x2b, 0x5a, 0x9b, 0x0e,
+ 0x39, 0x47, 0xbc, 0x91, 0xaa, 0xf5, 0x77, 0xda, 0x68, 0x0f, 0xc4, 0x96, 0xde, 0xb7, 0x70, 0xdf,
+ 0x1a, 0x58, 0x0a, 0x0b, 0x21, 0xdc, 0x0d, 0x07, 0x9c, 0x29, 0x0b, 0x64, 0x35, 0x87, 0xf3, 0x90,
+ 0x32, 0xca, 0xa5, 0x56, 0x90, 0x80, 0xee, 0x01, 0x5c, 0xa8, 0x5d, 0xad, 0xad, 0xda, 0xba, 0x69,
+ 0x95, 0x93, 0x6b, 0x89, 0x1b, 0xf9, 0xcd, 0xb5, 0xb1, 0xad, 0x3e, 0x71, 0x58, 0x8e, 0x8d, 0xb6,
+ 0x6a, 0xe3, 0xad, 0x24, 0x19, 0xae, 0xec, 0x93, 0x44, 0x4f, 0x41, 0x49, 0x35, 0x0c, 0xc5, 0xb2,
+ 0x55, 0x1b, 0x2b, 0xa7, 0x97, 0x36, 0xb6, 0xa8, 0x8b, 0x5e, 0x90, 0x0b, 0xaa, 0x61, 0x1c, 0x11,
+ 0xea, 0x16, 0x21, 0xa2, 0x27, 0xa1, 0x48, 0xbc, 0xb9, 0xa6, 0x76, 0x95, 0x0e, 0xd6, 0xce, 0x3b,
+ 0x76, 0x39, 0xbd, 0x26, 0xdc, 0x48, 0xc8, 0x05, 0x4e, 0x6d, 0x50, 0xa2, 0xd4, 0x76, 0x77, 0x9c,
+ 0x7a, 0x72, 0x84, 0x20, 0xd9, 0x56, 0x6d, 0x95, 0xae, 0xe4, 0x82, 0x4c, 0xbf, 0x09, 0xcd, 0x50,
+ 0xed, 0x0e, 0x5f, 0x1f, 0xfa, 0x8d, 0xae, 0x40, 0x9a, 0xab, 0x4d, 0x50, 0xb5, 0xbc, 0x85, 0x96,
+ 0x21, 0x65, 0x98, 0xfa, 0x05, 0xa6, 0x5b, 0x97, 0x95, 0x59, 0x43, 0x92, 0xa1, 0x18, 0xf4, 0xfa,
+ 0xa8, 0x08, 0x71, 0x7b, 0xc8, 0x7b, 0x89, 0xdb, 0x43, 0xf4, 0x02, 0x24, 0xc9, 0x42, 0xd2, 0x3e,
+ 0x8a, 0x21, 0x71, 0x8e, 0xcb, 0x35, 0x2f, 0x0d, 0x2c, 0x53, 0x4e, 0xa9, 0x04, 0x85, 0x40, 0x34,
+ 0x90, 0xae, 0xc0, 0x72, 0x98, 0x73, 0x97, 0x3a, 0x2e, 0x3d, 0xe0, 0xa4, 0xd1, 0x6d, 0xc8, 0xba,
+ 0xde, 0x9d, 0x19, 0xce, 0xd5, 0xb1, 0x6e, 0x1d, 0x66, 0xd9, 0x65, 0x25, 0x16, 0x43, 0x36, 0xa0,
+ 0xa3, 0xf2, 0x58, 0xbe, 0x20, 0x67, 0x54, 0xc3, 0x68, 0xa8, 0x56, 0x47, 0x7a, 0x1b, 0xca, 0x51,
+ 0x9e, 0xdb, 0xb7, 0x60, 0x02, 0x35, 0x7b, 0x67, 0xc1, 0xae, 0x40, 0xfa, 0x4c, 0x37, 0x7b, 0xaa,
+ 0x4d, 0x95, 0x15, 0x64, 0xde, 0x22, 0x0b, 0xc9, 0xbc, 0x78, 0x82, 0x92, 0x59, 0x43, 0x52, 0xe0,
+ 0x6a, 0xa4, 0xf7, 0x26, 0x22, 0x5a, 0xbf, 0x8d, 0xd9, 0xb2, 0x16, 0x64, 0xd6, 0xf0, 0x14, 0xb1,
+ 0xc1, 0xb2, 0x06, 0xe9, 0xd6, 0xa2, 0x73, 0xa5, 0xfa, 0x73, 0x32, 0x6f, 0x49, 0x1f, 0x27, 0xe0,
+ 0x4a, 0xb8, 0x0f, 0x47, 0x6b, 0xb0, 0xd0, 0x53, 0x87, 0x8a, 0x3d, 0xe4, 0x66, 0x27, 0xd0, 0x8d,
+ 0x87, 0x9e, 0x3a, 0x6c, 0x0e, 0x99, 0xcd, 0x89, 0x90, 0xb0, 0x87, 0x56, 0x39, 0xbe, 0x96, 0xb8,
+ 0xb1, 0x20, 0x93, 0x4f, 0x74, 0x0c, 0x8b, 0x5d, 0xbd, 0xa5, 0x76, 0x95, 0xae, 0x6a, 0xd9, 0x0a,
+ 0x0f, 0xee, 0xec, 0x10, 0x3d, 0x31, 0xb6, 0xd8, 0xcc, 0x1b, 0xe3, 0x36, 0xdb, 0x4f, 0xe2, 0x70,
+ 0xb8, 0xfd, 0x97, 0xa8, 0x8e, 0x3d, 0xd5, 0xd9, 0x6a, 0xb4, 0x0d, 0xf9, 0x9e, 0x66, 0x9d, 0xe2,
+ 0x8e, 0x7a, 0xa1, 0xe9, 0x26, 0x3f, 0x4d, 0xe3, 0x46, 0xf3, 0xc0, 0xe3, 0xe1, 0x9a, 0xfc, 0x62,
+ 0xbe, 0x2d, 0x49, 0x05, 0x6c, 0xd8, 0xf1, 0x26, 0xe9, 0xb9, 0xbd, 0xc9, 0x0b, 0xb0, 0xdc, 0xc7,
+ 0x43, 0x5b, 0xf1, 0xce, 0x2b, 0xb3, 0x93, 0x0c, 0x5d, 0x7a, 0x44, 0xfe, 0xb9, 0x27, 0xdc, 0x22,
+ 0x26, 0x83, 0x9e, 0xa1, 0x51, 0xd0, 0xd0, 0x2d, 0x6c, 0x2a, 0x6a, 0xbb, 0x6d, 0x62, 0xcb, 0x2a,
+ 0x67, 0x29, 0x77, 0xc9, 0xa1, 0x57, 0x19, 0x59, 0xfa, 0x8d, 0x7f, 0x6b, 0x82, 0x51, 0x8f, 0x2f,
+ 0xbc, 0xe0, 0x2d, 0xfc, 0x11, 0x2c, 0x73, 0xf9, 0x76, 0x60, 0xed, 0x59, 0xf6, 0xf9, 0xd8, 0xf8,
+ 0xf9, 0x1a, 0x5d, 0x73, 0xe4, 0x88, 0x47, 0x2f, 0x7b, 0xe2, 0xeb, 0x2d, 0x3b, 0x82, 0x24, 0x5d,
+ 0x94, 0x24, 0x73, 0x31, 0xe4, 0xfb, 0xff, 0x6d, 0x2b, 0x5e, 0x83, 0xc5, 0xb1, 0x0c, 0xc2, 0x9d,
+ 0x97, 0x10, 0x3a, 0xaf, 0xb8, 0x7f, 0x5e, 0xd2, 0xef, 0x05, 0xa8, 0x44, 0xa7, 0x0c, 0xa1, 0xaa,
+ 0x9e, 0x85, 0x45, 0x77, 0x2e, 0xee, 0xf8, 0xd8, 0x99, 0x16, 0xdd, 0x1f, 0x7c, 0x80, 0x91, 0xee,
+ 0xf9, 0x49, 0x28, 0x8e, 0x24, 0x34, 0x6c, 0x17, 0x0a, 0x17, 0xfe, 0xfe, 0xa5, 0x5f, 0x27, 0x5c,
+ 0x9f, 0x19, 0xc8, 0x3a, 0x42, 0x0c, 0xed, 0x75, 0x58, 0x6a, 0xe3, 0x96, 0xd6, 0xfe, 0xba, 0x76,
+ 0xb6, 0xc8, 0xa5, 0xbf, 0x37, 0xb3, 0x71, 0x33, 0xfb, 0x2d, 0x40, 0x56, 0xc6, 0x96, 0x41, 0x52,
+ 0x09, 0xb4, 0x05, 0x39, 0x3c, 0x6c, 0x61, 0xc3, 0x76, 0xb2, 0xaf, 0xf0, 0xbc, 0x96, 0x71, 0xd7,
+ 0x1d, 0x4e, 0x82, 0xea, 0x5c, 0x31, 0x74, 0x8b, 0x03, 0xd7, 0x68, 0x0c, 0xca, 0xc5, 0xfd, 0xc8,
+ 0xf5, 0x45, 0x07, 0xb9, 0x26, 0x22, 0x41, 0x19, 0x93, 0x1a, 0x81, 0xae, 0xb7, 0x38, 0x74, 0x4d,
+ 0x4e, 0xe9, 0x2c, 0x80, 0x5d, 0x6b, 0x01, 0xec, 0x9a, 0x9a, 0x32, 0xcd, 0x08, 0xf0, 0xfa, 0xa2,
+ 0x03, 0x5e, 0xd3, 0x53, 0x46, 0x3c, 0x82, 0x5e, 0x5f, 0xf5, 0xa1, 0xd7, 0x2c, 0x15, 0x5d, 0x8b,
+ 0x14, 0x0d, 0x81, 0xaf, 0x2f, 0xbb, 0xf0, 0x35, 0x1f, 0x09, 0x7d, 0xb9, 0xf0, 0x28, 0x7e, 0x3d,
+ 0x18, 0xc3, 0xaf, 0x0c, 0x6f, 0x3e, 0x15, 0xa9, 0x62, 0x0a, 0x80, 0x3d, 0x18, 0x03, 0xb0, 0x85,
+ 0x29, 0x0a, 0xa7, 0x20, 0xd8, 0x9f, 0x87, 0x23, 0xd8, 0x68, 0x8c, 0xc9, 0x87, 0x39, 0x1b, 0x84,
+ 0x55, 0x22, 0x20, 0x6c, 0x29, 0x12, 0x6e, 0x31, 0xf5, 0x33, 0x63, 0xd8, 0xe3, 0x10, 0x0c, 0xcb,
+ 0xd0, 0xe6, 0x8d, 0x48, 0xe5, 0x33, 0x80, 0xd8, 0xe3, 0x10, 0x10, 0xbb, 0x38, 0x55, 0xed, 0x54,
+ 0x14, 0x7b, 0x2f, 0x88, 0x62, 0x51, 0x44, 0xc2, 0xe4, 0x9d, 0xf6, 0x08, 0x18, 0x7b, 0x1a, 0x05,
+ 0x63, 0x19, 0xd4, 0x7c, 0x2e, 0x52, 0xe3, 0x1c, 0x38, 0xf6, 0x60, 0x0c, 0xc7, 0x2e, 0x4f, 0xb1,
+ 0xb4, 0xd9, 0x81, 0x6c, 0x46, 0xcc, 0x32, 0x08, 0xbb, 0x9b, 0xcc, 0x82, 0x98, 0x97, 0x9e, 0x21,
+ 0x71, 0x77, 0xc4, 0xc3, 0x91, 0x04, 0x17, 0x9b, 0xa6, 0x6e, 0x72, 0x48, 0xca, 0x1a, 0xd2, 0x0d,
+ 0x02, 0x6c, 0x3c, 0x6f, 0x36, 0x01, 0xf4, 0x52, 0x20, 0xe1, 0xf3, 0x60, 0xd2, 0x9f, 0x05, 0x4f,
+ 0x96, 0xc2, 0x5e, 0x3f, 0x28, 0xca, 0x71, 0x50, 0xe4, 0x83, 0xc2, 0xf1, 0x20, 0x14, 0x5e, 0x85,
+ 0x3c, 0x01, 0x08, 0x23, 0x28, 0x57, 0x35, 0x5c, 0x94, 0x7b, 0x13, 0x16, 0x69, 0xa8, 0x64, 0x80,
+ 0x99, 0x07, 0xa4, 0x24, 0x0d, 0x48, 0x25, 0xf2, 0x83, 0xad, 0x0b, 0x8b, 0x4c, 0xcf, 0xc3, 0x92,
+ 0x8f, 0xd7, 0x05, 0x1e, 0x0c, 0xf2, 0x89, 0x2e, 0x77, 0x95, 0x23, 0x90, 0xbf, 0x09, 0xde, 0x0a,
+ 0x79, 0xf0, 0x38, 0x0c, 0xc9, 0x0a, 0xdf, 0x12, 0x92, 0x8d, 0x7f, 0x6d, 0x24, 0xeb, 0x07, 0x52,
+ 0x89, 0x20, 0x90, 0xfa, 0x8f, 0xe0, 0xed, 0x89, 0x8b, 0x4b, 0x5b, 0x7a, 0x1b, 0x73, 0x68, 0x43,
+ 0xbf, 0x49, 0x32, 0xd2, 0xd5, 0xcf, 0x39, 0x80, 0x21, 0x9f, 0x84, 0xcb, 0x0d, 0x39, 0x39, 0x1e,
+ 0x51, 0x5c, 0x54, 0xc4, 0x42, 0x3e, 0x47, 0x45, 0x22, 0x24, 0x1e, 0x62, 0x16, 0x20, 0x16, 0x64,
+ 0xf2, 0x49, 0xf8, 0xa8, 0xd9, 0xf1, 0xd0, 0xcd, 0x1a, 0xe8, 0x0e, 0xe4, 0x68, 0xe5, 0x59, 0xd1,
+ 0x0d, 0x8b, 0xc7, 0x84, 0x40, 0x52, 0xc3, 0xca, 0xcf, 0xeb, 0x87, 0x84, 0xe7, 0xc0, 0xb0, 0xe4,
+ 0xac, 0xc1, 0xbf, 0x7c, 0xb9, 0x46, 0x2e, 0x90, 0x6b, 0x5c, 0x83, 0x1c, 0x19, 0xbd, 0x65, 0xa8,
+ 0x2d, 0x4c, 0xeb, 0x9c, 0x39, 0xd9, 0x23, 0x48, 0x9f, 0x0a, 0x50, 0x1a, 0x09, 0x31, 0xa1, 0x73,
+ 0x77, 0x4c, 0x32, 0xee, 0xc3, 0xe9, 0xd7, 0x01, 0xce, 0x55, 0x4b, 0x79, 0x4f, 0xed, 0xdb, 0xb8,
+ 0xcd, 0xa7, 0x9b, 0x3b, 0x57, 0xad, 0x37, 0x28, 0x21, 0xd8, 0x71, 0x76, 0xa4, 0x63, 0x1f, 0x20,
+ 0xcc, 0xf9, 0x01, 0x21, 0xaa, 0x40, 0xd6, 0x30, 0x35, 0xdd, 0xd4, 0xec, 0x4b, 0x3a, 0xda, 0x84,
+ 0xec, 0xb6, 0x77, 0x93, 0xd9, 0x84, 0x98, 0xdc, 0x4d, 0x66, 0x93, 0x62, 0xca, 0xad, 0x3a, 0xb1,
+ 0x23, 0x9b, 0x17, 0x17, 0xa4, 0x0f, 0xe2, 0x9e, 0x2d, 0x6e, 0xe3, 0xae, 0x76, 0x81, 0xcd, 0x39,
+ 0x26, 0x33, 0xdb, 0xe6, 0xae, 0x84, 0x4c, 0xd9, 0x47, 0x21, 0xa3, 0x27, 0xad, 0x81, 0x85, 0xdb,
+ 0xbc, 0xfe, 0xe1, 0xb6, 0x51, 0x03, 0xd2, 0xf8, 0x02, 0xf7, 0x6d, 0xab, 0x9c, 0xa1, 0x36, 0x7c,
+ 0x65, 0x1c, 0x90, 0x92, 0xdf, 0x5b, 0x65, 0x62, 0xb9, 0x5f, 0x7d, 0xbe, 0x2a, 0x32, 0xee, 0xe7,
+ 0xf4, 0x9e, 0x66, 0xe3, 0x9e, 0x61, 0x5f, 0xca, 0x5c, 0x7e, 0xf2, 0xca, 0x4a, 0x55, 0x28, 0x06,
+ 0xe3, 0x3e, 0x7a, 0x02, 0x0a, 0x26, 0xb6, 0x55, 0xad, 0xaf, 0x04, 0x92, 0xf4, 0x05, 0x46, 0x64,
+ 0x27, 0x7f, 0x37, 0x99, 0x15, 0xc4, 0xf8, 0x6e, 0x32, 0x1b, 0x17, 0x13, 0xd2, 0x21, 0x3c, 0x12,
+ 0x1a, 0xf7, 0xd1, 0x4b, 0x90, 0xf3, 0x52, 0x06, 0x81, 0x4e, 0x63, 0x42, 0x11, 0xc3, 0xe3, 0x95,
+ 0xfe, 0x2a, 0x78, 0x2a, 0x83, 0x65, 0x91, 0x3a, 0xa4, 0x4d, 0x6c, 0x0d, 0xba, 0xac, 0x50, 0x51,
+ 0xdc, 0x7c, 0x7e, 0xb6, 0x8c, 0x81, 0x50, 0x07, 0x5d, 0x5b, 0xe6, 0xc2, 0xd2, 0x5b, 0x90, 0x66,
+ 0x14, 0x94, 0x87, 0xcc, 0xf1, 0xfe, 0xfd, 0xfd, 0x83, 0x37, 0xf6, 0xc5, 0x18, 0x02, 0x48, 0x57,
+ 0x6b, 0xb5, 0xfa, 0x61, 0x53, 0x14, 0x50, 0x0e, 0x52, 0xd5, 0xad, 0x03, 0xb9, 0x29, 0xc6, 0x09,
+ 0x59, 0xae, 0xef, 0xd6, 0x6b, 0x4d, 0x31, 0x81, 0x16, 0xa1, 0xc0, 0xbe, 0x95, 0x7b, 0x07, 0xf2,
+ 0x83, 0x6a, 0x53, 0x4c, 0xfa, 0x48, 0x47, 0xf5, 0xfd, 0xed, 0xba, 0x2c, 0xa6, 0xa4, 0x1f, 0xc0,
+ 0xd5, 0xc8, 0x1c, 0xc3, 0xab, 0x79, 0x08, 0xbe, 0x9a, 0x87, 0xf4, 0x71, 0x9c, 0x80, 0xae, 0xa8,
+ 0xc4, 0x01, 0xed, 0x8e, 0x4c, 0x7c, 0x73, 0x8e, 0xac, 0x63, 0x64, 0xf6, 0x04, 0x67, 0x99, 0xf8,
+ 0x0c, 0xdb, 0xad, 0x0e, 0x4b, 0x64, 0x98, 0x9f, 0x2c, 0xc8, 0x05, 0x4e, 0xa5, 0x42, 0x16, 0x63,
+ 0x7b, 0x07, 0xb7, 0x6c, 0x85, 0x9d, 0x36, 0x8b, 0x82, 0x9d, 0x1c, 0x61, 0x23, 0xd4, 0x23, 0x46,
+ 0x94, 0xde, 0x9e, 0x6b, 0x2d, 0x73, 0x90, 0x92, 0xeb, 0x4d, 0xf9, 0x4d, 0x31, 0x81, 0x10, 0x14,
+ 0xe9, 0xa7, 0x72, 0xb4, 0x5f, 0x3d, 0x3c, 0x6a, 0x1c, 0x90, 0xb5, 0x5c, 0x82, 0x92, 0xb3, 0x96,
+ 0x0e, 0x31, 0x25, 0xfd, 0x23, 0x0e, 0x8f, 0x46, 0xa4, 0x3d, 0xe8, 0x0e, 0x80, 0x3d, 0x54, 0x4c,
+ 0xdc, 0xd2, 0xcd, 0x76, 0xb4, 0x91, 0x35, 0x87, 0x32, 0xe5, 0x90, 0x73, 0x36, 0xff, 0xb2, 0x26,
+ 0x94, 0xca, 0xd0, 0x2b, 0x5c, 0x29, 0x99, 0x95, 0xc5, 0x21, 0xde, 0xf5, 0x90, 0x8a, 0x10, 0x6e,
+ 0x11, 0xc5, 0x74, 0x6d, 0xa9, 0x62, 0xca, 0x8f, 0x1e, 0xf8, 0xb1, 0xf0, 0x80, 0x06, 0x98, 0x99,
+ 0x6b, 0xaa, 0x3e, 0xb4, 0xcc, 0x08, 0x16, 0x7a, 0x13, 0x1e, 0x1d, 0x89, 0x8f, 0xae, 0xd2, 0xd4,
+ 0xac, 0x61, 0xf2, 0x91, 0x60, 0x98, 0xe4, 0xaa, 0xa5, 0x3f, 0x24, 0xfc, 0x0b, 0x1b, 0xcc, 0xf2,
+ 0x0e, 0x20, 0x6d, 0xd9, 0xaa, 0x3d, 0xb0, 0xb8, 0xc1, 0xbd, 0x34, 0x6b, 0xca, 0xb8, 0xee, 0x7c,
+ 0x1c, 0x51, 0x71, 0x99, 0xab, 0xf9, 0x7e, 0xbd, 0x2d, 0xe9, 0x36, 0x14, 0x83, 0x8b, 0x13, 0x7d,
+ 0x64, 0x3c, 0x9f, 0x13, 0x97, 0xee, 0x02, 0x1a, 0x4f, 0xa6, 0x43, 0xaa, 0x25, 0x42, 0x58, 0xb5,
+ 0xe4, 0x8f, 0x02, 0x3c, 0x36, 0x21, 0x71, 0x46, 0xaf, 0x8f, 0xec, 0xf3, 0xcb, 0xf3, 0xa4, 0xdd,
+ 0xeb, 0x8c, 0x16, 0xdc, 0x69, 0xe9, 0x16, 0x2c, 0xf8, 0xe9, 0xb3, 0x4d, 0xf2, 0xab, 0xb8, 0xe7,
+ 0xf3, 0x83, 0x65, 0x1d, 0x2f, 0x14, 0x0a, 0xdf, 0x30, 0x14, 0x06, 0xed, 0x2c, 0x3e, 0xa7, 0x9d,
+ 0x1d, 0x85, 0xd9, 0x59, 0x62, 0xae, 0x0c, 0x73, 0x2e, 0x6b, 0x4b, 0x7e, 0x33, 0x6b, 0x0b, 0x1c,
+ 0xb8, 0x54, 0x30, 0x85, 0x7d, 0x13, 0xc0, 0xab, 0x75, 0x91, 0x80, 0x64, 0xea, 0x83, 0x7e, 0x9b,
+ 0x5a, 0x40, 0x4a, 0x66, 0x0d, 0x74, 0x1b, 0x52, 0xc4, 0x92, 0x9c, 0x75, 0x1a, 0x77, 0xaa, 0xc4,
+ 0x12, 0x7c, 0xb5, 0x32, 0xc6, 0x2d, 0x69, 0x80, 0xc6, 0x4b, 0xe5, 0x11, 0x5d, 0xbc, 0x1a, 0xec,
+ 0xe2, 0xf1, 0xc8, 0xa2, 0x7b, 0x78, 0x57, 0xef, 0x43, 0x8a, 0xee, 0x3c, 0x49, 0xbe, 0xe8, 0xfd,
+ 0x0c, 0x87, 0x40, 0xe4, 0x1b, 0xfd, 0x02, 0x40, 0xb5, 0x6d, 0x53, 0x3b, 0x1d, 0x78, 0x1d, 0xac,
+ 0x86, 0x5b, 0x4e, 0xd5, 0xe1, 0xdb, 0xba, 0xc6, 0x4d, 0x68, 0xd9, 0x13, 0xf5, 0x99, 0x91, 0x4f,
+ 0xa1, 0xb4, 0x0f, 0xc5, 0xa0, 0xac, 0x93, 0xb4, 0xb3, 0x31, 0x04, 0x93, 0x76, 0x86, 0xc1, 0x78,
+ 0xd2, 0xee, 0xa6, 0xfc, 0x09, 0x76, 0x09, 0x45, 0x1b, 0xd2, 0x7f, 0x05, 0x58, 0xf0, 0x1b, 0xde,
+ 0xb7, 0x9c, 0x8a, 0x4e, 0xc9, 0xbe, 0xaf, 0x8e, 0x65, 0xa2, 0x99, 0x73, 0xd5, 0x3a, 0xfe, 0x2e,
+ 0x13, 0xd1, 0x0f, 0x04, 0xc8, 0xba, 0x93, 0x0f, 0xde, 0x47, 0x05, 0x2e, 0xf0, 0xd8, 0xda, 0xc5,
+ 0xfd, 0x97, 0x48, 0xec, 0xba, 0x2e, 0xe1, 0x5e, 0xd7, 0xdd, 0x75, 0x73, 0xa5, 0xa8, 0xea, 0x9e,
+ 0x7f, 0xa5, 0xb9, 0x4d, 0x39, 0xa9, 0xe1, 0xef, 0xf8, 0x38, 0x48, 0x92, 0x80, 0x7e, 0x04, 0x69,
+ 0xb5, 0xe5, 0xd6, 0x34, 0x8b, 0x21, 0xc5, 0x3e, 0x87, 0x75, 0xbd, 0x39, 0xac, 0x52, 0x4e, 0x99,
+ 0x4b, 0xf0, 0x51, 0xc5, 0x9d, 0x51, 0x49, 0xaf, 0x11, 0xbd, 0x8c, 0x27, 0xe8, 0x11, 0x8b, 0x00,
+ 0xc7, 0xfb, 0x0f, 0x0e, 0xb6, 0x77, 0xee, 0xed, 0xd4, 0xb7, 0x79, 0xb6, 0xb4, 0xbd, 0x5d, 0xdf,
+ 0x16, 0xe3, 0x84, 0x4f, 0xae, 0x3f, 0x38, 0x38, 0xa9, 0x6f, 0x8b, 0x09, 0xe9, 0x2e, 0xe4, 0x5c,
+ 0xaf, 0x42, 0x10, 0xbe, 0x53, 0x9f, 0x15, 0xf8, 0xd9, 0xe6, 0xd5, 0xf5, 0x65, 0x48, 0x19, 0xfa,
+ 0x7b, 0xfc, 0xee, 0x2c, 0x21, 0xb3, 0x86, 0xd4, 0x86, 0xd2, 0x88, 0x4b, 0x42, 0x77, 0x21, 0x63,
+ 0x0c, 0x4e, 0x15, 0xc7, 0x68, 0x47, 0xaa, 0xd8, 0x0e, 0x76, 0x1c, 0x9c, 0x76, 0xb5, 0xd6, 0x7d,
+ 0x7c, 0xe9, 0x2c, 0x93, 0x31, 0x38, 0xbd, 0xcf, 0x6c, 0x9b, 0xf5, 0x12, 0xf7, 0xf7, 0x72, 0x01,
+ 0x59, 0xe7, 0xa8, 0xa2, 0x1f, 0x43, 0xce, 0xf5, 0x76, 0xee, 0xdd, 0x77, 0xa4, 0x9b, 0xe4, 0xea,
+ 0x3d, 0x11, 0x74, 0x13, 0x16, 0x2d, 0xed, 0xbc, 0xef, 0x94, 0xee, 0x59, 0xf5, 0x26, 0x4e, 0xcf,
+ 0x4c, 0x89, 0xfd, 0xd8, 0x73, 0x0a, 0x0c, 0x24, 0xc8, 0x89, 0xa3, 0xbe, 0xe2, 0xbb, 0x1c, 0x40,
+ 0x48, 0x30, 0x4e, 0x84, 0x05, 0xe3, 0x5f, 0xc5, 0x21, 0xef, 0xbb, 0x19, 0x40, 0x3f, 0xf4, 0x39,
+ 0xae, 0x62, 0x48, 0x14, 0xf1, 0xf1, 0x7a, 0x97, 0xcb, 0xc1, 0x89, 0xc5, 0xe7, 0x9f, 0x58, 0xd4,
+ 0xfd, 0x8b, 0x73, 0xd1, 0x90, 0x9c, 0xfb, 0xa2, 0xe1, 0x39, 0x40, 0xb6, 0x6e, 0xab, 0x5d, 0xe5,
+ 0x42, 0xb7, 0xb5, 0xfe, 0xb9, 0xc2, 0x4c, 0x83, 0xb9, 0x19, 0x91, 0xfe, 0x39, 0xa1, 0x3f, 0x0e,
+ 0xa9, 0x95, 0xfc, 0x52, 0x80, 0xac, 0x8b, 0xe8, 0xe6, 0xbd, 0x7a, 0xbe, 0x02, 0x69, 0x0e, 0x5a,
+ 0xd8, 0xdd, 0x33, 0x6f, 0x85, 0xde, 0xa8, 0x54, 0x20, 0xdb, 0xc3, 0xb6, 0x4a, 0x7d, 0x26, 0x8b,
+ 0x80, 0x6e, 0xfb, 0xe6, 0xcb, 0x90, 0xf7, 0x5d, 0xdb, 0x13, 0x37, 0xba, 0x5f, 0x7f, 0x43, 0x8c,
+ 0x55, 0x32, 0x1f, 0x7e, 0xb2, 0x96, 0xd8, 0xc7, 0xef, 0x91, 0x13, 0x26, 0xd7, 0x6b, 0x8d, 0x7a,
+ 0xed, 0xbe, 0x28, 0x54, 0xf2, 0x1f, 0x7e, 0xb2, 0x96, 0x91, 0x31, 0x2d, 0xa6, 0xdf, 0xbc, 0x0f,
+ 0xa5, 0x91, 0x8d, 0x09, 0x1e, 0x68, 0x04, 0xc5, 0xed, 0xe3, 0xc3, 0xbd, 0x9d, 0x5a, 0xb5, 0x59,
+ 0x57, 0x4e, 0x0e, 0x9a, 0x75, 0x51, 0x40, 0x8f, 0xc2, 0xd2, 0xde, 0xce, 0x4f, 0x1a, 0x4d, 0xa5,
+ 0xb6, 0xb7, 0x53, 0xdf, 0x6f, 0x2a, 0xd5, 0x66, 0xb3, 0x5a, 0xbb, 0x2f, 0xc6, 0x37, 0xff, 0x94,
+ 0x87, 0x52, 0x75, 0xab, 0xb6, 0x43, 0x60, 0x9b, 0xd6, 0x52, 0xa9, 0x7b, 0xa8, 0x41, 0x92, 0x96,
+ 0x05, 0x27, 0x3e, 0xde, 0xab, 0x4c, 0xbe, 0x21, 0x41, 0xf7, 0x20, 0x45, 0x2b, 0x86, 0x68, 0xf2,
+ 0x6b, 0xbe, 0xca, 0x94, 0x2b, 0x13, 0x32, 0x18, 0x7a, 0x9c, 0x26, 0x3e, 0xef, 0xab, 0x4c, 0xbe,
+ 0x41, 0x41, 0x7b, 0x90, 0x71, 0x0a, 0x46, 0xd3, 0xde, 0xdc, 0x55, 0xa6, 0x5e, 0x6b, 0x90, 0xa9,
+ 0xb1, 0xc2, 0xdb, 0xe4, 0x97, 0x7f, 0x95, 0x29, 0x77, 0x2b, 0x68, 0x07, 0xd2, 0xbc, 0xe8, 0x31,
+ 0xe5, 0x31, 0x5f, 0x65, 0xda, 0x6d, 0x09, 0x92, 0x21, 0xe7, 0x95, 0x34, 0xa7, 0xbf, 0x67, 0xac,
+ 0xcc, 0x70, 0x6d, 0x84, 0xde, 0x82, 0x42, 0xb0, 0xa0, 0x32, 0xdb, 0x83, 0xc1, 0xca, 0x8c, 0xf7,
+ 0x32, 0x44, 0x7f, 0xb0, 0xba, 0x32, 0xdb, 0x03, 0xc2, 0xca, 0x8c, 0xd7, 0x34, 0xe8, 0x1d, 0x58,
+ 0x1c, 0xaf, 0x7e, 0xcc, 0xfe, 0x9e, 0xb0, 0x32, 0xc7, 0xc5, 0x0d, 0xea, 0x01, 0x0a, 0xa9, 0x9a,
+ 0xcc, 0xf1, 0xbc, 0xb0, 0x32, 0xcf, 0x3d, 0x0e, 0x6a, 0x43, 0x69, 0xb4, 0x12, 0x31, 0xeb, 0x73,
+ 0xc3, 0xca, 0xcc, 0x77, 0x3a, 0xac, 0x97, 0x20, 0x2c, 0x9f, 0xf5, 0xf9, 0x61, 0x65, 0xe6, 0x2b,
+ 0x1e, 0x74, 0x0c, 0xe0, 0x83, 0x95, 0x33, 0x3c, 0x47, 0xac, 0xcc, 0x72, 0xd9, 0x83, 0x0c, 0x58,
+ 0x0a, 0xc3, 0x9b, 0xf3, 0xbc, 0x4e, 0xac, 0xcc, 0x75, 0x07, 0x44, 0xec, 0x39, 0x88, 0x1c, 0x67,
+ 0x7b, 0xad, 0x58, 0x99, 0xf1, 0x32, 0x68, 0xab, 0xfe, 0xe9, 0x17, 0x2b, 0xc2, 0x67, 0x5f, 0xac,
+ 0x08, 0xff, 0xfe, 0x62, 0x45, 0xf8, 0xe8, 0xcb, 0x95, 0xd8, 0x67, 0x5f, 0xae, 0xc4, 0xfe, 0xf9,
+ 0xe5, 0x4a, 0xec, 0xa7, 0xcf, 0x9e, 0x6b, 0x76, 0x67, 0x70, 0xba, 0xde, 0xd2, 0x7b, 0x1b, 0xfe,
+ 0x07, 0xde, 0x61, 0xcf, 0xca, 0x4f, 0xd3, 0x34, 0xa0, 0xde, 0xfa, 0x5f, 0x00, 0x00, 0x00, 0xff,
+ 0xff, 0xdc, 0x85, 0x19, 0x4e, 0x76, 0x2e, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -5510,10 +5509,10 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error)
i--
dAtA[i] = 0x28
}
- if len(m.ByzantineValidators) > 0 {
- for iNdEx := len(m.ByzantineValidators) - 1; iNdEx >= 0; iNdEx-- {
+ if len(m.Misbehavior) > 0 {
+ for iNdEx := len(m.Misbehavior) - 1; iNdEx >= 0; iNdEx-- {
{
- size, err := m.ByzantineValidators[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ size, err := m.Misbehavior[iNdEx].MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
@@ -5605,10 +5604,10 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error)
i--
dAtA[i] = 0x22
}
- if len(m.ByzantineValidators) > 0 {
- for iNdEx := len(m.ByzantineValidators) - 1; iNdEx >= 0; iNdEx-- {
+ if len(m.Misbehavior) > 0 {
+ for iNdEx := len(m.Misbehavior) - 1; iNdEx >= 0; iNdEx-- {
{
- size, err := m.ByzantineValidators[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ size, err := m.Misbehavior[iNdEx].MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
@@ -5779,10 +5778,10 @@ func (m *RequestFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x22
}
- if len(m.ByzantineValidators) > 0 {
- for iNdEx := len(m.ByzantineValidators) - 1; iNdEx >= 0; iNdEx-- {
+ if len(m.Misbehavior) > 0 {
+ for iNdEx := len(m.Misbehavior) - 1; iNdEx >= 0; iNdEx-- {
{
- size, err := m.ByzantineValidators[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ size, err := m.Misbehavior[iNdEx].MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
@@ -8145,8 +8144,8 @@ func (m *RequestPrepareProposal) Size() (n int) {
}
l = m.LocalLastCommit.Size()
n += 1 + l + sovTypes(uint64(l))
- if len(m.ByzantineValidators) > 0 {
- for _, e := range m.ByzantineValidators {
+ if len(m.Misbehavior) > 0 {
+ for _, e := range m.Misbehavior {
l = e.Size()
n += 1 + l + sovTypes(uint64(l))
}
@@ -8181,8 +8180,8 @@ func (m *RequestProcessProposal) Size() (n int) {
}
l = m.ProposedLastCommit.Size()
n += 1 + l + sovTypes(uint64(l))
- if len(m.ByzantineValidators) > 0 {
- for _, e := range m.ByzantineValidators {
+ if len(m.Misbehavior) > 0 {
+ for _, e := range m.Misbehavior {
l = e.Size()
n += 1 + l + sovTypes(uint64(l))
}
@@ -8261,8 +8260,8 @@ func (m *RequestFinalizeBlock) Size() (n int) {
}
l = m.DecidedLastCommit.Size()
n += 1 + l + sovTypes(uint64(l))
- if len(m.ByzantineValidators) > 0 {
- for _, e := range m.ByzantineValidators {
+ if len(m.Misbehavior) > 0 {
+ for _, e := range m.Misbehavior {
l = e.Size()
n += 1 + l + sovTypes(uint64(l))
}
@@ -11139,7 +11138,7 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 4:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field ByzantineValidators", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
@@ -11166,8 +11165,8 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.ByzantineValidators = append(m.ByzantineValidators, Misbehavior{})
- if err := m.ByzantineValidators[len(m.ByzantineValidators)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ m.Misbehavior = append(m.Misbehavior, Misbehavior{})
+ if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -11408,7 +11407,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 3:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field ByzantineValidators", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
@@ -11435,8 +11434,8 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.ByzantineValidators = append(m.ByzantineValidators, Misbehavior{})
- if err := m.ByzantineValidators[len(m.ByzantineValidators)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ m.Misbehavior = append(m.Misbehavior, Misbehavior{})
+ if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -11985,7 +11984,7 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 3:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field ByzantineValidators", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
@@ -12012,8 +12011,8 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.ByzantineValidators = append(m.ByzantineValidators, Misbehavior{})
- if err := m.ByzantineValidators[len(m.ByzantineValidators)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ m.Misbehavior = append(m.Misbehavior, Misbehavior{})
+ if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
diff --git a/cmd/tendermint/commands/debug/kill.go b/cmd/tendermint/commands/debug/kill.go
index ec741ecb3..bf4ab79ad 100644
--- a/cmd/tendermint/commands/debug/kill.go
+++ b/cmd/tendermint/commands/debug/kill.go
@@ -33,10 +33,14 @@ $ tendermint debug kill 34255 /path/to/tm-debug.zip`,
Args: cobra.ExactArgs(2),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
- pid, err := strconv.ParseInt(args[0], 10, 64)
+ // Using Atoi so that the size of an integer can be automatically inferred.
+ pid, err := strconv.Atoi(args[0])
if err != nil {
return err
}
+ if pid <= 0 {
+ return fmt.Errorf("PID value must be > 0; given value %q, got %d", args[0], pid)
+ }
outFile := args[1]
if outFile == "" {
@@ -95,7 +99,7 @@ $ tendermint debug kill 34255 /path/to/tm-debug.zip`,
}
logger.Info("killing Tendermint process")
- if err := killProc(int(pid), tmpDir); err != nil {
+ if err := killProc(pid, tmpDir); err != nil {
return err
}
@@ -113,6 +117,9 @@ $ tendermint debug kill 34255 /path/to/tm-debug.zip`,
// if the output file cannot be created or the tail command cannot be started.
// An error is not returned if any subsequent syscall fails.
func killProc(pid int, dir string) error {
+ if pid <= 0 {
+ return fmt.Errorf("PID must be > 0, got %d", pid)
+ }
// pipe STDERR output from tailing the Tendermint process to a file
//
// NOTE: This will only work on UNIX systems.
diff --git a/cmd/tendermint/commands/key_migrate.go b/cmd/tendermint/commands/key_migrate.go
index 723026da5..88b9dfe71 100644
--- a/cmd/tendermint/commands/key_migrate.go
+++ b/cmd/tendermint/commands/key_migrate.go
@@ -34,7 +34,6 @@ func RunDatabaseMigration(ctx context.Context, logger log.Logger, conf *config.C
// reduce the possibility of the
// ephemeral data overwriting later data
"tx_index",
- "peerstore",
"light",
"blockstore",
"state",
@@ -57,7 +56,7 @@ func RunDatabaseMigration(ctx context.Context, logger log.Logger, conf *config.C
return fmt.Errorf("constructing database handle: %w", err)
}
- if err = keymigrate.Migrate(ctx, db); err != nil {
+ if err = keymigrate.Migrate(ctx, dbctx, db); err != nil {
return fmt.Errorf("running migration for context %q: %w",
dbctx, err)
}
diff --git a/config/config.go b/config/config.go
index 65f17bfd4..7f6cc3e1f 100644
--- a/config/config.go
+++ b/config/config.go
@@ -619,6 +619,10 @@ type P2PConfig struct { //nolint: maligned
// outbound).
MaxConnections uint16 `mapstructure:"max-connections"`
+ // MaxOutgoingConnections defines the maximum number of connected peers (inbound and
+ // outbound).
+ MaxOutgoingConnections uint16 `mapstructure:"max-outgoing-connections"`
+
// MaxIncomingConnectionAttempts rate limits the number of incoming connection
// attempts per IP address.
MaxIncomingConnectionAttempts uint `mapstructure:"max-incoming-connection-attempts"`
@@ -647,8 +651,8 @@ type P2PConfig struct { //nolint: maligned
DialTimeout time.Duration `mapstructure:"dial-timeout"`
// Makes it possible to configure which queue backend the p2p
- // layer uses. Options are: "fifo" and "priority",
- // with the default being "priority".
+ // layer uses. Options are: "fifo" and "simple-priority", and "priority",
+ // with the default being "simple-priority".
QueueType string `mapstructure:"queue-type"`
}
@@ -659,6 +663,7 @@ func DefaultP2PConfig() *P2PConfig {
ExternalAddress: "",
UPNP: false,
MaxConnections: 64,
+ MaxOutgoingConnections: 12,
MaxIncomingConnectionAttempts: 100,
FlushThrottleTimeout: 100 * time.Millisecond,
// The MTU (Maximum Transmission Unit) for Ethernet is 1500 bytes.
@@ -672,7 +677,7 @@ func DefaultP2PConfig() *P2PConfig {
PexReactor: true,
HandshakeTimeout: 20 * time.Second,
DialTimeout: 3 * time.Second,
- QueueType: "priority",
+ QueueType: "simple-priority",
}
}
@@ -691,6 +696,9 @@ func (cfg *P2PConfig) ValidateBasic() error {
if cfg.RecvRate < 0 {
return errors.New("recv-rate can't be negative")
}
+ if cfg.MaxOutgoingConnections > cfg.MaxConnections {
+ return errors.New("max-outgoing-connections cannot be larger than max-connections")
+ }
return nil
}
diff --git a/config/db.go b/config/db.go
index f508354e0..bbc286944 100644
--- a/config/db.go
+++ b/config/db.go
@@ -25,5 +25,6 @@ type DBProvider func(*DBContext) (dbm.DB, error)
// specified in the Config.
func DefaultDBProvider(ctx *DBContext) (dbm.DB, error) {
dbType := dbm.BackendType(ctx.Config.DBBackend)
+
return dbm.NewDB(ctx.ID, dbType, ctx.Config.DBDir())
}
diff --git a/config/toml.go b/config/toml.go
index c24c22e2f..2da4bca37 100644
--- a/config/toml.go
+++ b/config/toml.go
@@ -311,7 +311,9 @@ pprof-laddr = "{{ .RPC.PprofListenAddress }}"
#######################################################
[p2p]
-# Select the p2p internal queue
+# Select the p2p internal queue.
+# Options are: "fifo" and "simple-priority", and "priority",
+# with the default being "simple-priority".
queue-type = "{{ .P2P.QueueType }}"
# Address to listen for incoming connections
@@ -338,6 +340,10 @@ upnp = {{ .P2P.UPNP }}
# Maximum number of connections (inbound and outbound).
max-connections = {{ .P2P.MaxConnections }}
+# Maximum number of connections reserved for outgoing
+# connections. Must be less than max-connections
+max-outgoing-connections = {{ .P2P.MaxOutgoingConnections }}
+
# Rate limits the number of incoming connection attempts per IP address.
max-incoming-connection-attempts = {{ .P2P.MaxIncomingConnectionAttempts }}
diff --git a/docs/app-dev/abci-cli.md b/docs/app-dev/abci-cli.md
index 109e3b9fb..bb94a36ca 100644
--- a/docs/app-dev/abci-cli.md
+++ b/docs/app-dev/abci-cli.md
@@ -208,6 +208,33 @@ Try running these commands:
-> key.hex: 646566
-> value: xyz
-> value.hex: 78797A
+
+> prepare_proposal "preparedef"
+-> code: OK
+-> log: Succeeded. Tx: def action: ADDED
+-> code: OK
+-> log: Succeeded. Tx: preparedef action: REMOVED
+
+> process_proposal "def"
+-> code: OK
+-> status: ACCEPT
+
+> process_proposal "preparedef"
+-> code: OK
+-> status: REJECT
+
+> prepare_proposal
+
+> process_proposal
+-> code: OK
+-> status: ACCEPT
+
+> finalize_block
+-> code: OK
+-> data.hex: 0x0600000000000000
+
+> commit
+-> code: OK
```
Note that if we do `finalize_block "abc" ...` it will store `(abc, abc)`, but if
diff --git a/docs/introduction/quick-start.md b/docs/introduction/quick-start.md
index 040da8eb2..74baf7201 100644
--- a/docs/introduction/quick-start.md
+++ b/docs/introduction/quick-start.md
@@ -106,10 +106,10 @@ Next, use the `tendermint testnet` command to create four directories of config
Before you can start the network, you'll need peers identifiers (IPs are not enough and can change). We'll refer to them as ID1, ID2, ID3, ID4.
```sh
-tendermint show_node_id --home ./mytestnet/node0
-tendermint show_node_id --home ./mytestnet/node1
-tendermint show_node_id --home ./mytestnet/node2
-tendermint show_node_id --home ./mytestnet/node3
+tendermint show-node-id --home ./mytestnet/node0
+tendermint show-node-id --home ./mytestnet/node1
+tendermint show-node-id --home ./mytestnet/node2
+tendermint show-node-id --home ./mytestnet/node3
```
Finally, from each machine, run:
diff --git a/docs/introduction/what-is-tendermint.md b/docs/introduction/what-is-tendermint.md
index 417152d74..18fe5ce77 100644
--- a/docs/introduction/what-is-tendermint.md
+++ b/docs/introduction/what-is-tendermint.md
@@ -103,9 +103,9 @@ Another example of a cryptocurrency application built on Tendermint is
to Tendermint, but is more opinionated about how the state is managed,
and requires that all application behaviour runs in potentially many
docker containers, modules it calls "chaincode". It uses an
-implementation of [PBFT](http://pmg.csail.mit.edu/papers/osdi99.pdf).
+implementation of [PBFT](http://pmg.csail.mit.edu/papers/osdi99.pdf)
from a team at IBM that is augmented to handle potentially non-deterministic
-chaincode It is possible to implement this docker-based behaviour as a ABCI app
+chaincode. It is possible to implement this docker-based behaviour as a ABCI app
in Tendermint, though extending Tendermint to handle non-determinism remains
for future work.
diff --git a/docs/package-lock.json b/docs/package-lock.json
index 7240aaa2d..da9a0c1c2 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -12288,9 +12288,9 @@
}
},
"node_modules/terser": {
- "version": "4.8.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
- "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+ "version": "4.8.1",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+ "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
"dependencies": {
"commander": "^2.20.0",
"source-map": "~0.6.1",
@@ -23925,9 +23925,9 @@
"integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
},
"terser": {
- "version": "4.8.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
- "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+ "version": "4.8.1",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+ "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
"requires": {
"commander": "^2.20.0",
"source-map": "~0.6.1",
diff --git a/docs/rfc/README.md b/docs/rfc/README.md
index 2872c988a..c1461e887 100644
--- a/docs/rfc/README.md
+++ b/docs/rfc/README.md
@@ -58,5 +58,6 @@ sections.
- [RFC-018: BLS Signature Aggregation Exploration](./rfc-018-bls-agg-exploration.md)
- [RFC-019: Configuration File Versioning](./rfc-019-config-version.md)
- [RFC-020: Onboarding Projects](./rfc-020-onboarding-projects.rst)
+- [RFC-021: The Future of the Socket Protocol](./rfc-021-socket-protocol.md)
diff --git a/docs/rfc/rfc-013-abci++.md b/docs/rfc/rfc-013-abci++.md
index 0289c187e..6e83c9aa2 100644
--- a/docs/rfc/rfc-013-abci++.md
+++ b/docs/rfc/rfc-013-abci++.md
@@ -3,7 +3,7 @@
## Changelog
- 2020-01-11: initialized
-- 2021-02-11: Migrate RFC to tendermint repo (Originally [RFC 004](https://github.com/tendermint/spec/pull/254))
+- 2022-02-11: Migrate RFC to tendermint repo (Originally [RFC 004](https://github.com/tendermint/spec/pull/254))
## Author(s)
diff --git a/docs/rfc/rfc-021-socket-protocol.md b/docs/rfc/rfc-021-socket-protocol.md
new file mode 100644
index 000000000..74034d20a
--- /dev/null
+++ b/docs/rfc/rfc-021-socket-protocol.md
@@ -0,0 +1,266 @@
+# RFC 021: The Future of the Socket Protocol
+
+## Changelog
+
+- 19-May-2022: Initial draft (@creachadair)
+- 19-Jul-2022: Converted from ADR to RFC (@creachadair)
+
+## Abstract
+
+This RFC captures some technical discussion about the ABCI socket protocol that
+was originally documented to solicit an architectural decision. This topic was
+not high-enough priority as of this writing to justify making a final decision.
+
+For that reason, the text of this RFC has the general structure of an ADR, but
+should be viewed primarily as a record of the issue for future reference.
+
+## Background
+
+The [Application Blockchain Interface (ABCI)][abci] is a client-server protocol
+used by the Tendermint consensus engine to communicate with the application on
+whose behalf it performs state replication. There are currently three transport
+options available for ABCI applications:
+
+1. **In-process**: Applications written in Go can be linked directly into the
+ same binary as the consensus node. Such applications use a "local" ABCI
+ connection, which exposes application methods to the node as direct function
+ calls.
+
+2. **Socket protocol**: Out-of-process applications may export the ABCI service
+ via a custom socket protocol that sends requests and responses over a
+ Unix-domain or TCP socket connection as length-prefixed protocol buffers.
+ In Tendermint, this is handled by the [socket client][socket-client].
+
+3. **gRPC**: Out-of-process applications may export the ABCI service via gRPC.
+ In Tendermint, this is handled by the [gRPC client][grpc-client].
+
+Both the out-of-process options (2) and (3) have a long history in Tendermint.
+The beginnings of the gRPC client were added in [May 2016][abci-start] when
+ABCI was still hosted in a separate repository, and the socket client (formerly
+called the "remote client") was part of ABCI from its inception in November
+2015.
+
+At that time when ABCI was first being developed, the gRPC project was very new
+(it launched Q4 2015) and it was not an obvious choice for use in Tendermint.
+It took a while before the language coverage and quality of gRPC reached a
+point where it could be a viable solution for out-of-process applications. For
+that reason, it made sense for the initial design of ABCI to focus on a custom
+protocol for out-of-process applications.
+
+## Problem Statement
+
+For practical reasons, ABCI needs an interprocess communication option to
+support applications not written in Go. The two practical options are RPC and
+FFI, and for operational reasons an RPC mechanism makes more sense.
+
+The socket protocol has not changed all that substantially since its original
+design, and has the advantage of being simple to implement in almost any
+reasonable language. However, its simplicity includes some limitations that
+have had a negative impact on the stability and performance of out-of-process
+applications using it. In particular:
+
+- The protocol lacks request identifiers, so the client and server must return
+ responses in strict FIFO order. Even if the client issues requests that have
+ no dependency on each other, the protocol has no way except order of issue to
+ map responses to requests.
+
+ This reduces (in some cases substantially) the concurrency an application can
+ exploit, since the parallelism of requests in flight is gated by the slowest
+ active request at any moment. There have been complaints from some network
+ operators on that basis.
+
+- The protocol lacks method identifiers, so the only way for the client and
+ server to understand which operation is requested is to dispatch on the type
+ of the request and response payloads. For responses, this means that [any
+ error condition is terminal not only to the request, but to the entire ABCI
+ client](https://github.com/tendermint/tendermint/blob/master/abci/client/socket_client.go#L149).
+
+ The historical intent of terminating for any error seems to have been that
+ all ABCI errors are unrecoverable and hence protocol fatal
+ (see [Note 1](#note1)). In practice, however, this greatly complicates
+ debugging a faulty node, since the only way to respond to errors is to panic
+ the node which loses valuable context that could have been logged.
+
+- There are subtle concurrency management dependencies between the client and
+ the server that are not clearly documented anywhere, and it is very easy for
+ small changes in both the client and the server to lead to tricky deadlocks,
+ panics, race conditions, and slowdowns. As a recent example of this, see
+ https://github.com/tendermint/tendermint/pull/8581.
+
+These limitations are fixable, but one important question is whether it is
+worthwhile to fix them. We can add request and method identifiers, for
+example, but doing so would be a breaking change to the protocol requiring
+every application using it to update. If applications have to migrate anyway,
+the stability and language coverage of gRPC have improved a lot, and today it
+is probably simpler to set up and maintain an application using gRPC transport
+than to reimplement the Tendermint socket protocol.
+
+Moreover, gRPC addresses all the above issues out-of-the-box, and requires
+(much) less custom code for both the server (i.e., the application) and the
+client. The project is well-funded and widely-used, which makes it a safe bet
+for a dependency.
+
+## Decision
+
+There is a set of related alternatives to consider:
+
+- Question 1: Designate a single IPC standard for out-of-process applications?
+
+ Claim: We should converge on one (and only one) IPC option for out-of-process
+ applications. We should choose an option that, after a suitable period of
+ deprecation for alternatives, will address most or all the highest-impact
+ uses of Tendermint. Maintaining multiple options increases the surface area
+ for bugs and vulnerabilities, and we should not have multiple options for
+ basic interfaces without a clear and well-documented reason.
+
+- Question 2a: Choose gRPC and deprecate/remove the socket protocol?
+
+ Claim: Maintaining and improving a custom RPC protocol is a substantial
+ project and not directly relevant to the requirements of consensus. We would
+ be better served by depending on a well-maintained open-source library like
+ gRPC.
+
+- Question 2b: Improve the socket protocol and deprecate/remove gRPC?
+
+ Claim: If we find meaningful advantages to maintaining our own custom RPC
+ protocol in Tendermint, we should treat it as a first-class project within
+ the core and invest in making it good enough that we do not require other
+ options.
+
+**One important consideration** when discussing these questions is that _any
+outcome which includes keeping the socket protocol will have eventual migration
+impacts for out-of-process applications_ regardless. To fix the limitations of
+the socket protocol as it is currently designed will require making _breaking
+changes_ to the protocol. So, while we may put off a migration cost for
+out-of-process applications by retaining the socket protocol in the short term,
+we will eventually have to pay those costs to fix the problems in its current
+design.
+
+## Detailed Design
+
+1. If we choose to standardize on gRPC, the main work in Tendermint core will
+ be removing and cleaning up the code for the socket client and server.
+
+ Besides the code cleanup, we will also need to clearly document a
+ deprecation schedule, and invest time in making the migration easier for
+ applications currently using the socket protocol.
+
+ > **Point for discussion:** Migrating from the socket protocol to gRPC
+ > should mostly be a plumbing change, as long as we do it during a release
+ > in which we are not making other breaking changes to ABCI. However, the
+ > effort may be more or less depending on how gRPC integration works in the
+ > application's implementation language, and would have to be sure networks
+ > have plenty of time not only to make the change but to verify that it
+ > preserves the function of the network.
+ >
+ > What questions should we be asking node operators and application
+ > developers to understand the migration costs better?
+
+2. If we choose to keep only the socket protocol, we will need to follow up
+ with a more detailed design for extending and upgrading the protocol to fix
+ the existing performance and operational issues with the protocol.
+
+ Moreover, since the gRPC interface has been around for a long time we will
+ also need a deprecation plan for it.
+
+3. If we choose to keep both options, we will still need to do all the work of
+ (2), but the gRPC implementation should not require any immediate changes.
+
+
+## Alternatives Considered
+
+- **FFI**. Another approach we could take is to use a C-based FFI interface so
+ that applications written in other languages are linked directly with the
+ consensus node, an option currently only available for Go applications.
+
+ An FFI interface is possible for a lot of languages, but FFI support varies
+ widely in coverage and quality across languages and the points of friction
+ can be tricky to work around. Moreover, it's much harder to add FFI support
+ to a language where it's missing after-the-fact for an application developer.
+
+ Although a basic FFI interface is not too difficult on the Go side, the C
+ shims for an FFI can get complicated if there's a lot of variability in the
+ runtime environment on the other end.
+
+ If we want to have one answer for non-Go applications, we are better off
+ picking an IPC-based solution (whether that's gRPC or an extension of our
+ custom socket protocol or something else).
+
+## Consequences
+
+- **Standardize on gRPC**
+
+ - ✅ Addresses existing performance and operational issues.
+ - ✅ Replaces custom code with a well-maintained widely-used library.
+ - ✅ Aligns with Cosmos SDK, which already uses gRPC extensively.
+ - ✅ Aligns with priv validator interface, for which the socket protocol is already deprecated for gRPC.
+ - ❓ Applications will be hard to implement in a language without gRPC support.
+ - ⛔ All users of the socket protocol have to migrate to gRPC, and we believe most current out-of-process applications use the socket protocol.
+
+- **Standardize on socket protocol**
+
+ - ✅ Less immediate impact for existing users (but see below).
+ - ✅ Simplifies ABCI API surface by removing gRPC.
+ - ❓ Users of the socket protocol will have a (smaller) migration.
+ - ❓ Potentially easier to implement for languages that do not have support.
+ - ⛔ Need to do all the work to fix the socket protocol (which will require existing users to update anyway later).
+ - ⛔ Ongoing maintenance burden for per-language server implementations.
+
+- **Keep both options**
+
+ - ✅ Less immediate impact for existing users (but see below).
+ - ❓ Users of the socket protocol will have a (smaller) migration.
+ - ⛔ Still need to do all the work to fix the socket protocol (which will require existing users to update anyway later).
+ - ⛔ Requires ongoing maintenance and support of both gRPC and socket protocol integrations.
+
+
+## References
+
+- [Application Blockchain Interface (ABCI)][abci]
+- [Tendermint ABCI socket client][socket-client]
+- [Tendermint ABCI gRPC client][grpc-client]
+- [Initial commit of gRPC client][abci-start]
+
+[abci]: https://github.com/tendermint/spec/tree/master/spec/abci
+[socket-client]: https://github.com/tendermint/tendermint/blob/master/abci/client/socket_client.go
+[socket-server]: https://github.com/tendermint/tendermint/blob/master/abci/server/socket_server.go
+[grpc-client]: https://github.com/tendermint/tendermint/blob/master/abci/client/grpc_client.go
+[abci-start]: https://github.com/tendermint/abci/commit/1ab3c747182aaa38418258679c667090c2bb1e0d
+
+## Notes
+
+- **Note 1**: The choice to make all ABCI errors protocol-fatal
+ was intended to avoid the risk that recovering an application error could
+ cause application state to diverge. Divergence can break consensus, so it's
+ essential to avoid it.
+
+ This is a sound principle, but conflates protocol errors with "mechanical"
+ errors such as timeouts, resoures exhaustion, failed connections, and so on.
+ Because the protocol has no way to distinguish these conditions, the only way
+ for an application to report an error is to panic or crash.
+
+ Whether a node is running in the same process as the application or as a
+ separate process, application errors should not be suppressed or hidden.
+ However, it's important to ensure that errors are handled at a consistent and
+ well-defined point in the protocol: Having the application panic or crash
+ rather than reporting an error means the node sees different results
+ depending on whether the application runs in-process or out-of-process, even
+ if the application logic is otherwise identical.
+
+## Appendix: Known Implementations of ABCI Socket Protocol
+
+This is a list of known implementations of the Tendermint custom socket
+protocol. Note that in most cases I have not checked how complete or correct
+these implementations are; these are based on search results and a cursory
+visual inspection.
+
+- Tendermint Core (Go): [client][socket-client], [server][socket-server]
+- Informal Systems [tendermint-rs](https://github.com/informalsystems/tendermint-rs) (Rust): [client](https://github.com/informalsystems/tendermint-rs/blob/master/abci/src/client.rs), [server](https://github.com/informalsystems/tendermint-rs/blob/master/abci/src/server.rs)
+- Tendermint [js-abci](https://github.com/tendermint/js-abci) (JS): [server](https://github.com/tendermint/js-abci/blob/master/src/server.js)
+- [Hotmoka](https://github.com/Hotmoka/hotmoka) ABCI (Java): [server](https://github.com/Hotmoka/hotmoka/blob/master/io-hotmoka-tendermint-abci/src/main/java/io/hotmoka/tendermint_abci/Server.java)
+- [Tower ABCI](https://github.com/penumbra-zone/tower-abci) (Rust): [server](https://github.com/penumbra-zone/tower-abci/blob/main/src/server.rs)
+- [abci-host](https://github.com/datopia/abci-host) (Clojure): [server](https://github.com/datopia/abci-host/blob/master/src/abci/host.clj)
+- [abci_server](https://github.com/KrzysiekJ/abci_server) (Erlang): [server](https://github.com/KrzysiekJ/abci_server/blob/master/src/abci_server.erl)
+- [py-abci](https://github.com/davebryson/py-abci) (Python): [server](https://github.com/davebryson/py-abci/blob/master/src/abci/server.py)
+- [scala-tendermint-server](https://github.com/intechsa/scala-tendermint-server) (Scala): [server](https://github.com/InTechSA/scala-tendermint-server/blob/master/src/main/scala/lu/intech/tendermint/Server.scala)
+- [kepler](https://github.com/f-o-a-m/kepler) (Rust): [server](https://github.com/f-o-a-m/kepler/blob/master/hs-abci-server/src/Network/ABCI/Server.hs)
diff --git a/docs/tendermint-core/using-tendermint.md b/docs/tendermint-core/using-tendermint.md
index 9501c5e66..b249d2619 100644
--- a/docs/tendermint-core/using-tendermint.md
+++ b/docs/tendermint-core/using-tendermint.md
@@ -254,7 +254,7 @@ afford to lose all blockchain data!
To reset a blockchain, stop the node and run:
```sh
-tendermint unsafe_reset_all
+tendermint unsafe-reset-all
```
This command will remove the data directory and reset private validator and
diff --git a/docs/tools/debugging/proposer-based-timestamps-runbook.md b/docs/tools/debugging/proposer-based-timestamps-runbook.md
index a817bd29e..cb32248dd 100644
--- a/docs/tools/debugging/proposer-based-timestamps-runbook.md
+++ b/docs/tools/debugging/proposer-based-timestamps-runbook.md
@@ -213,4 +213,4 @@ documentation](https://hub.cosmos.network/main/governance/submitting.html#sendin
If the application does not implement a way to update the consensus parameters
programatically, then the application itself must be updated to do so. More information on updating
-the consensus parameters via ABCI can be found in the [FinalizeBlock documentation](https://github.com/tendermint/tendermint/blob/master/spec/abci++/abci++_methods_002_draft.md#finalizeblock).
+the consensus parameters via ABCI can be found in the [FinalizeBlock documentation](../../../spec/abci++/abci%2B%2B_methods.md#finalizeblock).
diff --git a/docs/tutorials/go-built-in.md b/docs/tutorials/go-built-in.md
index 456024ebf..35f0cbca9 100644
--- a/docs/tutorials/go-built-in.md
+++ b/docs/tutorials/go-built-in.md
@@ -23,8 +23,6 @@ yourself with the syntax.
By following along with this guide, you'll create a Tendermint Core project
called kvstore, a (very) simple distributed BFT key-value store.
-> Note: please use a released version of Tendermint with this guide. The guides will work with the latest version. Please, do not use master.
-
## Built-in app vs external app
Running your application inside the same process as Tendermint Core will give
@@ -36,28 +34,27 @@ through a TCP, Unix domain socket or gRPC.
## 1.1 Installing Go
Please refer to [the official guide for installing
-Go](https://golang.org/doc/install).
+Go](https://go.dev/doc/install).
Verify that you have the latest version of Go installed:
-```bash
+```sh
$ go version
-go version go1.16.x darwin/amd64
+go version go1.18.x darwin/amd64
```
## 1.2 Creating a new Go project
-We'll start by creating a new Go project.
+We'll start by creating a new Go project. First, initialize the project folder with `go mod init`. Running this command should create the `go.mod` file.
-```bash
-mkdir kvstore
-cd kvstore
-go mod init github.com//
+```sh
+$ mkdir kvstore
+$ cd kvstore
+$ go mod init github.com//kvstore
+go: creating new go.mod: module github.com//kvstore
```
-Inside the example directory create a `main.go` file with the following content:
-
-> Note: there is no need to clone or fork Tendermint in this tutorial.
+Inside the project directory, create a `main.go` file with the following content:
```go
package main
@@ -73,7 +70,7 @@ func main() {
When run, this should print "Hello, Tendermint Core" to the standard output.
-```bash
+```sh
$ go run main.go
Hello, Tendermint Core
```
@@ -152,16 +149,43 @@ func (KVStoreApplication) ApplySnapshotChunk(abcitypes.RequestApplySnapshotChunk
}
```
-Now I will go through each method explaining when it's called and adding
+Now, we will go through each method and explain when it is executed while adding
required business logic.
-### 1.3.1 CheckTx
+### 1.3.1 Key-value store setup
-When a new transaction is added to the Tendermint Core, it will ask the
-application to check it (validate the format, signatures, etc.).
+For the underlying key-value store we'll use the latest version of [badger](https://github.com/dgraph-io/badger), which is an embeddable, persistent and fast key-value (KV) database.
+
+```sh
+$ go get github.com/dgraph-io/badger/v3
+go: added github.com/dgraph-io/badger/v3 v3.2103.2
+```
```go
-import "bytes"
+import "github.com/dgraph-io/badger/v3"
+
+type KVStoreApplication struct {
+ db *badger.DB
+ currentBatch *badger.Txn
+}
+
+func NewKVStoreApplication(db *badger.DB) *KVStoreApplication {
+ return &KVStoreApplication{
+ db: db,
+ }
+}
+```
+
+### 1.3.2 CheckTx
+
+When a new transaction is added to the Tendermint Core, it will ask the application to check it (validate the format, signatures, etc.).
+
+```go
+import (
+ "bytes"
+
+ ...
+)
func (app *KVStoreApplication) isValid(tx []byte) (code uint32) {
// check format
@@ -214,26 +238,7 @@ Valid transactions will eventually be committed given they are not too big and
have enough gas. To learn more about gas, check out ["the
specification"](https://github.com/tendermint/tendermint/blob/master/spec/abci/apps.md#gas).
-For the underlying key-value store we'll use
-[badger](https://github.com/dgraph-io/badger), which is an embeddable,
-persistent and fast key-value (KV) database.
-
-```go
-import "github.com/dgraph-io/badger"
-
-type KVStoreApplication struct {
- db *badger.DB
- currentBatch *badger.Txn
-}
-
-func NewKVStoreApplication(db *badger.DB) *KVStoreApplication {
- return &KVStoreApplication{
- db: db,
- }
-}
-```
-
-### 1.3.2 BeginBlock -> DeliverTx -> EndBlock -> Commit
+### 1.3.3 BeginBlock -> DeliverTx -> EndBlock -> Commit
When Tendermint Core has decided on the block, it's transfered to the
application in 3 parts: `BeginBlock`, one `DeliverTx` per transaction and
@@ -290,7 +295,7 @@ func (app *KVStoreApplication) Commit() abcitypes.ResponseCommit {
}
```
-### 1.3.3 Query
+### 1.3.4 Query
Now, when the client wants to know whenever a particular key/value exist, it
will call Tendermint Core RPC `/abci_query` endpoint, which in turn will call
@@ -348,17 +353,15 @@ import (
"path/filepath"
"syscall"
- "github.com/dgraph-io/badger"
+ "github.com/dgraph-io/badger/v3"
"github.com/spf13/viper"
- abci "github.com/tendermint/tendermint/abci/types"
- cfg "github.com/tendermint/tendermint/config"
- tmflags "github.com/tendermint/tendermint/libs/cli/flags"
- "github.com/tendermint/tendermint/libs/log"
- nm "github.com/tendermint/tendermint/node"
- "github.com/tendermint/tendermint/internal/p2p"
- "github.com/tendermint/tendermint/privval"
- "github.com/tendermint/tendermint/proxy"
+ abciclient "github.com/tendermint/tendermint/abci/client"
+ abcitypes "github.com/tendermint/tendermint/abci/types"
+ tmconfig "github.com/tendermint/tendermint/config"
+ tmlog "github.com/tendermint/tendermint/libs/log"
+ tmservice "github.com/tendermint/tendermint/libs/service"
+ tmnode "github.com/tendermint/tendermint/node"
)
var configFile string
@@ -395,57 +398,42 @@ func main() {
<-c
}
-func newTendermint(app abci.Application, configFile string) (*nm.Node, error) {
- // read config
- config := cfg.DefaultValidatorConfig()
- config.RootDir = filepath.Dir(filepath.Dir(configFile))
- viper.SetConfigFile(configFile)
- if err := viper.ReadInConfig(); err != nil {
- return nil, fmt.Errorf("viper failed to read config file: %w", err)
- }
- if err := viper.Unmarshal(config); err != nil {
- return nil, fmt.Errorf("viper failed to unmarshal config: %w", err)
- }
- if err := config.ValidateBasic(); err != nil {
- return nil, fmt.Errorf("config is invalid: %w", err)
- }
+func newTendermint(app abcitypes.Application, configFile string) (tmservice.Service, error) {
+ // read config
+ config := tmconfig.DefaultValidatorConfig()
+ config.SetRoot(filepath.Dir(filepath.Dir(configFile)))
- // create logger
- logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
- var err error
- logger, err = tmflags.ParseLogLevel(config.LogLevel, logger, cfg.DefaultLogLevel)
- if err != nil {
- return nil, fmt.Errorf("failed to parse log level: %w", err)
- }
+ viper.SetConfigFile(configFile)
+ if err := viper.ReadInConfig(); err != nil {
+ return nil, fmt.Errorf("viper failed to read config file: %w", err)
+ }
+ if err := viper.Unmarshal(config); err != nil {
+ return nil, fmt.Errorf("viper failed to unmarshal config: %w", err)
+ }
+ if err := config.ValidateBasic(); err != nil {
+ return nil, fmt.Errorf("config is invalid: %w", err)
+ }
- // read private validator
- pv := privval.LoadFilePV(
- config.PrivValidatorKeyFile(),
- config.PrivValidatorStateFile(),
- )
+ // create logger
+ logger, err := tmlog.NewDefaultLogger(tmlog.LogFormatPlain, config.LogLevel, false)
+ if err != nil {
+ return nil, fmt.Errorf("failed to create logger: %w", err)
+ }
- // read node key
- nodeKey, err := p2p.LoadNodeKey(config.NodeKeyFile())
- if err != nil {
- return nil, fmt.Errorf("failed to load node's key: %w", err)
- }
+ // create node
+ node, err := tmnode.New(
+ config,
+ logger,
+ abciclient.NewLocalCreator(app),
+ nil,
+ )
+ if err != nil {
+ return nil, fmt.Errorf("failed to create new Tendermint node: %w", err)
+ }
- // create node
- node, err := nm.NewNode(
- config,
- pv,
- nodeKey,
- abcicli.NewLocalClientCreator(app),
- nm.DefaultGenesisDocProviderFunc(config),
- nm.DefaultDBProvider,
- nm.DefaultMetricsProvider(config.Instrumentation),
- logger)
- if err != nil {
- return nil, fmt.Errorf("failed to create new Tendermint node: %w", err)
- }
-
- return node, nil
+ return node, nil
}
+
```
This is a huge blob of code, so let's break it down into pieces.
@@ -469,7 +457,7 @@ This can be avoided by setting the truncate option to true, like this:
db, err := badger.Open(badger.DefaultOptions("/tmp/badger").WithTruncate(true))
```
-Then we use it to create a Tendermint Core `Node` instance:
+Then we use it to create a Tendermint Core [Service](https://github.com/tendermint/tendermint/blob/v0.35.8/libs/service/service.go#L24) instance:
```go
flag.Parse()
@@ -483,75 +471,48 @@ if err != nil {
...
// create node
-node, err := nm.NewNode(
- config,
- pv,
- nodeKey,
- abcicli.NewLocalClientCreator(app),
- nm.DefaultGenesisDocProviderFunc(config),
- nm.DefaultDBProvider,
- nm.DefaultMetricsProvider(config.Instrumentation),
- logger)
+node, err := tmnode.New(
+ config,
+ logger,
+ abciclient.NewLocalCreator(app),
+ nil,
+)
if err != nil {
- return nil, fmt.Errorf("failed to create new Tendermint node: %w", err)
+ return nil, fmt.Errorf("failed to create new Tendermint node: %w", err)
}
```
-`NewNode` requires a few things including a configuration file, a private
-validator, a node key and a few others in order to construct the full node.
+[tmnode.New](https://github.com/tendermint/tendermint/blob/v0.35.8/node/public.go#L29) requires a few things including a configuration file, a logger and a few others in order to construct the full node.
-Note we use `abcicli.NewLocalClientCreator` here to create a local client instead
-of one communicating through a socket or gRPC.
+Note that we use [abciclient.NewLocalCreator](https://github.com/tendermint/tendermint/blob/v0.35.8/abci/client/creators.go#L15) here to create a local client instead of one communicating through a socket or gRPC.
[viper](https://github.com/spf13/viper) is being used for reading the config,
which we will generate later using the `tendermint init` command.
```go
-config := cfg.DefaultValidatorConfig()
-config.RootDir = filepath.Dir(filepath.Dir(configFile))
+// read config
+config := tmconfig.DefaultValidatorConfig()
+config.SetRoot(filepath.Dir(filepath.Dir(configFile)))
viper.SetConfigFile(configFile)
if err := viper.ReadInConfig(); err != nil {
- return nil, fmt.Errorf("viper failed to read config file: %w", err)
+ return nil, fmt.Errorf("viper failed to read config file: %w", err)
}
if err := viper.Unmarshal(config); err != nil {
- return nil, fmt.Errorf("viper failed to unmarshal config: %w", err)
+ return nil, fmt.Errorf("viper failed to unmarshal config: %w", err)
}
if err := config.ValidateBasic(); err != nil {
- return nil, fmt.Errorf("config is invalid: %w", err)
+ return nil, fmt.Errorf("config is invalid: %w", err)
}
```
-We use `FilePV`, which is a private validator (i.e. thing which signs consensus
-messages). Normally, you would use `SignerRemote` to connect to an external
-[HSM](https://kb.certus.one/hsm.html).
+As for the logger, we use the built-in library, which provides a nice
+abstraction over [zerolog](https://github.com/rs/zerolog).
```go
-pv := privval.LoadFilePV(
- config.PrivValidatorKeyFile(),
- config.PrivValidatorStateFile(),
-)
-
-```
-
-`nodeKey` is needed to identify the node in a p2p network.
-
-```go
-nodeKey, err := p2p.LoadNodeKey(config.NodeKeyFile())
+// create logger
+logger, err := tmlog.NewDefaultLogger(tmlog.LogFormatPlain, config.LogLevel, true)
if err != nil {
- return nil, fmt.Errorf("failed to load node's key: %w", err)
-}
-```
-
-As for the logger, we use the build-in library, which provides a nice
-abstraction over [go-kit's
-logger](https://github.com/go-kit/kit/tree/master/log).
-
-```go
-logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
-var err error
-logger, err = tmflags.ParseLogLevel(config.LogLevel, logger, cfg.DefaultLogLevel())
-if err != nil {
- return nil, fmt.Errorf("failed to parse log level: %w", err)
+ return nil, fmt.Errorf("failed to create logger: %w", err)
}
```
@@ -570,40 +531,41 @@ signal.Notify(c, os.Interrupt, syscall.SIGTERM)
<-c
```
-## 1.5 Getting Up and Running
+## 1.5 Getting up and running
-We are going to use [Go modules](https://github.com/golang/go/wiki/Modules) for
-dependency management.
-
-```bash
-export GO111MODULE=on
-go mod init github.com/me/example
-```
-
-This should create a `go.mod` file. The current tutorial only works with
-the master branch of Tendermint. so let's make sure we're using the latest version:
+Make sure to enable [Go modules](https://github.com/golang/go/wiki/Modules). Run `go mod tidy` to download and add dependencies in `go.mod` file.
```sh
-go get github.com/tendermint/tendermint@master
+$ go mod tidy
+...
+```
+
+Let's make sure we're using the latest version of Tendermint (currently `v0.35.8`).
+
+```sh
+$ go get github.com/tendermint/tendermint@latest
+...
```
This will populate the `go.mod` with a release number followed by a hash for Tendermint.
```go
-module github.com/me/example
+module github.com//kvstore
-go 1.15
+go 1.18
require (
- github.com/dgraph-io/badger v1.6.2
- github.com/tendermint/tendermint
+ github.com/dgraph-io/badger/v3 v3.2103.2
+ github.com/tendermint/tendermint v0.35.8
+ ...
)
```
-Now we can build the binary:
+Now, we can build the binary:
-```bash
-go build
+```sh
+$ go build
+...
```
To create a default configuration, nodeKey and private validator files, let's
@@ -614,66 +576,87 @@ installing from source, don't forget to checkout the latest release (`git
checkout vX.Y.Z`). Don't forget to check that the application uses the same
major version.
-```bash
-$ rm -rf /tmp/example
-$ TMHOME="/tmp/example" tendermint init validator
+```sh
+$ rm -rf /tmp/kvstore /tmp/badger
+$ TMHOME="/tmp/kvstore" tendermint init validator
-I[2019-07-16|18:40:36.480] Generated private validator module=main keyFile=/tmp/example/config/priv_validator_key.json stateFile=/tmp/example2/data/priv_validator_state.json
-I[2019-07-16|18:40:36.481] Generated node key module=main path=/tmp/example/config/node_key.json
-I[2019-07-16|18:40:36.482] Generated genesis file module=main path=/tmp/example/config/genesis.json
-I[2019-07-16|18:40:36.483] Generated config module=main mode=validator
+2022-07-20T17:04:41+08:00 INFO Generated private validator keyFile=/tmp/kvstore/config/priv_validator_key.json module=main stateFile=/tmp/kvstore/data/priv_validator_state.json
+2022-07-20T17:04:41+08:00 INFO Generated node key module=main path=/tmp/kvstore/config/node_key.json
+2022-07-20T17:04:41+08:00 INFO Generated genesis file module=main path=/tmp/kvstore/config/genesis.json
+2022-07-20T17:04:41+08:00 INFO Generated config mode=validator module=main
```
+Feel free to explore the generated files, which can be found at
+`/tmp/kvstore/config` directory. Documentation on the config can be found
+[here](https://docs.tendermint.com/master/tendermint-core/configuration.html).
+
We are ready to start our application:
-```bash
-$ ./example -config "/tmp/example/config/config.toml"
+```sh
+$ ./kvstore -config "/tmp/kvstore/config/config.toml"
-badger 2019/07/16 18:42:25 INFO: All 0 tables opened in 0s
-badger 2019/07/16 18:42:25 INFO: Replaying file id: 0 at offset: 0
-badger 2019/07/16 18:42:25 INFO: Replay took: 695.227s
-E[2019-07-16|18:42:25.818] Couldn't connect to any seeds module=p2p
-I[2019-07-16|18:42:26.853] Executed block module=state height=1 validTxs=0 invalidTxs=0
-I[2019-07-16|18:42:26.865] Committed state module=state height=1 txs=0 appHash=
+badger 2022/07/16 13:55:59 INFO: All 0 tables opened in 0s
+badger 2022/07/16 13:55:59 INFO: Replaying file id: 0 at offset: 0
+badger 2022/07/16 13:55:59 INFO: Replay took: 3.052µs
+badger 2022/07/16 13:55:59 DEBUG: Value log discard stats empty
+2022-07-16T13:55:59+08:00 INFO starting service impl=multiAppConn module=proxy service=multiAppConn
+2022-07-16T13:55:59+08:00 INFO starting service connection=query impl=localClient module=abci-client service=localClient
+2022-07-16T13:55:59+08:00 INFO starting service connection=snapshot impl=localClient module=abci-client service=localClient
+2022-07-16T13:55:59+08:00 INFO starting service connection=mempool impl=localClient module=abci-client service=localClient
+2022-07-16T13:55:59+08:00 INFO starting service connection=consensus impl=localClient module=abci-client service=localClient
+2022-07-16T13:55:59+08:00 INFO starting service impl=EventBus module=events service=EventBus
+2022-07-16T13:55:59+08:00 INFO starting service impl=PubSub module=pubsub service=PubSub
+2022-07-16T13:55:59+08:00 INFO starting service impl=IndexerService module=txindex service=IndexerService
+2022-07-16T13:55:59+08:00 INFO ABCI Handshake App Info hash= height=0 module=consensus protocol-version=0 software-version=
+2022-07-16T13:55:59+08:00 INFO ABCI Replay Blocks appHeight=0 module=consensus stateHeight=0 storeHeight=0
+2022-07-16T13:55:59+08:00 INFO Completed ABCI Handshake - Tendermint and App are synced appHash= appHeight=0 module=consensus
+2022-07-16T13:55:59+08:00 INFO Version info block=11 mode=validator p2p=8 tmVersion=0.35.8
```
-Now open another tab in your terminal and try sending a transaction:
+Let's try sending a transaction. Open another terminal and execute the below command.
-```bash
+```sh
$ curl -s 'localhost:26657/broadcast_tx_commit?tx="tendermint=rocks"'
{
- "check_tx": {
- "gasWanted": "1",
- ...
- },
- "deliver_tx": { ... },
- "hash": "1B3C5A1093DB952C331B1749A21DCCBB0F6C7F4E0055CD04D16346472FC60EC6",
- "height": "128"
+ ...
+ "result": {
+ "check_tx": {
+ ...
+ "gas_wanted": "1",
+ ...
+ },
+ "deliver_tx": {...},
+ "hash": "1B3C5A1093DB952C331B1749A21DCCBB0F6C7F4E0055CD04D16346472FC60EC6",
+ "height": "91"
+ }
}
```
Response should contain the height where this transaction was committed.
-Now let's check if the given key now exists and its value:
+Let's check if the given key now exists and its value:
-```json
+```sh
$ curl -s 'localhost:26657/abci_query?data="tendermint"'
{
- "response": {
- "code": 0,
- "log": "exists",
- "info": "",
- "index": "0",
- "key": "dGVuZGVybWludA==",
- "value": "cm9ja3M=",
- "proofOps": null,
- "height": "6",
- "codespace": ""
+ ...
+ "result": {
+ "response": {
+ "code": 0,
+ "log": "exists",
+ "info": "",
+ "index": "0",
+ "key": "dGVuZGVybWludA==",
+ "value": "cm9ja3M=",
+ "proofOps": null,
+ "height": "0",
+ "codespace": ""
+ }
}
}
```
-"dGVuZGVybWludA==" and "cm9ja3M=" are the base64-encoding of the ASCII of
+`dGVuZGVybWludA==` and `cm9ja3M=` are the base64-encoding of the ASCII of
"tendermint" and "rocks" accordingly.
## Outro
diff --git a/docs/tutorials/go.md b/docs/tutorials/go.md
index ff85bd069..908c63c74 100644
--- a/docs/tutorials/go.md
+++ b/docs/tutorials/go.md
@@ -37,25 +37,27 @@ Core will not have access to application's state.
## 1.1 Installing Go
Please refer to [the official guide for installing
-Go](https://golang.org/doc/install).
+Go](https://go.dev/doc/install).
Verify that you have the latest version of Go installed:
-```bash
+```sh
$ go version
-go version go1.16.x darwin/amd64
+go version go1.18.x darwin/amd64
```
## 1.2 Creating a new Go project
-We'll start by creating a new Go project.
+We'll start by creating a new Go project. Initialize the folder with `go mod init`. Running this command should create the `go.mod` file.
-```bash
-mkdir kvstore
-cd kvstore
+```sh
+$ mkdir kvstore
+$ cd kvstore
+$ go mod init github.com//kvstore
+go: creating new go.mod: module github.com//kvstore
```
-Inside the example directory create a `main.go` file with the following content:
+Inside the project directory, create a `main.go` file with the following content:
```go
package main
@@ -71,8 +73,8 @@ func main() {
When run, this should print "Hello, Tendermint Core" to the standard output.
-```bash
-go run main.go
+```sh
+$ go run main.go
Hello, Tendermint Core
```
@@ -150,10 +152,34 @@ func (KVStoreApplication) ApplySnapshotChunk(abcitypes.RequestApplySnapshotChunk
}
```
-Now I will go through each method explaining when it's called and adding
+Now, we will go through each method and explain when it is executed while adding
required business logic.
-### 1.3.1 CheckTx
+### 1.3.1 Key-value store setup
+
+For the underlying key-value store we'll use the latest version of [badger](https://github.com/dgraph-io/badger), which is an embeddable, persistent and fast key-value (KV) database.
+
+```sh
+$ go get github.com/dgraph-io/badger/v3
+go: added github.com/dgraph-io/badger/v3 v3.2103.2
+```
+
+```go
+import "github.com/dgraph-io/badger/v3"
+
+type KVStoreApplication struct {
+ db *badger.DB
+ currentBatch *badger.Txn
+}
+
+func NewKVStoreApplication(db *badger.DB) *KVStoreApplication {
+ return &KVStoreApplication{
+ db: db,
+ }
+}
+```
+
+### 1.3.2 CheckTx
When a new transaction is added to the Tendermint Core, it will ask the
application to check it (validate the format, signatures, etc.).
@@ -212,26 +238,8 @@ Valid transactions will eventually be committed given they are not too big and
have enough gas. To learn more about gas, check out ["the
specification"](https://github.com/tendermint/tendermint/blob/master/spec/abci/apps.md#gas).
-For the underlying key-value store we'll use
-[badger](https://github.com/dgraph-io/badger), which is an embeddable,
-persistent and fast key-value (KV) database.
-```go
-import "github.com/dgraph-io/badger"
-
-type KVStoreApplication struct {
- db *badger.DB
- currentBatch *badger.Txn
-}
-
-func NewKVStoreApplication(db *badger.DB) *KVStoreApplication {
- return &KVStoreApplication{
- db: db,
- }
-}
-```
-
-### 1.3.2 BeginBlock -> DeliverTx -> EndBlock -> Commit
+### 1.3.3 BeginBlock -> DeliverTx -> EndBlock -> Commit
When Tendermint Core has decided on the block, it's transferred to the
application in 3 parts: `BeginBlock`, one `DeliverTx` per transaction and
@@ -287,7 +295,7 @@ func (app *KVStoreApplication) Commit() abcitypes.ResponseCommit {
}
```
-### 1.3.3 Query
+### 1.3.4 Query
Now, when the client wants to know whenever a particular key/value exist, it
will call Tendermint Core RPC `/abci_query` endpoint, which in turn will call
@@ -344,7 +352,7 @@ import (
"os/signal"
"syscall"
- "github.com/dgraph-io/badger"
+ "github.com/dgraph-io/badger/v3"
abciserver "github.com/tendermint/tendermint/abci/server"
"github.com/tendermint/tendermint/libs/log"
@@ -353,7 +361,7 @@ import (
var socketAddr string
func init() {
- flag.StringVar(&socketAddr, "socket-addr", "unix://example.sock", "Unix domain socket address")
+ flag.StringVar(&socketAddr, "socket-addr", "unix://kvstore.sock", "Unix domain socket address")
}
func main() {
@@ -426,40 +434,41 @@ signal.Notify(c, os.Interrupt, syscall.SIGTERM)
<-c
```
-## 1.5 Getting Up and Running
+## 1.5 Getting up and running
-We are going to use [Go modules](https://github.com/golang/go/wiki/Modules) for
-dependency management.
-
-```bash
-export GO111MODULE=on
-go mod init github.com/me/example
-```
-
-This should create a `go.mod` file. The current tutorial only works with
-the master branch of Tendermint, so let's make sure we're using the latest version:
+Make sure to enable [Go modules](https://github.com/golang/go/wiki/Modules). Run `go mod tidy` to download and add dependencies in `go.mod` file.
```sh
-go get github.com/tendermint/tendermint@97a3e44e0724f2017079ce24d36433f03124c09e
+$ go mod tidy
+...
+```
+
+Let's make sure we're using the latest version of Tendermint (currently `v0.35.8`).
+
+```sh
+$ go get github.com/tendermint/tendermint@latest
+...
```
This will populate the `go.mod` with a release number followed by a hash for Tendermint.
```go
-module github.com/me/example
+module github.com//kvstore
-go 1.16
+go 1.18
require (
- github.com/dgraph-io/badger v1.6.2
- github.com/tendermint/tendermint
+ github.com/dgraph-io/badger/v3 v3.2103.2
+ github.com/tendermint/tendermint v0.35.8
+ ...
)
```
-Now we can build the binary:
+Now, we can build the binary:
-```bash
-go build
+```sh
+$ go build
+...
```
To create a default configuration, nodeKey and private validator files, let's
@@ -470,94 +479,112 @@ installing from source, don't forget to checkout the latest release (`git
checkout vX.Y.Z`). Don't forget to check that the application uses the same
major version.
-```bash
-rm -rf /tmp/example
-TMHOME="/tmp/example" tendermint init validator
+```sh
+$ rm -rf /tmp/kvstore /tmp/badger
+$ TMHOME="/tmp/kvstore" tendermint init validator
-I[2019-07-16|18:20:36.480] Generated private validator module=main keyFile=/tmp/example/config/priv_validator_key.json stateFile=/tmp/example2/data/priv_validator_state.json
-I[2019-07-16|18:20:36.481] Generated node key module=main path=/tmp/example/config/node_key.json
-I[2019-07-16|18:20:36.482] Generated genesis file module=main path=/tmp/example/config/genesis.json
-I[2019-07-16|18:20:36.483] Generated config module=main mode=validator
+2022-07-20T17:04:41+08:00 INFO Generated private validator keyFile=/tmp/kvstore/config/priv_validator_key.json module=main stateFile=/tmp/kvstore/data/priv_validator_state.json
+2022-07-20T17:04:41+08:00 INFO Generated node key module=main path=/tmp/kvstore/config/node_key.json
+2022-07-20T17:04:41+08:00 INFO Generated genesis file module=main path=/tmp/kvstore/config/genesis.json
+2022-07-20T17:04:41+08:00 INFO Generated config mode=validator module=main
```
Feel free to explore the generated files, which can be found at
-`/tmp/example/config` directory. Documentation on the config can be found
+`/tmp/kvstore/config` directory. Documentation on the config can be found
[here](https://docs.tendermint.com/master/tendermint-core/configuration.html).
We are ready to start our application:
-```bash
-rm example.sock
-./example
+```sh
+$ rm kvstore.sock
+$ ./kvstore
-badger 2019/07/16 18:25:11 INFO: All 0 tables opened in 0s
-badger 2019/07/16 18:25:11 INFO: Replaying file id: 0 at offset: 0
-badger 2019/07/16 18:25:11 INFO: Replay took: 300.4s
-I[2019-07-16|18:25:11.523] Starting ABCIServer impl=ABCIServ
+badger 2022/07/20 17:07:17 INFO: All 1 tables opened in 9ms
+badger 2022/07/20 17:07:17 INFO: Replaying file id: 0 at offset: 256
+badger 2022/07/20 17:07:17 INFO: Replay took: 9.077µs
+badger 2022/07/20 17:07:17 DEBUG: Value log discard stats empty
+2022-07-20T17:07:17+08:00 INFO starting service impl=ABCIServer service=ABCIServer
+2022-07-20T17:07:17+08:00 INFO Waiting for new connection...
```
-Then we need to start Tendermint Core and point it to our application. Staying
-within the application directory execute:
+Then, we need to start Tendermint Core and point it to our application. Staying
+within the project directory, open another terminal and execute the command below:
-```bash
-TMHOME="/tmp/example" tendermint node --proxy-app=unix://example.sock
+```sh
+$ TMHOME="/tmp/kvstore" tendermint node --proxy-app=unix://kvstore.sock
-I[2019-07-16|18:26:20.362] Version info module=main software=0.32.1 block=10 p2p=7
-I[2019-07-16|18:26:20.383] Starting Node module=main impl=Node
-E[2019-07-16|18:26:20.392] Couldn't connect to any seeds module=p2p
-I[2019-07-16|18:26:20.394] Started node module=main nodeInfo="{ProtocolVersion:{P2P:7 Block:10 App:0} ID_:8dab80770ae8e295d4ce905d86af78c4ff634b79 ListenAddr:tcp://0.0.0.0:26656 Network:test-chain-nIO96P Version:0.32.1 Channels:4020212223303800 Moniker:app48.fun-box.ru Other:{TxIndex:on RPCAddress:tcp://127.0.0.1:26657}}"
-I[2019-07-16|18:26:21.440] Executed block module=state height=1 validTxs=0 invalidTxs=0
-I[2019-07-16|18:26:21.446] Committed state module=state height=1 txs=0 appHash=
+2022-07-20T17:10:22+08:00 INFO starting service impl=multiAppConn module=proxy service=multiAppConn
+2022-07-20T17:10:22+08:00 INFO starting service connection=query impl=socketClient module=abci-client service=socketClient
+2022-07-20T17:10:22+08:00 INFO starting service connection=snapshot impl=socketClient module=abci-client service=socketClient
+2022-07-20T17:10:22+08:00 INFO starting service connection=mempool impl=socketClient module=abci-client service=socketClient
+2022-07-20T17:10:22+08:00 INFO starting service connection=consensus impl=socketClient module=abci-client service=socketClient
+2022-07-20T17:10:22+08:00 INFO starting service impl=EventBus module=events service=EventBus
+2022-07-20T17:10:22+08:00 INFO starting service impl=PubSub module=pubsub service=PubSub
+2022-07-20T17:10:22+08:00 INFO starting service impl=IndexerService module=txindex service=IndexerService
+...
+2022-07-20T17:10:22+08:00 INFO starting service impl=Node module=main service=Node
+2022-07-20T17:10:22+08:00 INFO Starting RPC HTTP server on 127.0.0.1:26657 module=rpc-server
+2022-07-20T17:10:22+08:00 INFO p2p service legacy_enabled=false module=main
+2022-07-20T17:10:22+08:00 INFO starting service impl=router module=p2p service=router
+2022-07-20T17:10:22+08:00 INFO starting router channels=402021222330386061626300 listen_addr=tcp://0.0.0.0:26656 module=p2p net_addr={"id":"715727499e94f8fcaef1763192ebcc8460f44666","ip":"0.0.0.0","port":26656} node_id=715727499e94f8fcaef1763192ebcc8460f44666
+...
```
This should start the full node and connect to our ABCI application.
```sh
-I[2019-07-16|18:25:11.525] Waiting for new connection...
-I[2019-07-16|18:26:20.329] Accepted a new connection
-I[2019-07-16|18:26:20.329] Waiting for new connection...
-I[2019-07-16|18:26:20.330] Accepted a new connection
-I[2019-07-16|18:26:20.330] Waiting for new connection...
-I[2019-07-16|18:26:20.330] Accepted a new connection
+2022-07-20T17:09:55+08:00 INFO Waiting for new connection...
+2022-07-20T17:10:22+08:00 INFO Accepted a new connection
+2022-07-20T17:10:22+08:00 INFO Waiting for new connection...
+2022-07-20T17:10:22+08:00 INFO Accepted a new connection
+2022-07-20T17:10:22+08:00 INFO Waiting for new connection...
+2022-07-20T17:10:22+08:00 INFO Accepted a new connection
```
-Now open another tab in your terminal and try sending a transaction:
+Let's try sending a transaction. Open another terminal and execute the below command.
-```json
+```sh
$ curl -s 'localhost:26657/broadcast_tx_commit?tx="tendermint=rocks"'
{
- "check_tx": {
- "gasWanted": "1",
- ...
- },
- "deliver_tx": { ... },
- "hash": "CDD3C6DFA0A08CAEDF546F9938A2EEC232209C24AA0E4201194E0AFB78A2C2BB",
- "height": "33"
+ ...
+ "result": {
+ "check_tx": {
+ ...
+ "gas_wanted": "1",
+ ...
+ },
+ "deliver_tx": { ... },
+ "hash": "1B3C5A1093DB952C331B1749A21DCCBB0F6C7F4E0055CD04D16346472FC60EC6",
+ "height": "15"
+ }
}
```
Response should contain the height where this transaction was committed.
-Now let's check if the given key now exists and its value:
+Let's check if the given key now exists and its value:
-```json
+```sh
$ curl -s 'localhost:26657/abci_query?data="tendermint"'
{
- "response": {
- "code": 0,
- "log": "exists",
- "info": "",
- "index": "0",
- "key": "dGVuZGVybWludA==",
- "value": "cm9ja3M=",
- "proofOps": null,
- "height": "6",
- "codespace": ""
+ ...
+ "result": {
+ "response": {
+ "code": 0,
+ "log": "exists",
+ "info": "",
+ "index": "0",
+ "key": "dGVuZGVybWludA==",
+ "value": "cm9ja3M=",
+ "proofOps": null,
+ "height": "0",
+ "codespace": ""
+ }
}
}
```
-"dGVuZGVybWludA==" and "cm9ja3M=" are the base64-encoding of the ASCII of
+`dGVuZGVybWludA==` and `cm9ja3M=` are the base64-encoding of the ASCII of
"tendermint" and "rocks" accordingly.
## Outro
diff --git a/go.mod b/go.mod
index 5d005836f..704731c32 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/tendermint/tendermint
go 1.17
require (
- github.com/BurntSushi/toml v1.1.0
- github.com/adlio/schema v1.3.0
+ github.com/BurntSushi/toml v1.2.0
+ github.com/adlio/schema v1.3.3
github.com/btcsuite/btcd v0.22.1
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
github.com/fortytw2/leaktest v1.3.0
@@ -17,7 +17,7 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/lib/pq v1.10.6
- github.com/libp2p/go-buffer-pool v0.0.2
+ github.com/libp2p/go-buffer-pool v0.1.0
github.com/mroth/weightedrand v0.4.1
github.com/oasisprotocol/curve25519-voi v0.0.0-20210609091139-0a56a4bca00b
github.com/ory/dockertest v3.3.5+incompatible
@@ -25,40 +25,41 @@ require (
github.com/rs/cors v1.8.2
github.com/rs/zerolog v1.27.0
github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
- github.com/spf13/cobra v1.4.0
+ github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.12.0
- github.com/stretchr/testify v1.7.2
+ github.com/stretchr/testify v1.8.0
github.com/tendermint/tm-db v0.6.6
- golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
- golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2
+ golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
+ golang.org/x/net v0.0.0-20220617184016-355a448f1bc9
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
- google.golang.org/grpc v1.47.0
- pgregory.net/rapid v0.4.7
+ google.golang.org/grpc v1.48.0
+ pgregory.net/rapid v0.4.8
)
require (
github.com/bufbuild/buf v1.4.0
github.com/creachadair/atomicfile v0.2.6
github.com/creachadair/taskgroup v0.3.2
- github.com/golangci/golangci-lint v1.46.0
+ github.com/golangci/golangci-lint v1.47.2
github.com/google/go-cmp v0.5.8
- github.com/vektra/mockery/v2 v2.12.3
+ github.com/vektra/mockery/v2 v2.14.0
gotest.tools v2.2.0+incompatible
)
require (
4d63.com/gochecknoglobals v0.1.0 // indirect
- github.com/Antonboom/errname v0.1.6 // indirect
+ github.com/Antonboom/errname v0.1.7 // indirect
github.com/Antonboom/nilnil v0.1.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/DataDog/zstd v1.4.1 // indirect
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
- github.com/GaijinEntertainment/go-exhaustruct/v2 v2.1.0 // indirect
+ github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
- github.com/Microsoft/go-winio v0.5.1 // indirect
+ github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
github.com/alexkohler/prealloc v1.0.0 // indirect
+ github.com/alingse/asasalint v0.0.10 // indirect
github.com/ashanbrown/forbidigo v1.3.0 // indirect
github.com/ashanbrown/makezero v1.1.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
@@ -73,9 +74,9 @@ require (
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/charithe/durationcheck v0.0.9 // indirect
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 // indirect
- github.com/containerd/continuity v0.2.1 // indirect
- github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
- github.com/daixiang0/gci v0.3.3 // indirect
+ github.com/containerd/continuity v0.3.0 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+ github.com/daixiang0/gci v0.4.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/denis-tingaikin/go-header v0.4.3 // indirect
github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
@@ -91,9 +92,9 @@ require (
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/structtag v1.2.0 // indirect
- github.com/firefart/nonamedreturns v1.0.1 // indirect
+ github.com/firefart/nonamedreturns v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
- github.com/fzipp/gocyclo v0.5.1 // indirect
+ github.com/fzipp/gocyclo v0.6.0 // indirect
github.com/go-critic/go-critic v0.6.3 // indirect
github.com/go-toolsmith/astcast v1.0.0 // indirect
github.com/go-toolsmith/astcopy v1.0.0 // indirect
@@ -123,9 +124,10 @@ require (
github.com/gostaticanalysis/comment v1.4.2 // indirect
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
+ github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
- github.com/hashicorp/go-version v1.4.0 // indirect
+ github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -137,19 +139,19 @@ require (
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/julz/importas v0.1.0 // indirect
- github.com/kisielk/errcheck v1.6.0 // indirect
+ github.com/kisielk/errcheck v1.6.1 // indirect
github.com/kisielk/gotool v1.0.0 // indirect
github.com/klauspost/compress v1.15.1 // indirect
github.com/klauspost/pgzip v1.2.5 // indirect
- github.com/kulti/thelper v0.6.2 // indirect
- github.com/kunwardeep/paralleltest v1.0.3 // indirect
+ github.com/kulti/thelper v0.6.3 // indirect
+ github.com/kunwardeep/paralleltest v1.0.6 // indirect
github.com/kyoh86/exportloopref v0.1.8 // indirect
github.com/ldez/gomoddirectives v0.2.3 // indirect
github.com/ldez/tagliatelle v0.3.1 // indirect
github.com/leonklingele/grouper v1.1.0 // indirect
- github.com/lufeee/execinquery v1.0.0 // indirect
+ github.com/lufeee/execinquery v1.2.1 // indirect
github.com/magiconair/properties v1.8.6 // indirect
- github.com/maratori/testpackage v1.0.1 // indirect
+ github.com/maratori/testpackage v1.1.0 // indirect
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
@@ -162,20 +164,20 @@ require (
github.com/moricho/tparallel v0.2.1 // indirect
github.com/nakabonne/nestif v0.3.1 // indirect
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
- github.com/nishanths/exhaustive v0.7.11 // indirect
+ github.com/nishanths/exhaustive v0.8.1 // indirect
github.com/nishanths/predeclared v0.2.2 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
- github.com/opencontainers/runc v1.0.3 // indirect
+ github.com/opencontainers/runc v1.1.3 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
- github.com/pelletier/go-toml/v2 v2.0.1 // indirect
+ github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/profile v1.6.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/polyfloyd/go-errorlint v0.0.0-20211125173453-6d6d39c5bb8b // indirect
+ github.com/polyfloyd/go-errorlint v1.0.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a // indirect
github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect
@@ -185,11 +187,12 @@ require (
github.com/ryancurrah/gomodguard v1.2.3 // indirect
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
- github.com/securego/gosec/v2 v2.11.0 // indirect
+ github.com/securego/gosec/v2 v2.12.0 // indirect
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/sivchari/containedctx v1.0.2 // indirect
- github.com/sivchari/tenv v1.5.0 // indirect
+ github.com/sivchari/nosnakecase v1.5.0 // indirect
+ github.com/sivchari/tenv v1.7.0 // indirect
github.com/sonatard/noctx v0.0.1 // indirect
github.com/sourcegraph/go-diff v0.6.1 // indirect
github.com/spf13/afero v1.8.2 // indirect
@@ -198,48 +201,47 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
- github.com/stretchr/objx v0.1.1 // indirect
- github.com/subosito/gotenv v1.3.0 // indirect
+ github.com/stretchr/objx v0.4.0 // indirect
+ github.com/subosito/gotenv v1.4.0 // indirect
github.com/sylvia7788/contextcheck v1.0.4 // indirect
github.com/tdakkota/asciicheck v0.1.1 // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
github.com/tetafro/godot v1.4.11 // indirect
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
- github.com/tomarrell/wrapcheck/v2 v2.6.1 // indirect
+ github.com/tomarrell/wrapcheck/v2 v2.6.2 // indirect
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
github.com/ultraware/funlen v0.0.3 // indirect
github.com/ultraware/whitespace v0.0.5 // indirect
- github.com/uudashr/gocognit v1.0.5 // indirect
+ github.com/uudashr/gocognit v1.0.6 // indirect
github.com/yagipy/maintidx v1.0.0 // indirect
github.com/yeya24/promlinter v0.2.0 // indirect
- gitlab.com/bosi/decorder v0.2.1 // indirect
+ gitlab.com/bosi/decorder v0.2.2 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
- golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
- golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
- golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
- golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
+ golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect
+ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+ golang.org/x/sys v0.0.0-20220702020025-31831981b65f // indirect
+ golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
golang.org/x/text v0.3.7 // indirect
- golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
- golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
+ golang.org/x/tools v0.1.12-0.20220628192153-7743d1d949f1 // indirect
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
google.golang.org/protobuf v1.28.0 // indirect
- gopkg.in/ini.v1 v1.66.4 // indirect
+ gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
- honnef.co/go/tools v0.3.1 // indirect
+ honnef.co/go/tools v0.3.2 // indirect
mvdan.cc/gofumpt v0.3.1 // indirect
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
- mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5 // indirect
+ mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect
)
require (
github.com/creachadair/tomledit v0.0.22
github.com/prometheus/client_model v0.2.0
- github.com/prometheus/common v0.34.0
+ github.com/prometheus/common v0.37.0
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
)
diff --git a/go.sum b/go.sum
index bf2c4f067..49f324776 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,5 @@
4d63.com/gochecknoglobals v0.1.0 h1:zeZSRqj5yCg28tCkIV/z/lWbwvNm5qnKVS15PI8nhD0=
4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo=
-bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
@@ -63,19 +62,21 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Antonboom/errname v0.1.6 h1:LzIJZlyLOCSu51o3/t2n9Ck7PcoP9wdbrdaW6J8fX24=
-github.com/Antonboom/errname v0.1.6/go.mod h1:7lz79JAnuoMNDAWE9MeeIr1/c/VpSUWatBv2FH9NYpI=
+github.com/Antonboom/errname v0.1.7 h1:mBBDKvEYwPl4WFFNwec1CZO096G6vzK9vvDQzAwkako=
+github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU=
github.com/Antonboom/nilnil v0.1.1 h1:PHhrh5ANKFWRBh7TdYmyyq2gyT2lotnvFvvFbylF81Q=
github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI=
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
+github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
@@ -84,8 +85,8 @@ github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM=
github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM=
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
-github.com/GaijinEntertainment/go-exhaustruct/v2 v2.1.0 h1:LAPPhJ4KR5Z8aKVZF5S48csJkxL5RMKmE/98fMs1u5M=
-github.com/GaijinEntertainment/go-exhaustruct/v2 v2.1.0/go.mod h1:LGOGuvEgCfCQsy3JF2tRmpGDpzA53iZfyGEWSPwQ6/4=
+github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.0 h1:V9xVvhKbLt7unNEGAruK1xXglyc668Pq3Xx0MNTNqpo=
+github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.0/go.mod h1:n/vLeA7V+QY84iYAGwMkkUUp9ooeuftMEvaDrSVch+Q=
github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
@@ -95,8 +96,8 @@ github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3Q
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
-github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
-github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
+github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
@@ -107,8 +108,8 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/adlio/schema v1.3.0 h1:eSVYLxYWbm/6ReZBCkLw4Fz7uqC+ZNoPvA39bOwi52A=
-github.com/adlio/schema v1.3.0/go.mod h1:51QzxkpeFs6lRY11kPye26IaFPOV+HqEj01t5aXXKfs=
+github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I=
+github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg=
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
@@ -119,6 +120,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw=
github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
+github.com/alingse/asasalint v0.0.10 h1:qqGPDTV0ff0tWHN/nnIlSdjlU/EwRPaUY4SfpE1rnms=
+github.com/alingse/asasalint v0.0.10/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I=
github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
@@ -150,7 +153,6 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A=
github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI=
github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M=
@@ -185,6 +187,8 @@ github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRt
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
+github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
+github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
@@ -196,11 +200,11 @@ github.com/charithe/durationcheck v0.0.9 h1:mPP4ucLrf/rKZiIG/a9IPXHGlh8p4CzgpyTy
github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg=
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 h1:tFXjAxje9thrTF4h57Ckik+scJjTWdwAtZqZPtOT48M=
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4/go.mod h1:W8EnPSQ8Nv4fUjc/v1/8tHFqhuOJXnRub0dTfuAQktU=
-github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
+github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
+github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
@@ -216,16 +220,14 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=
-github.com/containerd/continuity v0.2.1 h1:/EeEo2EtN3umhbbgCveyjifoMYg0pS+nMMEemaYw634=
-github.com/containerd/continuity v0.2.1/go.mod h1:wCYX+dRqZdImhGucXOqTQn05AhX6EUDaGEMUzTFFpLg=
-github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
+github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
+github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -235,8 +237,9 @@ github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creachadair/atomicfile v0.2.6 h1:FgYxYvGcqREApTY8Nxg8msM6P/KVKK3ob5h9FaRUTNg=
github.com/creachadair/atomicfile v0.2.6/go.mod h1:BRq8Une6ckFneYXZQ+kO7p1ZZP3I2fzVzf28JxrIkBc=
github.com/creachadair/command v0.0.0-20220426235536-a748effdf6a1/go.mod h1:bAM+qFQb/KwWyCc9MLC4U1jvn3XyakqP5QRkds5T6cY=
@@ -246,9 +249,10 @@ github.com/creachadair/tomledit v0.0.22 h1:lRtepmrwhzDq+g1gv5ftVn5itgo7CjYbm6abK
github.com/creachadair/tomledit v0.0.22/go.mod h1:cIu/4x5L855oSRejIqr+WRFh+mv9g4fWLiUFaApYn/Y=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
-github.com/daixiang0/gci v0.3.3 h1:55xJKH7Gl9Vk6oQ1cMkwrDWjAkT1D+D1G9kNmRcAIY4=
-github.com/daixiang0/gci v0.3.3/go.mod h1:1Xr2bxnQbDxCqqulUOv8qpGqkgRw9RSCGGjEC2LjF8o=
+github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/daixiang0/gci v0.4.3 h1:wf7x0xRjQqTlA2dzHTI0A/xPyp7VcBatBG9nwGatwbQ=
+github.com/daixiang0/gci v0.4.3/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c=
github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -266,8 +270,13 @@ github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KP
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
+github.com/docker/cli v20.10.14+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M=
+github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE=
+github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
@@ -310,8 +319,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
-github.com/firefart/nonamedreturns v1.0.1 h1:fSvcq6ZpK/uBAgJEGMvzErlzyM4NELLqqdTofVjVNag=
-github.com/firefart/nonamedreturns v1.0.1/go.mod h1:D3dpIBojGGNh5UfElmwPu73SwDCm+VKhHYqwlNOk2uQ=
+github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y=
+github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI=
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
@@ -327,8 +336,8 @@ github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM=
-github.com/fzipp/gocyclo v0.5.1 h1:L66amyuYogbxl0j2U+vGqJXusPF2IkduvXLnYD5TFgw=
-github.com/fzipp/gocyclo v0.5.1/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
+github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
+github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-critic/go-critic v0.6.3 h1:abibh5XYBTASawfTQ0rA7dVtQT+6KzpGqb/J+DxRDaw=
github.com/go-critic/go-critic v0.6.3/go.mod h1:c6b3ZP1MQ7o6lPR7Rv3lEf7pYQUmAcx8ABHgdZCQt/k=
@@ -376,6 +385,7 @@ github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
@@ -394,7 +404,6 @@ github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -440,8 +449,8 @@ github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ=
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS8ch1y9zPNsgXThGwjKPrYfqMPks=
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU=
-github.com/golangci/golangci-lint v1.46.0 h1:uz9AtEcIP63FH+FIyuAXcQGVQO4vCUavEsMTJpPeD4s=
-github.com/golangci/golangci-lint v1.46.0/go.mod h1:IJpcNOUfx/XLRwE95FHQ6QtbhYwwqcm0H5QkwUfF4ZE=
+github.com/golangci/golangci-lint v1.47.2 h1:qvMDVv49Hrx3PSEXZ0bD/yhwSbhsOihQjFYCKieegIw=
+github.com/golangci/golangci-lint v1.47.2/go.mod h1:lpS2pjBZtRyXewUcOY7yUL3K4KfpoWz072yRN8AuhHg=
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA=
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg=
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA=
@@ -497,6 +506,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw=
github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -512,7 +523,7 @@ github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/Oth
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo=
+github.com/gookit/color v1.5.1/go.mod h1:wZFzea4X8qN6vHOSP2apMb4/+w/orMznEzYsIHPaqKM=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU=
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 h1:PVRE9d4AQKmbelZ7emNig1+NT27DUmKZn5qXxfio54U=
@@ -522,7 +533,6 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -546,14 +556,12 @@ github.com/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Rep
github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI=
github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI=
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
@@ -584,8 +592,8 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go-version v1.4.0 h1:aAQzgqIrRKRa7w75CKpbBxYsmUoPjzVm1W59ca1L0J4=
-github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
+github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
@@ -610,6 +618,9 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
@@ -662,8 +673,8 @@ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/errcheck v1.6.0 h1:YTDO4pNy7AUN/021p+JGHycQyYNIyMoenM1YDVK6RlY=
-github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/errcheck v1.6.1 h1:cErYo+J4SmEjdXZrVXGwLJCE2sB06s23LpkcyWNrT+s=
+github.com/kisielk/errcheck v1.6.1/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
@@ -688,10 +699,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kulti/thelper v0.6.2 h1:K4xulKkwOCnT1CDms6Ex3uG1dvSMUUQe9zxgYQgbRXs=
-github.com/kulti/thelper v0.6.2/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I=
-github.com/kunwardeep/paralleltest v1.0.3 h1:UdKIkImEAXjR1chUWLn+PNXqWUGs//7tzMeWuP7NhmI=
-github.com/kunwardeep/paralleltest v1.0.3/go.mod h1:vLydzomDFpk7yu5UX02RmP0H8QfRPOV/oFhWN85Mjb4=
+github.com/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs=
+github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I=
+github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoaGS+Ugg8g=
+github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/kyoh86/exportloopref v0.1.8 h1:5Ry/at+eFdkX9Vsdw3qU4YkvGtzuVfzT4X7S77LoN/M=
github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg=
@@ -702,24 +713,25 @@ github.com/ldez/tagliatelle v0.3.1/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3
github.com/leonklingele/grouper v1.1.0 h1:tC2y/ygPbMFSBOs3DcyaEMKnnwH7eYKzohOtRrf0SAg=
github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY=
github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag=
+github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs=
-github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
-github.com/lufeee/execinquery v1.0.0 h1:1XUTuLIVPDlFvUU3LXmmZwHDsolsxXnY67lzhpeqe0I=
-github.com/lufeee/execinquery v1.0.0/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM=
+github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
+github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
+github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM=
+github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/maratori/testpackage v1.0.1 h1:QtJ5ZjqapShm0w5DosRjg0PRlSdAdlx+W6cCKoALdbQ=
-github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU=
+github.com/maratori/testpackage v1.1.0 h1:GJY4wlzQhuBusMF1oahQCBtUV/AQ/k69IZ68vxaac2Q=
+github.com/maratori/testpackage v1.1.0/go.mod h1:PeAhzU8qkCwdGEMTEupsHJNlQu2gZopMC6RjbhmHeDc=
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 h1:pWxk9e//NbPwfxat7RXkts09K+dEBJWakUWwICVqYbA=
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s=
github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
@@ -771,13 +783,17 @@ github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN
github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
+github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
+github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
+github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc=
+github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -809,8 +825,8 @@ github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6Fx
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nishanths/exhaustive v0.7.11 h1:xV/WU3Vdwh5BUH4N06JNUznb6d5zhRPOnlgCrpNYNKA=
-github.com/nishanths/exhaustive v0.7.11/go.mod h1:gX+MP7DWMKJmNa1HfMozK+u04hQd3na9i0hyqf3/dOI=
+github.com/nishanths/exhaustive v0.8.1 h1:0QKNascWv9qIHY7zRoZSxeRr6kuk5aAT3YXLTiDmjTo=
+github.com/nishanths/exhaustive v0.8.1/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg=
github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ=
github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk=
github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c=
@@ -819,7 +835,6 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oasisprotocol/curve25519-voi v0.0.0-20210609091139-0a56a4bca00b h1:MKwruh+HeCSKWphkxuzvRzU4QzDkg7yiPkDVV0cDFgI=
github.com/oasisprotocol/curve25519-voi v0.0.0-20210609091139-0a56a4bca00b/go.mod h1:TLJifjWF6eotcfzDjKZsDqWJ+73Uvj/N85MvVyrvynM=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68=
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
@@ -834,31 +849,34 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
+github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
-github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
+github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
+github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/runc v1.0.3 h1:1hbqejyQWCJBvtKAfdO0b1FmaEf2z/bxnjqbARass5k=
-github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
+github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
+github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w=
+github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
+github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE=
github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
+github.com/ory/dockertest/v3 v3.9.1 h1:v4dkG+dlu76goxMiTT2j8zV7s4oPPEppKT8K8p2f1kY=
+github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM=
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
@@ -872,10 +890,9 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.0.0/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
+github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
+github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA=
@@ -897,13 +914,12 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR
github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/polyfloyd/go-errorlint v0.0.0-20211125173453-6d6d39c5bb8b h1:/BDyEJWLnDUYKGWdlNx/82qSaVu2bUok/EvPUtIGuvw=
-github.com/polyfloyd/go-errorlint v0.0.0-20211125173453-6d6d39c5bb8b/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw=
+github.com/polyfloyd/go-errorlint v1.0.0 h1:pDrQG0lrh68e602Wfp68BlUTRFoHn8PZYAjLgt2LFsM=
+github.com/polyfloyd/go-errorlint v1.0.0/go.mod h1:KZy4xxPJyy88/gldCe5OdW6OQRtNO3EZE7hXzmnebgA=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@@ -917,25 +933,21 @@ github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.34.0 h1:RBmGO9d/FVjqHT0yUGQwBJhkwKV+wPCn7KGpvfab0uE=
-github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE=
+github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
+github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA=
github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q=
github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30=
@@ -943,7 +955,7 @@ github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a h1:sWFav
github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a/go.mod h1:VMX+OnnSw4LicdiEGtRSD/1X8kW7GuEscjYNr4cOIT4=
github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
github.com/quasilyte/go-ruleguard/dsl v0.3.16/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
-github.com/quasilyte/go-ruleguard/dsl v0.3.19/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
+github.com/quasilyte/go-ruleguard/dsl v0.3.21/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc=
github.com/quasilyte/go-ruleguard/rules v0.0.0-20211022131956-028d6511ab71/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50=
github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 h1:PDWGei+Rf2bBiuZIbZmM20J2ftEy9IeUCHA8HbQqed8=
@@ -966,7 +978,6 @@ github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U=
github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
@@ -980,19 +991,18 @@ github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8
github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
-github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM=
-github.com/sagikazarmark/crypt v0.5.0/go.mod h1:l+nzl7KWh51rpzp2h7t4MZWyiEWdhNpOAnclKvg+mdA=
github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8=
github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA=
github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
-github.com/securego/gosec/v2 v2.11.0 h1:+PDkpzR41OI2jrw1q6AdXZCbsNGNGT7pQjal0H0cArI=
-github.com/securego/gosec/v2 v2.11.0/go.mod h1:SX8bptShuG8reGC0XS09+a4H2BoWSJi+fscA+Pulbpo=
+github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
+github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
+github.com/securego/gosec/v2 v2.12.0 h1:CQWdW7ATFpvLSohMVsajscfyHJ5rsGmEXmsNcsDNmAg=
+github.com/securego/gosec/v2 v2.12.0/go.mod h1:iTpT+eKTw59bSgklBHlSnH5O2tNygHMDxfvMubA4i7I=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU=
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs=
-github.com/shirou/gopsutil/v3 v3.22.4/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM=
+github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs=
github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -1004,8 +1014,10 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI=
github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw=
-github.com/sivchari/tenv v1.5.0 h1:wxW0mFpKI6DIb3s6m1jCDYvkWXCskrimXMuGd0K/kSQ=
-github.com/sivchari/tenv v1.5.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg=
+github.com/sivchari/nosnakecase v1.5.0 h1:ZBvAu1H3uteN0KQ0IsLpIFOwYgPEhKLyv2ahrVkub6M=
+github.com/sivchari/nosnakecase v1.5.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY=
+github.com/sivchari/tenv v1.7.0 h1:d4laZMBK6jpe5PWepxlV9S+LC0yXqvYHiq8E6ceoVVE=
+github.com/sivchari/tenv v1.7.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa h1:YJfZp12Z3AFhSBeXOlv4BO55RMwPn2NoQeDsrdWnBtY=
@@ -1022,7 +1034,6 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
@@ -1031,10 +1042,10 @@ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
-github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
+github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
+github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
@@ -1043,10 +1054,7 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
-github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
-github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk=
github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0=
@@ -1057,8 +1065,9 @@ github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3
github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -1068,11 +1077,14 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
+github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs=
+github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo=
github.com/sylvia7788/contextcheck v1.0.4 h1:MsiVqROAdr0efZc/fOCt0c235qm9XJqHtWwM+2h2B04=
github.com/sylvia7788/contextcheck v1.0.4/go.mod h1:vuPKJMQ7MQ91ZTqfdyreNKwZjyUg6KO+IebVyQDedZQ=
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
@@ -1097,14 +1109,12 @@ github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hM
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tomarrell/wrapcheck/v2 v2.6.1 h1:Cf4a/iwuMp9s7kKrh74GTgijRVim0wEpKjgAsT7Wctw=
-github.com/tomarrell/wrapcheck/v2 v2.6.1/go.mod h1:Eo+Opt6pyMW1b6cNllOcDSSoHO0aTJ+iF6BfCUbHltA=
+github.com/tomarrell/wrapcheck/v2 v2.6.2 h1:3dI6YNcrJTQ/CJQ6M/DUkc0gnqYSIk6o0rChn9E/D0M=
+github.com/tomarrell/wrapcheck/v2 v2.6.2/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg=
github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4=
github.com/tommy-muehle/go-mnd/v2 v2.5.0 h1:iAj0a8e6+dXSL7Liq0aXPox36FiN1dBbjA6lt9fl65s=
github.com/tommy-muehle/go-mnd/v2 v2.5.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
-github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA=
github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
@@ -1112,17 +1122,24 @@ github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqz
github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/uudashr/gocognit v1.0.5 h1:rrSex7oHr3/pPLQ0xoWq108XMU8s678FJcQ+aSfOHa4=
-github.com/uudashr/gocognit v1.0.5/go.mod h1:wgYz0mitoKOTysqxTDMOUXg+Jb5SvtihkfmugIZYpEA=
+github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y=
+github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus=
github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8=
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
-github.com/vektra/mockery/v2 v2.12.3 h1:74h0R+p75tdr3QNwiNz3MXeCwSP/I5bYUbZY6oT4t20=
-github.com/vektra/mockery/v2 v2.12.3/go.mod h1:8vf4KDDUptfkyypzdHLuE7OE2xA7Gdt60WgIS8PgD+U=
+github.com/vektra/mockery/v2 v2.14.0 h1:KZ1p5Hrn8tiY+LErRMr14HHle6khxo+JKOXLBW/yfqs=
+github.com/vektra/mockery/v2 v2.14.0/go.mod h1:bnD1T8tExSgPD1ripLkDbr60JA9VtQeu12P3wgLZd7M=
github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE=
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
@@ -1141,9 +1158,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-gitlab.com/bosi/decorder v0.2.1 h1:ehqZe8hI4w7O4b1vgsDZw1YU1PE7iJXrQWFMsocbQ1w=
-gitlab.com/bosi/decorder v0.2.1/go.mod h1:6C/nhLSbF6qZbYD8bRmISBwc6vcWdNsiIBkRvjJFrH0=
-go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+gitlab.com/bosi/decorder v0.2.2 h1:LRfb3lP6mZWjUzpMOCLTVjcnl/SqZWBWmKNqQvMocQs=
+gitlab.com/bosi/decorder v0.2.2/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
@@ -1151,15 +1167,12 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k=
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/pkg/v3 v3.5.2/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
-go.etcd.io/etcd/client/v2 v2.305.2/go.mod h1:2D7ZejHVMIfog1221iLSYlQRzrtECw3kz4I4VAQm3qI=
go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU=
go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0=
go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
@@ -1221,11 +1234,9 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1241,8 +1252,9 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 h1:FR+oGxGfbQu1d+jglI3rCkjAjUnhRSZcUxr+DqlDLNo=
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
-golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e h1:qyrTQ++p1afMkO4DPEeLGq/3oTsdlvdH4vqZUBWzUKM=
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
+golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d h1:+W8Qf4iJtMGKkyAygcKohjxTk4JPsL9DpzApJ22m5Ic=
+golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -1271,8 +1283,9 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1286,7 +1299,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -1333,14 +1345,14 @@ golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y=
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 h1:Yqz/iviulwKwAREEeUd3nbBFn0XuyJqkoft2IlrvOhc=
+golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1408,7 +1420,6 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1431,8 +1442,8 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1452,7 +1463,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1465,16 +1475,18 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1482,18 +1494,23 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220702020025-31831981b65f h1:xdsejrW/0Wf2diT5CPp3XmKUNbr7Xvw8kYilQ+6qjRY=
+golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
+golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1531,6 +1548,7 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -1565,7 +1583,6 @@ golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWc
golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -1611,14 +1628,15 @@ golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/tools v0.1.9-0.20211228192929-ee1ca4ffc4da/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II=
-golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
+golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
+golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
+golang.org/x/tools v0.1.12-0.20220628192153-7743d1d949f1 h1:NHLFZ56qCjD+0hYY3kE5Wl40Z7q4Gn9Ln/7YU0lsGko=
+golang.org/x/tools v0.1.12-0.20220628192153-7743d1d949f1/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
@@ -1764,7 +1782,6 @@ google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP
google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@@ -1793,13 +1810,12 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
-google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
+google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -1830,9 +1846,9 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.66.3/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
+gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -1855,6 +1871,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
+gotest.tools/v3 v3.2.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1862,18 +1880,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.3.1 h1:1kJlrWJLkaGXgcaeosRXViwviqjI7nkBvU2+sZW0AYc=
-honnef.co/go/tools v0.3.1/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70=
+honnef.co/go/tools v0.3.2 h1:ytYb4rOqyp1TSa2EPvNVwtPQJctSELKaMyLfqNP4+34=
+honnef.co/go/tools v0.3.2/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw=
mvdan.cc/gofumpt v0.3.1 h1:avhhrOmv0IuvQVK7fvwV91oFSGAk5/6Po8GXTzICeu8=
mvdan.cc/gofumpt v0.3.1/go.mod h1:w3ymliuxvzVx8DAutBnVyDqYb1Niy/yCJt/lk821YCE=
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo=
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
-mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5 h1:Jh3LAeMt1eGpxomyu3jVkmVZWW2MxZ1qIIV2TZ/nRio=
-mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5/go.mod h1:b8RRCBm0eeiWR8cfN88xeq2G5SG3VKGO+5UPWi5FSOY=
-pgregory.net/rapid v0.4.7 h1:MTNRktPuv5FNqOO151TM9mDTa+XHcX6ypYeISDVD14g=
-pgregory.net/rapid v0.4.7/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
+mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 h1:seuXWbRB1qPrS3NQnHmFKLJLtskWyueeIzmLXghMGgk=
+mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2YjFf5CaW0Bw4RL8RfbEf4GRggJk=
+pgregory.net/rapid v0.4.8 h1:d+5SGZWUbJPbl3ss6tmPFqnNeQR6VDOFly+eTjwPiEw=
+pgregory.net/rapid v0.4.8/go.mod h1:Z5PbWqjvWR1I3UGjvboUuan4fe4ZYEYNLNQLExzCoUs=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
diff --git a/internal/blocksync/reactor.go b/internal/blocksync/reactor.go
index 6c1c060e7..c1b032b03 100644
--- a/internal/blocksync/reactor.go
+++ b/internal/blocksync/reactor.go
@@ -135,7 +135,7 @@ func (r *Reactor) OnStart(ctx context.Context) error {
if err != nil {
return err
}
- r.chCreator = func(context.Context, *conn.ChannelDescriptor) (*p2p.Channel, error) { return blockSyncCh, nil }
+ r.chCreator = func(context.Context, *conn.ChannelDescriptor) (p2p.Channel, error) { return blockSyncCh, nil }
state, err := r.stateStore.Load()
if err != nil {
@@ -183,7 +183,7 @@ func (r *Reactor) OnStop() {
// respondToPeer loads a block and sends it to the requesting peer, if we have it.
// Otherwise, we'll respond saying we do not have it.
-func (r *Reactor) respondToPeer(ctx context.Context, msg *bcproto.BlockRequest, peerID types.NodeID, blockSyncCh *p2p.Channel) error {
+func (r *Reactor) respondToPeer(ctx context.Context, msg *bcproto.BlockRequest, peerID types.NodeID, blockSyncCh p2p.Channel) error {
block := r.store.LoadBlock(msg.Height)
if block == nil {
r.logger.Info("peer requesting a block we do not have", "peer", peerID, "height", msg.Height)
@@ -223,7 +223,7 @@ func (r *Reactor) respondToPeer(ctx context.Context, msg *bcproto.BlockRequest,
// handleMessage handles an Envelope sent from a peer on a specific p2p Channel.
// It will handle errors and any possible panics gracefully. A caller can handle
// any error returned by sending a PeerError on the respective channel.
-func (r *Reactor) handleMessage(ctx context.Context, envelope *p2p.Envelope, blockSyncCh *p2p.Channel) (err error) {
+func (r *Reactor) handleMessage(ctx context.Context, envelope *p2p.Envelope, blockSyncCh p2p.Channel) (err error) {
defer func() {
if e := recover(); e != nil {
err = fmt.Errorf("panic in processing message: %v", e)
@@ -298,7 +298,7 @@ func (r *Reactor) handleMessage(ctx context.Context, envelope *p2p.Envelope, blo
// message execution will result in a PeerError being sent on the BlockSyncChannel.
// When the reactor is stopped, we will catch the signal and close the p2p Channel
// gracefully.
-func (r *Reactor) processBlockSyncCh(ctx context.Context, blockSyncCh *p2p.Channel) {
+func (r *Reactor) processBlockSyncCh(ctx context.Context, blockSyncCh p2p.Channel) {
iter := blockSyncCh.Receive(ctx)
for iter.Next(ctx) {
envelope := iter.Envelope()
@@ -319,7 +319,7 @@ func (r *Reactor) processBlockSyncCh(ctx context.Context, blockSyncCh *p2p.Chann
}
// processPeerUpdate processes a PeerUpdate.
-func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpdate, blockSyncCh *p2p.Channel) {
+func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpdate, blockSyncCh p2p.Channel) {
r.logger.Debug("received peer update", "peer", peerUpdate.NodeID, "status", peerUpdate.Status)
// XXX: Pool#RedoRequest can sometimes give us an empty peer.
@@ -354,7 +354,7 @@ func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpda
// processPeerUpdates initiates a blocking process where we listen for and handle
// PeerUpdate messages. When the reactor is stopped, we will catch the signal and
// close the p2p PeerUpdatesCh gracefully.
-func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerUpdates, blockSyncCh *p2p.Channel) {
+func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerUpdates, blockSyncCh p2p.Channel) {
for {
select {
case <-ctx.Done():
@@ -396,7 +396,7 @@ func (r *Reactor) SwitchToBlockSync(ctx context.Context, state sm.State) error {
return nil
}
-func (r *Reactor) requestRoutine(ctx context.Context, blockSyncCh *p2p.Channel) {
+func (r *Reactor) requestRoutine(ctx context.Context, blockSyncCh p2p.Channel) {
statusUpdateTicker := time.NewTicker(statusUpdateIntervalSeconds * time.Second)
defer statusUpdateTicker.Stop()
@@ -438,7 +438,7 @@ func (r *Reactor) requestRoutine(ctx context.Context, blockSyncCh *p2p.Channel)
// do.
//
// NOTE: Don't sleep in the FOR_LOOP or otherwise slow it down!
-func (r *Reactor) poolRoutine(ctx context.Context, stateSynced bool, blockSyncCh *p2p.Channel) {
+func (r *Reactor) poolRoutine(ctx context.Context, stateSynced bool, blockSyncCh p2p.Channel) {
var (
trySyncTicker = time.NewTicker(trySyncIntervalMS * time.Millisecond)
switchToConsensusTicker = time.NewTicker(switchToConsensusIntervalSeconds * time.Second)
diff --git a/internal/blocksync/reactor_test.go b/internal/blocksync/reactor_test.go
index d23c5d165..c4f4f79a4 100644
--- a/internal/blocksync/reactor_test.go
+++ b/internal/blocksync/reactor_test.go
@@ -35,7 +35,7 @@ type reactorTestSuite struct {
reactors map[types.NodeID]*Reactor
app map[types.NodeID]abciclient.Client
- blockSyncChannels map[types.NodeID]*p2p.Channel
+ blockSyncChannels map[types.NodeID]p2p.Channel
peerChans map[types.NodeID]chan p2p.PeerUpdate
peerUpdates map[types.NodeID]*p2p.PeerUpdates
}
@@ -62,7 +62,7 @@ func setup(
nodes: make([]types.NodeID, 0, numNodes),
reactors: make(map[types.NodeID]*Reactor, numNodes),
app: make(map[types.NodeID]abciclient.Client, numNodes),
- blockSyncChannels: make(map[types.NodeID]*p2p.Channel, numNodes),
+ blockSyncChannels: make(map[types.NodeID]p2p.Channel, numNodes),
peerChans: make(map[types.NodeID]chan p2p.PeerUpdate, numNodes),
peerUpdates: make(map[types.NodeID]*p2p.PeerUpdates, numNodes),
}
@@ -175,7 +175,7 @@ func (rts *reactorTestSuite) addNode(
rts.peerUpdates[nodeID] = p2p.NewPeerUpdates(rts.peerChans[nodeID], 1)
rts.network.Nodes[nodeID].PeerManager.Register(ctx, rts.peerUpdates[nodeID])
- chCreator := func(ctx context.Context, chdesc *p2p.ChannelDescriptor) (*p2p.Channel, error) {
+ chCreator := func(ctx context.Context, chdesc *p2p.ChannelDescriptor) (p2p.Channel, error) {
return rts.blockSyncChannels[nodeID], nil
}
diff --git a/internal/consensus/invalid_test.go b/internal/consensus/invalid_test.go
index 93c5cea1b..4685bb318 100644
--- a/internal/consensus/invalid_test.go
+++ b/internal/consensus/invalid_test.go
@@ -107,7 +107,7 @@ func invalidDoPrevoteFunc(
round int32,
cs *State,
r *Reactor,
- voteCh *p2p.Channel,
+ voteCh p2p.Channel,
pv types.PrivValidator,
) {
// routine to:
diff --git a/internal/consensus/mempool_test.go b/internal/consensus/mempool_test.go
index 8cd2559d7..2d9a2b7bd 100644
--- a/internal/consensus/mempool_test.go
+++ b/internal/consensus/mempool_test.go
@@ -210,12 +210,13 @@ func TestMempoolRmBadTx(t *testing.T) {
emptyMempoolCh := make(chan struct{})
checkTxRespCh := make(chan struct{})
go func() {
- // Try to send the tx through the mempool.
+ // Try to send an out-of-sequence transaction through the mempool.
// CheckTx should not err, but the app should return a bad abci code
// and the tx should get removed from the pool
+ binary.BigEndian.PutUint64(txBytes, uint64(5))
err := assertMempool(t, cs.txNotifier).CheckTx(ctx, txBytes, func(r *abci.ResponseCheckTx) {
if r.Code != code.CodeTypeBadNonce {
- t.Errorf("expected checktx to return bad nonce, got %v", r)
+ t.Errorf("expected checktx to return bad nonce, got %#v", r)
return
}
checkTxRespCh <- struct{}{}
@@ -308,14 +309,15 @@ func (app *CounterApplication) FinalizeBlock(_ context.Context, req *abci.Reques
func (app *CounterApplication) CheckTx(_ context.Context, req *abci.RequestCheckTx) (*abci.ResponseCheckTx, error) {
app.mu.Lock()
defer app.mu.Unlock()
-
- txValue := txAsUint64(req.Tx)
- if txValue != uint64(app.mempoolTxCount) {
- return &abci.ResponseCheckTx{
- Code: code.CodeTypeBadNonce,
- }, nil
+ if req.Type == abci.CheckTxType_New {
+ txValue := txAsUint64(req.Tx)
+ if txValue != uint64(app.mempoolTxCount) {
+ return &abci.ResponseCheckTx{
+ Code: code.CodeTypeBadNonce,
+ }, nil
+ }
+ app.mempoolTxCount++
}
- app.mempoolTxCount++
return &abci.ResponseCheckTx{Code: code.CodeTypeOK}, nil
}
@@ -328,8 +330,6 @@ func txAsUint64(tx []byte) uint64 {
func (app *CounterApplication) Commit(context.Context) (*abci.ResponseCommit, error) {
app.mu.Lock()
defer app.mu.Unlock()
-
- app.mempoolTxCount = app.txCount
return &abci.ResponseCommit{}, nil
}
diff --git a/internal/consensus/reactor.go b/internal/consensus/reactor.go
index c353e0c73..3ba95c836 100644
--- a/internal/consensus/reactor.go
+++ b/internal/consensus/reactor.go
@@ -165,10 +165,10 @@ func NewReactor(
}
type channelBundle struct {
- state *p2p.Channel
- data *p2p.Channel
- vote *p2p.Channel
- votSet *p2p.Channel
+ state p2p.Channel
+ data p2p.Channel
+ vote p2p.Channel
+ votSet p2p.Channel
}
// OnStart starts separate go routines for each p2p Channel and listens for
@@ -310,14 +310,14 @@ func (r *Reactor) GetPeerState(peerID types.NodeID) (*PeerState, bool) {
return ps, ok
}
-func (r *Reactor) broadcastNewRoundStepMessage(ctx context.Context, rs *cstypes.RoundState, stateCh *p2p.Channel) error {
+func (r *Reactor) broadcastNewRoundStepMessage(ctx context.Context, rs *cstypes.RoundState, stateCh p2p.Channel) error {
return stateCh.Send(ctx, p2p.Envelope{
Broadcast: true,
Message: makeRoundStepMessage(rs),
})
}
-func (r *Reactor) broadcastNewValidBlockMessage(ctx context.Context, rs *cstypes.RoundState, stateCh *p2p.Channel) error {
+func (r *Reactor) broadcastNewValidBlockMessage(ctx context.Context, rs *cstypes.RoundState, stateCh p2p.Channel) error {
psHeader := rs.ProposalBlockParts.Header()
return stateCh.Send(ctx, p2p.Envelope{
Broadcast: true,
@@ -331,7 +331,7 @@ func (r *Reactor) broadcastNewValidBlockMessage(ctx context.Context, rs *cstypes
})
}
-func (r *Reactor) broadcastHasVoteMessage(ctx context.Context, vote *types.Vote, stateCh *p2p.Channel) error {
+func (r *Reactor) broadcastHasVoteMessage(ctx context.Context, vote *types.Vote, stateCh p2p.Channel) error {
return stateCh.Send(ctx, p2p.Envelope{
Broadcast: true,
Message: &tmcons.HasVote{
@@ -346,7 +346,7 @@ func (r *Reactor) broadcastHasVoteMessage(ctx context.Context, vote *types.Vote,
// subscribeToBroadcastEvents subscribes for new round steps and votes using the
// internal pubsub defined in the consensus state to broadcast them to peers
// upon receiving.
-func (r *Reactor) subscribeToBroadcastEvents(ctx context.Context, stateCh *p2p.Channel) {
+func (r *Reactor) subscribeToBroadcastEvents(ctx context.Context, stateCh p2p.Channel) {
onStopCh := r.state.getOnStopCh()
err := r.state.evsw.AddListenerForEvent(
@@ -403,7 +403,7 @@ func makeRoundStepMessage(rs *cstypes.RoundState) *tmcons.NewRoundStep {
}
}
-func (r *Reactor) sendNewRoundStepMessage(ctx context.Context, peerID types.NodeID, stateCh *p2p.Channel) error {
+func (r *Reactor) sendNewRoundStepMessage(ctx context.Context, peerID types.NodeID, stateCh p2p.Channel) error {
return stateCh.Send(ctx, p2p.Envelope{
To: peerID,
Message: makeRoundStepMessage(r.getRoundState()),
@@ -433,7 +433,7 @@ func (r *Reactor) getRoundState() *cstypes.RoundState {
return r.rs
}
-func (r *Reactor) gossipDataForCatchup(ctx context.Context, rs *cstypes.RoundState, prs *cstypes.PeerRoundState, ps *PeerState, dataCh *p2p.Channel) {
+func (r *Reactor) gossipDataForCatchup(ctx context.Context, rs *cstypes.RoundState, prs *cstypes.PeerRoundState, ps *PeerState, dataCh p2p.Channel) {
logger := r.logger.With("height", prs.Height).With("peer", ps.peerID)
if index, ok := prs.ProposalBlockParts.Not().PickRandom(); ok {
@@ -497,7 +497,7 @@ func (r *Reactor) gossipDataForCatchup(ctx context.Context, rs *cstypes.RoundSta
time.Sleep(r.state.config.PeerGossipSleepDuration)
}
-func (r *Reactor) gossipDataRoutine(ctx context.Context, ps *PeerState, dataCh *p2p.Channel) {
+func (r *Reactor) gossipDataRoutine(ctx context.Context, ps *PeerState, dataCh p2p.Channel) {
logger := r.logger.With("peer", ps.peerID)
timer := time.NewTimer(0)
@@ -632,7 +632,7 @@ OUTER_LOOP:
// pickSendVote picks a vote and sends it to the peer. It will return true if
// there is a vote to send and false otherwise.
-func (r *Reactor) pickSendVote(ctx context.Context, ps *PeerState, votes types.VoteSetReader, voteCh *p2p.Channel) (bool, error) {
+func (r *Reactor) pickSendVote(ctx context.Context, ps *PeerState, votes types.VoteSetReader, voteCh p2p.Channel) (bool, error) {
vote, ok := ps.PickVoteToSend(votes)
if !ok {
return false, nil
@@ -660,7 +660,7 @@ func (r *Reactor) gossipVotesForHeight(
rs *cstypes.RoundState,
prs *cstypes.PeerRoundState,
ps *PeerState,
- voteCh *p2p.Channel,
+ voteCh p2p.Channel,
) (bool, error) {
logger := r.logger.With("height", prs.Height).With("peer", ps.peerID)
@@ -732,7 +732,7 @@ func (r *Reactor) gossipVotesForHeight(
return false, nil
}
-func (r *Reactor) gossipVotesRoutine(ctx context.Context, ps *PeerState, voteCh *p2p.Channel) {
+func (r *Reactor) gossipVotesRoutine(ctx context.Context, ps *PeerState, voteCh p2p.Channel) {
logger := r.logger.With("peer", ps.peerID)
timer := time.NewTimer(0)
@@ -804,7 +804,7 @@ func (r *Reactor) gossipVotesRoutine(ctx context.Context, ps *PeerState, voteCh
// NOTE: `queryMaj23Routine` has a simple crude design since it only comes
// into play for liveness when there's a signature DDoS attack happening.
-func (r *Reactor) queryMaj23Routine(ctx context.Context, ps *PeerState, stateCh *p2p.Channel) {
+func (r *Reactor) queryMaj23Routine(ctx context.Context, ps *PeerState, stateCh p2p.Channel) {
timer := time.NewTimer(0)
defer timer.Stop()
@@ -1015,7 +1015,7 @@ func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpda
// If we fail to find the peer state for the envelope sender, we perform a no-op
// and return. This can happen when we process the envelope after the peer is
// removed.
-func (r *Reactor) handleStateMessage(ctx context.Context, envelope *p2p.Envelope, msgI Message, voteSetCh *p2p.Channel) error {
+func (r *Reactor) handleStateMessage(ctx context.Context, envelope *p2p.Envelope, msgI Message, voteSetCh p2p.Channel) error {
ps, ok := r.GetPeerState(envelope.From)
if !ok || ps == nil {
r.logger.Debug("failed to find peer state", "peer", envelope.From, "ch_id", "StateChannel")
diff --git a/internal/consensus/reactor_test.go b/internal/consensus/reactor_test.go
index 3392b3a7b..06715591e 100644
--- a/internal/consensus/reactor_test.go
+++ b/internal/consensus/reactor_test.go
@@ -46,10 +46,10 @@ type reactorTestSuite struct {
reactors map[types.NodeID]*Reactor
subs map[types.NodeID]eventbus.Subscription
blocksyncSubs map[types.NodeID]eventbus.Subscription
- stateChannels map[types.NodeID]*p2p.Channel
- dataChannels map[types.NodeID]*p2p.Channel
- voteChannels map[types.NodeID]*p2p.Channel
- voteSetBitsChannels map[types.NodeID]*p2p.Channel
+ stateChannels map[types.NodeID]p2p.Channel
+ dataChannels map[types.NodeID]p2p.Channel
+ voteChannels map[types.NodeID]p2p.Channel
+ voteSetBitsChannels map[types.NodeID]p2p.Channel
}
func chDesc(chID p2p.ChannelID, size int) *p2p.ChannelDescriptor {
@@ -86,7 +86,7 @@ func setup(
t.Cleanup(cancel)
chCreator := func(nodeID types.NodeID) p2p.ChannelCreator {
- return func(ctx context.Context, desc *p2p.ChannelDescriptor) (*p2p.Channel, error) {
+ return func(ctx context.Context, desc *p2p.ChannelDescriptor) (p2p.Channel, error) {
switch desc.ID {
case StateChannel:
return rts.stateChannels[nodeID], nil
diff --git a/internal/consensus/state.go b/internal/consensus/state.go
index 3af775bb6..a7a0b8fed 100644
--- a/internal/consensus/state.go
+++ b/internal/consensus/state.go
@@ -1530,7 +1530,8 @@ func (cs *State) defaultDoPrevote(ctx context.Context, height int64, round int32
}
sp := cs.state.ConsensusParams.Synchrony.SynchronyParamsOrDefaults()
- if cs.Proposal.POLRound == -1 && cs.LockedRound == -1 && !cs.proposalIsTimely() {
+ //TODO: Remove this temporary fix when the complete solution is ready. See #8739
+ if !cs.replayMode && cs.Proposal.POLRound == -1 && cs.LockedRound == -1 && !cs.proposalIsTimely() {
logger.Debug("prevote step: Proposal is not timely; prevoting nil",
"proposed",
tmtime.Canonical(cs.Proposal.Timestamp).Format(time.RFC3339Nano),
diff --git a/internal/evidence/reactor.go b/internal/evidence/reactor.go
index 1d952d30e..d0bc28b13 100644
--- a/internal/evidence/reactor.go
+++ b/internal/evidence/reactor.go
@@ -159,7 +159,7 @@ func (r *Reactor) handleMessage(ctx context.Context, envelope *p2p.Envelope) (er
// processEvidenceCh implements a blocking event loop where we listen for p2p
// Envelope messages from the evidenceCh.
-func (r *Reactor) processEvidenceCh(ctx context.Context, evidenceCh *p2p.Channel) {
+func (r *Reactor) processEvidenceCh(ctx context.Context, evidenceCh p2p.Channel) {
iter := evidenceCh.Receive(ctx)
for iter.Next(ctx) {
envelope := iter.Envelope()
@@ -186,7 +186,7 @@ func (r *Reactor) processEvidenceCh(ctx context.Context, evidenceCh *p2p.Channel
// connects/disconnects frequently from the broadcasting peer(s).
//
// REF: https://github.com/tendermint/tendermint/issues/4727
-func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpdate, evidenceCh *p2p.Channel) {
+func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpdate, evidenceCh p2p.Channel) {
r.logger.Debug("received peer update", "peer", peerUpdate.NodeID, "status", peerUpdate.Status)
r.mtx.Lock()
@@ -227,7 +227,7 @@ func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpda
// processPeerUpdates initiates a blocking process where we listen for and handle
// PeerUpdate messages. When the reactor is stopped, we will catch the signal and
// close the p2p PeerUpdatesCh gracefully.
-func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerUpdates, evidenceCh *p2p.Channel) {
+func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerUpdates, evidenceCh p2p.Channel) {
for {
select {
case peerUpdate := <-peerUpdates.Updates():
@@ -249,7 +249,7 @@ func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerU
// that the peer has already received or may not be ready for.
//
// REF: https://github.com/tendermint/tendermint/issues/4727
-func (r *Reactor) broadcastEvidenceLoop(ctx context.Context, peerID types.NodeID, evidenceCh *p2p.Channel) {
+func (r *Reactor) broadcastEvidenceLoop(ctx context.Context, peerID types.NodeID, evidenceCh p2p.Channel) {
var next *clist.CElement
defer func() {
diff --git a/internal/evidence/reactor_test.go b/internal/evidence/reactor_test.go
index f23195fae..92566ccc8 100644
--- a/internal/evidence/reactor_test.go
+++ b/internal/evidence/reactor_test.go
@@ -38,7 +38,7 @@ type reactorTestSuite struct {
logger log.Logger
reactors map[types.NodeID]*evidence.Reactor
pools map[types.NodeID]*evidence.Pool
- evidenceChannels map[types.NodeID]*p2p.Channel
+ evidenceChannels map[types.NodeID]p2p.Channel
peerUpdates map[types.NodeID]*p2p.PeerUpdates
peerChans map[types.NodeID]chan p2p.PeerUpdate
nodes []*p2ptest.Node
@@ -96,7 +96,7 @@ func setup(ctx context.Context, t *testing.T, stateStores []sm.Store) *reactorTe
rts.network.Nodes[nodeID].PeerManager.Register(ctx, pu)
rts.nodes = append(rts.nodes, rts.network.Nodes[nodeID])
- chCreator := func(ctx context.Context, chdesc *p2p.ChannelDescriptor) (*p2p.Channel, error) {
+ chCreator := func(ctx context.Context, chdesc *p2p.ChannelDescriptor) (p2p.Channel, error) {
return rts.evidenceChannels[nodeID], nil
}
diff --git a/internal/inspect/inspect.go b/internal/inspect/inspect.go
index 6381ea888..573b63f40 100644
--- a/internal/inspect/inspect.go
+++ b/internal/inspect/inspect.go
@@ -10,13 +10,13 @@ import (
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/internal/eventbus"
"github.com/tendermint/tendermint/internal/inspect/rpc"
+ tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
rpccore "github.com/tendermint/tendermint/internal/rpc/core"
"github.com/tendermint/tendermint/internal/state"
"github.com/tendermint/tendermint/internal/state/indexer"
"github.com/tendermint/tendermint/internal/state/indexer/sink"
"github.com/tendermint/tendermint/internal/store"
"github.com/tendermint/tendermint/libs/log"
- tmstrings "github.com/tendermint/tendermint/libs/strings"
"github.com/tendermint/tendermint/types"
"golang.org/x/sync/errgroup"
diff --git a/internal/libs/clist/bench_test.go b/internal/libs/clist/bench_test.go
index ee5d836a7..95973cc76 100644
--- a/internal/libs/clist/bench_test.go
+++ b/internal/libs/clist/bench_test.go
@@ -12,7 +12,7 @@ func BenchmarkDetaching(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
start.removed = true
- start.detachNext()
+ start.DetachNext()
start.DetachPrev()
tmp := nxt
nxt = nxt.Next()
diff --git a/internal/libs/clist/clist.go b/internal/libs/clist/clist.go
index 3969c94cc..9a0e5bcc8 100644
--- a/internal/libs/clist/clist.go
+++ b/internal/libs/clist/clist.go
@@ -103,7 +103,7 @@ func (e *CElement) Removed() bool {
return isRemoved
}
-func (e *CElement) detachNext() {
+func (e *CElement) DetachNext() {
e.mtx.Lock()
if !e.removed {
e.mtx.Unlock()
diff --git a/internal/libs/confix/confix.go b/internal/libs/confix/confix.go
new file mode 100644
index 000000000..a9449fa22
--- /dev/null
+++ b/internal/libs/confix/confix.go
@@ -0,0 +1,155 @@
+// Package confix applies changes to a Tendermint TOML configuration file, to
+// update configurations created with an older version of Tendermint to a
+// compatible format for a newer version.
+package confix
+
+import (
+ "bytes"
+ "context"
+ "errors"
+ "fmt"
+ "io"
+ "os"
+
+ "github.com/creachadair/atomicfile"
+ "github.com/creachadair/tomledit"
+ "github.com/creachadair/tomledit/transform"
+ "github.com/spf13/viper"
+
+ "github.com/tendermint/tendermint/config"
+)
+
+// Upgrade reads the configuration file at configPath and applies any
+// transformations necessary to upgrade it to the current version. If this
+// succeeds, the transformed output is written to outputPath. As a special
+// case, if outputPath == "" the output is written to stdout.
+//
+// It is safe if outputPath == inputPath. If a regular file outputPath already
+// exists, it is overwritten. In case of error, the output is not written.
+//
+// Upgrade is a convenience wrapper for calls to LoadConfig, ApplyFixes, and
+// CheckValid. If the caller requires more control over the behavior of the
+// upgrade, call those functions directly.
+func Upgrade(ctx context.Context, configPath, outputPath string) error {
+ if configPath == "" {
+ return errors.New("empty input configuration path")
+ }
+
+ doc, err := LoadConfig(configPath)
+ if err != nil {
+ return fmt.Errorf("loading config: %v", err)
+ }
+
+ if err := ApplyFixes(ctx, doc); err != nil {
+ return fmt.Errorf("updating %q: %v", configPath, err)
+ }
+
+ var buf bytes.Buffer
+ if err := tomledit.Format(&buf, doc); err != nil {
+ return fmt.Errorf("formatting config: %v", err)
+ }
+
+ // Verify that Tendermint can parse the results after our edits.
+ if err := CheckValid(buf.Bytes()); err != nil {
+ return fmt.Errorf("updated config is invalid: %v", err)
+ }
+
+ if outputPath == "" {
+ _, err = os.Stdout.Write(buf.Bytes())
+ } else {
+ err = atomicfile.WriteData(outputPath, buf.Bytes(), 0600)
+ }
+ return err
+}
+
+// ApplyFixes transforms doc and reports whether it succeeded.
+func ApplyFixes(ctx context.Context, doc *tomledit.Document) error {
+ // Check what version of Tendermint might have created this config file, as
+ // a safety check for the updates we are about to make.
+ tmVersion := GuessConfigVersion(doc)
+ if tmVersion == vUnknown {
+ return errors.New("cannot tell what Tendermint version created this config")
+ } else if tmVersion < v34 || tmVersion > v36 {
+ // TODO(creachadair): Add in rewrites for older versions. This will
+ // require some digging to discover what the changes were. The upgrade
+ // instructions do not give specifics.
+ return fmt.Errorf("unable to update version %s config", tmVersion)
+ }
+ return plan.Apply(ctx, doc)
+}
+
+// LoadConfig loads and parses the TOML document from path.
+func LoadConfig(path string) (*tomledit.Document, error) {
+ f, err := os.Open(path)
+ if err != nil {
+ return nil, err
+ }
+ defer f.Close()
+ return tomledit.Parse(f)
+}
+
+const (
+ vUnknown = ""
+ v32 = "v0.32"
+ v33 = "v0.33"
+ v34 = "v0.34"
+ v35 = "v0.35"
+ v36 = "v0.36"
+)
+
+// GuessConfigVersion attempts to figure out which version of Tendermint
+// created the specified config document. It returns "" if the creating version
+// cannot be determined, otherwise a string of the form "vX.YY".
+func GuessConfigVersion(doc *tomledit.Document) string {
+ hasDisableWS := doc.First("rpc", "experimental-disable-websocket") != nil
+ hasUseLegacy := doc.First("p2p", "use-legacy") != nil // v0.35 only
+ if hasDisableWS && !hasUseLegacy {
+ return v36
+ }
+
+ hasBlockSync := transform.FindTable(doc, "blocksync") != nil // add: v0.35
+ hasStateSync := transform.FindTable(doc, "statesync") != nil // add: v0.34
+ if hasBlockSync && hasStateSync {
+ return v35
+ } else if hasStateSync {
+ return v34
+ }
+
+ hasIndexKeys := doc.First("tx_index", "index_keys") != nil // add: v0.33
+ hasIndexTags := doc.First("tx_index", "index_tags") != nil // rem: v0.33
+ if hasIndexKeys && !hasIndexTags {
+ return v33
+ }
+
+ hasFastSync := transform.FindTable(doc, "fastsync") != nil // add: v0.32
+ if hasIndexTags && hasFastSync {
+ return v32
+ }
+
+ // Something older, probably.
+ return vUnknown
+}
+
+// CheckValid checks whether the specified config appears to be a valid
+// Tendermint config file. This emulates how the node loads the config.
+func CheckValid(data []byte) error {
+ v := viper.New()
+ v.SetConfigType("toml")
+
+ if err := v.ReadConfig(bytes.NewReader(data)); err != nil {
+ return fmt.Errorf("reading config: %w", err)
+ }
+
+ var cfg config.Config
+ if err := v.Unmarshal(&cfg); err != nil {
+ return fmt.Errorf("decoding config: %w", err)
+ }
+
+ return cfg.ValidateBasic()
+}
+
+// WithLogWriter returns a child of ctx with a logger attached that sends
+// output to w. This is a convenience wrapper for transform.WithLogWriter.
+func WithLogWriter(ctx context.Context, w io.Writer) context.Context {
+ return transform.WithLogWriter(ctx, w)
+}
diff --git a/scripts/confix/confix_test.go b/internal/libs/confix/confix_test.go
similarity index 97%
rename from scripts/confix/confix_test.go
rename to internal/libs/confix/confix_test.go
index ec258f4ca..dc0042fe5 100644
--- a/scripts/confix/confix_test.go
+++ b/internal/libs/confix/confix_test.go
@@ -1,4 +1,4 @@
-package main_test
+package confix_test
import (
"bytes"
@@ -9,7 +9,7 @@ import (
"github.com/creachadair/tomledit"
"github.com/google/go-cmp/cmp"
- confix "github.com/tendermint/tendermint/scripts/confix"
+ "github.com/tendermint/tendermint/internal/libs/confix"
)
func mustParseConfig(t *testing.T, path string) *tomledit.Document {
diff --git a/scripts/confix/plan.go b/internal/libs/confix/plan.go
similarity index 99%
rename from scripts/confix/plan.go
rename to internal/libs/confix/plan.go
index 706343338..ac6f7b5a6 100644
--- a/scripts/confix/plan.go
+++ b/internal/libs/confix/plan.go
@@ -1,4 +1,4 @@
-package main
+package confix
import (
"context"
diff --git a/scripts/confix/testdata/README.md b/internal/libs/confix/testdata/README.md
similarity index 90%
rename from scripts/confix/testdata/README.md
rename to internal/libs/confix/testdata/README.md
index 5bbfa795f..04f2af205 100644
--- a/scripts/confix/testdata/README.md
+++ b/internal/libs/confix/testdata/README.md
@@ -41,12 +41,12 @@ The files named `diff-XX-YY.txt` were generated by using the `condiff` tool on
the config samples for versions v0.XX and v0.YY:
```shell
-go run ./scripts/confix/condiff -desnake vXX-config vYY-config.toml > diff-XX-YY.txt
+go run ./scripts/condiff -desnake vXX-config vYY-config.toml > diff-XX-YY.txt
```
The `baseline.txt` was computed in the same way, but using an empty starting
file so that we capture all the settings in the target:
```shell
-go run ./scripts/confix/condiff -desnake /dev/null v26-config.toml > baseline.txt
+go run ./scripts/condiff -desnake /dev/null v26-config.toml > baseline.txt
```
diff --git a/scripts/confix/testdata/baseline.txt b/internal/libs/confix/testdata/baseline.txt
similarity index 100%
rename from scripts/confix/testdata/baseline.txt
rename to internal/libs/confix/testdata/baseline.txt
diff --git a/scripts/confix/testdata/diff-26-27.txt b/internal/libs/confix/testdata/diff-26-27.txt
similarity index 100%
rename from scripts/confix/testdata/diff-26-27.txt
rename to internal/libs/confix/testdata/diff-26-27.txt
diff --git a/scripts/confix/testdata/diff-27-28.txt b/internal/libs/confix/testdata/diff-27-28.txt
similarity index 100%
rename from scripts/confix/testdata/diff-27-28.txt
rename to internal/libs/confix/testdata/diff-27-28.txt
diff --git a/scripts/confix/testdata/diff-28-29.txt b/internal/libs/confix/testdata/diff-28-29.txt
similarity index 100%
rename from scripts/confix/testdata/diff-28-29.txt
rename to internal/libs/confix/testdata/diff-28-29.txt
diff --git a/scripts/confix/testdata/diff-29-30.txt b/internal/libs/confix/testdata/diff-29-30.txt
similarity index 100%
rename from scripts/confix/testdata/diff-29-30.txt
rename to internal/libs/confix/testdata/diff-29-30.txt
diff --git a/scripts/confix/testdata/diff-30-31.txt b/internal/libs/confix/testdata/diff-30-31.txt
similarity index 100%
rename from scripts/confix/testdata/diff-30-31.txt
rename to internal/libs/confix/testdata/diff-30-31.txt
diff --git a/scripts/confix/testdata/diff-31-32.txt b/internal/libs/confix/testdata/diff-31-32.txt
similarity index 100%
rename from scripts/confix/testdata/diff-31-32.txt
rename to internal/libs/confix/testdata/diff-31-32.txt
diff --git a/scripts/confix/testdata/diff-32-33.txt b/internal/libs/confix/testdata/diff-32-33.txt
similarity index 100%
rename from scripts/confix/testdata/diff-32-33.txt
rename to internal/libs/confix/testdata/diff-32-33.txt
diff --git a/scripts/confix/testdata/diff-33-34.txt b/internal/libs/confix/testdata/diff-33-34.txt
similarity index 100%
rename from scripts/confix/testdata/diff-33-34.txt
rename to internal/libs/confix/testdata/diff-33-34.txt
diff --git a/scripts/confix/testdata/diff-34-35.txt b/internal/libs/confix/testdata/diff-34-35.txt
similarity index 87%
rename from scripts/confix/testdata/diff-34-35.txt
rename to internal/libs/confix/testdata/diff-34-35.txt
index 13a4432a0..de08f2965 100644
--- a/scripts/confix/testdata/diff-34-35.txt
+++ b/internal/libs/confix/testdata/diff-34-35.txt
@@ -8,13 +8,11 @@
+M blocksync.version
-S fastsync
-M fastsync.version
-+M mempool.ttl-duration
-+M mempool.ttl-num-blocks
-+M mempool.version
-M mempool.wal-dir
+M p2p.bootstrap-peers
+M p2p.max-connections
+M p2p.max-incoming-connection-attempts
++M p2p.max-outgoing-connections
+M p2p.queue-type
-M p2p.seed-mode
+M p2p.use-legacy
@@ -28,4 +26,3 @@
-M statesync.chunk-fetchers
+M statesync.fetchers
+M statesync.use-p2p
-+M tx-index.psql-conn
diff --git a/scripts/confix/testdata/diff-35-36.txt b/internal/libs/confix/testdata/diff-35-36.txt
similarity index 100%
rename from scripts/confix/testdata/diff-35-36.txt
rename to internal/libs/confix/testdata/diff-35-36.txt
diff --git a/scripts/confix/testdata/non-config.toml b/internal/libs/confix/testdata/non-config.toml
similarity index 100%
rename from scripts/confix/testdata/non-config.toml
rename to internal/libs/confix/testdata/non-config.toml
diff --git a/scripts/confix/testdata/v26-config.toml b/internal/libs/confix/testdata/v26-config.toml
similarity index 100%
rename from scripts/confix/testdata/v26-config.toml
rename to internal/libs/confix/testdata/v26-config.toml
diff --git a/scripts/confix/testdata/v27-config.toml b/internal/libs/confix/testdata/v27-config.toml
similarity index 100%
rename from scripts/confix/testdata/v27-config.toml
rename to internal/libs/confix/testdata/v27-config.toml
diff --git a/scripts/confix/testdata/v28-config.toml b/internal/libs/confix/testdata/v28-config.toml
similarity index 100%
rename from scripts/confix/testdata/v28-config.toml
rename to internal/libs/confix/testdata/v28-config.toml
diff --git a/scripts/confix/testdata/v29-config.toml b/internal/libs/confix/testdata/v29-config.toml
similarity index 100%
rename from scripts/confix/testdata/v29-config.toml
rename to internal/libs/confix/testdata/v29-config.toml
diff --git a/scripts/confix/testdata/v30-config.toml b/internal/libs/confix/testdata/v30-config.toml
similarity index 100%
rename from scripts/confix/testdata/v30-config.toml
rename to internal/libs/confix/testdata/v30-config.toml
diff --git a/scripts/confix/testdata/v31-config.toml b/internal/libs/confix/testdata/v31-config.toml
similarity index 100%
rename from scripts/confix/testdata/v31-config.toml
rename to internal/libs/confix/testdata/v31-config.toml
diff --git a/scripts/confix/testdata/v32-config.toml b/internal/libs/confix/testdata/v32-config.toml
similarity index 100%
rename from scripts/confix/testdata/v32-config.toml
rename to internal/libs/confix/testdata/v32-config.toml
diff --git a/scripts/confix/testdata/v33-config.toml b/internal/libs/confix/testdata/v33-config.toml
similarity index 100%
rename from scripts/confix/testdata/v33-config.toml
rename to internal/libs/confix/testdata/v33-config.toml
diff --git a/scripts/confix/testdata/v34-config.toml b/internal/libs/confix/testdata/v34-config.toml
similarity index 93%
rename from scripts/confix/testdata/v34-config.toml
rename to internal/libs/confix/testdata/v34-config.toml
index 0ef8b25eb..f9d61f493 100644
--- a/scripts/confix/testdata/v34-config.toml
+++ b/internal/libs/confix/testdata/v34-config.toml
@@ -272,6 +272,11 @@ dial_timeout = "3s"
#######################################################
[mempool]
+# Mempool version to use:
+# 1) "v0" - (default) FIFO mempool.
+# 2) "v1" - prioritized mempool.
+version = "v0"
+
recheck = true
broadcast = true
wal_dir = ""
@@ -301,6 +306,22 @@ max_tx_bytes = 1048576
# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796
max_batch_bytes = 0
+# ttl-duration, if non-zero, defines the maximum amount of time a transaction
+# can exist for in the mempool.
+#
+# Note, if ttl-num-blocks is also defined, a transaction will be removed if it
+# has existed in the mempool at least ttl-num-blocks number of blocks or if it's
+# insertion time into the mempool is beyond ttl-duration.
+ttl-duration = "0s"
+
+# ttl-num-blocks, if non-zero, defines the maximum number of blocks a transaction
+# can exist for in the mempool.
+#
+# Note, if ttl-duration is also defined, a transaction will be removed if it
+# has existed in the mempool at least ttl-num-blocks number of blocks or if
+# it's insertion time into the mempool is beyond ttl-duration.
+ttl-num-blocks = 0
+
#######################################################
### State Sync Configuration Options ###
#######################################################
@@ -403,8 +424,14 @@ peer_query_maj23_sleep_duration = "2s"
# 1) "null"
# 2) "kv" (default) - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
# - When "kv" is chosen "tx.height" and "tx.hash" will always be indexed.
+# 3) "psql" - the indexer services backed by PostgreSQL.
+# When "kv" or "psql" is chosen "tx.height" and "tx.hash" will always be indexed.
indexer = "kv"
+# The PostgreSQL connection configuration, the connection format:
+# postgresql://:@:/?
+psql-conn = ""
+
#######################################################
### Instrumentation Configuration Options ###
#######################################################
diff --git a/scripts/confix/testdata/v35-config.toml b/internal/libs/confix/testdata/v35-config.toml
similarity index 98%
rename from scripts/confix/testdata/v35-config.toml
rename to internal/libs/confix/testdata/v35-config.toml
index 79616d6cd..a59161f07 100644
--- a/scripts/confix/testdata/v35-config.toml
+++ b/internal/libs/confix/testdata/v35-config.toml
@@ -227,7 +227,9 @@ pprof-laddr = ""
# Enable the legacy p2p layer.
use-legacy = false
-# Select the p2p internal queue
+# Select the p2p internal queue.
+# Options are: "fifo", "simple-priority", "priority", and "wdrr"
+# with the default being "priority".
queue-type = "priority"
# Address to listen for incoming connections
@@ -281,6 +283,10 @@ max-num-outbound-peers = 10
# Maximum number of connections (inbound and outbound).
max-connections = 64
+# Maximum number of connections reserved for outgoing
+# connections. Must be less than max-connections
+max-outgoing-connections = 12
+
# Rate limits the number of incoming connection attempts per IP address.
max-incoming-connection-attempts = 100
diff --git a/scripts/confix/testdata/v36-config.toml b/internal/libs/confix/testdata/v36-config.toml
similarity index 98%
rename from scripts/confix/testdata/v36-config.toml
rename to internal/libs/confix/testdata/v36-config.toml
index 612f46ece..7d39afc15 100644
--- a/scripts/confix/testdata/v36-config.toml
+++ b/internal/libs/confix/testdata/v36-config.toml
@@ -208,8 +208,10 @@ pprof-laddr = ""
#######################################################
[p2p]
-# Select the p2p internal queue
-queue-type = "priority"
+# Select the p2p internal queue.
+# Options are: "fifo", "simple-priority", and "priority",
+# with the default being "priority".
+queue-type = "simple-priority"
# Address to listen for incoming connections
laddr = "tcp://0.0.0.0:26656"
@@ -235,6 +237,10 @@ upnp = false
# Maximum number of connections (inbound and outbound).
max-connections = 64
+# Maximum number of connections reserved for outgoing
+# connections. Must be less than max-connections
+max-outgoing-connections = 12
+
# Rate limits the number of incoming connection attempts per IP address.
max-incoming-connection-attempts = 100
diff --git a/libs/strings/string.go b/internal/libs/strings/string.go
similarity index 100%
rename from libs/strings/string.go
rename to internal/libs/strings/string.go
diff --git a/libs/strings/string_test.go b/internal/libs/strings/string_test.go
similarity index 100%
rename from libs/strings/string_test.go
rename to internal/libs/strings/string_test.go
diff --git a/internal/mempool/cache.go b/internal/mempool/cache.go
index c69fc80dd..3986cd585 100644
--- a/internal/mempool/cache.go
+++ b/internal/mempool/cache.go
@@ -22,6 +22,10 @@ type TxCache interface {
// Remove removes the given raw transaction from the cache.
Remove(tx types.Tx)
+
+ // Has reports whether tx is present in the cache. Checking for presence is
+ // not treated as an access of the value.
+ Has(tx types.Tx) bool
}
var _ TxCache = (*LRUTxCache)(nil)
@@ -97,6 +101,14 @@ func (c *LRUTxCache) Remove(tx types.Tx) {
}
}
+func (c *LRUTxCache) Has(tx types.Tx) bool {
+ c.mtx.Lock()
+ defer c.mtx.Unlock()
+
+ _, ok := c.cacheMap[tx.Key()]
+ return ok
+}
+
// NopTxCache defines a no-op raw transaction cache.
type NopTxCache struct{}
@@ -105,3 +117,4 @@ var _ TxCache = (*NopTxCache)(nil)
func (NopTxCache) Reset() {}
func (NopTxCache) Push(types.Tx) bool { return true }
func (NopTxCache) Remove(types.Tx) {}
+func (NopTxCache) Has(types.Tx) bool { return false }
diff --git a/internal/mempool/mempool.go b/internal/mempool/mempool.go
index caee97ff8..0354eb28a 100644
--- a/internal/mempool/mempool.go
+++ b/internal/mempool/mempool.go
@@ -1,20 +1,20 @@
package mempool
import (
- "bytes"
"context"
- "errors"
"fmt"
+ "runtime"
+ "sort"
"sync"
"sync/atomic"
"time"
+ "github.com/creachadair/taskgroup"
abciclient "github.com/tendermint/tendermint/abci/client"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/internal/libs/clist"
"github.com/tendermint/tendermint/libs/log"
- tmmath "github.com/tendermint/tendermint/libs/math"
"github.com/tendermint/tendermint/types"
)
@@ -23,73 +23,41 @@ var _ Mempool = (*TxMempool)(nil)
// TxMempoolOption sets an optional parameter on the TxMempool.
type TxMempoolOption func(*TxMempool)
-// TxMempool defines a prioritized mempool data structure used by the v1 mempool
-// reactor. It keeps a thread-safe priority queue of transactions that is used
-// when a block proposer constructs a block and a thread-safe linked-list that
-// is used to gossip transactions to peers in a FIFO manner.
+// TxMempool implemements the Mempool interface and allows the application to
+// set priority values on transactions in the CheckTx response. When selecting
+// transactions to include in a block, higher-priority transactions are chosen
+// first. When evicting transactions from the mempool for size constraints,
+// lower-priority transactions are evicted sooner.
+//
+// Within the mempool, transactions are ordered by time of arrival, and are
+// gossiped to the rest of the network based on that order (gossip order does
+// not take priority into account).
type TxMempool struct {
+ // Immutable fields
logger log.Logger
- metrics *Metrics
config *config.MempoolConfig
proxyAppConn abciclient.Client
+ metrics *Metrics
+ cache TxCache // seen transactions
- // txsAvailable fires once for each height when the mempool is not empty
- txsAvailable chan struct{}
+ // Atomically-updated fields
+ txsBytes int64 // atomic: the total size of all transactions in the mempool, in bytes
+
+ // Synchronized fields, protected by mtx.
+ mtx *sync.RWMutex
notifiedTxsAvailable bool
+ txsAvailable chan struct{} // one value sent per height when mempool is not empty
+ preCheck PreCheckFunc
+ postCheck PostCheckFunc
+ height int64 // the latest height passed to Update
- // height defines the last block height process during Update()
- height int64
-
- // sizeBytes defines the total size of the mempool (sum of all tx bytes)
- sizeBytes int64
-
- // cache defines a fixed-size cache of already seen transactions as this
- // reduces pressure on the proxyApp.
- cache TxCache
-
- // txStore defines the main storage of valid transactions. Indexes are built
- // on top of this store.
- txStore *TxStore
-
- // gossipIndex defines the gossiping index of valid transactions via a
- // thread-safe linked-list. We also use the gossip index as a cursor for
- // rechecking transactions already in the mempool.
- gossipIndex *clist.CList
-
- // recheckCursor and recheckEnd are used as cursors based on the gossip index
- // to recheck transactions that are already in the mempool. Iteration is not
- // thread-safe and transaction may be mutated in serial order.
- //
- // XXX/TODO: It might be somewhat of a codesmell to use the gossip index for
- // iterator and cursor management when rechecking transactions. If the gossip
- // index changes or is removed in a future refactor, this will have to be
- // refactored. Instead, we should consider just keeping a slice of a snapshot
- // of the mempool's current transactions during Update and an integer cursor
- // into that slice. This, however, requires additional O(n) space complexity.
- recheckCursor *clist.CElement // next expected response
- recheckEnd *clist.CElement // re-checking stops here
-
- // priorityIndex defines the priority index of valid transactions via a
- // thread-safe priority queue.
- priorityIndex *TxPriorityQueue
-
- // heightIndex defines a height-based, in ascending order, transaction index.
- // i.e. older transactions are first.
- heightIndex *WrappedTxList
-
- // timestampIndex defines a timestamp-based, in ascending order, transaction
- // index. i.e. older transactions are first.
- timestampIndex *WrappedTxList
-
- // A read/write lock is used to safe guard updates, insertions and deletions
- // from the mempool. A read-lock is implicitly acquired when executing CheckTx,
- // however, a caller must explicitly grab a write-lock via Lock when updating
- // the mempool via Update().
- mtx sync.RWMutex
- preCheck PreCheckFunc
- postCheck PostCheckFunc
+ txs *clist.CList // valid transactions (passed CheckTx)
+ txByKey map[types.TxKey]*clist.CElement
+ txBySender map[string]*clist.CElement // for sender != ""
}
+// NewTxMempool constructs a new, empty priority mempool at the specified
+// initial height and using the given config and options.
func NewTxMempool(
logger log.Logger,
cfg *config.MempoolConfig,
@@ -98,23 +66,16 @@ func NewTxMempool(
) *TxMempool {
txmp := &TxMempool{
- logger: logger,
- config: cfg,
- proxyAppConn: proxyAppConn,
- height: -1,
- cache: NopTxCache{},
- metrics: NopMetrics(),
- txStore: NewTxStore(),
- gossipIndex: clist.New(),
- priorityIndex: NewTxPriorityQueue(),
- heightIndex: NewWrappedTxList(func(wtx1, wtx2 *WrappedTx) bool {
- return wtx1.height >= wtx2.height
- }),
- timestampIndex: NewWrappedTxList(func(wtx1, wtx2 *WrappedTx) bool {
- return wtx1.timestamp.After(wtx2.timestamp) || wtx1.timestamp.Equal(wtx2.timestamp)
- }),
+ logger: logger,
+ config: cfg,
+ proxyAppConn: proxyAppConn,
+ metrics: NopMetrics(),
+ cache: NopTxCache{},
+ txs: clist.New(),
+ mtx: new(sync.RWMutex),
+ txByKey: make(map[types.TxKey]*clist.CElement),
+ txBySender: make(map[string]*clist.CElement),
}
-
if cfg.CacheSize > 0 {
txmp.cache = NewLRUTxCache(cfg.CacheSize)
}
@@ -147,47 +108,36 @@ func WithMetrics(metrics *Metrics) TxMempoolOption {
// Lock obtains a write-lock on the mempool. A caller must be sure to explicitly
// release the lock when finished.
-func (txmp *TxMempool) Lock() {
- txmp.mtx.Lock()
-}
+func (txmp *TxMempool) Lock() { txmp.mtx.Lock() }
// Unlock releases a write-lock on the mempool.
-func (txmp *TxMempool) Unlock() {
- txmp.mtx.Unlock()
-}
+func (txmp *TxMempool) Unlock() { txmp.mtx.Unlock() }
// Size returns the number of valid transactions in the mempool. It is
// thread-safe.
-func (txmp *TxMempool) Size() int {
- return txmp.txStore.Size()
-}
+func (txmp *TxMempool) Size() int { return txmp.txs.Len() }
// SizeBytes return the total sum in bytes of all the valid transactions in the
// mempool. It is thread-safe.
-func (txmp *TxMempool) SizeBytes() int64 {
- return atomic.LoadInt64(&txmp.sizeBytes)
-}
+func (txmp *TxMempool) SizeBytes() int64 { return atomic.LoadInt64(&txmp.txsBytes) }
-// FlushAppConn executes FlushSync on the mempool's proxyAppConn.
+// FlushAppConn executes Flush on the mempool's proxyAppConn.
//
-// NOTE: The caller must obtain a write-lock prior to execution.
+// The caller must hold an exclusive mempool lock (by calling txmp.Lock) before
+// calling FlushAppConn.
func (txmp *TxMempool) FlushAppConn(ctx context.Context) error {
+ // N.B.: We have to issue the call outside the lock so that its callback can
+ // fire. It's safe to do this, the flush will block until complete.
+ //
+ // We could just not require the caller to hold the lock at all, but the
+ // semantics of the Mempool interface require the caller to hold it, and we
+ // can't change that without disrupting existing use.
+ txmp.mtx.Unlock()
+ defer txmp.mtx.Lock()
+
return txmp.proxyAppConn.Flush(ctx)
}
-// WaitForNextTx returns a blocking channel that will be closed when the next
-// valid transaction is available to gossip. It is thread-safe.
-func (txmp *TxMempool) WaitForNextTx() <-chan struct{} {
- return txmp.gossipIndex.WaitChan()
-}
-
-// NextGossipTx returns the next valid transaction to gossip. A caller must wait
-// for WaitForNextTx to signal a transaction is available to gossip first. It is
-// thread-safe.
-func (txmp *TxMempool) NextGossipTx() *clist.CElement {
- return txmp.gossipIndex.Front()
-}
-
// EnableTxsAvailable enables the mempool to trigger events when transactions
// are available on a block by block basis.
func (txmp *TxMempool) EnableTxsAvailable() {
@@ -199,232 +149,249 @@ func (txmp *TxMempool) EnableTxsAvailable() {
// TxsAvailable returns a channel which fires once for every height, and only
// when transactions are available in the mempool. It is thread-safe.
-func (txmp *TxMempool) TxsAvailable() <-chan struct{} {
- return txmp.txsAvailable
-}
+func (txmp *TxMempool) TxsAvailable() <-chan struct{} { return txmp.txsAvailable }
-// CheckTx executes the ABCI CheckTx method for a given transaction.
-// It acquires a read-lock and attempts to execute the application's
-// CheckTx ABCI method synchronously. We return an error if any of
-// the following happen:
+// CheckTx adds the given transaction to the mempool if it fits and passes the
+// application's ABCI CheckTx method.
//
-// - The CheckTx execution fails.
-// - The transaction already exists in the cache and we've already received the
-// transaction from the peer. Otherwise, if it solely exists in the cache, we
-// return nil.
-// - The transaction size exceeds the maximum transaction size as defined by the
-// configuration provided to the mempool.
-// - The transaction fails Pre-Check (if it is defined).
-// - The proxyAppConn fails, e.g. the buffer is full.
+// CheckTx reports an error without adding tx if:
//
-// If the mempool is full, we still execute CheckTx and attempt to find a lower
-// priority transaction to evict. If such a transaction exists, we remove the
-// lower priority transaction and add the new one with higher priority.
+// - The size of tx exceeds the configured maximum transaction size.
+// - The pre-check hook is defined and reports an error for tx.
+// - The transaction already exists in the cache.
+// - The proxy connection to the application fails.
//
-// NOTE:
-// - The applications' CheckTx implementation may panic.
-// - The caller is not to explicitly require any locks for executing CheckTx.
+// If tx passes all of the above conditions, it is passed (asynchronously) to
+// the application's ABCI CheckTx method and this CheckTx method returns nil.
+// If cb != nil, it is called when the ABCI request completes to report the
+// application response.
+//
+// If the application accepts the transaction and the mempool is full, the
+// mempool evicts one or more of the lowest-priority transaction whose priority
+// is (strictly) lower than the priority of tx and whose size together exceeds
+// the size of tx, and adds tx instead. If no such transactions exist, tx is
+// discarded.
func (txmp *TxMempool) CheckTx(
ctx context.Context,
tx types.Tx,
cb func(*abci.ResponseCheckTx),
txInfo TxInfo,
) error {
- txmp.mtx.RLock()
- defer txmp.mtx.RUnlock()
+ // During the initial phase of CheckTx, we do not need to modify any state.
+ // A transaction will not actually be added to the mempool until it survives
+ // a call to the ABCI CheckTx method and size constraint checks.
+ height, err := func() (int64, error) {
+ txmp.mtx.RLock()
+ defer txmp.mtx.RUnlock()
- if txSize := len(tx); txSize > txmp.config.MaxTxBytes {
- return types.ErrTxTooLarge{
- Max: txmp.config.MaxTxBytes,
- Actual: txSize,
+ // Reject transactions in excess of the configured maximum transaction size.
+ if len(tx) > txmp.config.MaxTxBytes {
+ return 0, types.ErrTxTooLarge{Max: txmp.config.MaxTxBytes, Actual: len(tx)}
}
- }
- if txmp.preCheck != nil {
- if err := txmp.preCheck(tx); err != nil {
- return types.ErrPreCheck{Reason: err}
+ // If a precheck hook is defined, call it before invoking the application.
+ if txmp.preCheck != nil {
+ if err := txmp.preCheck(tx); err != nil {
+ return 0, types.ErrPreCheck{Reason: err}
+ }
}
- }
- if err := txmp.proxyAppConn.Error(); err != nil {
+ // Early exit if the proxy connection has an error.
+ if err := txmp.proxyAppConn.Error(); err != nil {
+ return 0, err
+ }
+
+ txKey := tx.Key()
+
+ // Check for the transaction in the cache.
+ if !txmp.cache.Push(tx) {
+ // If the cached transaction is also in the pool, record its sender.
+ if elt, ok := txmp.txByKey[txKey]; ok {
+ w := elt.Value.(*WrappedTx)
+ w.SetPeer(txInfo.SenderID)
+ }
+ return 0, types.ErrTxInCache
+ }
+ return txmp.height, nil
+ }()
+ if err != nil {
return err
}
- txHash := tx.Key()
-
- // We add the transaction to the mempool's cache and if the
- // transaction is already present in the cache, i.e. false is returned, then we
- // check if we've seen this transaction and error if we have.
- if !txmp.cache.Push(tx) {
- txmp.txStore.GetOrSetPeerByTxHash(txHash, txInfo.SenderID)
- return types.ErrTxInCache
- }
-
- res, err := txmp.proxyAppConn.CheckTx(ctx, &abci.RequestCheckTx{Tx: tx})
+ // Invoke an ABCI CheckTx for this transaction.
+ rsp, err := txmp.proxyAppConn.CheckTx(ctx, &abci.RequestCheckTx{Tx: tx})
if err != nil {
txmp.cache.Remove(tx)
return err
}
-
- if txmp.recheckCursor != nil {
- return errors.New("recheck cursor is non-nil")
- }
-
wtx := &WrappedTx{
tx: tx,
- hash: txHash,
+ hash: tx.Key(),
timestamp: time.Now().UTC(),
- height: txmp.height,
- }
-
- txmp.defaultTxCallback(tx, res)
- err = txmp.initTxCallback(wtx, res, txInfo)
-
- if err != nil {
- return err
+ height: height,
}
+ wtx.SetPeer(txInfo.SenderID)
if cb != nil {
- cb(res)
+ cb(rsp)
}
-
- return nil
+ return txmp.addNewTransaction(wtx, rsp)
}
+// RemoveTxByKey removes the transaction with the specified key from the
+// mempool. It reports an error if no such transaction exists. This operation
+// does not remove the transaction from the cache.
func (txmp *TxMempool) RemoveTxByKey(txKey types.TxKey) error {
- txmp.Lock()
- defer txmp.Unlock()
+ txmp.mtx.Lock()
+ defer txmp.mtx.Unlock()
+ return txmp.removeTxByKey(txKey)
+}
- // remove the committed transaction from the transaction store and indexes
- if wtx := txmp.txStore.GetTxByHash(txKey); wtx != nil {
- txmp.removeTx(wtx, false)
+// removeTxByKey removes the specified transaction key from the mempool.
+// The caller must hold txmp.mtx exclusively.
+func (txmp *TxMempool) removeTxByKey(key types.TxKey) error {
+ if elt, ok := txmp.txByKey[key]; ok {
+ w := elt.Value.(*WrappedTx)
+ delete(txmp.txByKey, key)
+ delete(txmp.txBySender, w.sender)
+ txmp.txs.Remove(elt)
+ elt.DetachPrev()
+ elt.DetachNext()
+ atomic.AddInt64(&txmp.txsBytes, -w.Size())
return nil
}
-
- return errors.New("transaction not found")
+ return fmt.Errorf("transaction %x not found", key)
}
-// Flush empties the mempool. It acquires a read-lock, fetches all the
-// transactions currently in the transaction store and removes each transaction
-// from the store and all indexes and finally resets the cache.
-//
-// NOTE:
-// - Flushing the mempool may leave the mempool in an inconsistent state.
+// removeTxByElement removes the specified transaction element from the mempool.
+// The caller must hold txmp.mtx exclusively.
+func (txmp *TxMempool) removeTxByElement(elt *clist.CElement) {
+ w := elt.Value.(*WrappedTx)
+ delete(txmp.txByKey, w.tx.Key())
+ delete(txmp.txBySender, w.sender)
+ txmp.txs.Remove(elt)
+ elt.DetachPrev()
+ elt.DetachNext()
+ atomic.AddInt64(&txmp.txsBytes, -w.Size())
+}
+
+// Flush purges the contents of the mempool and the cache, leaving both empty.
+// The current height is not modified by this operation.
func (txmp *TxMempool) Flush() {
- txmp.mtx.RLock()
- defer txmp.mtx.RUnlock()
+ txmp.mtx.Lock()
+ defer txmp.mtx.Unlock()
- txmp.heightIndex.Reset()
- txmp.timestampIndex.Reset()
-
- for _, wtx := range txmp.txStore.GetAllTxs() {
- txmp.removeTx(wtx, false)
+ // Remove all the transactions in the list explicitly, so that the sizes
+ // and indexes get updated properly.
+ cur := txmp.txs.Front()
+ for cur != nil {
+ next := cur.Next()
+ txmp.removeTxByElement(cur)
+ cur = next
}
-
- atomic.SwapInt64(&txmp.sizeBytes, 0)
txmp.cache.Reset()
}
-// ReapMaxBytesMaxGas returns a list of transactions within the provided size
-// and gas constraints. Transaction are retrieved in priority order.
+// allEntriesSorted returns a slice of all the transactions currently in the
+// mempool, sorted in nonincreasing order by priority with ties broken by
+// increasing order of arrival time.
+func (txmp *TxMempool) allEntriesSorted() []*WrappedTx {
+ txmp.mtx.RLock()
+ defer txmp.mtx.RUnlock()
+
+ all := make([]*WrappedTx, 0, len(txmp.txByKey))
+ for _, tx := range txmp.txByKey {
+ all = append(all, tx.Value.(*WrappedTx))
+ }
+ sort.Slice(all, func(i, j int) bool {
+ if all[i].priority == all[j].priority {
+ return all[i].timestamp.Before(all[j].timestamp)
+ }
+ return all[i].priority > all[j].priority // N.B. higher priorities first
+ })
+ return all
+}
+
+// ReapMaxBytesMaxGas returns a slice of valid transactions that fit within the
+// size and gas constraints. The results are ordered by nonincreasing priority,
+// with ties broken by increasing order of arrival. Reaping transactions does
+// not remove them from the mempool.
//
-// NOTE:
-// - Transactions returned are not removed from the mempool transaction
-// store or indexes.
+// If maxBytes < 0, no limit is set on the total size in bytes.
+// If maxGas < 0, no limit is set on the total gas cost.
+//
+// If the mempool is empty or has no transactions fitting within the given
+// constraints, the result will also be empty.
func (txmp *TxMempool) ReapMaxBytesMaxGas(maxBytes, maxGas int64) types.Txs {
- txmp.mtx.RLock()
- defer txmp.mtx.RUnlock()
+ var totalGas, totalBytes int64
- var (
- totalGas int64
- totalSize int64
- )
-
- // wTxs contains a list of *WrappedTx retrieved from the priority queue that
- // need to be re-enqueued prior to returning.
- wTxs := make([]*WrappedTx, 0, txmp.priorityIndex.NumTxs())
- defer func() {
- for _, wtx := range wTxs {
- txmp.priorityIndex.PushTx(wtx)
+ var keep []types.Tx //nolint:prealloc
+ for _, w := range txmp.allEntriesSorted() {
+ // N.B. When computing byte size, we need to include the overhead for
+ // encoding as protobuf to send to the application.
+ totalGas += w.gasWanted
+ totalBytes += types.ComputeProtoSizeForTxs([]types.Tx{w.tx})
+ if (maxGas >= 0 && totalGas > maxGas) || (maxBytes >= 0 && totalBytes > maxBytes) {
+ break
}
- }()
-
- txs := make([]types.Tx, 0, txmp.priorityIndex.NumTxs())
- for txmp.priorityIndex.NumTxs() > 0 {
- wtx := txmp.priorityIndex.PopTx()
- txs = append(txs, wtx.tx)
- wTxs = append(wTxs, wtx)
- size := types.ComputeProtoSizeForTxs([]types.Tx{wtx.tx})
-
- // Ensure we have capacity for the transaction with respect to the
- // transaction size.
- if maxBytes > -1 && totalSize+size > maxBytes {
- return txs[:len(txs)-1]
- }
-
- totalSize += size
-
- // ensure we have capacity for the transaction with respect to total gas
- gas := totalGas + wtx.gasWanted
- if maxGas > -1 && gas > maxGas {
- return txs[:len(txs)-1]
- }
-
- totalGas = gas
+ keep = append(keep, w.tx)
}
-
- return txs
+ return keep
}
-// ReapMaxTxs returns a list of transactions within the provided number of
-// transactions bound. Transaction are retrieved in priority order.
+// TxsWaitChan returns a channel that is closed when there is at least one
+// transaction available to be gossiped.
+func (txmp *TxMempool) TxsWaitChan() <-chan struct{} { return txmp.txs.WaitChan() }
+
+// TxsFront returns the frontmost element of the pending transaction list.
+// It will be nil if the mempool is empty.
+func (txmp *TxMempool) TxsFront() *clist.CElement { return txmp.txs.Front() }
+
+// ReapMaxTxs returns up to max transactions from the mempool. The results are
+// ordered by nonincreasing priority with ties broken by increasing order of
+// arrival. Reaping transactions does not remove them from the mempool.
//
-// NOTE:
-// - Transactions returned are not removed from the mempool transaction
-// store or indexes.
+// If max < 0, all transactions in the mempool are reaped.
+//
+// The result may have fewer than max elements (possibly zero) if the mempool
+// does not have that many transactions available.
func (txmp *TxMempool) ReapMaxTxs(max int) types.Txs {
- txmp.mtx.RLock()
- defer txmp.mtx.RUnlock()
+ var keep []types.Tx //nolint:prealloc
- numTxs := txmp.priorityIndex.NumTxs()
- if max < 0 {
- max = numTxs
+ for _, w := range txmp.allEntriesSorted() {
+ if max >= 0 && len(keep) >= max {
+ break
+ }
+ keep = append(keep, w.tx)
}
-
- cap := tmmath.MinInt(numTxs, max)
-
- // wTxs contains a list of *WrappedTx retrieved from the priority queue that
- // need to be re-enqueued prior to returning.
- wTxs := make([]*WrappedTx, 0, cap)
- txs := make([]types.Tx, 0, cap)
- for txmp.priorityIndex.NumTxs() > 0 && len(txs) < max {
- wtx := txmp.priorityIndex.PopTx()
- txs = append(txs, wtx.tx)
- wTxs = append(wTxs, wtx)
- }
- for _, wtx := range wTxs {
- txmp.priorityIndex.PushTx(wtx)
- }
- return txs
+ return keep
}
-// Update iterates over all the transactions provided by the block producer,
-// removes them from the cache (if applicable), and removes
-// the transactions from the main transaction store and associated indexes.
-// If there are transactions remaining in the mempool, we initiate a
-// re-CheckTx for them (if applicable), otherwise, we notify the caller more
-// transactions are available.
+// Update removes all the given transactions from the mempool and the cache,
+// and updates the current block height. The blockTxs and deliverTxResponses
+// must have the same length with each response corresponding to the tx at the
+// same offset.
//
-// NOTE:
-// - The caller must explicitly acquire a write-lock.
+// If the configuration enables recheck, Update sends each remaining
+// transaction after removing blockTxs to the ABCI CheckTx method. Any
+// transactions marked as invalid during recheck are also removed.
+//
+// The caller must hold an exclusive mempool lock (by calling txmp.Lock) before
+// calling Update.
func (txmp *TxMempool) Update(
ctx context.Context,
blockHeight int64,
blockTxs types.Txs,
- execTxResult []*abci.ExecTxResult,
+ deliverTxResponses []*abci.ExecTxResult,
newPreFn PreCheckFunc,
newPostFn PostCheckFunc,
recheck bool,
) error {
+ // Safety check: Transactions and responses must match in number.
+ if len(blockTxs) != len(deliverTxResponses) {
+ panic(fmt.Sprintf("mempool: got %d transactions but %d ExecTx responses",
+ len(blockTxs), len(deliverTxResponses)))
+ }
+
txmp.height = blockHeight
txmp.notifiedTxsAvailable = false
@@ -436,18 +403,17 @@ func (txmp *TxMempool) Update(
}
for i, tx := range blockTxs {
- if execTxResult[i].Code == abci.CodeTypeOK {
- // add the valid committed transaction to the cache (if missing)
+ // Add successful committed transactions to the cache (if they are not
+ // already present). Transactions that failed to commit are removed from
+ // the cache unless the operator has explicitly requested we keep them.
+ if deliverTxResponses[i].Code == abci.CodeTypeOK {
_ = txmp.cache.Push(tx)
} else if !txmp.config.KeepInvalidTxsInCache {
- // allow invalid transactions to be re-submitted
txmp.cache.Remove(tx)
}
- // remove the committed transaction from the transaction store and indexes
- if wtx := txmp.txStore.GetTxByHash(tx.Key()); wtx != nil {
- txmp.removeTx(wtx, false)
- }
+ // Regardless of success, remove the transaction from the mempool.
+ _ = txmp.removeTxByKey(tx.Key())
}
txmp.purgeExpiredTxs(blockHeight)
@@ -455,134 +421,173 @@ func (txmp *TxMempool) Update(
// If there any uncommitted transactions left in the mempool, we either
// initiate re-CheckTx per remaining transaction or notify that remaining
// transactions are left.
- if txmp.Size() > 0 {
+ size := txmp.Size()
+ txmp.metrics.Size.Set(float64(size))
+ if size > 0 {
if recheck {
- txmp.logger.Debug(
- "executing re-CheckTx for all remaining transactions",
- "num_txs", txmp.Size(),
- "height", blockHeight,
- )
- txmp.updateReCheckTxs(ctx)
+ txmp.recheckTransactions(ctx)
} else {
txmp.notifyTxsAvailable()
}
}
-
- txmp.metrics.Size.Set(float64(txmp.Size()))
return nil
}
-// initTxCallback is the callback invoked for a new unique transaction after CheckTx
-// has been executed by the ABCI application for the first time on that transaction.
-// CheckTx can be called again for the same transaction later when re-checking;
-// however, this callback will not be called.
+// addNewTransaction handles the ABCI CheckTx response for the first time a
+// transaction is added to the mempool. A recheck after a block is committed
+// goes to handleRecheckResult.
//
-// initTxCallback runs after the ABCI application executes CheckTx.
-// It runs the postCheck hook if one is defined on the mempool.
-// If the CheckTx response response code is not OK, or if the postCheck hook
-// reports an error, the transaction is rejected. Otherwise, we attempt to insert
-// the transaction into the mempool.
+// If either the application rejected the transaction or a post-check hook is
+// defined and rejects the transaction, it is discarded.
//
-// When inserting a transaction, we first check if there is sufficient capacity.
-// If there is, the transaction is added to the txStore and all indexes.
-// Otherwise, if the mempool is full, we attempt to find a lower priority transaction
-// to evict in place of the new incoming transaction. If no such transaction exists,
-// the new incoming transaction is rejected.
+// Otherwise, if the mempool is full, check for lower-priority transactions
+// that can be evicted to make room for the new one. If no such transactions
+// exist, this transaction is logged and dropped; otherwise the selected
+// transactions are evicted.
//
-// NOTE:
-// - An explicit lock is NOT required.
-func (txmp *TxMempool) initTxCallback(wtx *WrappedTx, res *abci.ResponseCheckTx, txInfo TxInfo) error {
+// Finally, the new transaction is added and size stats updated.
+func (txmp *TxMempool) addNewTransaction(wtx *WrappedTx, checkTxRes *abci.ResponseCheckTx) error {
+ txmp.mtx.Lock()
+ defer txmp.mtx.Unlock()
+
var err error
if txmp.postCheck != nil {
- err = txmp.postCheck(wtx.tx, res)
+ err = txmp.postCheck(wtx.tx, checkTxRes)
}
- if err != nil || res.Code != abci.CodeTypeOK {
- // ignore bad transactions
+ if err != nil || checkTxRes.Code != abci.CodeTypeOK {
txmp.logger.Info(
"rejected bad transaction",
- "priority", wtx.priority,
+ "priority", wtx.Priority(),
"tx", fmt.Sprintf("%X", wtx.tx.Hash()),
- "peer_id", txInfo.SenderNodeID,
- "code", res.Code,
+ "peer_id", wtx.peers,
+ "code", checkTxRes.Code,
"post_check_err", err,
)
txmp.metrics.FailedTxs.Add(1)
+ // Remove the invalid transaction from the cache, unless the operator has
+ // instructed us to keep invalid transactions.
if !txmp.config.KeepInvalidTxsInCache {
txmp.cache.Remove(wtx.tx)
}
- return err
+
+ if err != nil {
+ return err
+ }
+ // TODO(creachadair): Report an error for an invalid transaction.
+ // This is an API change, unfortunately, but should be made safe if it isn't.
+ // fmt.Errorf("invalid transaction: ABCI response code %d", checkTxRes.Code)
+ return nil
}
- sender := res.Sender
- priority := res.Priority
+ priority := checkTxRes.Priority
+ sender := checkTxRes.Sender
- if len(sender) > 0 {
- if wtx := txmp.txStore.GetTxBySender(sender); wtx != nil {
- txmp.logger.Error(
- "rejected incoming good transaction; tx already exists for sender",
- "tx", fmt.Sprintf("%X", wtx.tx.Hash()),
+ // Disallow multiple concurrent transactions from the same sender assigned
+ // by the ABCI application. As a special case, an empty sender is not
+ // restricted.
+ if sender != "" {
+ elt, ok := txmp.txBySender[sender]
+ if ok {
+ w := elt.Value.(*WrappedTx)
+ txmp.logger.Debug(
+ "rejected valid incoming transaction; tx already exists for sender",
+ "tx", fmt.Sprintf("%X", w.tx.Hash()),
"sender", sender,
)
txmp.metrics.RejectedTxs.Add(1)
+ // TODO(creachadair): Report an error for a duplicate sender.
+ // This is an API change, unfortunately, but should be made safe if it isn't.
+ // fmt.Errorf("transaction rejected: tx already exists for sender %q (%X)", sender, w.tx.Hash())
return nil
}
}
+ // At this point the application has ruled the transaction valid, but the
+ // mempool might be full. If so, find the lowest-priority items with lower
+ // priority than the application assigned to this new one, and evict as many
+ // of them as necessary to make room for tx. If no such items exist, we
+ // discard tx.
+
if err := txmp.canAddTx(wtx); err != nil {
- evictTxs := txmp.priorityIndex.GetEvictableTxs(
- priority,
- int64(wtx.Size()),
- txmp.SizeBytes(),
- txmp.config.MaxTxsBytes,
- )
- if len(evictTxs) == 0 {
- // No room for the new incoming transaction so we just remove it from
- // the cache.
+ var victims []*clist.CElement // eligible transactions for eviction
+ var victimBytes int64 // total size of victims
+ for cur := txmp.txs.Front(); cur != nil; cur = cur.Next() {
+ cw := cur.Value.(*WrappedTx)
+ if cw.priority < priority {
+ victims = append(victims, cur)
+ victimBytes += cw.Size()
+ }
+ }
+
+ // If there are no suitable eviction candidates, or the total size of
+ // those candidates is not enough to make room for the new transaction,
+ // drop the new one.
+ if len(victims) == 0 || victimBytes < wtx.Size() {
txmp.cache.Remove(wtx.tx)
txmp.logger.Error(
- "rejected incoming good transaction; mempool full",
+ "rejected valid incoming transaction; mempool is full",
"tx", fmt.Sprintf("%X", wtx.tx.Hash()),
"err", err.Error(),
)
txmp.metrics.RejectedTxs.Add(1)
+ // TODO(creachadair): Report an error for a full mempool.
+ // This is an API change, unfortunately, but should be made safe if it isn't.
+ // fmt.Errorf("transaction rejected: mempool is full (%X)", wtx.tx.Hash())
return nil
}
- // evict an existing transaction(s)
- //
- // NOTE:
- // - The transaction, toEvict, can be removed while a concurrent
- // reCheckTx callback is being executed for the same transaction.
- for _, toEvict := range evictTxs {
- txmp.removeTx(toEvict, true)
+ txmp.logger.Debug("evicting lower-priority transactions",
+ "new_tx", fmt.Sprintf("%X", wtx.tx.Hash()),
+ "new_priority", priority,
+ )
+
+ // Sort lowest priority items first so they will be evicted first. Break
+ // ties in favor of newer items (to maintain FIFO semantics in a group).
+ sort.Slice(victims, func(i, j int) bool {
+ iw := victims[i].Value.(*WrappedTx)
+ jw := victims[j].Value.(*WrappedTx)
+ if iw.Priority() == jw.Priority() {
+ return iw.timestamp.After(jw.timestamp)
+ }
+ return iw.Priority() < jw.Priority()
+ })
+
+ // Evict as many of the victims as necessary to make room.
+ var evictedBytes int64
+ for _, vic := range victims {
+ w := vic.Value.(*WrappedTx)
+
txmp.logger.Debug(
- "evicted existing good transaction; mempool full",
- "old_tx", fmt.Sprintf("%X", toEvict.tx.Hash()),
- "old_priority", toEvict.priority,
- "new_tx", fmt.Sprintf("%X", wtx.tx.Hash()),
- "new_priority", wtx.priority,
+ "evicted valid existing transaction; mempool full",
+ "old_tx", fmt.Sprintf("%X", w.tx.Hash()),
+ "old_priority", w.priority,
)
+ txmp.removeTxByElement(vic)
+ txmp.cache.Remove(w.tx)
txmp.metrics.EvictedTxs.Add(1)
+
+ // We may not need to evict all the eligible transactions. Bail out
+ // early if we have made enough room.
+ evictedBytes += w.Size()
+ if evictedBytes >= wtx.Size() {
+ break
+ }
}
}
- wtx.gasWanted = res.GasWanted
- wtx.priority = priority
- wtx.sender = sender
- wtx.peers = map[uint16]struct{}{
- txInfo.SenderID: {},
- }
+ wtx.SetGasWanted(checkTxRes.GasWanted)
+ wtx.SetPriority(priority)
+ wtx.SetSender(sender)
+ txmp.insertTx(wtx)
txmp.metrics.TxSizeBytes.Observe(float64(wtx.Size()))
txmp.metrics.Size.Set(float64(txmp.Size()))
-
- txmp.insertTx(wtx)
txmp.logger.Debug(
- "inserted good transaction",
- "priority", wtx.priority,
+ "inserted new valid transaction",
+ "priority", wtx.Priority(),
"tx", fmt.Sprintf("%X", wtx.tx.Hash()),
"height", txmp.height,
"num_txs", txmp.Size(),
@@ -591,149 +596,129 @@ func (txmp *TxMempool) initTxCallback(wtx *WrappedTx, res *abci.ResponseCheckTx,
return nil
}
-// defaultTxCallback is the CheckTx application callback used when a
-// transaction is being re-checked (if re-checking is enabled). The
-// caller must hold a mempool write-lock (via Lock()) and when
-// executing Update(), if the mempool is non-empty and Recheck is
-// enabled, then all remaining transactions will be rechecked via
-// CheckTx. The order transactions are rechecked must be the same as
-// the order in which this callback is called.
-func (txmp *TxMempool) defaultTxCallback(tx types.Tx, res *abci.ResponseCheckTx) {
- if txmp.recheckCursor == nil {
+func (txmp *TxMempool) insertTx(wtx *WrappedTx) {
+ elt := txmp.txs.PushBack(wtx)
+ txmp.txByKey[wtx.tx.Key()] = elt
+ if s := wtx.Sender(); s != "" {
+ txmp.txBySender[s] = elt
+ }
+
+ atomic.AddInt64(&txmp.txsBytes, wtx.Size())
+}
+
+// handleRecheckResult handles the responses from ABCI CheckTx calls issued
+// during the recheck phase of a block Update. It removes any transactions
+// invalidated by the application.
+//
+// This method is NOT executed for the initial CheckTx on a new transaction;
+// that case is handled by addNewTransaction instead.
+func (txmp *TxMempool) handleRecheckResult(tx types.Tx, checkTxRes *abci.ResponseCheckTx) {
+ txmp.metrics.RecheckTimes.Add(1)
+ txmp.mtx.Lock()
+ defer txmp.mtx.Unlock()
+
+ // Find the transaction reported by the ABCI callback. It is possible the
+ // transaction was evicted during the recheck, in which case the transaction
+ // will be gone.
+ elt, ok := txmp.txByKey[tx.Key()]
+ if !ok {
return
}
+ wtx := elt.Value.(*WrappedTx)
- txmp.metrics.RecheckTimes.Add(1)
-
- wtx := txmp.recheckCursor.Value.(*WrappedTx)
-
- // Search through the remaining list of tx to recheck for a transaction that matches
- // the one we received from the ABCI application.
- for {
- if bytes.Equal(tx, wtx.tx) {
- // We've found a tx in the recheck list that matches the tx that we
- // received from the ABCI application.
- // Break, and use this transaction for further checks.
- break
- }
-
- txmp.logger.Error(
- "re-CheckTx transaction mismatch",
- "got", wtx.tx.Hash(),
- "expected", tx.Key(),
- )
-
- if txmp.recheckCursor == txmp.recheckEnd {
- // we reached the end of the recheckTx list without finding a tx
- // matching the one we received from the ABCI application.
- // Return without processing any tx.
- txmp.recheckCursor = nil
- return
- }
-
- txmp.recheckCursor = txmp.recheckCursor.Next()
- wtx = txmp.recheckCursor.Value.(*WrappedTx)
+ // If a postcheck hook is defined, call it before checking the result.
+ var err error
+ if txmp.postCheck != nil {
+ err = txmp.postCheck(tx, checkTxRes)
}
- // Only evaluate transactions that have not been removed. This can happen
- // if an existing transaction is evicted during CheckTx and while this
- // callback is being executed for the same evicted transaction.
- if !txmp.txStore.IsTxRemoved(wtx.hash) {
- var err error
- if txmp.postCheck != nil {
- err = txmp.postCheck(tx, res)
- }
-
- if res.Code == abci.CodeTypeOK && err == nil {
- wtx.priority = res.Priority
- } else {
- txmp.logger.Debug(
- "existing transaction no longer valid; failed re-CheckTx callback",
- "priority", wtx.priority,
- "tx", fmt.Sprintf("%X", wtx.tx.Hash()),
- "err", err,
- "code", res.Code,
- )
-
- if wtx.gossipEl != txmp.recheckCursor {
- panic("corrupted reCheckTx cursor")
- }
-
- txmp.removeTx(wtx, !txmp.config.KeepInvalidTxsInCache)
- }
+ if checkTxRes.Code == abci.CodeTypeOK && err == nil {
+ wtx.SetPriority(checkTxRes.Priority)
+ return // N.B. Size of mempool did not change
}
- // move reCheckTx cursor to next element
- if txmp.recheckCursor == txmp.recheckEnd {
- txmp.recheckCursor = nil
- } else {
- txmp.recheckCursor = txmp.recheckCursor.Next()
+ txmp.logger.Debug(
+ "existing transaction no longer valid; failed re-CheckTx callback",
+ "priority", wtx.Priority(),
+ "tx", fmt.Sprintf("%X", wtx.tx.Hash()),
+ "err", err,
+ "code", checkTxRes.Code,
+ )
+ txmp.removeTxByElement(elt)
+ txmp.metrics.FailedTxs.Add(1)
+ if !txmp.config.KeepInvalidTxsInCache {
+ txmp.cache.Remove(wtx.tx)
}
-
- if txmp.recheckCursor == nil {
- txmp.logger.Debug("finished rechecking transactions")
-
- if txmp.Size() > 0 {
- txmp.notifyTxsAvailable()
- }
- }
-
txmp.metrics.Size.Set(float64(txmp.Size()))
}
-// updateReCheckTxs updates the recheck cursors using the gossipIndex. For
-// each transaction, it executes CheckTx. The global callback defined on
-// the proxyAppConn will be executed for each transaction after CheckTx is
-// executed.
+// recheckTransactions initiates re-CheckTx ABCI calls for all the transactions
+// currently in the mempool. It reports the number of recheck calls that were
+// successfully initiated.
//
-// NOTE:
-// - The caller must have a write-lock when executing updateReCheckTxs.
-func (txmp *TxMempool) updateReCheckTxs(ctx context.Context) {
+// Precondition: The mempool is not empty.
+// The caller must hold txmp.mtx exclusively.
+func (txmp *TxMempool) recheckTransactions(ctx context.Context) {
if txmp.Size() == 0 {
- panic("attempted to update re-CheckTx txs when mempool is empty")
+ panic("mempool: cannot run recheck on an empty mempool")
+ }
+ txmp.logger.Debug(
+ "executing re-CheckTx for all remaining transactions",
+ "num_txs", txmp.Size(),
+ "height", txmp.height,
+ )
+
+ // Collect transactions currently in the mempool requiring recheck.
+ wtxs := make([]*WrappedTx, 0, txmp.txs.Len())
+ for e := txmp.txs.Front(); e != nil; e = e.Next() {
+ wtxs = append(wtxs, e.Value.(*WrappedTx))
}
- txmp.recheckCursor = txmp.gossipIndex.Front()
- txmp.recheckEnd = txmp.gossipIndex.Back()
+ // Issue CheckTx calls for each remaining transaction, and when all the
+ // rechecks are complete signal watchers that transactions may be available.
+ go func() {
+ g, start := taskgroup.New(nil).Limit(2 * runtime.NumCPU())
- for e := txmp.gossipIndex.Front(); e != nil; e = e.Next() {
- wtx := e.Value.(*WrappedTx)
-
- // Only execute CheckTx if the transaction is not marked as removed which
- // could happen if the transaction was evicted.
- if !txmp.txStore.IsTxRemoved(wtx.hash) {
- res, err := txmp.proxyAppConn.CheckTx(ctx, &abci.RequestCheckTx{
- Tx: wtx.tx,
- Type: abci.CheckTxType_Recheck,
+ for _, wtx := range wtxs {
+ wtx := wtx
+ start(func() error {
+ rsp, err := txmp.proxyAppConn.CheckTx(ctx, &abci.RequestCheckTx{
+ Tx: wtx.tx,
+ Type: abci.CheckTxType_Recheck,
+ })
+ if err != nil {
+ txmp.logger.Error("failed to execute CheckTx during recheck",
+ "err", err, "hash", fmt.Sprintf("%x", wtx.tx.Hash()))
+ } else {
+ txmp.handleRecheckResult(wtx.tx, rsp)
+ }
+ return nil
})
- if err != nil {
- // no need in retrying since the tx will be rechecked after the next block
- txmp.logger.Error("failed to execute CheckTx during rechecking", "err", err)
- continue
- }
- txmp.defaultTxCallback(wtx.tx, res)
}
- }
+ if err := txmp.proxyAppConn.Flush(ctx); err != nil {
+ txmp.logger.Error("failed to flush transactions during recheck", "err", err)
+ }
- if err := txmp.proxyAppConn.Flush(ctx); err != nil {
- txmp.logger.Error("failed to flush transactions during rechecking", "err", err)
- }
+ // When recheck is complete, trigger a notification for more transactions.
+ _ = g.Wait()
+ txmp.mtx.Lock()
+ defer txmp.mtx.Unlock()
+ txmp.notifyTxsAvailable()
+ }()
}
// canAddTx returns an error if we cannot insert the provided *WrappedTx into
-// the mempool due to mempool configured constraints. If it returns nil,
-// the transaction can be inserted into the mempool.
+// the mempool due to mempool configured constraints. Otherwise, nil is
+// returned and the transaction can be inserted into the mempool.
func (txmp *TxMempool) canAddTx(wtx *WrappedTx) error {
- var (
- numTxs = txmp.Size()
- sizeBytes = txmp.SizeBytes()
- )
+ numTxs := txmp.Size()
+ txBytes := txmp.SizeBytes()
- if numTxs >= txmp.config.Size || int64(wtx.Size())+sizeBytes > txmp.config.MaxTxsBytes {
+ if numTxs >= txmp.config.Size || wtx.Size()+txBytes > txmp.config.MaxTxsBytes {
return types.ErrMempoolIsFull{
NumTxs: numTxs,
MaxTxs: txmp.config.Size,
- TxsBytes: sizeBytes,
+ TxsBytes: txBytes,
MaxTxsBytes: txmp.config.MaxTxsBytes,
}
}
@@ -741,96 +726,40 @@ func (txmp *TxMempool) canAddTx(wtx *WrappedTx) error {
return nil
}
-func (txmp *TxMempool) insertTx(wtx *WrappedTx) {
- txmp.txStore.SetTx(wtx)
- txmp.priorityIndex.PushTx(wtx)
- txmp.heightIndex.Insert(wtx)
- txmp.timestampIndex.Insert(wtx)
-
- // Insert the transaction into the gossip index and mark the reference to the
- // linked-list element, which will be needed at a later point when the
- // transaction is removed.
- gossipEl := txmp.gossipIndex.PushBack(wtx)
- wtx.gossipEl = gossipEl
-
- atomic.AddInt64(&txmp.sizeBytes, int64(wtx.Size()))
-}
-
-func (txmp *TxMempool) removeTx(wtx *WrappedTx, removeFromCache bool) {
- if txmp.txStore.IsTxRemoved(wtx.hash) {
- return
- }
-
- txmp.txStore.RemoveTx(wtx)
- txmp.priorityIndex.RemoveTx(wtx)
- txmp.heightIndex.Remove(wtx)
- txmp.timestampIndex.Remove(wtx)
-
- // Remove the transaction from the gossip index and cleanup the linked-list
- // element so it can be garbage collected.
- txmp.gossipIndex.Remove(wtx.gossipEl)
- wtx.gossipEl.DetachPrev()
-
- atomic.AddInt64(&txmp.sizeBytes, int64(-wtx.Size()))
-
- if removeFromCache {
- txmp.cache.Remove(wtx.tx)
- }
-}
-
-// purgeExpiredTxs removes all transactions that have exceeded their respective
-// height- and/or time-based TTLs from their respective indexes. Every expired
-// transaction will be removed from the mempool, but preserved in the cache.
+// purgeExpiredTxs removes all transactions from the mempool that have exceeded
+// their respective height or time-based limits as of the given blockHeight.
+// Transactions removed by this operation are not removed from the cache.
//
-// NOTE: purgeExpiredTxs must only be called during TxMempool#Update in which
-// the caller has a write-lock on the mempool and so we can safely iterate over
-// the height and time based indexes.
+// The caller must hold txmp.mtx exclusively.
func (txmp *TxMempool) purgeExpiredTxs(blockHeight int64) {
+ if txmp.config.TTLNumBlocks == 0 && txmp.config.TTLDuration == 0 {
+ return // nothing to do
+ }
+
now := time.Now()
- expiredTxs := make(map[types.TxKey]*WrappedTx)
+ cur := txmp.txs.Front()
+ for cur != nil {
+ // N.B. Grab the next element first, since if we remove cur its successor
+ // will be invalidated.
+ next := cur.Next()
- if txmp.config.TTLNumBlocks > 0 {
- purgeIdx := -1
- for i, wtx := range txmp.heightIndex.txs {
- if (blockHeight - wtx.height) > txmp.config.TTLNumBlocks {
- expiredTxs[wtx.tx.Key()] = wtx
- purgeIdx = i
- } else {
- // since the index is sorted, we know no other txs can be be purged
- break
- }
+ w := cur.Value.(*WrappedTx)
+ if txmp.config.TTLNumBlocks > 0 && (blockHeight-w.height) > txmp.config.TTLNumBlocks {
+ txmp.removeTxByElement(cur)
+ txmp.cache.Remove(w.tx)
+ txmp.metrics.EvictedTxs.Add(1)
+ } else if txmp.config.TTLDuration > 0 && now.Sub(w.timestamp) > txmp.config.TTLDuration {
+ txmp.removeTxByElement(cur)
+ txmp.cache.Remove(w.tx)
+ txmp.metrics.EvictedTxs.Add(1)
}
-
- if purgeIdx >= 0 {
- txmp.heightIndex.txs = txmp.heightIndex.txs[purgeIdx+1:]
- }
- }
-
- if txmp.config.TTLDuration > 0 {
- purgeIdx := -1
- for i, wtx := range txmp.timestampIndex.txs {
- if now.Sub(wtx.timestamp) > txmp.config.TTLDuration {
- expiredTxs[wtx.tx.Key()] = wtx
- purgeIdx = i
- } else {
- // since the index is sorted, we know no other txs can be be purged
- break
- }
- }
-
- if purgeIdx >= 0 {
- txmp.timestampIndex.txs = txmp.timestampIndex.txs[purgeIdx+1:]
- }
- }
-
- for _, wtx := range expiredTxs {
- txmp.removeTx(wtx, false)
+ cur = next
}
}
func (txmp *TxMempool) notifyTxsAvailable() {
if txmp.Size() == 0 {
- panic("attempt to notify txs available but mempool is empty!")
+ return // nothing to do
}
if txmp.txsAvailable != nil && !txmp.notifiedTxsAvailable {
diff --git a/internal/mempool/mempool_test.go b/internal/mempool/mempool_test.go
index 538cb3e1f..2071d1f05 100644
--- a/internal/mempool/mempool_test.go
+++ b/internal/mempool/mempool_test.go
@@ -86,9 +86,19 @@ func setup(t testing.TB, app abciclient.Client, cacheSize int, options ...TxMemp
return NewTxMempool(logger.With("test", t.Name()), cfg.Mempool, app, options...)
}
-func checkTxs(ctx context.Context, t *testing.T, txmp *TxMempool, numTxs int, peerID uint16) []testTx {
- t.Helper()
+// mustCheckTx invokes txmp.CheckTx for the given transaction and waits until
+// its callback has finished executing. It fails t if CheckTx fails.
+func mustCheckTx(ctx context.Context, t *testing.T, txmp *TxMempool, spec string) {
+ done := make(chan struct{})
+ if err := txmp.CheckTx(ctx, []byte(spec), func(*abci.ResponseCheckTx) {
+ close(done)
+ }, TxInfo{}); err != nil {
+ t.Fatalf("CheckTx for %q failed: %v", spec, err)
+ }
+ <-done
+}
+func checkTxs(ctx context.Context, t *testing.T, txmp *TxMempool, numTxs int, peerID uint16) []testTx {
txs := make([]testTx, numTxs)
txInfo := TxInfo{SenderID: peerID}
@@ -217,6 +227,87 @@ func TestTxMempool_Size(t *testing.T) {
require.Equal(t, int64(2850), txmp.SizeBytes())
}
+func TestTxMempool_Eviction(t *testing.T) {
+ ctx, cancel := context.WithCancel(context.Background())
+ defer cancel()
+
+ client := abciclient.NewLocalClient(log.NewNopLogger(), &application{Application: kvstore.NewApplication()})
+ if err := client.Start(ctx); err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(client.Wait)
+
+ txmp := setup(t, client, 1000)
+ txmp.config.Size = 5
+ txmp.config.MaxTxsBytes = 60
+ txExists := func(spec string) bool {
+ txmp.Lock()
+ defer txmp.Unlock()
+ key := types.Tx(spec).Key()
+ _, ok := txmp.txByKey[key]
+ return ok
+ }
+ t.Cleanup(client.Wait)
+
+ // A transaction bigger than the mempool should be rejected even when there
+ // are slots available.
+ mustCheckTx(ctx, t, txmp, "big=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef=1")
+ require.Equal(t, 0, txmp.Size())
+
+ // Nearly-fill the mempool with a low-priority transaction, to show that it
+ // is evicted even when slots are available for a higher-priority tx.
+ const bigTx = "big=0123456789abcdef0123456789abcdef0123456789abcdef01234=2"
+ mustCheckTx(ctx, t, txmp, bigTx)
+ require.Equal(t, 1, txmp.Size()) // bigTx is the only element
+ require.True(t, txExists(bigTx))
+ require.Equal(t, int64(len(bigTx)), txmp.SizeBytes())
+
+ // The next transaction should evict bigTx, because it is higher priority
+ // but does not fit on size.
+ mustCheckTx(ctx, t, txmp, "key1=0000=25")
+ require.True(t, txExists("key1=0000=25"))
+ require.False(t, txExists(bigTx))
+ require.False(t, txmp.cache.Has([]byte(bigTx)))
+ require.Equal(t, int64(len("key1=0000=25")), txmp.SizeBytes())
+
+ // Now fill up the rest of the slots with other transactions.
+ mustCheckTx(ctx, t, txmp, "key2=0001=5")
+ mustCheckTx(ctx, t, txmp, "key3=0002=10")
+ mustCheckTx(ctx, t, txmp, "key4=0003=3")
+ mustCheckTx(ctx, t, txmp, "key5=0004=3")
+
+ // A new transaction with low priority should be discarded.
+ mustCheckTx(ctx, t, txmp, "key6=0005=1")
+ require.False(t, txExists("key6=0005=1"))
+
+ // A new transaction with higher priority should evict key5, which is the
+ // newest of the two transactions with lowest priority.
+ mustCheckTx(ctx, t, txmp, "key7=0006=7")
+ require.True(t, txExists("key7=0006=7")) // new transaction added
+ require.False(t, txExists("key5=0004=3")) // newest low-priority tx evicted
+ require.True(t, txExists("key4=0003=3")) // older low-priority tx retained
+
+ // Another new transaction evicts the other low-priority element.
+ mustCheckTx(ctx, t, txmp, "key8=0007=20")
+ require.True(t, txExists("key8=0007=20"))
+ require.False(t, txExists("key4=0003=3"))
+
+ // Now the lowest-priority tx is 5, so that should be the next to go.
+ mustCheckTx(ctx, t, txmp, "key9=0008=9")
+ require.True(t, txExists("key9=0008=9"))
+ require.False(t, txExists("k3y2=0001=5"))
+
+ // Add a transaction that requires eviction of multiple lower-priority
+ // entries, in order to fit the size of the element.
+ mustCheckTx(ctx, t, txmp, "key10=0123456789abcdef=11") // evict 10, 9, 7; keep 25, 20, 11
+ require.True(t, txExists("key1=0000=25"))
+ require.True(t, txExists("key8=0007=20"))
+ require.True(t, txExists("key10=0123456789abcdef=11"))
+ require.False(t, txExists("key3=0002=10"))
+ require.False(t, txExists("key9=0008=9"))
+ require.False(t, txExists("key7=0006=7"))
+}
+
func TestTxMempool_Flush(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -537,7 +628,6 @@ func TestTxMempool_ExpiredTxs_NumBlocks(t *testing.T) {
tTxs := checkTxs(ctx, t, txmp, 100, 0)
require.Equal(t, len(tTxs), txmp.Size())
- require.Equal(t, 100, txmp.heightIndex.Size())
// reap 5 txs at the next height -- no txs should expire
reapedTxs := txmp.ReapMaxTxs(5)
@@ -551,12 +641,10 @@ func TestTxMempool_ExpiredTxs_NumBlocks(t *testing.T) {
txmp.Unlock()
require.Equal(t, 95, txmp.Size())
- require.Equal(t, 95, txmp.heightIndex.Size())
// check more txs at height 101
_ = checkTxs(ctx, t, txmp, 50, 1)
require.Equal(t, 145, txmp.Size())
- require.Equal(t, 145, txmp.heightIndex.Size())
// Reap 5 txs at a height that would expire all the transactions from before
// the previous Update (height 100).
@@ -577,7 +665,6 @@ func TestTxMempool_ExpiredTxs_NumBlocks(t *testing.T) {
txmp.Unlock()
require.GreaterOrEqual(t, txmp.Size(), 45)
- require.GreaterOrEqual(t, txmp.heightIndex.Size(), 45)
}
func TestTxMempool_CheckTxPostCheckError(t *testing.T) {
@@ -631,7 +718,7 @@ func TestTxMempool_CheckTxPostCheckError(t *testing.T) {
require.NoError(t, txmp.CheckTx(ctx, tx, callback, TxInfo{SenderID: 0}))
} else {
err = txmp.CheckTx(ctx, tx, callback, TxInfo{SenderID: 0})
- fmt.Print(err.Error())
+ require.EqualError(t, err, "test error")
}
})
}
diff --git a/internal/mempool/priority_queue.go b/internal/mempool/priority_queue.go
deleted file mode 100644
index e31997397..000000000
--- a/internal/mempool/priority_queue.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package mempool
-
-import (
- "container/heap"
- "sort"
- "sync"
-)
-
-var _ heap.Interface = (*TxPriorityQueue)(nil)
-
-// TxPriorityQueue defines a thread-safe priority queue for valid transactions.
-type TxPriorityQueue struct {
- mtx sync.RWMutex
- txs []*WrappedTx
-}
-
-func NewTxPriorityQueue() *TxPriorityQueue {
- pq := &TxPriorityQueue{
- txs: make([]*WrappedTx, 0),
- }
-
- heap.Init(pq)
-
- return pq
-}
-
-// GetEvictableTxs attempts to find and return a list of *WrappedTx than can be
-// evicted to make room for another *WrappedTx with higher priority. If no such
-// list of *WrappedTx exists, nil will be returned. The returned list of *WrappedTx
-// indicate that these transactions can be removed due to them being of lower
-// priority and that their total sum in size allows room for the incoming
-// transaction according to the mempool's configured limits.
-func (pq *TxPriorityQueue) GetEvictableTxs(priority, txSize, totalSize, cap int64) []*WrappedTx {
- pq.mtx.RLock()
- defer pq.mtx.RUnlock()
-
- txs := make([]*WrappedTx, len(pq.txs))
- copy(txs, pq.txs)
-
- sort.Slice(txs, func(i, j int) bool {
- return txs[i].priority < txs[j].priority
- })
-
- var (
- toEvict []*WrappedTx
- i int
- )
-
- currSize := totalSize
-
- // Loop over all transactions in ascending priority order evaluating those
- // that are only of less priority than the provided argument. We continue
- // evaluating transactions until there is sufficient capacity for the new
- // transaction (size) as defined by txSize.
- for i < len(txs) && txs[i].priority < priority {
- toEvict = append(toEvict, txs[i])
- currSize -= int64(txs[i].Size())
-
- if currSize+txSize <= cap {
- return toEvict
- }
-
- i++
- }
-
- return nil
-}
-
-// NumTxs returns the number of transactions in the priority queue. It is
-// thread safe.
-func (pq *TxPriorityQueue) NumTxs() int {
- pq.mtx.RLock()
- defer pq.mtx.RUnlock()
-
- return len(pq.txs)
-}
-
-// RemoveTx removes a specific transaction from the priority queue.
-func (pq *TxPriorityQueue) RemoveTx(tx *WrappedTx) {
- pq.mtx.Lock()
- defer pq.mtx.Unlock()
-
- if tx.heapIndex < len(pq.txs) {
- heap.Remove(pq, tx.heapIndex)
- }
-}
-
-// PushTx adds a valid transaction to the priority queue. It is thread safe.
-func (pq *TxPriorityQueue) PushTx(tx *WrappedTx) {
- pq.mtx.Lock()
- defer pq.mtx.Unlock()
-
- heap.Push(pq, tx)
-}
-
-// PopTx removes the top priority transaction from the queue. It is thread safe.
-func (pq *TxPriorityQueue) PopTx() *WrappedTx {
- pq.mtx.Lock()
- defer pq.mtx.Unlock()
-
- x := heap.Pop(pq)
- if x != nil {
- return x.(*WrappedTx)
- }
-
- return nil
-}
-
-// Push implements the Heap interface.
-//
-// NOTE: A caller should never call Push. Use PushTx instead.
-func (pq *TxPriorityQueue) Push(x interface{}) {
- n := len(pq.txs)
- item := x.(*WrappedTx)
- item.heapIndex = n
- pq.txs = append(pq.txs, item)
-}
-
-// Pop implements the Heap interface.
-//
-// NOTE: A caller should never call Pop. Use PopTx instead.
-func (pq *TxPriorityQueue) Pop() interface{} {
- old := pq.txs
- n := len(old)
- item := old[n-1]
- old[n-1] = nil // avoid memory leak
- item.heapIndex = -1 // for safety
- pq.txs = old[0 : n-1]
- return item
-}
-
-// Len implements the Heap interface.
-//
-// NOTE: A caller should never call Len. Use NumTxs instead.
-func (pq *TxPriorityQueue) Len() int {
- return len(pq.txs)
-}
-
-// Less implements the Heap interface. It returns true if the transaction at
-// position i in the queue is of less priority than the transaction at position j.
-func (pq *TxPriorityQueue) Less(i, j int) bool {
- // If there exists two transactions with the same priority, consider the one
- // that we saw the earliest as the higher priority transaction.
- if pq.txs[i].priority == pq.txs[j].priority {
- return pq.txs[i].timestamp.Before(pq.txs[j].timestamp)
- }
-
- // We want Pop to give us the highest, not lowest, priority so we use greater
- // than here.
- return pq.txs[i].priority > pq.txs[j].priority
-}
-
-// Swap implements the Heap interface. It swaps two transactions in the queue.
-func (pq *TxPriorityQueue) Swap(i, j int) {
- pq.txs[i], pq.txs[j] = pq.txs[j], pq.txs[i]
- pq.txs[i].heapIndex = i
- pq.txs[j].heapIndex = j
-}
diff --git a/internal/mempool/priority_queue_test.go b/internal/mempool/priority_queue_test.go
deleted file mode 100644
index ddc84806d..000000000
--- a/internal/mempool/priority_queue_test.go
+++ /dev/null
@@ -1,176 +0,0 @@
-package mempool
-
-import (
- "math/rand"
- "sort"
- "sync"
- "testing"
- "time"
-
- "github.com/stretchr/testify/require"
-)
-
-func TestTxPriorityQueue(t *testing.T) {
- pq := NewTxPriorityQueue()
- numTxs := 1000
-
- priorities := make([]int, numTxs)
-
- var wg sync.WaitGroup
- for i := 1; i <= numTxs; i++ {
- priorities[i-1] = i
- wg.Add(1)
-
- go func(i int) {
- pq.PushTx(&WrappedTx{
- priority: int64(i),
- timestamp: time.Now(),
- })
-
- wg.Done()
- }(i)
- }
-
- sort.Sort(sort.Reverse(sort.IntSlice(priorities)))
-
- wg.Wait()
- require.Equal(t, numTxs, pq.NumTxs())
-
- // Wait a second and push a tx with a duplicate priority
- time.Sleep(time.Second)
- now := time.Now()
- pq.PushTx(&WrappedTx{
- priority: 1000,
- timestamp: now,
- })
- require.Equal(t, 1001, pq.NumTxs())
-
- tx := pq.PopTx()
- require.Equal(t, 1000, pq.NumTxs())
- require.Equal(t, int64(1000), tx.priority)
- require.NotEqual(t, now, tx.timestamp)
-
- gotPriorities := make([]int, 0)
- for pq.NumTxs() > 0 {
- gotPriorities = append(gotPriorities, int(pq.PopTx().priority))
- }
-
- require.Equal(t, priorities, gotPriorities)
-}
-
-func TestTxPriorityQueue_GetEvictableTxs(t *testing.T) {
- pq := NewTxPriorityQueue()
- rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-
- values := make([]int, 1000)
-
- for i := 0; i < 1000; i++ {
- tx := make([]byte, 5) // each tx is 5 bytes
- _, err := rng.Read(tx)
- require.NoError(t, err)
-
- x := rng.Intn(100000)
- pq.PushTx(&WrappedTx{
- tx: tx,
- priority: int64(x),
- })
-
- values[i] = x
- }
-
- sort.Ints(values)
-
- max := values[len(values)-1]
- min := values[0]
- totalSize := int64(len(values) * 5)
-
- testCases := []struct {
- name string
- priority, txSize, totalSize, cap int64
- expectedLen int
- }{
- {
- name: "larest priority; single tx",
- priority: int64(max + 1),
- txSize: 5,
- totalSize: totalSize,
- cap: totalSize,
- expectedLen: 1,
- },
- {
- name: "larest priority; multi tx",
- priority: int64(max + 1),
- txSize: 17,
- totalSize: totalSize,
- cap: totalSize,
- expectedLen: 4,
- },
- {
- name: "larest priority; out of capacity",
- priority: int64(max + 1),
- txSize: totalSize + 1,
- totalSize: totalSize,
- cap: totalSize,
- expectedLen: 0,
- },
- {
- name: "smallest priority; no tx",
- priority: int64(min - 1),
- txSize: 5,
- totalSize: totalSize,
- cap: totalSize,
- expectedLen: 0,
- },
- {
- name: "small priority; no tx",
- priority: int64(min),
- txSize: 5,
- totalSize: totalSize,
- cap: totalSize,
- expectedLen: 0,
- },
- }
-
- for _, tc := range testCases {
- tc := tc
-
- t.Run(tc.name, func(t *testing.T) {
- evictTxs := pq.GetEvictableTxs(tc.priority, tc.txSize, tc.totalSize, tc.cap)
- require.Len(t, evictTxs, tc.expectedLen)
- })
- }
-}
-
-func TestTxPriorityQueue_RemoveTx(t *testing.T) {
- pq := NewTxPriorityQueue()
- rng := rand.New(rand.NewSource(time.Now().UnixNano()))
- numTxs := 1000
-
- values := make([]int, numTxs)
-
- for i := 0; i < numTxs; i++ {
- x := rng.Intn(100000)
- pq.PushTx(&WrappedTx{
- priority: int64(x),
- })
-
- values[i] = x
- }
-
- require.Equal(t, numTxs, pq.NumTxs())
-
- sort.Ints(values)
- max := values[len(values)-1]
-
- wtx := pq.txs[pq.NumTxs()/2]
- pq.RemoveTx(wtx)
- require.Equal(t, numTxs-1, pq.NumTxs())
- require.Equal(t, int64(max), pq.PopTx().priority)
- require.Equal(t, numTxs-2, pq.NumTxs())
-
- require.NotPanics(t, func() {
- pq.RemoveTx(&WrappedTx{heapIndex: numTxs})
- pq.RemoveTx(&WrappedTx{heapIndex: numTxs + 1})
- })
- require.Equal(t, numTxs-2, pq.NumTxs())
-}
diff --git a/internal/mempool/reactor.go b/internal/mempool/reactor.go
index 28ee9e334..1f4b3f78a 100644
--- a/internal/mempool/reactor.go
+++ b/internal/mempool/reactor.go
@@ -194,7 +194,7 @@ func (r *Reactor) handleMessage(ctx context.Context, envelope *p2p.Envelope) (er
// processMempoolCh implements a blocking event loop where we listen for p2p
// Envelope messages from the mempoolCh.
-func (r *Reactor) processMempoolCh(ctx context.Context, mempoolCh *p2p.Channel) {
+func (r *Reactor) processMempoolCh(ctx context.Context, mempoolCh p2p.Channel) {
iter := mempoolCh.Receive(ctx)
for iter.Next(ctx) {
envelope := iter.Envelope()
@@ -215,7 +215,7 @@ func (r *Reactor) processMempoolCh(ctx context.Context, mempoolCh *p2p.Channel)
// goroutine or not. If not, we start one for the newly added peer. For down or
// removed peers, we remove the peer from the mempool peer ID set and signal to
// stop the tx broadcasting goroutine.
-func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpdate, mempoolCh *p2p.Channel) {
+func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpdate, mempoolCh p2p.Channel) {
r.logger.Debug("received peer update", "peer", peerUpdate.NodeID, "status", peerUpdate.Status)
r.mtx.Lock()
@@ -264,7 +264,7 @@ func (r *Reactor) processPeerUpdate(ctx context.Context, peerUpdate p2p.PeerUpda
// processPeerUpdates initiates a blocking process where we listen for and handle
// PeerUpdate messages. When the reactor is stopped, we will catch the signal and
// close the p2p PeerUpdatesCh gracefully.
-func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerUpdates, mempoolCh *p2p.Channel) {
+func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerUpdates, mempoolCh p2p.Channel) {
for {
select {
case <-ctx.Done():
@@ -275,7 +275,7 @@ func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerU
}
}
-func (r *Reactor) broadcastTxRoutine(ctx context.Context, peerID types.NodeID, mempoolCh *p2p.Channel) {
+func (r *Reactor) broadcastTxRoutine(ctx context.Context, peerID types.NodeID, mempoolCh p2p.Channel) {
peerMempoolID := r.ids.GetForPeer(peerID)
var nextGossipTx *clist.CElement
@@ -307,8 +307,8 @@ func (r *Reactor) broadcastTxRoutine(ctx context.Context, peerID types.NodeID, m
select {
case <-ctx.Done():
return
- case <-r.mempool.WaitForNextTx(): // wait until a tx is available
- if nextGossipTx = r.mempool.NextGossipTx(); nextGossipTx == nil {
+ case <-r.mempool.TxsWaitChan(): // wait until a tx is available
+ if nextGossipTx = r.mempool.TxsFront(); nextGossipTx == nil {
continue
}
}
@@ -318,7 +318,7 @@ func (r *Reactor) broadcastTxRoutine(ctx context.Context, peerID types.NodeID, m
// NOTE: Transaction batching was disabled due to:
// https://github.com/tendermint/tendermint/issues/5796
- if ok := r.mempool.txStore.TxHasPeer(memTx.hash, peerMempoolID); !ok {
+ if !memTx.HasPeer(peerMempoolID) {
// Send the mempool tx to the corresponding peer. Note, the peer may be
// behind and thus would not be able to process the mempool tx correctly.
if err := mempoolCh.Send(ctx, p2p.Envelope{
diff --git a/internal/mempool/reactor_test.go b/internal/mempool/reactor_test.go
index 034c5eaa2..bd6ccf8b2 100644
--- a/internal/mempool/reactor_test.go
+++ b/internal/mempool/reactor_test.go
@@ -30,7 +30,7 @@ type reactorTestSuite struct {
logger log.Logger
reactors map[types.NodeID]*Reactor
- mempoolChannels map[types.NodeID]*p2p.Channel
+ mempoolChannels map[types.NodeID]p2p.Channel
mempools map[types.NodeID]*TxMempool
kvstores map[types.NodeID]*kvstore.Application
@@ -51,7 +51,7 @@ func setupReactors(ctx context.Context, t *testing.T, logger log.Logger, numNode
logger: log.NewNopLogger().With("testCase", t.Name()),
network: p2ptest.MakeNetwork(ctx, t, p2ptest.NetworkOptions{NumNodes: numNodes}),
reactors: make(map[types.NodeID]*Reactor, numNodes),
- mempoolChannels: make(map[types.NodeID]*p2p.Channel, numNodes),
+ mempoolChannels: make(map[types.NodeID]p2p.Channel, numNodes),
mempools: make(map[types.NodeID]*TxMempool, numNodes),
kvstores: make(map[types.NodeID]*kvstore.Application, numNodes),
peerChans: make(map[types.NodeID]chan p2p.PeerUpdate, numNodes),
@@ -68,14 +68,14 @@ func setupReactors(ctx context.Context, t *testing.T, logger log.Logger, numNode
require.NoError(t, client.Start(ctx))
t.Cleanup(client.Wait)
- mempool := setup(t, client, 0)
+ mempool := setup(t, client, 1<<20)
rts.mempools[nodeID] = mempool
rts.peerChans[nodeID] = make(chan p2p.PeerUpdate, chBuf)
rts.peerUpdates[nodeID] = p2p.NewPeerUpdates(rts.peerChans[nodeID], 1)
rts.network.Nodes[nodeID].PeerManager.Register(ctx, rts.peerUpdates[nodeID])
- chCreator := func(ctx context.Context, chDesc *p2p.ChannelDescriptor) (*p2p.Channel, error) {
+ chCreator := func(ctx context.Context, chDesc *p2p.ChannelDescriptor) (p2p.Channel, error) {
return rts.mempoolChannels[nodeID], nil
}
@@ -170,7 +170,9 @@ func TestReactorBroadcastDoesNotPanic(t *testing.T) {
secondaryReactor.observePanic = observePanic
firstTx := &WrappedTx{}
+ primaryMempool.Lock()
primaryMempool.insertTx(firstTx)
+ primaryMempool.Unlock()
// run the router
rts.start(ctx, t)
@@ -183,6 +185,8 @@ func TestReactorBroadcastDoesNotPanic(t *testing.T) {
wg.Add(1)
go func() {
defer wg.Done()
+ primaryMempool.Lock()
+ defer primaryMempool.Unlock()
primaryMempool.insertTx(next)
}()
}
diff --git a/internal/mempool/tx.go b/internal/mempool/tx.go
index c7113c951..1a221e2c3 100644
--- a/internal/mempool/tx.go
+++ b/internal/mempool/tx.go
@@ -1,11 +1,9 @@
package mempool
import (
- "sort"
"sync"
"time"
- "github.com/tendermint/tendermint/internal/libs/clist"
"github.com/tendermint/tendermint/types"
)
@@ -24,270 +22,78 @@ type TxInfo struct {
// WrappedTx defines a wrapper around a raw transaction with additional metadata
// that is used for indexing.
type WrappedTx struct {
- // tx represents the raw binary transaction data
- tx types.Tx
+ tx types.Tx // the original transaction data
+ hash types.TxKey // the transaction hash
+ height int64 // height when this transaction was initially checked (for expiry)
+ timestamp time.Time // time when transaction was entered (for TTL)
- // hash defines the transaction hash and the primary key used in the mempool
- hash types.TxKey
-
- // height defines the height at which the transaction was validated at
- height int64
-
- // gasWanted defines the amount of gas the transaction sender requires
- gasWanted int64
-
- // priority defines the transaction's priority as specified by the application
- // in the ResponseCheckTx response.
- priority int64
-
- // sender defines the transaction's sender as specified by the application in
- // the ResponseCheckTx response.
- sender string
-
- // timestamp is the time at which the node first received the transaction from
- // a peer. It is used as a second dimension is prioritizing transactions when
- // two transactions have the same priority.
- timestamp time.Time
-
- // peers records a mapping of all peers that sent a given transaction
- peers map[uint16]struct{}
-
- // heapIndex defines the index of the item in the heap
- heapIndex int
-
- // gossipEl references the linked-list element in the gossip index
- gossipEl *clist.CElement
-
- // removed marks the transaction as removed from the mempool. This is set
- // during RemoveTx and is needed due to the fact that a given existing
- // transaction in the mempool can be evicted when it is simultaneously having
- // a reCheckTx callback executed.
- removed bool
+ mtx sync.Mutex
+ gasWanted int64 // app: gas required to execute this transaction
+ priority int64 // app: priority value for this transaction
+ sender string // app: assigned sender label
+ peers map[uint16]bool // peer IDs who have sent us this transaction
}
-func (wtx *WrappedTx) Size() int {
- return len(wtx.tx)
-}
+// Size reports the size of the raw transaction in bytes.
+func (w *WrappedTx) Size() int64 { return int64(len(w.tx)) }
-// TxStore implements a thread-safe mapping of valid transaction(s).
-//
-// NOTE:
-// - Concurrent read-only access to a *WrappedTx object is OK. However, mutative
-// access is not allowed. Regardless, it is not expected for the mempool to
-// need mutative access.
-type TxStore struct {
- mtx sync.RWMutex
- hashTxs map[types.TxKey]*WrappedTx // primary index
- senderTxs map[string]*WrappedTx // sender is defined by the ABCI application
-}
-
-func NewTxStore() *TxStore {
- return &TxStore{
- senderTxs: make(map[string]*WrappedTx),
- hashTxs: make(map[types.TxKey]*WrappedTx),
+// SetPeer adds the specified peer ID as a sender of w.
+func (w *WrappedTx) SetPeer(id uint16) {
+ w.mtx.Lock()
+ defer w.mtx.Unlock()
+ if w.peers == nil {
+ w.peers = map[uint16]bool{id: true}
+ } else {
+ w.peers[id] = true
}
}
-// Size returns the total number of transactions in the store.
-func (txs *TxStore) Size() int {
- txs.mtx.RLock()
- defer txs.mtx.RUnlock()
-
- return len(txs.hashTxs)
-}
-
-// GetAllTxs returns all the transactions currently in the store.
-func (txs *TxStore) GetAllTxs() []*WrappedTx {
- txs.mtx.RLock()
- defer txs.mtx.RUnlock()
-
- wTxs := make([]*WrappedTx, len(txs.hashTxs))
- i := 0
- for _, wtx := range txs.hashTxs {
- wTxs[i] = wtx
- i++
- }
-
- return wTxs
-}
-
-// GetTxBySender returns a *WrappedTx by the transaction's sender property
-// defined by the ABCI application.
-func (txs *TxStore) GetTxBySender(sender string) *WrappedTx {
- txs.mtx.RLock()
- defer txs.mtx.RUnlock()
-
- return txs.senderTxs[sender]
-}
-
-// GetTxByHash returns a *WrappedTx by the transaction's hash.
-func (txs *TxStore) GetTxByHash(hash types.TxKey) *WrappedTx {
- txs.mtx.RLock()
- defer txs.mtx.RUnlock()
-
- return txs.hashTxs[hash]
-}
-
-// IsTxRemoved returns true if a transaction by hash is marked as removed and
-// false otherwise.
-func (txs *TxStore) IsTxRemoved(hash types.TxKey) bool {
- txs.mtx.RLock()
- defer txs.mtx.RUnlock()
-
- wtx, ok := txs.hashTxs[hash]
- if ok {
- return wtx.removed
- }
-
- return false
-}
-
-// SetTx stores a *WrappedTx by it's hash. If the transaction also contains a
-// non-empty sender, we additionally store the transaction by the sender as
-// defined by the ABCI application.
-func (txs *TxStore) SetTx(wtx *WrappedTx) {
- txs.mtx.Lock()
- defer txs.mtx.Unlock()
-
- if len(wtx.sender) > 0 {
- txs.senderTxs[wtx.sender] = wtx
- }
-
- txs.hashTxs[wtx.tx.Key()] = wtx
-}
-
-// RemoveTx removes a *WrappedTx from the transaction store. It deletes all
-// indexes of the transaction.
-func (txs *TxStore) RemoveTx(wtx *WrappedTx) {
- txs.mtx.Lock()
- defer txs.mtx.Unlock()
-
- if len(wtx.sender) > 0 {
- delete(txs.senderTxs, wtx.sender)
- }
-
- delete(txs.hashTxs, wtx.tx.Key())
- wtx.removed = true
-}
-
-// TxHasPeer returns true if a transaction by hash has a given peer ID and false
-// otherwise. If the transaction does not exist, false is returned.
-func (txs *TxStore) TxHasPeer(hash types.TxKey, peerID uint16) bool {
- txs.mtx.RLock()
- defer txs.mtx.RUnlock()
-
- wtx := txs.hashTxs[hash]
- if wtx == nil {
- return false
- }
-
- _, ok := wtx.peers[peerID]
+// HasPeer reports whether the specified peer ID is a sender of w.
+func (w *WrappedTx) HasPeer(id uint16) bool {
+ w.mtx.Lock()
+ defer w.mtx.Unlock()
+ _, ok := w.peers[id]
return ok
}
-// GetOrSetPeerByTxHash looks up a WrappedTx by transaction hash and adds the
-// given peerID to the WrappedTx's set of peers that sent us this transaction.
-// We return true if we've already recorded the given peer for this transaction
-// and false otherwise. If the transaction does not exist by hash, we return
-// (nil, false).
-func (txs *TxStore) GetOrSetPeerByTxHash(hash types.TxKey, peerID uint16) (*WrappedTx, bool) {
- txs.mtx.Lock()
- defer txs.mtx.Unlock()
-
- wtx := txs.hashTxs[hash]
- if wtx == nil {
- return nil, false
- }
-
- if wtx.peers == nil {
- wtx.peers = make(map[uint16]struct{})
- }
-
- if _, ok := wtx.peers[peerID]; ok {
- return wtx, true
- }
-
- wtx.peers[peerID] = struct{}{}
- return wtx, false
+// SetGasWanted sets the application-assigned gas requirement of w.
+func (w *WrappedTx) SetGasWanted(gas int64) {
+ w.mtx.Lock()
+ defer w.mtx.Unlock()
+ w.gasWanted = gas
}
-// WrappedTxList implements a thread-safe list of *WrappedTx objects that can be
-// used to build generic transaction indexes in the mempool. It accepts a
-// comparator function, less(a, b *WrappedTx) bool, that compares two WrappedTx
-// references which is used during Insert in order to determine sorted order. If
-// less returns true, a <= b.
-type WrappedTxList struct {
- mtx sync.RWMutex
- txs []*WrappedTx
- less func(*WrappedTx, *WrappedTx) bool
+// GasWanted reports the application-assigned gas requirement of w.
+func (w *WrappedTx) GasWanted() int64 {
+ w.mtx.Lock()
+ defer w.mtx.Unlock()
+ return w.gasWanted
}
-func NewWrappedTxList(less func(*WrappedTx, *WrappedTx) bool) *WrappedTxList {
- return &WrappedTxList{
- txs: make([]*WrappedTx, 0),
- less: less,
- }
+// SetSender sets the application-assigned sender of w.
+func (w *WrappedTx) SetSender(sender string) {
+ w.mtx.Lock()
+ defer w.mtx.Unlock()
+ w.sender = sender
}
-// Size returns the number of WrappedTx objects in the list.
-func (wtl *WrappedTxList) Size() int {
- wtl.mtx.RLock()
- defer wtl.mtx.RUnlock()
-
- return len(wtl.txs)
+// Sender reports the application-assigned sender of w.
+func (w *WrappedTx) Sender() string {
+ w.mtx.Lock()
+ defer w.mtx.Unlock()
+ return w.sender
}
-// Reset resets the list of transactions to an empty list.
-func (wtl *WrappedTxList) Reset() {
- wtl.mtx.Lock()
- defer wtl.mtx.Unlock()
-
- wtl.txs = make([]*WrappedTx, 0)
+// SetPriority sets the application-assigned priority of w.
+func (w *WrappedTx) SetPriority(p int64) {
+ w.mtx.Lock()
+ defer w.mtx.Unlock()
+ w.priority = p
}
-// Insert inserts a WrappedTx reference into the sorted list based on the list's
-// comparator function.
-func (wtl *WrappedTxList) Insert(wtx *WrappedTx) {
- wtl.mtx.Lock()
- defer wtl.mtx.Unlock()
-
- i := sort.Search(len(wtl.txs), func(i int) bool {
- return wtl.less(wtl.txs[i], wtx)
- })
-
- if i == len(wtl.txs) {
- // insert at the end
- wtl.txs = append(wtl.txs, wtx)
- return
- }
-
- // Make space for the inserted element by shifting values at the insertion
- // index up one index.
- //
- // NOTE: The call to append does not allocate memory when cap(wtl.txs) > len(wtl.txs).
- wtl.txs = append(wtl.txs[:i+1], wtl.txs[i:]...)
- wtl.txs[i] = wtx
-}
-
-// Remove attempts to remove a WrappedTx from the sorted list.
-func (wtl *WrappedTxList) Remove(wtx *WrappedTx) {
- wtl.mtx.Lock()
- defer wtl.mtx.Unlock()
-
- i := sort.Search(len(wtl.txs), func(i int) bool {
- return wtl.less(wtl.txs[i], wtx)
- })
-
- // Since the list is sorted, we evaluate all elements starting at i. Note, if
- // the element does not exist, we may potentially evaluate the entire remainder
- // of the list. However, a caller should not be expected to call Remove with a
- // non-existing element.
- for i < len(wtl.txs) {
- if wtl.txs[i] == wtx {
- wtl.txs = append(wtl.txs[:i], wtl.txs[i+1:]...)
- return
- }
-
- i++
- }
+// Priority reports the application-assigned priority of w.
+func (w *WrappedTx) Priority() int64 {
+ w.mtx.Lock()
+ defer w.mtx.Unlock()
+ return w.priority
}
diff --git a/internal/mempool/tx_test.go b/internal/mempool/tx_test.go
deleted file mode 100644
index c6d494b04..000000000
--- a/internal/mempool/tx_test.go
+++ /dev/null
@@ -1,231 +0,0 @@
-package mempool
-
-import (
- "fmt"
- "math/rand"
- "sort"
- "testing"
- "time"
-
- "github.com/stretchr/testify/require"
-
- "github.com/tendermint/tendermint/types"
-)
-
-func TestTxStore_GetTxBySender(t *testing.T) {
- txs := NewTxStore()
- wtx := &WrappedTx{
- tx: []byte("test_tx"),
- sender: "foo",
- priority: 1,
- timestamp: time.Now(),
- }
-
- res := txs.GetTxBySender(wtx.sender)
- require.Nil(t, res)
-
- txs.SetTx(wtx)
-
- res = txs.GetTxBySender(wtx.sender)
- require.NotNil(t, res)
- require.Equal(t, wtx, res)
-}
-
-func TestTxStore_GetTxByHash(t *testing.T) {
- txs := NewTxStore()
- wtx := &WrappedTx{
- tx: []byte("test_tx"),
- sender: "foo",
- priority: 1,
- timestamp: time.Now(),
- }
-
- key := wtx.tx.Key()
- res := txs.GetTxByHash(key)
- require.Nil(t, res)
-
- txs.SetTx(wtx)
-
- res = txs.GetTxByHash(key)
- require.NotNil(t, res)
- require.Equal(t, wtx, res)
-}
-
-func TestTxStore_SetTx(t *testing.T) {
- txs := NewTxStore()
- wtx := &WrappedTx{
- tx: []byte("test_tx"),
- priority: 1,
- timestamp: time.Now(),
- }
-
- key := wtx.tx.Key()
- txs.SetTx(wtx)
-
- res := txs.GetTxByHash(key)
- require.NotNil(t, res)
- require.Equal(t, wtx, res)
-
- wtx.sender = "foo"
- txs.SetTx(wtx)
-
- res = txs.GetTxByHash(key)
- require.NotNil(t, res)
- require.Equal(t, wtx, res)
-}
-
-func TestTxStore_GetOrSetPeerByTxHash(t *testing.T) {
- txs := NewTxStore()
- wtx := &WrappedTx{
- tx: []byte("test_tx"),
- priority: 1,
- timestamp: time.Now(),
- }
-
- key := wtx.tx.Key()
- txs.SetTx(wtx)
-
- res, ok := txs.GetOrSetPeerByTxHash(types.Tx([]byte("test_tx_2")).Key(), 15)
- require.Nil(t, res)
- require.False(t, ok)
-
- res, ok = txs.GetOrSetPeerByTxHash(key, 15)
- require.NotNil(t, res)
- require.False(t, ok)
-
- res, ok = txs.GetOrSetPeerByTxHash(key, 15)
- require.NotNil(t, res)
- require.True(t, ok)
-
- require.True(t, txs.TxHasPeer(key, 15))
- require.False(t, txs.TxHasPeer(key, 16))
-}
-
-func TestTxStore_RemoveTx(t *testing.T) {
- txs := NewTxStore()
- wtx := &WrappedTx{
- tx: []byte("test_tx"),
- priority: 1,
- timestamp: time.Now(),
- }
-
- txs.SetTx(wtx)
-
- key := wtx.tx.Key()
- res := txs.GetTxByHash(key)
- require.NotNil(t, res)
-
- txs.RemoveTx(res)
-
- res = txs.GetTxByHash(key)
- require.Nil(t, res)
-}
-
-func TestTxStore_Size(t *testing.T) {
- txStore := NewTxStore()
- numTxs := 1000
-
- for i := 0; i < numTxs; i++ {
- txStore.SetTx(&WrappedTx{
- tx: []byte(fmt.Sprintf("test_tx_%d", i)),
- priority: int64(i),
- timestamp: time.Now(),
- })
- }
-
- require.Equal(t, numTxs, txStore.Size())
-}
-
-func TestWrappedTxList_Reset(t *testing.T) {
- list := NewWrappedTxList(func(wtx1, wtx2 *WrappedTx) bool {
- return wtx1.height >= wtx2.height
- })
-
- require.Zero(t, list.Size())
-
- for i := 0; i < 100; i++ {
- list.Insert(&WrappedTx{height: int64(i)})
- }
-
- require.Equal(t, 100, list.Size())
-
- list.Reset()
- require.Zero(t, list.Size())
-}
-
-func TestWrappedTxList_Insert(t *testing.T) {
- list := NewWrappedTxList(func(wtx1, wtx2 *WrappedTx) bool {
- return wtx1.height >= wtx2.height
- })
-
- rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-
- var expected []int
- for i := 0; i < 100; i++ {
- height := rng.Int63n(10000)
- expected = append(expected, int(height))
- list.Insert(&WrappedTx{height: height})
-
- if i%10 == 0 {
- list.Insert(&WrappedTx{height: height})
- expected = append(expected, int(height))
- }
- }
-
- got := make([]int, list.Size())
- for i, wtx := range list.txs {
- got[i] = int(wtx.height)
- }
-
- sort.Ints(expected)
- require.Equal(t, expected, got)
-}
-
-func TestWrappedTxList_Remove(t *testing.T) {
- list := NewWrappedTxList(func(wtx1, wtx2 *WrappedTx) bool {
- return wtx1.height >= wtx2.height
- })
-
- rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-
- var txs []*WrappedTx
- for i := 0; i < 100; i++ {
- height := rng.Int63n(10000)
- tx := &WrappedTx{height: height}
-
- txs = append(txs, tx)
- list.Insert(tx)
-
- if i%10 == 0 {
- tx = &WrappedTx{height: height}
- list.Insert(tx)
- txs = append(txs, tx)
- }
- }
-
- // remove a tx that does not exist
- list.Remove(&WrappedTx{height: 20000})
-
- // remove a tx that exists (by height) but not referenced
- list.Remove(&WrappedTx{height: txs[0].height})
-
- // remove a few existing txs
- for i := 0; i < 25; i++ {
- j := rng.Intn(len(txs))
- list.Remove(txs[j])
- txs = append(txs[:j], txs[j+1:]...)
- }
-
- expected := make([]int, len(txs))
- for i, tx := range txs {
- expected[i] = int(tx.height)
- }
-
- got := make([]int, list.Size())
- for i, wtx := range list.txs {
- got[i] = int(wtx.height)
- }
-
- sort.Ints(expected)
- require.Equal(t, expected, got)
-}
diff --git a/internal/p2p/channel.go b/internal/p2p/channel.go
index d6763543a..394656632 100644
--- a/internal/p2p/channel.go
+++ b/internal/p2p/channel.go
@@ -2,6 +2,7 @@ package p2p
import (
"context"
+ "errors"
"fmt"
"sync"
@@ -19,6 +20,10 @@ type Envelope struct {
ChannelID ChannelID
}
+func (e Envelope) IsZero() bool {
+ return e.From == "" && e.To == "" && e.Message == nil
+}
+
// Wrapper is a Protobuf message that can contain a variety of inner messages
// (e.g. via oneof fields). If a Channel's message type implements Wrapper, the
// Router will automatically wrap outbound messages and unwrap inbound messages,
@@ -33,6 +38,16 @@ type Wrapper interface {
Unwrap() (proto.Message, error)
}
+type Channel interface {
+ fmt.Stringer
+
+ Err() error
+
+ Send(context.Context, Envelope) error
+ SendError(context.Context, PeerError) error
+ Receive(context.Context) *ChannelIterator
+}
+
// PeerError is a peer error reported via Channel.Error.
//
// FIXME: This currently just disconnects the peer, which is too simplistic.
@@ -52,9 +67,9 @@ type PeerError struct {
func (pe PeerError) Error() string { return fmt.Sprintf("peer=%q: %s", pe.NodeID, pe.Err.Error()) }
func (pe PeerError) Unwrap() error { return pe.Err }
-// Channel is a bidirectional channel to exchange Protobuf messages with peers.
+// legacyChannel is a bidirectional channel to exchange Protobuf messages with peers.
// Each message is wrapped in an Envelope to specify its sender and receiver.
-type Channel struct {
+type legacyChannel struct {
ID ChannelID
inCh <-chan Envelope // inbound messages (peers to reactors)
outCh chan<- Envelope // outbound messages (reactors to peers)
@@ -65,9 +80,10 @@ type Channel struct {
// NewChannel creates a new channel. It is primarily for internal and test
// use, reactors should use Router.OpenChannel().
-func NewChannel(id ChannelID, inCh <-chan Envelope, outCh chan<- Envelope, errCh chan<- PeerError) *Channel {
- return &Channel{
+func NewChannel(id ChannelID, name string, inCh <-chan Envelope, outCh chan<- Envelope, errCh chan<- PeerError) Channel {
+ return &legacyChannel{
ID: id,
+ name: name,
inCh: inCh,
outCh: outCh,
errCh: errCh,
@@ -76,7 +92,7 @@ func NewChannel(id ChannelID, inCh <-chan Envelope, outCh chan<- Envelope, errCh
// Send blocks until the envelope has been sent, or until ctx ends.
// An error only occurs if the context ends before the send completes.
-func (ch *Channel) Send(ctx context.Context, envelope Envelope) error {
+func (ch *legacyChannel) Send(ctx context.Context, envelope Envelope) error {
select {
case <-ctx.Done():
return ctx.Err()
@@ -85,9 +101,15 @@ func (ch *Channel) Send(ctx context.Context, envelope Envelope) error {
}
}
+func (ch *legacyChannel) Err() error { return nil }
+
// SendError blocks until the given error has been sent, or ctx ends.
// An error only occurs if the context ends before the send completes.
-func (ch *Channel) SendError(ctx context.Context, pe PeerError) error {
+func (ch *legacyChannel) SendError(ctx context.Context, pe PeerError) error {
+ if errors.Is(pe.Err, context.Canceled) || errors.Is(pe.Err, context.DeadlineExceeded) {
+ return nil
+ }
+
select {
case <-ctx.Done():
return ctx.Err()
@@ -96,18 +118,29 @@ func (ch *Channel) SendError(ctx context.Context, pe PeerError) error {
}
}
-func (ch *Channel) String() string { return fmt.Sprintf("p2p.Channel<%d:%s>", ch.ID, ch.name) }
+func (ch *legacyChannel) String() string { return fmt.Sprintf("p2p.Channel<%d:%s>", ch.ID, ch.name) }
// Receive returns a new unbuffered iterator to receive messages from ch.
// The iterator runs until ctx ends.
-func (ch *Channel) Receive(ctx context.Context) *ChannelIterator {
+func (ch *legacyChannel) Receive(ctx context.Context) *ChannelIterator {
iter := &ChannelIterator{
pipe: make(chan Envelope), // unbuffered
}
- go func() {
+ go func(pipe chan<- Envelope) {
defer close(iter.pipe)
- iteratorWorker(ctx, ch, iter.pipe)
- }()
+ for {
+ select {
+ case <-ctx.Done():
+ return
+ case envelope := <-ch.inCh:
+ select {
+ case <-ctx.Done():
+ return
+ case pipe <- envelope:
+ }
+ }
+ }
+ }(iter.pipe)
return iter
}
@@ -122,21 +155,6 @@ type ChannelIterator struct {
current *Envelope
}
-func iteratorWorker(ctx context.Context, ch *Channel, pipe chan Envelope) {
- for {
- select {
- case <-ctx.Done():
- return
- case envelope := <-ch.inCh:
- select {
- case <-ctx.Done():
- return
- case pipe <- envelope:
- }
- }
- }
-}
-
// Next returns true when the Envelope value has advanced, and false
// when the context is canceled or iteration should stop. If an iterator has returned false,
// it will never return true again.
@@ -175,7 +193,7 @@ func (iter *ChannelIterator) Envelope() *Envelope { return iter.current }
//
// This allows the caller to consume messages from multiple channels
// without needing to manage the concurrency separately.
-func MergedChannelIterator(ctx context.Context, chs ...*Channel) *ChannelIterator {
+func MergedChannelIterator(ctx context.Context, chs ...Channel) *ChannelIterator {
iter := &ChannelIterator{
pipe: make(chan Envelope), // unbuffered
}
@@ -183,10 +201,17 @@ func MergedChannelIterator(ctx context.Context, chs ...*Channel) *ChannelIterato
for _, ch := range chs {
wg.Add(1)
- go func(ch *Channel) {
+ go func(ch Channel, pipe chan<- Envelope) {
defer wg.Done()
- iteratorWorker(ctx, ch, iter.pipe)
- }(ch)
+ iter := ch.Receive(ctx)
+ for iter.Next(ctx) {
+ select {
+ case <-ctx.Done():
+ return
+ case pipe <- *iter.Envelope():
+ }
+ }
+ }(ch, iter.pipe)
}
done := make(chan struct{})
diff --git a/internal/p2p/channel_test.go b/internal/p2p/channel_test.go
index e06e3e77e..eeaf77db2 100644
--- a/internal/p2p/channel_test.go
+++ b/internal/p2p/channel_test.go
@@ -16,13 +16,13 @@ type channelInternal struct {
Error chan PeerError
}
-func testChannel(size int) (*channelInternal, *Channel) {
+func testChannel(size int) (*channelInternal, *legacyChannel) {
in := &channelInternal{
In: make(chan Envelope, size),
Out: make(chan Envelope, size),
Error: make(chan PeerError, size),
}
- ch := &Channel{
+ ch := &legacyChannel{
inCh: in.In,
outCh: in.Out,
errCh: in.Error,
diff --git a/internal/p2p/conn/connection.go b/internal/p2p/conn/connection.go
index c8fc21188..8f8453e71 100644
--- a/internal/p2p/conn/connection.go
+++ b/internal/p2p/conn/connection.go
@@ -100,7 +100,8 @@ type MConnection struct {
// used to ensure FlushStop and OnStop
// are safe to call concurrently.
- stopMtx sync.Mutex
+ stopMtx sync.Mutex
+ stopSignal <-chan struct{}
cancel context.CancelFunc
@@ -207,6 +208,7 @@ func (c *MConnection) OnStart(ctx context.Context) error {
c.quitSendRoutine = make(chan struct{})
c.doneSendRoutine = make(chan struct{})
c.quitRecvRoutine = make(chan struct{})
+ c.stopSignal = ctx.Done()
c.setRecvLastMsgAt(time.Now())
go c.sendRoutine(ctx)
go c.recvRoutine(ctx)
@@ -681,6 +683,8 @@ func (ch *channel) sendBytes(bytes []byte) bool {
return true
case <-time.After(defaultSendTimeout):
return false
+ case <-ch.conn.stopSignal:
+ return false
}
}
diff --git a/internal/p2p/metrics.gen.go b/internal/p2p/metrics.gen.go
index cbfba29d9..9cffbc46b 100644
--- a/internal/p2p/metrics.gen.go
+++ b/internal/p2p/metrics.gen.go
@@ -14,11 +14,23 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
labels = append(labels, labelsAndValues[i])
}
return &Metrics{
- Peers: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+ PeersConnected: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
Namespace: namespace,
Subsystem: MetricsSubsystem,
- Name: "peers",
- Help: "Number of peers.",
+ Name: "peers_connected",
+ Help: "Number of peers connected.",
+ }, labels).With(labelsAndValues...),
+ PeersStored: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+ Namespace: namespace,
+ Subsystem: MetricsSubsystem,
+ Name: "peers_stored",
+ Help: "Nomber of peers in the peer store database.",
+ }, labels).With(labelsAndValues...),
+ PeersInactivated: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+ Namespace: namespace,
+ Subsystem: MetricsSubsystem,
+ Name: "peers_inactivated",
+ Help: "Number of inactive peers stored.",
}, labels).With(labelsAndValues...),
PeerReceiveBytesTotal: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
Namespace: namespace,
@@ -38,6 +50,36 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
Name: "peer_pending_send_bytes",
Help: "Number of bytes pending being sent to a given peer.",
}, append(labels, "peer_id")).With(labelsAndValues...),
+ PeersConnectedSuccess: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
+ Namespace: namespace,
+ Subsystem: MetricsSubsystem,
+ Name: "peers_connected_success",
+ Help: "Number of successful connection attempts",
+ }, labels).With(labelsAndValues...),
+ PeersConnectedFailure: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
+ Namespace: namespace,
+ Subsystem: MetricsSubsystem,
+ Name: "peers_connected_failure",
+ Help: "Number of failed connection attempts",
+ }, labels).With(labelsAndValues...),
+ PeersConnectedIncoming: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+ Namespace: namespace,
+ Subsystem: MetricsSubsystem,
+ Name: "peers_connected_incoming",
+ Help: "Number of peers connected as a result of dialing the peer.",
+ }, labels).With(labelsAndValues...),
+ PeersConnectedOutgoing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+ Namespace: namespace,
+ Subsystem: MetricsSubsystem,
+ Name: "peers_connected_outgoing",
+ Help: "Number of peers connected as a result of the peer dialing this node.",
+ }, labels).With(labelsAndValues...),
+ PeersEvicted: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
+ Namespace: namespace,
+ Subsystem: MetricsSubsystem,
+ Name: "peers_evicted",
+ Help: "Number of peers evicted by this node.",
+ }, labels).With(labelsAndValues...),
RouterPeerQueueRecv: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
Namespace: namespace,
Subsystem: MetricsSubsystem,
@@ -73,10 +115,17 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
func NopMetrics() *Metrics {
return &Metrics{
- Peers: discard.NewGauge(),
+ PeersConnected: discard.NewGauge(),
+ PeersStored: discard.NewGauge(),
+ PeersInactivated: discard.NewGauge(),
PeerReceiveBytesTotal: discard.NewCounter(),
PeerSendBytesTotal: discard.NewCounter(),
PeerPendingSendBytes: discard.NewGauge(),
+ PeersConnectedSuccess: discard.NewCounter(),
+ PeersConnectedFailure: discard.NewCounter(),
+ PeersConnectedIncoming: discard.NewGauge(),
+ PeersConnectedOutgoing: discard.NewGauge(),
+ PeersEvicted: discard.NewCounter(),
RouterPeerQueueRecv: discard.NewHistogram(),
RouterPeerQueueSend: discard.NewHistogram(),
RouterChannelQueueSend: discard.NewHistogram(),
diff --git a/internal/p2p/metrics.go b/internal/p2p/metrics.go
index b45f128e5..bc233f691 100644
--- a/internal/p2p/metrics.go
+++ b/internal/p2p/metrics.go
@@ -26,8 +26,12 @@ var (
// Metrics contains metrics exposed by this package.
type Metrics struct {
- // Number of peers.
- Peers metrics.Gauge
+ // Number of peers connected.
+ PeersConnected metrics.Gauge
+ // Nomber of peers in the peer store database.
+ PeersStored metrics.Gauge
+ // Number of inactive peers stored.
+ PeersInactivated metrics.Gauge
// Number of bytes per channel received from a given peer.
PeerReceiveBytesTotal metrics.Counter `metrics_labels:"peer_id, chID, message_type"`
// Number of bytes per channel sent to a given peer.
@@ -35,6 +39,21 @@ type Metrics struct {
// Number of bytes pending being sent to a given peer.
PeerPendingSendBytes metrics.Gauge `metrics_labels:"peer_id"`
+ // Number of successful connection attempts
+ PeersConnectedSuccess metrics.Counter
+ // Number of failed connection attempts
+ PeersConnectedFailure metrics.Counter
+
+ // Number of peers connected as a result of dialing the
+ // peer.
+ PeersConnectedIncoming metrics.Gauge
+ // Number of peers connected as a result of the peer dialing
+ // this node.
+ PeersConnectedOutgoing metrics.Gauge
+
+ // Number of peers evicted by this node.
+ PeersEvicted metrics.Counter
+
// RouterPeerQueueRecv defines the time taken to read off of a peer's queue
// before sending on the connection.
//metrics:The time taken to read off of a peer's queue before sending on the connection.
diff --git a/internal/p2p/mocks/connection.go b/internal/p2p/mocks/connection.go
index 766bbf657..20727f8a6 100644
--- a/internal/p2p/mocks/connection.go
+++ b/internal/p2p/mocks/connection.go
@@ -13,6 +13,8 @@ import (
p2p "github.com/tendermint/tendermint/internal/p2p"
+ time "time"
+
types "github.com/tendermint/tendermint/types"
)
@@ -35,20 +37,20 @@ func (_m *Connection) Close() error {
return r0
}
-// Handshake provides a mock function with given fields: _a0, _a1, _a2
-func (_m *Connection) Handshake(_a0 context.Context, _a1 types.NodeInfo, _a2 crypto.PrivKey) (types.NodeInfo, crypto.PubKey, error) {
- ret := _m.Called(_a0, _a1, _a2)
+// Handshake provides a mock function with given fields: _a0, _a1, _a2, _a3
+func (_m *Connection) Handshake(_a0 context.Context, _a1 time.Duration, _a2 types.NodeInfo, _a3 crypto.PrivKey) (types.NodeInfo, crypto.PubKey, error) {
+ ret := _m.Called(_a0, _a1, _a2, _a3)
var r0 types.NodeInfo
- if rf, ok := ret.Get(0).(func(context.Context, types.NodeInfo, crypto.PrivKey) types.NodeInfo); ok {
- r0 = rf(_a0, _a1, _a2)
+ if rf, ok := ret.Get(0).(func(context.Context, time.Duration, types.NodeInfo, crypto.PrivKey) types.NodeInfo); ok {
+ r0 = rf(_a0, _a1, _a2, _a3)
} else {
r0 = ret.Get(0).(types.NodeInfo)
}
var r1 crypto.PubKey
- if rf, ok := ret.Get(1).(func(context.Context, types.NodeInfo, crypto.PrivKey) crypto.PubKey); ok {
- r1 = rf(_a0, _a1, _a2)
+ if rf, ok := ret.Get(1).(func(context.Context, time.Duration, types.NodeInfo, crypto.PrivKey) crypto.PubKey); ok {
+ r1 = rf(_a0, _a1, _a2, _a3)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(crypto.PubKey)
@@ -56,8 +58,8 @@ func (_m *Connection) Handshake(_a0 context.Context, _a1 types.NodeInfo, _a2 cry
}
var r2 error
- if rf, ok := ret.Get(2).(func(context.Context, types.NodeInfo, crypto.PrivKey) error); ok {
- r2 = rf(_a0, _a1, _a2)
+ if rf, ok := ret.Get(2).(func(context.Context, time.Duration, types.NodeInfo, crypto.PrivKey) error); ok {
+ r2 = rf(_a0, _a1, _a2, _a3)
} else {
r2 = ret.Error(2)
}
diff --git a/internal/p2p/p2ptest/network.go b/internal/p2p/p2ptest/network.go
index 85df029d8..95c040b57 100644
--- a/internal/p2p/p2ptest/network.go
+++ b/internal/p2p/p2ptest/network.go
@@ -146,8 +146,8 @@ func (n *Network) MakeChannels(
ctx context.Context,
t *testing.T,
chDesc *p2p.ChannelDescriptor,
-) map[types.NodeID]*p2p.Channel {
- channels := map[types.NodeID]*p2p.Channel{}
+) map[types.NodeID]p2p.Channel {
+ channels := map[types.NodeID]p2p.Channel{}
for _, node := range n.Nodes {
channels[node.NodeID] = node.MakeChannel(ctx, t, chDesc)
}
@@ -161,8 +161,8 @@ func (n *Network) MakeChannelsNoCleanup(
ctx context.Context,
t *testing.T,
chDesc *p2p.ChannelDescriptor,
-) map[types.NodeID]*p2p.Channel {
- channels := map[types.NodeID]*p2p.Channel{}
+) map[types.NodeID]p2p.Channel {
+ channels := map[types.NodeID]p2p.Channel{}
for _, node := range n.Nodes {
channels[node.NodeID] = node.MakeChannelNoCleanup(ctx, t, chDesc)
}
@@ -252,11 +252,13 @@ func (n *Network) MakeNode(ctx context.Context, t *testing.T, opts NodeOptions)
require.NotNil(t, ep, "transport not listening an endpoint")
peerManager, err := p2p.NewPeerManager(nodeID, dbm.NewMemDB(), p2p.PeerManagerOptions{
- MinRetryTime: 10 * time.Millisecond,
- MaxRetryTime: 100 * time.Millisecond,
- RetryTimeJitter: time.Millisecond,
- MaxPeers: opts.MaxPeers,
- MaxConnected: opts.MaxConnected,
+ MinRetryTime: 10 * time.Millisecond,
+ DisconnectCooldownPeriod: 10 * time.Millisecond,
+ MaxRetryTime: 100 * time.Millisecond,
+ RetryTimeJitter: time.Millisecond,
+ MaxPeers: opts.MaxPeers,
+ MaxConnected: opts.MaxConnected,
+ Metrics: p2p.NopMetrics(),
})
require.NoError(t, err)
@@ -268,7 +270,7 @@ func (n *Network) MakeNode(ctx context.Context, t *testing.T, opts NodeOptions)
func() *types.NodeInfo { return &nodeInfo },
transport,
ep,
- p2p.RouterOptions{DialSleep: func(_ context.Context) {}},
+ p2p.RouterOptions{},
)
require.NoError(t, err)
@@ -302,7 +304,7 @@ func (n *Node) MakeChannel(
ctx context.Context,
t *testing.T,
chDesc *p2p.ChannelDescriptor,
-) *p2p.Channel {
+) p2p.Channel {
ctx, cancel := context.WithCancel(ctx)
channel, err := n.Router.OpenChannel(ctx, chDesc)
require.NoError(t, err)
@@ -319,7 +321,7 @@ func (n *Node) MakeChannelNoCleanup(
ctx context.Context,
t *testing.T,
chDesc *p2p.ChannelDescriptor,
-) *p2p.Channel {
+) p2p.Channel {
channel, err := n.Router.OpenChannel(ctx, chDesc)
require.NoError(t, err)
return channel
diff --git a/internal/p2p/p2ptest/require.go b/internal/p2p/p2ptest/require.go
index 885e080d4..276bff390 100644
--- a/internal/p2p/p2ptest/require.go
+++ b/internal/p2p/p2ptest/require.go
@@ -15,7 +15,7 @@ import (
)
// RequireEmpty requires that the given channel is empty.
-func RequireEmpty(ctx context.Context, t *testing.T, channels ...*p2p.Channel) {
+func RequireEmpty(ctx context.Context, t *testing.T, channels ...p2p.Channel) {
t.Helper()
ctx, cancel := context.WithTimeout(ctx, 10*time.Millisecond)
@@ -32,7 +32,7 @@ func RequireEmpty(ctx context.Context, t *testing.T, channels ...*p2p.Channel) {
}
// RequireReceive requires that the given envelope is received on the channel.
-func RequireReceive(ctx context.Context, t *testing.T, channel *p2p.Channel, expect p2p.Envelope) {
+func RequireReceive(ctx context.Context, t *testing.T, channel p2p.Channel, expect p2p.Envelope) {
t.Helper()
ctx, cancel := context.WithTimeout(ctx, time.Second)
@@ -54,7 +54,7 @@ func RequireReceive(ctx context.Context, t *testing.T, channel *p2p.Channel, exp
// RequireReceiveUnordered requires that the given envelopes are all received on
// the channel, ignoring order.
-func RequireReceiveUnordered(ctx context.Context, t *testing.T, channel *p2p.Channel, expect []*p2p.Envelope) {
+func RequireReceiveUnordered(ctx context.Context, t *testing.T, channel p2p.Channel, expect []*p2p.Envelope) {
ctx, cancel := context.WithTimeout(ctx, time.Second)
defer cancel()
@@ -75,7 +75,7 @@ func RequireReceiveUnordered(ctx context.Context, t *testing.T, channel *p2p.Cha
}
// RequireSend requires that the given envelope is sent on the channel.
-func RequireSend(ctx context.Context, t *testing.T, channel *p2p.Channel, envelope p2p.Envelope) {
+func RequireSend(ctx context.Context, t *testing.T, channel p2p.Channel, envelope p2p.Envelope) {
tctx, cancel := context.WithTimeout(ctx, time.Second)
defer cancel()
@@ -93,7 +93,7 @@ func RequireSend(ctx context.Context, t *testing.T, channel *p2p.Channel, envelo
func RequireSendReceive(
ctx context.Context,
t *testing.T,
- channel *p2p.Channel,
+ channel p2p.Channel,
peerID types.NodeID,
send proto.Message,
receive proto.Message,
@@ -116,7 +116,7 @@ func RequireNoUpdates(ctx context.Context, t *testing.T, peerUpdates *p2p.PeerUp
}
// RequireError requires that the given peer error is submitted for a peer.
-func RequireError(ctx context.Context, t *testing.T, channel *p2p.Channel, peerError p2p.PeerError) {
+func RequireError(ctx context.Context, t *testing.T, channel p2p.Channel, peerError p2p.PeerError) {
tctx, tcancel := context.WithTimeout(ctx, time.Second)
defer tcancel()
diff --git a/internal/p2p/peermanager.go b/internal/p2p/peermanager.go
index 7391de4ea..4d179e63f 100644
--- a/internal/p2p/peermanager.go
+++ b/internal/p2p/peermanager.go
@@ -38,11 +38,18 @@ const (
PeerStatusBad PeerStatus = "bad" // peer observed as bad
)
-// PeerScore is a numeric score assigned to a peer (higher is better).
-type PeerScore uint8
+type peerConnectionDirection int
const (
- PeerScorePersistent PeerScore = math.MaxUint8 // persistent peers
+ peerConnectionIncoming peerConnectionDirection = iota + 1
+ peerConnectionOutgoing
+)
+
+// PeerScore is a numeric score assigned to a peer (higher is better).
+type PeerScore int16
+
+const (
+ PeerScorePersistent PeerScore = math.MaxInt16 // persistent peers
MaxPeerScoreNotPersistent PeerScore = PeerScorePersistent - 1
)
@@ -101,6 +108,13 @@ type PeerManagerOptions struct {
// outbound). 0 means no limit.
MaxConnected uint16
+ // MaxOutgoingConnections specifies how many outgoing
+ // connections a node will maintain. It must be lower than MaxConnected. If it is
+ // 0, then all connections can be outgoing. Once this limit is
+ // reached, the node will not dial peers, allowing the
+ // remaining peer connections to be used by incoming connections.
+ MaxOutgoingConnections uint16
+
// MaxConnectedUpgrade is the maximum number of additional connections to
// use for probing any better-scored peers to upgrade to when all connection
// slots are full. 0 disables peer upgrading.
@@ -130,6 +144,10 @@ type PeerManagerOptions struct {
// retry times, to avoid thundering herds. 0 disables jitter.
RetryTimeJitter time.Duration
+ // DisconnectCooldownPeriod is the amount of time after we
+ // disconnect from a peer before we'll consider dialing a new peer
+ DisconnectCooldownPeriod time.Duration
+
// PeerScores sets fixed scores for specific peers. It is mainly used
// for testing. A score of 0 is ignored.
PeerScores map[types.NodeID]PeerScore
@@ -145,6 +163,9 @@ type PeerManagerOptions struct {
// persistentPeers provides fast PersistentPeers lookups. It is built
// by optimize().
persistentPeers map[types.NodeID]bool
+
+ // Peer Metrics
+ Metrics *Metrics
}
// Validate validates the options.
@@ -193,14 +214,18 @@ func (o *PeerManagerOptions) Validate() error {
}
}
+ if o.MaxOutgoingConnections > 0 && o.MaxConnected < o.MaxOutgoingConnections {
+ return errors.New("cannot set MaxOutgoingConnections to a value larger than MaxConnected")
+ }
+
return nil
}
-// isPersistentPeer checks if a peer is in PersistentPeers. It will panic
+// isPersistent checks if a peer is in PersistentPeers. It will panic
// if called before optimize().
func (o *PeerManagerOptions) isPersistent(id types.NodeID) bool {
if o.persistentPeers == nil {
- panic("isPersistentPeer() called before optimize()")
+ panic("isPersistent() called before optimize()")
}
return o.persistentPeers[id]
}
@@ -261,19 +286,20 @@ func (o *PeerManagerOptions) optimize() {
type PeerManager struct {
selfID types.NodeID
options PeerManagerOptions
+ metrics *Metrics
rand *rand.Rand
dialWaker *tmsync.Waker // wakes up DialNext() on relevant peer changes
evictWaker *tmsync.Waker // wakes up EvictNext() on relevant peer changes
mtx sync.Mutex
store *peerStore
- subscriptions map[*PeerUpdates]*PeerUpdates // keyed by struct identity (address)
- dialing map[types.NodeID]bool // peers being dialed (DialNext → Dialed/DialFail)
- upgrading map[types.NodeID]types.NodeID // peers claimed for upgrade (DialNext → Dialed/DialFail)
- connected map[types.NodeID]bool // connected peers (Dialed/Accepted → Disconnected)
- ready map[types.NodeID]bool // ready peers (Ready → Disconnected)
- evict map[types.NodeID]bool // peers scheduled for eviction (Connected → EvictNext)
- evicting map[types.NodeID]bool // peers being evicted (EvictNext → Disconnected)
+ subscriptions map[*PeerUpdates]*PeerUpdates // keyed by struct identity (address)
+ dialing map[types.NodeID]bool // peers being dialed (DialNext → Dialed/DialFail)
+ upgrading map[types.NodeID]types.NodeID // peers claimed for upgrade (DialNext → Dialed/DialFail)
+ connected map[types.NodeID]peerConnectionDirection // connected peers (Dialed/Accepted → Disconnected)
+ ready map[types.NodeID]bool // ready peers (Ready → Disconnected)
+ evict map[types.NodeID]bool // peers scheduled for eviction (Connected → EvictNext)
+ evicting map[types.NodeID]bool // peers being evicted (EvictNext → Disconnected)
}
// NewPeerManager creates a new peer manager.
@@ -298,16 +324,22 @@ func NewPeerManager(selfID types.NodeID, peerDB dbm.DB, options PeerManagerOptio
rand: rand.New(rand.NewSource(time.Now().UnixNano())), // nolint:gosec
dialWaker: tmsync.NewWaker(),
evictWaker: tmsync.NewWaker(),
+ metrics: NopMetrics(),
store: store,
dialing: map[types.NodeID]bool{},
upgrading: map[types.NodeID]types.NodeID{},
- connected: map[types.NodeID]bool{},
+ connected: map[types.NodeID]peerConnectionDirection{},
ready: map[types.NodeID]bool{},
evict: map[types.NodeID]bool{},
evicting: map[types.NodeID]bool{},
subscriptions: map[*PeerUpdates]*PeerUpdates{},
}
+
+ if options.Metrics != nil {
+ peerManager.metrics = options.Metrics
+ }
+
if err = peerManager.configurePeers(); err != nil {
return nil, err
}
@@ -339,6 +371,9 @@ func (m *PeerManager) configurePeers() error {
}
}
}
+
+ m.metrics.PeersStored.Add(float64(m.store.Size()))
+
return nil
}
@@ -368,20 +403,45 @@ func (m *PeerManager) prunePeers() error {
ranked := m.store.Ranked()
for i := len(ranked) - 1; i >= 0; i-- {
peerID := ranked[i].ID
+
switch {
case m.store.Size() <= int(m.options.MaxPeers):
return nil
case m.dialing[peerID]:
- case m.connected[peerID]:
+ case m.isConnected(peerID):
default:
if err := m.store.Delete(peerID); err != nil {
return err
}
+ m.metrics.PeersStored.Add(-1)
}
}
return nil
}
+func (m *PeerManager) isConnected(peerID types.NodeID) bool {
+ _, ok := m.connected[peerID]
+ return ok
+}
+
+type connectionStats struct {
+ incoming uint16
+ outgoing uint16
+}
+
+func (m *PeerManager) getConnectedInfo() connectionStats {
+ out := connectionStats{}
+ for _, direction := range m.connected {
+ switch direction {
+ case peerConnectionIncoming:
+ out.incoming++
+ case peerConnectionOutgoing:
+ out.outgoing++
+ }
+ }
+ return out
+}
+
// Add adds a peer to the manager, given as an address. If the peer already
// exists, the address is added to it if it isn't already present. This will push
// low scoring peers out of the address book if it exceeds the maximum size.
@@ -405,12 +465,17 @@ func (m *PeerManager) Add(address NodeAddress) (bool, error) {
if ok {
return false, nil
}
+ if peer.Inactive {
+ return false, nil
+ }
// else add the new address
peer.AddressInfo[address] = &peerAddressInfo{Address: address}
if err := m.store.Set(peer); err != nil {
return false, err
}
+
+ m.metrics.PeersStored.Add(1)
if err := m.prunePeers(); err != nil {
return true, err
}
@@ -437,18 +502,28 @@ func (m *PeerManager) HasMaxPeerCapacity() bool {
return len(m.connected) >= int(m.options.MaxConnected)
}
+func (m *PeerManager) HasDialedMaxPeers() bool {
+ m.mtx.Lock()
+ defer m.mtx.Unlock()
+
+ stats := m.getConnectedInfo()
+
+ return stats.outgoing >= m.options.MaxOutgoingConnections
+}
+
// DialNext finds an appropriate peer address to dial, and marks it as dialing.
// If no peer is found, or all connection slots are full, it blocks until one
// becomes available. The caller must call Dialed() or DialFailed() for the
// returned peer.
func (m *PeerManager) DialNext(ctx context.Context) (NodeAddress, error) {
for {
- address, err := m.TryDialNext()
- if err != nil || (address != NodeAddress{}) {
- return address, err
+ if address := m.TryDialNext(); (address != NodeAddress{}) {
+ return address, nil
}
+
select {
case <-m.dialWaker.Sleep():
+ continue
case <-ctx.Done():
return NodeAddress{}, ctx.Err()
}
@@ -457,20 +532,28 @@ func (m *PeerManager) DialNext(ctx context.Context) (NodeAddress, error) {
// TryDialNext is equivalent to DialNext(), but immediately returns an empty
// address if no peers or connection slots are available.
-func (m *PeerManager) TryDialNext() (NodeAddress, error) {
+func (m *PeerManager) TryDialNext() NodeAddress {
m.mtx.Lock()
defer m.mtx.Unlock()
// We allow dialing MaxConnected+MaxConnectedUpgrade peers. Including
// MaxConnectedUpgrade allows us to probe additional peers that have a
// higher score than any other peers, and if successful evict it.
- if m.options.MaxConnected > 0 && len(m.connected)+len(m.dialing) >=
- int(m.options.MaxConnected)+int(m.options.MaxConnectedUpgrade) {
- return NodeAddress{}, nil
+ if m.options.MaxConnected > 0 && len(m.connected)+len(m.dialing) >= int(m.options.MaxConnected)+int(m.options.MaxConnectedUpgrade) {
+ return NodeAddress{}
+ }
+
+ cinfo := m.getConnectedInfo()
+ if m.options.MaxOutgoingConnections > 0 && cinfo.outgoing >= m.options.MaxOutgoingConnections {
+ return NodeAddress{}
}
for _, peer := range m.store.Ranked() {
- if m.dialing[peer.ID] || m.connected[peer.ID] {
+ if m.dialing[peer.ID] || m.isConnected(peer.ID) {
+ continue
+ }
+
+ if !peer.LastDisconnected.IsZero() && time.Since(peer.LastDisconnected) < m.options.DisconnectCooldownPeriod {
continue
}
@@ -479,6 +562,10 @@ func (m *PeerManager) TryDialNext() (NodeAddress, error) {
continue
}
+ if id, ok := m.store.Resolve(addressInfo.Address); ok && (m.isConnected(id) || m.dialing[id]) {
+ continue
+ }
+
// We now have an eligible address to dial. If we're full but have
// upgrade capacity (as checked above), we find a lower-scored peer
// we can replace and mark it as upgrading so noone else claims it.
@@ -489,25 +576,24 @@ func (m *PeerManager) TryDialNext() (NodeAddress, error) {
if m.options.MaxConnected > 0 && len(m.connected) >= int(m.options.MaxConnected) {
upgradeFromPeer := m.findUpgradeCandidate(peer.ID, peer.Score())
if upgradeFromPeer == "" {
- return NodeAddress{}, nil
+ return NodeAddress{}
}
m.upgrading[upgradeFromPeer] = peer.ID
}
m.dialing[peer.ID] = true
- return addressInfo.Address, nil
+ return addressInfo.Address
}
}
- return NodeAddress{}, nil
+ return NodeAddress{}
}
// DialFailed reports a failed dial attempt. This will make the peer available
// for dialing again when appropriate (possibly after a retry timeout).
-//
-// FIXME: This should probably delete or mark bad addresses/peers after some time.
func (m *PeerManager) DialFailed(ctx context.Context, address NodeAddress) error {
m.mtx.Lock()
defer m.mtx.Unlock()
+ m.metrics.PeersConnectedFailure.Add(1)
delete(m.dialing, address.NodeID)
for from, to := range m.upgrading {
@@ -527,6 +613,7 @@ func (m *PeerManager) DialFailed(ctx context.Context, address NodeAddress) error
addressInfo.LastDialFailure = time.Now().UTC()
addressInfo.DialFailures++
+
if err := m.store.Set(peer); err != nil {
return err
}
@@ -560,6 +647,8 @@ func (m *PeerManager) Dialed(address NodeAddress) error {
m.mtx.Lock()
defer m.mtx.Unlock()
+ m.metrics.PeersConnectedSuccess.Add(1)
+
delete(m.dialing, address.NodeID)
var upgradeFromPeer types.NodeID
@@ -574,12 +663,11 @@ func (m *PeerManager) Dialed(address NodeAddress) error {
if address.NodeID == m.selfID {
return fmt.Errorf("rejecting connection to self (%v)", address.NodeID)
}
- if m.connected[address.NodeID] {
+ if m.isConnected(address.NodeID) {
return fmt.Errorf("peer %v is already connected", address.NodeID)
}
if m.options.MaxConnected > 0 && len(m.connected) >= int(m.options.MaxConnected) {
- if upgradeFromPeer == "" || len(m.connected) >=
- int(m.options.MaxConnected)+int(m.options.MaxConnectedUpgrade) {
+ if upgradeFromPeer == "" || len(m.connected) >= int(m.options.MaxConnected)+int(m.options.MaxConnectedUpgrade) {
return fmt.Errorf("already connected to maximum number of peers")
}
}
@@ -589,6 +677,11 @@ func (m *PeerManager) Dialed(address NodeAddress) error {
return fmt.Errorf("peer %q was removed while dialing", address.NodeID)
}
now := time.Now().UTC()
+ if peer.Inactive {
+ m.metrics.PeersInactivated.Add(-1)
+ }
+ peer.Inactive = false
+
peer.LastConnected = now
if addressInfo, ok := peer.AddressInfo[address]; ok {
addressInfo.DialFailures = 0
@@ -600,8 +693,7 @@ func (m *PeerManager) Dialed(address NodeAddress) error {
return err
}
- if upgradeFromPeer != "" && m.options.MaxConnected > 0 &&
- len(m.connected) >= int(m.options.MaxConnected) {
+ if upgradeFromPeer != "" && m.options.MaxConnected > 0 && len(m.connected) >= int(m.options.MaxConnected) {
// Look for an even lower-scored peer that may have appeared since we
// started the upgrade.
if p, ok := m.store.Get(upgradeFromPeer); ok {
@@ -610,9 +702,11 @@ func (m *PeerManager) Dialed(address NodeAddress) error {
}
}
m.evict[upgradeFromPeer] = true
+ m.evictWaker.Wake()
}
- m.connected[peer.ID] = true
- m.evictWaker.Wake()
+
+ m.metrics.PeersConnectedOutgoing.Add(1)
+ m.connected[peer.ID] = peerConnectionOutgoing
return nil
}
@@ -641,11 +735,10 @@ func (m *PeerManager) Accepted(peerID types.NodeID) error {
if peerID == m.selfID {
return fmt.Errorf("rejecting connection from self (%v)", peerID)
}
- if m.connected[peerID] {
+ if m.isConnected(peerID) {
return fmt.Errorf("peer %q is already connected", peerID)
}
- if m.options.MaxConnected > 0 &&
- len(m.connected) >= int(m.options.MaxConnected)+int(m.options.MaxConnectedUpgrade) {
+ if m.options.MaxConnected > 0 && len(m.connected) >= int(m.options.MaxConnected)+int(m.options.MaxConnectedUpgrade) {
return fmt.Errorf("already connected to maximum number of peers")
}
@@ -670,12 +763,17 @@ func (m *PeerManager) Accepted(peerID types.NodeID) error {
}
}
+ if peer.Inactive {
+ m.metrics.PeersInactivated.Add(-1)
+ }
+ peer.Inactive = false
peer.LastConnected = time.Now().UTC()
if err := m.store.Set(peer); err != nil {
return err
}
- m.connected[peerID] = true
+ m.metrics.PeersConnectedIncoming.Add(1)
+ m.connected[peerID] = peerConnectionIncoming
if upgradeFromPeer != "" {
m.evict[upgradeFromPeer] = true
}
@@ -694,7 +792,7 @@ func (m *PeerManager) Ready(ctx context.Context, peerID types.NodeID, channels C
m.mtx.Lock()
defer m.mtx.Unlock()
- if m.connected[peerID] {
+ if m.isConnected(peerID) {
m.ready[peerID] = true
m.broadcast(ctx, PeerUpdate{
NodeID: peerID,
@@ -730,7 +828,7 @@ func (m *PeerManager) TryEvictNext() (types.NodeID, error) {
// random one.
for peerID := range m.evict {
delete(m.evict, peerID)
- if m.connected[peerID] && !m.evicting[peerID] {
+ if m.isConnected(peerID) && !m.evicting[peerID] {
m.evicting[peerID] = true
return peerID, nil
}
@@ -747,7 +845,7 @@ func (m *PeerManager) TryEvictNext() (types.NodeID, error) {
ranked := m.store.Ranked()
for i := len(ranked) - 1; i >= 0; i-- {
peer := ranked[i]
- if m.connected[peer.ID] && !m.evicting[peer.ID] {
+ if m.isConnected(peer.ID) && !m.evicting[peer.ID] {
m.evicting[peer.ID] = true
return peer.ID, nil
}
@@ -762,6 +860,13 @@ func (m *PeerManager) Disconnected(ctx context.Context, peerID types.NodeID) {
m.mtx.Lock()
defer m.mtx.Unlock()
+ switch m.connected[peerID] {
+ case peerConnectionIncoming:
+ m.metrics.PeersConnectedIncoming.Add(-1)
+ case peerConnectionOutgoing:
+ m.metrics.PeersConnectedOutgoing.Add(-1)
+ }
+
ready := m.ready[peerID]
delete(m.connected, peerID)
@@ -770,6 +875,22 @@ func (m *PeerManager) Disconnected(ctx context.Context, peerID types.NodeID) {
delete(m.evicting, peerID)
delete(m.ready, peerID)
+ if peer, ok := m.store.Get(peerID); ok {
+ peer.LastDisconnected = time.Now()
+ _ = m.store.Set(peer)
+ // launch a thread to ping the dialWaker when the
+ // disconnected peer can be dialed again.
+ go func() {
+ timer := time.NewTimer(m.options.DisconnectCooldownPeriod)
+ defer timer.Stop()
+ select {
+ case <-timer.C:
+ m.dialWaker.Wake()
+ case <-ctx.Done():
+ }
+ }()
+ }
+
if ready {
m.broadcast(ctx, PeerUpdate{
NodeID: peerID,
@@ -792,17 +913,34 @@ func (m *PeerManager) Errored(peerID types.NodeID, err error) {
m.mtx.Lock()
defer m.mtx.Unlock()
- if m.connected[peerID] {
+ if m.isConnected(peerID) {
m.evict[peerID] = true
}
m.evictWaker.Wake()
}
+// Inactivate marks a peer as inactive which means we won't attempt to
+// dial this peer again. A peer can be reactivated by successfully
+// dialing and connecting to the node.
+func (m *PeerManager) Inactivate(peerID types.NodeID) error {
+ m.mtx.Lock()
+ defer m.mtx.Unlock()
+
+ peer, ok := m.store.peers[peerID]
+ if !ok {
+ return nil
+ }
+
+ peer.Inactive = true
+ m.metrics.PeersInactivated.Add(1)
+ return m.store.Set(*peer)
+}
+
// Advertise returns a list of peer addresses to advertise to a peer.
//
-// FIXME: This is fairly naïve and only returns the addresses of the
-// highest-ranked peers.
+// It sorts all peers in the peer store, and assembles a list of peers
+// that is most likely to include the highest priority of peers.
func (m *PeerManager) Advertise(peerID types.NodeID, limit uint16) []NodeAddress {
m.mtx.Lock()
defer m.mtx.Unlock()
@@ -815,19 +953,98 @@ func (m *PeerManager) Advertise(peerID types.NodeID, limit uint16) []NodeAddress
addresses = append(addresses, m.options.SelfAddress)
}
- for _, peer := range m.store.Ranked() {
+ var numAddresses int
+ var totalAbsScore int
+ ranked := m.store.Ranked()
+ seenAddresses := map[NodeAddress]struct{}{}
+ scores := map[types.NodeID]int{}
+
+ // get the total number of possible addresses
+ for _, peer := range ranked {
if peer.ID == peerID {
continue
}
+ score := int(peer.Score())
+ if score < 0 {
+ totalAbsScore += -score
+ } else {
+ totalAbsScore += score
+ }
- for nodeAddr, addressInfo := range peer.AddressInfo {
- if len(addresses) >= int(limit) {
- return addresses
+ scores[peer.ID] = score
+ for addr := range peer.AddressInfo {
+ if _, ok := m.options.PrivatePeers[addr.NodeID]; !ok {
+ numAddresses++
+ }
+ }
+ }
+
+ meanAbsScore := (totalAbsScore + 1) / (len(scores) + 1)
+
+ var attempts uint16
+ var addedLastIteration bool
+
+ // if the number of addresses is less than the number of peers
+ // to advertise, adjust the limit downwards
+ if numAddresses < int(limit) {
+ limit = uint16(numAddresses)
+ }
+
+ // collect addresses until we have the number requested
+ // (limit), or we've added all known addresses, or we've tried
+ // at least 256 times and the last time we iterated over
+ // remaining addresses we added no new candidates.
+ for len(addresses) < int(limit) && (attempts < (limit*2) || !addedLastIteration) {
+ attempts++
+ addedLastIteration = false
+
+ for idx, peer := range ranked {
+ if peer.ID == peerID {
+ continue
}
- // only add non-private NodeIDs
- if _, ok := m.options.PrivatePeers[nodeAddr.NodeID]; !ok {
- addresses = append(addresses, addressInfo.Address)
+ if len(addresses) >= int(limit) {
+ break
+ }
+
+ for nodeAddr, addressInfo := range peer.AddressInfo {
+ if len(addresses) >= int(limit) {
+ break
+ }
+
+ // only look at each address once, by
+ // tracking a set of addresses seen
+ if _, ok := seenAddresses[addressInfo.Address]; ok {
+ continue
+ }
+
+ // only add non-private NodeIDs
+ if _, ok := m.options.PrivatePeers[nodeAddr.NodeID]; !ok {
+ // add the peer if the total number of ranked addresses is
+ // will fit within the limit, or otherwise adding
+ // addresses based on a coin flip.
+
+ // the coinflip is based on the score, commonly, but
+ // 10% of the time we'll randomly insert a "loosing"
+ // peer.
+
+ // nolint:gosec // G404: Use of weak random number generator
+ if numAddresses <= int(limit) || rand.Intn((meanAbsScore*2)+1) <= scores[peer.ID]+1 || rand.Intn((idx+1)*10) <= idx+1 {
+ addresses = append(addresses, addressInfo.Address)
+ addedLastIteration = true
+ seenAddresses[addressInfo.Address] = struct{}{}
+ }
+ } else {
+ seenAddresses[addressInfo.Address] = struct{}{}
+ // if the number of addresses
+ // is the same as the limit,
+ // we should remove private
+ // addresses from the limit so
+ // we can still return early.
+ if numAddresses == int(limit) {
+ limit--
+ }
+ }
}
}
}
@@ -901,8 +1118,14 @@ func (m *PeerManager) processPeerEvent(ctx context.Context, pu PeerUpdate) {
switch pu.Status {
case PeerStatusBad:
+ if m.store.peers[pu.NodeID].MutableScore == math.MinInt16 {
+ return
+ }
m.store.peers[pu.NodeID].MutableScore--
case PeerStatusGood:
+ if m.store.peers[pu.NodeID].MutableScore == math.MaxInt16 {
+ return
+ }
m.store.peers[pu.NodeID].MutableScore++
}
}
@@ -993,9 +1216,11 @@ func (m *PeerManager) findUpgradeCandidate(id types.NodeID, score PeerScore) typ
for i := len(ranked) - 1; i >= 0; i-- {
candidate := ranked[i]
switch {
+ case candidate.ID == id:
+ continue
case candidate.Score() >= score:
return "" // no further peers can be scored lower, due to sorting
- case !m.connected[candidate.ID]:
+ case !m.isConnected(candidate.ID):
case m.evict[candidate.ID]:
case m.evicting[candidate.ID]:
case m.upgrading[candidate.ID] != "":
@@ -1044,6 +1269,7 @@ func (m *PeerManager) retryDelay(failures uint32, persistent bool) time.Duration
type peerStore struct {
db dbm.DB
peers map[types.NodeID]*peerInfo
+ index map[NodeAddress]types.NodeID
ranked []*peerInfo // cache for Ranked(), nil invalidates cache
}
@@ -1063,6 +1289,7 @@ func newPeerStore(db dbm.DB) (*peerStore, error) {
// loadPeers loads all peers from the database into memory.
func (s *peerStore) loadPeers() error {
peers := map[types.NodeID]*peerInfo{}
+ addrs := map[NodeAddress]types.NodeID{}
start, end := keyPeerInfoRange()
iter, err := s.db.Iterator(start, end)
@@ -1082,11 +1309,18 @@ func (s *peerStore) loadPeers() error {
return fmt.Errorf("invalid peer data: %w", err)
}
peers[peer.ID] = peer
+ for addr := range peer.AddressInfo {
+ // TODO maybe check to see if we've seen this
+ // addr before for a different peer, there
+ // could be duplicates.
+ addrs[addr] = peer.ID
+ }
}
if iter.Error() != nil {
return iter.Error()
}
s.peers = peers
+ s.index = addrs
s.ranked = nil // invalidate cache if populated
return nil
}
@@ -1098,6 +1332,12 @@ func (s *peerStore) Get(id types.NodeID) (peerInfo, bool) {
return peer.Copy(), ok
}
+// Resolve returns the peer ID for a given node address if known.
+func (s *peerStore) Resolve(addr NodeAddress) (types.NodeID, bool) {
+ id, ok := s.index[addr]
+ return id, ok
+}
+
// Set stores peer data. The input data will be copied, and can safely be reused
// by the caller.
func (s *peerStore) Set(peer peerInfo) error {
@@ -1126,20 +1366,29 @@ func (s *peerStore) Set(peer peerInfo) error {
// update the existing pointer address.
*current = peer
}
+ for addr := range peer.AddressInfo {
+ s.index[addr] = peer.ID
+ }
return nil
}
// Delete deletes a peer, or does nothing if it does not exist.
func (s *peerStore) Delete(id types.NodeID) error {
- if _, ok := s.peers[id]; !ok {
+ peer, ok := s.peers[id]
+ if !ok {
return nil
}
- if err := s.db.Delete(keyPeerInfo(id)); err != nil {
- return err
+ for _, addr := range peer.AddressInfo {
+ delete(s.index, addr.Address)
}
delete(s.peers, id)
s.ranked = nil
+
+ if err := s.db.Delete(keyPeerInfo(id)); err != nil {
+ return err
+ }
+
return nil
}
@@ -1175,8 +1424,6 @@ func (s *peerStore) Ranked() []*peerInfo {
s.ranked = append(s.ranked, peer)
}
sort.Slice(s.ranked, func(i, j int) bool {
- // FIXME: If necessary, consider precomputing scores before sorting,
- // to reduce the number of Score() calls.
return s.ranked[i].Score() > s.ranked[j].Score()
})
return s.ranked
@@ -1189,17 +1436,18 @@ func (s *peerStore) Size() int {
// peerInfo contains peer information stored in a peerStore.
type peerInfo struct {
- ID types.NodeID
- AddressInfo map[NodeAddress]*peerAddressInfo
- LastConnected time.Time
+ ID types.NodeID
+ AddressInfo map[NodeAddress]*peerAddressInfo
+ LastConnected time.Time
+ LastDisconnected time.Time
// These fields are ephemeral, i.e. not persisted to the database.
Persistent bool
- Seed bool
Height int64
FixedScore PeerScore // mainly for tests
MutableScore int64 // updated by router
+ Inactive bool
}
// peerInfoFromProto converts a Protobuf PeerInfo message to a peerInfo,
@@ -1208,6 +1456,7 @@ func peerInfoFromProto(msg *p2pproto.PeerInfo) (*peerInfo, error) {
p := &peerInfo{
ID: types.NodeID(msg.ID),
AddressInfo: map[NodeAddress]*peerAddressInfo{},
+ Inactive: msg.Inactive,
}
if msg.LastConnected != nil {
p.LastConnected = *msg.LastConnected
@@ -1230,6 +1479,7 @@ func peerInfoFromProto(msg *p2pproto.PeerInfo) (*peerInfo, error) {
func (p *peerInfo) ToProto() *p2pproto.PeerInfo {
msg := &p2pproto.PeerInfo{
ID: string(p.ID),
+ Inactive: p.Inactive,
LastConnected: &p.LastConnected,
}
for _, addressInfo := range p.AddressInfo {
@@ -1238,6 +1488,7 @@ func (p *peerInfo) ToProto() *p2pproto.PeerInfo {
if msg.LastConnected.IsZero() {
msg.LastConnected = nil
}
+
return msg
}
@@ -1254,6 +1505,46 @@ func (p *peerInfo) Copy() peerInfo {
return c
}
+// LastDialed returns when the peer was last dialed, and if that dial
+// attempt was successful. If the peer was never dialed the time stamp
+// is zero time.
+func (p *peerInfo) LastDialed() (time.Time, bool) {
+ var (
+ last time.Time
+ success bool
+ )
+ last = last.Add(-1) // so it's after the epoch
+
+ for _, addr := range p.AddressInfo {
+ if addr.LastDialFailure.Equal(addr.LastDialSuccess) {
+ if addr.LastDialFailure.IsZero() {
+ continue
+ }
+ if last.After(addr.LastDialSuccess) {
+ continue
+ }
+ success = true
+ last = addr.LastDialSuccess
+ }
+ if addr.LastDialFailure.After(last) {
+ success = false
+ last = addr.LastDialFailure
+ }
+ if addr.LastDialSuccess.After(last) || last.Equal(addr.LastDialSuccess) {
+ success = true
+ last = addr.LastDialSuccess
+ }
+ }
+
+ // if we never modified last, then we should return it to the
+ // zero value
+ if last.Add(1).IsZero() {
+ return time.Time{}, success
+ }
+
+ return last, success
+}
+
// Score calculates a score for the peer. Higher-scored peers will be
// preferred over lower scores.
func (p *peerInfo) Score() PeerScore {
@@ -1275,8 +1566,8 @@ func (p *peerInfo) Score() PeerScore {
score -= int64(addr.DialFailures)
}
- if score <= 0 {
- return 0
+ if score < math.MinInt16 {
+ score = math.MinInt16
}
return PeerScore(score)
diff --git a/internal/p2p/peermanager_scoring_test.go b/internal/p2p/peermanager_scoring_test.go
index a45df0b72..b454da151 100644
--- a/internal/p2p/peermanager_scoring_test.go
+++ b/internal/p2p/peermanager_scoring_test.go
@@ -34,7 +34,7 @@ func TestPeerScoring(t *testing.T) {
t.Run("Synchronous", func(t *testing.T) {
// update the manager and make sure it's correct
- require.EqualValues(t, 0, peerManager.Scores()[id])
+ require.Zero(t, peerManager.Scores()[id])
// add a bunch of good status updates and watch things increase.
for i := 1; i < 10; i++ {
@@ -97,3 +97,173 @@ func TestPeerScoring(t *testing.T) {
}
})
}
+
+func makeMockPeerStore(t *testing.T, peers ...peerInfo) *peerStore {
+ t.Helper()
+ s, err := newPeerStore(dbm.NewMemDB())
+ if err != nil {
+ t.Fatal(err)
+ }
+ for idx := range peers {
+ if err := s.Set(peers[idx]); err != nil {
+ t.Fatal(err)
+ }
+ }
+ return s
+}
+
+func TestPeerRanking(t *testing.T) {
+ t.Run("InactiveSecond", func(t *testing.T) {
+ t.Skip("inactive status is not currently factored into peer rank.")
+
+ store := makeMockPeerStore(t,
+ peerInfo{ID: "second", Inactive: true},
+ peerInfo{ID: "first", Inactive: false},
+ )
+
+ ranked := store.Ranked()
+ if len(ranked) != 2 {
+ t.Fatal("missing peer in ranked output")
+ }
+ if ranked[0].ID != "first" {
+ t.Error("inactive peer is first")
+ }
+ if ranked[1].ID != "second" {
+ t.Error("active peer is second")
+ }
+ })
+ t.Run("ScoreOrder", func(t *testing.T) {
+ for _, test := range []struct {
+ Name string
+ First int64
+ Second int64
+ }{
+ {
+ Name: "Mirror",
+ First: 100,
+ Second: -100,
+ },
+ {
+ Name: "VeryLow",
+ First: 0,
+ Second: -100,
+ },
+ {
+ Name: "High",
+ First: 300,
+ Second: 256,
+ },
+ } {
+ t.Run(test.Name, func(t *testing.T) {
+ store := makeMockPeerStore(t,
+ peerInfo{
+ ID: "second",
+ MutableScore: test.Second,
+ },
+ peerInfo{
+ ID: "first",
+ MutableScore: test.First,
+ })
+
+ ranked := store.Ranked()
+ if len(ranked) != 2 {
+ t.Fatal("missing peer in ranked output")
+ }
+ if ranked[0].ID != "first" {
+ t.Error("higher peer is first")
+ }
+ if ranked[1].ID != "second" {
+ t.Error("higher peer is second")
+ }
+ })
+ }
+ })
+}
+
+func TestLastDialed(t *testing.T) {
+ t.Run("Zero", func(t *testing.T) {
+ p := &peerInfo{}
+ ts, ok := p.LastDialed()
+ if !ts.IsZero() {
+ t.Error("timestamp should be zero:", ts)
+ }
+ if ok {
+ t.Error("peer reported success, despite none")
+ }
+ })
+ t.Run("NeverDialed", func(t *testing.T) {
+ p := &peerInfo{
+ AddressInfo: map[NodeAddress]*peerAddressInfo{
+ {NodeID: "kip"}: {},
+ {NodeID: "merlin"}: {},
+ },
+ }
+ ts, ok := p.LastDialed()
+ if !ts.IsZero() {
+ t.Error("timestamp should be zero:", ts)
+ }
+ if ok {
+ t.Error("peer reported success, despite none")
+ }
+ })
+ t.Run("Ordered", func(t *testing.T) {
+ base := time.Now()
+ for _, test := range []struct {
+ Name string
+ SuccessTime time.Time
+ FailTime time.Time
+ ExpectedSuccess bool
+ }{
+ {
+ Name: "Zero",
+ },
+ {
+ Name: "Success",
+ SuccessTime: base.Add(time.Hour),
+ FailTime: base,
+ ExpectedSuccess: true,
+ },
+ {
+ Name: "Equal",
+ SuccessTime: base,
+ FailTime: base,
+ ExpectedSuccess: true,
+ },
+ {
+ Name: "Failure",
+ SuccessTime: base,
+ FailTime: base.Add(time.Hour),
+ ExpectedSuccess: false,
+ },
+ } {
+ t.Run(test.Name, func(t *testing.T) {
+ p := &peerInfo{
+ AddressInfo: map[NodeAddress]*peerAddressInfo{
+ {NodeID: "kip"}: {LastDialSuccess: test.SuccessTime},
+ {NodeID: "merlin"}: {LastDialFailure: test.FailTime},
+ },
+ }
+ ts, ok := p.LastDialed()
+ if test.ExpectedSuccess && !ts.Equal(test.SuccessTime) {
+ if !ts.Equal(test.FailTime) {
+ t.Fatal("got unexpected timestamp:", ts)
+ }
+
+ t.Error("last dialed time reported incorrect value:", ts)
+ }
+ if !test.ExpectedSuccess && !ts.Equal(test.FailTime) {
+ if !ts.Equal(test.SuccessTime) {
+ t.Fatal("got unexpected timestamp:", ts)
+ }
+
+ t.Error("last dialed time reported incorrect value:", ts)
+ }
+ if test.ExpectedSuccess != ok {
+ t.Error("test reported incorrect outcome for last dialed type")
+ }
+ })
+ }
+
+ })
+
+}
diff --git a/internal/p2p/peermanager_test.go b/internal/p2p/peermanager_test.go
index 47e8462a4..a1543bf18 100644
--- a/internal/p2p/peermanager_test.go
+++ b/internal/p2p/peermanager_test.go
@@ -384,16 +384,14 @@ func TestPeerManager_DialNext_WakeOnDialFailed(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
// Add b. We shouldn't be able to dial it, due to MaxConnected.
added, err = peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
// Spawn a goroutine to fail a's dial attempt.
@@ -427,8 +425,7 @@ func TestPeerManager_DialNext_WakeOnDialFailedRetry(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
require.NoError(t, peerManager.DialFailed(ctx, dial))
failed := time.Now()
@@ -458,8 +455,7 @@ func TestPeerManager_DialNext_WakeOnDisconnected(t *testing.T) {
err = peerManager.Accepted(a.NodeID)
require.NoError(t, err)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Zero(t, dial)
dctx, dcancel := context.WithTimeout(ctx, 300*time.Millisecond)
@@ -490,8 +486,7 @@ func TestPeerManager_TryDialNext_MaxConnected(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
require.NoError(t, peerManager.Dialed(a))
@@ -499,16 +494,14 @@ func TestPeerManager_TryDialNext_MaxConnected(t *testing.T) {
added, err = peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, b, dial)
// At this point, adding c will not allow dialing it.
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
}
@@ -524,11 +517,11 @@ func TestPeerManager_TryDialNext_MaxConnectedUpgrade(t *testing.T) {
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
PeerScores: map[types.NodeID]p2p.PeerScore{
- a.NodeID: 0,
- b.NodeID: 1,
- c.NodeID: 2,
- d.NodeID: 3,
- e.NodeID: 0,
+ a.NodeID: p2p.PeerScore(0),
+ b.NodeID: p2p.PeerScore(1),
+ c.NodeID: p2p.PeerScore(2),
+ d.NodeID: p2p.PeerScore(3),
+ e.NodeID: p2p.PeerScore(0),
},
PersistentPeers: []types.NodeID{c.NodeID, d.NodeID},
MaxConnected: 2,
@@ -540,7 +533,7 @@ func TestPeerManager_TryDialNext_MaxConnectedUpgrade(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
+ dial := peerManager.TryDialNext()
require.NoError(t, err)
require.Equal(t, a, dial)
require.NoError(t, peerManager.Dialed(a))
@@ -549,8 +542,7 @@ func TestPeerManager_TryDialNext_MaxConnectedUpgrade(t *testing.T) {
added, err = peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, b, dial)
// Even though we are at capacity, we should be allowed to dial c for an
@@ -558,8 +550,7 @@ func TestPeerManager_TryDialNext_MaxConnectedUpgrade(t *testing.T) {
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, c, dial)
// However, since we're using all upgrade slots now, we can't add and dial
@@ -567,24 +558,20 @@ func TestPeerManager_TryDialNext_MaxConnectedUpgrade(t *testing.T) {
added, err = peerManager.Add(d)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
// We go through with c's upgrade.
require.NoError(t, peerManager.Dialed(c))
// Still can't dial d.
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
// Now, if we disconnect a, we should be allowed to dial d because we have a
// free upgrade slot.
+ require.Error(t, peerManager.Dialed(d))
peerManager.Disconnected(ctx, a.NodeID)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
- require.Equal(t, d, dial)
require.NoError(t, peerManager.Dialed(d))
// However, if we disconnect b (such that only c and d are connected), we
@@ -594,8 +581,7 @@ func TestPeerManager_TryDialNext_MaxConnectedUpgrade(t *testing.T) {
added, err = peerManager.Add(e)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
}
@@ -605,7 +591,7 @@ func TestPeerManager_TryDialNext_UpgradeReservesPeer(t *testing.T) {
c := p2p.NodeAddress{Protocol: "memory", NodeID: types.NodeID(strings.Repeat("c", 40))}
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
- PeerScores: map[types.NodeID]p2p.PeerScore{b.NodeID: 1, c.NodeID: 1},
+ PeerScores: map[types.NodeID]p2p.PeerScore{b.NodeID: p2p.PeerScore(1), c.NodeID: 1},
MaxConnected: 1,
MaxConnectedUpgrade: 2,
})
@@ -615,8 +601,7 @@ func TestPeerManager_TryDialNext_UpgradeReservesPeer(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
require.NoError(t, peerManager.Dialed(a))
@@ -624,8 +609,7 @@ func TestPeerManager_TryDialNext_UpgradeReservesPeer(t *testing.T) {
added, err = peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, b, dial)
// Adding c and dialing it will fail, because a is the only connected
@@ -633,8 +617,7 @@ func TestPeerManager_TryDialNext_UpgradeReservesPeer(t *testing.T) {
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Empty(t, dial)
}
@@ -655,22 +638,19 @@ func TestPeerManager_TryDialNext_DialingConnected(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
// Adding a's TCP address will not dispense a, since it's already dialing.
added, err = peerManager.Add(aTCP)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
// Marking a as dialed will still not dispense it.
require.NoError(t, peerManager.Dialed(a))
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
// Adding b and accepting a connection from it will not dispense it either.
@@ -678,8 +658,7 @@ func TestPeerManager_TryDialNext_DialingConnected(t *testing.T) {
require.NoError(t, err)
require.True(t, added)
require.NoError(t, peerManager.Accepted(bID))
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
}
@@ -708,16 +687,14 @@ func TestPeerManager_TryDialNext_Multiple(t *testing.T) {
// All addresses should be dispensed as long as dialing them has failed.
dial := []p2p.NodeAddress{}
for range addresses {
- address, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ address := peerManager.TryDialNext()
require.NotZero(t, address)
require.NoError(t, peerManager.DialFailed(ctx, address))
dial = append(dial, address)
}
require.ElementsMatch(t, dial, addresses)
- address, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ address := peerManager.TryDialNext()
require.Zero(t, address)
}
@@ -742,15 +719,14 @@ func TestPeerManager_DialFailed(t *testing.T) {
// Dialing and then calling DialFailed with a different address (same
// NodeID) should unmark as dialing and allow us to dial the other address
// again, but not register the failed address.
- dial, err := peerManager.TryDialNext()
+ dial := peerManager.TryDialNext()
require.NoError(t, err)
require.Equal(t, a, dial)
require.NoError(t, peerManager.DialFailed(ctx, p2p.NodeAddress{
Protocol: "tcp", NodeID: aID, Hostname: "localhost"}))
require.Equal(t, []p2p.NodeAddress{a}, peerManager.Addresses(aID))
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, a, dial)
// Calling DialFailed on same address twice should be fine.
@@ -771,7 +747,10 @@ func TestPeerManager_DialFailed_UnreservePeer(t *testing.T) {
c := p2p.NodeAddress{Protocol: "memory", NodeID: types.NodeID(strings.Repeat("c", 40))}
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
- PeerScores: map[types.NodeID]p2p.PeerScore{b.NodeID: 1, c.NodeID: 1},
+ PeerScores: map[types.NodeID]p2p.PeerScore{
+ b.NodeID: p2p.PeerScore(1),
+ c.NodeID: p2p.PeerScore(2),
+ },
MaxConnected: 1,
MaxConnectedUpgrade: 2,
})
@@ -781,8 +760,7 @@ func TestPeerManager_DialFailed_UnreservePeer(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
require.NoError(t, peerManager.Dialed(a))
@@ -790,8 +768,7 @@ func TestPeerManager_DialFailed_UnreservePeer(t *testing.T) {
added, err = peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, b, dial)
// Adding c and dialing it will fail, even though it could upgrade a and we
@@ -800,14 +777,12 @@ func TestPeerManager_DialFailed_UnreservePeer(t *testing.T) {
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Empty(t, dial)
// Failing b's dial will now make c available for dialing.
require.NoError(t, peerManager.DialFailed(ctx, b))
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, c, dial)
}
@@ -822,8 +797,7 @@ func TestPeerManager_Dialed_Connected(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
require.NoError(t, peerManager.Dialed(a))
@@ -833,8 +807,7 @@ func TestPeerManager_Dialed_Connected(t *testing.T) {
added, err = peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, b, dial)
require.NoError(t, peerManager.Accepted(b.NodeID))
@@ -863,8 +836,7 @@ func TestPeerManager_Dialed_MaxConnected(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
// Marking b as dialed in the meanwhile (even without TryDialNext)
@@ -887,7 +859,7 @@ func TestPeerManager_Dialed_MaxConnectedUpgrade(t *testing.T) {
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
MaxConnected: 2,
MaxConnectedUpgrade: 1,
- PeerScores: map[types.NodeID]p2p.PeerScore{c.NodeID: 1, d.NodeID: 1},
+ PeerScores: map[types.NodeID]p2p.PeerScore{c.NodeID: p2p.PeerScore(1), d.NodeID: 1},
})
require.NoError(t, err)
@@ -906,8 +878,7 @@ func TestPeerManager_Dialed_MaxConnectedUpgrade(t *testing.T) {
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, c, dial)
require.NoError(t, peerManager.Dialed(c))
@@ -937,7 +908,7 @@ func TestPeerManager_Dialed_Upgrade(t *testing.T) {
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
MaxConnected: 1,
MaxConnectedUpgrade: 2,
- PeerScores: map[types.NodeID]p2p.PeerScore{b.NodeID: 1, c.NodeID: 1},
+ PeerScores: map[types.NodeID]p2p.PeerScore{b.NodeID: p2p.PeerScore(1), c.NodeID: 1},
})
require.NoError(t, err)
@@ -951,8 +922,7 @@ func TestPeerManager_Dialed_Upgrade(t *testing.T) {
added, err = peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, b, dial)
require.NoError(t, peerManager.Dialed(b))
@@ -961,8 +931,7 @@ func TestPeerManager_Dialed_Upgrade(t *testing.T) {
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Empty(t, dial)
// a should now be evicted.
@@ -984,10 +953,10 @@ func TestPeerManager_Dialed_UpgradeEvenLower(t *testing.T) {
MaxConnected: 2,
MaxConnectedUpgrade: 1,
PeerScores: map[types.NodeID]p2p.PeerScore{
- a.NodeID: 3,
- b.NodeID: 2,
- c.NodeID: 10,
- d.NodeID: 1,
+ a.NodeID: p2p.PeerScore(3),
+ b.NodeID: p2p.PeerScore(2),
+ c.NodeID: p2p.PeerScore(10),
+ d.NodeID: p2p.PeerScore(1),
},
})
require.NoError(t, err)
@@ -1008,8 +977,7 @@ func TestPeerManager_Dialed_UpgradeEvenLower(t *testing.T) {
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, c, dial)
// In the meanwhile, a disconnects and d connects. d is even lower-scored
@@ -1040,9 +1008,9 @@ func TestPeerManager_Dialed_UpgradeNoEvict(t *testing.T) {
MaxConnected: 2,
MaxConnectedUpgrade: 1,
PeerScores: map[types.NodeID]p2p.PeerScore{
- a.NodeID: 1,
- b.NodeID: 2,
- c.NodeID: 3,
+ a.NodeID: p2p.PeerScore(1),
+ b.NodeID: p2p.PeerScore(2),
+ c.NodeID: p2p.PeerScore(3),
},
})
require.NoError(t, err)
@@ -1062,7 +1030,7 @@ func TestPeerManager_Dialed_UpgradeNoEvict(t *testing.T) {
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
+ dial := peerManager.TryDialNext()
require.NoError(t, err)
require.Equal(t, c, dial)
@@ -1108,8 +1076,7 @@ func TestPeerManager_Accepted(t *testing.T) {
added, err = peerManager.Add(c)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, c, dial)
require.NoError(t, peerManager.Accepted(c.NodeID))
require.Error(t, peerManager.Dialed(c))
@@ -1118,8 +1085,7 @@ func TestPeerManager_Accepted(t *testing.T) {
added, err = peerManager.Add(d)
require.NoError(t, err)
require.True(t, added)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, d, dial)
require.NoError(t, peerManager.Dialed(d))
require.Error(t, peerManager.Accepted(d.NodeID))
@@ -1161,8 +1127,8 @@ func TestPeerManager_Accepted_MaxConnectedUpgrade(t *testing.T) {
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
PeerScores: map[types.NodeID]p2p.PeerScore{
- c.NodeID: 1,
- d.NodeID: 2,
+ c.NodeID: p2p.PeerScore(1),
+ d.NodeID: p2p.PeerScore(2),
},
MaxConnected: 1,
MaxConnectedUpgrade: 1,
@@ -1209,8 +1175,8 @@ func TestPeerManager_Accepted_Upgrade(t *testing.T) {
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
PeerScores: map[types.NodeID]p2p.PeerScore{
- b.NodeID: 1,
- c.NodeID: 1,
+ b.NodeID: p2p.PeerScore(1),
+ c.NodeID: p2p.PeerScore(1),
},
MaxConnected: 1,
MaxConnectedUpgrade: 2,
@@ -1252,8 +1218,8 @@ func TestPeerManager_Accepted_UpgradeDialing(t *testing.T) {
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
PeerScores: map[types.NodeID]p2p.PeerScore{
- b.NodeID: 1,
- c.NodeID: 1,
+ b.NodeID: p2p.PeerScore(1),
+ c.NodeID: p2p.PeerScore(1),
},
MaxConnected: 1,
MaxConnectedUpgrade: 2,
@@ -1270,8 +1236,7 @@ func TestPeerManager_Accepted_UpgradeDialing(t *testing.T) {
added, err = peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, b, dial)
// a has already been claimed as an upgrade of a, so accepting
@@ -1428,7 +1393,7 @@ func TestPeerManager_EvictNext_WakeOnUpgradeDialed(t *testing.T) {
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
MaxConnected: 1,
MaxConnectedUpgrade: 1,
- PeerScores: map[types.NodeID]p2p.PeerScore{b.NodeID: 1},
+ PeerScores: map[types.NodeID]p2p.PeerScore{b.NodeID: p2p.PeerScore(1)},
})
require.NoError(t, err)
@@ -1445,8 +1410,7 @@ func TestPeerManager_EvictNext_WakeOnUpgradeDialed(t *testing.T) {
added, err := peerManager.Add(b)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, b, dial)
require.NoError(t, peerManager.Dialed(b))
}()
@@ -1469,7 +1433,9 @@ func TestPeerManager_EvictNext_WakeOnUpgradeAccepted(t *testing.T) {
peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{
MaxConnected: 1,
MaxConnectedUpgrade: 1,
- PeerScores: map[types.NodeID]p2p.PeerScore{b.NodeID: 1},
+ PeerScores: map[types.NodeID]p2p.PeerScore{
+ b.NodeID: p2p.PeerScore(1),
+ },
})
require.NoError(t, err)
@@ -1578,13 +1544,11 @@ func TestPeerManager_Disconnected(t *testing.T) {
// Disconnecting a dialing peer does not unmark it as dialing, to avoid
// dialing it multiple times in parallel.
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
peerManager.Disconnected(ctx, a.NodeID)
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Zero(t, dial)
}
@@ -1657,8 +1621,7 @@ func TestPeerManager_Subscribe(t *testing.T) {
require.Equal(t, p2p.PeerUpdate{NodeID: a.NodeID, Status: p2p.PeerStatusDown}, <-sub.Updates())
// Outbound connection with peer error and eviction.
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
require.Empty(t, sub.Updates())
@@ -1681,8 +1644,7 @@ func TestPeerManager_Subscribe(t *testing.T) {
require.Equal(t, p2p.PeerUpdate{NodeID: a.NodeID, Status: p2p.PeerStatusDown}, <-sub.Updates())
// Outbound connection with dial failure.
- dial, err = peerManager.TryDialNext()
- require.NoError(t, err)
+ dial = peerManager.TryDialNext()
require.Equal(t, a, dial)
require.Empty(t, sub.Updates())
@@ -1787,8 +1749,7 @@ func TestPeerManager_Close(t *testing.T) {
added, err := peerManager.Add(a)
require.NoError(t, err)
require.True(t, added)
- dial, err := peerManager.TryDialNext()
- require.NoError(t, err)
+ dial := peerManager.TryDialNext()
require.Equal(t, a, dial)
require.NoError(t, peerManager.DialFailed(ctx, a))
}
@@ -1833,6 +1794,7 @@ func TestPeerManager_Advertise(t *testing.T) {
require.NoError(t, err)
require.True(t, added)
+ require.Len(t, peerManager.Advertise(dID, 100), 6)
// d should get all addresses.
require.ElementsMatch(t, []p2p.NodeAddress{
aTCP, aMem, bTCP, bMem, cTCP, cMem,
@@ -1846,10 +1808,18 @@ func TestPeerManager_Advertise(t *testing.T) {
// Asking for 0 addresses should return, well, 0.
require.Empty(t, peerManager.Advertise(aID, 0))
- // Asking for 2 addresses should get the highest-rated ones, i.e. a.
- require.ElementsMatch(t, []p2p.NodeAddress{
- aTCP, aMem,
- }, peerManager.Advertise(dID, 2))
+ // Asking for 2 addresses should get two addresses
+ // the content of the list when there are two
+ addrs := peerManager.Advertise(dID, 2)
+ require.Len(t, addrs, 2)
+ for _, addr := range addrs {
+ if dID == addr.NodeID {
+ t.Fatal("never advertise self")
+ }
+ if cID == addr.NodeID {
+ t.Fatal("should not have returned the lowest ranked peer")
+ }
+ }
}
func TestPeerManager_Advertise_Self(t *testing.T) {
diff --git a/internal/p2p/pex/reactor.go b/internal/p2p/pex/reactor.go
index bd4737326..87677799d 100644
--- a/internal/p2p/pex/reactor.go
+++ b/internal/p2p/pex/reactor.go
@@ -145,7 +145,7 @@ func (r *Reactor) OnStop() {}
// processPexCh implements a blocking event loop where we listen for p2p
// Envelope messages from the pexCh.
-func (r *Reactor) processPexCh(ctx context.Context, pexCh *p2p.Channel) {
+func (r *Reactor) processPexCh(ctx context.Context, pexCh p2p.Channel) {
incoming := make(chan *p2p.Envelope)
go func() {
defer close(incoming)
@@ -192,8 +192,7 @@ func (r *Reactor) processPexCh(ctx context.Context, pexCh *p2p.Channel) {
// A request from another peer, or a response to one of our requests.
dur, err := r.handlePexMessage(ctx, envelope, pexCh)
if err != nil {
- r.logger.Error("failed to process message",
- "ch_id", envelope.ChannelID, "envelope", envelope, "err", err)
+ r.logger.Error("failed to process message", "ch_id", envelope.ChannelID, "envelope", envelope, "err", err)
if serr := pexCh.SendError(ctx, p2p.PeerError{
NodeID: envelope.From,
Err: err,
@@ -225,7 +224,7 @@ func (r *Reactor) processPeerUpdates(ctx context.Context, peerUpdates *p2p.PeerU
// handlePexMessage handles envelopes sent from peers on the PexChannel.
// If an update was received, a new polling interval is returned; otherwise the
// duration is 0.
-func (r *Reactor) handlePexMessage(ctx context.Context, envelope *p2p.Envelope, pexCh *p2p.Channel) (time.Duration, error) {
+func (r *Reactor) handlePexMessage(ctx context.Context, envelope *p2p.Envelope, pexCh p2p.Channel) (time.Duration, error) {
logger := r.logger.With("peer", envelope.From)
switch msg := envelope.Message.(type) {
@@ -308,7 +307,7 @@ func (r *Reactor) processPeerUpdate(peerUpdate p2p.PeerUpdate) {
// that peer a request for more peer addresses. The chosen peer is moved into
// the requestsSent bucket so that we will not attempt to contact them again
// until they've replied or updated.
-func (r *Reactor) sendRequestForPeers(ctx context.Context, pexCh *p2p.Channel) error {
+func (r *Reactor) sendRequestForPeers(ctx context.Context, pexCh p2p.Channel) error {
r.mtx.Lock()
defer r.mtx.Unlock()
if len(r.availablePeers) == 0 {
diff --git a/internal/p2p/pex/reactor_test.go b/internal/p2p/pex/reactor_test.go
index ec2f03d83..07f49f0d6 100644
--- a/internal/p2p/pex/reactor_test.go
+++ b/internal/p2p/pex/reactor_test.go
@@ -275,7 +275,7 @@ type singleTestReactor struct {
pexInCh chan p2p.Envelope
pexOutCh chan p2p.Envelope
pexErrCh chan p2p.PeerError
- pexCh *p2p.Channel
+ pexCh p2p.Channel
peerCh chan p2p.PeerUpdate
manager *p2p.PeerManager
}
@@ -287,8 +287,11 @@ func setupSingle(ctx context.Context, t *testing.T) *singleTestReactor {
pexInCh := make(chan p2p.Envelope, chBuf)
pexOutCh := make(chan p2p.Envelope, chBuf)
pexErrCh := make(chan p2p.PeerError, chBuf)
+
+ chDesc := pex.ChannelDescriptor()
pexCh := p2p.NewChannel(
- p2p.ChannelID(pex.PexChannel),
+ chDesc.ID,
+ chDesc.Name,
pexInCh,
pexOutCh,
pexErrCh,
@@ -299,7 +302,7 @@ func setupSingle(ctx context.Context, t *testing.T) *singleTestReactor {
peerManager, err := p2p.NewPeerManager(nodeID, dbm.NewMemDB(), p2p.PeerManagerOptions{})
require.NoError(t, err)
- chCreator := func(context.Context, *p2p.ChannelDescriptor) (*p2p.Channel, error) {
+ chCreator := func(context.Context, *p2p.ChannelDescriptor) (p2p.Channel, error) {
return pexCh, nil
}
@@ -324,7 +327,7 @@ type reactorTestSuite struct {
logger log.Logger
reactors map[types.NodeID]*pex.Reactor
- pexChannels map[types.NodeID]*p2p.Channel
+ pexChannels map[types.NodeID]p2p.Channel
peerChans map[types.NodeID]chan p2p.PeerUpdate
peerUpdates map[types.NodeID]*p2p.PeerUpdates
@@ -367,7 +370,7 @@ func setupNetwork(ctx context.Context, t *testing.T, opts testOptions) *reactorT
logger: log.NewNopLogger().With("testCase", t.Name()),
network: p2ptest.MakeNetwork(ctx, t, networkOpts),
reactors: make(map[types.NodeID]*pex.Reactor, realNodes),
- pexChannels: make(map[types.NodeID]*p2p.Channel, opts.TotalNodes),
+ pexChannels: make(map[types.NodeID]p2p.Channel, opts.TotalNodes),
peerChans: make(map[types.NodeID]chan p2p.PeerUpdate, opts.TotalNodes),
peerUpdates: make(map[types.NodeID]*p2p.PeerUpdates, opts.TotalNodes),
total: opts.TotalNodes,
@@ -388,7 +391,7 @@ func setupNetwork(ctx context.Context, t *testing.T, opts testOptions) *reactorT
rts.peerUpdates[nodeID] = p2p.NewPeerUpdates(rts.peerChans[nodeID], chBuf)
rts.network.Nodes[nodeID].PeerManager.Register(ctx, rts.peerUpdates[nodeID])
- chCreator := func(context.Context, *p2p.ChannelDescriptor) (*p2p.Channel, error) {
+ chCreator := func(context.Context, *p2p.ChannelDescriptor) (p2p.Channel, error) {
return rts.pexChannels[nodeID], nil
}
@@ -448,7 +451,7 @@ func (r *reactorTestSuite) addNodes(ctx context.Context, t *testing.T, nodes int
r.peerUpdates[nodeID] = p2p.NewPeerUpdates(r.peerChans[nodeID], r.opts.BufferSize)
r.network.Nodes[nodeID].PeerManager.Register(ctx, r.peerUpdates[nodeID])
- chCreator := func(context.Context, *p2p.ChannelDescriptor) (*p2p.Channel, error) {
+ chCreator := func(context.Context, *p2p.ChannelDescriptor) (p2p.Channel, error) {
return r.pexChannels[nodeID], nil
}
diff --git a/internal/p2p/pqueue.go b/internal/p2p/pqueue.go
index 268daa8de..3cd1c897a 100644
--- a/internal/p2p/pqueue.go
+++ b/internal/p2p/pqueue.go
@@ -31,8 +31,16 @@ func (pq priorityQueue) get(i int) *pqEnvelope { return pq[i] }
func (pq priorityQueue) Len() int { return len(pq) }
func (pq priorityQueue) Less(i, j int) bool {
- // if both elements have the same priority, prioritize based on most recent
+ // if both elements have the same priority, prioritize based
+ // on most recent and largest
if pq[i].priority == pq[j].priority {
+ diff := pq[i].timestamp.Sub(pq[j].timestamp)
+ if diff < 0 {
+ diff *= -1
+ }
+ if diff < 10*time.Millisecond {
+ return pq[i].size > pq[j].size
+ }
return pq[i].timestamp.After(pq[j].timestamp)
}
@@ -272,12 +280,10 @@ func (s *pqScheduler) process(ctx context.Context) {
}
func (s *pqScheduler) push(pqEnv *pqEnvelope) {
- chIDStr := strconv.Itoa(int(pqEnv.envelope.ChannelID))
-
// enqueue the incoming Envelope
heap.Push(s.pq, pqEnv)
s.size += pqEnv.size
- s.metrics.PeerQueueMsgSize.With("ch_id", chIDStr).Add(float64(pqEnv.size))
+ s.metrics.PeerQueueMsgSize.With("ch_id", strconv.Itoa(int(pqEnv.envelope.ChannelID))).Add(float64(pqEnv.size))
// Update the cumulative sizes by adding the Envelope's size to every
// priority less than or equal to it.
diff --git a/internal/p2p/router.go b/internal/p2p/router.go
index 8b77541de..4f3af1346 100644
--- a/internal/p2p/router.go
+++ b/internal/p2p/router.go
@@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"io"
- "math/rand"
"net"
"runtime"
"sync"
@@ -62,12 +61,6 @@ type RouterOptions struct {
// return an error to reject the peer.
FilterPeerByID func(context.Context, types.NodeID) error
- // DialSleep controls the amount of time that the router
- // sleeps between dialing peers. If not set, a default value
- // is used that sleeps for a (random) amount of time up to 3
- // seconds between submitting each peer to be dialed.
- DialSleep func(context.Context)
-
// NumConcrruentDials controls how many parallel go routines
// are used to dial peers. This defaults to the value of
// runtime.NumCPU.
@@ -75,8 +68,9 @@ type RouterOptions struct {
}
const (
- queueTypeFifo = "fifo"
- queueTypePriority = "priority"
+ queueTypeFifo = "fifo"
+ queueTypePriority = "priority"
+ queueTypeSimplePriority = "simple-priority"
)
// Validate validates router options.
@@ -84,7 +78,7 @@ func (o *RouterOptions) Validate() error {
switch o.QueueType {
case "":
o.QueueType = queueTypeFifo
- case queueTypeFifo, queueTypePriority:
+ case queueTypeFifo, queueTypePriority, queueTypeSimplePriority:
// pass
default:
return fmt.Errorf("queue type %q is not supported", o.QueueType)
@@ -234,6 +228,9 @@ func (r *Router) createQueueFactory(ctx context.Context) (func(int) queue, error
return q
}, nil
+ case queueTypeSimplePriority:
+ return func(size int) queue { return newSimplePriorityQueue(ctx, size, r.chDescs) }, nil
+
default:
return nil, fmt.Errorf("cannot construct queue of type %q", r.options.QueueType)
}
@@ -242,7 +239,7 @@ func (r *Router) createQueueFactory(ctx context.Context) (func(int) queue, error
// ChannelCreator allows routers to construct their own channels,
// either by receiving a reference to Router.OpenChannel or using some
// kind shim for testing purposes.
-type ChannelCreator func(context.Context, *ChannelDescriptor) (*Channel, error)
+type ChannelCreator func(context.Context, *ChannelDescriptor) (Channel, error)
// OpenChannel opens a new channel for the given message type. The caller must
// close the channel when done, before stopping the Router. messageType is the
@@ -250,7 +247,7 @@ type ChannelCreator func(context.Context, *ChannelDescriptor) (*Channel, error)
// implement Wrapper to automatically (un)wrap multiple message types in a
// wrapper message. The caller may provide a size to make the channel buffered,
// which internally makes the inbound, outbound, and error channel buffered.
-func (r *Router) OpenChannel(ctx context.Context, chDesc *ChannelDescriptor) (*Channel, error) {
+func (r *Router) OpenChannel(ctx context.Context, chDesc *ChannelDescriptor) (Channel, error) {
r.channelMtx.Lock()
defer r.channelMtx.Unlock()
@@ -265,11 +262,10 @@ func (r *Router) OpenChannel(ctx context.Context, chDesc *ChannelDescriptor) (*C
queue := r.queueFactory(chDesc.RecvBufferCapacity)
outCh := make(chan Envelope, chDesc.RecvBufferCapacity)
errCh := make(chan PeerError, chDesc.RecvBufferCapacity)
- channel := NewChannel(id, queue.dequeue(), outCh, errCh)
- channel.name = chDesc.Name
+ channel := NewChannel(chDesc.ID, chDesc.Name, queue.dequeue(), outCh, errCh)
var wrapper Wrapper
- if w, ok := messageType.(Wrapper); ok {
+ if w, ok := chDesc.MessageType.(Wrapper); ok {
wrapper = w
}
@@ -290,7 +286,7 @@ func (r *Router) OpenChannel(ctx context.Context, chDesc *ChannelDescriptor) (*C
queue.close()
}()
- r.routeChannel(ctx, id, outCh, errCh, wrapper)
+ r.routeChannel(ctx, chDesc.ID, outCh, errCh, wrapper)
}()
return channel, nil
@@ -310,11 +306,10 @@ func (r *Router) routeChannel(
) {
for {
select {
- case envelope, ok := <-outCh:
- if !ok {
- return
+ case envelope := <-outCh:
+ if envelope.IsZero() {
+ continue
}
-
// Mark the envelope with the channel ID to allow sendPeer() to pass
// it on to Transport.SendMessage().
envelope.ChannelID = chID
@@ -391,20 +386,22 @@ func (r *Router) routeChannel(
}
}
- case peerError, ok := <-errCh:
- if !ok {
- return
- }
-
- shouldEvict := peerError.Fatal || r.peerManager.HasMaxPeerCapacity()
+ case peerError := <-errCh:
+ maxPeerCapacity := r.peerManager.HasMaxPeerCapacity()
r.logger.Error("peer error",
"peer", peerError.NodeID,
"err", peerError.Err,
- "evicting", shouldEvict,
+ "disconnecting", peerError.Fatal || maxPeerCapacity,
)
- if shouldEvict {
+
+ if peerError.Fatal || maxPeerCapacity {
+ // if the error is fatal or all peer
+ // slots are in use, we can error
+ // (disconnect) from the peer.
r.peerManager.Errored(peerError.NodeID, peerError.Err)
} else {
+ // this just decrements the peer
+ // score.
r.peerManager.processPeerEvent(ctx, PeerUpdate{
NodeID: peerError.NodeID,
Status: PeerStatusBad,
@@ -417,9 +414,9 @@ func (r *Router) routeChannel(
}
}
-func (r *Router) numConccurentDials() int {
+func (r *Router) numConcurrentDials() int {
if r.options.NumConcurrentDials == nil {
- return runtime.NumCPU()
+ return runtime.NumCPU() * 32
}
return r.options.NumConcurrentDials()
@@ -441,43 +438,22 @@ func (r *Router) filterPeersID(ctx context.Context, id types.NodeID) error {
return r.options.FilterPeerByID(ctx, id)
}
-func (r *Router) dialSleep(ctx context.Context) {
- if r.options.DialSleep == nil {
- const (
- maxDialerInterval = 3000
- minDialerInterval = 250
- )
-
- // nolint:gosec // G404: Use of weak random number generator
- dur := time.Duration(rand.Int63n(maxDialerInterval-minDialerInterval+1) + minDialerInterval)
-
- timer := time.NewTimer(dur * time.Millisecond)
- defer timer.Stop()
-
- select {
- case <-ctx.Done():
- case <-timer.C:
- }
-
- return
- }
-
- r.options.DialSleep(ctx)
-}
-
// acceptPeers accepts inbound connections from peers on the given transport,
// and spawns goroutines that route messages to/from them.
func (r *Router) acceptPeers(ctx context.Context, transport Transport) {
for {
conn, err := transport.Accept(ctx)
- switch err {
- case nil:
- case io.EOF:
- r.logger.Debug("stopping accept routine", "transport", transport)
+ switch {
+ case errors.Is(err, context.Canceled), errors.Is(err, context.DeadlineExceeded):
+ r.logger.Debug("stopping accept routine", "transport", transport, "err", "context canceled")
return
- default:
+ case errors.Is(err, io.EOF):
+ r.logger.Debug("stopping accept routine", "transport", transport, "err", "EOF")
+ return
+ case err != nil:
+ // in this case we got an error from the net.Listener.
r.logger.Error("failed to accept connection", "transport", transport, "err", err)
- return
+ continue
}
incomingIP := conn.RemoteEndpoint().IP
@@ -489,7 +465,7 @@ func (r *Router) acceptPeers(ctx context.Context, transport Transport) {
"close_err", closeErr,
)
- return
+ continue
}
// Spawn a goroutine for the handshake, to avoid head-of-line blocking.
@@ -558,7 +534,7 @@ func (r *Router) dialPeers(ctx context.Context) {
// able to add peers at a reasonable pace, though the number
// is somewhat arbitrary. The action is further throttled by a
// sleep after sending to the addresses channel.
- for i := 0; i < r.numConccurentDials(); i++ {
+ for i := 0; i < r.numConcurrentDials(); i++ {
wg.Add(1)
go func() {
defer wg.Done()
@@ -580,19 +556,13 @@ LOOP:
switch {
case errors.Is(err, context.Canceled):
break LOOP
- case err != nil:
- r.logger.Error("failed to find next peer to dial", "err", err)
- break LOOP
+ case address == NodeAddress{}:
+ continue LOOP
}
select {
case addresses <- address:
- // this jitters the frequency that we call
- // DialNext and prevents us from attempting to
- // create connections too quickly.
-
- r.dialSleep(ctx)
- continue
+ continue LOOP
case <-ctx.Done():
close(addresses)
break LOOP
@@ -608,7 +578,7 @@ func (r *Router) connectPeer(ctx context.Context, address NodeAddress) {
case errors.Is(err, context.Canceled):
return
case err != nil:
- r.logger.Error("failed to dial peer", "peer", address, "err", err)
+ r.logger.Debug("failed to dial peer", "peer", address, "err", err)
if err = r.peerManager.DialFailed(ctx, address); err != nil {
r.logger.Error("failed to report dial failure", "peer", address, "err", err)
}
@@ -630,8 +600,8 @@ func (r *Router) connectPeer(ctx context.Context, address NodeAddress) {
}
if err := r.runWithPeerMutex(func() error { return r.peerManager.Dialed(address) }); err != nil {
- r.logger.Error("failed to dial peer",
- "op", "outgoing/dialing", "peer", address.NodeID, "err", err)
+ r.logger.Error("failed to dial peer", "op", "outgoing/dialing", "peer", address.NodeID, "err", err)
+ r.peerManager.dialWaker.Wake()
conn.Close()
return
}
@@ -689,12 +659,13 @@ func (r *Router) dialPeer(ctx context.Context, address NodeAddress) (Connection,
// Internet can't and needs a different public address.
conn, err := r.transport.Dial(dialCtx, endpoint)
if err != nil {
- r.logger.Error("failed to dial endpoint", "peer", address.NodeID, "endpoint", endpoint, "err", err)
+ r.logger.Debug("failed to dial endpoint", "peer", address.NodeID, "endpoint", endpoint, "err", err)
} else {
r.logger.Debug("dialed peer", "peer", address.NodeID, "endpoint", endpoint)
return conn, nil
}
}
+
return nil, errors.New("all endpoints failed")
}
@@ -706,14 +677,8 @@ func (r *Router) handshakePeer(
expectID types.NodeID,
) (types.NodeInfo, error) {
- if r.options.HandshakeTimeout > 0 {
- var cancel context.CancelFunc
- ctx, cancel = context.WithTimeout(ctx, r.options.HandshakeTimeout)
- defer cancel()
- }
-
nodeInfo := r.nodeInfoProducer()
- peerInfo, peerKey, err := conn.Handshake(ctx, *nodeInfo, r.privKey)
+ peerInfo, peerKey, err := conn.Handshake(ctx, r.options.HandshakeTimeout, *nodeInfo, r.privKey)
if err != nil {
return peerInfo, err
}
@@ -721,14 +686,6 @@ func (r *Router) handshakePeer(
return peerInfo, fmt.Errorf("invalid handshake NodeInfo: %w", err)
}
- if peerInfo.Network != nodeInfo.Network {
- if err := r.peerManager.store.Delete(peerInfo.NodeID); err != nil {
- return peerInfo, fmt.Errorf("problem removing peer from store from incorrect network [%s]: %w", peerInfo.Network, err)
- }
-
- return peerInfo, fmt.Errorf("connected to peer from wrong network, %q, removed from peer store", peerInfo.Network)
- }
-
if types.NodeIDFromPubKey(peerKey) != peerInfo.NodeID {
return peerInfo, fmt.Errorf("peer's public key did not match its node ID %q (expected %q)",
peerInfo.NodeID, types.NodeIDFromPubKey(peerKey))
@@ -739,6 +696,10 @@ func (r *Router) handshakePeer(
}
if err := nodeInfo.CompatibleWith(peerInfo); err != nil {
+ if err := r.peerManager.Inactivate(peerInfo.NodeID); err != nil {
+ return peerInfo, fmt.Errorf("problem inactivating peer %q: %w", peerInfo.ID(), err)
+ }
+
return peerInfo, ErrRejected{
err: err,
id: peerInfo.ID(),
@@ -758,7 +719,7 @@ func (r *Router) runWithPeerMutex(fn func() error) error {
// channels. It will close the given connection and send queue when done, or if
// they are closed elsewhere it will cause this method to shut down and return.
func (r *Router) routePeer(ctx context.Context, peerID types.NodeID, conn Connection, channels ChannelIDSet) {
- r.metrics.Peers.Add(1)
+ r.metrics.PeersConnected.Add(1)
r.peerManager.Ready(ctx, peerID, channels)
sendQueue := r.getOrMakeQueue(peerID, channels)
@@ -771,7 +732,7 @@ func (r *Router) routePeer(ctx context.Context, peerID types.NodeID, conn Connec
sendQueue.close()
r.peerManager.Disconnected(ctx, peerID)
- r.metrics.Peers.Add(-1)
+ r.metrics.PeersConnected.Add(-1)
}()
r.logger.Info("peer connected", "peer", peerID, "endpoint", conn)
@@ -930,6 +891,8 @@ func (r *Router) evictPeers(ctx context.Context) {
queue, ok := r.peerQueues[peerID]
r.peerMtx.RUnlock()
+ r.metrics.PeersEvicted.Add(1)
+
if ok {
queue.close()
}
diff --git a/internal/p2p/router_test.go b/internal/p2p/router_test.go
index 663e6b81c..dd336510c 100644
--- a/internal/p2p/router_test.go
+++ b/internal/p2p/router_test.go
@@ -26,7 +26,7 @@ import (
"github.com/tendermint/tendermint/types"
)
-func echoReactor(ctx context.Context, channel *p2p.Channel) {
+func echoReactor(ctx context.Context, channel p2p.Channel) {
iter := channel.Receive(ctx)
for iter.Next(ctx) {
envelope := iter.Envelope()
@@ -385,7 +385,7 @@ func TestRouter_AcceptPeers(t *testing.T) {
connCtx, connCancel := context.WithCancel(context.Background())
mockConnection := &mocks.Connection{}
mockConnection.On("String").Maybe().Return("mock")
- mockConnection.On("Handshake", mock.Anything, selfInfo, selfKey).
+ mockConnection.On("Handshake", mock.Anything, mock.Anything, selfInfo, selfKey).
Return(tc.peerInfo, tc.peerKey, nil)
mockConnection.On("Close").Run(func(_ mock.Arguments) { connCancel() }).Return(nil).Maybe()
mockConnection.On("RemoteEndpoint").Return(p2p.Endpoint{})
@@ -442,78 +442,48 @@ func TestRouter_AcceptPeers(t *testing.T) {
}
}
-func TestRouter_AcceptPeers_Error(t *testing.T) {
- t.Cleanup(leaktest.Check(t))
+func TestRouter_AcceptPeers_Errors(t *testing.T) {
- ctx, cancel := context.WithCancel(context.Background())
- defer cancel()
+ for _, err := range []error{io.EOF, context.Canceled, context.DeadlineExceeded} {
+ t.Run(err.Error(), func(t *testing.T) {
+ t.Cleanup(leaktest.Check(t))
- // Set up a mock transport that returns an error, which should prevent
- // the router from calling Accept again.
- mockTransport := &mocks.Transport{}
- mockTransport.On("String").Maybe().Return("mock")
- mockTransport.On("Accept", mock.Anything).Once().Return(nil, errors.New("boom"))
- mockTransport.On("Close").Return(nil)
- mockTransport.On("Listen", mock.Anything).Return(nil)
+ ctx, cancel := context.WithCancel(context.Background())
+ defer cancel()
- // Set up and start the router.
- peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{})
- require.NoError(t, err)
+ // Set up a mock transport that returns io.EOF once, which should prevent
+ // the router from calling Accept again.
+ mockTransport := &mocks.Transport{}
+ mockTransport.On("String").Maybe().Return("mock")
+ mockTransport.On("Accept", mock.Anything).Once().Return(nil, err)
+ mockTransport.On("Close").Return(nil)
+ mockTransport.On("Listen", mock.Anything).Return(nil)
- router, err := p2p.NewRouter(
- log.NewNopLogger(),
- p2p.NopMetrics(),
- selfKey,
- peerManager,
- func() *types.NodeInfo { return &selfInfo },
- mockTransport,
- nil,
- p2p.RouterOptions{},
- )
- require.NoError(t, err)
+ // Set up and start the router.
+ peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{})
+ require.NoError(t, err)
- require.NoError(t, router.Start(ctx))
- time.Sleep(time.Second)
- router.Stop()
+ router, err := p2p.NewRouter(
+ log.NewNopLogger(),
+ p2p.NopMetrics(),
+ selfKey,
+ peerManager,
+ func() *types.NodeInfo { return &selfInfo },
+ mockTransport,
+ nil,
+ p2p.RouterOptions{},
+ )
+ require.NoError(t, err)
- mockTransport.AssertExpectations(t)
-}
+ require.NoError(t, router.Start(ctx))
+ time.Sleep(time.Second)
+ router.Stop()
-func TestRouter_AcceptPeers_ErrorEOF(t *testing.T) {
- t.Cleanup(leaktest.Check(t))
+ mockTransport.AssertExpectations(t)
- ctx, cancel := context.WithCancel(context.Background())
- defer cancel()
+ })
- // Set up a mock transport that returns io.EOF once, which should prevent
- // the router from calling Accept again.
- mockTransport := &mocks.Transport{}
- mockTransport.On("String").Maybe().Return("mock")
- mockTransport.On("Accept", mock.Anything).Once().Return(nil, io.EOF)
- mockTransport.On("Close").Return(nil)
- mockTransport.On("Listen", mock.Anything).Return(nil)
-
- // Set up and start the router.
- peerManager, err := p2p.NewPeerManager(selfID, dbm.NewMemDB(), p2p.PeerManagerOptions{})
- require.NoError(t, err)
-
- router, err := p2p.NewRouter(
- log.NewNopLogger(),
- p2p.NopMetrics(),
- selfKey,
- peerManager,
- func() *types.NodeInfo { return &selfInfo },
- mockTransport,
- nil,
- p2p.RouterOptions{},
- )
- require.NoError(t, err)
-
- require.NoError(t, router.Start(ctx))
- time.Sleep(time.Second)
- router.Stop()
-
- mockTransport.AssertExpectations(t)
+ }
}
func TestRouter_AcceptPeers_HeadOfLineBlocking(t *testing.T) {
@@ -530,7 +500,7 @@ func TestRouter_AcceptPeers_HeadOfLineBlocking(t *testing.T) {
mockConnection := &mocks.Connection{}
mockConnection.On("String").Maybe().Return("mock")
- mockConnection.On("Handshake", mock.Anything, selfInfo, selfKey).
+ mockConnection.On("Handshake", mock.Anything, mock.Anything, selfInfo, selfKey).
WaitUntil(closeCh).Return(types.NodeInfo{}, nil, io.EOF)
mockConnection.On("Close").Return(nil)
mockConnection.On("RemoteEndpoint").Return(p2p.Endpoint{})
@@ -618,7 +588,7 @@ func TestRouter_DialPeers(t *testing.T) {
mockConnection := &mocks.Connection{}
mockConnection.On("String").Maybe().Return("mock")
if tc.dialErr == nil {
- mockConnection.On("Handshake", mock.Anything, selfInfo, selfKey).
+ mockConnection.On("Handshake", mock.Anything, mock.Anything, selfInfo, selfKey).
Return(tc.peerInfo, tc.peerKey, nil)
mockConnection.On("Close").Run(func(_ mock.Arguments) { connCancel() }).Return(nil).Maybe()
}
@@ -704,7 +674,7 @@ func TestRouter_DialPeers_Parallel(t *testing.T) {
mockConnection := &mocks.Connection{}
mockConnection.On("String").Maybe().Return("mock")
- mockConnection.On("Handshake", mock.Anything, selfInfo, selfKey).
+ mockConnection.On("Handshake", mock.Anything, mock.Anything, selfInfo, selfKey).
WaitUntil(closeCh).Return(types.NodeInfo{}, nil, io.EOF)
mockConnection.On("Close").Return(nil)
@@ -745,7 +715,6 @@ func TestRouter_DialPeers_Parallel(t *testing.T) {
mockTransport,
nil,
p2p.RouterOptions{
- DialSleep: func(_ context.Context) {},
NumConcurrentDials: func() int {
ncpu := runtime.NumCPU()
if ncpu <= 3 {
@@ -787,7 +756,7 @@ func TestRouter_EvictPeers(t *testing.T) {
mockConnection := &mocks.Connection{}
mockConnection.On("String").Maybe().Return("mock")
- mockConnection.On("Handshake", mock.Anything, selfInfo, selfKey).
+ mockConnection.On("Handshake", mock.Anything, mock.Anything, selfInfo, selfKey).
Return(peerInfo, peerKey.PubKey(), nil)
mockConnection.On("ReceiveMessage", mock.Anything).WaitUntil(closeCh).Return(chID, nil, io.EOF)
mockConnection.On("RemoteEndpoint").Return(p2p.Endpoint{})
@@ -856,7 +825,7 @@ func TestRouter_ChannelCompatability(t *testing.T) {
mockConnection := &mocks.Connection{}
mockConnection.On("String").Maybe().Return("mock")
- mockConnection.On("Handshake", mock.Anything, selfInfo, selfKey).
+ mockConnection.On("Handshake", mock.Anything, mock.Anything, selfInfo, selfKey).
Return(incompatiblePeer, peerKey.PubKey(), nil)
mockConnection.On("RemoteEndpoint").Return(p2p.Endpoint{})
mockConnection.On("Close").Return(nil)
@@ -907,7 +876,7 @@ func TestRouter_DontSendOnInvalidChannel(t *testing.T) {
mockConnection := &mocks.Connection{}
mockConnection.On("String").Maybe().Return("mock")
- mockConnection.On("Handshake", mock.Anything, selfInfo, selfKey).
+ mockConnection.On("Handshake", mock.Anything, mock.Anything, selfInfo, selfKey).
Return(peer, peerKey.PubKey(), nil)
mockConnection.On("RemoteEndpoint").Return(p2p.Endpoint{})
mockConnection.On("Close").Return(nil)
diff --git a/internal/p2p/rqueue.go b/internal/p2p/rqueue.go
new file mode 100644
index 000000000..8d6406864
--- /dev/null
+++ b/internal/p2p/rqueue.go
@@ -0,0 +1,112 @@
+package p2p
+
+import (
+ "container/heap"
+ "context"
+ "sort"
+ "time"
+
+ "github.com/gogo/protobuf/proto"
+)
+
+type simpleQueue struct {
+ input chan Envelope
+ output chan Envelope
+ closeFn func()
+ closeCh <-chan struct{}
+
+ maxSize int
+ chDescs []*ChannelDescriptor
+}
+
+func newSimplePriorityQueue(ctx context.Context, size int, chDescs []*ChannelDescriptor) *simpleQueue {
+ if size%2 != 0 {
+ size++
+ }
+
+ ctx, cancel := context.WithCancel(ctx)
+ q := &simpleQueue{
+ input: make(chan Envelope, size*2),
+ output: make(chan Envelope, size/2),
+ maxSize: size * size,
+ closeCh: ctx.Done(),
+ closeFn: cancel,
+ }
+
+ go q.run(ctx)
+ return q
+}
+
+func (q *simpleQueue) enqueue() chan<- Envelope { return q.input }
+func (q *simpleQueue) dequeue() <-chan Envelope { return q.output }
+func (q *simpleQueue) close() { q.closeFn() }
+func (q *simpleQueue) closed() <-chan struct{} { return q.closeCh }
+
+func (q *simpleQueue) run(ctx context.Context) {
+ defer q.closeFn()
+
+ var chPriorities = make(map[ChannelID]uint, len(q.chDescs))
+ for _, chDesc := range q.chDescs {
+ chID := chDesc.ID
+ chPriorities[chID] = uint(chDesc.Priority)
+ }
+
+ pq := make(priorityQueue, 0, q.maxSize)
+ heap.Init(&pq)
+ ticker := time.NewTicker(10 * time.Millisecond)
+ // must have a buffer of exactly one because both sides of
+ // this channel are used in this loop, and simply signals adds
+ // to the heap
+ signal := make(chan struct{}, 1)
+ for {
+ select {
+ case <-ctx.Done():
+ return
+ case <-q.closeCh:
+ return
+ case e := <-q.input:
+ // enqueue the incoming Envelope
+ heap.Push(&pq, &pqEnvelope{
+ envelope: e,
+ size: uint(proto.Size(e.Message)),
+ priority: chPriorities[e.ChannelID],
+ timestamp: time.Now().UTC(),
+ })
+
+ select {
+ case signal <- struct{}{}:
+ default:
+ if len(pq) > q.maxSize {
+ sort.Sort(pq)
+ pq = pq[:q.maxSize]
+ }
+ }
+
+ case <-ticker.C:
+ if len(pq) > q.maxSize {
+ sort.Sort(pq)
+ pq = pq[:q.maxSize]
+ }
+ if len(pq) > 0 {
+ select {
+ case signal <- struct{}{}:
+ default:
+ }
+ }
+ case <-signal:
+ SEND:
+ for len(pq) > 0 {
+ select {
+ case <-ctx.Done():
+ return
+ case <-q.closeCh:
+ return
+ case q.output <- heap.Pop(&pq).(*pqEnvelope).envelope:
+ continue SEND
+ default:
+ break SEND
+ }
+ }
+ }
+ }
+}
diff --git a/internal/p2p/rqueue_test.go b/internal/p2p/rqueue_test.go
new file mode 100644
index 000000000..43c4066e5
--- /dev/null
+++ b/internal/p2p/rqueue_test.go
@@ -0,0 +1,47 @@
+package p2p
+
+import (
+ "context"
+ "testing"
+ "time"
+)
+
+func TestSimpleQueue(t *testing.T) {
+ ctx, cancel := context.WithCancel(context.Background())
+ defer cancel()
+
+ // set up a small queue with very small buffers so we can
+ // watch it shed load, then send a bunch of messages to the
+ // queue, most of which we'll watch it drop.
+ sq := newSimplePriorityQueue(ctx, 1, nil)
+ for i := 0; i < 100; i++ {
+ sq.enqueue() <- Envelope{From: "merlin"}
+ }
+
+ seen := 0
+
+RETRY:
+ for seen <= 2 {
+ select {
+ case e := <-sq.dequeue():
+ if e.From != "merlin" {
+ continue
+ }
+ seen++
+ case <-time.After(10 * time.Millisecond):
+ break RETRY
+ }
+ }
+ // if we don't see any messages, then it's just broken.
+ if seen == 0 {
+ t.Errorf("seen %d messages, should have seen more than one", seen)
+ }
+ // ensure that load shedding happens: there can be at most 3
+ // messages that we get out of this, one that was buffered
+ // plus 2 that were under the cap, everything else gets
+ // dropped.
+ if seen > 3 {
+ t.Errorf("saw %d messages, should have seen 5 or fewer", seen)
+ }
+
+}
diff --git a/internal/p2p/transport.go b/internal/p2p/transport.go
index 7a965260a..e644a11ae 100644
--- a/internal/p2p/transport.go
+++ b/internal/p2p/transport.go
@@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"net"
+ "time"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/types"
@@ -81,7 +82,7 @@ type Connection interface {
// FIXME: The handshake should really be the Router's responsibility, but
// that requires the connection interface to be byte-oriented rather than
// message-oriented (see comment above).
- Handshake(context.Context, types.NodeInfo, crypto.PrivKey) (types.NodeInfo, crypto.PubKey, error)
+ Handshake(context.Context, time.Duration, types.NodeInfo, crypto.PrivKey) (types.NodeInfo, crypto.PubKey, error)
// ReceiveMessage returns the next message received on the connection,
// blocking until one is available. Returns io.EOF if closed.
diff --git a/internal/p2p/transport_mconn.go b/internal/p2p/transport_mconn.go
index 7bf17d1a0..523fbf89f 100644
--- a/internal/p2p/transport_mconn.go
+++ b/internal/p2p/transport_mconn.go
@@ -9,6 +9,7 @@ import (
"net"
"strconv"
"sync"
+ "time"
"golang.org/x/net/netutil"
@@ -274,6 +275,7 @@ func newMConnConnection(
// Handshake implements Connection.
func (c *mConnConnection) Handshake(
ctx context.Context,
+ timeout time.Duration,
nodeInfo types.NodeInfo,
privKey crypto.PrivKey,
) (types.NodeInfo, crypto.PubKey, error) {
@@ -283,6 +285,12 @@ func (c *mConnConnection) Handshake(
peerKey crypto.PubKey
errCh = make(chan error, 1)
)
+ handshakeCtx := ctx
+ if timeout > 0 {
+ var cancel context.CancelFunc
+ handshakeCtx, cancel = context.WithTimeout(ctx, timeout)
+ defer cancel()
+ }
// To handle context cancellation, we need to do the handshake in a
// goroutine and abort the blocking network calls by closing the connection
// when the context is canceled.
@@ -295,25 +303,29 @@ func (c *mConnConnection) Handshake(
}
}()
var err error
- mconn, peerInfo, peerKey, err = c.handshake(ctx, nodeInfo, privKey)
+ mconn, peerInfo, peerKey, err = c.handshake(handshakeCtx, nodeInfo, privKey)
select {
case errCh <- err:
- case <-ctx.Done():
+ case <-handshakeCtx.Done():
}
}()
select {
- case <-ctx.Done():
+ case <-handshakeCtx.Done():
_ = c.Close()
- return types.NodeInfo{}, nil, ctx.Err()
+ return types.NodeInfo{}, nil, handshakeCtx.Err()
case err := <-errCh:
if err != nil {
return types.NodeInfo{}, nil, err
}
c.mconn = mconn
+ // Start must not use the handshakeCtx. The handshakeCtx may have a
+ // timeout set that is intended to terminate only the handshake procedure.
+ // The context passed to Start controls the entire lifecycle of the
+ // mconn.
if err = c.mconn.Start(ctx); err != nil {
return types.NodeInfo{}, nil, err
}
diff --git a/internal/p2p/transport_memory.go b/internal/p2p/transport_memory.go
index 3eb4c5b51..c321bc174 100644
--- a/internal/p2p/transport_memory.go
+++ b/internal/p2p/transport_memory.go
@@ -7,6 +7,7 @@ import (
"io"
"net"
"sync"
+ "time"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/libs/log"
@@ -273,9 +274,16 @@ func (c *MemoryConnection) RemoteEndpoint() Endpoint {
// Handshake implements Connection.
func (c *MemoryConnection) Handshake(
ctx context.Context,
+ timeout time.Duration,
nodeInfo types.NodeInfo,
privKey crypto.PrivKey,
) (types.NodeInfo, crypto.PubKey, error) {
+ if timeout > 0 {
+ var cancel context.CancelFunc
+ ctx, cancel = context.WithTimeout(ctx, timeout)
+ defer cancel()
+ }
+
select {
case c.sendCh <- memoryMessage{nodeInfo: &nodeInfo, pubKey: privKey.PubKey()}:
c.logger.Debug("sent handshake", "nodeInfo", nodeInfo)
diff --git a/internal/p2p/transport_test.go b/internal/p2p/transport_test.go
index b4edf9bc9..d58c23955 100644
--- a/internal/p2p/transport_test.go
+++ b/internal/p2p/transport_test.go
@@ -296,7 +296,7 @@ func TestConnection_Handshake(t *testing.T) {
errCh := make(chan error, 1)
go func() {
// Must use assert due to goroutine.
- peerInfo, peerKey, err := ba.Handshake(ctx, bInfo, bKey)
+ peerInfo, peerKey, err := ba.Handshake(ctx, 0, bInfo, bKey)
if err == nil {
assert.Equal(t, aInfo, peerInfo)
assert.Equal(t, aKey.PubKey(), peerKey)
@@ -307,7 +307,7 @@ func TestConnection_Handshake(t *testing.T) {
}
}()
- peerInfo, peerKey, err := ab.Handshake(ctx, aInfo, aKey)
+ peerInfo, peerKey, err := ab.Handshake(ctx, 0, aInfo, aKey)
require.NoError(t, err)
require.Equal(t, bInfo, peerInfo)
require.Equal(t, bKey.PubKey(), peerKey)
@@ -328,7 +328,7 @@ func TestConnection_HandshakeCancel(t *testing.T) {
ab, ba := dialAccept(ctx, t, a, b)
timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Minute)
cancel()
- _, _, err := ab.Handshake(timeoutCtx, types.NodeInfo{}, ed25519.GenPrivKey())
+ _, _, err := ab.Handshake(timeoutCtx, 0, types.NodeInfo{}, ed25519.GenPrivKey())
require.Error(t, err)
require.Equal(t, context.Canceled, err)
_ = ab.Close()
@@ -338,7 +338,7 @@ func TestConnection_HandshakeCancel(t *testing.T) {
ab, ba = dialAccept(ctx, t, a, b)
timeoutCtx, cancel = context.WithTimeout(ctx, 200*time.Millisecond)
defer cancel()
- _, _, err = ab.Handshake(timeoutCtx, types.NodeInfo{}, ed25519.GenPrivKey())
+ _, _, err = ab.Handshake(timeoutCtx, 0, types.NodeInfo{}, ed25519.GenPrivKey())
require.Error(t, err)
require.Equal(t, context.DeadlineExceeded, err)
_ = ab.Close()
@@ -642,13 +642,13 @@ func dialAcceptHandshake(ctx context.Context, t *testing.T, a, b p2p.Transport)
go func() {
privKey := ed25519.GenPrivKey()
nodeInfo := types.NodeInfo{NodeID: types.NodeIDFromPubKey(privKey.PubKey())}
- _, _, err := ba.Handshake(ctx, nodeInfo, privKey)
+ _, _, err := ba.Handshake(ctx, 0, nodeInfo, privKey)
errCh <- err
}()
privKey := ed25519.GenPrivKey()
nodeInfo := types.NodeInfo{NodeID: types.NodeIDFromPubKey(privKey.PubKey())}
- _, _, err := ab.Handshake(ctx, nodeInfo, privKey)
+ _, _, err := ab.Handshake(ctx, 0, nodeInfo, privKey)
require.NoError(t, err)
timer := time.NewTimer(2 * time.Second)
diff --git a/internal/rpc/core/env.go b/internal/rpc/core/env.go
index 124525f26..f1ba58ee3 100644
--- a/internal/rpc/core/env.go
+++ b/internal/rpc/core/env.go
@@ -18,6 +18,7 @@ import (
"github.com/tendermint/tendermint/internal/consensus"
"github.com/tendermint/tendermint/internal/eventbus"
"github.com/tendermint/tendermint/internal/eventlog"
+ "github.com/tendermint/tendermint/internal/libs/strings"
"github.com/tendermint/tendermint/internal/mempool"
"github.com/tendermint/tendermint/internal/p2p"
tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
@@ -26,7 +27,6 @@ import (
"github.com/tendermint/tendermint/internal/state/indexer"
"github.com/tendermint/tendermint/internal/statesync"
"github.com/tendermint/tendermint/libs/log"
- "github.com/tendermint/tendermint/libs/strings"
"github.com/tendermint/tendermint/rpc/coretypes"
rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
"github.com/tendermint/tendermint/types"
diff --git a/internal/state/execution.go b/internal/state/execution.go
index 2710478e6..2638a67c6 100644
--- a/internal/state/execution.go
+++ b/internal/state/execution.go
@@ -105,14 +105,14 @@ func (blockExec *BlockExecutor) CreateProposalBlock(
rpp, err := blockExec.appClient.PrepareProposal(
ctx,
&abci.RequestPrepareProposal{
- MaxTxBytes: maxDataBytes,
- Txs: block.Txs.ToSliceOfBytes(),
- LocalLastCommit: buildExtendedCommitInfo(lastExtCommit, blockExec.store, state.InitialHeight, state.ConsensusParams.ABCI),
- ByzantineValidators: block.Evidence.ToABCI(),
- Height: block.Height,
- Time: block.Time,
- NextValidatorsHash: block.NextValidatorsHash,
- ProposerAddress: block.ProposerAddress,
+ MaxTxBytes: maxDataBytes,
+ Txs: block.Txs.ToSliceOfBytes(),
+ LocalLastCommit: buildExtendedCommitInfo(lastExtCommit, blockExec.store, state.InitialHeight, state.ConsensusParams.ABCI),
+ Misbehavior: block.Evidence.ToABCI(),
+ Height: block.Height,
+ Time: block.Time,
+ NextValidatorsHash: block.NextValidatorsHash,
+ ProposerAddress: block.ProposerAddress,
},
)
if err != nil {
@@ -147,14 +147,14 @@ func (blockExec *BlockExecutor) ProcessProposal(
state State,
) (bool, error) {
resp, err := blockExec.appClient.ProcessProposal(ctx, &abci.RequestProcessProposal{
- Hash: block.Header.Hash(),
- Height: block.Header.Height,
- Time: block.Header.Time,
- Txs: block.Data.Txs.ToSliceOfBytes(),
- ProposedLastCommit: buildLastCommitInfo(block, blockExec.store, state.InitialHeight),
- ByzantineValidators: block.Evidence.ToABCI(),
- ProposerAddress: block.ProposerAddress,
- NextValidatorsHash: block.NextValidatorsHash,
+ Hash: block.Header.Hash(),
+ Height: block.Header.Height,
+ Time: block.Header.Time,
+ Txs: block.Data.Txs.ToSliceOfBytes(),
+ ProposedLastCommit: buildLastCommitInfo(block, blockExec.store, state.InitialHeight),
+ Misbehavior: block.Evidence.ToABCI(),
+ ProposerAddress: block.ProposerAddress,
+ NextValidatorsHash: block.NextValidatorsHash,
})
if err != nil {
return false, ErrInvalidBlock(err)
@@ -208,14 +208,14 @@ func (blockExec *BlockExecutor) ApplyBlock(
fBlockRes, err := blockExec.appClient.FinalizeBlock(
ctx,
&abci.RequestFinalizeBlock{
- Hash: block.Hash(),
- Height: block.Header.Height,
- Time: block.Header.Time,
- Txs: block.Txs.ToSliceOfBytes(),
- DecidedLastCommit: buildLastCommitInfo(block, blockExec.store, state.InitialHeight),
- ByzantineValidators: block.Evidence.ToABCI(),
- ProposerAddress: block.ProposerAddress,
- NextValidatorsHash: block.NextValidatorsHash,
+ Hash: block.Hash(),
+ Height: block.Header.Height,
+ Time: block.Header.Time,
+ Txs: block.Txs.ToSliceOfBytes(),
+ DecidedLastCommit: buildLastCommitInfo(block, blockExec.store, state.InitialHeight),
+ Misbehavior: block.Evidence.ToABCI(),
+ ProposerAddress: block.ProposerAddress,
+ NextValidatorsHash: block.NextValidatorsHash,
},
)
endTime := time.Now().UnixNano()
@@ -677,12 +677,12 @@ func ExecCommitBlock(
finalizeBlockResponse, err := appConn.FinalizeBlock(
ctx,
&abci.RequestFinalizeBlock{
- Hash: block.Hash(),
- Height: block.Height,
- Time: block.Time,
- Txs: block.Txs.ToSliceOfBytes(),
- DecidedLastCommit: buildLastCommitInfo(block, store, initialHeight),
- ByzantineValidators: block.Evidence.ToABCI(),
+ Hash: block.Hash(),
+ Height: block.Height,
+ Time: block.Time,
+ Txs: block.Txs.ToSliceOfBytes(),
+ DecidedLastCommit: buildLastCommitInfo(block, store, initialHeight),
+ Misbehavior: block.Evidence.ToABCI(),
},
)
diff --git a/internal/state/execution_test.go b/internal/state/execution_test.go
index 79557b787..93b0d1cfb 100644
--- a/internal/state/execution_test.go
+++ b/internal/state/execution_test.go
@@ -158,8 +158,8 @@ func TestFinalizeBlockDecidedLastCommit(t *testing.T) {
}
}
-// TestFinalizeBlockByzantineValidators ensures we send byzantine validators list.
-func TestFinalizeBlockByzantineValidators(t *testing.T) {
+// TestFinalizeBlockMisbehavior ensures we send misbehavior list.
+func TestFinalizeBlockMisbehavior(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -274,7 +274,7 @@ func TestFinalizeBlockByzantineValidators(t *testing.T) {
require.NoError(t, err)
// TODO check state and mempool
- assert.Equal(t, abciMb, app.ByzantineValidators)
+ assert.Equal(t, abciMb, app.Misbehavior)
}
func TestProcessProposal(t *testing.T) {
@@ -338,11 +338,11 @@ func TestProcessProposal(t *testing.T) {
block1.Txs = txs
expectedRpp := &abci.RequestProcessProposal{
- Txs: block1.Txs.ToSliceOfBytes(),
- Hash: block1.Hash(),
- Height: block1.Header.Height,
- Time: block1.Header.Time,
- ByzantineValidators: block1.Evidence.ToABCI(),
+ Txs: block1.Txs.ToSliceOfBytes(),
+ Hash: block1.Hash(),
+ Height: block1.Header.Height,
+ Time: block1.Header.Time,
+ Misbehavior: block1.Evidence.ToABCI(),
ProposedLastCommit: abci.CommitInfo{
Round: 0,
Votes: voteInfos,
diff --git a/internal/state/helpers_test.go b/internal/state/helpers_test.go
index 354a2874f..bfdc8b1f5 100644
--- a/internal/state/helpers_test.go
+++ b/internal/state/helpers_test.go
@@ -266,9 +266,9 @@ func makeRandomStateFromConsensusParams(
type testApp struct {
abci.BaseApplication
- CommitVotes []abci.VoteInfo
- ByzantineValidators []abci.Misbehavior
- ValidatorUpdates []abci.ValidatorUpdate
+ CommitVotes []abci.VoteInfo
+ Misbehavior []abci.Misbehavior
+ ValidatorUpdates []abci.ValidatorUpdate
}
var _ abci.Application = (*testApp)(nil)
@@ -279,7 +279,7 @@ func (app *testApp) Info(_ context.Context, req *abci.RequestInfo) (*abci.Respon
func (app *testApp) FinalizeBlock(_ context.Context, req *abci.RequestFinalizeBlock) (*abci.ResponseFinalizeBlock, error) {
app.CommitVotes = req.DecidedLastCommit.Votes
- app.ByzantineValidators = req.ByzantineValidators
+ app.Misbehavior = req.Misbehavior
resTxs := make([]*abci.ExecTxResult, len(req.Txs))
for i, tx := range req.Txs {
diff --git a/internal/state/indexer/indexer_service.go b/internal/state/indexer/indexer_service.go
index e73e4a3ba..d6db82806 100644
--- a/internal/state/indexer/indexer_service.go
+++ b/internal/state/indexer/indexer_service.go
@@ -4,6 +4,7 @@ import (
"context"
"time"
+ abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/internal/eventbus"
"github.com/tendermint/tendermint/internal/pubsub"
"github.com/tendermint/tendermint/libs/log"
@@ -96,7 +97,14 @@ func (is *Service) publish(msg pubsub.Message) error {
if curr.Size() != 0 {
start := time.Now()
- err := sink.IndexTxEvents(curr.Ops)
+
+ var err error
+ curr.Ops, err = DeduplicateBatch(curr.Ops, sink)
+ if err != nil {
+ is.logger.Error("failed to deduplicate batch", "height", is.currentBlock.height, "error", err)
+ }
+
+ err = sink.IndexTxEvents(curr.Ops)
if err != nil {
is.logger.Error("failed to index block txs",
"height", is.currentBlock.height, "err", err)
@@ -169,3 +177,45 @@ func IndexingEnabled(sinks []EventSink) bool {
return false
}
+
+// DeduplicateBatch consider the case of duplicate txs.
+// if the current one under investigation is NOT OK, then we need to check
+// whether there's a previously indexed tx.
+// SKIP the current tx if the previously indexed record is found and successful.
+func DeduplicateBatch(ops []*abci.TxResult, sink EventSink) ([]*abci.TxResult, error) {
+ result := make([]*abci.TxResult, 0, len(ops))
+
+ // keep track of successful txs in this block in order to suppress latter ones being indexed.
+ var successfulTxsInThisBlock = make(map[string]struct{})
+
+ for _, txResult := range ops {
+ hash := types.Tx(txResult.Tx).Hash()
+
+ if txResult.Result.IsOK() {
+ successfulTxsInThisBlock[string(hash)] = struct{}{}
+ } else {
+ // if it already appeared in current block and was successful, skip.
+ if _, found := successfulTxsInThisBlock[string(hash)]; found {
+ continue
+ }
+
+ // check if this tx hash is already indexed
+ old, err := sink.GetTxByHash(hash)
+
+ // if db op errored
+ // Not found is not an error
+ if err != nil {
+ return nil, err
+ }
+
+ // if it's already indexed in an older block and was successful, skip.
+ if old != nil && old.Result.Code == abci.CodeTypeOK {
+ continue
+ }
+ }
+
+ result = append(result, txResult)
+ }
+
+ return result, nil
+}
diff --git a/internal/state/indexer/indexer_service_test.go b/internal/state/indexer/indexer_service_test.go
index 6126ae259..6dc1bdf50 100644
--- a/internal/state/indexer/indexer_service_test.go
+++ b/internal/state/indexer/indexer_service_test.go
@@ -109,6 +109,165 @@ func TestIndexerServiceIndexesBlocks(t *testing.T) {
assert.Nil(t, teardown(t, pool))
}
+func TestTxIndexDuplicatedTx(t *testing.T) {
+ var mockTx = types.Tx("MOCK_TX_HASH")
+
+ testCases := []struct {
+ name string
+ tx1 abci.TxResult
+ tx2 abci.TxResult
+ expSkip bool // do we expect the second tx to be skipped by tx indexer
+ }{
+ {"skip, previously successful",
+ abci.TxResult{
+ Height: 1,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK,
+ },
+ },
+ abci.TxResult{
+ Height: 2,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK + 1,
+ },
+ },
+ true,
+ },
+ {"not skip, previously unsuccessful",
+ abci.TxResult{
+ Height: 1,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK + 1,
+ },
+ },
+ abci.TxResult{
+ Height: 2,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK + 1,
+ },
+ },
+ false,
+ },
+ {"not skip, both successful",
+ abci.TxResult{
+ Height: 1,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK,
+ },
+ },
+ abci.TxResult{
+ Height: 2,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK,
+ },
+ },
+ false,
+ },
+ {"not skip, both unsuccessful",
+ abci.TxResult{
+ Height: 1,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK + 1,
+ },
+ },
+ abci.TxResult{
+ Height: 2,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK + 1,
+ },
+ },
+ false,
+ },
+ {"skip, same block, previously successful",
+ abci.TxResult{
+ Height: 1,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK,
+ },
+ },
+ abci.TxResult{
+ Height: 1,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK + 1,
+ },
+ },
+ true,
+ },
+ {"not skip, same block, previously unsuccessful",
+ abci.TxResult{
+ Height: 1,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK + 1,
+ },
+ },
+ abci.TxResult{
+ Height: 1,
+ Index: 0,
+ Tx: mockTx,
+ Result: abci.ExecTxResult{
+ Code: abci.CodeTypeOK,
+ },
+ },
+ false,
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ sink := kv.NewEventSink(dbm.NewMemDB())
+
+ if tc.tx1.Height != tc.tx2.Height {
+ // index the first tx
+ err := sink.IndexTxEvents([]*abci.TxResult{&tc.tx1})
+ require.NoError(t, err)
+
+ // check if the second one should be skipped.
+ ops, err := indexer.DeduplicateBatch([]*abci.TxResult{&tc.tx2}, sink)
+ require.NoError(t, err)
+
+ if tc.expSkip {
+ require.Empty(t, ops)
+ } else {
+ require.Equal(t, []*abci.TxResult{&tc.tx2}, ops)
+ }
+ } else {
+ // same block
+ ops := []*abci.TxResult{&tc.tx1, &tc.tx2}
+ ops, err := indexer.DeduplicateBatch(ops, sink)
+ require.NoError(t, err)
+ if tc.expSkip {
+ // the second one is skipped
+ require.Equal(t, []*abci.TxResult{&tc.tx1}, ops)
+ } else {
+ require.Equal(t, []*abci.TxResult{&tc.tx1, &tc.tx2}, ops)
+ }
+ }
+ })
+ }
+}
+
func readSchema() ([]*schema.Migration, error) {
filename := "./sink/psql/schema.sql"
contents, err := os.ReadFile(filename)
diff --git a/internal/state/indexer/sink/psql/psql.go b/internal/state/indexer/sink/psql/psql.go
index c06383264..57f5e5c3d 100644
--- a/internal/state/indexer/sink/psql/psql.go
+++ b/internal/state/indexer/sink/psql/psql.go
@@ -9,8 +9,7 @@ import (
"strings"
"time"
- "github.com/gogo/protobuf/proto"
-
+ "github.com/gogo/protobuf/jsonpb"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/internal/pubsub/query"
"github.com/tendermint/tendermint/internal/state/indexer"
@@ -177,12 +176,16 @@ INSERT INTO `+tableBlocks+` (height, chain_id, created_at)
})
}
+var (
+ jsonpbMarshaller = jsonpb.Marshaler{}
+)
+
func (es *EventSink) IndexTxEvents(txrs []*abci.TxResult) error {
ts := time.Now().UTC()
for _, txr := range txrs {
// Encode the result message in protobuf wire format for indexing.
- resultData, err := proto.Marshal(txr)
+ resultData, err := jsonpbMarshaller.MarshalToString(txr)
if err != nil {
return fmt.Errorf("marshaling tx_result: %w", err)
}
diff --git a/internal/state/indexer/sink/psql/psql_test.go b/internal/state/indexer/sink/psql/psql_test.go
index 72d14b5d8..2625d7245 100644
--- a/internal/state/indexer/sink/psql/psql_test.go
+++ b/internal/state/indexer/sink/psql/psql_test.go
@@ -1,6 +1,7 @@
package psql
import (
+ "bytes"
"context"
"database/sql"
"flag"
@@ -12,7 +13,7 @@ import (
"time"
"github.com/adlio/schema"
- "github.com/gogo/protobuf/proto"
+ "github.com/gogo/protobuf/jsonpb"
"github.com/ory/dockertest"
"github.com/ory/dockertest/docker"
"github.com/stretchr/testify/assert"
@@ -151,6 +152,8 @@ func TestType(t *testing.T) {
assert.Equal(t, indexer.PSQL, psqlSink.Type())
}
+var jsonpbUnmarshaller = jsonpb.Unmarshaler{}
+
func TestIndexing(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -278,13 +281,14 @@ func loadTxResult(hash []byte) (*abci.TxResult, error) {
hashString := fmt.Sprintf("%X", hash)
var resultData []byte
if err := testDB().QueryRow(`
-SELECT tx_result FROM `+tableTxResults+` WHERE tx_hash = $1;
-`, hashString).Scan(&resultData); err != nil {
+ SELECT tx_result FROM `+tableTxResults+` WHERE tx_hash = $1;
+ `, hashString).Scan(&resultData); err != nil {
return nil, fmt.Errorf("lookup transaction for hash %q failed: %v", hashString, err)
}
+ reader := bytes.NewBuffer(resultData)
txr := new(abci.TxResult)
- if err := proto.Unmarshal(resultData, txr); err != nil {
+ if err := jsonpbUnmarshaller.Unmarshal(reader, txr); err != nil {
return nil, fmt.Errorf("unmarshaling txr: %w", err)
}
diff --git a/internal/statesync/dispatcher.go b/internal/statesync/dispatcher.go
index 9cdb34978..e7ad73148 100644
--- a/internal/statesync/dispatcher.go
+++ b/internal/statesync/dispatcher.go
@@ -26,14 +26,14 @@ var (
// NOTE: It is not the responsibility of the dispatcher to verify the light blocks.
type Dispatcher struct {
// the channel with which to send light block requests on
- requestCh *p2p.Channel
+ requestCh p2p.Channel
mtx sync.Mutex
// all pending calls that have been dispatched and are awaiting an answer
calls map[types.NodeID]chan *types.LightBlock
}
-func NewDispatcher(requestChannel *p2p.Channel) *Dispatcher {
+func NewDispatcher(requestChannel p2p.Channel) *Dispatcher {
return &Dispatcher{
requestCh: requestChannel,
calls: make(map[types.NodeID]chan *types.LightBlock),
diff --git a/internal/statesync/dispatcher_test.go b/internal/statesync/dispatcher_test.go
index 3224ddf04..64f976ec6 100644
--- a/internal/statesync/dispatcher_test.go
+++ b/internal/statesync/dispatcher_test.go
@@ -24,13 +24,13 @@ type channelInternal struct {
Error chan p2p.PeerError
}
-func testChannel(size int) (*channelInternal, *p2p.Channel) {
+func testChannel(size int) (*channelInternal, p2p.Channel) {
in := &channelInternal{
In: make(chan p2p.Envelope, size),
Out: make(chan p2p.Envelope, size),
Error: make(chan p2p.PeerError, size),
}
- return in, p2p.NewChannel(0, in.In, in.Out, in.Error)
+ return in, p2p.NewChannel(0, "test", in.In, in.Out, in.Error)
}
func TestDispatcherBasic(t *testing.T) {
diff --git a/internal/statesync/reactor.go b/internal/statesync/reactor.go
index f4d72d017..deed8d0d3 100644
--- a/internal/statesync/reactor.go
+++ b/internal/statesync/reactor.go
@@ -305,7 +305,7 @@ func (r *Reactor) OnStart(ctx context.Context) error {
return nil
}
- go r.processChannels(ctx, map[p2p.ChannelID]*p2p.Channel{
+ go r.processChannels(ctx, map[p2p.ChannelID]p2p.Channel{
SnapshotChannel: snapshotCh,
ChunkChannel: chunkCh,
LightBlockChannel: blockCh,
@@ -611,7 +611,7 @@ func (r *Reactor) backfill(
// handleSnapshotMessage handles envelopes sent from peers on the
// SnapshotChannel. It returns an error only if the Envelope.Message is unknown
// for this channel. This should never be called outside of handleMessage.
-func (r *Reactor) handleSnapshotMessage(ctx context.Context, envelope *p2p.Envelope, snapshotCh *p2p.Channel) error {
+func (r *Reactor) handleSnapshotMessage(ctx context.Context, envelope *p2p.Envelope, snapshotCh p2p.Channel) error {
logger := r.logger.With("peer", envelope.From)
switch msg := envelope.Message.(type) {
@@ -683,7 +683,7 @@ func (r *Reactor) handleSnapshotMessage(ctx context.Context, envelope *p2p.Envel
// handleChunkMessage handles envelopes sent from peers on the ChunkChannel.
// It returns an error only if the Envelope.Message is unknown for this channel.
// This should never be called outside of handleMessage.
-func (r *Reactor) handleChunkMessage(ctx context.Context, envelope *p2p.Envelope, chunkCh *p2p.Channel) error {
+func (r *Reactor) handleChunkMessage(ctx context.Context, envelope *p2p.Envelope, chunkCh p2p.Channel) error {
switch msg := envelope.Message.(type) {
case *ssproto.ChunkRequest:
r.logger.Debug(
@@ -772,7 +772,7 @@ func (r *Reactor) handleChunkMessage(ctx context.Context, envelope *p2p.Envelope
return nil
}
-func (r *Reactor) handleLightBlockMessage(ctx context.Context, envelope *p2p.Envelope, blockCh *p2p.Channel) error {
+func (r *Reactor) handleLightBlockMessage(ctx context.Context, envelope *p2p.Envelope, blockCh p2p.Channel) error {
switch msg := envelope.Message.(type) {
case *ssproto.LightBlockRequest:
r.logger.Info("received light block request", "height", msg.Height)
@@ -829,7 +829,7 @@ func (r *Reactor) handleLightBlockMessage(ctx context.Context, envelope *p2p.Env
return nil
}
-func (r *Reactor) handleParamsMessage(ctx context.Context, envelope *p2p.Envelope, paramsCh *p2p.Channel) error {
+func (r *Reactor) handleParamsMessage(ctx context.Context, envelope *p2p.Envelope, paramsCh p2p.Channel) error {
switch msg := envelope.Message.(type) {
case *ssproto.ParamsRequest:
r.logger.Debug("received consensus params request", "height", msg.Height)
@@ -878,7 +878,7 @@ func (r *Reactor) handleParamsMessage(ctx context.Context, envelope *p2p.Envelop
// handleMessage handles an Envelope sent from a peer on a specific p2p Channel.
// It will handle errors and any possible panics gracefully. A caller can handle
// any error returned by sending a PeerError on the respective channel.
-func (r *Reactor) handleMessage(ctx context.Context, envelope *p2p.Envelope, chans map[p2p.ChannelID]*p2p.Channel) (err error) {
+func (r *Reactor) handleMessage(ctx context.Context, envelope *p2p.Envelope, chans map[p2p.ChannelID]p2p.Channel) (err error) {
defer func() {
if e := recover(); e != nil {
err = fmt.Errorf("panic in processing message: %v", e)
@@ -912,12 +912,12 @@ func (r *Reactor) handleMessage(ctx context.Context, envelope *p2p.Envelope, cha
// encountered during message execution will result in a PeerError being sent on
// the respective channel. When the reactor is stopped, we will catch the signal
// and close the p2p Channel gracefully.
-func (r *Reactor) processChannels(ctx context.Context, chanTable map[p2p.ChannelID]*p2p.Channel) {
- // make sure that the iterator gets cleaned up in case of error
+func (r *Reactor) processChannels(ctx context.Context, chanTable map[p2p.ChannelID]p2p.Channel) {
+ // make sure tht the iterator gets cleaned up in case of error
ctx, cancel := context.WithCancel(ctx)
defer cancel()
- chs := make([]*p2p.Channel, 0, len(chanTable))
+ chs := make([]p2p.Channel, 0, len(chanTable))
for key := range chanTable {
chs = append(chs, chanTable[key])
}
diff --git a/internal/statesync/reactor_test.go b/internal/statesync/reactor_test.go
index f57e228a7..b81c1ac2c 100644
--- a/internal/statesync/reactor_test.go
+++ b/internal/statesync/reactor_test.go
@@ -40,22 +40,22 @@ type reactorTestSuite struct {
conn *clientmocks.Client
stateProvider *mocks.StateProvider
- snapshotChannel *p2p.Channel
+ snapshotChannel p2p.Channel
snapshotInCh chan p2p.Envelope
snapshotOutCh chan p2p.Envelope
snapshotPeerErrCh chan p2p.PeerError
- chunkChannel *p2p.Channel
+ chunkChannel p2p.Channel
chunkInCh chan p2p.Envelope
chunkOutCh chan p2p.Envelope
chunkPeerErrCh chan p2p.PeerError
- blockChannel *p2p.Channel
+ blockChannel p2p.Channel
blockInCh chan p2p.Envelope
blockOutCh chan p2p.Envelope
blockPeerErrCh chan p2p.PeerError
- paramsChannel *p2p.Channel
+ paramsChannel p2p.Channel
paramsInCh chan p2p.Envelope
paramsOutCh chan p2p.Envelope
paramsPeerErrCh chan p2p.PeerError
@@ -102,6 +102,7 @@ func setup(
rts.snapshotChannel = p2p.NewChannel(
SnapshotChannel,
+ "snapshot",
rts.snapshotInCh,
rts.snapshotOutCh,
rts.snapshotPeerErrCh,
@@ -109,6 +110,7 @@ func setup(
rts.chunkChannel = p2p.NewChannel(
ChunkChannel,
+ "chunk",
rts.chunkInCh,
rts.chunkOutCh,
rts.chunkPeerErrCh,
@@ -116,6 +118,7 @@ func setup(
rts.blockChannel = p2p.NewChannel(
LightBlockChannel,
+ "lightblock",
rts.blockInCh,
rts.blockOutCh,
rts.blockPeerErrCh,
@@ -123,6 +126,7 @@ func setup(
rts.paramsChannel = p2p.NewChannel(
ParamsChannel,
+ "params",
rts.paramsInCh,
rts.paramsOutCh,
rts.paramsPeerErrCh,
@@ -133,7 +137,7 @@ func setup(
cfg := config.DefaultStateSyncConfig()
- chCreator := func(ctx context.Context, desc *p2p.ChannelDescriptor) (*p2p.Channel, error) {
+ chCreator := func(ctx context.Context, desc *p2p.ChannelDescriptor) (p2p.Channel, error) {
switch desc.ID {
case SnapshotChannel:
return rts.snapshotChannel, nil
diff --git a/internal/statesync/stateprovider.go b/internal/statesync/stateprovider.go
index a796b0b2e..a8110b71b 100644
--- a/internal/statesync/stateprovider.go
+++ b/internal/statesync/stateprovider.go
@@ -208,7 +208,7 @@ type stateProviderP2P struct {
sync.Mutex // light.Client is not concurrency-safe
lc *light.Client
initialHeight int64
- paramsSendCh *p2p.Channel
+ paramsSendCh p2p.Channel
paramsRecvCh chan types.ConsensusParams
}
@@ -220,7 +220,7 @@ func NewP2PStateProvider(
initialHeight int64,
providers []lightprovider.Provider,
trustOptions light.TrustOptions,
- paramsSendCh *p2p.Channel,
+ paramsSendCh p2p.Channel,
logger log.Logger,
) (StateProvider, error) {
if len(providers) < 2 {
diff --git a/internal/statesync/syncer.go b/internal/statesync/syncer.go
index 47e058c19..a09b55892 100644
--- a/internal/statesync/syncer.go
+++ b/internal/statesync/syncer.go
@@ -56,8 +56,8 @@ type syncer struct {
stateProvider StateProvider
conn abciclient.Client
snapshots *snapshotPool
- snapshotCh *p2p.Channel
- chunkCh *p2p.Channel
+ snapshotCh p2p.Channel
+ chunkCh p2p.Channel
tempDir string
fetchers int32
retryTimeout time.Duration
diff --git a/libs/log/default.go b/libs/log/default.go
index 706977659..557ba6551 100644
--- a/libs/log/default.go
+++ b/libs/log/default.go
@@ -61,20 +61,20 @@ func NewDefaultLogger(format, level string) (Logger, error) {
}
func (l defaultLogger) Info(msg string, keyVals ...interface{}) {
- l.Logger.Info().Fields(getLogFields(keyVals...)).Msg(msg)
+ l.Logger.Info().Fields(keyVals).Msg(msg)
}
func (l defaultLogger) Error(msg string, keyVals ...interface{}) {
- l.Logger.Error().Fields(getLogFields(keyVals...)).Msg(msg)
+ l.Logger.Error().Fields(keyVals).Msg(msg)
}
func (l defaultLogger) Debug(msg string, keyVals ...interface{}) {
- l.Logger.Debug().Fields(getLogFields(keyVals...)).Msg(msg)
+ l.Logger.Debug().Fields(keyVals).Msg(msg)
}
func (l defaultLogger) With(keyVals ...interface{}) Logger {
return &defaultLogger{
- Logger: l.Logger.With().Fields(getLogFields(keyVals...)).Logger(),
+ Logger: l.Logger.With().Fields(keyVals).Logger(),
}
}
@@ -99,16 +99,3 @@ func OverrideWithNewLogger(logger Logger, format, level string) error {
ol.Logger = nl.Logger
return nil
}
-
-func getLogFields(keyVals ...interface{}) map[string]interface{} {
- if len(keyVals)%2 != 0 {
- return nil
- }
-
- fields := make(map[string]interface{}, len(keyVals))
- for i := 0; i < len(keyVals); i += 2 {
- fields[fmt.Sprint(keyVals[i])] = keyVals[i+1]
- }
-
- return fields
-}
diff --git a/light/client.go b/light/client.go
index dfb4fccf7..f38e9d59d 100644
--- a/light/client.go
+++ b/light/client.go
@@ -1034,7 +1034,12 @@ func (c *Client) findNewPrimary(ctx context.Context, height int64, remove bool)
// process all the responses as they come in
for i := 0; i < cap(witnessResponsesC); i++ {
- response := <-witnessResponsesC
+ var response witnessResponse
+ select {
+ case response = <-witnessResponsesC:
+ case <-ctx.Done():
+ return nil, ctx.Err()
+ }
switch response.err {
// success! We have found a new primary
case nil:
@@ -1063,10 +1068,6 @@ func (c *Client) findNewPrimary(ctx context.Context, height int64, remove bool)
// return the light block that new primary responded with
return response.lb, nil
- // catch canceled contexts or deadlines
- case context.Canceled, context.DeadlineExceeded:
- return nil, response.err
-
// process benign errors by logging them only
case provider.ErrNoResponse, provider.ErrLightBlockNotFound, provider.ErrHeightTooHigh:
lastError = response.err
diff --git a/node/node.go b/node/node.go
index 1bda1f0f7..187a7a1d6 100644
--- a/node/node.go
+++ b/node/node.go
@@ -203,7 +203,7 @@ func makeNode(
}
}
- peerManager, peerCloser, err := createPeerManager(cfg, dbProvider, nodeKey.ID)
+ peerManager, peerCloser, err := createPeerManager(cfg, dbProvider, nodeKey.ID, nodeMetrics.p2p)
closers = append(closers, peerCloser)
if err != nil {
return nil, combineCloseError(
@@ -715,7 +715,9 @@ func loadStateFromDBOrGenesisDocProvider(stateStore sm.Store, genDoc *types.Gene
func getRouterConfig(conf *config.Config, appClient abciclient.Client) p2p.RouterOptions {
opts := p2p.RouterOptions{
- QueueType: conf.P2P.QueueType,
+ QueueType: conf.P2P.QueueType,
+ HandshakeTimeout: conf.P2P.HandshakeTimeout,
+ DialTimeout: conf.P2P.DialTimeout,
}
if conf.FilterPeers && appClient != nil {
diff --git a/node/seed.go b/node/seed.go
index a0b71e411..92d55230f 100644
--- a/node/seed.go
+++ b/node/seed.go
@@ -67,7 +67,7 @@ func makeSeedNode(
// Setup Transport and Switch.
p2pMetrics := p2p.PrometheusMetrics(cfg.Instrumentation.Namespace, "chain_id", genDoc.ChainID)
- peerManager, closer, err := createPeerManager(cfg, dbProvider, nodeKey.ID)
+ peerManager, closer, err := createPeerManager(cfg, dbProvider, nodeKey.ID, p2pMetrics)
if err != nil {
return nil, combineCloseError(
fmt.Errorf("failed to create peer manager: %w", err),
diff --git a/node/setup.go b/node/setup.go
index 51a048249..38ad58518 100644
--- a/node/setup.go
+++ b/node/setup.go
@@ -17,6 +17,7 @@ import (
"github.com/tendermint/tendermint/internal/consensus"
"github.com/tendermint/tendermint/internal/eventbus"
"github.com/tendermint/tendermint/internal/evidence"
+ tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
"github.com/tendermint/tendermint/internal/mempool"
"github.com/tendermint/tendermint/internal/p2p"
"github.com/tendermint/tendermint/internal/p2p/conn"
@@ -28,7 +29,6 @@ import (
"github.com/tendermint/tendermint/libs/log"
tmnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
- tmstrings "github.com/tendermint/tendermint/libs/strings"
"github.com/tendermint/tendermint/privval"
tmgrpc "github.com/tendermint/tendermint/privval/grpc"
"github.com/tendermint/tendermint/types"
@@ -202,6 +202,7 @@ func createPeerManager(
cfg *config.Config,
dbProvider config.DBProvider,
nodeID types.NodeID,
+ metrics *p2p.Metrics,
) (*p2p.PeerManager, closer, error) {
selfAddr, err := p2p.ParseNodeAddress(nodeID.AddressString(cfg.P2P.ExternalAddress))
@@ -223,18 +224,29 @@ func createPeerManager(
maxConns = 64
}
+ var maxOutgoingConns uint16
+ switch {
+ case cfg.P2P.MaxOutgoingConnections > 0:
+ maxOutgoingConns = cfg.P2P.MaxOutgoingConnections
+ default:
+ maxOutgoingConns = maxConns / 2
+ }
+
maxUpgradeConns := uint16(4)
options := p2p.PeerManagerOptions{
- SelfAddress: selfAddr,
- MaxConnected: maxConns,
- MaxConnectedUpgrade: maxUpgradeConns,
- MaxPeers: maxUpgradeConns + 2*maxConns,
- MinRetryTime: 250 * time.Millisecond,
- MaxRetryTime: 30 * time.Minute,
- MaxRetryTimePersistent: 5 * time.Minute,
- RetryTimeJitter: 5 * time.Second,
- PrivatePeers: privatePeerIDs,
+ SelfAddress: selfAddr,
+ MaxConnected: maxConns,
+ MaxOutgoingConnections: maxOutgoingConns,
+ MaxConnectedUpgrade: maxUpgradeConns,
+ DisconnectCooldownPeriod: 2 * time.Second,
+ MaxPeers: maxUpgradeConns + 4*maxConns,
+ MinRetryTime: 250 * time.Millisecond,
+ MaxRetryTime: 30 * time.Minute,
+ MaxRetryTimePersistent: 5 * time.Minute,
+ RetryTimeJitter: 5 * time.Second,
+ PrivatePeers: privatePeerIDs,
+ Metrics: metrics,
}
peers := []p2p.NodeAddress{}
diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto
index aa9e3fcbe..7f9e57df5 100644
--- a/proto/tendermint/abci/types.proto
+++ b/proto/tendermint/abci/types.proto
@@ -109,7 +109,7 @@ message RequestPrepareProposal {
// sent to the app for possible modifications.
repeated bytes txs = 2;
ExtendedCommitInfo local_last_commit = 3 [(gogoproto.nullable) = false];
- repeated Misbehavior byzantine_validators = 4 [(gogoproto.nullable) = false];
+ repeated Misbehavior misbehavior = 4 [(gogoproto.nullable) = false];
int64 height = 5;
google.protobuf.Timestamp time = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
bytes next_validators_hash = 7;
@@ -120,7 +120,7 @@ message RequestPrepareProposal {
message RequestProcessProposal {
repeated bytes txs = 1;
CommitInfo proposed_last_commit = 2 [(gogoproto.nullable) = false];
- repeated Misbehavior byzantine_validators = 3 [(gogoproto.nullable) = false];
+ repeated Misbehavior misbehavior = 3 [(gogoproto.nullable) = false];
// hash is the merkle root hash of the fields of the proposed block.
bytes hash = 4;
int64 height = 5;
@@ -147,8 +147,8 @@ message RequestVerifyVoteExtension {
message RequestFinalizeBlock {
repeated bytes txs = 1;
CommitInfo decided_last_commit = 2 [(gogoproto.nullable) = false];
- repeated Misbehavior byzantine_validators = 3 [(gogoproto.nullable) = false];
- // hash is the merkle root hash of the fields of the proposed block.
+ repeated Misbehavior misbehavior = 3 [(gogoproto.nullable) = false];
+ // hash is the merkle root hash of the fields of the decided block.
bytes hash = 4;
int64 height = 5;
google.protobuf.Timestamp time = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
@@ -248,7 +248,7 @@ message ResponseDeliverTx {
}
message ResponseCommit {
- // reserve 1
+ reserved 1, 2;
int64 retain_height = 3;
}
diff --git a/proto/tendermint/p2p/types.pb.go b/proto/tendermint/p2p/types.pb.go
index bffa6884f..7965b668b 100644
--- a/proto/tendermint/p2p/types.pb.go
+++ b/proto/tendermint/p2p/types.pb.go
@@ -243,6 +243,7 @@ type PeerInfo struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
AddressInfo []*PeerAddressInfo `protobuf:"bytes,2,rep,name=address_info,json=addressInfo,proto3" json:"address_info,omitempty"`
LastConnected *time.Time `protobuf:"bytes,3,opt,name=last_connected,json=lastConnected,proto3,stdtime" json:"last_connected,omitempty"`
+ Inactive bool `protobuf:"varint,4,opt,name=inactive,proto3" json:"inactive,omitempty"`
}
func (m *PeerInfo) Reset() { *m = PeerInfo{} }
@@ -299,6 +300,13 @@ func (m *PeerInfo) GetLastConnected() *time.Time {
return nil
}
+func (m *PeerInfo) GetInactive() bool {
+ if m != nil {
+ return m.Inactive
+ }
+ return false
+}
+
type PeerAddressInfo struct {
Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
LastDialSuccess *time.Time `protobuf:"bytes,2,opt,name=last_dial_success,json=lastDialSuccess,proto3,stdtime" json:"last_dial_success,omitempty"`
@@ -378,46 +386,46 @@ func init() {
func init() { proto.RegisterFile("tendermint/p2p/types.proto", fileDescriptor_c8a29e659aeca578) }
var fileDescriptor_c8a29e659aeca578 = []byte{
- // 610 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x4e, 0x1b, 0x3d,
- 0x14, 0xcd, 0x24, 0x21, 0x09, 0x37, 0x84, 0xf0, 0x59, 0xe8, 0xd3, 0x10, 0xa9, 0x19, 0x14, 0x36,
- 0xac, 0x26, 0x52, 0xaa, 0x2e, 0xba, 0x64, 0x40, 0xad, 0x22, 0x55, 0x25, 0x9a, 0xa2, 0x2e, 0xda,
- 0xc5, 0x68, 0x32, 0x76, 0x82, 0xc5, 0xc4, 0xb6, 0x3c, 0x4e, 0x4b, 0xdf, 0x82, 0x37, 0xe9, 0x63,
- 0x94, 0x25, 0xcb, 0xae, 0xd2, 0x6a, 0xd8, 0xf6, 0x21, 0x2a, 0xdb, 0x33, 0x40, 0xa2, 0x2e, 0xd8,
- 0xf9, 0xdc, 0xe3, 0x73, 0xee, 0x8f, 0xad, 0x0b, 0x3d, 0x45, 0x18, 0x26, 0x72, 0x41, 0x99, 0x1a,
- 0x8a, 0x91, 0x18, 0xaa, 0x6f, 0x82, 0x64, 0xbe, 0x90, 0x5c, 0x71, 0xb4, 0xfb, 0xc8, 0xf9, 0x62,
- 0x24, 0x7a, 0xfb, 0x73, 0x3e, 0xe7, 0x86, 0x1a, 0xea, 0x93, 0xbd, 0xd5, 0xf3, 0xe6, 0x9c, 0xcf,
- 0x53, 0x32, 0x34, 0x68, 0xba, 0x9c, 0x0d, 0x15, 0x5d, 0x90, 0x4c, 0xc5, 0x0b, 0x61, 0x2f, 0x0c,
- 0x2e, 0xa0, 0x3b, 0xd1, 0x87, 0x84, 0xa7, 0x1f, 0x89, 0xcc, 0x28, 0x67, 0xe8, 0x00, 0x6a, 0x62,
- 0x24, 0x5c, 0xe7, 0xd0, 0x39, 0xae, 0x07, 0xcd, 0x7c, 0xe5, 0xd5, 0x26, 0xa3, 0x49, 0xa8, 0x63,
- 0x68, 0x1f, 0xb6, 0xa6, 0x29, 0x4f, 0xae, 0xdc, 0xaa, 0x26, 0x43, 0x0b, 0xd0, 0x1e, 0xd4, 0x62,
- 0x21, 0xdc, 0x9a, 0x89, 0xe9, 0xe3, 0xe0, 0x47, 0x15, 0x5a, 0xef, 0x39, 0x26, 0x63, 0x36, 0xe3,
- 0x68, 0x02, 0x7b, 0xa2, 0x48, 0x11, 0x7d, 0xb1, 0x39, 0x8c, 0x79, 0x7b, 0xe4, 0xf9, 0xeb, 0x4d,
- 0xf8, 0x1b, 0xa5, 0x04, 0xf5, 0xdb, 0x95, 0x57, 0x09, 0xbb, 0x62, 0xa3, 0xc2, 0x23, 0x68, 0x32,
- 0x8e, 0x49, 0x44, 0xb1, 0x29, 0x64, 0x3b, 0x80, 0x7c, 0xe5, 0x35, 0x4c, 0xc2, 0xb3, 0xb0, 0xa1,
- 0xa9, 0x31, 0x46, 0x1e, 0xb4, 0x53, 0x9a, 0x29, 0xc2, 0xa2, 0x18, 0x63, 0x69, 0xaa, 0xdb, 0x0e,
- 0xc1, 0x86, 0x4e, 0x30, 0x96, 0xc8, 0x85, 0x26, 0x23, 0xea, 0x2b, 0x97, 0x57, 0x6e, 0xdd, 0x90,
- 0x25, 0xd4, 0x4c, 0x59, 0xe8, 0x96, 0x65, 0x0a, 0x88, 0x7a, 0xd0, 0x4a, 0x2e, 0x63, 0xc6, 0x48,
- 0x9a, 0xb9, 0x8d, 0x43, 0xe7, 0x78, 0x27, 0x7c, 0xc0, 0x5a, 0xb5, 0xe0, 0x8c, 0x5e, 0x11, 0xe9,
- 0x36, 0xad, 0xaa, 0x80, 0xe8, 0x35, 0x6c, 0x71, 0x75, 0x49, 0xa4, 0xdb, 0x32, 0x6d, 0xbf, 0xd8,
- 0x6c, 0xbb, 0x1c, 0xd5, 0xb9, 0xbe, 0x54, 0x34, 0x6d, 0x15, 0x83, 0xcf, 0xd0, 0x59, 0x63, 0xd1,
- 0x01, 0xb4, 0xd4, 0x75, 0x44, 0x19, 0x26, 0xd7, 0x66, 0x8a, 0xdb, 0x61, 0x53, 0x5d, 0x8f, 0x35,
- 0x44, 0x43, 0x68, 0x4b, 0x91, 0x98, 0x76, 0x49, 0x96, 0x15, 0xa3, 0xd9, 0xcd, 0x57, 0x1e, 0x84,
- 0x93, 0xd3, 0x13, 0x1b, 0x0d, 0x41, 0x8a, 0xa4, 0x38, 0x0f, 0xbe, 0x3b, 0xd0, 0x9a, 0x10, 0x22,
- 0xcd, 0x33, 0xfd, 0x0f, 0x55, 0x8a, 0xad, 0x65, 0xd0, 0xc8, 0x57, 0x5e, 0x75, 0x7c, 0x16, 0x56,
- 0x29, 0x46, 0x01, 0xec, 0x14, 0x8e, 0x11, 0x65, 0x33, 0xee, 0x56, 0x0f, 0x6b, 0xff, 0x7c, 0x3a,
- 0x42, 0x64, 0xe1, 0xab, 0xed, 0xc2, 0x76, 0xfc, 0x08, 0xd0, 0x5b, 0xd8, 0x4d, 0xe3, 0x4c, 0x45,
- 0x09, 0x67, 0x8c, 0x24, 0x8a, 0x60, 0xf3, 0x1c, 0xed, 0x51, 0xcf, 0xb7, 0xff, 0xd3, 0x2f, 0xff,
- 0xa7, 0x7f, 0x51, 0xfe, 0xcf, 0xa0, 0x7e, 0xf3, 0xcb, 0x73, 0xc2, 0x8e, 0xd6, 0x9d, 0x96, 0xb2,
- 0xc1, 0x1f, 0x07, 0xba, 0x1b, 0x99, 0xf4, 0xdc, 0xcb, 0x96, 0x8b, 0x81, 0x14, 0x10, 0xbd, 0x83,
- 0xff, 0x4c, 0x5a, 0x4c, 0xe3, 0x34, 0xca, 0x96, 0x49, 0x52, 0x8e, 0xe5, 0x39, 0x99, 0xbb, 0x5a,
- 0x7a, 0x46, 0xe3, 0xf4, 0x83, 0x15, 0xae, 0xbb, 0xcd, 0x62, 0x9a, 0x2e, 0x25, 0x79, 0x76, 0x1f,
- 0x0f, 0x6e, 0x6f, 0xac, 0x10, 0x1d, 0x41, 0xe7, 0xa9, 0x51, 0x66, 0xfe, 0x60, 0x27, 0xdc, 0xc1,
- 0x8f, 0x77, 0xb2, 0xe0, 0xfc, 0x36, 0xef, 0x3b, 0x77, 0x79, 0xdf, 0xf9, 0x9d, 0xf7, 0x9d, 0x9b,
- 0xfb, 0x7e, 0xe5, 0xee, 0xbe, 0x5f, 0xf9, 0x79, 0xdf, 0xaf, 0x7c, 0x7a, 0x35, 0xa7, 0xea, 0x72,
- 0x39, 0xf5, 0x13, 0xbe, 0x18, 0x3e, 0xd9, 0x12, 0x4f, 0x17, 0x86, 0xd9, 0x05, 0xeb, 0x1b, 0x64,
- 0xda, 0x30, 0xd1, 0x97, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0b, 0xe9, 0x56, 0xd3, 0x5a, 0x04,
- 0x00, 0x00,
+ // 621 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x41, 0x4f, 0xdb, 0x30,
+ 0x14, 0x6e, 0xda, 0xd2, 0x96, 0x57, 0x4a, 0x99, 0x85, 0xa6, 0x50, 0x69, 0x0d, 0x2a, 0x17, 0x4e,
+ 0x89, 0xd4, 0x69, 0x87, 0x1d, 0x09, 0x68, 0x53, 0xa5, 0x69, 0x54, 0x1e, 0xda, 0x61, 0x3b, 0x44,
+ 0x69, 0xec, 0x16, 0x8b, 0xd4, 0xb6, 0x12, 0x97, 0xb1, 0x7f, 0xc1, 0xbf, 0x1a, 0xd2, 0x2e, 0x1c,
+ 0x77, 0xea, 0xa6, 0x70, 0xdd, 0x8f, 0x98, 0xec, 0x24, 0xd0, 0x56, 0x3b, 0x70, 0xf3, 0xf7, 0x9e,
+ 0xbf, 0xcf, 0xdf, 0x7b, 0xcf, 0x7a, 0xd0, 0x53, 0x94, 0x13, 0x9a, 0xcc, 0x19, 0x57, 0x9e, 0x1c,
+ 0x4a, 0x4f, 0x7d, 0x97, 0x34, 0x75, 0x65, 0x22, 0x94, 0x40, 0xbb, 0x4f, 0x39, 0x57, 0x0e, 0x65,
+ 0x6f, 0x7f, 0x26, 0x66, 0xc2, 0xa4, 0x3c, 0x7d, 0xca, 0x6f, 0xf5, 0x9c, 0x99, 0x10, 0xb3, 0x98,
+ 0x7a, 0x06, 0x4d, 0x16, 0x53, 0x4f, 0xb1, 0x39, 0x4d, 0x55, 0x38, 0x97, 0xf9, 0x85, 0xc1, 0x05,
+ 0x74, 0xc7, 0xfa, 0x10, 0x89, 0xf8, 0x33, 0x4d, 0x52, 0x26, 0x38, 0x3a, 0x80, 0x9a, 0x1c, 0x4a,
+ 0xdb, 0x3a, 0xb4, 0x8e, 0xeb, 0x7e, 0x33, 0x5b, 0x3a, 0xb5, 0xf1, 0x70, 0x8c, 0x75, 0x0c, 0xed,
+ 0xc3, 0xd6, 0x24, 0x16, 0xd1, 0x95, 0x5d, 0xd5, 0x49, 0x9c, 0x03, 0xb4, 0x07, 0xb5, 0x50, 0x4a,
+ 0xbb, 0x66, 0x62, 0xfa, 0x38, 0xf8, 0x51, 0x85, 0xd6, 0x47, 0x41, 0xe8, 0x88, 0x4f, 0x05, 0x1a,
+ 0xc3, 0x9e, 0x2c, 0x9e, 0x08, 0xae, 0xf3, 0x37, 0x8c, 0x78, 0x7b, 0xe8, 0xb8, 0xeb, 0x45, 0xb8,
+ 0x1b, 0x56, 0xfc, 0xfa, 0xdd, 0xd2, 0xa9, 0xe0, 0xae, 0xdc, 0x70, 0x78, 0x04, 0x4d, 0x2e, 0x08,
+ 0x0d, 0x18, 0x31, 0x46, 0xb6, 0x7d, 0xc8, 0x96, 0x4e, 0xc3, 0x3c, 0x78, 0x86, 0x1b, 0x3a, 0x35,
+ 0x22, 0xc8, 0x81, 0x76, 0xcc, 0x52, 0x45, 0x79, 0x10, 0x12, 0x92, 0x18, 0x77, 0xdb, 0x18, 0xf2,
+ 0xd0, 0x09, 0x21, 0x09, 0xb2, 0xa1, 0xc9, 0xa9, 0xfa, 0x26, 0x92, 0x2b, 0xbb, 0x6e, 0x92, 0x25,
+ 0xd4, 0x99, 0xd2, 0xe8, 0x56, 0x9e, 0x29, 0x20, 0xea, 0x41, 0x2b, 0xba, 0x0c, 0x39, 0xa7, 0x71,
+ 0x6a, 0x37, 0x0e, 0xad, 0xe3, 0x1d, 0xfc, 0x88, 0x35, 0x6b, 0x2e, 0x38, 0xbb, 0xa2, 0x89, 0xdd,
+ 0xcc, 0x59, 0x05, 0x44, 0x6f, 0x61, 0x4b, 0xa8, 0x4b, 0x9a, 0xd8, 0x2d, 0x53, 0xf6, 0xab, 0xcd,
+ 0xb2, 0xcb, 0x56, 0x9d, 0xeb, 0x4b, 0x45, 0xd1, 0x39, 0x63, 0xf0, 0x15, 0x3a, 0x6b, 0x59, 0x74,
+ 0x00, 0x2d, 0x75, 0x13, 0x30, 0x4e, 0xe8, 0x8d, 0xe9, 0xe2, 0x36, 0x6e, 0xaa, 0x9b, 0x91, 0x86,
+ 0xc8, 0x83, 0x76, 0x22, 0x23, 0x53, 0x2e, 0x4d, 0xd3, 0xa2, 0x35, 0xbb, 0xd9, 0xd2, 0x01, 0x3c,
+ 0x3e, 0x3d, 0xc9, 0xa3, 0x18, 0x12, 0x19, 0x15, 0xe7, 0xc1, 0x4f, 0x0b, 0x5a, 0x63, 0x4a, 0x13,
+ 0x33, 0xa6, 0x97, 0x50, 0x65, 0x24, 0x97, 0xf4, 0x1b, 0xd9, 0xd2, 0xa9, 0x8e, 0xce, 0x70, 0x95,
+ 0x11, 0xe4, 0xc3, 0x4e, 0xa1, 0x18, 0x30, 0x3e, 0x15, 0x76, 0xf5, 0xb0, 0xf6, 0xdf, 0xd1, 0x51,
+ 0x9a, 0x14, 0xba, 0x5a, 0x0e, 0xb7, 0xc3, 0x27, 0x80, 0xde, 0xc3, 0x6e, 0x1c, 0xa6, 0x2a, 0x88,
+ 0x04, 0xe7, 0x34, 0x52, 0x94, 0x98, 0x71, 0xb4, 0x87, 0x3d, 0x37, 0xff, 0x9f, 0x6e, 0xf9, 0x3f,
+ 0xdd, 0x8b, 0xf2, 0x7f, 0xfa, 0xf5, 0xdb, 0xdf, 0x8e, 0x85, 0x3b, 0x9a, 0x77, 0x5a, 0xd2, 0x74,
+ 0xff, 0x19, 0x0f, 0x23, 0xc5, 0xae, 0xa9, 0x19, 0x5a, 0x0b, 0x3f, 0xe2, 0xc1, 0x5f, 0x0b, 0xba,
+ 0x1b, 0x2e, 0xf4, 0x4c, 0xca, 0x76, 0x14, 0xcd, 0x2a, 0x20, 0xfa, 0x00, 0x2f, 0x8c, 0x25, 0xc2,
+ 0xc2, 0x38, 0x48, 0x17, 0x51, 0x54, 0xb6, 0xec, 0x39, 0xae, 0xba, 0x9a, 0x7a, 0xc6, 0xc2, 0xf8,
+ 0x53, 0x4e, 0x5c, 0x57, 0x9b, 0x86, 0x2c, 0x5e, 0x24, 0xf4, 0xd9, 0x35, 0x3e, 0xaa, 0xbd, 0xcb,
+ 0x89, 0xe8, 0x08, 0x3a, 0xab, 0x42, 0xa9, 0x29, 0xb5, 0x83, 0x77, 0xc8, 0xd3, 0x9d, 0xd4, 0x3f,
+ 0xbf, 0xcb, 0xfa, 0xd6, 0x7d, 0xd6, 0xb7, 0xfe, 0x64, 0x7d, 0xeb, 0xf6, 0xa1, 0x5f, 0xb9, 0x7f,
+ 0xe8, 0x57, 0x7e, 0x3d, 0xf4, 0x2b, 0x5f, 0xde, 0xcc, 0x98, 0xba, 0x5c, 0x4c, 0xdc, 0x48, 0xcc,
+ 0xbd, 0x95, 0x0d, 0xb2, 0xba, 0x4c, 0xcc, 0x9e, 0x58, 0xdf, 0x2e, 0x93, 0x86, 0x89, 0xbe, 0xfe,
+ 0x17, 0x00, 0x00, 0xff, 0xff, 0x42, 0xcb, 0x37, 0x26, 0x76, 0x04, 0x00, 0x00,
}
func (m *ProtocolVersion) Marshal() (dAtA []byte, err error) {
@@ -600,6 +608,16 @@ func (m *PeerInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
+ if m.Inactive {
+ i--
+ if m.Inactive {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i--
+ dAtA[i] = 0x20
+ }
if m.LastConnected != nil {
n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.LastConnected, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.LastConnected):])
if err3 != nil {
@@ -792,6 +810,9 @@ func (m *PeerInfo) Size() (n int) {
l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.LastConnected)
n += 1 + l + sovTypes(uint64(l))
}
+ if m.Inactive {
+ n += 2
+ }
return n
}
@@ -1487,6 +1508,26 @@ func (m *PeerInfo) Unmarshal(dAtA []byte) error {
return err
}
iNdEx = postIndex
+ case 4:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Inactive", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowTypes
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.Inactive = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipTypes(dAtA[iNdEx:])
diff --git a/proto/tendermint/p2p/types.proto b/proto/tendermint/p2p/types.proto
index faccd59d2..a2ed6c90f 100644
--- a/proto/tendermint/p2p/types.proto
+++ b/proto/tendermint/p2p/types.proto
@@ -32,6 +32,7 @@ message PeerInfo {
string id = 1 [(gogoproto.customname) = "ID"];
repeated PeerAddressInfo address_info = 2;
google.protobuf.Timestamp last_connected = 3 [(gogoproto.stdtime) = true];
+ bool inactive = 4;
}
message PeerAddressInfo {
diff --git a/scripts/confix/condiff/condiff.go b/scripts/condiff/condiff.go
similarity index 100%
rename from scripts/confix/condiff/condiff.go
rename to scripts/condiff/condiff.go
diff --git a/scripts/confix/confix.go b/scripts/confix/confix.go
index b24c3a778..29c5bb753 100644
--- a/scripts/confix/confix.go
+++ b/scripts/confix/confix.go
@@ -1,24 +1,17 @@
-// Program confix applies fixes to a Tendermint TOML configuration file to
-// update a file created with an older version of Tendermint to a compatible
-// format for a newer version.
+// Program confix applies changes to a Tendermint TOML configuration file, to
+// update configurations created with an older version of Tendermint to a
+// compatible format for a newer version.
package main
import (
- "bytes"
"context"
- "errors"
"flag"
"fmt"
"log"
"os"
"path/filepath"
- "github.com/creachadair/atomicfile"
- "github.com/creachadair/tomledit"
- "github.com/creachadair/tomledit/transform"
- "github.com/spf13/viper"
-
- "github.com/tendermint/tendermint/config"
+ "github.com/tendermint/tendermint/internal/libs/confix"
)
func init() {
@@ -42,6 +35,7 @@ Options:
var (
configPath = flag.String("config", "", "Config file path (required)")
outPath = flag.String("out", "", "Output file path (default stdout)")
+ doVerbose = flag.Bool("v", false, "Log changes to stderr")
)
func main() {
@@ -50,115 +44,11 @@ func main() {
log.Fatal("You must specify a non-empty -config path")
}
- doc, err := LoadConfig(*configPath)
- if err != nil {
- log.Fatalf("Loading config: %v", err)
+ ctx := context.Background()
+ if *doVerbose {
+ ctx = confix.WithLogWriter(ctx, os.Stderr)
}
-
- ctx := transform.WithLogWriter(context.Background(), os.Stderr)
- if err := ApplyFixes(ctx, doc); err != nil {
- log.Fatalf("Updating %q: %v", *configPath, err)
- }
-
- var buf bytes.Buffer
- if err := tomledit.Format(&buf, doc); err != nil {
- log.Fatalf("Formatting config: %v", err)
- }
-
- // Verify that Tendermint can parse the results after our edits.
- if err := CheckValid(buf.Bytes()); err != nil {
- log.Fatalf("Updated config is invalid: %v", err)
- }
-
- if *outPath == "" {
- os.Stdout.Write(buf.Bytes())
- } else if err := atomicfile.WriteData(*outPath, buf.Bytes(), 0600); err != nil {
- log.Fatalf("Writing output: %v", err)
+ if err := confix.Upgrade(ctx, *configPath, *outPath); err != nil {
+ log.Fatalf("Upgrading config: %v", err)
}
}
-
-// ApplyFixes transforms doc and reports whether it succeeded.
-func ApplyFixes(ctx context.Context, doc *tomledit.Document) error {
- // Check what version of Tendermint might have created this config file, as
- // a safety check for the updates we are about to make.
- tmVersion := GuessConfigVersion(doc)
- if tmVersion == vUnknown {
- return errors.New("cannot tell what Tendermint version created this config")
- } else if tmVersion < v34 || tmVersion > v36 {
- // TODO(creachadair): Add in rewrites for older versions. This will
- // require some digging to discover what the changes were. The upgrade
- // instructions do not give specifics.
- return fmt.Errorf("unable to update version %s config", tmVersion)
- }
- return plan.Apply(ctx, doc)
-}
-
-// LoadConfig loads and parses the TOML document from path.
-func LoadConfig(path string) (*tomledit.Document, error) {
- f, err := os.Open(path)
- if err != nil {
- return nil, err
- }
- defer f.Close()
- return tomledit.Parse(f)
-}
-
-const (
- vUnknown = ""
- v32 = "v0.32"
- v33 = "v0.33"
- v34 = "v0.34"
- v35 = "v0.35"
- v36 = "v0.36"
-)
-
-// GuessConfigVersion attempts to figure out which version of Tendermint
-// created the specified config document. It returns "" if the creating version
-// cannot be determined, otherwise a string of the form "vX.YY".
-func GuessConfigVersion(doc *tomledit.Document) string {
- hasDisableWS := doc.First("rpc", "experimental-disable-websocket") != nil
- hasUseLegacy := doc.First("p2p", "use-legacy") != nil // v0.35 only
- if hasDisableWS && !hasUseLegacy {
- return v36
- }
-
- hasBlockSync := transform.FindTable(doc, "blocksync") != nil // add: v0.35
- hasStateSync := transform.FindTable(doc, "statesync") != nil // add: v0.34
- if hasBlockSync && hasStateSync {
- return v35
- } else if hasStateSync {
- return v34
- }
-
- hasIndexKeys := doc.First("tx_index", "index_keys") != nil // add: v0.33
- hasIndexTags := doc.First("tx_index", "index_tags") != nil // rem: v0.33
- if hasIndexKeys && !hasIndexTags {
- return v33
- }
-
- hasFastSync := transform.FindTable(doc, "fastsync") != nil // add: v0.32
- if hasIndexTags && hasFastSync {
- return v32
- }
-
- // Something older, probably.
- return vUnknown
-}
-
-// CheckValid checks whether the specified config appears to be a valid
-// Tendermint config file. This emulates how the node loads the config.
-func CheckValid(data []byte) error {
- v := viper.New()
- v.SetConfigType("toml")
-
- if err := v.ReadConfig(bytes.NewReader(data)); err != nil {
- return fmt.Errorf("reading config: %w", err)
- }
-
- var cfg config.Config
- if err := v.Unmarshal(&cfg); err != nil {
- return fmt.Errorf("decoding config: %w", err)
- }
-
- return cfg.ValidateBasic()
-}
diff --git a/scripts/keymigrate/migrate.go b/scripts/keymigrate/migrate.go
index a0b43aef6..2c5873427 100644
--- a/scripts/keymigrate/migrate.go
+++ b/scripts/keymigrate/migrate.go
@@ -26,7 +26,7 @@ type (
migrateFunc func(keyID) (keyID, error)
)
-func getAllLegacyKeys(db dbm.DB) ([]keyID, error) {
+func getAllLegacyKeys(db dbm.DB, storeName string) ([]keyID, error) {
var out []keyID
iter, err := db.Iterator(nil, nil)
@@ -37,9 +37,16 @@ func getAllLegacyKeys(db dbm.DB) ([]keyID, error) {
for ; iter.Valid(); iter.Next() {
k := iter.Key()
- // make sure it's a key with a legacy format, and skip
- // all other keys, to make it safe to resume the migration.
- if !checkKeyType(k).isLegacy() {
+ // make sure it's a key that we'd expect to see in
+ // this database, with a legacy format, and skip all
+ // other keys, to make it safe to resume the
+ // migration.
+ kt, err := checkKeyType(k, storeName)
+ if err != nil {
+ return nil, err
+ }
+
+ if !kt.isLegacy() {
continue
}
@@ -88,73 +95,377 @@ var prefixes = []struct {
ktype keyType
check func(keyID) bool
}{
- {[]byte("consensusParamsKey:"), consensusParamsKey, nil},
- {[]byte("abciResponsesKey:"), abciResponsesKey, nil},
- {[]byte("validatorsKey:"), validatorsKey, nil},
- {[]byte("stateKey"), stateStoreKey, nil},
- {[]byte("H:"), blockMetaKey, nil},
- {[]byte("P:"), blockPartKey, nil},
- {[]byte("C:"), commitKey, nil},
- {[]byte("SC:"), seenCommitKey, nil},
- {[]byte("BH:"), blockHashKey, nil},
- {[]byte("size"), lightSizeKey, nil},
- {[]byte("lb/"), lightBlockKey, nil},
- {[]byte("\x00"), evidenceCommittedKey, checkEvidenceKey},
- {[]byte("\x01"), evidencePendingKey, checkEvidenceKey},
+ {[]byte(legacyConsensusParamsPrefix), consensusParamsKey, nil},
+ {[]byte(legacyAbciResponsePrefix), abciResponsesKey, nil},
+ {[]byte(legacyValidatorPrefix), validatorsKey, nil},
+ {[]byte(legacyStateKeyPrefix), stateStoreKey, nil},
+ {[]byte(legacyBlockMetaPrefix), blockMetaKey, nil},
+ {[]byte(legacyBlockPartPrefix), blockPartKey, nil},
+ {[]byte(legacyCommitPrefix), commitKey, nil},
+ {[]byte(legacySeenCommitPrefix), seenCommitKey, nil},
+ {[]byte(legacyBlockHashPrefix), blockHashKey, nil},
+ {[]byte(legacyLightSizePrefix), lightSizeKey, nil},
+ {[]byte(legacyLightBlockPrefix), lightBlockKey, nil},
+ {[]byte(legacyEvidenceComittedPrefix), evidenceCommittedKey, checkEvidenceKey},
+ {[]byte(legacyEvidencePendingPrefix), evidencePendingKey, checkEvidenceKey},
+}
+
+const (
+ legacyConsensusParamsPrefix = "consensusParamsKey:"
+ legacyAbciResponsePrefix = "abciResponsesKey:"
+ legacyValidatorPrefix = "validatorsKey:"
+ legacyStateKeyPrefix = "stateKey"
+ legacyBlockMetaPrefix = "H:"
+ legacyBlockPartPrefix = "P:"
+ legacyCommitPrefix = "C:"
+ legacySeenCommitPrefix = "SC:"
+ legacyBlockHashPrefix = "BH:"
+ legacyLightSizePrefix = "size"
+ legacyLightBlockPrefix = "lb/"
+ legacyEvidenceComittedPrefix = "\x00"
+ legacyEvidencePendingPrefix = "\x01"
+)
+
+type migrationDefinition struct {
+ name string
+ storeName string
+ prefix []byte
+ ktype keyType
+ check func(keyID) bool
+ transform migrateFunc
+}
+
+var migrations = []migrationDefinition{
+ {
+ name: "consensus-params",
+ storeName: "state",
+ prefix: []byte(legacyConsensusParamsPrefix),
+ ktype: consensusParamsKey,
+ transform: func(key keyID) (keyID, error) {
+ val, err := strconv.Atoi(string(key[19:]))
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(6), int64(val))
+ },
+ },
+ {
+ name: "abci-responses",
+ storeName: "state",
+ prefix: []byte(legacyAbciResponsePrefix),
+ ktype: abciResponsesKey,
+ transform: func(key keyID) (keyID, error) {
+ val, err := strconv.Atoi(string(key[17:]))
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(7), int64(val))
+ },
+ },
+ {
+ name: "validators",
+ storeName: "state",
+ prefix: []byte(legacyValidatorPrefix),
+ ktype: validatorsKey,
+ transform: func(key keyID) (keyID, error) {
+ val, err := strconv.Atoi(string(key[14:]))
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(5), int64(val))
+ },
+ },
+ {
+ name: "tendermint-state",
+ storeName: "state",
+ prefix: []byte(legacyStateKeyPrefix),
+ ktype: stateStoreKey,
+ transform: func(key keyID) (keyID, error) {
+ return orderedcode.Append(nil, int64(8))
+ },
+ },
+ {
+ name: "block-meta",
+ storeName: "blockstore",
+ prefix: []byte(legacyBlockMetaPrefix),
+ ktype: blockMetaKey,
+ transform: func(key keyID) (keyID, error) {
+ val, err := strconv.Atoi(string(key[2:]))
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(0), int64(val))
+ },
+ },
+ {
+ name: "block-part",
+ storeName: "blockstore",
+ prefix: []byte(legacyBlockPartPrefix),
+ ktype: blockPartKey,
+ transform: func(key keyID) (keyID, error) {
+ parts := bytes.Split(key[2:], []byte(":"))
+ if len(parts) != 2 {
+ return nil, fmt.Errorf("block parts key has %d rather than 2 components",
+ len(parts))
+ }
+ valOne, err := strconv.Atoi(string(parts[0]))
+ if err != nil {
+ return nil, err
+ }
+
+ valTwo, err := strconv.Atoi(string(parts[1]))
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(1), int64(valOne), int64(valTwo))
+ },
+ },
+ {
+ name: "commit",
+ storeName: "blockstore",
+ prefix: []byte(legacyCommitPrefix),
+ ktype: commitKey,
+ transform: func(key keyID) (keyID, error) {
+ val, err := strconv.Atoi(string(key[2:]))
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(2), int64(val))
+ },
+ },
+ {
+ name: "seen-commit",
+ storeName: "blockstore",
+ prefix: []byte(legacySeenCommitPrefix),
+ ktype: seenCommitKey,
+ transform: func(key keyID) (keyID, error) {
+ val, err := strconv.Atoi(string(key[3:]))
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(3), int64(val))
+ },
+ },
+ {
+ name: "block-hash",
+ storeName: "blockstore",
+ prefix: []byte(legacyBlockHashPrefix),
+ ktype: blockHashKey,
+ transform: func(key keyID) (keyID, error) {
+ hash := string(key[3:])
+ if len(hash)%2 == 1 {
+ hash = "0" + hash
+ }
+ val, err := hex.DecodeString(hash)
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(4), string(val))
+ },
+ },
+ {
+ name: "light-size",
+ storeName: "light",
+ prefix: []byte(legacyLightSizePrefix),
+ ktype: lightSizeKey,
+ transform: func(key keyID) (keyID, error) {
+ return orderedcode.Append(nil, int64(12))
+ },
+ },
+ {
+ name: "light-block",
+ storeName: "light",
+ prefix: []byte(legacyLightBlockPrefix),
+ ktype: lightBlockKey,
+ transform: func(key keyID) (keyID, error) {
+ if len(key) < 24 {
+ return nil, fmt.Errorf("light block evidence %q in invalid format", string(key))
+ }
+
+ val, err := strconv.Atoi(string(key[len(key)-20:]))
+ if err != nil {
+ return nil, err
+ }
+
+ return orderedcode.Append(nil, int64(11), int64(val))
+ },
+ },
+ {
+ name: "evidence-pending",
+ storeName: "evidence",
+ prefix: []byte(legacyEvidencePendingPrefix),
+ ktype: evidencePendingKey,
+ transform: func(key keyID) (keyID, error) {
+ return convertEvidence(key, 10)
+ },
+ },
+ {
+ name: "evidence-committed",
+ storeName: "evidence",
+ prefix: []byte(legacyEvidenceComittedPrefix),
+ ktype: evidenceCommittedKey,
+ transform: func(key keyID) (keyID, error) {
+ return convertEvidence(key, 9)
+ },
+ },
+ {
+ name: "event-tx",
+ storeName: "tx_index",
+ prefix: nil,
+ ktype: txHeightKey,
+ transform: func(key keyID) (keyID, error) {
+ parts := bytes.Split(key, []byte("/"))
+ if len(parts) != 4 {
+ return nil, fmt.Errorf("key has %d parts rather than 4", len(parts))
+ }
+ parts = parts[1:] // drop prefix
+
+ elems := make([]interface{}, 0, len(parts)+1)
+ elems = append(elems, "tx.height")
+
+ for idx, pt := range parts {
+ val, err := strconv.Atoi(string(pt))
+ if err != nil {
+ return nil, err
+ }
+ if idx == 0 {
+ elems = append(elems, fmt.Sprintf("%d", val))
+ } else {
+ elems = append(elems, int64(val))
+ }
+ }
+
+ return orderedcode.Append(nil, elems...)
+ },
+ },
+ {
+ name: "event-abci",
+ storeName: "tx_index",
+ prefix: nil,
+ ktype: abciEventKey,
+ transform: func(key keyID) (keyID, error) {
+ parts := bytes.Split(key, []byte("/"))
+
+ elems := make([]interface{}, 0, 4)
+ if len(parts) == 4 {
+ elems = append(elems, string(parts[0]), string(parts[1]))
+
+ val, err := strconv.Atoi(string(parts[2]))
+ if err != nil {
+ return nil, err
+ }
+ elems = append(elems, int64(val))
+
+ val2, err := strconv.Atoi(string(parts[3]))
+ if err != nil {
+ return nil, err
+ }
+ elems = append(elems, int64(val2))
+ } else {
+ elems = append(elems, string(parts[0]))
+ parts = parts[1:]
+
+ val, err := strconv.Atoi(string(parts[len(parts)-1]))
+ if err != nil {
+ return nil, err
+ }
+
+ val2, err := strconv.Atoi(string(parts[len(parts)-2]))
+ if err != nil {
+ return nil, err
+ }
+
+ appKey := bytes.Join(parts[:len(parts)-3], []byte("/"))
+ elems = append(elems, string(appKey), int64(val), int64(val2))
+ }
+
+ return orderedcode.Append(nil, elems...)
+ },
+ },
+ {
+ name: "event-tx-hash",
+ storeName: "tx_index",
+ prefix: nil,
+ ktype: txHashKey,
+ transform: func(key keyID) (keyID, error) {
+ return orderedcode.Append(nil, "tx.hash", string(key))
+ },
+ },
}
// checkKeyType classifies a candidate key based on its structure.
-func checkKeyType(key keyID) keyType {
- for _, p := range prefixes {
- if bytes.HasPrefix(key, p.prefix) {
- if p.check == nil || p.check(key) {
- return p.ktype
+func checkKeyType(key keyID, storeName string) (keyType, error) {
+ var migrations []migrationDefinition
+ for _, m := range migrations {
+ if m.storeName != storeName {
+ continue
+ }
+ if m.prefix == nil && storeName == "tx_index" {
+ // A legacy event key has the form:
+ //
+ // / / /
+ //
+ // Transaction hashes are stored as a raw binary hash with no prefix.
+ //
+ // Note, though, that nothing prevents event names or values from containing
+ // additional "/" separators, so the parse has to be forgiving.
+ parts := bytes.Split(key, []byte("/"))
+ if len(parts) >= 4 {
+ // Special case for tx.height.
+ if len(parts) == 4 && bytes.Equal(parts[0], []byte("tx.height")) {
+ return txHeightKey, nil
+ }
+
+ // The name cannot be empty, but we don't know where the name ends and
+ // the value begins, so insist that there be something.
+ var n int
+ for _, part := range parts[:len(parts)-2] {
+ n += len(part)
+ }
+ // Check whether the last two fields could be .../height/index.
+ if n > 0 && isDecimal(parts[len(parts)-1]) && isDecimal(parts[len(parts)-2]) {
+ return abciEventKey, nil
+ }
}
- }
- }
- // A legacy event key has the form:
- //
- // / / /
- //
- // Transaction hashes are stored as a raw binary hash with no prefix.
- //
- // Because a hash can contain any byte, it is possible (though unlikely)
- // that a hash could have the correct form for an event key, in which case
- // we would translate it incorrectly. To reduce the likelihood of an
- // incorrect interpretation, we parse candidate event keys and check for
- // some structural properties before making a decision.
- //
- // Note, though, that nothing prevents event names or values from containing
- // additional "/" separators, so the parse has to be forgiving.
- parts := bytes.Split(key, []byte("/"))
- if len(parts) >= 4 {
- // Special case for tx.height.
- if len(parts) == 4 && bytes.Equal(parts[0], []byte("tx.height")) {
- return txHeightKey
- }
-
- // The name cannot be empty, but we don't know where the name ends and
- // the value begins, so insist that there be something.
- var n int
- for _, part := range parts[:len(parts)-2] {
- n += len(part)
- }
- // Check whether the last two fields could be .../height/index.
- if n > 0 && isDecimal(parts[len(parts)-1]) && isDecimal(parts[len(parts)-2]) {
- return abciEventKey
+ // If we get here, it's not an event key. Treat it as a hash if it is the
+ // right length. Note that it IS possible this could collide with the
+ // translation of some other key (though not a hash, since encoded hashes
+ // will be longer). The chance of that is small, but there is nothing we can
+ // do to detect it.
+ if len(key) == 32 {
+ return txHashKey, nil
+ }
+ } else if bytes.HasPrefix(key, m.prefix) {
+ if m.check == nil || m.check(key) {
+ return m.ktype, nil
+ }
+ // we have an expected legacy prefix but that
+ // didn't pass the check. This probably means
+ // the evidence data is currupt (based on the
+ // defined migrations) best to error here.
+ return -1, fmt.Errorf("in store %q, key %q exists but is not a valid key of type %q", storeName, key, m.ktype)
}
+ // if we get here, the key in question is either
+ // migrated or of a different type. We can't break
+ // here because there are more than one key type in a
+ // specific database, so we have to keep iterating.
}
+ // if we've looked at every migration and not identified a key
+ // type, then the key has been migrated *or* we (possibly, but
+ // very unlikely have data that is in the wrong place or the
+ // sign of corruption.) In either case we should not attempt
+ // more migrations at this point
- // If we get here, it's not an event key. Treat it as a hash if it is the
- // right length. Note that it IS possible this could collide with the
- // translation of some other key (though not a hash, since encoded hashes
- // will be longer). The chance of that is small, but there is nothing we can
- // do to detect it.
- if len(key) == 32 {
- return txHashKey
- }
- return nonLegacyKey
+ return nonLegacyKey, nil
}
// isDecimal reports whether buf is a non-empty sequence of Unicode decimal
@@ -168,161 +479,21 @@ func isDecimal(buf []byte) bool {
return len(buf) != 0
}
-func migrateKey(key keyID) (keyID, error) {
- switch checkKeyType(key) {
- case blockMetaKey:
- val, err := strconv.Atoi(string(key[2:]))
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(0), int64(val))
- case blockPartKey:
- parts := bytes.Split(key[2:], []byte(":"))
- if len(parts) != 2 {
- return nil, fmt.Errorf("block parts key has %d rather than 2 components",
- len(parts))
- }
- valOne, err := strconv.Atoi(string(parts[0]))
- if err != nil {
- return nil, err
- }
-
- valTwo, err := strconv.Atoi(string(parts[1]))
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(1), int64(valOne), int64(valTwo))
- case commitKey:
- val, err := strconv.Atoi(string(key[2:]))
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(2), int64(val))
- case seenCommitKey:
- val, err := strconv.Atoi(string(key[3:]))
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(3), int64(val))
- case blockHashKey:
- hash := string(key[3:])
- if len(hash)%2 == 1 {
- hash = "0" + hash
- }
- val, err := hex.DecodeString(hash)
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(4), string(val))
- case validatorsKey:
- val, err := strconv.Atoi(string(key[14:]))
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(5), int64(val))
- case consensusParamsKey:
- val, err := strconv.Atoi(string(key[19:]))
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(6), int64(val))
- case abciResponsesKey:
- val, err := strconv.Atoi(string(key[17:]))
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(7), int64(val))
- case stateStoreKey:
- return orderedcode.Append(nil, int64(8))
- case evidenceCommittedKey:
- return convertEvidence(key, 9)
- case evidencePendingKey:
- return convertEvidence(key, 10)
- case lightBlockKey:
- if len(key) < 24 {
- return nil, fmt.Errorf("light block evidence %q in invalid format", string(key))
- }
-
- val, err := strconv.Atoi(string(key[len(key)-20:]))
- if err != nil {
- return nil, err
- }
-
- return orderedcode.Append(nil, int64(11), int64(val))
- case lightSizeKey:
- return orderedcode.Append(nil, int64(12))
- case txHeightKey:
- parts := bytes.Split(key, []byte("/"))
- if len(parts) != 4 {
- return nil, fmt.Errorf("key has %d parts rather than 4", len(parts))
- }
- parts = parts[1:] // drop prefix
-
- elems := make([]interface{}, 0, len(parts)+1)
- elems = append(elems, "tx.height")
-
- for idx, pt := range parts {
- val, err := strconv.Atoi(string(pt))
- if err != nil {
- return nil, err
- }
- if idx == 0 {
- elems = append(elems, fmt.Sprintf("%d", val))
- } else {
- elems = append(elems, int64(val))
- }
- }
-
- return orderedcode.Append(nil, elems...)
- case abciEventKey:
- parts := bytes.Split(key, []byte("/"))
-
- elems := make([]interface{}, 0, 4)
- if len(parts) == 4 {
- elems = append(elems, string(parts[0]), string(parts[1]))
-
- val, err := strconv.Atoi(string(parts[2]))
- if err != nil {
- return nil, err
- }
- elems = append(elems, int64(val))
-
- val2, err := strconv.Atoi(string(parts[3]))
- if err != nil {
- return nil, err
- }
- elems = append(elems, int64(val2))
- } else {
- elems = append(elems, string(parts[0]))
- parts = parts[1:]
-
- val, err := strconv.Atoi(string(parts[len(parts)-1]))
- if err != nil {
- return nil, err
- }
-
- val2, err := strconv.Atoi(string(parts[len(parts)-2]))
- if err != nil {
- return nil, err
- }
-
- appKey := bytes.Join(parts[:len(parts)-3], []byte("/"))
- elems = append(elems, string(appKey), int64(val), int64(val2))
- }
- return orderedcode.Append(nil, elems...)
- case txHashKey:
- return orderedcode.Append(nil, "tx.hash", string(key))
- default:
- return nil, fmt.Errorf("key %q is in the wrong format", string(key))
+func migrateKey(key keyID, storeName string) (keyID, error) {
+ kt, err := checkKeyType(key, storeName)
+ if err != nil {
+ return nil, err
}
+ for _, migration := range migrations {
+ if migration.storeName != storeName {
+ continue
+ }
+ if kt == migration.ktype {
+ return migration.transform(key)
+ }
+ }
+
+ return nil, fmt.Errorf("key %q is in the wrong format", string(key))
}
func convertEvidence(key keyID, newPrefix int64) ([]byte, error) {
@@ -374,7 +545,29 @@ func isHex(data []byte) bool {
return len(data) != 0
}
-func replaceKey(db dbm.DB, key keyID, gooseFn migrateFunc) error {
+func getMigrationFunc(storeName string, key keyID) (*migrationDefinition, error) {
+ for idx := range migrations {
+ migration := migrations[idx]
+
+ if migration.storeName == storeName {
+ if migration.prefix == nil {
+ return &migration, nil
+ }
+ if bytes.HasPrefix(migration.prefix, key) {
+ return &migration, nil
+ }
+ }
+ }
+ return nil, fmt.Errorf("no migration defined for data store %q and key %q", storeName, key)
+}
+
+func replaceKey(db dbm.DB, storeName string, key keyID) error {
+ migration, err := getMigrationFunc(storeName, key)
+ if err != nil {
+ return err
+ }
+ gooseFn := migration.transform
+
exists, err := db.Has(key)
if err != nil {
return err
@@ -433,8 +626,8 @@ func replaceKey(db dbm.DB, key keyID, gooseFn migrateFunc) error {
// The context allows for a safe termination of the operation
// (e.g connected to a singal handler,) to abort the operation
// in-between migration operations.
-func Migrate(ctx context.Context, db dbm.DB) error {
- keys, err := getAllLegacyKeys(db)
+func Migrate(ctx context.Context, storeName string, db dbm.DB) error {
+ keys, err := getAllLegacyKeys(db, storeName)
if err != nil {
return err
}
@@ -451,7 +644,7 @@ func Migrate(ctx context.Context, db dbm.DB) error {
if err := ctx.Err(); err != nil {
return err
}
- return replaceKey(db, key, migrateKey)
+ return replaceKey(db, storeName, key)
})
}
if g.Wait() != nil {
diff --git a/scripts/keymigrate/migrate_test.go b/scripts/keymigrate/migrate_test.go
index f7322b352..b2e7a4ab8 100644
--- a/scripts/keymigrate/migrate_test.go
+++ b/scripts/keymigrate/migrate_test.go
@@ -1,16 +1,12 @@
package keymigrate
import (
- "context"
- "errors"
"fmt"
- "math"
"strings"
"testing"
"github.com/google/orderedcode"
"github.com/stretchr/testify/require"
- dbm "github.com/tendermint/tm-db"
)
func makeKey(t *testing.T, elems ...interface{}) []byte {
@@ -78,30 +74,6 @@ func getNewPrefixKeys(t *testing.T, val int) map[string][]byte {
}
}
-func getLegacyDatabase(t *testing.T) (int, dbm.DB) {
- db := dbm.NewMemDB()
- batch := db.NewBatch()
- ct := 0
-
- generated := []map[string][]byte{
- getLegacyPrefixKeys(8),
- getLegacyPrefixKeys(9001),
- getLegacyPrefixKeys(math.MaxInt32 << 1),
- getLegacyPrefixKeys(math.MaxInt64 - 8),
- }
-
- // populate database
- for _, km := range generated {
- for _, key := range km {
- ct++
- require.NoError(t, batch.Set(key, []byte(fmt.Sprintf(`{"value": %d}`, ct))))
- }
- }
- require.NoError(t, batch.WriteSync())
- require.NoError(t, batch.Close())
- return ct - (2 * len(generated)) + 2, db
-}
-
func TestMigration(t *testing.T) {
t.Run("Idempotency", func(t *testing.T) {
// we want to make sure that the key space for new and
@@ -113,37 +85,12 @@ func TestMigration(t *testing.T) {
require.Equal(t, len(legacyPrefixes), len(newPrefixes))
- t.Run("Legacy", func(t *testing.T) {
- for kind, le := range legacyPrefixes {
- require.True(t, checkKeyType(le).isLegacy(), kind)
- }
- })
- t.Run("New", func(t *testing.T) {
- for kind, ne := range newPrefixes {
- require.False(t, checkKeyType(ne).isLegacy(), kind)
- }
- })
- t.Run("Conversion", func(t *testing.T) {
- for kind, le := range legacyPrefixes {
- nk, err := migrateKey(le)
- require.NoError(t, err, kind)
- require.False(t, checkKeyType(nk).isLegacy(), kind)
- }
- })
t.Run("Hashes", func(t *testing.T) {
t.Run("NewKeysAreNotHashes", func(t *testing.T) {
for _, key := range getNewPrefixKeys(t, 9001) {
require.True(t, len(key) != 32)
}
})
- t.Run("ContrivedLegacyKeyDetection", func(t *testing.T) {
- // length 32: should appear to be a hash
- require.Equal(t, txHashKey, checkKeyType([]byte("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")))
-
- // length ≠ 32: should not appear to be a hash
- require.Equal(t, nonLegacyKey, checkKeyType([]byte("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx--")))
- require.Equal(t, nonLegacyKey, checkKeyType([]byte("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")))
- })
})
})
t.Run("Migrations", func(t *testing.T) {
@@ -171,72 +118,101 @@ func TestMigration(t *testing.T) {
"UserKey3": []byte("foo/bar/baz/1.2/4"),
}
for kind, key := range table {
- out, err := migrateKey(key)
+ out, err := migrateKey(key, "")
+ // TODO probably these error at the
+ // moment because of store missmatches
require.Error(t, err, kind)
require.Nil(t, out, kind)
}
})
- t.Run("Replacement", func(t *testing.T) {
- t.Run("MissingKey", func(t *testing.T) {
- db := dbm.NewMemDB()
- require.NoError(t, replaceKey(db, keyID("hi"), nil))
- })
- t.Run("ReplacementFails", func(t *testing.T) {
- db := dbm.NewMemDB()
- key := keyID("hi")
- require.NoError(t, db.Set(key, []byte("world")))
- require.Error(t, replaceKey(db, key, func(k keyID) (keyID, error) {
- return nil, errors.New("hi")
- }))
- })
- t.Run("KeyDisappears", func(t *testing.T) {
- db := dbm.NewMemDB()
- key := keyID("hi")
- require.NoError(t, db.Set(key, []byte("world")))
- require.Error(t, replaceKey(db, key, func(k keyID) (keyID, error) {
- require.NoError(t, db.Delete(key))
- return keyID("wat"), nil
- }))
-
- exists, err := db.Has(key)
- require.NoError(t, err)
- require.False(t, exists)
-
- exists, err = db.Has(keyID("wat"))
- require.NoError(t, err)
- require.False(t, exists)
- })
- })
- })
- t.Run("Integration", func(t *testing.T) {
- t.Run("KeyDiscovery", func(t *testing.T) {
- size, db := getLegacyDatabase(t)
- keys, err := getAllLegacyKeys(db)
- require.NoError(t, err)
- require.Equal(t, size, len(keys))
- legacyKeys := 0
- for _, k := range keys {
- if checkKeyType(k).isLegacy() {
- legacyKeys++
- }
- }
- require.Equal(t, size, legacyKeys)
- })
- t.Run("KeyIdempotency", func(t *testing.T) {
- for _, key := range getNewPrefixKeys(t, 84) {
- require.False(t, checkKeyType(key).isLegacy())
- }
- })
- t.Run("Migrate", func(t *testing.T) {
- _, db := getLegacyDatabase(t)
-
- ctx := context.Background()
- err := Migrate(ctx, db)
- require.NoError(t, err)
- keys, err := getAllLegacyKeys(db)
- require.NoError(t, err)
- require.Equal(t, 0, len(keys))
-
- })
})
}
+
+func TestGlobalDataStructuresForRefactor(t *testing.T) {
+ defer func() {
+ if t.Failed() {
+ t.Log("number of migrations:", len(migrations))
+ }
+ }()
+
+ const unPrefixedLegacyKeys = 3
+
+ t.Run("MigrationsAreDefined", func(t *testing.T) {
+ if len(prefixes)+unPrefixedLegacyKeys != len(migrations) {
+ t.Fatal("migrationse are not correctly defined",
+ "prefixes", len(prefixes),
+ "migrations", len(migrations))
+ }
+ })
+ t.Run("AllMigrationsHavePrefixDefined", func(t *testing.T) {
+ for _, m := range migrations {
+ if m.prefix == nil && m.storeName != "tx_index" {
+ t.Errorf("migration named %q for store %q does not have a prefix defined", m.name, m.storeName)
+ }
+ }
+ })
+ t.Run("Deduplication", func(t *testing.T) {
+ t.Run("Prefixes", func(t *testing.T) {
+ set := map[string]struct{}{}
+ for _, prefix := range prefixes {
+ set[string(prefix.prefix)] = struct{}{}
+ }
+ if len(set) != len(prefixes) {
+ t.Fatal("duplicate prefix definition",
+ "set", len(set),
+ "values", set)
+ }
+ })
+ t.Run("MigrationName", func(t *testing.T) {
+ set := map[string]struct{}{}
+ for _, migration := range migrations {
+ set[migration.name] = struct{}{}
+ }
+ if len(set) != len(migrations) {
+ t.Fatal("duplicate migration name defined",
+ "set", len(set),
+ "values", set)
+ }
+ })
+ t.Run("MigrationPrefix", func(t *testing.T) {
+ set := map[string]struct{}{}
+ for _, migration := range migrations {
+ set[string(migration.prefix)] = struct{}{}
+ }
+ // three keys don't have prefixes in the
+ // legacy system; this is fine but it means
+ // the set will have 1 less than expected
+ // (well 2 less, but the empty key takes one
+ // of the slots):
+ expectedDupl := unPrefixedLegacyKeys - 1
+
+ if len(set) != len(migrations)-expectedDupl {
+ t.Fatal("duplicate migration prefix defined",
+ "set", len(set),
+ "expected", len(migrations)-expectedDupl,
+ "values", set)
+ }
+ })
+ t.Run("MigrationStoreName", func(t *testing.T) {
+ set := map[string]struct{}{}
+ for _, migration := range migrations {
+ set[migration.storeName] = struct{}{}
+ }
+ if len(set) != 5 {
+ t.Fatal("duplicate migration store name defined",
+ "set", len(set),
+ "values", set)
+ }
+ if _, ok := set[""]; ok {
+ t.Fatal("empty store name defined")
+ }
+ })
+ })
+ t.Run("NilPrefix", func(t *testing.T) {
+ _, err := getMigrationFunc("tx_index", []byte("fooo"))
+ if err != nil {
+ t.Fatal("should find an index for tx", err)
+ }
+ })
+
+}
diff --git a/spec/abci++/README.md b/spec/abci++/README.md
index a22babfee..2cd2bb483 100644
--- a/spec/abci++/README.md
+++ b/spec/abci++/README.md
@@ -25,14 +25,14 @@ This allows Tendermint to run with applications written in many programming lang
This specification is split as follows:
-- [Overview and basic concepts](./abci++_basic_concepts_002_draft.md) - interface's overview and concepts
+- [Overview and basic concepts](./abci++_basic_concepts.md) - interface's overview and concepts
needed to understand other parts of this specification.
-- [Methods](./abci++_methods_002_draft.md) - complete details on all ABCI++ methods
+- [Methods](./abci++_methods.md) - complete details on all ABCI++ methods
and message types.
-- [Requirements for the Application](./abci++_app_requirements_002_draft.md) - formal requirements
+- [Requirements for the Application](./abci++_app_requirements.md) - formal requirements
on the Application's logic to ensure Tendermint properties such as liveness. These requirements define what
Tendermint expects from the Application; second part on managing ABCI application state and related topics.
-- [Tendermint's expected behavior](./abci++_tmint_expected_behavior_002_draft.md) - specification of
+- [Tendermint's expected behavior](./abci++_tmint_expected_behavior.md) - specification of
how the different ABCI++ methods may be called by Tendermint. This explains what the Application
is to expect from Tendermint.
- [Client and Server](../abci/client-server.md) - for those looking to implement their
diff --git a/spec/abci++/abci++_app_requirements_002_draft.md b/spec/abci++/abci++_app_requirements.md
similarity index 93%
rename from spec/abci++/abci++_app_requirements_002_draft.md
rename to spec/abci++/abci++_app_requirements.md
index 3203f7a95..cd4d877c4 100644
--- a/spec/abci++/abci++_app_requirements_002_draft.md
+++ b/spec/abci++/abci++_app_requirements.md
@@ -1,23 +1,24 @@
---
order: 3
-title: Application Requirements
+title: Requirements for the Application
---
-# Application Requirements
+# Requirements for the Application
## Formal Requirements
This section specifies what Tendermint expects from the Application. It is structured as a set
of formal requirements that can be used for testing and verification of the Application's logic.
-Let *p* and *q* be two different correct proposers in rounds *rp* and *rq*
-respectively, in height *h*.
+Let *p* and *q* be two correct processes.
+Let *rp* (resp. *rq*) be a round of height *h* where *p* (resp. *q*) is the
+proposer.
Let *sp,h-1* be *p*'s Application's state committed for height *h-1*.
Let *vp* (resp. *vq*) be the block that *p*'s (resp. *q*'s) Tendermint passes
on to the Application
via `RequestPrepareProposal` as proposer of round *rp* (resp *rq*), height *h*,
also known as the raw proposal.
-Let *v'p* (resp. *v'q*) the possibly modified block *p*'s (resp. *q*'s) Application
+Let *up* (resp. *uq*) the possibly modified block *p*'s (resp. *q*'s) Application
returns via `ResponsePrepareProposal` to Tendermint, also known as the prepared proposal.
Process *p*'s prepared proposal can differ in two different rounds where *p* is the proposer.
@@ -49,6 +50,7 @@ same-block execution mode and *does not* provide values for
Full execution of blocks at `PrepareProposal` time stands on Tendermint's critical path. Thus,
Requirement 3 ensures the Application will set a value for `TimeoutPropose` such that the time it takes
to fully execute blocks in `PrepareProposal` does not interfere with Tendermint's propose timer.
+Note that violation of Requirement 3 may just lead to further rounds, but will not compromise liveness.
* Requirement 4 [`PrepareProposal`, tx-size]: When *p*'s Application calls `ResponsePrepareProposal`, the
total size in bytes of the transactions returned does not exceed `RequestPrepareProposal.max_tx_bytes`.
@@ -62,7 +64,7 @@ transaction list returned by the application will never cause the resulting bloc
limit.
* Requirement 5 [`PrepareProposal`, `ProcessProposal`, coherence]: For any two correct processes *p* and *q*,
- if *q*'s Tendermint calls `RequestProcessProposal` on *v'p*,
+ if *q*'s Tendermint calls `RequestProcessProposal` on *up*,
*q*'s Application returns Accept in `ResponseProcessProposal`.
Requirement 5 makes sure that blocks proposed by correct processes *always* pass the correct receiving process's
@@ -75,14 +77,14 @@ serious consequences on Tendermint's liveness that this entails. Due to its crit
target for extensive testing and automated verification.
* Requirement 6 [`ProcessProposal`, determinism-1]: `ProcessProposal` is a (deterministic) function of the current
- state and the block that is about to be applied. In other words, for any correct process *p*, and any arbitrary block *v'*,
- if *p*'s Tendermint calls `RequestProcessProposal` on *v'* at height *h*,
- then *p*'s Application's acceptance or rejection **exclusively** depends on *v'* and *sp,h-1*.
+ state and the block that is about to be applied. In other words, for any correct process *p*, and any arbitrary block *u*,
+ if *p*'s Tendermint calls `RequestProcessProposal` on *u* at height *h*,
+ then *p*'s Application's acceptance or rejection **exclusively** depends on *u* and *sp,h-1*.
* Requirement 7 [`ProcessProposal`, determinism-2]: For any two correct processes *p* and *q*, and any arbitrary
- block *v'*,
- if *p*'s (resp. *q*'s) Tendermint calls `RequestProcessProposal` on *v'* at height *h*,
- then *p*'s Application accepts *v'* if and only if *q*'s Application accepts *v'*.
+ block *u*,
+ if *p*'s (resp. *q*'s) Tendermint calls `RequestProcessProposal` on *u* at height *h*,
+ then *p*'s Application accepts *u* if and only if *q*'s Application accepts *u*.
Note that this requirement follows from Requirement 6 and the Agreement property of consensus.
Requirements 6 and 7 ensure that all correct processes will react in the same way to a proposed block, even
@@ -97,7 +99,7 @@ of `ProcessProposal`. As a general rule `ProcessProposal` SHOULD always accept t
According to the Tendermint algorithm, a correct process can broadcast at most one precommit
message in round *r*, height *h*.
-Since, as stated in the [Methods](./abci++_methods_002_draft.md#extendvote) section, `ResponseExtendVote`
+Since, as stated in the [Methods](./abci++_methods.md#extendvote) section, `ResponseExtendVote`
is only called when Tendermint
is about to broadcast a non-`nil` precommit message, a correct process can only produce one vote extension
in round *r*, height *h*.
@@ -106,9 +108,9 @@ Let *erp* be the vote extension that the Application of a
Let *wrp* be the proposed block that *p*'s Tendermint passes to the Application via `RequestExtendVote`
in round *r*, height *h*.
-* Requirement 8 [`ExtendVote`, `VerifyVoteExtension`, coherence]: For any two correct processes *p* and *q*, if *q*
-receives *erp*
- from *p* in height *h*, *q*'s Application returns Accept in `ResponseVerifyVoteExtension`.
+* Requirement 8 [`ExtendVote`, `VerifyVoteExtension`, coherence]: For any two different correct
+ processes *p* and *q*, if *q* receives *erp* from *p* in height *h*, *q*'s
+ Application returns Accept in `ResponseVerifyVoteExtension`.
Requirement 8 constrains the creation and handling of vote extensions in a similar way as Requirement 5
constrains the creation and handling of proposed blocks.
@@ -170,8 +172,8 @@ Finally, notice that neither `PrepareProposal` nor `ExtendVote` have determinism
requirements associated.
Indeed, `PrepareProposal` is not required to be deterministic:
-* *v'p* may depend on *vp* and *sp,h-1*, but may also depend on other values or operations.
-* *vp = vq ⇏ v'p = v'q*.
+* *up* may depend on *vp* and *sp,h-1*, but may also depend on other values or operations.
+* *vp = vq ⇏ up = uq*.
Likewise, `ExtendVote` can also be non-deterministic:
@@ -365,12 +367,12 @@ For more information, see Section [State Sync](#state-sync).
### Transaction Results
The Application is expected to return a list of
-[`ExecTxResult`](./abci%2B%2B_methods_002_draft.md#exectxresult) in
-[`ResponseFinalizeBlock`](./abci%2B%2B_methods_002_draft.md#finalizeblock). The list of transaction
+[`ExecTxResult`](./abci%2B%2B_methods.md#exectxresult) in
+[`ResponseFinalizeBlock`](./abci%2B%2B_methods.md#finalizeblock). The list of transaction
results must respect the same order as the list of transactions delivered via
-[`RequestFinalizeBlock`](./abci%2B%2B_methods_002_draft.md#finalizeblock).
+[`RequestFinalizeBlock`](./abci%2B%2B_methods.md#finalizeblock).
This section discusses the fields inside this structure, along with the fields in
-[`ResponseCheckTx`](./abci%2B%2B_methods_002_draft.md#checktx),
+[`ResponseCheckTx`](./abci%2B%2B_methods.md#checktx),
whose semantics are similar.
The `Info` and `Log` fields are
@@ -471,12 +473,12 @@ events took place during their execution.
### Updating the Validator Set
The application may set the validator set during
-[`InitChain`](./abci%2B%2B_methods_002_draft.md#initchain), and may update it during
-[`FinalizeBlock`](./abci%2B%2B_methods_002_draft.md#finalizeblock)
+[`InitChain`](./abci%2B%2B_methods.md#initchain), and may update it during
+[`FinalizeBlock`](./abci%2B%2B_methods.md#finalizeblock)
(next block execution mode) or
-[`PrepareProposal`](./abci%2B%2B_methods_002_draft.md#prepareproposal)/[`ProcessProposal`](./abci%2B%2B_methods_002_draft.md#processproposal)
+[`PrepareProposal`](./abci%2B%2B_methods.md#prepareproposal)/[`ProcessProposal`](./abci%2B%2B_methods.md#processproposal)
(same block execution mode). In all cases, a structure of type
-[`ValidatorUpdate`](./abci%2B%2B_methods_002_draft.md#validatorupdate) is returned.
+[`ValidatorUpdate`](./abci%2B%2B_methods.md#validatorupdate) is returned.
The `InitChain` method, used to initialize the Application, can return a list of validators.
If the list is empty, Tendermint will use the validators loaded from the genesis
@@ -510,7 +512,7 @@ Applications must ensure that
`MaxTotalVotingPower = MaxInt64 / 8`
Note the updates returned after processing the block at height `H` will only take effect
-at block `H+2` (see Section [Methods](./abci%2B%2B_methods_002_draft.md)).
+at block `H+2` (see Section [Methods](./abci%2B%2B_methods.md)).
### Consensus Parameters
@@ -518,10 +520,10 @@ at block `H+2` (see Section [Methods](./abci%2B%2B_methods_002_draft.md)).
They enforce certain limits in the blockchain, like the maximum size
of blocks, amount of gas used in a block, and the maximum acceptable age of
evidence. They can be set in
-[`InitChain`](./abci%2B%2B_methods_002_draft.md#initchain), and updated in
-[`FinalizeBlock`](./abci%2B%2B_methods_002_draft.md#finalizeblock)
+[`InitChain`](./abci%2B%2B_methods.md#initchain), and updated in
+[`FinalizeBlock`](./abci%2B%2B_methods.md#finalizeblock)
(next block execution mode) or
-[`PrepareProposal`](./abci%2B%2B_methods_002_draft.md#prepareproposal)/[`ProcessProposal`](./abci%2B%2B_methods_002_draft.md#processproposal)
+[`PrepareProposal`](./abci%2B%2B_methods.md#prepareproposal)/[`ProcessProposal`](./abci%2B%2B_methods.md#processproposal)
(same block execution model).
These parameters are deterministically set and/or updated by the Application, so
all full nodes have the same value at a given height.
@@ -672,14 +674,33 @@ node has received all precommits for a block, forgoing the remaining commit time
Setting this parameter to `false` (the default) causes Tendermint to wait
for the full commit timeout configured in `TimeoutParams.Commit`.
+##### ABCIParams.VoteExtensionsEnableHeight
+
+This parameter is either 0 or a positive height at which vote extensions
+become mandatory. If the value is zero (which is the default), vote
+extensions are not required. Otherwise, at all heights greater than the
+configured height `H` vote extensions must be present (even if empty).
+When the configured height `H` is reached, `PrepareProposal` will not
+include vote extensions yet, but `ExtendVote` and `VerifyVoteExtension` will
+be called. Then, when reaching height `H+1`, `PrepareProposal` will
+include the vote extensions from height `H`. For all heights after `H`
+
+* vote extensions cannot be disabled,
+* they are mandatory: all precommit messages sent MUST have an extension
+ attached. Nevetheless, the application MAY provide 0-length
+ extensions.
+
+Must always be set to a future height. Once set to a value different from
+0, its value must not be changed.
+
#### Updating Consensus Parameters
The application may set the `ConsensusParams` during
-[`InitChain`](./abci%2B%2B_methods_002_draft.md#initchain),
+[`InitChain`](./abci%2B%2B_methods.md#initchain),
and update them during
-[`FinalizeBlock`](./abci%2B%2B_methods_002_draft.md#finalizeblock)
+[`FinalizeBlock`](./abci%2B%2B_methods.md#finalizeblock)
(next block execution mode) or
-[`PrepareProposal`](./abci%2B%2B_methods_002_draft.md#prepareproposal)/[`ProcessProposal`](./abci%2B%2B_methods_002_draft.md#processproposal)
+[`PrepareProposal`](./abci%2B%2B_methods.md#prepareproposal)/[`ProcessProposal`](./abci%2B%2B_methods.md#processproposal)
(same block execution mode).
If the `ConsensusParams` is empty, it will be ignored. Each field
that is not empty will be applied in full. For instance, if updating the
@@ -885,7 +906,7 @@ truncated block history - users are advised to consider the broader network impl
terms of block availability and auditability. This functionality may be added in the future.
For details on the specific ABCI calls and types, see the
-[methods](abci%2B%2B_methods_002_draft.md) section.
+[methods](abci%2B%2B_methods.md) section.
#### Taking Snapshots
diff --git a/spec/abci++/abci++_basic_concepts.md b/spec/abci++/abci++_basic_concepts.md
new file mode 100644
index 000000000..b02798b57
--- /dev/null
+++ b/spec/abci++/abci++_basic_concepts.md
@@ -0,0 +1,468 @@
+---
+order: 1
+title: Overview and basic concepts
+---
+
+## Outline
+
+- [ABCI++ vs. ABCI](#abci-vs-abci)
+- [Method overview](#method-overview)
+ - [Consensus/block execution methods](#consensusblock-execution-methods)
+ - [Mempool methods](#mempool-methods)
+ - [Info methods](#info-methods)
+ - [State-sync methods](#state-sync-methods)
+- [Next-block execution vs. same-block execution](#next-block-execution-vs-same-block-execution)
+- [Tendermint proposal timeout](#tendermint-proposal-timeout)
+- [Deterministic State-Machine Replication](#deterministic-state-machine-replication)
+- [Events](#events)
+- [Evidence](#evidence)
+- [Errors](#errors)
+
+# Overview and basic concepts
+
+## ABCI++ vs. ABCI
+
+[↑ Back to Outline](#outline)
+
+The Application's main role is to execute blocks decided (a.k.a. finalized) by consensus. The
+decided blocks are the main consensus's ouput to the (replicated) Application. With ABCI, the
+application only interacts with consensus at *decision* time. This restricted mode of interaction
+prevents numerous features for the Application, including many scalability improvements that are
+now better understood than when ABCI was first written. For example, many ideas proposed to improve
+scalability can be boiled down to "make the block proposers do work, so the network does not have
+to". This includes optimizations such as transaction level signature aggregation, state transition
+proofs, etc. Furthermore, many new security properties cannot be achieved in the current paradigm,
+as the Application cannot require validators to do more than executing the transactions contained in
+finalized blocks. This includes features such as threshold cryptography, and guaranteed IBC
+connection attempts.
+
+ABCI++ addresses these limitations by allowing the application to intervene at three key places of
+consensus execution: (a) at the moment a new proposal is to be created, (b) at the moment a
+proposal is to be validated, and (c) at the moment a (precommit) vote is sent/received. The new
+interface allows block proposers to perform application-dependent work in a block through the
+`PrepareProposal` method (a); validators to perform application-dependent work and checks in a
+proposed block through the `ProcessProposal` method (b); and applications to require their validators
+do more than just validate blocks through the `ExtendVote` and `VerifyVoteExtension` methods (c).
+Furthermore, ABCI++ coalesces {`BeginBlock`, [`DeliverTx`], `EndBlock`} into `FinalizeBlock`, as a
+simplified, efficient way to deliver a decided block to the Application.
+
+## Method overview
+
+[↑ Back to Outline](#outline)
+
+Methods can be classified into four categories: *consensus*, *mempool*, *info*, and *state-sync*.
+
+### Consensus/block execution methods
+
+The first time a new blockchain is started, Tendermint calls `InitChain`. From then on, method
+`FinalizeBlock` is executed upon the decision of each block, resulting in an updated Application
+state. During the execution of an instance of consensus, which decides the block for a given
+height, and before method `FinalizeBlock` is called, methods `PrepareProposal`, `ProcessProposal`,
+`ExtendVote`, and `VerifyVoteExtension` may be called several times. See
+[Tendermint's expected behavior](abci++_tmint_expected_behavior.md) for details on the possible
+call sequences of these methods.
+
+- [**InitChain:**](./abci++_methods.md#initchain) This method initializes the blockchain.
+ Tendermint calls it once upon genesis.
+
+- [**PrepareProposal:**](./abci++_methods.md#prepareproposal) It allows the block
+ proposer to perform application-dependent work in a block before proposing it.
+ This enables, for instance, batch optimizations to a block, which has been empirically
+ demonstrated to be a key component for improved performance. Method `PrepareProposal` is called
+ every time Tendermint is about to broadcast a Proposal message, but no previous proposal has
+ been locked at the Tendermint level. Tendermint gathers outstanding transactions from the
+ mempool, generates a block header, and uses them to create a block to propose. Then, it calls
+ `RequestPrepareProposal` with the newly created proposal, called *raw proposal*. The Application
+ can make changes to the raw proposal, such as modifying transactions, and returns the
+ (potentially) modified proposal, called *prepared proposal* in the `ResponsePrepareProposal`
+ call. The logic modifying the raw proposal can be non-deterministic.
+
+- [**ProcessProposal:**](./abci++_methods.md#processproposal) It allows a validator to
+ perform application-dependent work in a proposed block. This enables features such as immediate
+ block execution, and allows the Application to reject invalid blocks.
+ Tendermint calls it when it receives a proposal and the Tendermint algorithm has not locked on a
+ value. The Application cannot modify the proposal at this point but can reject it if it is
+ invalid. If that is the case, Tendermint will prevote `nil` on the proposal, which has
+ strong liveness implications for Tendermint. As a general rule, the Application
+ SHOULD accept a prepared proposal passed via `ProcessProposal`, even if a part of
+ the proposal is invalid (e.g., an invalid transaction); the Application can
+ ignore the invalid part of the prepared proposal at block execution time.
+
+- [**ExtendVote:**](./abci++_methods.md#extendvote) It allows applications to force their
+ validators to do more than just validate within consensus. `ExtendVote` allows applications to
+ include non-deterministic data, opaque to Tendermint, to precommit messages (the final round of
+ voting). The data, called *vote extension*, will be broadcast and received together with the
+ vote it is extending, and will be made available to the Application in the next height,
+ in the rounds where the local process is the proposer.
+ Tendermint calls `ExtendVote` when it is about to send a non-`nil` precommit message.
+ If the Application does not have vote extension information to provide at that time, it returns
+ a 0-length byte array as its vote extension.
+
+- [**VerifyVoteExtension:**](./abci++_methods.md#verifyvoteextension) It allows
+ validators to validate the vote extension data attached to a precommit message. If the validation
+ fails, the whole precommit message will be deemed invalid and ignored by Tendermint.
+ This has a negative impact on Tendermint's liveness, i.e., if vote extensions repeatedly cannot be
+ verified by correct validators, Tendermint may not be able to finalize a block even if sufficiently
+ many (+2/3) validators send precommit votes for that block. Thus, `VerifyVoteExtension`
+ should be used with special care.
+ As a general rule, an Application that detects an invalid vote extension SHOULD
+ accept it in `ResponseVerifyVoteExtension` and ignore it in its own logic. Tendermint calls it when
+ a process receives a precommit message with a (possibly empty) vote extension.
+
+- [**FinalizeBlock:**](./abci++_methods.md#finalizeblock) It delivers a decided block to the
+ Application. The Application must execute the transactions in the block deterministically and
+ update its state accordingly. Cryptographic commitments to the block and transaction results,
+ returned via the corresponding parameters in `ResponseFinalizeBlock`, are included in the header
+ of the next block. Tendermint calls it when a new block is decided.
+
+- [**Commit:**](./abci++_methods.md#commit) Instructs the Application to persist its
+ state. It is a fundamental part of Tendermint's crash-recovery mechanism that ensures the
+ synchronization between Tendermint and the Applicatin upon recovery. Tendermint calls it just after
+ having persisted the data returned by `ResponseFinalizeBlock`. The Application can now discard
+ any state or data except the one resulting from executing the transactions in the decided block.
+
+### Mempool methods
+
+- [**CheckTx:**](./abci++_methods.md#checktx) This method allows the Application to validate
+ transactions. Validation can be stateless (e.g., checking signatures ) or stateful
+ (e.g., account balances). The type of validation performed is up to the application. If a
+ transaction passes the validation, then Tendermint adds it to the mempool; otherwise the
+ transaction is discarded.
+ Tendermint calls it when it receives a new transaction either coming from an external
+ user (e.g., a client) or another node. Furthermore, Tendermint can be configured to call
+ re-`CheckTx` on all outstanding transactions in the mempool after calling `Commit`for a block.
+
+### Info methods
+
+- [**Info:**](./abci++_methods.md#info) Used to sync Tendermint with the Application during a
+ handshake that happens upon recovery, or on startup when state-sync is used.
+
+- [**Query:**](./abci++_methods.md#query) This method can be used to query the Application for
+ information about the application state.
+
+### State-sync methods
+
+State sync allows new nodes to rapidly bootstrap by discovering, fetching, and applying
+state machine (application) snapshots instead of replaying historical blocks. For more details, see the
+[state sync documentation](../p2p/messages/state-sync.md).
+
+New nodes discover and request snapshots from other nodes in the P2P network.
+A Tendermint node that receives a request for snapshots from a peer will call
+`ListSnapshots` on its Application. The Application returns the list of locally available
+snapshots.
+Note that the list does not contain the actual snapshots but metadata about them: height at which
+the snapshot was taken, application-specific verification data and more (see
+[snapshot data type](./abci++_methods.md#snapshot) for more details). After receiving a
+list of available snapshots from a peer, the new node can offer any of the snapshots in the list to
+its local Application via the `OfferSnapshot` method. The Application can check at this point the
+validity of the snapshot metadata.
+
+Snapshots may be quite large and are thus broken into smaller "chunks" that can be
+assembled into the whole snapshot. Once the Application accepts a snapshot and
+begins restoring it, Tendermint will fetch snapshot "chunks" from existing nodes.
+The node providing "chunks" will fetch them from its local Application using
+the `LoadSnapshotChunk` method.
+
+As the new node receives "chunks" it will apply them sequentially to the local
+application with `ApplySnapshotChunk`. When all chunks have been applied, the
+Application's `AppHash` is retrieved via an `Info` query.
+To ensure that the sync proceeded correctly, Tendermint compares the local Application's `AppHash`
+to the `AppHash` stored on the blockchain (verified via
+[light client verification](../light-client/verification/README.md)).
+
+In summary:
+
+- [**ListSnapshots:**](./abci++_methods.md#listsnapshots) Used by nodes to discover available
+ snapshots on peers.
+
+- [**OfferSnapshot:**](./abci++_methods.md#offersnapshot) When a node receives a snapshot from a
+ peer, Tendermint uses this method to offer the snapshot to the Application.
+
+- [**LoadSnapshotChunk:**](./abci++_methods.md#loadsnapshotchunk) Used by Tendermint to retrieve
+ snapshot chunks from the Application to send to peers.
+
+- [**ApplySnapshotChunk:**](./abci++_methods.md#applysnapshotchunk) Used by Tendermint to hand
+ snapshot chunks to the Application.
+
+### Other methods
+
+Additionally, there is a [**Flush**](./abci++_methods.md#flush) method that is called on every connection,
+and an [**Echo**](./abci++_methods.md#echo) method that is used for debugging.
+
+More details on managing state across connections can be found in the section on
+[Managing Application State](./abci%2B%2B_app_requirements.md#managing-the-application-state-and-related-topics).
+
+## Next-block execution vs. same-block execution
+
+[↑ Back to Outline](#outline)
+
+In the original ABCI protocol, the only moment when the Application had access to a
+block was after it was decided. This led to a block execution model, called *next-block
+execution*, where some fields hashed in a block header refer to the execution of the
+previous block, namely:
+
+- the Merkle root of the Application's state
+- the transaction results
+- the consensus parameter updates
+- the validator updates
+
+With ABCI++, an Application may be configured to keep using the next-block execution model, by
+executing the decided block in `FinalizeBlock`. However, the new methods introduced —
+`PrepareProposal` and `ProcessProposal` — disclose the entire proposed block to the
+Application, allowing for its immediate exectution. An Application implementing immediate execution
+may additionally wish to store certain data resulting from the block's execution in the same block
+that has just been executed. This brings about a new execution model, called
+*same-block execution*. An Application implementing this execution model, upon receiving a raw
+proposal via `RequestPrepareProposal` and potentially modifying its transaction list, fully
+executes the resulting prepared proposal as though it was the decided block (immediate execution),
+and the results of the block execution are used as follows:
+
+- The block execution may generate a set of events. The Application should store these events and
+ return them back to Tendermint during the `FinalizeBlock` call if the block is finally decided.
+- The Merkle root resulting from executing the prepared proposal is provided in
+ `ResponsePrepareProposal` and thus refers to the **current block**. Tendermint
+ will use it in the prepared proposal's header.
+- Likewise, the transaction results from executing the prepared proposal are
+ provided in `ResponsePrepareProposal` and refer to the transactions in the
+ **current block**. Tendermint will use them to calculate the results hash
+ in the prepared proposal's header.
+- The consensus parameter updates and validator updates are also provided in
+ `ResponsePrepareProposal` and reflect the result of the prepared proposal's
+ execution. They come into force in height H+1 (as opposed to the H+2 rule
+ in next-block execution model).
+
+If the Application is configured to keep the next-block execution model, it will not
+provide any data in `ResponsePrepareProposal`, other than a potentially modified
+transaction list. The Application may nevertheless choose to perform immediate execution even in
+next-block execution mode, however same-block execution mode *requires* immediate execution.
+
+The long term plan is for the execution model to be set in a new boolean parameter *same_block* in
+`ConsensusParams`. Once this parameter is introduced, it **must not** be changed once the
+blockchain has started, unless the Application developers *really* know what they are doing.
+However, modifying `ConsensusParams` structure cannot be done lightly if we are to
+preserve blockchain compatibility. Therefore we need an interim solution until
+soft upgrades are specified and implemented in Tendermint. This somewhat *unsafe*
+solution consists in Tendermint assuming same-block execution if the Application
+fills the above mentioned fields in `ResponsePrepareProposal`.
+
+## Tendermint proposal timeout
+
+Immediate execution requires the Application to fully execute the prepared block
+before returning from `PrepareProposal`, this means that Tendermint cannot make progress
+during the block execution.
+This stands on Tendermint's critical path: if the Application takes a long time
+executing the block, the default value of *TimeoutPropose* might not be sufficient
+to accommodate the long block execution time and non-proposer nodes might time
+out and prevote `nil`. The proposal, in this case, will probably be rejected and a new round will be necessary.
+
+The Application is the best suited to provide a value for *TimeoutPropose* so
+that the block execution time upon `PrepareProposal` fits well in the propose
+timeout interval. Thus, the Application can adapt the value of *TimeoutPropose* at every height via
+`TimeoutParams.Propose`, contained in `ConsensusParams`.
+
+## Deterministic State-Machine Replication
+
+[↑ Back to Outline](#outline)
+
+ABCI++ applications must implement deterministic finite-state machines to be
+securely replicated by the Tendermint consensus engine. This means block execution
+must be strictly deterministic: given the same
+ordered set of transactions, all nodes will compute identical responses, for all
+successive `FinalizeBlock` calls. This is critical because the
+responses are included in the header of the next block, either via a Merkle root
+or directly, so all nodes must agree on exactly what they are.
+
+For this reason, it is recommended that application state is not exposed to any
+external user or process except via the ABCI connections to a consensus engine
+like Tendermint Core. The Application must only change its state based on input
+from block execution (`FinalizeBlock` calls), and not through
+any other kind of request. This is the only way to ensure all nodes see the same
+transactions and compute the same results.
+
+Some Applications may choose to implement immediate execution, which entails executing the blocks
+that are about to be proposed (via `PrepareProposal`), and those that the Application is asked to
+validate (via `ProcessProposal`). However, the state changes caused by processing those
+proposed blocks must never replace the previous state until `FinalizeBlock` confirms
+the block decided.
+
+Additionally, vote extensions or the validation thereof (via `ExtendVote` or
+`VerifyVoteExtension`) must *never* have side effects on the current state.
+They can only be used when their data is provided in a `RequestPrepareProposal` call.
+
+If there is some non-determinism in the state machine, consensus will eventually
+fail as nodes disagree over the correct values for the block header. The
+non-determinism must be fixed and the nodes restarted.
+
+Sources of non-determinism in applications may include:
+
+- Hardware failures
+ - Cosmic rays, overheating, etc.
+- Node-dependent state
+ - Random numbers
+ - Time
+- Underspecification
+ - Library version changes
+ - Race conditions
+ - Floating point numbers
+ - JSON or protobuf serialization
+ - Iterating through hash-tables/maps/dictionaries
+- External Sources
+ - Filesystem
+ - Network calls (eg. some external REST API service)
+
+See [#56](https://github.com/tendermint/abci/issues/56) for the original discussion.
+
+Note that some methods (`Query, FinalizeBlock`) return non-deterministic data in the form
+of `Info` and `Log` fields. The `Log` is intended for the literal output from the Application's
+logger, while the `Info` is any additional info that should be returned. These are the only fields
+that are not included in block header computations, so we don't need agreement
+on them. All other fields in the `Response*` must be strictly deterministic.
+
+## Events
+
+[↑ Back to Outline](#outline)
+
+Method `FinalizeBlock` includes an `events` field at the top level in its
+`Response*`, and one `events` field per transaction included in the block.
+Applications may respond to this ABCI++ method with an event list for each executed
+transaction, and a general event list for the block itself.
+Events allow applications to associate metadata with transactions and blocks.
+Events returned via `FinalizeBlock` do not impact Tendermint consensus in any way
+and instead exist to power subscriptions and queries of Tendermint state.
+
+An `Event` contains a `type` and a list of `EventAttributes`, which are key-value
+string pairs denoting metadata about what happened during the method's (or transaction's)
+execution. `Event` values can be used to index transactions and blocks according to what
+happened during their execution.
+
+Each event has a `type` which is meant to categorize the event for a particular
+`Response*` or `Tx`. A `Response*` or `Tx` may contain multiple events with duplicate
+`type` values, where each distinct entry is meant to categorize attributes for a
+particular event. Every key and value in an event's attributes must be UTF-8
+encoded strings along with the event type itself.
+
+```protobuf
+message Event {
+ string type = 1;
+ repeated EventAttribute attributes = 2;
+}
+```
+
+The attributes of an `Event` consist of a `key`, a `value`, and an `index` flag. The
+index flag notifies the Tendermint indexer to index the attribute. The value of
+the `index` flag is non-deterministic and may vary across different nodes in the network.
+
+```protobuf
+message EventAttribute {
+ bytes key = 1;
+ bytes value = 2;
+ bool index = 3; // nondeterministic
+}
+```
+
+Example:
+
+```go
+ abci.ResponseFinalizeBlock{
+ // ...
+ Events: []abci.Event{
+ {
+ Type: "validator.provisions",
+ Attributes: []abci.EventAttribute{
+ abci.EventAttribute{Key: []byte("address"), Value: []byte("..."), Index: true},
+ abci.EventAttribute{Key: []byte("amount"), Value: []byte("..."), Index: true},
+ abci.EventAttribute{Key: []byte("balance"), Value: []byte("..."), Index: true},
+ },
+ },
+ {
+ Type: "validator.provisions",
+ Attributes: []abci.EventAttribute{
+ abci.EventAttribute{Key: []byte("address"), Value: []byte("..."), Index: true},
+ abci.EventAttribute{Key: []byte("amount"), Value: []byte("..."), Index: false},
+ abci.EventAttribute{Key: []byte("balance"), Value: []byte("..."), Index: false},
+ },
+ },
+ {
+ Type: "validator.slashed",
+ Attributes: []abci.EventAttribute{
+ abci.EventAttribute{Key: []byte("address"), Value: []byte("..."), Index: false},
+ abci.EventAttribute{Key: []byte("amount"), Value: []byte("..."), Index: true},
+ abci.EventAttribute{Key: []byte("reason"), Value: []byte("..."), Index: true},
+ },
+ },
+ // ...
+ },
+}
+```
+
+## Evidence
+
+[↑ Back to Outline](#outline)
+
+Tendermint's security model relies on the use of evidences of misbehavior. An evidence is an
+irrefutable proof of malicious behavior by a network participant. It is the responsibility of
+Tendermint to detect such malicious behavior. When malicious behavior is detected, Tendermint
+will gossip evidences of misbehavior to other nodes and commit the evidences to
+the chain once they are verified by a subset of validators. These evidences will then be
+passed on to the Application through ABCI++. It is the responsibility of the
+Application to handle evidence of misbehavior and exercise punishment.
+
+There are two forms of evidence: Duplicate Vote and Light Client Attack. More
+information can be found in either [data structures](../core/data_structures.md)
+or [accountability](../light-client/accountability/).
+
+EvidenceType has the following protobuf format:
+
+```protobuf
+enum EvidenceType {
+ UNKNOWN = 0;
+ DUPLICATE_VOTE = 1;
+ LIGHT_CLIENT_ATTACK = 2;
+}
+```
+
+## Errors
+
+[↑ Back to Outline](#outline)
+
+The `Query`, and `CheckTx` methods include a `Code` field in their `Response*`.
+Field `Code` is meant to contain an application-specific response code.
+A response code of `0` indicates no error. Any other response code
+indicates to Tendermint that an error occurred.
+
+These methods also return a `Codespace` string to Tendermint. This field is
+used to disambiguate `Code` values returned by different domains of the
+Application. The `Codespace` is a namespace for the `Code`.
+
+Methods `Echo`, `Info`, and `InitChain` do not return errors.
+An error in any of these methods represents a critical issue that Tendermint
+has no reasonable way to handle. If there is an error in one
+of these methods, the Application must crash to ensure that the error is safely
+handled by an operator.
+
+Method `FinalizeBlock` is a special case. It contains a number of
+`Code` and `Codespace` fields as part of type `ExecTxResult`. Each of
+these codes reports errors related to the transaction it is attached to.
+However, `FinalizeBlock` does not return errors at the top level, so the
+same considerations on critical issues made for `Echo`, `Info`, and
+`InitChain` also apply here.
+
+The handling of non-zero response codes by Tendermint is described below.
+
+### `CheckTx`
+
+When Tendermint receives a `ResponseCheckTx` with a non-zero `Code`, the associated
+transaction will not be added to Tendermint's mempool or it will be removed if
+it is already included.
+
+### `ExecTxResult` (as part of `FinalizeBlock`)
+
+The `ExecTxResult` type delivers transaction results from the Application to Tendermint. When
+Tendermint receives a `ResponseFinalizeBlock` containing an `ExecTxResult` with a non-zero `Code`,
+the response code is logged. Past `Code` values can be queried by clients. As the transaction was
+part of a decided block, the `Code` does not influence Tendermint consensus.
+
+### `Query`
+
+When Tendermint receives a `ResponseQuery` with a non-zero `Code`, this code is
+returned directly to the client that initiated the query.
diff --git a/spec/abci++/abci++_basic_concepts_002_draft.md b/spec/abci++/abci++_basic_concepts_002_draft.md
deleted file mode 100644
index a1ad038a5..000000000
--- a/spec/abci++/abci++_basic_concepts_002_draft.md
+++ /dev/null
@@ -1,404 +0,0 @@
----
-order: 1
-title: Overview and basic concepts
----
-
-## Outline
-- [ABCI++ vs. ABCI](#abci-vs-abci)
-- [Methods overview](#methods-overview)
- - [Consensus methods](#consensus-methods)
- - [Mempool methods](#mempool-methods)
- - [Info methods](#info-methods)
- - [State-sync methods](#state-sync-methods)
-- [Next-block execution vs. same-block execution](#next-block-execution-vs-same-block-execution)
- - [Tendermint timeouts](#tendermint-timeouts-in-same-block-execution)
-- [Determinism](#determinism)
-- [Errors](#errors)
-- [Events](#events)
-- [Evidence](#evidence)
-
-# Overview and basic concepts
-
-## ABCI++ vs. ABCI
-[↑ Back to Outline](#outline)
-
-With ABCI, the application can only act at one phase in consensus, immediately after a block has been finalized. This restriction on the application prevents numerous features for the application, including many scalability improvements that are now better understood than when ABCI was first written. For example, many of the scalability proposals can be boiled down to "Make the miner / block proposers / validators do work, so the network does not have to". This includes optimizations such as tx-level signature aggregation, state transition proofs, etc. Furthermore, many new security properties cannot be achieved in the current paradigm, as the application cannot enforce validators to do more than just finalize txs. This includes features such as threshold cryptography, and guaranteed IBC connection attempts.
-
-ABCI++ overcomes these limitations by allowing the application to intervene at three key places of the block execution. The new interface allows block proposers to perform application-dependent work in a block through the `PrepareProposal` method; validators to perform application-dependent work in a proposed block through the `ProcessProposal` method; and applications to require their validators do more than just validate blocks, e.g., validator guaranteed IBC connection attempts, through the `ExtendVote` and `VerifyVoteExtension` methods. Furthermore, ABCI++ renames {`BeginBlock`, [`DeliverTx`], `EndBlock`} to `FinalizeBlock`, as a simplified way to deliver a decided block to the Application.
-
-## Methods overview
-[↑ Back to Outline](#outline)
-
-Methods can be classified into four categories: consensus, mempool, info, and state-sync.
-
-### Consensus/block execution methods
-
-The first time a new blockchain is started, Tendermint calls
-`InitChain`. From then on, method `FinalizeBlock` is executed at the end of each
-block, resulting in an updated Application state.
-During consensus execution of a block height, before method `FinalizeBlock` is
-called, methods `PrepareProposal`, `ProcessProposal`, `ExtendVote`, and
-`VerifyVoteExtension` may be called several times.
-See [Tendermint's expected behavior](abci++_tmint_expected_behavior_002_draft.md)
-for details on the possible call sequences of these methods.
-
-* [**InitChain:**](./abci++_methods_002_draft.md#initchain) This method initializes the blockchain. Tendermint calls it once upon genesis.
-
-* [**PrepareProposal:**](./abci++_methods_002_draft.md#prepareproposal) It allows the block proposer to perform application-dependent work in a block before using it as its proposal. This enables, for instance, batch optimizations to a block, which has been empirically demonstrated to be a key component for scaling. Method `PrepareProposal` is called every time Tendermint is about to send
-a proposal message, but no previous proposal has been locked at Tendermint level.
-Tendermint gathers outstanding transactions from the mempool, generates a block header, and uses
-them to create a block to propose. Then, it calls `RequestPrepareProposal`
-with the newly created proposal, called _raw proposal_. The Application can
-make changes to the raw proposal, such as modifying transactions, and returns
-the (potentially) modified proposal, called _prepared proposal_ in the
-`Response*` call. The logic modifying the raw proposal can be non-deterministic.
-
-* [**ProcessProposal:**](./abci++_methods_002_draft.md#processproposal) It allows a validator to perform application-dependent work in a proposed block. This enables features such as allowing validators to reject a block according to whether the state machine deems it valid, and changing the block execution pipeline. Tendermint calls it when it receives a proposal and it is not locked on a block. The Application cannot
-modify the proposal at this point but can reject it if it realizes it is invalid.
-If that is the case, Tendermint will prevote `nil` on the proposal, which has
-strong liveness implications for Tendermint. As a general rule, the Application
-SHOULD accept a prepared proposal passed via `ProcessProposal`, even if a part of
-the proposal is invalid (e.g., an invalid transaction); the Application can
-ignore the invalid part of the prepared proposal at block execution time.
-
-* [**ExtendVote:**](./abci++_methods_002_draft.md#extendvote) It allows applications to force their validators to do more than just validate within consensus. `ExtendVote` allows applications to include non-deterministic data, opaque to Tendermint, to precommit messages (the final round of voting).
-The data, called _vote extension_, will also be made available to the
-application in the next height, along with the vote it is extending, in the rounds
-where the local process is the proposer.
-If the Application does not have vote extension information to provide, it returns a 0-length byte array as its vote extension.
-Tendermint calls `ExtendVote` when is about to send a non-`nil` precommit message.
-
-* [**VerifyVoteExtension:**](./abci++_methods_002_draft.md#verifyvoteextension) It allows validators to validate the vote extension data attached to a precommit message. If the validation fails, the precommit message will be deemed invalid and ignored
-by Tendermint. This has a negative impact on Tendermint's liveness, i.e., if vote extensions repeatedly cannot be verified by correct validators, Tendermint may not be able to finalize a block even if sufficiently many (+2/3) of the validators send precommit votes for that block. Thus, `VerifyVoteExtension` should be used with special care.
-As a general rule, an Application that detects an invalid vote extension SHOULD
-accept it in `ResponseVerifyVoteExtension` and ignore it in its own logic. Tendermint calls it when
-a process receives a precommit message with a (possibly empty) vote extension.
-
-* [**FinalizeBlock:**](./abci++_methods_002_draft.md#finalizeblock) It delivers a decided block to the Application. The Application must execute the transactions in the block in order and update its state accordingly. Cryptographic commitments to the block and transaction results, via the corresponding
-parameters in `ResponseFinalizeBlock`, are included in the header of the next block. Tendermint calls it when a new block is decided.
-
-### Mempool methods
-
-* [**CheckTx:**](./abci++_methods_002_draft.md#checktx) This method allows the Application to validate transactions against its current state, e.g., checking signatures and account balances. If a transaction passes the validation, then tendermint adds it to its local mempool, discarding it otherwise. Tendermint calls it when it receives a new transaction either coming from an external user or another node. Furthermore, Tendermint can be configured to re-call `CheckTx` on any decided transaction (after `FinalizeBlock`).
-
-### Info methods
-
-* [**Info:**](./abci++_methods_002_draft.md#info) Used to sync Tendermint with the Application during a handshake that happens on startup.
-
-* [**Query:**](./abci++_methods_002_draft.md#query) Clients can use this method to query the Application for information about the application state.
-
-### State-sync methods
-
-State sync allows new nodes to rapidly bootstrap by discovering, fetching, and applying
-state machine snapshots instead of replaying historical blocks. For more details, see the
-[state sync section](../p2p/messages/state-sync.md).
-
-New nodes will discover and request snapshots from other nodes in the P2P network.
-A Tendermint node that receives a request for snapshots from a peer will call
-`ListSnapshots` on its Application. The Application returns the list of locally avaiable snapshots.
-Note that the list does not contain the actual snapshot but metadata about it: height at which the snapshot was taken, application-specific verification data and more (see [snapshot data type](./abci++_methods_002_draft.md#snapshot) for more details). After receiving a list of available snapshots from a peer, the new node can offer any of the snapshots in the list to its local Application via the `OfferSnapshot` method. The Application can check at this point the validity of the snapshot metadata.
-
-Snapshots may be quite large and are thus broken into smaller "chunks" that can be
-assembled into the whole snapshot. Once the Application accepts a snapshot and
-begins restoring it, Tendermint will fetch snapshot "chunks" from existing nodes.
-The node providing "chunks" will fetch them from its local Application using
-the `LoadSnapshotChunk` method.
-
-As the new node receives "chunks" it will apply them sequentially to the local
-application with `ApplySnapshotChunk`. When all chunks have been applied, the
-Application's `AppHash` is retrieved via an `Info` query.
-To ensure that the sync proceeded correctly, Tendermint compares the local Application's `AppHash` to the `AppHash` stored on the blockchain (verified via
-[light client verification](../light-client/verification/README.md)).
-
-In summary:
-
-* [**ListSnapshots:**](./abci++_methods_002_draft.md#listsnapshots) Used by nodes to discover available snapshots on peers.
-
-* [**LoadSnapshotChunk:**](./abci++_methods_002_draft.md#loadsnapshotchunk) Used by Tendermint to retrieve snapshot chunks from the application to send to peers.
-
-* [**OfferSnapshot:**](./abci++_methods_002_draft.md#offersnapshot) When a node receives a snapshot from a peer, Tendermint uses this method to offer the snapshot to the Application.
-
-* [**ApplySnapshotChunk:**](./abci++_methods_002_draft.md#applysnapshotchunk) Used by Tendermint to hand snapshot chunks to the Application.
-
-### Other methods
-
-Additionally, there is a [**Flush**](./abci++_methods_002_draft.md#flush) method that is called on every connection,
-and an [**Echo**](./abci++_methods_002_draft.md#echo) method that is just for debugging.
-
-More details on managing state across connections can be found in the section on
-[ABCI Applications](../abci/apps.md).
-
-## Next-block execution vs. same-block execution
-[↑ Back to Outline](#outline)
-
-In the original ABCI protocol, the only moment when the Application had access to a
-block was after it was decided. This led to a block execution model, called _next-block
-execution_, where some fields hashed in a block header refer to the execution of the
-previous block, namely:
-
-* the Merkle root of the Application's state
-* the transaction results
-* the consensus parameter updates
-* the validator updates
-
-With ABCI++, an Application may decide to keep using the next-block execution model, by doing all its processing in `FinalizeBlock`;
-however the new methods introduced, `PrepareProposal` and `ProcessProposal` allow
-for a new execution model, called _same-block execution_. An Application implementing
-this execution model, upon receiving a raw proposal via `RequestPrepareProposal`
-and potentially modifying its transaction list,
-fully executes the resulting prepared proposal as though it was the decided block.
-The results of the block execution are used as follows:
-
-* The block execution may generate a set of events. The Application should store these events and return them back to Tendermint during the `FinalizeBlock` call if the block is finally decided.
-* The Merkle root resulting from executing the prepared proposal is provided in
- `ResponsePrepareProposal` and thus refers to the **current block**. Tendermint
- will use it in the prepared proposal's header.
-* likewise, the transaction results from executing the prepared proposal are
- provided in `ResponsePrepareProposal` and refer to the transactions in the
- **current block**. Tendermint will use them to calculate the results hash
- in the prepared proposal's header.
-* The consensus parameter updates and validator updates are also provided in
- `ResponsePrepareProposal` and reflect the result of the prepared proposal's
- execution. They come into force in height H+1 (as opposed to the H+2 rule
- in next-block execution model).
-
-If the Application decides to keep the next-block execution model, it will not
-provide any data in `ResponsePrepareProposal`, other than an optionally modified
-transaction list.
-
-In the long term, the execution model will be set in a new boolean parameter
-*same_block* in `ConsensusParams`.
-It **must not** be changed once the blockchain has started unless the Application
-developers _really_ know what they are doing.
-However, modifying `ConsensusParams` structure cannot be done lightly if we are to
-preserve blockchain compatibility. Therefore we need an interim solution until
-soft upgrades are specified and implemented in Tendermint. This somewhat _unsafe_
-solution consists in Tendermint assuming same-block execution if the Application
-fills the above mentioned fields in `ResponsePrepareProposal`.
-
-### Tendermint timeouts in same-block execution
-
-The new same-block execution mode requires the Application to fully execute the
-prepared block at `PrepareProposal` time. This execution is synchronous, so
-Tendermint cannot make progress until the Application returns from `PrepareProposal`.
-This stands on Tendermint's critical path: if the Application takes a long time
-executing the block, the default value of _TimeoutPropose_ might not be sufficient
-to accommodate the long block execution time and non-proposer processes might time
-out and prevote `nil`, thus starting a further round unnecessarily.
-
-The Application is the best suited to provide a value for _TimeoutPropose_ so
-that the block execution time upon `PrepareProposal` fits well in the propose
-timeout interval.
-
-Currently, the Application can override the value of _TimeoutPropose_ via the
-`config.toml` file. In the future, `ConsensusParams` will have an extra field
-with the current _TimeoutPropose_ value so that the Application can adapt it at every height.
-
-## Determinism
-[↑ Back to Outline](#outline)
-
-ABCI++ applications must implement deterministic finite-state machines to be
-securely replicated by the Tendermint consensus engine. This means block execution
-over the Consensus Connection must be strictly deterministic: given the same
-ordered set of transactions, all nodes will compute identical responses, for all
-successive `FinalizeBlock` calls. This is critical because the
-responses are included in the header of the next block, either via a Merkle root
-or directly, so all nodes must agree on exactly what they are.
-
-For this reason, it is recommended that application state is not exposed to any
-external user or process except via the ABCI connections to a consensus engine
-like Tendermint Core. The Application must only change its state based on input
-from block execution (`FinalizeBlock` calls), and not through
-any other kind of request. This is the only way to ensure all nodes see the same
-transactions and compute the same results.
-
-Some Applications may choose to execute the blocks that are about to be proposed
-(via `PrepareProposal`), or those that the Application is asked to validate
-(via `ProcessProposal`). However, the state changes caused by processing those
-proposed blocks must never replace the previous state until `FinalizeBlock` confirms
-the block decided.
-
-Additionally, vote extensions or the validation thereof (via `ExtendVote` or
-`VerifyVoteExtension`) must _never_ have side effects on the current state.
-They can only be used when their data is provided in a `RequestPrepareProposal` call.
-
-If there is some non-determinism in the state machine, consensus will eventually
-fail as nodes disagree over the correct values for the block header. The
-non-determinism must be fixed and the nodes restarted.
-
-Sources of non-determinism in applications may include:
-
-* Hardware failures
- * Cosmic rays, overheating, etc.
-* Node-dependent state
- * Random numbers
- * Time
-* Underspecification
- * Library version changes
- * Race conditions
- * Floating point numbers
- * JSON or protobuf serialization
- * Iterating through hash-tables/maps/dictionaries
-* External Sources
- * Filesystem
- * Network calls (eg. some external REST API service)
-
-See [#56](https://github.com/tendermint/abci/issues/56) for original discussion.
-
-Note that some methods (`Query, CheckTx, FinalizeBlock`) return
-explicitly non-deterministic data in the form of `Info` and `Log` fields. The `Log` is
-intended for the literal output from the Application's logger, while the
-`Info` is any additional info that should be returned. These are the only fields
-that are not included in block header computations, so we don't need agreement
-on them. All other fields in the `Response*` must be strictly deterministic.
-
-## Errors
-[↑ Back to Outline](#outline)
-
-The `Query`, and `CheckTx` methods include a `Code` field in their `Response*`.
-The `Code` field is also included in type `TxResult`, used by
-method `FinalizeBlock`'s `Response*`.
-Field `Code` is meant to contain an application-specific response code.
-A response code of `0` indicates no error. Any other response code
-indicates to Tendermint that an error occurred.
-
-These methods also return a `Codespace` string to Tendermint. This field is
-used to disambiguate `Code` values returned by different domains of the
-Application. The `Codespace` is a namespace for the `Code`.
-
-Methods `Echo`, `Info`, and `InitChain` do not return errors.
-An error in any of these methods represents a critical issue that Tendermint
-has no reasonable way to handle. If there is an error in one
-of these methods, the Application must crash to ensure that the error is safely
-handled by an operator.
-
-Method `FinalizeBlock` is a special case. It contains a number of
-`Code` and `Codespace` fields as part of type `TxResult`. Each of
-these codes reports errors related to the transaction it is attached to.
-However, `FinalizeBlock` does not return errors at the top level, so the
-same considerations on critical issues made for `Echo`, `Info`, and
-`InitChain` also apply here.
-
-The handling of non-zero response codes by Tendermint is described below
-
-### `CheckTx`
-
-When Tendermint receives a `ResponseCheckTx` with a non-zero `Code`, the associated
-transaction will not be added to Tendermint's mempool or it will be removed if
-it is already included.
-
-### `TxResult` (as part of `FinalizeBlock`)
-
-The `TxResult` type delivers transactions from Tendermint to the Application.
-When Tendermint receives a `ResponseFinalizeBlock` containing a `TxResult`
-with a non-zero `Code`, the response code is logged.
-The transaction was already included in a block, so the `Code` does not influence
-Tendermint consensus.
-
-### `Query`
-
-When Tendermint receives a `ResponseQuery` with a non-zero `Code`, this code is
-returned directly to the client that initiated the query.
-
-## Events
-[↑ Back to Outline](#outline)
-
-Method `CheckTx` includes an `Events` field in its `Response*`.
-Method `FinalizeBlock` includes an `Events` field at the top level in its
-`Response*`, and one `events` field per transaction included in the block.
-Applications may respond to these ABCI++ methods with a set of events.
-Events allow applications to associate metadata about ABCI++ method execution with the
-transactions and blocks this metadata relates to.
-Events returned via these ABCI++ methods do not impact Tendermint consensus in any way
-and instead exist to power subscriptions and queries of Tendermint state.
-
-An `Event` contains a `type` and a list of `EventAttributes`, which are key-value
-string pairs denoting metadata about what happened during the method's (or transaction's)
-execution. `Event` values can be used to index transactions and blocks according to what
-happened during their execution.
-
-Each event has a `type` which is meant to categorize the event for a particular
-`Response*` or `Tx`. A `Response*` or `Tx` may contain multiple events with duplicate
-`type` values, where each distinct entry is meant to categorize attributes for a
-particular event. Every key and value in an event's attributes must be UTF-8
-encoded strings along with the event type itself.
-
-```protobuf
-message Event {
- string type = 1;
- repeated EventAttribute attributes = 2;
-}
-```
-
-The attributes of an `Event` consist of a `key`, a `value`, and an `index` flag. The
-index flag notifies the Tendermint indexer to index the attribute. The value of
-the `index` flag is non-deterministic and may vary across different nodes in the network.
-
-```protobuf
-message EventAttribute {
- bytes key = 1;
- bytes value = 2;
- bool index = 3; // nondeterministic
-}
-```
-
-Example:
-
-```go
- abci.ResponseCheckTx{
- // ...
- Events: []abci.Event{
- {
- Type: "validator.provisions",
- Attributes: []abci.EventAttribute{
- abci.EventAttribute{Key: []byte("address"), Value: []byte("..."), Index: true},
- abci.EventAttribute{Key: []byte("amount"), Value: []byte("..."), Index: true},
- abci.EventAttribute{Key: []byte("balance"), Value: []byte("..."), Index: true},
- },
- },
- {
- Type: "validator.provisions",
- Attributes: []abci.EventAttribute{
- abci.EventAttribute{Key: []byte("address"), Value: []byte("..."), Index: true},
- abci.EventAttribute{Key: []byte("amount"), Value: []byte("..."), Index: false},
- abci.EventAttribute{Key: []byte("balance"), Value: []byte("..."), Index: false},
- },
- },
- {
- Type: "validator.slashed",
- Attributes: []abci.EventAttribute{
- abci.EventAttribute{Key: []byte("address"), Value: []byte("..."), Index: false},
- abci.EventAttribute{Key: []byte("amount"), Value: []byte("..."), Index: true},
- abci.EventAttribute{Key: []byte("reason"), Value: []byte("..."), Index: true},
- },
- },
- // ...
- },
-}
-```
-
-## Evidence
-[↑ Back to Outline](#outline)
-
-Tendermint's security model relies on the use of "evidence". Evidence is proof of
-malicious behavior by a network participant. It is the responsibility of Tendermint
-to detect such malicious behavior. When malicious behavior is detected, Tendermint
-will gossip evidence of the behavior to other nodes and commit the evidence to
-the chain once it is verified by all validators. This evidence will then be
-passed on to the Application through ABCI++. It is the responsibility of the
-Application to handle the evidence and exercise punishment.
-
-EvidenceType has the following protobuf format:
-
-```protobuf
-enum EvidenceType {
- UNKNOWN = 0;
- DUPLICATE_VOTE = 1;
- LIGHT_CLIENT_ATTACK = 2;
-}
-```
-
-There are two forms of evidence: Duplicate Vote and Light Client Attack. More
-information can be found in either [data structures](../core/data_structures.md)
-or [accountability](../light-client/accountability/)
-
diff --git a/spec/abci++/abci++_client_server_002_draft.md b/spec/abci++/abci++_client_server.md
similarity index 91%
rename from spec/abci++/abci++_client_server_002_draft.md
rename to spec/abci++/abci++_client_server.md
index f26ee8cd5..652652dc9 100644
--- a/spec/abci++/abci++_client_server_002_draft.md
+++ b/spec/abci++/abci++_client_server.md
@@ -9,10 +9,10 @@ This section is for those looking to implement their own ABCI Server, perhaps in
a new programming language.
You are expected to have read all previous sections of ABCI++ specification, namely
-[Basic Concepts](./abci%2B%2B_basic_concepts_002_draft.md),
-[Methods](./abci%2B%2B_methods_002_draft.md),
-[Application Requirements](./abci%2B%2B_app_requirements_002_draft.md), and
-[Expected Behavior](./abci%2B%2B_tmint_expected_behavior_002_draft.md).
+[Basic Concepts](./abci%2B%2B_basic_concepts.md),
+[Methods](./abci%2B%2B_methods.md),
+[Application Requirements](./abci%2B%2B_app_requirements.md), and
+[Expected Behavior](./abci%2B%2B_tmint_expected_behavior.md).
## Message Protocol and Synchrony
@@ -25,7 +25,7 @@ or custom protobuf types.
For more details on protobuf, see the [documentation](https://developers.google.com/protocol-buffers/docs/overview).
As of v0.36 requests are synchronous. For each of ABCI++'s four connections (see
-[Connections](./abci%2B%2B_app_requirements_002_draft.md)), when Tendermint issues a request to the
+[Connections](./abci%2B%2B_app_requirements.md)), when Tendermint issues a request to the
Application, it will wait for the response before continuing execution. As a side effect,
requests and responses are ordered for each connection, but not necessarily across connections.
diff --git a/spec/abci++/abci++_methods_002_draft.md b/spec/abci++/abci++_methods.md
similarity index 71%
rename from spec/abci++/abci++_methods_002_draft.md
rename to spec/abci++/abci++_methods.md
index 4eb1bb295..4d1e47bef 100644
--- a/spec/abci++/abci++_methods_002_draft.md
+++ b/spec/abci++/abci++_methods.md
@@ -38,22 +38,21 @@ title: Methods
* **Response**:
- | Name | Type | Description | Field Number |
- |---------------------|--------|--------------------------------------------------|--------------|
- | data | string | Some arbitrary information | 1 |
- | version | string | The application software semantic version | 2 |
- | app_version | uint64 | The application protocol version | 3 |
- | last_block_height | int64 | Latest block for which the app has called Commit | 4 |
- | last_block_app_hash | bytes | Latest result of Commit | 5 |
+ | Name | Type | Description | Field Number |
+ |---------------------|--------|-----------------------------------------------------|--------------|
+ | data | string | Some arbitrary information | 1 |
+ | version | string | The application software semantic version | 2 |
+ | app_version | uint64 | The application protocol version | 3 |
+ | last_block_height | int64 | Latest height for which the app persisted its state | 4 |
+ | last_block_app_hash | bytes | Latest AppHash returned by `FinalizeBlock` | 5 |
* **Usage**:
* Return information about the application state.
* Used to sync Tendermint with the application during a handshake
- that happens on startup.
+ that happens on startup or on recovery.
* The returned `app_version` will be included in the Header of every block.
* Tendermint expects `last_block_app_hash` and `last_block_height` to
- be updated during `Commit`, ensuring that `Commit` is never
- called twice for the same block height.
+ be updated during `FinalizeBlock` and persisted during `Commit`.
> Note: Semantic version is a reference to [semantic versioning](https://semver.org/). Semantic versions in info will be displayed as X.X.x.
@@ -61,22 +60,22 @@ title: Methods
* **Request**:
- | Name | Type | Description | Field Number |
- |------------------|--------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------|--------------|
- | time | [google.protobuf.Timestamp](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Timestamp) | Genesis time | 1 |
- | chain_id | string | ID of the blockchain. | 2 |
- | consensus_params | [ConsensusParams](#consensusparams) | Initial consensus-critical parameters. | 3 |
- | validators | repeated [ValidatorUpdate](#validatorupdate) | Initial genesis validators, sorted by voting power. | 4 |
- | app_state_bytes | bytes | Serialized initial application state. JSON bytes. | 5 |
- | initial_height | int64 | Height of the initial block (typically `1`). | 6 |
+ | Name | Type | Description | Field Number |
+ |------------------|-------------------------------------------------|-----------------------------------------------------|--------------|
+ | time | [google.protobuf.Timestamp][protobuf-timestamp] | Genesis time | 1 |
+ | chain_id | string | ID of the blockchain. | 2 |
+ | consensus_params | [ConsensusParams](#consensusparams) | Initial consensus-critical parameters. | 3 |
+ | validators | repeated [ValidatorUpdate](#validatorupdate) | Initial genesis validators, sorted by voting power. | 4 |
+ | app_state_bytes | bytes | Serialized initial application state. JSON bytes. | 5 |
+ | initial_height | int64 | Height of the initial block (typically `1`). | 6 |
* **Response**:
- | Name | Type | Description | Field Number |
- |------------------|----------------------------------------------|-------------------------------------------------|--------------|
+ | Name | Type | Description | Field Number |
+ |------------------|----------------------------------------------|--------------------------------------------------|--------------|
| consensus_params | [ConsensusParams](#consensusparams) | Initial consensus-critical parameters (optional) | 1 |
- | validators | repeated [ValidatorUpdate](#validatorupdate) | Initial validator set (optional). | 2 |
- | app_hash | bytes | Initial application hash. | 3 |
+ | validators | repeated [ValidatorUpdate](#validatorupdate) | Initial validator set (optional). | 2 |
+ | app_hash | bytes | Initial application hash. | 3 |
* **Usage**:
* Called once upon genesis.
@@ -84,10 +83,10 @@ title: Methods
* If `ResponseInitChain.Validators` is not empty, it will be the initial
validator set (regardless of what is in `RequestInitChain.Validators`).
* This allows the app to decide if it wants to accept the initial validator
- set proposed by tendermint (ie. in the genesis file), or if it wants to use
+ set proposed by Tendermint (ie. in the genesis file), or if it wants to use
a different one (perhaps computed based on some application specific
information in the genesis file).
- * Both `ResponseInitChain.Validators` and `ResponseInitChain.Validators` are [ValidatorUpdate](#validatorupdate) structs.
+ * Both `RequestInitChain.Validators` and `ResponseInitChain.Validators` are [ValidatorUpdate](#validatorupdate) structs.
So, technically, they both are _updating_ the set of validators from the empty set.
### Query
@@ -97,7 +96,7 @@ title: Methods
| Name | Type | Description | Field Number |
|--------|--------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
| data | bytes | Raw query bytes. Can be used with or in lieu of Path. | 1 |
- | path | string | Path field of the request URI. Can be used with or in lieu of `data`. Apps MUST interpret `/store` as a query by key on the underlying store. The key SHOULD be specified in the `data` field. Apps SHOULD allow queries over specific types like `/accounts/...` or `/votes/...` | 2 |
+ | path | string | Path field of the request URI. Can be used with or in lieu of `data`. Apps MUST interpret `/store` as a query by key on the underlying store. The key SHOULD be specified in the `data` field. Apps SHOULD allow queries over specific types like `/accounts/...` or `/votes/...` | 2 |
| height | int64 | The block height for which you want the query (default=0 returns data for the latest committed block). Note that this is the height of the block containing the application's Merkle root hash, which represents the state as it was after committing the block at Height-1 | 3 |
| prove | bool | Return Merkle proof with response if possible | 4 |
@@ -145,15 +144,40 @@ title: Methods
* Technically optional - not involved in processing blocks.
* Guardian of the mempool: every node runs `CheckTx` before letting a
- transaction into its local mempool.
+ transaction into its local mempool.
* The transaction may come from an external user or another node
* `CheckTx` validates the transaction against the current state of the application,
- for example, checking signatures and account balances, but does not apply any
- of the state changes described in the transaction.
- not running code in a virtual machine.
- * Transactions where `ResponseCheckTx.Code != 0` will be rejected - they will not be broadcast to
- other nodes or included in a proposal block.
- * Tendermint attributes no other value to the response code
+ for example, checking signatures and account balances, but does not apply any
+ of the state changes described in the transaction.
+ * Transactions where `ResponseCheckTx.Code != 0` will be rejected - they will not be broadcast
+ to other nodes or included in a proposal block.
+ Tendermint attributes no other value to the response code.
+
+### Commit
+
+#### Parameters and Types
+
+* **Request**:
+
+ | Name | Type | Description | Field Number |
+ |--------|-------|-------------|--------------|
+
+ Commit signals the application to persist application state. It takes no parameters.
+
+* **Response**:
+
+ | Name | Type | Description | Field Number |
+ |---------------|-------|------------------------------------------------------------------------|--------------|
+ | retain_height | int64 | Blocks below this height may be removed. Defaults to `0` (retain all). | 3 |
+
+* **Usage**:
+
+ * Signal the Application to persist the application state.
+ Application is expected to persist its state at the end of this call, before calling `ResponseCommit`.
+ * Use `ResponseCommit.retain_height` with caution! If all nodes in the network remove historical
+ blocks then this data is permanently lost, and no new nodes will be able to join the network and
+ bootstrap. Historical blocks may also be required for other purposes, e.g. auditing, replay of
+ non-persisted heights, light client verification, and so on.
### ListSnapshots
@@ -269,7 +293,7 @@ title: Methods
`Snapshot.Metadata` and/or incrementally verifying contents against `AppHash`.
* When all chunks have been accepted, Tendermint will make an ABCI `Info` call to verify that
`LastBlockAppHash` and `LastBlockHeight` matches the expected values, and record the
- `AppVersion` in the node state. It then switches to fast sync or consensus and joins the
+ `AppVersion` in the node state. It then switches to block sync or consensus and joins the
network.
* If Tendermint is unable to retrieve the next chunk after some time (e.g. because no suitable
peers are available), it will reject the snapshot and try a different one via `OfferSnapshot`.
@@ -283,16 +307,16 @@ title: Methods
* **Request**:
- | Name | Type | Description | Field Number |
- |-------------------------|---------------------------------------------|------------------------------------------------------------------------------------------------------------------|--------------|
- | max_tx_bytes | int64 | Currently configured maximum size in bytes taken by the modified transactions. | 1 |
- | txs | repeated bytes | Preliminary list of transactions that have been picked as part of the block to propose. | 2 |
- | local_last_commit | [ExtendedCommitInfo](#extendedcommitinfo) | Info about the last commit, obtained locally from Tendermint's data structures. | 3 |
- | byzantine_validators | repeated [Misbehavior](#misbehavior) | List of information about validators that acted incorrectly. | 4 |
- | height | int64 | The height of the block that will be proposed. | 5 |
- | time | [google.protobuf.Timestamp](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Timestamp) | Timestamp of the block that that will be proposed. | 6 |
- | next_validators_hash | bytes | Merkle root of the next validator set. | 7 |
- | proposer_address | bytes | [Address](../core/data_structures.md#address) of the validator that is creating the proposal. | 8 |
+ | Name | Type | Description | Field Number |
+ |----------------------|-------------------------------------------------|-----------------------------------------------------------------------------------------------|--------------|
+ | max_tx_bytes | int64 | Currently configured maximum size in bytes taken by the modified transactions. | 1 |
+ | txs | repeated bytes | Preliminary list of transactions that have been picked as part of the block to propose. | 2 |
+ | local_last_commit | [ExtendedCommitInfo](#extendedcommitinfo) | Info about the last commit, obtained locally from Tendermint's data structures. | 3 |
+ | misbehavior | repeated [Misbehavior](#misbehavior) | List of information about validators that misbehaved. | 4 |
+ | height | int64 | The height of the block that will be proposed. | 5 |
+ | time | [google.protobuf.Timestamp][protobuf-timestamp] | Timestamp of the block that that will be proposed. | 6 |
+ | next_validators_hash | bytes | Merkle root of the next validator set. | 7 |
+ | proposer_address | bytes | [Address](../core/data_structures.md#address) of the validator that is creating the proposal. | 8 |
* **Response**:
@@ -302,92 +326,128 @@ title: Methods
| app_hash | bytes | The Merkle root hash of the application state. | 3 |
| tx_results | repeated [ExecTxResult](#exectxresult) | List of structures containing the data resulting from executing the transactions | 4 |
| validator_updates | repeated [ValidatorUpdate](#validatorupdate) | Changes to validator set (set voting power to 0 to remove). | 5 |
- | consensus_param_updates | [ConsensusParams](#consensusparams) | Changes to consensus-critical gas, size, and other parameters. | 6 |
+ | consensus_param_updates | [ConsensusParams](#consensusparams) | Changes to gas, size, and other consensus-related parameters. | 6 |
* **Usage**:
- * The first six parameters of `RequestPrepareProposal` are the same as `RequestProcessProposal`
+ * `RequestPrepareProposal`'s parameters `txs`, `misbehavior`, `height`, `time`,
+ `next_validators_hash`, and `proposer_address` are the same as in `RequestProcessProposal`
and `RequestFinalizeBlock`.
- * The height and time values match the values from the header of the proposed block.
- * `RequestPrepareProposal` contains a preliminary set of transactions `txs` that Tendermint considers to be a good block proposal, called _raw proposal_. The Application can modify this set via `ResponsePrepareProposal.tx_records` (see [TxRecord](#txrecord)).
- * The Application _can_ reorder, remove or add transactions to the raw proposal. Let `tx` be a transaction in `txs`:
- * If the Application considers that `tx` should not be proposed in this block, e.g., there are other transactions with higher priority, then it should not include it in `tx_records`. In this case, Tendermint won't remove `tx` from the mempool. The Application should be extra-careful, as abusing this feature may cause transactions to stay forever in the mempool.
- * If the Application considers that a `tx` should not be included in the proposal and removed from the mempool, then the Application should include it in `tx_records` and _mark_ it as `REMOVED`. In this case, Tendermint will remove `tx` from the mempool.
- * If the Application wants to add a new transaction, then the Application should include it in `tx_records` and _mark_ it as `ADD`. In this case, Tendermint will add it to the mempool.
- * The Application should be aware that removing and adding transactions may compromise _traceability_.
- > Consider the following example: the Application transforms a client-submitted transaction `t1` into a second transaction `t2`, i.e., the Application asks Tendermint to remove `t1` and add `t2` to the mempool. If a client wants to eventually check what happened to `t1`, it will discover that `t_1` is not in the mempool or in a committed block, getting the wrong idea that `t_1` did not make it into a block. Note that `t_2` _will be_ in a committed block, but unless the Application tracks this information, no component will be aware of it. Thus, if the Application wants traceability, it is its responsability to support it. For instance, the Application could attach to a transformed transaction a list with the hashes of the transactions it derives from.
- * Tendermint MAY include a list of transactions in `RequestPrepareProposal.txs` whose total size in bytes exceeds `RequestPrepareProposal.max_tx_bytes`.
- Therefore, if the size of `RequestPrepareProposal.txs` is greater than `RequestPrepareProposal.max_tx_bytes`, the Application MUST make sure that the
- `RequestPrepareProposal.max_tx_bytes` limit is respected by those transaction records returned in `ResponsePrepareProposal.tx_records` that are marked as `UNMODIFIED` or `ADDED`.
- * In same-block execution mode, the Application must provide values for `ResponsePrepareProposal.app_hash`,
- `ResponsePrepareProposal.tx_results`, `ResponsePrepareProposal.validator_updates`, and
+ * `RequestPrepareProposal.local_last_commit` is a set of the precommit votes that allowed the
+ decision of the previous block, together with their corresponding vote extensions.
+ * The `height`, `time`, and `proposer_address` values match the values from the header of the
+ proposed block.
+ * `RequestPrepareProposal` contains a preliminary set of transactions `txs` that Tendermint
+ retrieved from the mempool, called _raw proposal_. The Application can modify this
+ set via `ResponsePrepareProposal.tx_records` (see [TxRecord](#txrecord)).
+ * The Application _can_ modify the raw proposal: it can reorder, remove or add transactions.
+ Let `tx` be a transaction in `txs`:
+ * If the Application considers that `tx` should not be proposed in this block, e.g.,
+ there are other transactions with higher priority, then it should not include it in
+ `tx_records`. In this case, Tendermint will not remove `tx` from the mempool. The
+ Application should be extra-careful, as abusing this feature may cause transactions
+ to stay much longer than needed in the mempool.
+ * If the Application considers that `tx` should not be included in the proposal and
+ removed from the mempool, then the Application should include it in `tx_records` and
+ _mark_ it as `REMOVED`. In this case, Tendermint will remove `tx` from the mempool.
+ * If the Application wants to add a new transaction to the proposed block, then the
+ Application includes it in `tx_records` and _marks_ it as `ADDED`. In this case, Tendermint
+ will also add the transaction to the mempool.
+ * The Application should be aware that removing and adding transactions may compromise
+ _traceability_.
+ > Consider the following example: the Application transforms a client-submitted
+ transaction `t1` into a second transaction `t2`, i.e., the Application asks Tendermint
+ to remove `t1` and add `t2` to the mempool. If a client wants to eventually check what
+ happened to `t1`, it will discover that `t1` is neither in the mempool nor in a
+ committed block, getting the wrong idea that `t1` did not make it into a block. Note
+ that `t2` _will be_ in a committed block, but unless the Application tracks this
+ information, no component will be aware of it. Thus, if the Application wants
+ traceability, it is its responsability to support it. For instance, the Application
+ could attach to a transformed transaction a list with the hashes of the transactions it
+ derives from.
+ * Tendermint MAY include a list of transactions in `RequestPrepareProposal.txs` whose total
+ size in bytes exceeds `RequestPrepareProposal.max_tx_bytes`.
+ Therefore, if the size of `RequestPrepareProposal.txs` is greater than
+ `RequestPrepareProposal.max_tx_bytes`, the Application MUST remove transactions to ensure
+ that the `RequestPrepareProposal.max_tx_bytes` limit is respected by those transaction
+ records returned in `ResponsePrepareProposal.tx_records` that are marked as `UNMODIFIED` or
+ `ADDED`.
+ * In same-block execution mode, the Application must provide values for
+ `ResponsePrepareProposal.app_hash`, `ResponsePrepareProposal.tx_results`,
+ `ResponsePrepareProposal.validator_updates`, and
`ResponsePrepareProposal.consensus_param_updates`, as a result of fully executing the block.
* The values for `ResponsePrepareProposal.validator_updates`, or
`ResponsePrepareProposal.consensus_param_updates` may be empty. In this case, Tendermint will keep
the current values.
* `ResponsePrepareProposal.validator_updates`, triggered by block `H`, affect validation
for blocks `H+1`, and `H+2`. Heights following a validator update are affected in the following way:
- * `H`: `NextValidatorsHash` includes the new `validator_updates` value.
- * `H+1`: The validator set change takes effect and `ValidatorsHash` is updated.
- * `H+2`: `local_last_commit` now includes the altered validator set.
+ * Height `H`: `NextValidatorsHash` includes the new `validator_updates` value.
+ * Height `H+1`: The validator set change takes effect and `ValidatorsHash` is updated.
+ * Height `H+2`: `*_last_commit` fields in `PrepareProposal`, `ProcessProposal`, and
+ `FinalizeBlock` now include the altered validator set.
* `ResponseFinalizeBlock.consensus_param_updates` returned for block `H` apply to the consensus
params for block `H+1` even if the change is agreed in block `H`.
For more information on the consensus parameters,
- see the [application spec entry on consensus parameters](../abci/apps.md#consensus-parameters).
- * It is the responsibility of the Application to set the right value for _TimeoutPropose_ so that
+ see the [consensus parameters](./abci%2B%2B_app_requirements.md#consensus-parameters)
+ section.
+ * It is the Application's responsibility to set the right value for _TimeoutPropose_ so that
the (synchronous) execution of the block does not cause other processes to prevote `nil` because
their propose timeout goes off.
- * In next-block execution mode, Tendermint will ignore parameters `ResponsePrepareProposal.tx_results`,
+ * In next-block execution mode, Tendermint will ignore parameters
+ `ResponsePrepareProposal.app_hash`, `ResponsePrepareProposal.tx_results`,
`ResponsePrepareProposal.validator_updates`, and `ResponsePrepareProposal.consensus_param_updates`.
- * As a result of executing the prepared proposal, the Application may produce header events or transaction events.
+ * As a result of executing the prepared proposal, the Application may produce block events or transaction events.
The Application must keep those events until a block is decided and then pass them on to Tendermint via
`ResponseFinalizeBlock`.
- * Likewise, in next-block execution mode, the Application must keep all responses to executing transactions
- until it can call `ResponseFinalizeBlock`.
+ * Likewise, in next-block execution mode, the Application must keep all responses to executing
+ transactions until it can call `ResponseFinalizeBlock`.
* As a sanity check, Tendermint will check the returned parameters for validity if the Application modified them.
In particular, `ResponsePrepareProposal.tx_records` will be deemed invalid if
* There is a duplicate transaction in the list.
- * A new or modified transaction is marked as `UNMODIFIED` or `REMOVED`.
- * An unmodified transaction is marked as `ADDED`.
+ * A new transaction is marked as `UNMODIFIED` or `REMOVED`.
+ * An existing transaction is marked as `ADDED`.
* A transaction is marked as `UNKNOWN`.
- * If Tendermint fails to validate the `ResponsePrepareProposal`, Tendermint will assume the application is faulty and crash.
+ * If Tendermint fails to validate the `ResponsePrepareProposal`, Tendermint will assume the
+ Application is faulty and crash.
* The implementation of `PrepareProposal` can be non-deterministic.
-#### When does Tendermint call it?
+#### When does Tendermint call `PrepareProposal`?
When a validator _p_ enters Tendermint consensus round _r_, height _h_, in which _p_ is the proposer,
and _p_'s _validValue_ is `nil`:
-1. _p_'s Tendermint collects outstanding transactions from the mempool
- * The transactions will be collected in order of priority
- * Let $C$ the list of currently collected transactions
- * The collection stops when any of the following conditions are met
- * the mempool is empty
- * the total size of transactions $\in C$ is greater than or equal to `consensusParams.block.max_bytes`
- * the sum of `GasWanted` field of transactions $\in C$ is greater than or equal to
- `consensusParams.block.max_gas`
+1. Tendermint collects outstanding transactions from _p_'s mempool
+ * the transactions will be collected in order of priority
* _p_'s Tendermint creates a block header.
-2. _p_'s Tendermint calls `RequestPrepareProposal` with the newly generated block.
- The call is synchronous: Tendermint's execution will block until the Application returns from the call.
-3. The Application checks the block (hashes, transactions, commit info, misbehavior). Besides,
- * in same-block execution mode, the Application can (and should) provide `ResponsePrepareProposal.app_hash`,
- `ResponsePrepareProposal.validator_updates`, or
+2. _p_'s Tendermint calls `RequestPrepareProposal` with the newly generated block, the local
+ commit of the previous height (with vote extensions), and any outstanding evidence of
+ misbehavior. The call is synchronous: Tendermint's execution will block until the Application
+ returns from the call.
+3. The Application uses the information received (transactions, commit info, misbehavior, time) to
+ (potentially) modify the proposal.
+ * in same-block execution mode, the Application fully executes the block and provides values
+ for `ResponsePrepareProposal.app_hash`, `ResponsePrepareProposal.tx_results`,
+ `ResponsePrepareProposal.validator_updates`, and
`ResponsePrepareProposal.consensus_param_updates`.
- * in "next-block execution" mode, _p_'s Tendermint will ignore the values for `ResponsePrepareProposal.app_hash`,
- `ResponsePrepareProposal.validator_updates`, and `ResponsePrepareProposal.consensus_param_updates`.
- * in both modes, the Application can manipulate transactions
+ * in next-block execution mode, _p_'s Tendermint will ignore the values for
+ `ResponsePrepareProposal.app_hash`, `ResponsePrepareProposal.tx_results`,
+ `ResponsePrepareProposal.validator_updates`, and
+ `ResponsePrepareProposal.consensus_param_updates`.
+ * in both modes, the Application can manipulate transactions:
* leave transactions untouched - `TxAction = UNMODIFIED`
- * add new transactions directly to the proposal - `TxAction = ADDED`
- * remove transactions (invalid) from the proposal and from the mempool - `TxAction = REMOVED`
+ * add new transactions (not present initially) to the proposal - `TxAction = ADDED`
+ * remove (invalid) transactions from the proposal and from the mempool - `TxAction = REMOVED`
* remove transactions from the proposal but not from the mempool (effectively _delaying_ them) - the
- Application removes the transaction from the list
- * modify transactions (e.g. aggregate them) - `TxAction = ADDED` followed by `TxAction = REMOVED`. As explained above, this compromises client traceability, unless it is implemented at the Application level.
+ Application does not include the transaction in `ResponsePrepareProposal.tx_records`
+ * modify transactions (e.g. aggregate them) - `TxAction = ADDED` followed by
+ `TxAction = REMOVED`. As explained above, this compromises client traceability, unless
+ it is implemented at the Application level.
* reorder transactions - the Application reorders transactions in the list
-4. If the block is modified, the Application sets `ResponsePrepareProposal.modified` to true,
- and includes the modified block in the return parameters (see the rules in section _Usage_).
- The Application returns from the call.
+4. The Application includes the transaction list (whether modified or not) in the return parameters
+ (see the rules in section _Usage_), and returns from the call.
5. _p_'s Tendermint uses the (possibly) modified block as _p_'s proposal in round _r_, height _h_.
-Note that, if _p_ has a non-`nil` _validValue_, Tendermint will use it as proposal and will not call `RequestPrepareProposal`.
+Note that, if _p_ has a non-`nil` _validValue_ in round _r_, height _h_, Tendermint will use it as
+proposal and will not call `RequestPrepareProposal`.
### ProcessProposal
@@ -395,16 +455,16 @@ Note that, if _p_ has a non-`nil` _validValue_, Tendermint will use it as propos
* **Request**:
- | Name | Type | Description | Field Number |
- |----------------------|---------------------------------------------|----------------------------------------------------------------------------------------------------------------|--------------|
- | txs | repeated bytes | List of transactions that have been picked as part of the proposed block. | 1 |
- | proposed_last_commit | [CommitInfo](#commitinfo) | Info about the last commit, obtained from the information in the proposed block. | 2 |
- | byzantine_validators | repeated [Misbehavior](#misbehavior) | List of information about validators that acted incorrectly. | 3 |
- | hash | bytes | The block header's hash of the proposed block. | 4 |
- | height | int64 | The height of the proposed block. | 5 |
- | time | [google.protobuf.Timestamp](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Timestamp) | Timestamp included in the proposed block. | 6 |
- | next_validators_hash | bytes | Merkle root of the next validator set. | 7 |
- | proposer_address | bytes | [Address](../core/data_structures.md#address) of the validator that created the proposal. | 8 |
+ | Name | Type | Description | Field Number |
+ |----------------------|-------------------------------------------------|-------------------------------------------------------------------------------------------|--------------|
+ | txs | repeated bytes | List of transactions of the proposed block. | 1 |
+ | proposed_last_commit | [CommitInfo](#commitinfo) | Info about the last commit, obtained from the information in the proposed block. | 2 |
+ | misbehavior | repeated [Misbehavior](#misbehavior) | List of information about validators that misbehaved. | 3 |
+ | hash | bytes | The hash of the proposed block. | 4 |
+ | height | int64 | The height of the proposed block. | 5 |
+ | time | [google.protobuf.Timestamp][protobuf-timestamp] | Timestamp of the proposed block. | 6 |
+ | next_validators_hash | bytes | Merkle root of the next validator set. | 7 |
+ | proposer_address | bytes | [Address](../core/data_structures.md#address) of the validator that created the proposal. | 8 |
* **Response**:
@@ -414,14 +474,19 @@ Note that, if _p_ has a non-`nil` _validValue_, Tendermint will use it as propos
| app_hash | bytes | The Merkle root hash of the application state. | 2 |
| tx_results | repeated [ExecTxResult](#exectxresult) | List of structures containing the data resulting from executing the transactions. | 3 |
| validator_updates | repeated [ValidatorUpdate](#validatorupdate) | Changes to validator set (set voting power to 0 to remove). | 4 |
- | consensus_param_updates | [ConsensusParams](#consensusparams) | Changes to consensus-critical gas, size, and other parameters. | 5 |
+ | consensus_param_updates | [ConsensusParams](#consensusparams) | Changes to gas, size, and other consensus-related parameters. | 5 |
* **Usage**:
- * Contains fields from the proposed block.
- * The Application may fully execute the block as though it was handling `RequestFinalizeBlock`.
- However, any resulting state changes must be kept as _candidate state_,
- and the Application should be ready to backtrack/discard it in case the decided block is different.
- * The height and timestamp values match the values from the header of the proposed block.
+ * Contains all information on the proposed block needed to fully execute it.
+ * The Application may fully execute the block as though it was handling
+ `RequestFinalizeBlock`.
+ * However, any resulting state changes must be kept as _candidate state_,
+ and the Application should be ready to discard it in case another block is decided.
+ * `RequestProcessProposal` is also called at the proposer of a round. The reason for this is to
+ inform the Application of the block header's hash, which cannot be done at `PrepareProposal`
+ time. In this case, the call to `RequestProcessProposal` occurs right after the call to
+ `RequestPrepareProposal`.
+ * The height and time values match the values from the header of the proposed block.
* If `ResponseProcessProposal.status` is `REJECT`, Tendermint assumes the proposal received
is not valid.
* In same-block execution mode, the Application is required to fully execute the block and provide values
@@ -430,35 +495,39 @@ Note that, if _p_ has a non-`nil` _validValue_, Tendermint will use it as propos
so that Tendermint can then verify the hashes in the block's header are correct.
If the hashes mismatch, Tendermint will reject the block even if `ResponseProcessProposal.status`
was set to `ACCEPT`.
- * In next-block execution mode, the Application should *not* provide values for parameters
+ * In next-block execution mode, the Application should _not_ provide values for parameters
`ResponseProcessProposal.app_hash`, `ResponseProcessProposal.tx_results`,
`ResponseProcessProposal.validator_updates`, and `ResponseProcessProposal.consensus_param_updates`.
* The implementation of `ProcessProposal` MUST be deterministic. Moreover, the value of
`ResponseProcessProposal.status` MUST **exclusively** depend on the parameters passed in
the call to `RequestProcessProposal`, and the last committed Application state
- (see [Requirements](abci++_app_requirements_002_draft.md) section).
+ (see [Requirements](./abci++_app_requirements.md) section).
* Moreover, application implementors SHOULD always set `ResponseProcessProposal.status` to `ACCEPT`,
unless they _really_ know what the potential liveness implications of returning `REJECT` are.
-#### When does Tendermint call it?
+#### When does Tendermint call `ProcessProposal`?
When a validator _p_ enters Tendermint consensus round _r_, height _h_, in which _q_ is the proposer (possibly _p_ = _q_):
1. _p_ sets up timer `ProposeTimeout`.
2. If _p_ is the proposer, _p_ executes steps 1-6 in [PrepareProposal](#prepareproposal).
-3. Upon reception of Proposal message (which contains the header) for round _r_, height _h_ from _q_, _p_'s Tendermint verifies the block header.
-4. Upon reception of Proposal message, along with all the block parts, for round _r_, height _h_ from _q_, _p_'s Tendermint follows its algorithm
- to check whether it should prevote for the block just received, or `nil`
-5. If Tendermint should prevote for the block just received
+3. Upon reception of Proposal message (which contains the header) for round _r_, height _h_ from
+ _q_, _p_'s Tendermint verifies the block header.
+4. Upon reception of Proposal message, along with all the block parts, for round _r_, height _h_
+ from _q_, _p_'s Tendermint follows its algorithm to check whether it should prevote for the
+ proposed block, or `nil`.
+5. If Tendermint should prevote for the proposed block:
1. Tendermint calls `RequestProcessProposal` with the block. The call is synchronous.
- 2. The Application checks/processes the proposed block, which is read-only, and returns true (_accept_) or false (_reject_) in `ResponseProcessProposal.accept`.
+ 2. The Application checks/processes the proposed block, which is read-only, and returns
+ `ACCEPT` or `REJECT` in the `ResponseProcessProposal.status` field.
* The Application, depending on its needs, may call `ResponseProcessProposal`
- * either after it has completely processed the block (the simpler case),
- * or immediately (after doing some basic checks), and process the block asynchronously. In this case the Application will
- not be able to reject the block, or force prevote/precommit `nil` afterwards.
+ * either after it has completely processed the block (immediate execution),
+ * or after doing some basic checks, and process the block asynchronously. In this case the
+ Application will not be able to reject the block, or force prevote/precommit `nil`
+ afterwards.
3. If the returned value is
- * _accept_, Tendermint prevotes on this proposal for round _r_, height _h_.
- * _reject_, Tendermint prevotes `nil`.
+ * `ACCEPT`: Tendermint prevotes on this proposal for round _r_, height _h_.
+ * `REJECT`: Tendermint prevotes `nil`.
### ExtendVote
@@ -473,20 +542,21 @@ When a validator _p_ enters Tendermint consensus round _r_, height _h_, in which
* **Response**:
- | Name | Type | Description | Field Number |
- |-------------------|-------|-----------------------------------------------|--------------|
- | vote_extension | bytes | Optional information signed by by Tendermint. | 1 |
+ | Name | Type | Description | Field Number |
+ |-------------------|-------|---------------------------------------------------------|--------------|
+ | vote_extension | bytes | Information signed by by Tendermint. Can have 0 length. | 1 |
* **Usage**:
- * `ResponseExtendVote.vote_extension` is optional information that, if present, will be signed by Tendermint and
- attached to the Precommit message.
- * `RequestExtendVote.hash` corresponds to the hash of a proposed block that was made available to the application
- in a previous call to `ProcessProposal` or `PrepareProposal` for the current height.
+ * `ResponseExtendVote.vote_extension` is application-generated information that will be signed
+ by Tendermint and attached to the Precommit message.
+ * The Application may choose to use an empty vote extension (0 length).
+ * `RequestExtendVote.hash` corresponds to the hash of a proposed block that was made available
+ to the Application in a previous call to `ProcessProposal` for the current height.
* `ResponseExtendVote.vote_extension` will only be attached to a non-`nil` Precommit message. If Tendermint is to
precommit `nil`, it will not call `RequestExtendVote`.
* The Application logic that creates the extension can be non-deterministic.
-#### When does Tendermint call it?
+#### When does Tendermint call `ExtendVote`?
When a validator _p_ is in Tendermint consensus state _prevote_ of round _r_, height _h_, in which _q_ is the proposer; and _p_ has received
@@ -497,7 +567,7 @@ then _p_'s Tendermint locks _v_ and sends a Precommit message in the following
1. _p_'s Tendermint sets _lockedValue_ and _validValue_ to _v_, and sets _lockedRound_ and _validRound_ to _r_
2. _p_'s Tendermint calls `RequestExtendVote` with _id(v)_ (`RequestExtendVote.hash`). The call is synchronous.
-3. The Application optionally returns an array of bytes, `ResponseExtendVote.extension`, which is not interpreted by Tendermint.
+3. The Application returns an array of bytes, `ResponseExtendVote.extension`, which is not interpreted by Tendermint.
4. _p_'s Tendermint includes `ResponseExtendVote.extension` in a field of type [CanonicalVoteExtension](#canonicalvoteextension),
it then populates the other fields in [CanonicalVoteExtension](#canonicalvoteextension), and signs the populated
data structure.
@@ -516,12 +586,12 @@ a [CanonicalVoteExtension](#canonicalvoteextension) field in the `precommit nil`
* **Request**:
- | Name | Type | Description | Field Number |
- |-------------------|-------|------------------------------------------------------------------------------------------|--------------|
- | hash | bytes | The header hash of the propsed block that the vote extension refers to. | 1 |
- | validator_address | bytes | [Address](../core/data_structures.md#address) of the validator that signed the extension | 2 |
- | height | int64 | Height of the block (for sanity check). | 3 |
- | vote_extension | bytes | Application-specific information signed by Tendermint. Can have 0 length | 4 |
+ | Name | Type | Description | Field Number |
+ |-------------------|-------|-------------------------------------------------------------------------------------------|--------------|
+ | hash | bytes | The hash of the proposed block that the vote extension refers to. | 1 |
+ | validator_address | bytes | [Address](../core/data_structures.md#address) of the validator that signed the extension. | 2 |
+ | height | int64 | Height of the block (for sanity check). | 3 |
+ | vote_extension | bytes | Application-specific information signed by Tendermint. Can have 0 length. | 4 |
* **Response**:
@@ -530,33 +600,38 @@ a [CanonicalVoteExtension](#canonicalvoteextension) field in the `precommit nil`
| status | [VerifyStatus](#verifystatus) | `enum` signaling if the application accepts the vote extension | 1 |
* **Usage**:
- * `RequestVerifyVoteExtension.vote_extension` can be an empty byte array. The Application's interpretation of it should be
+ * `RequestVerifyVoteExtension.vote_extension` can be an empty byte array. The Application's
+ interpretation of it should be
that the Application running at the process that sent the vote chose not to extend it.
Tendermint will always call `RequestVerifyVoteExtension`, even for 0 length vote extensions.
+ * `RequestVerifyVoteExtension` is not called for precommit votes sent by the local process.
+ * `RequestVerifyVoteExtension.hash` refers to a proposed block. There is not guarantee that
+ this proposed block has previously been exposed to the Application via `ProcessProposal`.
* If `ResponseVerifyVoteExtension.status` is `REJECT`, Tendermint will reject the whole received vote.
- See the [Requirements](abci++_app_requirements_002_draft.md) section to understand the potential
+ See the [Requirements](./abci++_app_requirements.md) section to understand the potential
liveness implications of this.
* The implementation of `VerifyVoteExtension` MUST be deterministic. Moreover, the value of
`ResponseVerifyVoteExtension.status` MUST **exclusively** depend on the parameters passed in
the call to `RequestVerifyVoteExtension`, and the last committed Application state
- (see [Requirements](abci++_app_requirements_002_draft.md) section).
+ (see [Requirements](./abci++_app_requirements.md) section).
* Moreover, application implementers SHOULD always set `ResponseVerifyVoteExtension.status` to `ACCEPT`,
unless they _really_ know what the potential liveness implications of returning `REJECT` are.
-#### When does Tendermint call it?
+#### When does Tendermint call `VerifyVoteExtension`?
-When a validator _p_ is in Tendermint consensus round _r_, height _h_, state _prevote_ (**TODO** discuss: I think I must remove the state
-from this condition, but not sure), and _p_ receives a Precommit message for round _r_, height _h_ from _q_:
+When a node _p_ is in Tendermint consensus round _r_, height _h_, and _p_ receives a Precommit
+message for round _r_, height _h_ from validator _q_ (_q_ ≠ _p_):
-1. If the Precommit message does not contain a vote extension with a valid signature, Tendermint discards the message as invalid.
+1. If the Precommit message does not contain a vote extension with a valid signature, Tendermint
+ discards the Precommit message as invalid.
* a 0-length vote extension is valid as long as its accompanying signature is also valid.
2. Else, _p_'s Tendermint calls `RequestVerifyVoteExtension`.
-3. The Application returns _accept_ or _reject_ via `ResponseVerifyVoteExtension.status`.
+3. The Application returns `ACCEPT` or `REJECT` via `ResponseVerifyVoteExtension.status`.
4. If the Application returns
- * _accept_, _p_'s Tendermint will keep the received vote, together with its corresponding
+ * `ACCEPT`, _p_'s Tendermint will keep the received vote, together with its corresponding
vote extension in its internal data structures. It will be used to populate the [ExtendedCommitInfo](#extendedcommitinfo)
structure in calls to `RequestPrepareProposal`, in rounds of height _h + 1_ where _p_ is the proposer.
- * _reject_, _p_'s Tendermint will deem the Precommit message invalid and discard it.
+ * `REJECT`, _p_'s Tendermint will deem the Precommit message invalid and discard it.
### FinalizeBlock
@@ -564,38 +639,38 @@ from this condition, but not sure), and _p_ receives a Precommit message for rou
* **Request**:
- | Name | Type | Description | Field Number |
- |----------------------|---------------------------------------------|------------------------------------------------------------------------------------------|--------------|
- | txs | repeated bytes | List of transactions committed as part of the block. | 1 |
- | decided_last_commit | [CommitInfo](#commitinfo) | Info about the last commit, obtained from the block that was just decided. | 2 |
- | byzantine_validators | repeated [Misbehavior](#misbehavior) | List of information about validators that acted incorrectly. | 3 |
- | hash | bytes | The block header's hash. Present for convenience (can be derived from the block header). | 4 |
- | height | int64 | The height of the finalized block. | 5 |
- | time | [google.protobuf.Timestamp](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Timestamp) | Timestamp included in the finalized block. | 6 |
- | next_validators_hash | bytes | Merkle root of the next validator set. | 7 |
- | proposer_address | bytes | [Address](../core/data_structures.md#address) of the validator that created the proposal.| 8 |
+ | Name | Type | Description | Field Number |
+ |----------------------|-------------------------------------------------|-------------------------------------------------------------------------------------------|--------------|
+ | txs | repeated bytes | List of transactions committed as part of the block. | 1 |
+ | decided_last_commit | [CommitInfo](#commitinfo) | Info about the last commit, obtained from the block that was just decided. | 2 |
+ | misbehavior | repeated [Misbehavior](#misbehavior) | List of information about validators that misbehaved. | 3 |
+ | hash | bytes | The block's hash. | 4 |
+ | height | int64 | The height of the finalized block. | 5 |
+ | time | [google.protobuf.Timestamp][protobuf-timestamp] | Timestamp of the finalized block. | 6 |
+ | next_validators_hash | bytes | Merkle root of the next validator set. | 7 |
+ | proposer_address | bytes | [Address](../core/data_structures.md#address) of the validator that created the proposal. | 8 |
* **Response**:
| Name | Type | Description | Field Number |
|-------------------------|-------------------------------------------------------------|----------------------------------------------------------------------------------|--------------|
- | events | repeated [Event](abci++_basic_concepts_002_draft.md#events) | Type & Key-Value events for indexing | 1 |
+ | events | repeated [Event](abci++_basic_concepts.md#events) | Type & Key-Value events for indexing | 1 |
| tx_results | repeated [ExecTxResult](#exectxresult) | List of structures containing the data resulting from executing the transactions | 2 |
| validator_updates | repeated [ValidatorUpdate](#validatorupdate) | Changes to validator set (set voting power to 0 to remove). | 3 |
- | consensus_param_updates | [ConsensusParams](#consensusparams) | Changes to consensus-critical gas, size, and other parameters. | 4 |
+ | consensus_param_updates | [ConsensusParams](#consensusparams) | Changes to gas, size, and other consensus-related parameters. | 4 |
| app_hash | bytes | The Merkle root hash of the application state. | 5 |
- | retain_height | int64 | Blocks below this height may be removed. Defaults to `0` (retain all). | 6 |
* **Usage**:
* Contains the fields of the newly decided block.
* This method is equivalent to the call sequence `BeginBlock`, [`DeliverTx`],
- `EndBlock`, `Commit` in the previous version of ABCI.
- * The height and timestamp values match the values from the header of the proposed block.
- * The Application can use `RequestFinalizeBlock.decided_last_commit` and `RequestFinalizeBlock.byzantine_validators`
+ and `EndBlock` in the previous version of ABCI.
+ * The height and time values match the values from the header of the proposed block.
+ * The Application can use `RequestFinalizeBlock.decided_last_commit` and `RequestFinalizeBlock.misbehavior`
to determine rewards and punishments for the validators.
- * The application must execute the transactions in full, in the order they appear in `RequestFinalizeBlock.txs`,
- before returning control to Tendermint. Alternatively, it can commit the candidate state corresponding to the same block
- previously executed via `PrepareProposal` or `ProcessProposal`.
+ * The Application executes the transactions in `RequestFinalizeBlock.txs` deterministically,
+ according to the rules set up by the Application, before returning control to Tendermint.
+ Alternatively, it can apply the candidate state corresponding to the same block previously
+ executed via `PrepareProposal` or `ProcessProposal`.
* `ResponseFinalizeBlock.tx_results[i].Code == 0` only if the _i_-th transaction is fully valid.
* In next-block execution mode, the Application must provide values for `ResponseFinalizeBlock.app_hash`,
`ResponseFinalizeBlock.tx_results`, `ResponseFinalizeBlock.validator_updates`, and
@@ -605,16 +680,18 @@ from this condition, but not sure), and _p_ receives a Precommit message for rou
the current values.
* `ResponseFinalizeBlock.validator_updates`, triggered by block `H`, affect validation
for blocks `H+1`, `H+2`, and `H+3`. Heights following a validator update are affected in the following way:
- - Height `H+1`: `NextValidatorsHash` includes the new `validator_updates` value.
- - Height `H+2`: The validator set change takes effect and `ValidatorsHash` is updated.
- - Height `H+3`: `decided_last_commit` now includes the altered validator set.
+ * Height `H+1`: `NextValidatorsHash` includes the new `validator_updates` value.
+ * Height `H+2`: The validator set change takes effect and `ValidatorsHash` is updated.
+ * Height `H+3`: `*_last_commit` fields in `PrepareProposal`, `ProcessProposal`, and
+ `FinalizeBlock` now include the altered validator set.
* `ResponseFinalizeBlock.consensus_param_updates` returned for block `H` apply to the consensus
params for block `H+1`. For more information on the consensus parameters,
- see the [application spec entry on consensus parameters](../abci/apps.md#consensus-parameters).
+ see the [consensus parameters](./abci%2B%2B_app_requirements.md#consensus-parameters)
+ section.
+
* In same-block execution mode, Tendermint will log an error and ignore values for
`ResponseFinalizeBlock.app_hash`, `ResponseFinalizeBlock.tx_results`, `ResponseFinalizeBlock.validator_updates`,
and `ResponsePrepareProposal.consensus_param_updates`, as those must have been provided by `PrepareProposal`.
- * Application is expected to persist its state at the end of this call, before calling `ResponseFinalizeBlock`.
* `ResponseFinalizeBlock.app_hash` contains an (optional) Merkle root hash of the application state.
* `ResponseFinalizeBlock.app_hash` is included
* [in next-block execution mode] as the `Header.AppHash` in the next block.
@@ -626,11 +703,7 @@ from this condition, but not sure), and _p_ receives a Precommit message for rou
of `RequestFinalizeBlock` and the previous committed state.
* Later calls to `Query` can return proofs about the application state anchored
in this Merkle root hash.
- * Use `ResponseFinalizeBlock.retain_height` with caution! If all nodes in the network remove historical
- blocks then this data is permanently lost, and no new nodes will be able to join the network and
- bootstrap. Historical blocks may also be required for other purposes, e.g. auditing, replay of
- non-persisted heights, light client verification, and so on.
- * Just as `ProcessProposal`, the implementation of `FinalizeBlock` MUST be deterministic, since it is
+ * The implementation of `FinalizeBlock` MUST be deterministic, since it is
making the Application's state evolve in the context of state machine replication.
* Currently, Tendermint will fill up all fields in `RequestFinalizeBlock`, even if they were
already passed on to the Application via `RequestPrepareProposal` or `RequestProcessProposal`.
@@ -638,9 +711,9 @@ from this condition, but not sure), and _p_ receives a Precommit message for rou
(rather than executing the whole block). In this case the Application disregards all parameters in
`RequestFinalizeBlock` except `RequestFinalizeBlock.hash`.
-#### When does Tendermint call it?
+#### When does Tendermint call `FinalizeBlock`?
-When a validator _p_ is in Tendermint consensus height _h_, and _p_ receives
+When a node _p_ is in Tendermint consensus height _h_, and _p_ receives
* the Proposal message with block _v_ for a round _r_, along with all its block parts, from _q_,
which is the proposer of round _r_, height _h_,
@@ -649,16 +722,19 @@ When a validator _p_ is in Tendermint consensus height _h_, and _p_ receives
then _p_'s Tendermint decides block _v_ and finalizes consensus for height _h_ in the following way
-1. _p_'s Tendermint persists _v_ as decision for height _h_.
-2. _p_'s Tendermint locks the mempool -- no calls to checkTx on new transactions.
-3. _p_'s Tendermint calls `RequestFinalizeBlock` with _id(v)_. The call is synchronous.
-4. _p_'s Application processes block _v_, received in a previous call to `RequestProcessProposal`.
-5. _p_'s Application commits and persists the state resulting from processing the block.
-6. _p_'s Application calculates and returns the _AppHash_, along with an array of arrays of bytes representing the output of each of the transactions
-7. _p_'s Tendermint hashes the array of transaction outputs and stores it in _ResultHash_
-8. _p_'s Tendermint persists _AppHash_ and _ResultHash_
-9. _p_'s Tendermint unlocks the mempool -- newly received transactions can now be checked.
-10. _p_'s starts consensus for a new height _h+1_, round 0
+1. _p_'s Tendermint persists _v_ as the decision for height _h_.
+2. _p_'s Tendermint calls `RequestFinalizeBlock` with _v_'s data. The call is synchronous.
+3. _p_'s Application executes block _v_.
+4. _p_'s Application calculates and returns the _AppHash_, along with a list containing
+ the outputs of each of the transactions executed.
+5. _p_'s Tendermint hashes all the transaction outputs and stores it in _ResultHash_.
+6. _p_'s Tendermint persists the transaction outputs, _AppHash_, and _ResultsHash_.
+7. _p_'s Tendermint locks the mempool — no calls to `CheckTx` on new transactions.
+8. _p_'s Tendermint calls `RequestCommit` to instruct the Application to persist its state.
+9. _p_'s Tendermint, optionally, re-checks all outstanding transactions in the mempool
+ against the newly persisted Application state.
+10. _p_'s Tendermint unlocks the mempool — newly received transactions can now be checked.
+11. _p_'s starts consensus for height _h+1_, round 0
## Data Types existing in ABCI
@@ -696,13 +772,13 @@ Most of the data structures used in ABCI are shared [common data structures](../
* **Fields**:
- | Name | Type | Description | Field Number |
- |--------------------|--------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------|--------------|
- | type | [MisbehaviorType](#misbehaviortype) | Type of the misbehavior. An enum of possible misbehaviors. | 1 |
- | validator | [Validator](#validator) | The offending validator | 2 |
- | height | int64 | Height when the offense occurred | 3 |
- | time | [google.protobuf.Timestamp](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Timestamp) | Time of the block that was committed at the height that the offense occurred | 4 |
- | total_voting_power | int64 | Total voting power of the validator set at height `Height` | 5 |
+ | Name | Type | Description | Field Number |
+ |--------------------|-------------------------------------------------|------------------------------------------------------------------------------|--------------|
+ | type | [MisbehaviorType](#misbehaviortype) | Type of the misbehavior. An enum of possible misbehaviors. | 1 |
+ | validator | [Validator](#validator) | The offending validator | 2 |
+ | height | int64 | Height when the offense occurred | 3 |
+ | time | [google.protobuf.Timestamp][protobuf-timestamp] | Timestamp of the block that was committed at height `height` | 4 |
+ | total_voting_power | int64 | Total voting power of the validator set at height `height` | 5 |
#### MisbehaviorType
@@ -754,8 +830,8 @@ Most of the data structures used in ABCI are shared [common data structures](../
| height | uint64 | The height at which the snapshot was taken (after commit). | 1 |
| format | uint32 | An application-specific snapshot format, allowing applications to version their snapshot data format and make backwards-incompatible changes. Tendermint does not interpret this. | 2 |
| chunks | uint32 | The number of chunks in the snapshot. Must be at least 1 (even if empty). | 3 |
- | hash | bytes | TAn arbitrary snapshot hash. Must be equal only for identical snapshots across nodes. Tendermint does not interpret the hash, it only compares them. | 3 |
- | metadata | bytes | Arbitrary application metadata, for example chunk hashes or other verification data. | 3 |
+ | hash | bytes | An arbitrary snapshot hash. Must be equal only for identical snapshots across nodes. Tendermint does not interpret the hash, it only compares them. | 4 |
+ | metadata | bytes | Arbitrary application metadata, for example chunk hashes or other verification data. | 5 |
* **Usage**:
* Used for state sync snapshots, see the [state sync section](../p2p/messages/state-sync.md) for details.
@@ -823,7 +899,7 @@ Most of the data structures used in ABCI are shared [common data structures](../
| info | string | Additional information. **May be non-deterministic.** | 4 |
| gas_wanted | int64 | Amount of gas requested for transaction. | 5 |
| gas_used | int64 | Amount of gas consumed by transaction. | 6 |
- | events | repeated [Event](abci++_basic_concepts_002_draft.md#events) | Type & Key-Value events for indexing transactions (e.g. by account). | 7 |
+ | events | repeated [Event](abci++_basic_concepts.md#events) | Type & Key-Value events for indexing transactions (e.g. by account). | 7 |
| codespace | string | Namespace for the `code`. | 8 |
### TxAction
@@ -842,7 +918,7 @@ enum TxAction {
* If `Action` is `UNMODIFIED`, Tendermint includes the transaction in the proposal. Nothing to do on the mempool.
* If `Action` is `ADDED`, Tendermint includes the transaction in the proposal. The transaction is _not_ added to the mempool.
* If `Action` is `REMOVED`, Tendermint excludes the transaction from the proposal. The transaction is also removed from the mempool if it exists,
- similar to `CheckTx` returning _false_.
+ similar to `CheckTx` returning an error code.
### TxRecord
@@ -905,3 +981,5 @@ enum VerifyStatus {
* Tendermint is to sign the whole data structure and attach it to a Precommit message
* Upon reception, Tendermint validates the sender's signature and sanity-checks the values of `height`, `round`, and `chain_id`.
Then it sends `extension` to the Application via `RequestVerifyVoteExtension` for verification.
+
+[protobuf-timestamp]: https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Timestamp
diff --git a/spec/abci++/abci++_tmint_expected_behavior_002_draft.md b/spec/abci++/abci++_tmint_expected_behavior.md
similarity index 66%
rename from spec/abci++/abci++_tmint_expected_behavior_002_draft.md
rename to spec/abci++/abci++_tmint_expected_behavior.md
index 778689450..8df5e6c84 100644
--- a/spec/abci++/abci++_tmint_expected_behavior_002_draft.md
+++ b/spec/abci++/abci++_tmint_expected_behavior.md
@@ -11,16 +11,20 @@ This section describes what the Application can expect from Tendermint.
The Tendermint consensus algorithm is designed to protect safety under any network conditions, as long as
less than 1/3 of validators' voting power is byzantine. Most of the time, though, the network will behave
-synchronously and there will be no byzantine process. In these frequent, benign conditions:
+synchronously, no process will fall behind, and there will be no byzantine process. The following describes
+what will happen during a block height _h_ in these frequent, benign conditions:
-* Tendermint will decide in round 0;
+* Tendermint will decide in round 0, for height _h_;
* `PrepareProposal` will be called exactly once at the proposer process of round 0, height _h_;
-* `ProcessProposal` will be called exactly once at all processes except the proposer of round 0, and
+* `ProcessProposal` will be called exactly once at all processes, and
will return _accept_ in its `Response*`;
-* `ExtendVote` will be called exactly once at all processes
-* `VerifyVoteExtension` will be called _n-1_ times at each validator process, where _n_ is the number of validators; and
-* `FinalizeBlock` will be finally called at all processes at the end of height _h_, conveying the same prepared
- block that all calls to `PrepareProposal` and `ProcessProposal` had previously reported for height _h_.
+* `ExtendVote` will be called exactly once at all processes;
+* `VerifyVoteExtension` will be called exactly _n-1_ times at each validator process, where _n_ is
+ the number of validators, and will always return _accept_ in its `Response*`;
+* `FinalizeBlock` will be called exactly once at all processes, conveying the same prepared
+ block that all calls to `PrepareProposal` and `ProcessProposal` had previously reported for
+ height _h_; and
+* `Commit` will finally be called exactly once at all processes at the end of height _h_.
However, the Application logic must be ready to cope with any possible run of Tendermint for a given
height, including bad periods (byzantine proposers, network being asynchronous).
@@ -28,7 +32,7 @@ In these cases, the sequence of calls to ABCI++ methods may not be so straighfor
the Application should still be able to handle them, e.g., without crashing.
The purpose of this section is to define what these sequences look like an a precise way.
-As mentioned in the [Basic Concepts](abci++_basic_concepts_002_draft.md) section, Tendermint
+As mentioned in the [Basic Concepts](./abci%2B%2B_basic_concepts.md) section, Tendermint
acts as a client of ABCI++ and the Application acts as a server. Thus, it is up to Tendermint to
determine when and in which order the different ABCI++ methods will be called. A well-written
Application design should consider _any_ of these possible sequences.
@@ -46,18 +50,15 @@ state-sync = *state-sync-attempt success-sync info
state-sync-attempt = offer-snapshot *apply-chunk
success-sync = offer-snapshot 1*apply-chunk
-recovery = info *consensus-replay consensus-exec
-consensus-replay = decide
+recovery = info consensus-exec
consensus-exec = (inf)consensus-height
-consensus-height = *consensus-round decide
+consensus-height = *consensus-round decide commit
consensus-round = proposer / non-proposer
-proposer = prepare-proposal extend-proposer
-extend-proposer = *got-vote [extend-vote] *got-vote
-
-non-proposer = *got-vote [extend-non-proposer] *got-vote
-extend-non-proposer = process-proposal *got-vote [extend-vote]
+proposer = *got-vote prepare-proposal *got-vote process-proposal [extend]
+extend = *got-vote extend-vote *got-vote
+non-proposer = *got-vote [process-proposal] [extend]
init-chain = %s""
offer-snapshot = %s""
@@ -68,12 +69,10 @@ process-proposal = %s""
extend-vote = %s""
got-vote = %s""
decide = %s""
+commit = %s""
```
->**TODO** Still hesitating... introduce _n_ as total number of validators, so that we can bound the occurrences of
->`got-vote` in a round.
-
-We have kept some of the ABCI++ methods out of the grammar, in order to keep it as clear and concise as possible.
+We have kept some ABCI methods out of the grammar, in order to keep it as clear and concise as possible.
A common reason for keeping all these methods out is that they all can be called at any point in a sequence defined
by the grammar above. Other reasons depend on the method in question:
@@ -115,7 +114,7 @@ Let us now examine the grammar line by line, providing further details.
* In _state-sync_ mode, Tendermint makes one or more attempts at synchronizing the Application's state.
At the beginning of each attempt, it offers the Application a snapshot found at another process.
- If the Application accepts the snapshop, at sequence of calls to `ApplySnapshotChunk` method follow
+ If the Application accepts the snapshot, a sequence of calls to `ApplySnapshotChunk` method follow
to provide the Application with all the snapshots needed, in order to reconstruct the state locally.
A successful attempt must provide at least one chunk via `ApplySnapshotChunk`.
At the end of a successful attempt, Tendermint calls `Info` to make sure the recontructed state's
@@ -128,12 +127,10 @@ Let us now examine the grammar line by line, providing further details.
>```
* In recovery mode, Tendermint first calls `Info` to know from which height it needs to replay decisions
- to the Application. To replay a decision, Tendermint simply calls `FinalizeBlock` with the decided
- block at that height. After this, Tendermint enters nomal consensus execution.
+ to the Application. After this, Tendermint enters nomal consensus execution.
>```abnf
->recovery = info *consensus-replay consensus-exec
->consensus-replay = decide
+>recovery = info consensus-exec
>```
* The non-terminal `consensus-exec` is a key point in this grammar. It is an infinite sequence of
@@ -145,33 +142,36 @@ Let us now examine the grammar line by line, providing further details.
>consensus-exec = (inf)consensus-height
>```
-* A consensus height consists of zero or more rounds before deciding via a call to `FinalizeBlock`.
- In each round, the sequence of method calls depends on whether the local process is the proposer or not.
+* A consensus height consists of zero or more rounds before deciding and executing via a call to
+ `FinalizeBlock`, followed by a call to `Commit`. In each round, the sequence of method calls
+ depends on whether the local process is the proposer or not. Note that, if a height contains zero
+ rounds, this means the process is replaying an already decided value (catch-up mode).
>```abnf
->consensus-height = *consensus-round decide
+>consensus-height = *consensus-round decide commit
>consensus-round = proposer / non-proposer
>```
-* If the local process is the proposer of the current round, Tendermint starts by calling `PrepareProposal`.
- No calls to methods related to vote extensions (`ExtendVote`, `VerifyVoteExtension`) can be called
- in the present round before `PrepareProposal`. Once `PrepareProposal` is called, calls to
- `ExtendVote` and `VerifyVoteExtension` can come in any order, although the former will be called
- at most once in this round.
+* For every round, if the local process is the proposer of the current round, Tendermint starts by
+ calling `PrepareProposal`, followed by `ProcessProposal`. Then, optionally, the Application is
+ asked to extend its vote for that round. Calls to `VerifyVoteExtension` can come at any time: the
+ local process may be slightly late in the current round, or votes may come from a future round
+ of this height.
>```abnf
->proposer = prepare-proposal extend-proposer
->extend-proposer = *got-vote [extend-vote] *got-vote
+>proposer = *got-vote prepare-proposal *got-vote process-proposal [extend]
+>extend = *got-vote extend-vote *got-vote
>```
-* If the local process is not the proposer of the current round, Tendermint will call `ProcessProposal`
- at most once. At most one call to `ExtendVote` can occur only after `ProcessProposal` is called.
- A number of calls to `VerifyVoteExtension` can occur in any order with respect to `ProcessProposal`
- and `ExtendVote` throughout the round.
+* Also for every round, if the local process is _not_ the proposer of the current round, Tendermint
+ will call `ProcessProposal` at most once. At most one call to `ExtendVote` may occur only after
+ `ProcessProposal` is called. A number of calls to `VerifyVoteExtension` can occur in any order
+ with respect to `ProcessProposal` and `ExtendVote` throughout the round. The reasons are the same
+ as above, namely, the process running slightly late in the current round, or votes from future
+ rounds of this height received.
>```abnf
->non-proposer = *got-vote [extend-non-proposer] *got-vote
->extend-non-proposer = process-proposal *got-vote [extend-vote]
+>non-proposer = *got-vote [process-proposal] [extend]
>```
* Finally, the grammar describes all its terminal symbols, which denote the different ABCI++ method calls that
@@ -187,6 +187,7 @@ Let us now examine the grammar line by line, providing further details.
>extend-vote = %s""
>got-vote = %s""
>decide = %s""
+>commit = %s""
>```
## Adapting existing Applications that use ABCI
@@ -202,17 +203,21 @@ to undergo any changes in their implementation.
As for the new methods:
-* `PrepareProposal` must create a list of [TxRecord](./abci++_methods_002_draft.md#txrecord) each containing a
- transaction passed in `RequestPrepareProposal.txs`, in the same other. The field `action` must be set to `UNMODIFIED`
- for all [TxRecord](./abci++_methods_002_draft.md#txrecord) elements in the list.
+* `PrepareProposal` must create a list of [TxRecord](./abci++_methods.md#txrecord) each containing
+ a transaction passed in `RequestPrepareProposal.txs`, in the same other. The field `action` must
+ be set to `UNMODIFIED` for all [TxRecord](./abci++_methods.md#txrecord) elements in the list.
The Application must check whether the size of all transactions exceeds the byte limit
- (`RequestPrepareProposal.max_tx_bytes`). If so, the Application must remove transactions at the end of the list
- until the total byte size is at or below the limit.
+ (`RequestPrepareProposal.max_tx_bytes`). If so, the Application must remove transactions at the
+ end of the list until the total byte size is at or below the limit.
* `ProcessProposal` must set `ResponseProcessProposal.accept` to _true_ and return.
* `ExtendVote` is to set `ResponseExtendVote.extension` to an empty byte array and return.
-* `VerifyVoteExtension` must set `ResponseVerifyVoteExtension.accept` to _true_ if the extension is an empty byte array
- and _false_ otherwise, then return.
-* `FinalizeBlock` is to coalesce the implementation of methods `BeginBlock`, `DeliverTx`, `EndBlock`, and `Commit`.
- Legacy applications looking to reuse old code that implemented `DeliverTx` should wrap the legacy
- `DeliverTx` logic in a loop that executes one transaction iteration per
+* `VerifyVoteExtension` must set `ResponseVerifyVoteExtension.accept` to _true_ if the extension is
+ an empty byte array and _false_ otherwise, then return.
+* `FinalizeBlock` is to coalesce the implementation of methods `BeginBlock`, `DeliverTx`, and
+ `EndBlock`. Legacy applications looking to reuse old code that implemented `DeliverTx` should
+ wrap the legacy `DeliverTx` logic in a loop that executes one transaction iteration per
transaction in `RequestFinalizeBlock.tx`.
+
+Finally, `Commit`, which is kept in ABCI++, no longer returns the `AppHash`. It is now up to
+`FinalizeBlock` to do so. Thus, a slight refactoring of the old `Commit` implementation will be
+needed to move the return of `AppHash` to `FinalizeBlock`.
diff --git a/spec/abci++/v0.md b/spec/abci++/v0.md
deleted file mode 100644
index 163b3f7cb..000000000
--- a/spec/abci++/v0.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# Tendermint v0 Markdown pseudocode
-
-This translates the latex code for Tendermint consensus from the Tendermint paper into markdown.
-
-### Initialization
-
-```go
-h_p ← 0
-round_p ← 0
-step_p is one of {propose, prevote, precommit}
-decision_p ← Vector()
-lockedRound_p ← -1
-lockedValue_p ← nil
-validValue_p ← nil
-validRound_p ← -1
-```
-
-### StartRound(round)
-
-```go
-function startRound(round) {
- round_p ← round
- step_p ← propose
- if proposer(h_p, round_p) = p {
- if validValue_p != nil {
- proposal ← validValue_p
- } else {
- proposal ← getValue()
- }
- broadcast ⟨PROPOSAL, h_p, round_p, proposal, validRound_p⟩
- } else {
- schedule OnTimeoutPropose(h_p,round_p) to be executed after timeoutPropose(round_p)
- }
-}
-```
-
-### ReceiveProposal
-
-In the case where the local node is not locked on any round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, −1) from proposer(h_p, round_p) while step_p = propose do {
- if valid(v) ∧ (lockedRound_p = −1 ∨ lockedValue_p = v) {
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- }
- step_p ← prevote
-}
-```
-
-In the case where the node is locked on a round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, vr⟩ from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v)⟩
- while step_p = propose ∧ (vr ≥ 0 ∧ vr < round_p) do {
- if valid(v) ∧ (lockedRound_p ≤ vr ∨ lockedValue_p = v) {
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- }
- step_p ← prevote
-}
-```
-
-### Prevote timeout
-
-Upon receiving 2f + 1 prevotes, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, vr, *⟩ with step_p = prevote for the first time, do {
- schedule OnTimeoutPrevote(h_p, round_p) to be executed after timeoutPrevote(round_p)
-}
-```
-
-with OnTimeoutPrevote defined as:
-
-```go
-function OnTimeoutPrevote(height, round) {
- if (height = h_p && round = round_p && step_p = prevote) {
- broadcast ⟨PRECOMMIT, h_p, round_p, nil⟩
- step_p ← precommit
- }
-}
-```
-
-### Receiving enough prevotes to precommit
-
-The following code is ran upon receiving 2f + 1 prevotes for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, *⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, round_p, id(v)⟩
- while valid(v) ∧ step_p >= prevote for the first time do {
- if (step_p = prevote) {
- lockedValue_p ← v
- lockedRound_p ← round_p
- broadcast ⟨PRECOMMIT, h_p, round_p, id(v)⟩
- step_p ← precommit
- }
- validValue_p ← v
- validRound_p ← round_p
-}
-```
-
-And upon receiving 2f + 1 prevotes for nil:
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, round_p, nil⟩
- while step_p = prevote do {
- broadcast ⟨PRECOMMIT, h_p, round_p, nil⟩
- step_p ← precommit
-}
-```
-
-### Precommit timeout
-
-Upon receiving 2f + 1 precommits, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PRECOMMIT, h_p, vr, *⟩ for the first time, do {
- schedule OnTimeoutPrecommit(h_p, round_p) to be executed after timeoutPrecommit(round_p)
-}
-```
-
-with OnTimeoutPrecommit defined as:
-
-```go
-function OnTimeoutPrecommit(height, round) {
- if (height = h_p && round = round_p) {
- StartRound(round_p + 1)
- }
-}
-```
-
-### Upon Receiving 2f + 1 precommits
-
-The following code is ran upon receiving 2f + 1 precommits for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, r, v, *⟩
- from proposer(h_p, r)
- AND 2f + 1 ⟨ PRECOMMIT, h_p, r, id(v)⟩
- while decision_p[h_p] = nil do {
- if (valid(v)) {
- decision_p[h_p] ← v
- h_p ← h_p + 1
- reset lockedRound_p, lockedValue_p,validRound_p and validValue_p to initial values
- StartRound(0)
- }
-}
-```
-
-If we don't see 2f + 1 precommits for the same block, we wait until we get 2f + 1 precommits, and the timeout occurs.
\ No newline at end of file
diff --git a/spec/abci++/v1.md b/spec/abci++/v1.md
deleted file mode 100644
index 96dc8e674..000000000
--- a/spec/abci++/v1.md
+++ /dev/null
@@ -1,162 +0,0 @@
-# Tendermint v1 Markdown pseudocode
-
-This adds hooks for the existing ABCI to the prior pseudocode
-
-### Initialization
-
-```go
-h_p ← 0
-round_p ← 0
-step_p is one of {propose, prevote, precommit}
-decision_p ← Vector()
-lockedValue_p ← nil
-validValue_p ← nil
-validRound_p ← -1
-```
-
-### StartRound(round)
-
-```go
-function startRound(round) {
- round_p ← round
- step_p ← propose
- if proposer(h_p, round_p) = p {
- if validValue_p != nil {
- proposal ← validValue_p
- } else {
- txdata ← mempool.GetBlock()
- // getBlockProposal fills in header
- proposal ← getBlockProposal(txdata)
- }
- broadcast ⟨PROPOSAL, h_p, round_p, proposal, validRound_p⟩
- } else {
- schedule OnTimeoutPropose(h_p,round_p) to be executed after timeoutPropose(round_p)
- }
-}
-```
-
-### ReceiveProposal
-
-In the case where the local node is not locked on any round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, −1) from proposer(h_p, round_p) while step_p = propose do {
- if valid(v) ∧ (lockedRound_p = −1 ∨ lockedValue_p = v) {
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- }
- step_p ← prevote
-}
-```
-
-In the case where the node is locked on a round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, vr⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v)⟩
- while step_p = propose ∧ (vr ≥ 0 ∧ vr < round_p) do {
- if valid(v) ∧ (lockedRound_p ≤ vr ∨ lockedValue_p = v) {
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- }
- step_p ← prevote
-}
-```
-
-### Prevote timeout
-
-Upon receiving 2f + 1 prevotes, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, vr, -1⟩
- with step_p = prevote for the first time, do {
- schedule OnTimeoutPrevote(h_p, round_p) to be executed after timeoutPrevote(round_p)
-}
-```
-
-with OnTimeoutPrevote defined as:
-
-```go
-function OnTimeoutPrevote(height, round) {
- if (height = h_p && round = round_p && step_p = prevote) {
- broadcast ⟨PRECOMMIT, h_p, round_p, nil⟩
- step_p ← precommit
- }
-}
-```
-
-### Receiving enough prevotes to precommit
-
-The following code is ran upon receiving 2f + 1 prevotes for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, *⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v)⟩
- while valid(v) ∧ step_p >= prevote for the first time do {
- if (step_p = prevote) {
- lockedValue_p ← v
- lockedRound_p ← round_p
- broadcast ⟨PRECOMMIT, h_p, round_p, id(v)⟩
- step_p ← precommit
- }
- validValue_p ← v
- validRound_p ← round_p
-}
-```
-
-And upon receiving 2f + 1 prevotes for nil:
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, round_p, nil⟩
- while step_p = prevote do {
- broadcast ⟨PRECOMMIT, h_p, round_p, nil⟩
- step_p ← precommit
-}
-```
-
-### Precommit timeout
-
-Upon receiving 2f + 1 precommits, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PRECOMMIT, h_p, vr, *⟩ for the first time, do {
- schedule OnTimeoutPrecommit(h_p, round_p) to be executed after timeoutPrecommit(round_p)
-}
-```
-
-with OnTimeoutPrecommit defined as:
-
-```go
-function OnTimeoutPrecommit(height, round) {
- if (height = h_p && round = round_p) {
- StartRound(round_p + 1)
- }
-}
-```
-
-### Upon Receiving 2f + 1 precommits
-
-The following code is ran upon receiving 2f + 1 precommits for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, r, v, *⟩
- from proposer(h_p, r)
- AND 2f + 1 ⟨ PRECOMMIT, h_p, r, id(v)⟩
- while decision_p[h_p] = nil do {
- if (valid(v)) {
- decision_p[h_p] ← v
- h_p ← h_p + 1
- reset lockedRound_p, lockedValue_p,validRound_p and validValue_p to initial values
- ABCI.BeginBlock(v.header)
- ABCI.DeliverTxs(v.data)
- ABCI.EndBlock()
- StartRound(0)
- }
-}
-```
-
-If we don't see 2f + 1 precommits for the same block, we wait until we get 2f + 1 precommits, and the timeout occurs.
\ No newline at end of file
diff --git a/spec/abci++/v2.md b/spec/abci++/v2.md
deleted file mode 100644
index 1abd8ec67..000000000
--- a/spec/abci++/v2.md
+++ /dev/null
@@ -1,180 +0,0 @@
-# Tendermint v2 Markdown pseudocode
-
-This adds a single-threaded implementation of ABCI++,
-with no optimization for splitting out verifying the header and verifying the proposal.
-
-### Initialization
-
-```go
-h_p ← 0
-round_p ← 0
-step_p is one of {propose, prevote, precommit}
-decision_p ← Vector()
-lockedValue_p ← nil
-validValue_p ← nil
-validRound_p ← -1
-```
-
-### StartRound(round)
-
-```go
-function startRound(round) {
- round_p ← round
- step_p ← propose
- if proposer(h_p, round_p) = p {
- if validValue_p != nil {
- proposal ← validValue_p
- } else {
- txdata ← mempool.GetBlock()
- // getUnpreparedBlockProposal takes tx data, and fills in the unprepared header data
- unpreparedProposal ← getUnpreparedBlockProposal(txdata)
- // ABCI++: the proposer may reorder/update transactions in `unpreparedProposal`
- proposal ← ABCI.PrepareProposal(unpreparedProposal)
- }
- broadcast ⟨PROPOSAL, h_p, round_p, proposal, validRound_p⟩
- } else {
- schedule OnTimeoutPropose(h_p,round_p) to be executed after timeoutPropose(round_p)
- }
-}
-```
-
-### ReceiveProposal
-
-In the case where the local node is not locked on any round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, −1) from proposer(h_p, round_p) while step_p = propose do {
- if valid(v) ∧ ABCI.ProcessProposal(h_p, v).accept ∧ (lockedRound_p = −1 ∨ lockedValue_p = v) {
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- // Include any slashing evidence that may be sent in the process proposal response
- for evidence in ABCI.ProcessProposal(h_p, v).evidence_list {
- broadcast ⟨EVIDENCE, evidence⟩
- }
- }
- step_p ← prevote
-}
-```
-
-In the case where the node is locked on a round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, vr⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v)⟩
- while step_p = propose ∧ (vr ≥ 0 ∧ vr < round_p) do {
- if valid(v) ∧ ABCI.ProcessProposal(h_p, v).accept ∧ (lockedRound_p ≤ vr ∨ lockedValue_p = v) {
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- // Include any slashing evidence that may be sent in the process proposal response
- for evidence in ABCI.ProcessProposal(h_p, v).evidence_list {
- broadcast ⟨EVIDENCE, evidence⟩
- }
- }
- step_p ← prevote
-}
-```
-
-### Prevote timeout
-
-Upon receiving 2f + 1 prevotes, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, vr, -1⟩
- with step_p = prevote for the first time, do {
- schedule OnTimeoutPrevote(h_p, round_p) to be executed after timeoutPrevote(round_p)
-}
-```
-
-with OnTimeoutPrevote defined as:
-
-```go
-function OnTimeoutPrevote(height, round) {
- if (height = h_p && round = round_p && step_p = prevote) {
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, nil)
- broadcast ⟨PRECOMMIT, h_p, round_p, nil, precommit_extension⟩
- step_p ← precommit
- }
-}
-```
-
-### Receiving enough prevotes to precommit
-
-The following code is ran upon receiving 2f + 1 prevotes for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, *⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v)⟩
- while valid(v) ∧ step_p >= prevote for the first time do {
- if (step_p = prevote) {
- lockedValue_p ← v
- lockedRound_p ← round_p
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, id(v))
- broadcast ⟨PRECOMMIT, h_p, round_p, id(v), precommit_extension⟩
- step_p ← precommit
- }
- validValue_p ← v
- validRound_p ← round_p
-}
-```
-
-And upon receiving 2f + 1 prevotes for nil:
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, round_p, nil⟩
- while step_p = prevote do {
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, nil)
- broadcast ⟨PRECOMMIT, h_p, round_p, nil, precommit_extension⟩
- step_p ← precommit
-}
-```
-
-### Upon receiving a precommit
-
-Upon receiving a precommit `precommit`, we ensure that `ABCI.VerifyVoteExtension(precommit.precommit_extension) = true`
-before accepting the precommit. This is akin to how we check the signature on precommits normally, hence its not wrapped
-in the syntax of methods from the paper.
-
-### Precommit timeout
-
-Upon receiving 2f + 1 precommits, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PRECOMMIT, h_p, vr, *⟩ for the first time, do {
- schedule OnTimeoutPrecommit(h_p, round_p) to be executed after timeoutPrecommit(round_p)
-}
-```
-
-with OnTimeoutPrecommit defined as:
-
-```go
-function OnTimeoutPrecommit(height, round) {
- if (height = h_p && round = round_p) {
- StartRound(round_p + 1)
- }
-}
-```
-
-### Upon Receiving 2f + 1 precommits
-
-The following code is ran upon receiving 2f + 1 precommits for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, r, v, *⟩
- from proposer(h_p, r)
- AND 2f + 1 ⟨ PRECOMMIT, h_p, r, id(v)⟩
- while decision_p[h_p] = nil do {
- if (valid(v)) {
- decision_p[h_p] ← v
- h_p ← h_p + 1
- reset lockedRound_p, lockedValue_p,validRound_p and validValue_p to initial values
- ABCI.FinalizeBlock(id(v))
- StartRound(0)
- }
-}
-```
-
-If we don't see 2f + 1 precommits for the same block, we wait until we get 2f + 1 precommits, and the timeout occurs.
diff --git a/spec/abci++/v3.md b/spec/abci++/v3.md
deleted file mode 100644
index ed4c720b4..000000000
--- a/spec/abci++/v3.md
+++ /dev/null
@@ -1,201 +0,0 @@
-# Tendermint v3 Markdown pseudocode
-
-This is a single-threaded implementation of ABCI++,
-with an optimization for the ProcessProposal phase.
-Namely, processing of the header and the block data is separated into two different functions.
-
-### Initialization
-
-```go
-h_p ← 0
-round_p ← 0
-step_p is one of {propose, prevote, precommit}
-decision_p ← Vector()
-lockedValue_p ← nil
-validValue_p ← nil
-validRound_p ← -1
-```
-
-### StartRound(round)
-
-```go
-function startRound(round) {
- round_p ← round
- step_p ← propose
- if proposer(h_p, round_p) = p {
- if validValue_p != nil {
- proposal ← validValue_p
- } else {
- txdata ← mempool.GetBlock()
- // getUnpreparedBlockProposal fills in header
- unpreparedProposal ← getUnpreparedBlockProposal(txdata)
- proposal ← ABCI.PrepareProposal(unpreparedProposal)
- }
- broadcast ⟨PROPOSAL, h_p, round_p, proposal, validRound_p⟩
- } else {
- schedule OnTimeoutPropose(h_p,round_p) to be executed after timeoutPropose(round_p)
- }
-}
-```
-
-### ReceiveProposal
-
-In the case where the local node is not locked on any round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v_header, −1) from proposer(h_p, round_p) while step_p = propose do {
- prevote_nil ← false
- // valid is Tendermints validation, ABCI.VerifyHeader is the applications
- if valid(v_header) ∧ ABCI.VerifyHeader(h_p, v_header) ∧ (lockedRound_p = −1 ∨ lockedValue_p = id(v_header)) {
- wait to receive proposal v corresponding to v_header
- // We split up the app's header verification from the remainder of its processing of the proposal
- if ABCI.ProcessProposal(h_p, v).accept {
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- prevote_nil ← true
- // Include any slashing evidence that may be sent in the process proposal response
- for evidence in ABCI.ProcessProposal(h_p, v).evidence_list {
- broadcast ⟨EVIDENCE, evidence⟩
- }
- }
- } else {
- prevote_nil ← true
- }
- if prevote_nil {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- }
- step_p ← prevote
-}
-```
-
-In the case where the node is locked on a round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v_header, vr⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v_header)⟩
- while step_p = propose ∧ (vr ≥ 0 ∧ vr < round_p) do {
- prevote_nil ← false
- if valid(v) ∧ ABCI.VerifyHeader(h_p, v.header) ∧ (lockedRound_p ≤ vr ∨ lockedValue_p = v) {
- wait to receive proposal v corresponding to v_header
- // We split up the app's header verification from the remainder of its processing of the proposal
- if ABCI.ProcessProposal(h_p, v).accept {
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- prevote_nil ← true
- // Include any slashing evidence that may be sent in the process proposal response
- for evidence in ABCI.ProcessProposal(h_p, v).evidence_list {
- broadcast ⟨EVIDENCE, evidence⟩
- }
- }
- } else {
- prevote_nil ← true
- }
- if prevote_nil {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- }
- step_p ← prevote
-}
-```
-
-### Prevote timeout
-
-Upon receiving 2f + 1 prevotes, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, vr, -1⟩
- with step_p = prevote for the first time, do {
- schedule OnTimeoutPrevote(h_p, round_p) to be executed after timeoutPrevote(round_p)
-}
-```
-
-with OnTimeoutPrevote defined as:
-
-```go
-function OnTimeoutPrevote(height, round) {
- if (height = h_p && round = round_p && step_p = prevote) {
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, nil)
- broadcast ⟨PRECOMMIT, h_p, round_p, nil, precommit_extension⟩
- step_p ← precommit
- }
-}
-```
-
-### Receiving enough prevotes to precommit
-
-The following code is ran upon receiving 2f + 1 prevotes for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, *⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v)⟩
- while valid(v) ∧ step_p >= prevote for the first time do {
- if (step_p = prevote) {
- lockedValue_p ← v
- lockedRound_p ← round_p
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, id(v))
- broadcast ⟨PRECOMMIT, h_p, round_p, id(v), precommit_extension⟩
- step_p ← precommit
- }
- validValue_p ← v
- validRound_p ← round_p
-}
-```
-
-And upon receiving 2f + 1 prevotes for nil:
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, round_p, nil⟩
- while step_p = prevote do {
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, nil)
- broadcast ⟨PRECOMMIT, h_p, round_p, nil, precommit_extension⟩
- step_p ← precommit
-}
-```
-
-### Upon receiving a precommit
-
-Upon receiving a precommit `precommit`, we ensure that `ABCI.VerifyVoteExtension(precommit.precommit_extension) = true`
-before accepting the precommit. This is akin to how we check the signature on precommits normally, hence its not wrapped
-in the syntax of methods from the paper.
-
-### Precommit timeout
-
-Upon receiving 2f + 1 precommits, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PRECOMMIT, h_p, vr, *⟩ for the first time, do {
- schedule OnTimeoutPrecommit(h_p, round_p) to be executed after timeoutPrecommit(round_p)
-}
-```
-
-with OnTimeoutPrecommit defined as:
-
-```go
-function OnTimeoutPrecommit(height, round) {
- if (height = h_p && round = round_p) {
- StartRound(round_p + 1)
- }
-}
-```
-
-### Upon Receiving 2f + 1 precommits
-
-The following code is ran upon receiving 2f + 1 precommits for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, r, v, *⟩
- from proposer(h_p, r)
- AND 2f + 1 ⟨ PRECOMMIT, h_p, r, id(v)⟩
- while decision_p[h_p] = nil do {
- if (valid(v)) {
- decision_p[h_p] ← v
- h_p ← h_p + 1
- reset lockedRound_p, lockedValue_p,validRound_p and validValue_p to initial values
- ABCI.FinalizeBlock(id(v))
- StartRound(0)
- }
-}
-```
-
-If we don't see 2f + 1 precommits for the same block, we wait until we get 2f + 1 precommits, and the timeout occurs.
\ No newline at end of file
diff --git a/spec/abci++/v4.md b/spec/abci++/v4.md
deleted file mode 100644
index d211fd87f..000000000
--- a/spec/abci++/v4.md
+++ /dev/null
@@ -1,199 +0,0 @@
-# Tendermint v4 Markdown pseudocode
-
-This is a multi-threaded implementation of ABCI++,
-where ProcessProposal starts when the proposal is received, but ends before precommitting.
-
-### Initialization
-
-```go
-h_p ← 0
-round_p ← 0
-step_p is one of {propose, prevote, precommit}
-decision_p ← Vector()
-lockedValue_p ← nil
-validValue_p ← nil
-validRound_p ← -1
-```
-
-### StartRound(round)
-
-```go
-function startRound(round) {
- round_p ← round
- step_p ← propose
- if proposer(h_p, round_p) = p {
- if validValue_p != nil {
- proposal ← validValue_p
- } else {
- txdata ← mempool.GetBlock()
- // getUnpreparedBlockProposal fills in header
- unpreparedProposal ← getUnpreparedBlockProposal(txdata)
- proposal ← ABCI.PrepareProposal(unpreparedProposal)
- }
- broadcast ⟨PROPOSAL, h_p, round_p, proposal, validRound_p⟩
- } else {
- schedule OnTimeoutPropose(h_p,round_p) to be executed after timeoutPropose(round_p)
- }
-}
-```
-
-### ReceiveProposal
-
-In the case where the local node is not locked on any round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, −1) from proposer(h_p, round_p) while step_p = propose do {
- if valid(v) ∧ ABCI.VerifyHeader(h_p, v.header) ∧ (lockedRound_p = −1 ∨ lockedValue_p = v) {
- // We fork process proposal into a parallel process
- Fork ABCI.ProcessProposal(h_p, v)
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- }
- step_p ← prevote
-}
-```
-
-In the case where the node is locked on a round, the following is ran:
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, vr⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v)⟩
- while step_p = propose ∧ (vr ≥ 0 ∧ vr < round_p) do {
- if valid(v) ∧ ABCI.VerifyHeader(h_p, v.header) ∧ (lockedRound_p ≤ vr ∨ lockedValue_p = v) {
- // We fork process proposal into a parallel process
- Fork ABCI.ProcessProposal(h_p, v)
- broadcast ⟨PREVOTE, h_p, round_p, id(v)⟩
- } else {
- broadcast ⟨PREVOTE, h_p, round_p, nil⟩
- }
- step_p ← prevote
-}
-```
-
-### Prevote timeout
-
-Upon receiving 2f + 1 prevotes, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, vr, -1⟩
- with step_p = prevote for the first time, do {
- schedule OnTimeoutPrevote(h_p, round_p) to be executed after timeoutPrevote(round_p)
-}
-```
-
-with OnTimeoutPrevote defined as:
-
-```go
-def OnTimeoutPrevote(height, round) {
- if (height = h_p && round = round_p && step_p = prevote) {
- // Join the ProcessProposal, and output any evidence in case it has some.
- processProposalOutput ← Join ABCI.ProcessProposal(h_p, v)
- for evidence in processProposalOutput.evidence_list {
- broadcast ⟨EVIDENCE, evidence⟩
- }
-
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, nil)
- broadcast ⟨PRECOMMIT, h_p, round_p, nil, precommit_extension⟩
- step_p ← precommit
- }
-}
-```
-
-### Receiving enough prevotes to precommit
-
-The following code is ran upon receiving 2f + 1 prevotes for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, round_p, v, *⟩
- from proposer(h_p, round_p)
- AND 2f + 1 ⟨PREVOTE, h_p, vr, id(v)⟩
-while valid(v) ∧ step_p >= prevote for the first time do {
- if (step_p = prevote) {
- lockedValue_p ← v
- lockedRound_p ← round_p
- processProposalOutput ← Join ABCI.ProcessProposal(h_p, v)
- // If the proposal is valid precommit as before.
- // If it was invalid, precommit nil.
- // Note that ABCI.ProcessProposal(h_p, v).accept is deterministic for all honest nodes.
- precommit_value ← nil
- if processProposalOutput.accept {
- precommit_value ← id(v)
- }
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, precommit_value)
- broadcast ⟨PRECOMMIT, h_p, round_p, precommit_value, precommit_extension⟩
- for evidence in processProposalOutput.evidence_list {
- broadcast ⟨EVIDENCE, evidence⟩
- }
-
- step_p ← precommit
- }
- validValue_p ← v
- validRound_p ← round_p
-}
-```
-
-And upon receiving 2f + 1 prevotes for nil:
-
-```go
-upon 2f + 1 ⟨PREVOTE, h_p, round_p, nil⟩
- while step_p = prevote do {
- // Join ABCI.ProcessProposal, and broadcast any evidence if it exists.
- processProposalOutput ← Join ABCI.ProcessProposal(h_p, v)
- for evidence in processProposalOutput.evidence_list {
- broadcast ⟨EVIDENCE, evidence⟩
- }
-
- precommit_extension ← ABCI.ExtendVote(h_p, round_p, nil)
- broadcast ⟨PRECOMMIT, h_p, round_p, nil, precommit_extension⟩
- step_p ← precommit
-}
-```
-
-### Upon receiving a precommit
-
-Upon receiving a precommit `precommit`, we ensure that `ABCI.VerifyVoteExtension(precommit.precommit_extension) = true`
-before accepting the precommit. This is akin to how we check the signature on precommits normally, hence its not wrapped
-in the syntax of methods from the paper.
-
-### Precommit timeout
-
-Upon receiving 2f + 1 precommits, setup a timeout.
-
-```go
-upon 2f + 1 ⟨PRECOMMIT, h_p, vr, *⟩ for the first time, do {
- schedule OnTimeoutPrecommit(h_p, round_p) to be executed after timeoutPrecommit(round_p)
-}
-```
-
-with OnTimeoutPrecommit defined as:
-
-```go
-def OnTimeoutPrecommit(height, round) {
- if (height = h_p && round = round_p) {
- StartRound(round_p + 1)
- }
-}
-```
-
-### Upon Receiving 2f + 1 precommits
-
-The following code is ran upon receiving 2f + 1 precommits for the same block
-
-```go
-upon ⟨PROPOSAL, h_p, r, v, *⟩
- from proposer(h_p, r)
- AND 2f + 1 ⟨ PRECOMMIT, h_p, r, id(v)⟩
- while decision_p[h_p] = nil do {
- if (valid(v)) {
- decision_p[h_p] ← v
- h_p ← h_p + 1
- reset lockedRound_p, lockedValue_p,validRound_p and validValue_p to initial values
- ABCI.FinalizeBlock(id(v))
- StartRound(0)
- }
-}
-```
-
-If we don't see 2f + 1 precommits for the same block, we wait until we get 2f + 1 precommits, and the timeout occurs.
\ No newline at end of file
diff --git a/spec/abci/abci.md b/spec/abci/abci.md
index 5d9d59b71..84e566d50 100644
--- a/spec/abci/abci.md
+++ b/spec/abci/abci.md
@@ -40,13 +40,13 @@ tendermint should not continue.
In the Go implementation these methods take a context and may return
an error. The context exists so that applications can terminate
gracefully during shutdown, and the error return value makes it
-possible for applications to singal transient errors to Tendermint.
+possible for applications to signal transient errors to Tendermint.
### CheckTx
The `CheckTx` ABCI method controls what transactions are considered for inclusion in a block.
When Tendermint receives a `ResponseCheckTx` with a non-zero `Code`, the associated
-transaction will be not be added to Tendermint's mempool or it will be removed if
+transaction will not be added to Tendermint's mempool or it will be removed if
it is already included.
### DeliverTx
diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go
index 771b72643..1f66e95cc 100644
--- a/test/e2e/app/app.go
+++ b/test/e2e/app/app.go
@@ -342,6 +342,9 @@ func (app *Application) ApplySnapshotChunk(_ context.Context, req *abci.RequestA
// total number of transaction bytes to exceed `req.MaxTxBytes`, we will not
// append our special vote extension transaction.
func (app *Application) PrepareProposal(_ context.Context, req *abci.RequestPrepareProposal) (*abci.ResponsePrepareProposal, error) {
+ app.mu.Lock()
+ defer app.mu.Unlock()
+
var sum int64
var extCount int
for _, vote := range req.LocalLastCommit.Votes {
@@ -423,6 +426,9 @@ func (app *Application) PrepareProposal(_ context.Context, req *abci.RequestPrep
// ProcessProposal implements part of the Application interface.
// It accepts any proposal that does not contain a malformed transaction.
func (app *Application) ProcessProposal(_ context.Context, req *abci.RequestProcessProposal) (*abci.ResponseProcessProposal, error) {
+ app.mu.Lock()
+ defer app.mu.Unlock()
+
for _, tx := range req.Txs {
k, v, err := parseTx(tx)
if err != nil {
@@ -454,6 +460,9 @@ func (app *Application) ProcessProposal(_ context.Context, req *abci.RequestProc
// key/value store ("extensionSum") with the sum of all of the numbers collected
// from the vote extensions.
func (app *Application) ExtendVote(_ context.Context, req *abci.RequestExtendVote) (*abci.ResponseExtendVote, error) {
+ app.mu.Lock()
+ defer app.mu.Unlock()
+
// We ignore any requests for vote extensions that don't match our expected
// next height.
if req.Height != int64(app.state.Height)+1 {
@@ -485,6 +494,9 @@ func (app *Application) ExtendVote(_ context.Context, req *abci.RequestExtendVot
// without doing anything about them. In this case, it just makes sure that the
// vote extension is a well-formed integer value.
func (app *Application) VerifyVoteExtension(_ context.Context, req *abci.RequestVerifyVoteExtension) (*abci.ResponseVerifyVoteExtension, error) {
+ app.mu.Lock()
+ defer app.mu.Unlock()
+
// We allow vote extensions to be optional
if len(req.VoteExtension) == 0 {
return &abci.ResponseVerifyVoteExtension{
diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go
index 01e04a418..d5d628aee 100644
--- a/test/e2e/generator/generate.go
+++ b/test/e2e/generator/generate.go
@@ -115,7 +115,7 @@ func generateTestnet(r *rand.Rand, opt map[string]interface{}) (e2e.Manifest, er
Nodes: map[string]*e2e.ManifestNode{},
KeyType: keyType.Choose(r).(string),
Evidence: evidence.Choose(r).(int),
- QueueType: "priority",
+ QueueType: "simple-priority",
TxSize: opt["txSize"].(int),
}
diff --git a/test/e2e/generator/main.go b/test/e2e/generator/main.go
index bec78d89c..da32b2831 100644
--- a/test/e2e/generator/main.go
+++ b/test/e2e/generator/main.go
@@ -1,4 +1,3 @@
-//nolint: gosec
package main
import (
@@ -77,6 +76,8 @@ func (cli *CLI) generate() error {
return err
}
+ // nolint: gosec
+ // G404: Use of weak random number generator (math/rand instead of crypto/rand)
manifests, err := Generate(rand.New(rand.NewSource(randomSeed)), cli.opts)
if err != nil {
return err
diff --git a/test/e2e/networks/ci.toml b/test/e2e/networks/ci.toml
index e7086db7f..bcdfdeac5 100644
--- a/test/e2e/networks/ci.toml
+++ b/test/e2e/networks/ci.toml
@@ -4,7 +4,7 @@ version = "master"
evidence = 5
initial_height = 1000
initial_state = {initial01 = "a", initial02 = "b", initial03 = "c"}
-queue_type = "priority"
+queue_type = "simple-priority"
abci_protocol = "builtin"
[validators]
diff --git a/test/e2e/pkg/exec/exec.go b/test/e2e/pkg/exec/exec.go
new file mode 100644
index 000000000..9dcd79384
--- /dev/null
+++ b/test/e2e/pkg/exec/exec.go
@@ -0,0 +1,34 @@
+package exec
+
+import (
+ "context"
+ "fmt"
+ "os"
+ osexec "os/exec"
+)
+
+// Command executes a shell command.
+func Command(ctx context.Context, args ...string) error {
+ // nolint: gosec
+ // G204: Subprocess launched with a potential tainted input or cmd arguments
+ cmd := osexec.CommandContext(ctx, args[0], args[1:]...)
+ out, err := cmd.CombinedOutput()
+ switch err := err.(type) {
+ case nil:
+ return nil
+ case *osexec.ExitError:
+ return fmt.Errorf("failed to run %q:\n%v", args, string(out))
+ default:
+ return err
+ }
+}
+
+// CommandVerbose executes a shell command while displaying its output.
+func CommandVerbose(ctx context.Context, args ...string) error {
+ // nolint: gosec
+ // G204: Subprocess launched with a potential tainted input or cmd arguments
+ cmd := osexec.CommandContext(ctx, args[0], args[1:]...)
+ cmd.Stdout = os.Stdout
+ cmd.Stderr = os.Stderr
+ return cmd.Run()
+}
diff --git a/test/e2e/pkg/infra/docker/compose.go b/test/e2e/pkg/infra/docker/compose.go
new file mode 100644
index 000000000..3ea5845ee
--- /dev/null
+++ b/test/e2e/pkg/infra/docker/compose.go
@@ -0,0 +1,69 @@
+package docker
+
+import (
+ "bytes"
+ "text/template"
+
+ e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+)
+
+// makeDockerCompose generates a Docker Compose config for a testnet.
+func makeDockerCompose(testnet *e2e.Testnet) ([]byte, error) {
+ // Must use version 2 Docker Compose format, to support IPv6.
+ tmpl, err := template.New("docker-compose").Funcs(template.FuncMap{
+ "addUint32": func(x, y uint32) uint32 {
+ return x + y
+ },
+ "isBuiltin": func(protocol e2e.Protocol, mode e2e.Mode) bool {
+ return mode == e2e.ModeLight || protocol == e2e.ProtocolBuiltin
+ },
+ }).Parse(`version: '2.4'
+
+networks:
+ {{ .Name }}:
+ labels:
+ e2e: true
+ driver: bridge
+{{- if .IPv6 }}
+ enable_ipv6: true
+{{- end }}
+ ipam:
+ driver: default
+ config:
+ - subnet: {{ .IP }}
+
+services:
+{{- range .Nodes }}
+ {{ .Name }}:
+ labels:
+ e2e: true
+ container_name: {{ .Name }}
+ image: tendermint/e2e-node
+{{- if isBuiltin $.ABCIProtocol .Mode }}
+ entrypoint: /usr/bin/entrypoint-builtin
+{{- else if .LogLevel }}
+ command: start --log-level {{ .LogLevel }}
+{{- end }}
+ init: true
+ ports:
+ - 26656
+ - {{ if .ProxyPort }}{{ addUint32 .ProxyPort 1000 }}:{{ end }}26660
+ - {{ if .ProxyPort }}{{ .ProxyPort }}:{{ end }}26657
+ - 6060
+ volumes:
+ - ./{{ .Name }}:/tendermint
+ networks:
+ {{ $.Name }}:
+ ipv{{ if $.IPv6 }}6{{ else }}4{{ end}}_address: {{ .IP }}
+
+{{end}}`)
+ if err != nil {
+ return nil, err
+ }
+ var buf bytes.Buffer
+ err = tmpl.Execute(&buf, testnet)
+ if err != nil {
+ return nil, err
+ }
+ return buf.Bytes(), nil
+}
diff --git a/test/e2e/pkg/infra/docker/exec.go b/test/e2e/pkg/infra/docker/exec.go
new file mode 100644
index 000000000..de0033e32
--- /dev/null
+++ b/test/e2e/pkg/infra/docker/exec.go
@@ -0,0 +1,27 @@
+package docker
+
+import (
+ "context"
+ "path/filepath"
+
+ "github.com/tendermint/tendermint/test/e2e/pkg/exec"
+)
+
+// execCompose runs a Docker Compose command for a testnet.
+func execCompose(ctx context.Context, dir string, args ...string) error {
+ return exec.Command(ctx, append(
+ []string{"docker-compose", "--ansi=never", "-f", filepath.Join(dir, "docker-compose.yml")},
+ args...)...)
+}
+
+// execComposeVerbose runs a Docker Compose command for a testnet and displays its output.
+func execComposeVerbose(ctx context.Context, dir string, args ...string) error {
+ return exec.CommandVerbose(ctx, append(
+ []string{"docker-compose", "--ansi=never", "-f", filepath.Join(dir, "docker-compose.yml")},
+ args...)...)
+}
+
+// execDocker runs a Docker command.
+func execDocker(ctx context.Context, args ...string) error {
+ return exec.Command(ctx, append([]string{"docker"}, args...)...)
+}
diff --git a/test/e2e/pkg/infra/docker/infra.go b/test/e2e/pkg/infra/docker/infra.go
new file mode 100644
index 000000000..9827be241
--- /dev/null
+++ b/test/e2e/pkg/infra/docker/infra.go
@@ -0,0 +1,140 @@
+package docker
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "path/filepath"
+
+ "github.com/tendermint/tendermint/libs/log"
+ e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+ "github.com/tendermint/tendermint/test/e2e/pkg/exec"
+ "github.com/tendermint/tendermint/test/e2e/pkg/infra"
+)
+
+// testnetInfra provides an API for provisioning and manipulating
+// infrastructure for a Docker-based testnet.
+type testnetInfra struct {
+ logger log.Logger
+ testnet *e2e.Testnet
+}
+
+var _ infra.TestnetInfra = &testnetInfra{}
+
+// NewTestnetInfra constructs an infrastructure provider that allows for Docker-based
+// testnet infrastructure.
+func NewTestnetInfra(logger log.Logger, testnet *e2e.Testnet) infra.TestnetInfra {
+ return &testnetInfra{
+ logger: logger,
+ testnet: testnet,
+ }
+}
+
+func (ti *testnetInfra) Setup(ctx context.Context) error {
+ compose, err := makeDockerCompose(ti.testnet)
+ if err != nil {
+ return err
+ }
+ // nolint: gosec
+ // G306: Expect WriteFile permissions to be 0600 or less
+ err = os.WriteFile(filepath.Join(ti.testnet.Dir, "docker-compose.yml"), compose, 0644)
+ if err != nil {
+ return err
+ }
+ return nil
+}
+
+func (ti *testnetInfra) StartNode(ctx context.Context, node *e2e.Node) error {
+ return execCompose(ctx, ti.testnet.Dir, "up", "-d", node.Name)
+}
+
+func (ti *testnetInfra) DisconnectNode(ctx context.Context, node *e2e.Node) error {
+ return execDocker(ctx, "network", "disconnect", ti.testnet.Name+"_"+ti.testnet.Name, node.Name)
+}
+
+func (ti *testnetInfra) ConnectNode(ctx context.Context, node *e2e.Node) error {
+ return execDocker(ctx, "network", "connect", ti.testnet.Name+"_"+ti.testnet.Name, node.Name)
+}
+
+func (ti *testnetInfra) KillNodeProcess(ctx context.Context, node *e2e.Node) error {
+ return execCompose(ctx, ti.testnet.Dir, "kill", "-s", "SIGKILL", node.Name)
+}
+
+func (ti *testnetInfra) StartNodeProcess(ctx context.Context, node *e2e.Node) error {
+ return execCompose(ctx, ti.testnet.Dir, "start", node.Name)
+}
+
+func (ti *testnetInfra) PauseNodeProcess(ctx context.Context, node *e2e.Node) error {
+ return execCompose(ctx, ti.testnet.Dir, "pause", node.Name)
+}
+
+func (ti *testnetInfra) UnpauseNodeProcess(ctx context.Context, node *e2e.Node) error {
+ return execCompose(ctx, ti.testnet.Dir, "unpause", node.Name)
+}
+
+func (ti *testnetInfra) TerminateNodeProcess(ctx context.Context, node *e2e.Node) error {
+ return execCompose(ctx, ti.testnet.Dir, "kill", "-s", "SIGTERM", node.Name)
+}
+
+func (ti *testnetInfra) Stop(ctx context.Context) error {
+ return execCompose(ctx, ti.testnet.Dir, "down")
+}
+
+func (ti *testnetInfra) Pause(ctx context.Context) error {
+ return execCompose(ctx, ti.testnet.Dir, "pause")
+}
+
+func (ti *testnetInfra) Unpause(ctx context.Context) error {
+ return execCompose(ctx, ti.testnet.Dir, "unpause")
+}
+
+func (ti *testnetInfra) ShowLogs(ctx context.Context) error {
+ return execComposeVerbose(ctx, ti.testnet.Dir, "logs", "--no-color")
+}
+
+func (ti *testnetInfra) ShowNodeLogs(ctx context.Context, node *e2e.Node) error {
+ return execComposeVerbose(ctx, ti.testnet.Dir, "logs", "--no-color", node.Name)
+}
+
+func (ti *testnetInfra) TailLogs(ctx context.Context) error {
+ return execComposeVerbose(ctx, ti.testnet.Dir, "logs", "--follow")
+}
+
+func (ti *testnetInfra) TailNodeLogs(ctx context.Context, node *e2e.Node) error {
+ return execComposeVerbose(ctx, ti.testnet.Dir, "logs", "--follow", node.Name)
+}
+
+func (ti *testnetInfra) Cleanup(ctx context.Context) error {
+ ti.logger.Info("Removing Docker containers and networks")
+
+ // GNU xargs requires the -r flag to not run when input is empty, macOS
+ // does this by default. Ugly, but works.
+ xargsR := `$(if [[ $OSTYPE == "linux-gnu"* ]]; then echo -n "-r"; fi)`
+
+ err := exec.Command(ctx, "bash", "-c", fmt.Sprintf(
+ "docker container ls -qa --filter label=e2e | xargs %v docker container rm -f", xargsR))
+ if err != nil {
+ return err
+ }
+
+ err = exec.Command(ctx, "bash", "-c", fmt.Sprintf(
+ "docker network ls -q --filter label=e2e | xargs %v docker network rm", xargsR))
+ if err != nil {
+ return err
+ }
+
+ // On Linux, some local files in the volume will be owned by root since Tendermint
+ // runs as root inside the container, so we need to clean them up from within a
+ // container running as root too.
+ absDir, err := filepath.Abs(ti.testnet.Dir)
+ if err != nil {
+ return err
+ }
+ err = execDocker(ctx, "run", "--rm", "--entrypoint", "", "-v", fmt.Sprintf("%v:/network", absDir),
+ "tendermint/e2e-node", "sh", "-c", "rm -rf /network/*/")
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
diff --git a/test/e2e/pkg/infra/infra.go b/test/e2e/pkg/infra/infra.go
new file mode 100644
index 000000000..2fa7c5ad9
--- /dev/null
+++ b/test/e2e/pkg/infra/infra.go
@@ -0,0 +1,84 @@
+package infra
+
+import (
+ "context"
+
+ e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+)
+
+// TestnetInfra provides an API for manipulating the infrastructure of a
+// specific testnet.
+type TestnetInfra interface {
+ //
+ // Overarching testnet infrastructure management.
+ //
+
+ // Setup generates any necessary configuration for the infrastructure
+ // provider during testnet setup.
+ Setup(ctx context.Context) error
+
+ // Stop will stop all running processes throughout the testnet without
+ // destroying any infrastructure.
+ Stop(ctx context.Context) error
+
+ // Pause will pause all processes in the testnet.
+ Pause(ctx context.Context) error
+
+ // Unpause will resume a paused testnet.
+ Unpause(ctx context.Context) error
+
+ // ShowLogs prints all logs for the whole testnet to stdout.
+ ShowLogs(ctx context.Context) error
+
+ // TailLogs tails the logs for all nodes in the testnet, if this is
+ // supported by the infrastructure provider.
+ TailLogs(ctx context.Context) error
+
+ // Cleanup stops and destroys all running testnet infrastructure and
+ // deletes any generated files.
+ Cleanup(ctx context.Context) error
+
+ //
+ // Node management, including node infrastructure.
+ //
+
+ // StartNode provisions infrastructure for the given node and starts it.
+ StartNode(ctx context.Context, node *e2e.Node) error
+
+ // DisconnectNode modifies the specified node's network configuration such
+ // that it becomes bidirectionally disconnected from the network (it cannot
+ // see other nodes, and other nodes cannot see it).
+ DisconnectNode(ctx context.Context, node *e2e.Node) error
+
+ // ConnectNode modifies the specified node's network configuration such
+ // that it can become bidirectionally connected.
+ ConnectNode(ctx context.Context, node *e2e.Node) error
+
+ // ShowNodeLogs prints all logs for the node with the give ID to stdout.
+ ShowNodeLogs(ctx context.Context, node *e2e.Node) error
+
+ // TailNodeLogs tails the logs for a single node, if this is supported by
+ // the infrastructure provider.
+ TailNodeLogs(ctx context.Context, node *e2e.Node) error
+
+ //
+ // Node process management.
+ //
+
+ // KillNodeProcess sends SIGKILL to a node's process.
+ KillNodeProcess(ctx context.Context, node *e2e.Node) error
+
+ // StartNodeProcess will start a stopped node's process. Assumes that the
+ // node's infrastructure has previously been provisioned using
+ // ProvisionNode.
+ StartNodeProcess(ctx context.Context, node *e2e.Node) error
+
+ // PauseNodeProcess sends a signal to the node's process to pause it.
+ PauseNodeProcess(ctx context.Context, node *e2e.Node) error
+
+ // UnpauseNodeProcess resumes a paused node's process.
+ UnpauseNodeProcess(ctx context.Context, node *e2e.Node) error
+
+ // TerminateNodeProcess sends SIGTERM to a node's process.
+ TerminateNodeProcess(ctx context.Context, node *e2e.Node) error
+}
diff --git a/test/e2e/pkg/testnet.go b/test/e2e/pkg/testnet.go
index 9d9fc5de0..81f4e9b4f 100644
--- a/test/e2e/pkg/testnet.go
+++ b/test/e2e/pkg/testnet.go
@@ -1,4 +1,3 @@
-//nolint: gosec
package e2e
import (
@@ -369,7 +368,7 @@ func (n Node) Validate(testnet Testnet) error {
return fmt.Errorf("invalid mempool version %q", n.Mempool)
}
switch n.QueueType {
- case "", "priority", "fifo":
+ case "", "priority", "fifo", "simple-priority":
default:
return fmt.Errorf("unsupported p2p queue type: %s", n.QueueType)
}
@@ -480,7 +479,7 @@ func (n Node) AddressRPC() string {
// Client returns an RPC client for a node.
func (n Node) Client() (*rpchttp.HTTP, error) {
- return rpchttp.New(fmt.Sprintf("http://127.0.0.1:%v", n.ProxyPort))
+ return rpchttp.New(fmt.Sprintf("http://%s", n.AddressRPC()))
}
// Stateless returns true if the node is either a seed node or a light node
@@ -503,6 +502,8 @@ type keyGenerator struct {
}
func newKeyGenerator(seed int64) *keyGenerator {
+ // nolint: gosec
+ // G404: Use of weak random number generator (math/rand instead of crypto/rand)
return &keyGenerator{
random: rand.New(rand.NewSource(seed)),
}
diff --git a/test/e2e/runner/cleanup.go b/test/e2e/runner/cleanup.go
index b08e39f6d..25a1008e6 100644
--- a/test/e2e/runner/cleanup.go
+++ b/test/e2e/runner/cleanup.go
@@ -1,70 +1,32 @@
package main
import (
+ "context"
"errors"
"fmt"
"os"
- "path/filepath"
"github.com/tendermint/tendermint/libs/log"
- e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+ "github.com/tendermint/tendermint/test/e2e/pkg/infra"
)
-// Cleanup removes the Docker Compose containers and testnet directory.
-func Cleanup(logger log.Logger, testnet *e2e.Testnet) error {
- err := cleanupDocker(logger)
- if err != nil {
- return err
+// Cleanup destroys all infrastructure and removes all generated testnet files.
+func Cleanup(ctx context.Context, logger log.Logger, testnetDir string, ti infra.TestnetInfra) error {
+ if testnetDir == "" {
+ return errors.New("no testnet directory set")
}
- return cleanupDir(logger, testnet.Dir)
-}
-// cleanupDocker removes all E2E resources (with label e2e=True), regardless
-// of testnet.
-func cleanupDocker(logger log.Logger) error {
- logger.Info("Removing Docker containers and networks")
-
- // GNU xargs requires the -r flag to not run when input is empty, macOS
- // does this by default. Ugly, but works.
- xargsR := `$(if [[ $OSTYPE == "linux-gnu"* ]]; then echo -n "-r"; fi)`
-
- err := exec("bash", "-c", fmt.Sprintf(
- "docker container ls -qa --filter label=e2e | xargs %v docker container rm -f", xargsR))
- if err != nil {
+ if err := ti.Cleanup(ctx); err != nil {
return err
}
- return exec("bash", "-c", fmt.Sprintf(
- "docker network ls -q --filter label=e2e | xargs %v docker network rm", xargsR))
-}
-
-// cleanupDir cleans up a testnet directory
-func cleanupDir(logger log.Logger, dir string) error {
- if dir == "" {
- return errors.New("no directory set")
- }
-
- _, err := os.Stat(dir)
+ _, err := os.Stat(testnetDir)
if os.IsNotExist(err) {
return nil
} else if err != nil {
return err
}
- logger.Info(fmt.Sprintf("Removing testnet directory %q", dir))
-
- // On Linux, some local files in the volume will be owned by root since Tendermint
- // runs as root inside the container, so we need to clean them up from within a
- // container running as root too.
- absDir, err := filepath.Abs(dir)
- if err != nil {
- return err
- }
- err = execDocker("run", "--rm", "--entrypoint", "", "-v", fmt.Sprintf("%v:/network", absDir),
- "tendermint/e2e-node", "sh", "-c", "rm -rf /network/*/")
- if err != nil {
- return err
- }
-
- return os.RemoveAll(dir)
+ logger.Info(fmt.Sprintf("Removing testnet directory %q", testnetDir))
+ return os.RemoveAll(testnetDir)
}
diff --git a/test/e2e/runner/exec.go b/test/e2e/runner/exec.go
deleted file mode 100644
index f2bc5163c..000000000
--- a/test/e2e/runner/exec.go
+++ /dev/null
@@ -1,50 +0,0 @@
-//nolint: gosec
-package main
-
-import (
- "fmt"
- "os"
- osexec "os/exec"
- "path/filepath"
-)
-
-// execute executes a shell command.
-func exec(args ...string) error {
- cmd := osexec.Command(args[0], args[1:]...)
- out, err := cmd.CombinedOutput()
- switch err := err.(type) {
- case nil:
- return nil
- case *osexec.ExitError:
- return fmt.Errorf("failed to run %q:\n%v", args, string(out))
- default:
- return err
- }
-}
-
-// execVerbose executes a shell command while displaying its output.
-func execVerbose(args ...string) error {
- cmd := osexec.Command(args[0], args[1:]...)
- cmd.Stdout = os.Stdout
- cmd.Stderr = os.Stderr
- return cmd.Run()
-}
-
-// execCompose runs a Docker Compose command for a testnet.
-func execCompose(dir string, args ...string) error {
- return exec(append(
- []string{"docker-compose", "--ansi=never", "-f", filepath.Join(dir, "docker-compose.yml")},
- args...)...)
-}
-
-// execComposeVerbose runs a Docker Compose command for a testnet and displays its output.
-func execComposeVerbose(dir string, args ...string) error {
- return execVerbose(append(
- []string{"docker-compose", "--ansi=never", "-f", filepath.Join(dir, "docker-compose.yml")},
- args...)...)
-}
-
-// execDocker runs a Docker command.
-func execDocker(args ...string) error {
- return exec(append([]string{"docker"}, args...)...)
-}
diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index 3843e9bd5..99c3c3ab7 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -13,6 +13,8 @@ import (
"github.com/tendermint/tendermint/libs/log"
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+ "github.com/tendermint/tendermint/test/e2e/pkg/infra"
+ "github.com/tendermint/tendermint/test/e2e/pkg/infra/docker"
)
const randomSeed = 2308084734268
@@ -33,6 +35,7 @@ func main() {
type CLI struct {
root *cobra.Command
testnet *e2e.Testnet
+ infra infra.TestnetInfra
preserve bool
}
@@ -53,12 +56,23 @@ func NewCLI(logger log.Logger) *CLI {
if err != nil {
return err
}
+ providerID, err := cmd.Flags().GetString("provider")
+ if err != nil {
+ return err
+ }
+ switch providerID {
+ case "docker":
+ cli.infra = docker.NewTestnetInfra(logger, testnet)
+ logger.Info("Using Docker-based infrastructure provider")
+ default:
+ return fmt.Errorf("unrecognized infrastructure provider ID: %s", providerID)
+ }
cli.testnet = testnet
return nil
},
RunE: func(cmd *cobra.Command, args []string) (err error) {
- if err = Cleanup(logger, cli.testnet); err != nil {
+ if err = Cleanup(cmd.Context(), logger, cli.testnet.Dir, cli.infra); err != nil {
return err
}
defer func() {
@@ -67,11 +81,11 @@ func NewCLI(logger log.Logger) *CLI {
} else if err != nil {
logger.Info("Preserving testnet that encountered error",
"err", err)
- } else if err := Cleanup(logger, cli.testnet); err != nil {
+ } else if err := Cleanup(cmd.Context(), logger, cli.testnet.Dir, cli.infra); err != nil {
logger.Error("error cleaning up testnet contents", "err", err)
}
}()
- if err = Setup(logger, cli.testnet); err != nil {
+ if err = Setup(cmd.Context(), logger, cli.testnet, cli.infra); err != nil {
return err
}
@@ -87,7 +101,7 @@ func NewCLI(logger log.Logger) *CLI {
chLoadResult <- Load(lctx, logger, r, cli.testnet)
}()
startAt := time.Now()
- if err = Start(ctx, logger, cli.testnet); err != nil {
+ if err = Start(ctx, logger, cli.testnet, cli.infra); err != nil {
return err
}
@@ -96,7 +110,7 @@ func NewCLI(logger log.Logger) *CLI {
}
if cli.testnet.HasPerturbations() {
- if err = Perturb(ctx, logger, cli.testnet); err != nil {
+ if err = Perturb(ctx, logger, cli.testnet, cli.infra); err != nil {
return err
}
if err = Wait(ctx, logger, cli.testnet, 5); err != nil { // allow some txs to go through
@@ -134,7 +148,7 @@ func NewCLI(logger log.Logger) *CLI {
if err = Wait(ctx, logger, cli.testnet, 5); err != nil { // wait for network to settle before tests
return err
}
- if err := Test(cli.testnet); err != nil {
+ if err := Test(ctx, cli.testnet); err != nil {
return err
}
return nil
@@ -144,6 +158,8 @@ func NewCLI(logger log.Logger) *CLI {
cli.root.PersistentFlags().StringP("file", "f", "", "Testnet TOML manifest")
_ = cli.root.MarkPersistentFlagRequired("file")
+ cli.root.PersistentFlags().String("provider", "docker", "Which infrastructure provider to use")
+
cli.root.Flags().BoolVarP(&cli.preserve, "preserve", "p", false,
"Preserves the running of the test net after tests are completed")
@@ -156,7 +172,7 @@ func NewCLI(logger log.Logger) *CLI {
Use: "setup",
Short: "Generates the testnet directory and configuration",
RunE: func(cmd *cobra.Command, args []string) error {
- return Setup(logger, cli.testnet)
+ return Setup(cmd.Context(), logger, cli.testnet, cli.infra)
},
})
@@ -166,12 +182,12 @@ func NewCLI(logger log.Logger) *CLI {
RunE: func(cmd *cobra.Command, args []string) error {
_, err := os.Stat(cli.testnet.Dir)
if os.IsNotExist(err) {
- err = Setup(logger, cli.testnet)
+ err = Setup(cmd.Context(), logger, cli.testnet, cli.infra)
}
if err != nil {
return err
}
- return Start(cmd.Context(), logger, cli.testnet)
+ return Start(cmd.Context(), logger, cli.testnet, cli.infra)
},
})
@@ -179,7 +195,7 @@ func NewCLI(logger log.Logger) *CLI {
Use: "perturb",
Short: "Perturbs the Docker testnet, e.g. by restarting or disconnecting nodes",
RunE: func(cmd *cobra.Command, args []string) error {
- return Perturb(cmd.Context(), logger, cli.testnet)
+ return Perturb(cmd.Context(), logger, cli.testnet, cli.infra)
},
})
@@ -196,7 +212,7 @@ func NewCLI(logger log.Logger) *CLI {
Short: "Stops the Docker testnet",
RunE: func(cmd *cobra.Command, args []string) error {
logger.Info("Stopping testnet")
- return execCompose(cli.testnet.Dir, "down")
+ return cli.infra.Stop(cmd.Context())
},
})
@@ -205,7 +221,7 @@ func NewCLI(logger log.Logger) *CLI {
Short: "Pauses the Docker testnet",
RunE: func(cmd *cobra.Command, args []string) error {
logger.Info("Pausing testnet")
- return execCompose(cli.testnet.Dir, "pause")
+ return cli.infra.Pause(cmd.Context())
},
})
@@ -214,7 +230,7 @@ func NewCLI(logger log.Logger) *CLI {
Short: "Resumes the Docker testnet",
RunE: func(cmd *cobra.Command, args []string) error {
logger.Info("Resuming testnet")
- return execCompose(cli.testnet.Dir, "unpause")
+ return cli.infra.Unpause(cmd.Context())
},
})
@@ -259,7 +275,7 @@ func NewCLI(logger log.Logger) *CLI {
Use: "test",
Short: "Runs test cases against a running testnet",
RunE: func(cmd *cobra.Command, args []string) error {
- return Test(cli.testnet)
+ return Test(cmd.Context(), cli.testnet)
},
})
@@ -267,17 +283,24 @@ func NewCLI(logger log.Logger) *CLI {
Use: "cleanup",
Short: "Removes the testnet directory",
RunE: func(cmd *cobra.Command, args []string) error {
- return Cleanup(logger, cli.testnet)
+ return Cleanup(cmd.Context(), logger, cli.testnet.Dir, cli.infra)
},
})
cli.root.AddCommand(&cobra.Command{
Use: "logs [node]",
- Short: "Shows the testnet or a specefic node's logs",
+ Short: "Shows the testnet or a specific node's logs",
Example: "runner logs validator03",
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
- return execComposeVerbose(cli.testnet.Dir, append([]string{"logs", "--no-color"}, args...)...)
+ if len(args) > 0 {
+ node := cli.testnet.LookupNode(args[0])
+ if node == nil {
+ return fmt.Errorf("no such node: %s", args[0])
+ }
+ return cli.infra.ShowNodeLogs(cmd.Context(), node)
+ }
+ return cli.infra.ShowLogs(cmd.Context())
},
})
@@ -287,9 +310,13 @@ func NewCLI(logger log.Logger) *CLI {
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 1 {
- return execComposeVerbose(cli.testnet.Dir, "logs", "--follow", args[0])
+ node := cli.testnet.LookupNode(args[0])
+ if node == nil {
+ return fmt.Errorf("no such node: %s", args[0])
+ }
+ return cli.infra.TailNodeLogs(cmd.Context(), node)
}
- return execComposeVerbose(cli.testnet.Dir, "logs", "--follow")
+ return cli.infra.TailLogs(cmd.Context())
},
})
@@ -302,20 +329,20 @@ func NewCLI(logger log.Logger) *CLI {
Min Block Interval
Max Block Interval
over a 100 block sampling period.
-
+
Does not run any perbutations.
`,
RunE: func(cmd *cobra.Command, args []string) error {
- if err := Cleanup(logger, cli.testnet); err != nil {
+ if err := Cleanup(cmd.Context(), logger, cli.testnet.Dir, cli.infra); err != nil {
return err
}
defer func() {
- if err := Cleanup(logger, cli.testnet); err != nil {
+ if err := Cleanup(cmd.Context(), logger, cli.testnet.Dir, cli.infra); err != nil {
logger.Error("error cleaning up testnet contents", "err", err)
}
}()
- if err := Setup(logger, cli.testnet); err != nil {
+ if err := Setup(cmd.Context(), logger, cli.testnet, cli.infra); err != nil {
return err
}
@@ -331,7 +358,7 @@ Does not run any perbutations.
chLoadResult <- Load(lctx, logger, r, cli.testnet)
}()
- if err := Start(ctx, logger, cli.testnet); err != nil {
+ if err := Start(ctx, logger, cli.testnet, cli.infra); err != nil {
return err
}
diff --git a/test/e2e/runner/perturb.go b/test/e2e/runner/perturb.go
index acabf7f34..76a209ea2 100644
--- a/test/e2e/runner/perturb.go
+++ b/test/e2e/runner/perturb.go
@@ -8,10 +8,11 @@ import (
"github.com/tendermint/tendermint/libs/log"
rpctypes "github.com/tendermint/tendermint/rpc/coretypes"
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+ "github.com/tendermint/tendermint/test/e2e/pkg/infra"
)
// Perturbs a running testnet.
-func Perturb(ctx context.Context, logger log.Logger, testnet *e2e.Testnet) error {
+func Perturb(ctx context.Context, logger log.Logger, testnet *e2e.Testnet, ti infra.TestnetInfra) error {
timer := time.NewTimer(0) // first tick fires immediately; reset below
defer timer.Stop()
@@ -21,7 +22,7 @@ func Perturb(ctx context.Context, logger log.Logger, testnet *e2e.Testnet) error
case <-ctx.Done():
return ctx.Err()
case <-timer.C:
- _, err := PerturbNode(ctx, logger, node, perturbation)
+ _, err := PerturbNode(ctx, logger, node, perturbation, ti)
if err != nil {
return err
}
@@ -36,46 +37,45 @@ func Perturb(ctx context.Context, logger log.Logger, testnet *e2e.Testnet) error
// PerturbNode perturbs a node with a given perturbation, returning its status
// after recovering.
-func PerturbNode(ctx context.Context, logger log.Logger, node *e2e.Node, perturbation e2e.Perturbation) (*rpctypes.ResultStatus, error) {
- testnet := node.Testnet
+func PerturbNode(ctx context.Context, logger log.Logger, node *e2e.Node, perturbation e2e.Perturbation, ti infra.TestnetInfra) (*rpctypes.ResultStatus, error) {
switch perturbation {
case e2e.PerturbationDisconnect:
logger.Info(fmt.Sprintf("Disconnecting node %v...", node.Name))
- if err := execDocker("network", "disconnect", testnet.Name+"_"+testnet.Name, node.Name); err != nil {
+ if err := ti.DisconnectNode(ctx, node); err != nil {
return nil, err
}
time.Sleep(10 * time.Second)
- if err := execDocker("network", "connect", testnet.Name+"_"+testnet.Name, node.Name); err != nil {
+ if err := ti.ConnectNode(ctx, node); err != nil {
return nil, err
}
case e2e.PerturbationKill:
logger.Info(fmt.Sprintf("Killing node %v...", node.Name))
- if err := execCompose(testnet.Dir, "kill", "-s", "SIGKILL", node.Name); err != nil {
+ if err := ti.KillNodeProcess(ctx, node); err != nil {
return nil, err
}
time.Sleep(10 * time.Second)
- if err := execCompose(testnet.Dir, "start", node.Name); err != nil {
+ if err := ti.StartNodeProcess(ctx, node); err != nil {
return nil, err
}
case e2e.PerturbationPause:
logger.Info(fmt.Sprintf("Pausing node %v...", node.Name))
- if err := execCompose(testnet.Dir, "pause", node.Name); err != nil {
+ if err := ti.PauseNodeProcess(ctx, node); err != nil {
return nil, err
}
time.Sleep(10 * time.Second)
- if err := execCompose(testnet.Dir, "unpause", node.Name); err != nil {
+ if err := ti.UnpauseNodeProcess(ctx, node); err != nil {
return nil, err
}
case e2e.PerturbationRestart:
logger.Info(fmt.Sprintf("Restarting node %v...", node.Name))
- if err := execCompose(testnet.Dir, "kill", "-s", "SIGTERM", node.Name); err != nil {
+ if err := ti.TerminateNodeProcess(ctx, node); err != nil {
return nil, err
}
time.Sleep(10 * time.Second)
- if err := execCompose(testnet.Dir, "start", node.Name); err != nil {
+ if err := ti.StartNodeProcess(ctx, node); err != nil {
return nil, err
}
diff --git a/test/e2e/runner/rpc.go b/test/e2e/runner/rpc.go
index 5f5c22149..c08805f40 100644
--- a/test/e2e/runner/rpc.go
+++ b/test/e2e/runner/rpc.go
@@ -23,7 +23,7 @@ func waitForHeight(ctx context.Context, testnet *e2e.Testnet, height int64) (*ty
clients = map[string]*rpchttp.HTTP{}
lastHeight int64
lastIncrease = time.Now()
- nodesAtHeight = map[string]struct{}{}
+ nodesAtHeight = map[string]int64{}
numRunningNodes int
)
if height == 0 {
@@ -85,7 +85,7 @@ func waitForHeight(ctx context.Context, testnet *e2e.Testnet, height int64) (*ty
// add this node to the set of target
// height nodes
- nodesAtHeight[node.Name] = struct{}{}
+ nodesAtHeight[node.Name] = result.SyncInfo.LatestBlockHeight
// if not all of the nodes that we
// have clients for have reached the
diff --git a/test/e2e/runner/setup.go b/test/e2e/runner/setup.go
index 0d1e62467..24477c9e0 100644
--- a/test/e2e/runner/setup.go
+++ b/test/e2e/runner/setup.go
@@ -1,8 +1,8 @@
-// nolint: gosec
package main
import (
"bytes"
+ "context"
"encoding/base64"
"encoding/json"
"errors"
@@ -12,7 +12,6 @@ import (
"regexp"
"sort"
"strings"
- "text/template"
"time"
"github.com/BurntSushi/toml"
@@ -22,6 +21,7 @@ import (
"github.com/tendermint/tendermint/libs/log"
"github.com/tendermint/tendermint/privval"
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+ "github.com/tendermint/tendermint/test/e2e/pkg/infra"
"github.com/tendermint/tendermint/types"
)
@@ -39,7 +39,7 @@ const (
)
// Setup sets up the testnet configuration.
-func Setup(logger log.Logger, testnet *e2e.Testnet) error {
+func Setup(ctx context.Context, logger log.Logger, testnet *e2e.Testnet, ti infra.TestnetInfra) error {
logger.Info(fmt.Sprintf("Generating testnet files in %q", testnet.Dir))
err := os.MkdirAll(testnet.Dir, os.ModePerm)
@@ -47,15 +47,6 @@ func Setup(logger log.Logger, testnet *e2e.Testnet) error {
return err
}
- compose, err := MakeDockerCompose(testnet)
- if err != nil {
- return err
- }
- err = os.WriteFile(filepath.Join(testnet.Dir, "docker-compose.yml"), compose, 0644)
- if err != nil {
- return err
- }
-
genesis, err := MakeGenesis(testnet)
if err != nil {
return err
@@ -92,6 +83,8 @@ func Setup(logger log.Logger, testnet *e2e.Testnet) error {
if err != nil {
return err
}
+ // nolint: gosec
+ // G306: Expect WriteFile permissions to be 0600 or less
err = os.WriteFile(filepath.Join(nodeDir, "config", "app.toml"), appCfg, 0644)
if err != nil {
return err
@@ -131,70 +124,13 @@ func Setup(logger log.Logger, testnet *e2e.Testnet) error {
}
}
+ if err := ti.Setup(ctx); err != nil {
+ return err
+ }
+
return nil
}
-// MakeDockerCompose generates a Docker Compose config for a testnet.
-func MakeDockerCompose(testnet *e2e.Testnet) ([]byte, error) {
- // Must use version 2 Docker Compose format, to support IPv6.
- tmpl, err := template.New("docker-compose").Funcs(template.FuncMap{
- "addUint32": func(x, y uint32) uint32 {
- return x + y
- },
- "isBuiltin": func(protocol e2e.Protocol, mode e2e.Mode) bool {
- return mode == e2e.ModeLight || protocol == e2e.ProtocolBuiltin
- },
- }).Parse(`version: '2.4'
-
-networks:
- {{ .Name }}:
- labels:
- e2e: true
- driver: bridge
-{{- if .IPv6 }}
- enable_ipv6: true
-{{- end }}
- ipam:
- driver: default
- config:
- - subnet: {{ .IP }}
-
-services:
-{{- range .Nodes }}
- {{ .Name }}:
- labels:
- e2e: true
- container_name: {{ .Name }}
- image: tendermint/e2e-node:{{ $.Version }}
-{{- if isBuiltin $.ABCIProtocol .Mode }}
- entrypoint: /usr/bin/entrypoint-builtin
-{{- else if .LogLevel }}
- command: start --log-level {{ .LogLevel }}
-{{- end }}
- init: true
- ports:
- - 26656
- - {{ if .ProxyPort }}{{ addUint32 .ProxyPort 1000 }}:{{ end }}26660
- - {{ if .ProxyPort }}{{ .ProxyPort }}:{{ end }}26657
- - 6060
- volumes:
- - ./{{ .Name }}:/tendermint
- networks:
- {{ $.Name }}:
- ipv{{ if $.IPv6 }}6{{ else }}4{{ end}}_address: {{ .IP }}
-
-{{end}}`)
- if err != nil {
- return nil, err
- }
- var buf bytes.Buffer
- err = tmpl.Execute(&buf, testnet)
- if err != nil {
- return nil, err
- }
- return buf.Bytes(), nil
-}
-
// MakeGenesis generates a genesis document.
func MakeGenesis(testnet *e2e.Testnet) (types.GenesisDoc, error) {
genesis := types.GenesisDoc{
@@ -421,5 +357,7 @@ func UpdateConfigStateSync(node *e2e.Node, height int64, hash []byte) error {
}
bz = regexp.MustCompile(`(?m)^trust-height =.*`).ReplaceAll(bz, []byte(fmt.Sprintf(`trust-height = %v`, height)))
bz = regexp.MustCompile(`(?m)^trust-hash =.*`).ReplaceAll(bz, []byte(fmt.Sprintf(`trust-hash = "%X"`, hash)))
+ // nolint: gosec
+ // G306: Expect WriteFile permissions to be 0600 or less
return os.WriteFile(cfgPath, bz, 0644)
}
diff --git a/test/e2e/runner/start.go b/test/e2e/runner/start.go
index be9661df3..5d5c2e7a9 100644
--- a/test/e2e/runner/start.go
+++ b/test/e2e/runner/start.go
@@ -8,9 +8,10 @@ import (
"github.com/tendermint/tendermint/libs/log"
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+ "github.com/tendermint/tendermint/test/e2e/pkg/infra"
)
-func Start(ctx context.Context, logger log.Logger, testnet *e2e.Testnet) error {
+func Start(ctx context.Context, logger log.Logger, testnet *e2e.Testnet, ti infra.TestnetInfra) error {
if len(testnet.Nodes) == 0 {
return fmt.Errorf("no nodes in testnet")
}
@@ -44,7 +45,7 @@ func Start(ctx context.Context, logger log.Logger, testnet *e2e.Testnet) error {
for len(nodeQueue) > 0 && nodeQueue[0].StartAt == 0 {
node := nodeQueue[0]
nodeQueue = nodeQueue[1:]
- if err := execCompose(testnet.Dir, "up", "-d", node.Name); err != nil {
+ if err := ti.StartNode(ctx, node); err != nil {
return err
}
@@ -58,7 +59,7 @@ func Start(ctx context.Context, logger log.Logger, testnet *e2e.Testnet) error {
return err
}
node.HasStarted = true
- logger.Info(fmt.Sprintf("Node %v up on http://127.0.0.1:%v", node.Name, node.ProxyPort))
+ logger.Info(fmt.Sprintf("Node %v up on http://%v:%v", node.IP, node.Name, node.ProxyPort))
}
networkHeight := testnet.InitialHeight
@@ -106,7 +107,7 @@ func Start(ctx context.Context, logger log.Logger, testnet *e2e.Testnet) error {
}
}
- if err := execCompose(testnet.Dir, "up", "-d", node.Name); err != nil {
+ if err := ti.StartNode(ctx, node); err != nil {
return err
}
@@ -128,8 +129,8 @@ func Start(ctx context.Context, logger log.Logger, testnet *e2e.Testnet) error {
} else {
lastNodeHeight = status.SyncInfo.LatestBlockHeight
}
- logger.Info(fmt.Sprintf("Node %v up on http://127.0.0.1:%v at height %v",
- node.Name, node.ProxyPort, lastNodeHeight))
+ logger.Info(fmt.Sprintf("Node %v up on http://%v:%v at height %v",
+ node.IP, node.Name, node.ProxyPort, lastNodeHeight))
}
return nil
diff --git a/test/e2e/runner/test.go b/test/e2e/runner/test.go
index 2237588a1..7766d6c8d 100644
--- a/test/e2e/runner/test.go
+++ b/test/e2e/runner/test.go
@@ -1,17 +1,19 @@
package main
import (
+ "context"
"os"
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+ "github.com/tendermint/tendermint/test/e2e/pkg/exec"
)
// Test runs test cases under tests/
-func Test(testnet *e2e.Testnet) error {
+func Test(ctx context.Context, testnet *e2e.Testnet) error {
err := os.Setenv("E2E_MANIFEST", testnet.File)
if err != nil {
return err
}
- return execVerbose("./build/tests", "-test.count=1", "-test.v")
+ return exec.CommandVerbose(ctx, "./build/tests", "-test.count=1")
}
diff --git a/test/e2e/tests/net_test.go b/test/e2e/tests/net_test.go
index 71a958412..43cab77e8 100644
--- a/test/e2e/tests/net_test.go
+++ b/test/e2e/tests/net_test.go
@@ -7,37 +7,48 @@ import (
"github.com/stretchr/testify/require"
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+ "github.com/tendermint/tendermint/types"
)
// Tests that all nodes have peered with each other, regardless of discovery method.
func TestNet_Peers(t *testing.T) {
- // FIXME Skip test since nodes aren't always able to fully mesh
- t.SkipNow()
-
testNode(t, func(ctx context.Context, t *testing.T, node e2e.Node) {
client, err := node.Client()
require.NoError(t, err)
netInfo, err := client.NetInfo(ctx)
require.NoError(t, err)
- require.Equal(t, len(node.Testnet.Nodes)-1, netInfo.NPeers,
- "node is not fully meshed with peers")
-
+ // FIXME: https://github.com/tendermint/tendermint/issues/8848
+ // We should be able to assert that we can discover all peers in a network
+ expectedPeers := len(node.Testnet.Nodes)
+ peers := make(map[string]*e2e.Node, 0)
seen := map[string]bool{}
for _, n := range node.Testnet.Nodes {
- seen[n.Name] = (n.Name == node.Name) // we've clearly seen ourself
- }
- for _, peerInfo := range netInfo.Peers {
- id := peerInfo.ID
- peer := node.Testnet.LookupNode(string(id))
- require.NotNil(t, peer, "unknown node %v", id)
- require.Contains(t, peerInfo.URL, peer.IP.String(),
- "unexpected IP address for peer %v", id)
- seen[string(id)] = true
+ // we never save light client addresses as they use RPC or ourselves
+ if n.Mode == e2e.ModeLight || n.Name == node.Name {
+ expectedPeers--
+ continue
+ }
+ peers[string(types.NodeIDFromPubKey(n.NodeKey.PubKey()))] = n
+ seen[n.Name] = false
}
- for name := range seen {
- require.True(t, seen[name], "node %v not peered with %v", node.Name, name)
+ require.GreaterOrEqual(t, netInfo.NPeers, expectedPeers-1,
+ "node is not fully meshed with peers")
+
+ for _, peerInfo := range netInfo.Peers {
+ id := string(peerInfo.ID)
+ peer, ok := peers[id]
+ require.True(t, ok, "unknown node %v", id)
+ require.Contains(t, peerInfo.URL, peer.IP.String(),
+ "unexpected IP address for peer %v", id)
+ seen[peer.Name] = true
}
+
+ // FIXME: https://github.com/tendermint/tendermint/issues/8848
+ // We should be able to assert that we can discover all peers in a network
+ // for name := range seen {
+ // require.True(t, seen[name], "node %v not peered with %v", node.Name, name)
+ // }
})
}
diff --git a/types/node_info.go b/types/node_info.go
index fd47816e2..bc614f55e 100644
--- a/types/node_info.go
+++ b/types/node_info.go
@@ -7,8 +7,8 @@ import (
"strconv"
"strings"
+ tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
"github.com/tendermint/tendermint/libs/bytes"
- tmstrings "github.com/tendermint/tendermint/libs/strings"
tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
)
diff --git a/types/params.go b/types/params.go
index 28c969e46..754b50322 100644
--- a/types/params.go
+++ b/types/params.go
@@ -9,7 +9,7 @@ import (
"github.com/tendermint/tendermint/crypto/ed25519"
"github.com/tendermint/tendermint/crypto/secp256k1"
"github.com/tendermint/tendermint/crypto/sr25519"
- tmstrings "github.com/tendermint/tendermint/libs/strings"
+ tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
)
diff --git a/types/vote.go b/types/vote.go
index f7006b8cd..821a63018 100644
--- a/types/vote.go
+++ b/types/vote.go
@@ -13,7 +13,8 @@ import (
)
const (
- nilVoteStr string = "nil-Vote"
+ absentVoteStr string = "Vote{absent}"
+ nilVoteStr string = "nil"
// The maximum supported number of bytes in a vote extension.
MaxVoteExtensionSize int = 1024 * 1024
@@ -189,7 +190,7 @@ func (vote *Vote) Copy() *Vote {
// 10. timestamp
func (vote *Vote) String() string {
if vote == nil {
- return nilVoteStr
+ return absentVoteStr
}
var typeString string
@@ -202,16 +203,22 @@ func (vote *Vote) String() string {
panic("Unknown vote type")
}
- return fmt.Sprintf("Vote{%v:%X %v/%02d/%v(%v) %X %X %X @ %s}",
+ var blockHashString string
+ if len(vote.BlockID.Hash) > 0 {
+ blockHashString = fmt.Sprintf("%X", tmbytes.Fingerprint(vote.BlockID.Hash))
+ } else {
+ blockHashString = nilVoteStr
+ }
+
+ return fmt.Sprintf("Vote{%v:%X %v/%d %s %s %X %d @ %s}",
vote.ValidatorIndex,
tmbytes.Fingerprint(vote.ValidatorAddress),
vote.Height,
vote.Round,
- vote.Type,
typeString,
- tmbytes.Fingerprint(vote.BlockID.Hash),
+ blockHashString,
tmbytes.Fingerprint(vote.Signature),
- tmbytes.Fingerprint(vote.Extension),
+ len(vote.Extension),
CanonicalTime(vote.Timestamp),
)
}
diff --git a/types/vote_set.go b/types/vote_set.go
index 6d83ac85d..7ca69f302 100644
--- a/types/vote_set.go
+++ b/types/vote_set.go
@@ -505,7 +505,7 @@ func (voteSet *VoteSet) StringIndented(indent string) string {
voteStrings := make([]string, len(voteSet.votes))
for i, vote := range voteSet.votes {
if vote == nil {
- voteStrings[i] = nilVoteStr
+ voteStrings[i] = absentVoteStr
} else {
voteStrings[i] = vote.String()
}
@@ -570,7 +570,7 @@ func (voteSet *VoteSet) voteStrings() []string {
voteStrings := make([]string, len(voteSet.votes))
for i, vote := range voteSet.votes {
if vote == nil {
- voteStrings[i] = nilVoteStr
+ voteStrings[i] = absentVoteStr
} else {
voteStrings[i] = vote.String()
}
diff --git a/types/vote_test.go b/types/vote_test.go
index d0819d7c4..917de2e4b 100644
--- a/types/vote_test.go
+++ b/types/vote_test.go
@@ -2,6 +2,7 @@ package types
import (
"context"
+ "fmt"
"testing"
"time"
@@ -16,6 +17,22 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
)
+const (
+ //nolint: lll
+ preCommitTestStr = `Vote{56789:6AF1F4111082 12345/2 Precommit 8B01023386C3 000000000000 0 @ 2017-12-25T03:00:01.234Z}`
+ //nolint: lll
+ preVoteTestStr = `Vote{56789:6AF1F4111082 12345/2 Prevote 8B01023386C3 000000000000 0 @ 2017-12-25T03:00:01.234Z}`
+)
+
+var (
+ // nolint: lll
+ nilVoteTestStr = fmt.Sprintf(`Vote{56789:6AF1F4111082 12345/2 Precommit %s 000000000000 0 @ 2017-12-25T03:00:01.234Z}`, nilVoteStr)
+ formatNonEmptyVoteExtensionFn = func(voteExtensionLength int) string {
+ // nolint: lll
+ return fmt.Sprintf(`Vote{56789:6AF1F4111082 12345/2 Precommit 8B01023386C3 000000000000 %d @ 2017-12-25T03:00:01.234Z}`, voteExtensionLength)
+ }
+)
+
func examplePrevote(t *testing.T) *Vote {
t.Helper()
return exampleVote(t, byte(tmproto.PrevoteType))
@@ -321,16 +338,43 @@ func TestVoteVerify(t *testing.T) {
}
func TestVoteString(t *testing.T) {
- str := examplePrecommit(t).String()
- expected := `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PRECOMMIT(Precommit) 8B01023386C3 000000000000 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests
- if str != expected {
- t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str)
+ testcases := map[string]struct {
+ vote *Vote
+ expectedResult string
+ }{
+ "pre-commit": {
+ vote: examplePrecommit(t),
+ expectedResult: preCommitTestStr,
+ },
+ "pre-vote": {
+ vote: examplePrevote(t),
+ expectedResult: preVoteTestStr,
+ },
+ "absent vote": {
+ expectedResult: absentVoteStr,
+ },
+ "nil vote": {
+ vote: func() *Vote {
+ v := examplePrecommit(t)
+ v.BlockID.Hash = nil
+ return v
+ }(),
+ expectedResult: nilVoteTestStr,
+ },
+ "non-empty vote extension": {
+ vote: func() *Vote {
+ v := examplePrecommit(t)
+ v.Extension = []byte{1, 2}
+ return v
+ }(),
+ expectedResult: formatNonEmptyVoteExtensionFn(2),
+ },
}
- str2 := examplePrevote(t).String()
- expected = `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PREVOTE(Prevote) 8B01023386C3 000000000000 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests
- if str2 != expected {
- t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str2)
+ for name, tc := range testcases {
+ t.Run(name, func(t *testing.T) {
+ require.Equal(t, tc.expectedResult, tc.vote.String())
+ })
}
}