feat: verifier

Cargo.toml

@@ -29,9 +29,11 @@ unnecessary-debug-formatting = "warn"
 
 [workspace.dependencies]
 alloy = "1"
+alloy-chains = "0.2"
 alloy-contract = "1.2"
 alloy-primitives = "1.5"
 alloy-provider = "1.2"
+alloy-rpc-types-eth = "1.6"
 alloy-signer = "1.1"
 alloy-signer-local = "1.1"
 alloy-sol-types = "1.5"

crates/calendar/src/main.rs

@@ -1,6 +1,6 @@
 //! Calendar server
 
-use alloy_primitives::{address, b256};
+use alloy_primitives::b256;
 use alloy_provider::{ProviderBuilder, network::EthereumWallet};
 use alloy_signer_local::{LocalSigner, MnemonicBuilder};
 use axum::{
@@ -33,9 +33,6 @@ async fn main() -> eyre::Result<()> {
     // TODO: graceful shutdown
     let journal = Journal::with_capacity(RING_BUFFER_CAPACITY);
 
-    // ethereum provider
-    // Implementation deployed at: 0xf74254bf3c40b29259ce12bd35e74f40b0fda07d
-    // Proxy deployed at: 0x98c857e675e472cf2fd98c478ed4ecc4caf81fae
     let key = MnemonicBuilder::from_phrase(env::var("MNEMONIC")?.as_str())
         .index(0u32)?
         .build()?;
@@ -44,10 +41,7 @@ async fn main() -> eyre::Result<()> {
         .connect("https://0xrpc.io/sep")
         .await?;
 
-    let contract = UniversalTimestamps::new(
-        address!("0x98c857e675e472cf2fd98c478ed4ecc4caf81fae"),
-        provider.clone(),
-    );
+    let contract = UniversalTimestamps::new(uts_contracts::uts::DEFAULT_ADDRESS, provider.clone());
 
     // stamper
     let reader = journal.reader();

crates/contracts/Cargo.toml

@@ -10,6 +10,7 @@ version.workspace = true
 
 [dependencies]
 alloy-contract = { workspace = true }
+alloy-primitives = { workspace = true }
 alloy-sol-types = { workspace = true, features = ["json"] }
 
 [dev-dependencies]

crates/contracts/abi/IUniversalTimestamps.json

@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"attest","inputs":[{"name":"root","type":"bytes32","internalType":"bytes32"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"timestamp","inputs":[{"name":"root","type":"bytes32","internalType":"bytes32"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"event","name":"Attested","inputs":[{"name":"root","type":"bytes32","indexed":true,"internalType":"bytes32"},{"name":"sender","type":"address","indexed":true,"internalType":"address"},{"name":"timestamp","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"attest(bytes32)":"23c3617f","timestamp(bytes32)":"4d003070"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.24+commit.e11b9ed9\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"Attested\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"}],\"name\":\"attest\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"root\",\"type\":\"bytes32\"}],\"name\":\"timestamp\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"contracts/IUniversalTimestamps.sol\":\"IUniversalTimestamps\"},\"evmVersion\":\"cancun\",\"libraries\":{},\"metadata\":{\"appendCBOR\":false,\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[\":@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/\",\":@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/\",\":erc4626-tests/=lib/openzeppelin-contracts-upgradeable/lib/erc4626-tests/\",\":forge-std/=lib/forge-std/src/\",\":halmos-cheatcodes/=lib/openzeppelin-contracts-upgradeable/lib/halmos-cheatcodes/src/\",\":openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/\",\":openzeppelin-contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/\",\":openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/\"]},\"sources\":{\"contracts/IUniversalTimestamps.sol\":{\"keccak256\":\"0xfa9490d2704cebe76fa78d15f51ed3bf13577ffaf782fe0337db402872571df0\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://c42b87e7040e6d72f5b49a2bff481191678e15df1c19793e9c55800e8f5276cf\",\"dweb:/ipfs/QmNr4ET95fihTnh3YF6WjjKUsCFU7KkoPkvKAizb83pyCC\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.24+commit.e11b9ed9"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"bytes32","name":"root","type":"bytes32","indexed":true},{"internalType":"address","name":"sender","type":"address","indexed":true},{"internalType":"uint256","name":"timestamp","type":"uint256","indexed":false}],"type":"event","name":"Attested","anonymous":false},{"inputs":[{"internalType":"bytes32","name":"root","type":"bytes32"}],"stateMutability":"nonpayable","type":"function","name":"attest"},{"inputs":[{"internalType":"bytes32","name":"root","type":"bytes32"}],"stateMutability":"view","type":"function","name":"timestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/","@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/","erc4626-tests/=lib/openzeppelin-contracts-upgradeable/lib/erc4626-tests/","forge-std/=lib/forge-std/src/","halmos-cheatcodes/=lib/openzeppelin-contracts-upgradeable/lib/halmos-cheatcodes/src/","openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/","openzeppelin-contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/","openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/"],"optimizer":{"enabled":true,"runs":200},"metadata":{"bytecodeHash":"none","appendCBOR":false},"compilationTarget":{"contracts/IUniversalTimestamps.sol":"IUniversalTimestamps"},"evmVersion":"cancun","libraries":{}},"sources":{"contracts/IUniversalTimestamps.sol":{"keccak256":"0xfa9490d2704cebe76fa78d15f51ed3bf13577ffaf782fe0337db402872571df0","urls":["bzz-raw://c42b87e7040e6d72f5b49a2bff481191678e15df1c19793e9c55800e8f5276cf","dweb:/ipfs/QmNr4ET95fihTnh3YF6WjjKUsCFU7KkoPkvKAizb83pyCC"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"ast":{"absolutePath":"contracts/IUniversalTimestamps.sol","id":187,"exportedSymbols":{"IUniversalTimestamps":[186]},"nodeType":"SourceUnit","src":"33:262:1","nodes":[{"id":165,"nodeType":"PragmaDirective","src":"33:24:1","nodes":[],"literals":["solidity","^","0.8",".24"]},{"id":186,"nodeType":"ContractDefinition","src":"59:235:1","nodes":[{"id":173,"nodeType":"EventDefinition","src":"96:80:1","nodes":[],"anonymous":false,"eventSelector":"61cae4201bb8c0117495b22a70f5202410666b349c27302dac280dc054b60f2a","name":"Attested","nameLocation":"102:8:1","parameters":{"id":172,"nodeType":"ParameterList","parameters":[{"constant":false,"id":167,"indexed":true,"mutability":"mutable","name":"root","nameLocation":"127:4:1","nodeType":"VariableDeclaration","scope":173,"src":"111:20:1","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"},"typeName":{"id":166,"name":"bytes32","nodeType":"ElementaryTypeName","src":"111:7:1","typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}},"visibility":"internal"},{"constant":false,"id":169,"indexed":true,"mutability":"mutable","name":"sender","nameLocation":"149:6:1","nodeType":"VariableDeclaration","scope":173,"src":"133:22:1","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":168,"name":"address","nodeType":"ElementaryTypeName","src":"133:7:1","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":171,"indexed":false,"mutability":"mutable","name":"timestamp","nameLocation":"165:9:1","nodeType":"VariableDeclaration","scope":173,"src":"157:17:1","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":170,"name":"uint256","nodeType":"ElementaryTypeName","src":"157:7:1","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"110:65:1"}},{"id":178,"nodeType":"FunctionDefinition","src":"182:39:1","nodes":[],"functionSelector":"23c3617f","implemented":false,"kind":"function","modifiers":[],"name":"attest","nameLocation":"191:6:1","parameters":{"id":176,"nodeType":"ParameterList","parameters":[{"constant":false,"id":175,"mutability":"mutable","name":"root","nameLocation":"206:4:1","nodeType":"VariableDeclaration","scope":178,"src":"198:12:1","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"},"typeName":{"id":174,"name":"bytes32","nodeType":"ElementaryTypeName","src":"198:7:1","typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}},"visibility":"internal"}],"src":"197:14:1"},"returnParameters":{"id":177,"nodeType":"ParameterList","parameters":[],"src":"220:0:1"},"scope":186,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":185,"nodeType":"FunctionDefinition","src":"227:65:1","nodes":[],"functionSelector":"4d003070","implemented":false,"kind":"function","modifiers":[],"name":"timestamp","nameLocation":"236:9:1","parameters":{"id":181,"nodeType":"ParameterList","parameters":[{"constant":false,"id":180,"mutability":"mutable","name":"root","nameLocation":"254:4:1","nodeType":"VariableDeclaration","scope":185,"src":"246:12:1","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"},"typeName":{"id":179,"name":"bytes32","nodeType":"ElementaryTypeName","src":"246:7:1","typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}},"visibility":"internal"}],"src":"245:14:1"},"returnParameters":{"id":184,"nodeType":"ParameterList","parameters":[{"constant":false,"id":183,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":185,"src":"283:7:1","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":182,"name":"uint256","nodeType":"ElementaryTypeName","src":"283:7:1","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"282:9:1"},"scope":186,"stateMutability":"view","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"IUniversalTimestamps","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[186],"name":"IUniversalTimestamps","nameLocation":"69:20:1","scope":187,"usedErrors":[],"usedEvents":[173]}],"license":"MIT"},"id":1}

crates/contracts/src/lib.rs

@@ -2,25 +2,21 @@
 
 /// UniversalTimestamps contract
 pub mod uts {
+    use alloy_primitives::{Address, address};
+
     #[doc(hidden)]
     pub mod binding {
         use alloy_sol_types::sol;
 
         sol!(
             #[sol(rpc, all_derives)]
             IUniversalTimestamps,
-            concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/../../target/foundry/IUniversalTimestamps.sol/IUniversalTimestamps.json"
-            )
+            "abi/IUniversalTimestamps.json"
         );
         sol!(
             #[sol(rpc)]
             UniversalTimestamps,
-            concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/../../target/foundry/UniversalTimestamps.sol/UniversalTimestamps.json"
-            )
+            "abi/UniversalTimestamps.json"
         );
     }
 
@@ -30,6 +26,9 @@ pub mod uts {
 
     pub use binding::UniversalTimestamps::{BYTECODE, DEPLOYED_BYTECODE, deploy, deploy_builder};
 
+    /// Default address for the UniversalTimestamps contract.
+    pub const DEFAULT_ADDRESS: Address = address!("0xceB7a9E77bd00D0391349B9bC989167cAB5e35e7");
+
     #[cfg(test)]
     mod tests {
         use super::*;
@@ -100,10 +99,7 @@ pub mod erc1967 {
         sol!(
             #[sol(rpc)]
             ERC1967Proxy,
-            concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/../../target/foundry/ERC1967Proxy.sol/ERC1967Proxy.json"
-            )
+            "abi/ERC1967Proxy.json"
         );
     }
 

crates/core-wasm/src/lib.rs

@@ -6,8 +6,8 @@ use serde_with::{hex::Hex, serde_as};
 use uts_core::codec::{
     Decode, Encode,
     v1::{
-        Attestation, BitcoinAttestation, DetachedTimestamp, DigestHeader, MayHaveInput,
-        PendingAttestation, Timestamp, opcode::OpCode,
+        Attestation, BitcoinAttestation, DetachedTimestamp, DigestHeader, EthereumUTSAttestation,
+        MayHaveInput, PendingAttestation, Timestamp, opcode::OpCode,
     },
 };
 use wasm_bindgen::prelude::*;
@@ -89,6 +89,10 @@ fn serialize_chain(mut current_node: &Timestamp) -> Value {
         Bitcoin {
             height: u32,
         },
+        EthereumUTS {
+            chain: u64,
+            height: u64,
+        },
         Unknown {
             #[serde_as(as = "Hex")]
             tag: Vec<u8>,
@@ -108,6 +112,12 @@ fn serialize_chain(mut current_node: &Timestamp) -> Value {
                 } else if raw.tag == BitcoinAttestation::TAG {
                     let btc = BitcoinAttestation::from_raw(raw).unwrap();
                     chain.push(json!(AttestationStep::Bitcoin { height: btc.height }));
+                } else if raw.tag == EthereumUTSAttestation::TAG {
+                    let eth = EthereumUTSAttestation::from_raw(raw).unwrap();
+                    chain.push(json!(AttestationStep::EthereumUTS {
+                        chain: eth.chain.id(),
+                        height: eth.height,
+                    }));
                 } else {
                     chain.push(json!(AttestationStep::Unknown {
                         tag: raw.tag.to_vec(),

crates/core/Cargo.toml

@@ -15,6 +15,11 @@ path = "src/bin/uts_info.rs"
 required-features = ["std"]
 
 [dependencies]
+alloy-chains = { workspace = true }
+alloy-primitives = { workspace = true }
+alloy-provider = { workspace = true, optional = true }
+alloy-rpc-types-eth = { workspace = true, optional = true }
+alloy-sol-types = { workspace = true, optional = true }
 auto_impl.workspace = true
 bytes = { workspace = true, optional = true }
 digest.workspace = true
@@ -29,13 +34,16 @@ sha2.workspace = true
 sha3.workspace = true
 thiserror.workspace = true
 tracing = { workspace = true, optional = true }
+uts-contracts = { workspace = true, optional = true }
 
 [features]
 bytes = ["dep:bytes"]
 default = ["std"]
+ethereum-uts-verifier = ["verifier", "dep:alloy-provider", "dep:alloy-rpc-types-eth", "dep:alloy-sol-types", "dep:uts-contracts"]
 serde = ["dep:serde", "dep:serde_with", "serde/derive", "serde_with/hex"]
 std = []
 tracing = ["dep:tracing"]
+verifier = []
 
 [dev-dependencies]
 criterion = { version = "0.5", features = ["html_reports"] }