P2P - Part 1

Cargo.toml

@@ -208,7 +208,6 @@ wavs = { path = "packages/wavs" }
 wavs-engine = { path = "packages/engine" }
 wavs-types = { path = "packages/types" }
 wavs-cli = { path = "packages/cli" }
-wavs-aggregator = { path = "packages/aggregator" }
 wavs-benchmark-common = { path = "packages/wavs/benches/common" }
 example-helpers = { path = "examples/components/_helpers" }
 example-types = { path = "examples/components/_types" }

checksums.txt

@@ -1,12 +1,12 @@
-83fc7cebc10ad4a2f0903a3a3172cfad66bdc04a703e837048630b5a530791d8  ./examples/build/components/chain_trigger_lookup.wasm
-4b685d3b70400b9d34bb3c332bfb9e753eff606ba495a3f2a203b132cb2c97b5  ./examples/build/components/cosmos_query.wasm
-9cf528fb697b636a4bc506a827dbb0bf0f1ea752f4ce1c31a0a93bc50473cef2  ./examples/build/components/echo_block_interval.wasm
-0105aba97c40166bb043cbb5aad290319c6f13a5972a68027086c5923f332842  ./examples/build/components/echo_cron_interval.wasm
-841b1ee7d96dc45f829b7051f8a01e5298262036aa3c4048be3d48e334ed5394  ./examples/build/components/echo_data.wasm
-755735b2720aaadd753cbefabafebb76ef84f5b8745341669b0a30f03f4157df  ./examples/build/components/example_helpers.wasm
-980288228c1f56076eff41eff796fcbdf0d400890d4322f043e843559620fae2  ./examples/build/components/example_types.wasm
-f30378955c29cdd42f423adce5157974ac5b1620b3af9dcbe3d4574708b81052  ./examples/build/components/kv_store.wasm
-4c4d271889fef308ff7768dff42f4e68c0ff40bcf0fbf94bafec863e71741e4d  ./examples/build/components/permissions.wasm
-f59d830593b785193c127546534098dec193385e8693e552751ad2b88d44dab4  ./examples/build/components/simple_aggregator.wasm
-4c7d13f89bf7dad2175e758ee68849f3a2e3b92f5c938beaf7cd2a64bd968c7b  ./examples/build/components/square.wasm
-d670a5147ba8b6cb208b7917ffc1b5c2be9ebfd6e6ad64005210d06904a3955a  ./examples/build/components/timer_aggregator.wasm
+7357a18b8c871645da205747eb2701343ac989a30cf0647593289233e35040e5  ./examples/build/components/chain_trigger_lookup.wasm
+45bdb2d5a9883272173bec399d2a8c2c1d8e06c0acb8eddc7e1745e52b48de35  ./examples/build/components/cosmos_query.wasm
+663cd1cc91f2dc706b383a916856c9aaa887401a4a45f18cc065a103f20be851  ./examples/build/components/echo_block_interval.wasm
+2d9f154a7c31db76ad960c140962cce650f9c82cff60dc52d964bb0f871d37bc  ./examples/build/components/echo_cron_interval.wasm
+906137ffd42c2d2ac80fd5be2bb0023bbcdcecbe8c40da2e50e8ca091bb427e0  ./examples/build/components/echo_data.wasm
+766f9a5ff079ddd6ce843b6575459b4e0e13ff4b4bd2a74c96e7dbaa1c21a3f2  ./examples/build/components/example_helpers.wasm
+74859d20ef1624be300bc641a24d8823f1b55a3038c1a6654e08713279e45773  ./examples/build/components/example_types.wasm
+f4e5eb8e9773fefa4e182412ed655a7bd789e9882163687bbf5da34acb3a68c0  ./examples/build/components/kv_store.wasm
+4d0391997d2095613e9052ca66ef8b5429d8f5425455454f04bc90a90388fb5f  ./examples/build/components/permissions.wasm
+ec07dc357b85c3e39ae4d219617751648837939f20b5851b69202e85de7f65a2  ./examples/build/components/simple_aggregator.wasm
+a4e4277e8f310cb423e1156d05d9e515ce11dd838941c2064f55624ecfa14ce6  ./examples/build/components/square.wasm
+5dff96dcd7fcb2302dfa83bc4a27a8fee739cc8f23797fef095c06be98d7078a  ./examples/build/components/timer_aggregator.wasm

