Skip to content

Commit

Permalink
Back-merge v1.4 (#316)
Browse files Browse the repository at this point in the history
  • Loading branch information
scarmuega authored Jun 5, 2022
2 parents 6276f72 + 7a4aab9 commit 8cec59e
Show file tree
Hide file tree
Showing 20 changed files with 349 additions and 145 deletions.
80 changes: 80 additions & 0 deletions .github/e2e/assert-n2c-testnet-origin-blocks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: ${TEST_NAME}
data:
daemon.toml: |-
[source]
type = "N2C"
address = ["Unix", "/opt/cardano/cnode/sockets/node0.socket"]
magic = "testnet"
min_depth = 6
[source.mapper]
include_byron_ebb = true
[source.retry_policy]
connection_max_retries = 5
connection_max_backoff = 60
[source.finalize]
max_block_quantity = 2000
[source.intersect]
type = "Origin"
[sink]
type = "Assert"
break_on_failure = true
---
apiVersion: batch/v1
kind: Job
metadata:
name: ${TEST_NAME}
labels:
app: ${TEST_NAME}
spec:
backoffLimit: 1
template:
metadata:
labels:
app: ${TEST_NAME}
spec:
restartPolicy: "Never"
containers:
- name: main
image: ${TARGET_IMAGE}
env:
- name: "RUST_LOG"
value: "warn"
resources:
requests:
memory: 100Mi
cpu: 50m
limits:
memory: 500Mi
cpu: 200m
args:
- "daemon"
volumeMounts:
- name: oura-config
mountPath: /etc/oura
- name: unix-socket
mountPath: /opt/cardano/cnode/sockets
- name: socat
image: alpine/socat
args:
[
"UNIX-LISTEN:/opt/cardano/cnode/sockets/node0.socket,reuseaddr,fork",
"TCP-CONNECT:node-0.nodes.testnet.svc.cluster.local:3307",
]
volumeMounts:
- name: unix-socket
mountPath: /opt/cardano/cnode/sockets
volumes:
- name: oura-config
configMap:
name: ${TEST_NAME}
- name: unix-socket
emptyDir: {}
77 changes: 77 additions & 0 deletions .github/e2e/assert-n2c-testnet-tip-blocks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: ${TEST_NAME}
data:
daemon.toml: |-
[source]
type = "N2C"
address = ["Unix", "/opt/cardano/cnode/sockets/node0.socket"]
magic = "testnet"
min_depth = 6
[source.retry_policy]
connection_max_retries = 5
connection_max_backoff = 60
[source.finalize]
max_block_quantity = 20
[source.intersect]
type = "Tip"
[sink]
type = "Assert"
break_on_failure = true
---
apiVersion: batch/v1
kind: Job
metadata:
name: ${TEST_NAME}
labels:
app: ${TEST_NAME}
spec:
backoffLimit: 1
template:
metadata:
labels:
app: ${TEST_NAME}
spec:
restartPolicy: "Never"
containers:
- name: main
image: ${TARGET_IMAGE}
env:
- name: "RUST_LOG"
value: "warn"
resources:
requests:
memory: 100Mi
cpu: 50m
limits:
memory: 500Mi
cpu: 200m
args:
- "daemon"
volumeMounts:
- name: oura-config
mountPath: /etc/oura
- name: unix-socket
mountPath: /opt/cardano/cnode/sockets
- name: socat
image: alpine/socat
args:
[
"UNIX-LISTEN:/opt/cardano/cnode/sockets/node0.socket,reuseaddr,fork",
"TCP-CONNECT:node-0.nodes.testnet.svc.cluster.local:3307",
]
volumeMounts:
- name: unix-socket
mountPath: /opt/cardano/cnode/sockets
volumes:
- name: oura-config
configMap:
name: ${TEST_NAME}
- name: unix-socket
emptyDir: {}
3 changes: 3 additions & 0 deletions .github/e2e/assert-n2n-mainnet-origin-blocks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ data:
address = ["Tcp", "relays-new.cardano-mainnet.iohk.io:3001"]
magic = "mainnet"
[source.mapper]
include_byron_ebb = true
[source.finalize]
max_block_quantity = 2000
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ jobs:
fail-fast: false
matrix:
include:
- name: assert-n2c-testnet-origin-blocks
- name: assert-n2c-testnet-tip-blocks
- name: assert-n2n-mainnet-origin-blocks
- name: assert-n2n-mainnet-tip-blocks
- name: assert-n2n-testnet-origin-blocks
Expand Down
22 changes: 21 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@
## [Unreleased]


<a name="v1.4.2"></a>
## [v1.4.2] - 2022-06-05
### Bug Fixes
- Include EBB blocks in E2E tests ([#315](https://github.com/txpipe/oura/issues/315))
- Add missing finalize option to N2C ([#314](https://github.com/txpipe/oura/issues/314))
- Upgrade Pallas to fix tx hash mismatch ([#312](https://github.com/txpipe/oura/issues/312))

### Continuous Integration
- Add N2C E2E tests ([#313](https://github.com/txpipe/oura/issues/313))


<a name="v1.4.1"></a>
## [v1.4.1] - 2022-05-09
### Bug Fixes
- Relax CIP15 requirements and log level ([#290](https://github.com/txpipe/oura/issues/290))


<a name="v1.4.0"></a>
## [v1.4.0] - 2022-05-09
### Features
Expand All @@ -27,6 +44,7 @@

### Continuous Integration
- Fix github / kubectl / eks issue
- Workaround github / kubectl / eks issue

### Chore
- Add min-depth to e2e tests ([#272](https://github.com/txpipe/oura/issues/272))
Expand Down Expand Up @@ -532,7 +550,9 @@ Configuration keys for the 'Selection' filter changed to reflect new metadata st
- fix lint issues


[Unreleased]: https://github.com/txpipe/oura/compare/v1.4.0...HEAD
[Unreleased]: https://github.com/txpipe/oura/compare/v1.4.2...HEAD
[v1.4.2]: https://github.com/txpipe/oura/compare/v1.4.1...v1.4.2
[v1.4.1]: https://github.com/txpipe/oura/compare/v1.4.0...v1.4.1
[v1.4.0]: https://github.com/txpipe/oura/compare/v1.3.2...v1.4.0
[v1.3.2]: https://github.com/txpipe/oura/compare/v1.3.1...v1.3.2
[v1.3.1]: https://github.com/txpipe/oura/compare/v1.3.0...v1.3.1
Expand Down
49 changes: 26 additions & 23 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "oura"
description = "The tail of Cardano"
version = "1.4.0"
version = "1.4.2"
edition = "2021"
repository = "https://github.com/txpipe/oura"
homepage = "https://github.com/txpipe/oura"
Expand All @@ -12,7 +12,7 @@ authors = ["Santiago Carmuega <santiago@carmuega.me>"]


[dependencies]
pallas = "0.9.1"
pallas = "0.10.0"
# pallas = { path = "../pallas/pallas" }
hex = "0.4.3"
net2 = "0.2.37"
Expand Down
1 change: 1 addition & 0 deletions src/bin/oura/dump.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ pub fn run(args: &ArgMatches) -> Result<(), Error> {
since: None,
intersect,
retry_policy: None,
finalize: None,
}),
};

Expand Down
1 change: 1 addition & 0 deletions src/bin/oura/watch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ pub fn run(args: &ArgMatches) -> Result<(), Error> {
since: None,
intersect,
retry_policy: None,
finalize: None,
}),
};

Expand Down
Loading

0 comments on commit 8cec59e

Please sign in to comment.