Release v2.0.0-alpha.1

.github/e2e/gcp-pubsub-10-blocks.yaml

@@ -0,0 +1,62 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ${TEST_NAME}
+data:
+  daemon.toml: |-
+    [source]
+    type = "N2N"
+    address = ["Tcp", "relays-new.cardano-mainnet.iohk.io:3001"]
+    magic = "mainnet"
+
+    [source.finalize]
+    max_block_quantity = 10
+
+    [source.intersect]
+    type = "Point"
+    value = [50030552, "5a091e9831bc0fcd6e6bdb2877036bb260abb4e19195517e4153fb041f956df5"]
+
+    [sink]
+    type = "GcpPubSub"
+    topic = "oura-e2e"
+---
+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"
+      serviceAccount: test
+      serviceAccountName: test
+      containers:
+        - name: main
+          image: ${TARGET_IMAGE}
+          env:
+            - name: "RUST_LOG"
+              value: "warn"
+            - name: ""
+          resources:
+            requests:
+              memory: 100Mi
+              cpu: 50m
+            limits:
+              memory: 500Mi
+              cpu: 200m
+          args:
+            - "daemon"
+          volumeMounts:
+            - mountPath: /etc/oura
+              name: oura-config
+      volumes:
+        - name: oura-config
+          configMap:
+            name: ${TEST_NAME}

.github/e2e/teak-perigee-375701-90625f60f360.json

@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "teak-perigee-375701",
+  "private_key_id": "90625f60f360ff18381e6b667fd974bf3ab3045f",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8OcbP8PIt7sr/\njRzU9Dz5BjFijwnCk+hzYIWNueFpZNxunQrh9kOiqNAw2Js4ufxk89lm3ztAexwk\nEdBKwtbPn0696uK6Ad24doPAFwA3O8GkVNqHUv687ULxSvZpkRoT/139jfwt26S5\nWN2f8yb/UzGuyJtxqQHDCTBCDg7oo5LtLwpvTaZZMu3sZ0c/qG0JnOD3YTE4x5km\nMPsj7VF0x3O5QVhgwVyBAy9FCnPSO9zxm7GuT0CoDsbLIAEShsnxHtn5IAi9q7UY\nNHtD1ZWYFuLdWe7QUFkTMDayOQcgzVnbVo/bMVnHyH4gEu3u6ApOiUG9aIfxhCGy\npBWSAh67AgMBAAECggEAEPQ6Ha6YydCTNVu+QWPZS1ImlNEu5ZL4CM7XyMSTWRbU\nkIJ4IZLsIOGIYYkpL7D4J7AboKhlbsq7MqtUfsXR0bRXERE9DqV7YkTYKJW8/byi\nr3NUybdzXYx+qQhOoLY8SjMIaGQ0VxcZKiuNSH2ydHFHoNqavpNxpq7HS4CqEOpl\nqUelFy0te3l2QIJZLeOurtgmCZRNXlSa3PCpNJwOgzn34MOilutUf2zbF5SU675V\n7XL8KscVp5aHcnRKbHnIDgnwDFhNgK/LGuG4vR8T2Fj+mJh3zuFywopoAKs16p/7\nR54I2Rf9zGG/LtIvKzn54rAyV9XQt/WQuMLuyTNU5QKBgQDt0/FucTpeKveuZ5Ze\nOFgW960kzcI/K/4qE+N6VPSK/FJqg6/fygRzkQxda4E/P9wIet0ev9Js4qtATunz\nWTRTrnQm455JiFMb/M8C3m4/vy7TjZ6d1YH2Qqjy6e+V/aD2EFk4r0H4aItuJcS2\n7ziWIBjJV1TA4AgxCzksPCEcLwKBgQDKm5WaNG/yNAKmDYJLhJBXw7oakSziPt5G\nvzKLUmoiwZ9e5ZPBENh9mOF7fctK1vPY5YiezGYcNDE47aUKHOa7iLfIsLKqzf1V\nHgO7rIMLQ3h5eXKxlzhSPXsaT8GbuyCUrSKXCF9VLanoE779xE4ldo0DXNraCKfC\nSgLl3D4HNQKBgQCEvtvvbTvK++irbB4+EOz6RNxbwo09fWysR9WcnnawbQ4DbeVo\n3/WEG93u9uZ5S0ehZBKv6xmktRApIOLsdUoDu0gRvNLI8FKTOJTDYSvgYPHeGxoB\ntv6HWcW7cF/ONHb3YUCrpwcHhDLvFB2sjfHjuZ6cIyanUWTBGyaaTiWc+QKBgHjj\n3J/mKeWaovnxlYz5zCaR4rl3ZhCY8ofEDaSTyEB0x2MYGNFZ+9L1JZVJucMt/tGs\nI5ic3VB20+fj5FXkaMf9C6vzwqenwUDIZ/HTPV27JGdWz9inIjPv+0P30s3ZGdec\ndscnd7qbRIX1QkCooPg5hGo9PVhbUb3b6167y0cBAoGBANXIgiDKc3moOJfI73t+\nuqZ55pBfiX8QaaTqSWdX+pNQemIp97UfW6vPG9gpsEZswUkwSNQjH5111ePLE0te\nK7dqqCuEMK7IIHGaMo48wZ8Et3tbWoLxpJu5iCaqCotxQ6ovUJAHPmb0ab42CxIV\n8vW11v5CXVCWa3f9YnMWfdqF\n-----END PRIVATE KEY-----\n",
+  "client_email": "[email protected]",
+  "client_id": "105764970135434041671",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/oura-e2e%40teak-perigee-375701.iam.gserviceaccount.com"
+}

.github/workflows/release.yml

@@ -131,6 +131,11 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern=v{{major}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{version}}
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
@@ -182,3 +187,4 @@ jobs:
         with:
           files: oura-*/oura-*
           body_path: RELEASE.md
+          draft: true

.github/workflows/validate.yml

@@ -55,7 +55,7 @@ jobs:
           command: test
           args: --all-features
 
-  lints-rust:
+  lints:
     name: Lint Rust
     runs-on: ubuntu-latest
     steps:
@@ -80,21 +80,4 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-features -- -D warnings
-
-  lints-others:
-    name: Lint Support Files
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Check EditorConfig Compliance
-        uses: editorconfig-checker/action-editorconfig-checker@v1
-
-  lints:
-    name: Lint Rust & Support Files
-    runs-on: ubuntu-latest
-    needs: [lints-rust, lints-others]
-    steps:
-     - run: echo "All lints successful"
+          args: --all-features --all-targets -- -D warnings

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "oura"
 description = "The tail of Cardano"
-version = "1.8.1"
+version = "2.0.0-alpha.1"
 edition = "2021"
 repository = "https://github.com/txpipe/oura"
 homepage = "https://github.com/txpipe/oura"
@@ -13,8 +13,8 @@ authors = ["Santiago Carmuega <[email protected]>"]
 
 [dependencies]
 # pallas = "0.18.0"
-# pallas = { git = "https://github.com/txpipe/pallas" }
-pallas = { path = "../pallas/pallas" }
+pallas = { git = "https://github.com/txpipe/pallas" }
+# pallas = { path = "../pallas/pallas" }
 # gasket = { path = "../../construkts/gasket-rs" }
 gasket = { git = "https://github.com/construkts/gasket-rs.git" }
 hex = "0.4.3"

src/bin/oura/console.rs

@@ -7,18 +7,13 @@ use gasket::{metrics::Reading, runtime::Tether};
 use lazy_static::{__Deref, lazy_static};
 use log::Log;
 
-#[derive(clap::ValueEnum, Clone)]
+#[derive(clap::ValueEnum, Clone, Default)]
 pub enum Mode {
     /// shows progress as a plain sequence of logs
+    #[default]
     Plain,
     /// shows aggregated progress and metrics
-    TUI,
-}
-
-impl Default for Mode {
-    fn default() -> Self {
-        Mode::Plain
-    }
+    Tui,
 }
 
 struct TuiConsole {
@@ -39,8 +34,7 @@ impl TuiConsole {
             indicatif::ProgressBar::new_spinner().with_style(
                 indicatif::ProgressStyle::default_spinner()
                     .template(&format!(
-                        "{{spinner}} {:<20} {{msg:<20}} {{pos:>8}} | {{per_sec}}",
-                        name
+                        "{{spinner}} {name:<20} {{msg:<20}} {{pos:>8}} | {{per_sec}}"
                     ))
                     .unwrap(),
             ),
@@ -195,7 +189,7 @@ lazy_static! {
 
 pub fn initialize(mode: &Option<Mode>) {
     match mode {
-        Some(Mode::TUI) => log::set_logger(TUI_CONSOLE.deref())
+        Some(Mode::Tui) => log::set_logger(TUI_CONSOLE.deref())
             .map(|_| log::set_max_level(log::LevelFilter::Info))
             .unwrap(),
         _ => tracing::subscriber::set_global_default(
@@ -209,7 +203,7 @@ pub fn initialize(mode: &Option<Mode>) {
 
 pub fn refresh<'a>(mode: &Option<Mode>, tethers: impl Iterator<Item = &'a Tether>) {
     match mode {
-        Some(Mode::TUI) => TUI_CONSOLE.refresh(tethers),
+        Some(Mode::Tui) => TUI_CONSOLE.refresh(tethers),
         _ => PLAIN_CONSOLE.refresh(tethers),
     }
 }

src/bin/oura/daemon.rs

@@ -1,4 +1,3 @@
-use clap;
 use gasket::runtime::Tether;
 use oura::{filters, framework::*, sinks, sources};
 use pallas::{ledger::traverse::wellknown::GenesisValues, network::upstream::cursor::Cursor};
@@ -56,10 +55,9 @@ impl Runtime {
 
     fn should_stop(&self) -> bool {
         self.all_tethers().any(|tether| match tether.check_state() {
-            gasket::runtime::TetherState::Alive(x) => match x {
-                gasket::runtime::StageState::StandBy => true,
-                _ => false,
-            },
+            gasket::runtime::TetherState::Alive(x) => {
+                matches!(x, gasket::runtime::StageState::StandBy)
+            }
             _ => true,
         })
     }
@@ -134,11 +132,11 @@ fn bootstrap(
 pub fn run(args: &Args) -> Result<(), Error> {
     console::initialize(&args.console);
 
-    let config = ConfigRoot::new(&args.config).map_err(|err| Error::config(err))?;
+    let config = ConfigRoot::new(&args.config).map_err(Error::config)?;
 
-    let chain = config.chain.unwrap_or_default().into();
+    let chain = config.chain.unwrap_or_default();
     let cursor = Cursor::new(config.intersect.into());
-    let error_policy = config.policy.unwrap_or_default().into();
+    let error_policy = config.policy.unwrap_or_default();
     let finalize = config.finalize;
     let current_dir = std::env::current_dir().unwrap();
 

src/filters/deno/mod.rs

@@ -1,17 +1,15 @@
 //! A mapper with custom logic from using the Deno runtime
 
-use deno_core::{op, Extension, ModuleSpecifier, OpState, Snapshot};
+use deno_core::{op, Extension, ModuleSpecifier, OpState};
 use deno_runtime::permissions::PermissionsContainer;
 use deno_runtime::worker::{MainWorker as DenoWorker, WorkerOptions};
 use deno_runtime::BootstrapOptions;
 use gasket::{messaging::*, runtime::Tether};
 use serde::Deserialize;
 use serde_json::json;
-use std::ops::Deref;
-use std::ops::DerefMut;
 use std::path::PathBuf;
 use tokio::runtime::Runtime as TokioRuntime;
-use tracing::{debug, trace};
+use tracing::trace;
 
 use crate::framework::*;
 
@@ -151,7 +149,7 @@ impl gasket::runtime::Worker for Worker {
                     }
                 }
             }
-            ChainEvent::Undo(p, r) => todo!(),
+            ChainEvent::Undo(..) => todo!(),
             ChainEvent::Reset(p) => {
                 self.output.send(ChainEvent::reset(p))?;
             }
@@ -189,7 +187,7 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn bootstrapper(self, ctx: &Context) -> Result<Bootstrapper, Error> {
+    pub fn bootstrapper(self, _ctx: &Context) -> Result<Bootstrapper, Error> {
         // let main_module =
         //    deno_core::resolve_path(&self.main_module,
         // &ctx.current_dir).map_err(Error::config)?;

src/filters/dsl.rs

@@ -214,9 +214,9 @@ impl Predicate {
     }
 }
 
-#[derive(Default)]
 struct Worker {
     msg_count: gasket::metrics::Counter,
+    predicate: Predicate,
     input: FilterInputPort,
     output: FilterOutputPort,
 }
@@ -231,9 +231,14 @@ impl gasket::runtime::Worker for Worker {
     fn work(&mut self) -> gasket::runtime::WorkResult {
         let msg = self.input.recv_or_idle()?;
 
-        todo!();
-
-        self.output.send(msg)?;
+        match &msg.payload {
+            ChainEvent::Apply(_, Record::OuraV1Event(x)) => {
+                if self.predicate.event_matches(x) {
+                    self.output.send(msg)?;
+                }
+            }
+            _ => todo!(),
+        }
 
         Ok(gasket::runtime::WorkOutcome::Partial)
     }
@@ -263,12 +268,17 @@ impl Bootstrapper {
 
 #[derive(Debug, Deserialize)]
 pub struct Config {
-    pub check: Predicate,
+    pub predicate: Predicate,
 }
 
 impl Config {
-    pub fn bootstrapper(self, ctx: &Context) -> Result<Bootstrapper, Error> {
-        let worker = Worker::default();
+    pub fn bootstrapper(self, _ctx: &Context) -> Result<Bootstrapper, Error> {
+        let worker = Worker {
+            predicate: self.predicate,
+            msg_count: Default::default(),
+            input: Default::default(),
+            output: Default::default(),
+        };
 
         Ok(Bootstrapper(worker))
     }