Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(sequencer): integrate slinky oracle and vote extension logic #1236

Open
wants to merge 85 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
7c39641
add slinky proto files and generated rust
noot Jul 2, 2024
a18ad26
add slinky grpc service and genesis state
noot Jul 2, 2024
b2cc653
impl most of slinky grpc methods
noot Jul 2, 2024
ff618db
add oracle option to config and connect on startup
noot Jul 2, 2024
280111d
begin vote extension handler logic
noot Jul 2, 2024
565ef67
remove unused protos
noot Jul 2, 2024
4635f40
begin oracle component
noot Jul 3, 2024
70df249
finish extend vote logic
noot Jul 3, 2024
f3045b3
finish vote extension validation in verify_vote_extension
noot Jul 3, 2024
8276363
add native types for slinky proto types
noot Jul 3, 2024
bdcd41a
merge with main, genesis updates
noot Jul 3, 2024
27267e2
update genesis example to incude market map
noot Jul 3, 2024
536fd2c
implement prepare/process proposal vote extension logic
noot Jul 3, 2024
d3ba1fa
fix sequencer block construction
noot Jul 3, 2024
8d031ca
no more unstable is_sorted
noot Jul 3, 2024
b41a719
implement finalize_block price aggregation and storing logic
noot Jul 3, 2024
f197a17
implement oracle module query service
noot Jul 4, 2024
6b84a8a
fixes based on running w sidecar, update genesis example to have oracle
noot Jul 4, 2024
25e024b
fix sequencer unit tests
noot Jul 5, 2024
bb1a975
clippy
noot Jul 5, 2024
f8dd3d6
fmt
noot Jul 5, 2024
b96ce64
remove unused protos
noot Jul 5, 2024
5f9ea4f
attempt to fix sequencer genesis in chart
noot Jul 5, 2024
078b116
lint chart
noot Jul 5, 2024
0ea34d9
maybe fix genesis in chart
noot Jul 5, 2024
63b6b2c
lint chart
noot Jul 5, 2024
72b9fc4
cleanup
noot Jul 5, 2024
5b6a99c
charts
noot Jul 5, 2024
24e916f
fmt
noot Jul 5, 2024
074e7a3
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Jul 5, 2024
0b6fd9b
add oracle config values to chart
noot Jul 6, 2024
a152b6b
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Jul 6, 2024
4192612
maybe fix chart
noot Jul 6, 2024
8877caa
merge w main
noot Jul 9, 2024
9d4f8dc
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Jul 9, 2024
936bf00
update protos
noot Jul 9, 2024
9b28345
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Jul 12, 2024
dd2b936
address comments
noot Jul 12, 2024
1fdda18
merge w main
noot Aug 19, 2024
3092971
bump chart version
noot Aug 19, 2024
573993c
merge w main
noot Aug 20, 2024
fc6d945
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Aug 20, 2024
eafff75
address comments
noot Aug 21, 2024
18af189
address comments
noot Aug 22, 2024
c87d28d
address chart comments
noot Aug 22, 2024
cd87fd4
remove clippy too many lines
noot Aug 22, 2024
08c51e4
merge w main, update genesis proto for slinky
noot Aug 22, 2024
b64fc41
update genesis to have SlinkyGenesis field
noot Aug 23, 2024
64ad809
address comments, var name cleanup
noot Aug 23, 2024
c8437f1
fix(core): restructure modules to match proto (#1405)
SuperFluffy Aug 23, 2024
71e3b78
merge w main
noot Aug 26, 2024
65fdc28
fmt protos
noot Aug 26, 2024
8c8d0eb
update buf cfg to ignore slinky lint warnings
noot Aug 26, 2024
69718e9
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Aug 29, 2024
fb1dbf7
address comments
noot Aug 29, 2024
7fd61bf
merge w main
noot Sep 3, 2024
9d71977
merge w main
noot Sep 3, 2024
ee820d9
recompile protos
noot Sep 3, 2024
c18201c
fix compiled protos
noot Sep 3, 2024
7a1838e
address comments
noot Sep 3, 2024
faa117c
use indexmap everywhere
noot Sep 3, 2024
2928513
fix chart genesis
noot Sep 4, 2024
6c8f81d
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Sep 4, 2024
6170dbb
fix merge issue
noot Sep 4, 2024
c2c7912
maybe fix chart genesis
noot Sep 4, 2024
3faeb74
maybe fix chart genesis
noot Sep 4, 2024
17e91aa
fix genesis log
noot Sep 4, 2024
3207ff9
maybe fix chart genesis
noot Sep 4, 2024
6b1f665
maybe fix charts
noot Sep 4, 2024
0db673a
maybe fix chart genesis
noot Sep 4, 2024
938df30
fix merge
noot Sep 5, 2024
f8db715
add unit test
noot Sep 5, 2024
dd817a2
merge w main
noot Sep 5, 2024
f6d43dc
cleanup
noot Sep 5, 2024
1ecfc14
cleanup
noot Sep 5, 2024
0506bba
clippy
noot Sep 5, 2024
1b8df49
refactor(sequencer): use streams for fetching slinky data from state …
SuperFluffy Sep 9, 2024
e6f34c3
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Sep 9, 2024
dca2e52
rework oracle types (#1484)
SuperFluffy Sep 19, 2024
7347bf3
merge wip
noot Sep 19, 2024
7d58ebb
fix merge
noot Sep 19, 2024
21e775a
fix tests
noot Sep 19, 2024
d0bfdf9
Merge branch 'main' of github.com:astriaorg/astria into noot/slinky
noot Sep 24, 2024
a2c7677
bump chart
noot Sep 24, 2024
68bd014
merge w main
noot Sep 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions buf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ modules:
ignore_only:
PACKAGE_VERSION_SUFFIX:
- proto/protocolapis/astria_vendored/tendermint
FIELD_LOWER_SNAKE_CASE:
- proto/protocolapis/astria_vendored/slinky
SERVICE_SUFFIX:
- proto/protocolapis/astria_vendored/slinky
RPC_REQUEST_STANDARD_NAME:
- proto/protocolapis/astria_vendored/slinky
disallow_comment_ignores: true
breaking:
use:
Expand Down
2 changes: 1 addition & 1 deletion charts/sequencer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.22.1
version: 0.22.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
Expand Down
20 changes: 19 additions & 1 deletion charts/sequencer/files/cometbft/config/genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,31 @@
{{- if $index }},{{- end }}
{{ include "sequencer.address" $value }}
{{- end }}
]
],
"slinky": {
"marketMap": {
"marketMap": {
"markets": {}
},
"params": {
"marketAuthorities": [],
"admin": "{{ .Values.genesis.marketAdminAddress }}"
}
},
"oracle": {
"currencyPairGenesis": [],
"nextId": "0"
}
}
{{- if not .Values.global.dev }}
{{- else }}
{{- end}}
},
"chain_id": "{{ .Values.genesis.chainId }}",
"consensus_params": {
"abci": {
"vote_extensions_enable_height": "1"
},
"block": {
"max_bytes": " {{ .Values.genesis.consensusParams.blockMaxBytes }}",
"max_gas": "{{ .Values.genesis.consensusParams.blockMaxGas }}"
Expand Down
3 changes: 3 additions & 0 deletions charts/sequencer/templates/configmaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ data:
OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.sequencer.otel.otlpHeaders }}"
OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.sequencer.otel.traceHeaders }}"
OTEL_SERVICE_NAME: "{{ tpl .Values.sequencer.otel.serviceName . }}"
ASTRIA_SEQUENCER_ORACLE_GRPC_ADDR: "http://127.0.0.1:8081"
ASTRIA_SEQUENCER_ORACLE_CLIENT_TIMEOUT_MILLISECONDS: "1000"
{{- if not .Values.global.dev }}
{{- else }}
ASTRIA_SEQUENCER_NO_ORACLE: "true"
{{- end }}
---
2 changes: 2 additions & 0 deletions charts/sequencer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ genesis:
base: "astria"
ibcCompat: "astriacompat"
authoritySudoAddress: ""
marketAdminAddress: ""
nativeAssetBaseDenomination: nria
allowedFeeAssets: []
# - nria
Expand Down Expand Up @@ -228,6 +229,7 @@ ports:
cometbftRpc: 26657
cometbftMetrics: 26660
sequencerABCI: 26658
# note: the oracle sidecar also uses 8080 by default but can be changed with --port
sequencerGrpc: 8080
relayerRpc: 2450
sequencerMetrics: 9000
Expand Down
1 change: 1 addition & 0 deletions crates/astria-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ penumbra-ibc = { workspace = true }
penumbra-proto = { workspace = true }
prost = { workspace = true }
rand = { workspace = true }
regex = { workspace = true }
serde = { workspace = true, features = ["derive"], optional = true }
sha2 = { workspace = true }
tendermint = { workspace = true }
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading