Skip to content

Commit bcf9d9e

Browse files
authored
Merge branch 'v0.34.x-celestia' into rp/messages-is-sorted
2 parents a721088 + 5a4c4fd commit bcf9d9e

16 files changed

+564
-34
lines changed

.golangci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ linters-settings:
6060
# check-shadowing: true
6161
revive:
6262
min-confidence: 0
63-
maligned:
64-
suggest-new: true
6563
misspell:
6664
locale: US
6765
ignore-words:
6866
- behaviour
69-
70-

.mergify.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

abci/types/result.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ func (r ResponseProcessProposal) IsErr() bool {
5656
return r.Result != ResponseProcessProposal_ACCEPT
5757
}
5858

59+
// IsRejected returns true if this ResponseProcessProposal was rejected
60+
func (r ResponseProcessProposal) IsRejected() bool {
61+
return r.Result == ResponseProcessProposal_REJECT
62+
}
63+
5964
//---------------------------------------------------------------------------
6065
// override JSON marshaling so we emit defaults (ie. disable omitempty)
6166

docs/celestia-architecture/adr-001-block-propagation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The proposed design is as follows.
2020

2121
The proposal and vote types have a BlockID, this will be replaced with a header hash. The proposal will contain add fields.
2222

23-
The current proposal will be updated to include required fields. The entirety of the message will be reworked at a later date. To see the extent of the needed changes you can visit the [spec repo](https://github.com/celestiaorg/celestia-specs/blob/master/specs/proto/consensus.proto#L19)
23+
The current proposal will be updated to include required fields. The entirety of the message will be reworked at a later date. To see the extent of the needed changes you can visit the [spec repo](https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/proto/consensus.proto#L19)
2424

2525
```proto
2626
message Proposal {
@@ -67,7 +67,7 @@ message Vote {
6767
}
6868
```
6969

70-
See [specs](https://github.com/celestiaorg/celestia-specs/blob/master/specs/data_structures.md#vote) for more details on the vote.
70+
See [specs](https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/data_structures.md#vote) for more details on the vote.
7171

7272
### Disk Storage
7373

docs/celestia-architecture/adr-002-ipld-da-sampling.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ A high-level, implementation-independent formalization of above mentioned sampli
1717
[_Fraud and Data Availability Proofs: Detecting Invalid Blocks in Light Clients_](https://fc21.ifca.ai/papers/83.pdf).
1818

1919
For the time being, besides the academic paper, no other formalization or specification of the protocol exists.
20-
Currently, the Celestia specification itself only describes the [erasure coding](https://github.com/celestiaorg/celestia-specs/blob/master/specs/data_structures.md#erasure-coding)
20+
Currently, the Celestia specification itself only describes the [erasure coding](https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/data_structures.md#erasure-coding)
2121
and how to construct the extended data square from the block data.
2222

2323
This ADR:
@@ -263,7 +263,7 @@ Proposed
263263

264264
[celestia-specs#126]: https://github.com/celestiaorg/celestia-specs/issues/126
265265
[celestia-specs#127]: https://github.com/celestiaorg/celestia-specs/pulls/127
266-
[Header]: https://github.com/celestiaorg/celestia-specs/blob/master/specs/data_structures.md#header
266+
[Header]: https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/data_structures.md#header
267267

268268
[go-ipfs documentation]: https://github.com/ipfs/go-ipfs/tree/master/docs/examples/go-ipfs-as-a-library#use-go-ipfs-as-a-library-to-spawn-a-node-and-add-a-file
269269
[ipld experiments]: https://github.com/celestia/ipld-plugin-experiments

docs/celestia-architecture/adr-003-application-data-retrieval.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## Context
88

99
This ADR builds on top of [ADR 002](adr-002-ipld-da-sampling.md) and will use the implemented APIs described there.
10-
The reader should familiarize themselves at least with the high-level concepts the as well as in the [specs](https://github.com/celestiaorg/celestia-specs/blob/master/specs/data_structures.md#2d-reed-solomon-encoding-scheme).
10+
The reader should familiarize themselves at least with the high-level concepts the as well as in the [specs](https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/data_structures.md#2d-reed-solomon-encoding-scheme).
1111

1212
The academic [paper](https://arxiv.org/abs/1905.09274) describes the motivation and context for this API.
1313
The main motivation can be quoted from section 3.3 of that paper:
@@ -29,7 +29,7 @@ An implementation can be found in [this repository](https://github.com/celestiao
2929
This ADR basically describes version of the [`GetWithProof`](https://github.com/celestiaorg/nmt/blob/ddcc72040149c115f83b2199eafabf3127ae12ac/nmt.go#L193-L196) of the NMT that leverages the fact that IPFS uses content addressing and that we have implemented an [IPLD plugin](https://github.com/celestiaorg/celestia-core/tree/37502aac69d755c189df37642b87327772f4ac2a/p2p/ipld) for an NMT.
3030

3131
**Note**: The APIs defined here will be particularly relevant for Optimistic Rollup (full) nodes that want to download their Rollup's data (see [celestiaorg/optimint#48](https://github.com/celestiaorg/optimint/issues/48)).
32-
Another potential use-case of this API could be for so-called [light validator nodes](https://github.com/celestiaorg/celestia-specs/blob/master/specs/node_types.md#node-type-definitions) that want to download and replay the state-relevant portion of the block data, i.e. transactions with [reserved namespace IDs](https://github.com/celestiaorg/celestia-specs/blob/master/specs/consensus.md#reserved-namespace-ids).
32+
Another potential use-case of this API could be for so-called [light validator nodes](https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/node_types.md#node-type-definitions) that want to download and replay the state-relevant portion of the block data, i.e. transactions with [reserved namespace IDs](https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/consensus.md#reserved-namespace-ids).
3333

3434
## Alternative Approaches
3535

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/btcsuite/btcd v0.21.0-beta
1111
github.com/btcsuite/btcutil v1.0.2
1212
github.com/celestiaorg/nmt v0.10.0
13-
github.com/celestiaorg/rsmt2d v0.5.0
13+
github.com/celestiaorg/rsmt2d v0.6.0
1414
github.com/fortytw2/leaktest v1.3.0
1515
github.com/go-kit/kit v0.12.0
1616
github.com/go-kit/log v0.2.1

0 commit comments

Comments
 (0)