chore: remove local ASM crates (#1642)

* everything compiles with asm deps using cargo check --workspace

* chore: remove unused files

* refactor: rename existing bridge types crate to strata-ol-bridge-types and consolidate existing types from asm

* chore: remove asm-logs crate

* purge local checkpoint-types-ssz

* fix lints

* style: put asm deps together

Author: prajwolrg

Cargo.lock

@@ -16,34 +16,16 @@ members = [
   "crates/alpen-ee/rpc/server",
   "crates/alpen-ee/rpc/types",
   "crates/alpen-ee/sequencer",
-  "crates/asm/common",
-  "crates/asm/logs",
-  "crates/asm/params",
-  "crates/asm/msgs/bridge",
-  "crates/asm/msgs/checkpoint",
-  "crates/asm/stf",
-  "crates/asm/manifest-types",
   "crates/asm/spec",
   "crates/asm/spec-debug",
-  "crates/asm/subprotocols/bridge-v1",
-  "crates/asm/subprotocols/debug-v1",
-  "crates/asm/subprotocols/admin",
-  "crates/asm/txs/admin",
   "crates/asm/txs/checkpoint-v0",
-  "crates/asm/txs/checkpoint",
   "crates/asm/subprotocols/checkpoint-v0",
-  "crates/asm/subprotocols/checkpoint",
-  "crates/asm/txs/test-utils",
-  "crates/asm/txs/bridge-v1",
-  "crates/asm/worker",
-  "crates/btc-verification",
   "crates/btcio",
   "crates/chainexec",
   "crates/chaintsn",
   "crates/chain-worker",
   "crates/chain-worker-new",
   "crates/checkpoint-types",
-  "crates/checkpoint-types-ssz",
   "crates/cli-common",
   "crates/codec-utils",
   "crates/common",
@@ -112,7 +94,6 @@ members = [
   "crates/storage",
   "crates/storage-common",
   "crates/sync",
-  "crates/test-utils/btc",
   "crates/test-utils/btcio",
   "crates/test-utils/evm-ee",
   "crates/test-utils/l2",
@@ -188,35 +169,16 @@ alpen-reth-rpc = { path = "crates/reth/rpc" }
 alpen-reth-statediff = { path = "crates/reth/statediff" }
 alpen-reth-witness = { path = "crates/reth/witness" }
 strata-acct-types = { path = "crates/acct-types" }
-strata-asm-bridge-msgs = { path = "crates/asm/msgs/bridge" }
-strata-asm-checkpoint-msgs = { path = "crates/asm/msgs/checkpoint" }
-strata-asm-common = { path = "crates/asm/common" }
-strata-asm-logs = { path = "crates/asm/logs" }
-strata-asm-manifest-types = { path = "crates/asm/manifest-types" }
-strata-asm-params = { path = "crates/asm/params" }
-strata-asm-proto-administration = { path = "crates/asm/subprotocols/admin" }
-strata-asm-proto-bridge-v1 = { path = "crates/asm/subprotocols/bridge-v1" }
-strata-asm-proto-checkpoint = { path = "crates/asm/subprotocols/checkpoint" }
 strata-asm-proto-checkpoint-v0 = { path = "crates/asm/subprotocols/checkpoint-v0" }
-strata-asm-proto-debug-v1 = { path = "crates/asm/subprotocols/debug-v1" }
 strata-asm-spec = { path = "crates/asm/spec" }
 strata-asm-spec-debug = { path = "crates/asm/spec-debug" }
-strata-asm-stf = { path = "crates/asm/stf" }
-strata-asm-txs-admin = { path = "crates/asm/txs/admin" }
-strata-asm-txs-bridge-v1 = { path = "crates/asm/txs/bridge-v1" }
-strata-asm-txs-checkpoint = { path = "crates/asm/txs/checkpoint" }
 strata-asm-txs-checkpoint-v0 = { path = "crates/asm/txs/checkpoint-v0" }
-strata-asm-txs-test-utils = { path = "crates/asm/txs/test-utils" }
-strata-asm-worker = { path = "crates/asm/worker" }
-strata-bridge-types = { path = "crates/bridge-types" }
-strata-btc-verification = { path = "crates/btc-verification" }
 strata-btcio = { path = "crates/btcio" }
 strata-chain-worker = { path = "crates/chain-worker" }
 strata-chain-worker-new = { path = "crates/chain-worker-new" }
 strata-chainexec = { path = "crates/chainexec" }
 strata-chaintsn = { path = "crates/chaintsn" }
 strata-checkpoint-types = { path = "crates/checkpoint-types" }
-strata-checkpoint-types-ssz = { path = "crates/checkpoint-types-ssz" }
 strata-cli-common = { path = "crates/cli-common" }
 strata-codec-utils = { path = "crates/codec-utils" }
 strata-common = { path = "crates/common" }
@@ -240,6 +202,7 @@ strata-ledger-types = { path = "crates/ledger-types" }
 strata-mpt = { path = "crates/mpt" }
 strata-node-context = { path = "crates/node-context" }
 strata-ol-block-assembly = { path = "crates/ol/block-assembly" }
+strata-ol-bridge-types = { path = "crates/bridge-types" }
 strata-ol-chain-types = { path = "crates/ol-chain-types" }
 strata-ol-chain-types-new = { path = "crates/ol/chain-types" }
 strata-ol-chainstate-types = { path = "crates/ol-chainstate-types" }
@@ -280,7 +243,6 @@ strata-storage = { path = "crates/storage" }
 strata-storage-common = { path = "crates/storage-common" }
 strata-sync = { path = "crates/sync" }
 strata-test-utils = { path = "crates/test-utils/test-utils" }
-strata-test-utils-btc = { path = "crates/test-utils/btc" }
 strata-test-utils-btcio = { path = "crates/test-utils/btcio" }
 strata-test-utils-evm-ee = { path = "crates/test-utils/evm-ee" }
 strata-test-utils-l2 = { path = "crates/test-utils/l2" }
@@ -305,6 +267,28 @@ strata-predicate = { git = "https://github.com/alpenlabs/strata-common", tag = "
 strata-service = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" }
 strata-tasks = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" }
 
+# asm
+strata-asm-bridge-msgs = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-checkpoint-msgs = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-common = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-logs = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-manifest-types = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-params = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-proto-administration = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-proto-bridge-v1 = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-proto-checkpoint = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-proto-debug-v1 = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-stf = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-txs-admin = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-txs-bridge-v1 = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-txs-checkpoint = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-txs-test-utils = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-asm-worker = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-bridge-types = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-btc-verification = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-checkpoint-types-ssz = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+strata-test-utils-btc = { git = "https://github.com/alpenlabs/asm", rev = "49c381ec0f3e11a32d3aa20a521ee49270662b21" }
+
 # sled wrapper
 typed-sled = { git = "https://github.com/alpenlabs/typed-sled" }
 

Cargo.toml

@@ -13,10 +13,10 @@ path = "src/main.rs"
 [dependencies]
 alpen-reth-primitives.workspace = true
 strata-asm-txs-bridge-v1.workspace = true
-strata-bridge-types.workspace = true
 strata-cli-common.workspace = true
 strata-identifiers.workspace = true
 strata-l1-txfmt.workspace = true
+strata-ol-bridge-types.workspace = true
 strata-params.workspace = true
 strata-primitives.workspace = true
 

bin/alpen-cli/Cargo.toml

@@ -19,10 +19,10 @@ use indicatif::ProgressBar;
 use rand_core::OsRng;
 use shrex::encode;
 use strata_asm_txs_bridge_v1::deposit_request::DrtHeaderAux;
-use strata_bridge_types::DepositDescriptor;
 use strata_cli_common::errors::{DisplayableError, DisplayedError};
 use strata_identifiers::{AccountSerial, SubjectIdBytes};
 use strata_l1_txfmt::{MagicBytes, ParseConfig};
+use strata_ol_bridge_types::DepositDescriptor;
 use strata_primitives::crypto::even_kp;
 
 use crate::{

bin/alpen-cli/src/cmd/deposit.rs

@@ -8,8 +8,8 @@ use alpen_reth_primitives::WithdrawalCalldata;
 use argh::FromArgs;
 use bdk_wallet::{bitcoin::Address, KeychainKind};
 use indicatif::ProgressBar;
-use strata_bridge_types::OperatorSelection;
 use strata_cli_common::errors::{DisplayableError, DisplayedError};
+use strata_ol_bridge_types::OperatorSelection;
 use strata_primitives::bitcoin_bosd::Descriptor;
 
 use crate::{

bin/alpen-cli/src/cmd/withdraw.rs

@@ -11,6 +11,7 @@ use strata_asm_params::{
     SubprotocolInstance,
 };
 use strata_btc_types::BitcoinAmount;
+use strata_btc_verification::L1Anchor;
 use strata_crypto::{
     keys::compressed::CompressedPublicKey, threshold_signature::ThresholdConfig, EvenPublicKey,
 };
@@ -152,9 +153,15 @@ pub(super) fn exec(cmd: SubcAsmParams, ctx: &mut CmdContext) -> anyhow::Result<(
     };
 
     // Assemble ASM params.
+    let anchor = L1Anchor {
+        block: genesis_l1_view.blk,
+        next_target: genesis_l1_view.next_target,
+        epoch_start_timestamp: genesis_l1_view.epoch_start_timestamp,
+        network: ctx.bitcoin_network,
+    };
     let asm_params = AsmParams {
         magic,
-        l1_view: genesis_l1_view,
+        anchor,
         subprotocols: vec![
             SubprotocolInstance::Admin(admin),
             SubprotocolInstance::Checkpoint(checkpoint),

bin/datatool/src/cmd/asm_params.rs

@@ -15,7 +15,6 @@ strata-asm-params.workspace = true
 strata-asm-proto-bridge-v1.workspace = true
 strata-asm-txs-bridge-v1.workspace = true
 strata-asm-txs-checkpoint-v0.workspace = true
-strata-bridge-types.workspace = true
 strata-btcio.workspace = true
 strata-checkpoint-types.workspace = true
 strata-common = { workspace = true, default-features = true }
@@ -28,6 +27,7 @@ strata-db-types.workspace = true
 strata-eectl.workspace = true
 strata-evmexec.workspace = true
 strata-l1-txfmt.workspace = true
+strata-ol-bridge-types.workspace = true
 strata-ol-chain-types.workspace = true
 strata-ol-chainstate-types.workspace = true
 strata-params.workspace = true

bin/strata-client/Cargo.toml

@@ -25,6 +25,7 @@ use strata_config::Config;
 use strata_consensus_logic::{
     genesis::{self, make_genesis_block},
     sync_manager::{self, SyncManager},
+    AsmBlockSubmitter,
 };
 use strata_db_store_sled::SledBackend;
 use strata_db_types::{
@@ -381,7 +382,7 @@ fn start_core_tasks(
             Arc::new(config.btcio.reader.clone()),
             btcio_params,
             status_channel.clone(),
-            sync_manager.get_asm_ctl(),
+            Arc::new(AsmBlockSubmitter::new(sync_manager.get_asm_ctl())),
         ),
     );
 

bin/strata-client/src/main.rs

@@ -8,7 +8,6 @@ use jsonrpsee::core::RpcResult;
 use strata_asm_proto_bridge_v1::{BridgeV1State, BridgeV1Subproto};
 use strata_asm_txs_bridge_v1::BRIDGE_V1_SUBPROTOCOL_ID;
 use strata_asm_txs_checkpoint_v0::{CHECKPOINT_V0_SUBPROTOCOL_ID, OL_STF_CHECKPOINT_TX_TYPE};
-use strata_bridge_types::{PublickeyTable, WithdrawalIntent};
 use strata_btcio::{broadcaster::L1BroadcastHandle, writer::EnvelopeHandle};
 use strata_checkpoint_types::{Checkpoint, EpochSummary, SignedCheckpoint};
 #[cfg(feature = "debug-utils")]
@@ -21,10 +20,12 @@ use strata_db_types::types::{
     CheckpointConfStatus, CheckpointProvingStatus, L1TxEntry, L1TxStatus,
 };
 use strata_l1_txfmt::TagData;
+use strata_ol_bridge_types::{PublickeyTable, WithdrawalIntent};
 use strata_ol_chain_types::{L2Block, L2BlockBundle, L2BlockId, L2Header};
 use strata_ol_chainstate_types::Chainstate;
 use strata_params::Params;
 use strata_primitives::{
+    bitcoin_bosd::Descriptor,
     buf::Buf32,
     crypto::EvenPublicKey,
     epoch::EpochCommitment,
@@ -452,7 +453,10 @@ impl StrataApiServer for StrataRpcImpl {
             .map(|a| RpcWithdrawalAssignment {
                 deposit_idx: a.deposit_idx(),
                 amt: a.withdrawal_command().net_amount(),
-                destination: a.withdrawal_command().destination().clone(),
+                destination: Descriptor::from_bytes(
+                    &a.withdrawal_command().destination().to_bytes(),
+                )
+                .expect("ASM descriptor should deserialize into RPC descriptor"),
                 operator_idx: a.current_assignee(),
             })
             .collect::<Vec<RpcWithdrawalAssignment>>();

bin/strata-client/src/rpc_server.rs

@@ -16,13 +16,13 @@ strata-acct-types.workspace = true
 strata-asm-logs.workspace = true
 strata-asm-manifest-types.workspace = true
 strata-asm-txs-bridge-v1 = { workspace = true, features = ["test-utils"] }
-strata-bridge-types.workspace = true
 strata-cli-common.workspace = true
 strata-codec.workspace = true
 strata-crypto.workspace = true
 strata-identifiers.workspace = true
 strata-l1-txfmt.workspace = true
 strata-msg-fmt.workspace = true
+strata-ol-bridge-types.workspace = true
 strata-ol-msg-types.workspace = true
 strata-ol-stf.workspace = true
 strata-primitives.workspace = true