examples/components/simple-aggregator/src/lib.rs

@@ -5,21 +5,20 @@ use wavs_types::ChainKey;
 use wavs_wasi_utils::impl_u128_conversions;
 use world::{
     host,
-    wavs::aggregator::aggregator::{AggregatorAction, Packet, SubmitAction},
+    wavs::aggregator::input::AggregatorInput,
+    wavs::aggregator::output::{
+        AggregatorAction, CosmosAddress, CosmosSubmitAction, EvmSubmitAction, SubmitAction, U128,
+    },
     wavs::types::chain::{AnyTxHash, EvmAddress},
     Guest,
 };
 
-use crate::world::wavs::aggregator::aggregator::{
-    CosmosAddress, CosmosSubmitAction, EvmSubmitAction, U128,
-};
-
 impl_u128_conversions!(U128);
 
 struct Component;
 
 impl Guest for Component {
-    fn process_packet(_pkt: Packet) -> Result<Vec<AggregatorAction>, String> {
+    fn process_input(_input: AggregatorInput) -> Result<Vec<AggregatorAction>, String> {
         let chain = host::config_var("chain").ok_or("chain config variable is required")?;
         let chain =
             AnyChainKey::from_host(&chain).ok_or(format!("no chain config for {}", chain))?;
@@ -68,12 +67,12 @@ impl Guest for Component {
         Ok(vec![AggregatorAction::Submit(submit_action)])
     }
 
-    fn handle_timer_callback(_packet: Packet) -> Result<Vec<AggregatorAction>, String> {
+    fn handle_timer_callback(_input: AggregatorInput) -> Result<Vec<AggregatorAction>, String> {
         Err("Not implemented yet".to_string())
     }
 
     fn handle_submit_callback(
-        _packet: Packet,
+        _input: AggregatorInput,
         tx_result: Result<AnyTxHash, String>,
     ) -> Result<(), String> {
         match tx_result {

examples/components/timer-aggregator/src/lib.rs

@@ -3,18 +3,17 @@ mod world;
 
 use world::{
     host,
-    wavs::aggregator::aggregator::{AggregatorAction, Packet, SubmitAction, TimerAction},
+    wavs::aggregator::input::AggregatorInput,
+    wavs::aggregator::output::{AggregatorAction, EvmSubmitAction, SubmitAction, TimerAction},
     wavs::types::chain::{AnyTxHash, EvmAddress},
     wavs::types::core::Duration,
     Guest,
 };
 
-use crate::world::wavs::aggregator::aggregator::EvmSubmitAction;
-
 struct Component;
 
 impl Guest for Component {
-    fn process_packet(_pkt: Packet) -> Result<Vec<AggregatorAction>, String> {
+    fn process_input(_input: AggregatorInput) -> Result<Vec<AggregatorAction>, String> {
         let timer_delay_secs_str = host::config_var("timer_delay_secs")
             .ok_or("timer_delay_secs config variable is required")?;
 
@@ -30,7 +29,7 @@ impl Guest for Component {
         Ok(vec![AggregatorAction::Timer(timer_action)])
     }
 
-    fn handle_timer_callback(packet: Packet) -> Result<Vec<AggregatorAction>, String> {
+    fn handle_timer_callback(input: AggregatorInput) -> Result<Vec<AggregatorAction>, String> {
         let chain = host::config_var("chain").ok_or("chain config variable is required")?;
         let service_handler_str = host::config_var("service_handler")
             .ok_or("service_handler config variable is required")?;
@@ -46,15 +45,15 @@ impl Guest for Component {
             gas_price: None,
         });
 
-        if !utils::is_valid_tx(packet.trigger_data)? {
+        if !utils::is_valid_tx(input.trigger_action.data)? {
             return Ok(vec![]);
         }
 
         Ok(vec![AggregatorAction::Submit(submit_action)])
     }
 
     fn handle_submit_callback(
-        _packet: Packet,
+        _input: AggregatorInput,
         tx_result: Result<AnyTxHash, String>,
     ) -> Result<(), String> {
         match tx_result {

justfile

@@ -384,4 +384,7 @@ wasi-publish version component="*" flags="":
 ts-bindings:
     rm -rf packages/types/bindings
     cargo test -p wavs-types --features ts-bindings
-    cargo run --bin ts
+    cargo run --bin ts
+
+debug:
+    cargo test --package wavs --features dev --test aggregator_tests send_to_self