[Publishing Tool]: Have a lib and bin in same crate

tools/publishing-tool/Cargo.toml

@@ -47,3 +47,10 @@ bitflags = "2.4.2"
 
 [lints]
 workspace = true
+
+[lib]
+crate-type = ["cdylib", "lib"]
+
+[[bin]]
+name = "publishing-tool"
+path = "src/cli/bin.rs"

tools/publishing-tool/src/cli/bin.rs

@@ -0,0 +1,29 @@
+#![allow(dead_code, clippy::enum_variant_names, clippy::wrong_self_convention)]
+
+mod default_configurations;
+mod publish;
+
+use clap::Parser;
+use publishing_tool::error::*;
+use radix_engine_common::prelude::*;
+use transaction::prelude::*;
+
+fn main() -> Result<(), Error> {
+    env_logger::init();
+    let mut out = std::io::stdout();
+    let cli = <Cli as clap::Parser>::parse();
+    cli.run(&mut out)
+}
+
+#[derive(Parser, Debug)]
+pub enum Cli {
+    Publish(publish::Publish),
+}
+
+impl Cli {
+    pub fn run<O: std::io::Write>(self, out: &mut O) -> Result<(), Error> {
+        match self {
+            Self::Publish(cmd) => cmd.run(out),
+        }
+    }
+}

tools/publishing-tool/src/cli/default_configurations/mainnet_testing.rs

@@ -1,7 +1,9 @@
 use common::prelude::*;
-
-use self::utils::*;
-use crate::*;
+use publishing_tool::publishing::*;
+use publishing_tool::utils::*;
+use publishing_tool::*;
+use radix_engine_interface::prelude::*;
+use transaction::prelude::*;
 
 pub fn mainnet_testing(
     notary_private_key: &PrivateKey,
@@ -297,9 +299,8 @@ pub fn mainnet_testing(
             }),
         },
         additional_information: AdditionalInformation {
-            ociswap_v2_registry_component: None,
+            ociswap_v2_registry_component_and_dapp_definition: None,
         },
-        additional_operation_flags: AdditionalOperationFlags::empty()
-        // cSpell:enable
+        additional_operation_flags: AdditionalOperationFlags::empty(), // cSpell:enable
     }
 }

tools/publishing-tool/src/cli/default_configurations/mod.rs

@@ -1,8 +1,10 @@
-use crate::*;
-use clap::*;
 mod mainnet_testing;
 mod stokenet_testing;
 
+use clap::*;
+use publishing_tool::publishing::*;
+use transaction::prelude::*;
+
 #[derive(ValueEnum, Clone, Copy, Debug)]
 pub enum ConfigurationSelector {
     MainnetTesting,

tools/publishing-tool/src/cli/default_configurations/stokenet_testing.rs

@@ -1,7 +1,9 @@
 use common::prelude::*;
-
-use self::utils::*;
-use crate::*;
+use publishing_tool::publishing::*;
+use publishing_tool::utils::*;
+use publishing_tool::*;
+use radix_engine_interface::prelude::*;
+use transaction::prelude::*;
 
 pub fn stokenet_testing(
     notary_private_key: &PrivateKey,
@@ -233,11 +235,21 @@ pub fn stokenet_testing(
             defiplaza_v2: None,
         },
         additional_information: AdditionalInformation {
-            ociswap_v2_registry_component: Some(component_address!(
-                "component_tdx_2_1cpwm3sjxr48gmsnh7lgmh5de3eqqzthqkazztc4qv6n3fvedgjepwk"
+            ociswap_v2_registry_component_and_dapp_definition: Some((
+                component_address!(
+                    "component_tdx_2_1cpwm3sjxr48gmsnh7lgmh5de3eqqzthqkazztc4qv6n3fvedgjepwk"
+                ),
+                component_address!(
+                    "account_tdx_2_12yhfrtak5j0pmaju5l3p752wpye4z4nzua679ypns0094hmu66p2yk"
+                ),
             )),
         },
-        additional_operation_flags: AdditionalOperationFlags::SUBMIT_ORACLE_PRICES_OF_ONE
-        // cSpell:enable
+        additional_operation_flags:
+            AdditionalOperationFlags::SUBMIT_ORACLE_PRICES_OF_ONE
+            .union(AdditionalOperationFlags::PROVIDE_INITIAL_IGNITION_LIQUIDITY)
+            .union(
+                AdditionalOperationFlags::PROVIDE_INITIAL_LIQUIDITY_TO_OCISWAP_BY_MINTING_USER_RESOURCE
+            )
     }
+    // cSpell:enable
 }

tools/publishing-tool/src/cli/publish.rs

@@ -1,7 +1,9 @@
-use super::default_configurations::*;
-use crate::utils::*;
+use crate::default_configurations::*;
 use crate::*;
 use clap::Parser;
+use publishing_tool::network_connection_provider::*;
+use publishing_tool::publishing::*;
+use publishing_tool::utils::*;
 use radix_engine_common::prelude::*;
 use state_manager::RocksDBStore;
 use std::path::*;

tools/publishing-tool/src/error.rs

@@ -1,4 +1,5 @@
-use crate::*;
+use crate::network_connection_provider::*;
+use crate::publishing::*;
 use state_manager::traits::*;
 
 #[derive(Debug)]

tools/publishing-tool/src/lib.rs

@@ -0,0 +1,6 @@
+pub mod database_overlay;
+pub mod error;
+pub mod macros;
+pub mod network_connection_provider;
+pub mod publishing;
+pub mod utils;

tools/publishing-tool/src/publishing/configuration.rs

@@ -76,6 +76,11 @@ bitflags::bitflags! {
         /// attempt to get the XRD from the faucet. If otherwise then it will
         /// attempt to mint it.
         const PROVIDE_INITIAL_IGNITION_LIQUIDITY = 0b00000010;
+
+        /// Provides initial liquidity to ociswap v2 pools by minting the user
+        /// asset. If the protocol asset is mintable then it mints them in the
+        /// process and if they're not then it gets them from the faucet.
+        const PROVIDE_INITIAL_LIQUIDITY_TO_OCISWAP_BY_MINTING_USER_RESOURCE = 0b00000100;
     }
 }
 
@@ -94,7 +99,8 @@ pub struct ProtocolConfigurationReceipt {
 }
 
 pub struct AdditionalInformation {
-    pub ociswap_v2_registry_component: Option<ComponentAddress>,
+    pub ociswap_v2_registry_component_and_dapp_definition:
+        Option<(ComponentAddress, ComponentAddress)>,
 }
 
 pub struct ProtocolConfiguration {

tools/publishing-tool/src/publishing/handler.rs

@@ -3,6 +3,7 @@
 use defiplaza_v2_adapter_v1::*;
 use ignition::{InitializationParametersManifest, PoolBlueprintInformation};
 use itertools::*;
+use ociswap_v2_adapter_v1::OciswapV2PoolInterfaceManifestBuilderExtensionTrait;
 use package_loader::*;
 use radix_engine::blueprints::package::*;
 use radix_engine::types::node_modules::*;
@@ -974,6 +975,119 @@ pub fn publish<N: NetworkConnectionProvider>(
                 .build();
             execution_service.execute_manifest(manifest)?;
         }
+
+        // Seeding Ignition with the initial set of XRD if requested.
+        if configuration.additional_operation_flags.contains(
+            AdditionalOperationFlags::PROVIDE_INITIAL_IGNITION_LIQUIDITY,
+        ) {
+            let total_amount_of_protocol_resource = dec!(10_000);
+            let mut manifest_builder = ManifestBuilder::new()
+                .create_proof_from_account_of_amount(
+                    resolved_badges.protocol_owner_badge.0,
+                    resolved_badges.protocol_owner_badge.1,
+                    dec!(1),
+                );
+            if configuration.protocol_configuration.protocol_resource == XRD {
+                manifest_builder = manifest_builder.get_free_xrd_from_faucet()
+            } else {
+                manifest_builder = manifest_builder.mint_fungible(
+                    configuration.protocol_configuration.protocol_resource,
+                    total_amount_of_protocol_resource,
+                )
+            }
+
+            let manifest = manifest_builder
+                .take_from_worktop(
+                    XRD,
+                    total_amount_of_protocol_resource / 2,
+                    "volatile",
+                )
+                .take_from_worktop(
+                    XRD,
+                    total_amount_of_protocol_resource / 2,
+                    "non_volatile",
+                )
+                .with_name_lookup(|builder, _| {
+                    let volatile = builder.bucket("volatile");
+                    let non_volatile = builder.bucket("non_volatile");
+
+                    builder
+                        .call_method(
+                            resolved_entity_component_addresses
+                                .protocol_entities
+                                .ignition,
+                            "deposit_protocol_resources",
+                            (volatile, common::prelude::Volatility::Volatile),
+                        )
+                        .call_method(
+                            resolved_entity_component_addresses
+                                .protocol_entities
+                                .ignition,
+                            "deposit_protocol_resources",
+                            (
+                                non_volatile,
+                                common::prelude::Volatility::NonVolatile,
+                            ),
+                        )
+                })
+                .build();
+            execution_service.execute_manifest(manifest)?;
+        }
+
+        // Contributing initial liquidity to Ociswap if requested
+        if configuration.additional_operation_flags.contains(
+            AdditionalOperationFlags::PROVIDE_INITIAL_LIQUIDITY_TO_OCISWAP_BY_MINTING_USER_RESOURCE,
+        ) {
+            if let Some(ExchangeInformation { pools, .. }) = resolved_exchange_data.ociswap_v2 {
+                for (pool_address, user_resource_address) in
+                    pools.zip_borrowed(&resolved_user_resources).iter()
+                {
+                    let (pool_address, user_resource_address) =
+                        (*pool_address, **user_resource_address);
+
+                    let mut manifest_builder = ManifestBuilder::new();
+                    if configuration.protocol_configuration.protocol_resource == XRD {
+                        manifest_builder = manifest_builder.get_free_xrd_from_faucet()
+                    } else {
+                        manifest_builder = manifest_builder.mint_fungible(
+                            configuration.protocol_configuration.protocol_resource,
+                            dec!(10_000),
+                        )
+                    }
+                    let manifest = manifest_builder
+                        .mint_fungible(user_resource_address, dec!(10_000))
+                        .take_all_from_worktop(
+                            configuration.protocol_configuration.protocol_resource,
+                            "protocol",
+                        )
+                        .take_all_from_worktop(user_resource_address, "user")
+                        .then(|builder| {
+                            let protocol_resource = builder.bucket("protocol");
+                            let user_resource = builder.bucket("user");
+
+                            let (x_bucket, y_bucket) =
+                                if configuration.protocol_configuration.protocol_resource
+                                    < user_resource_address
+                                {
+                                    (protocol_resource, user_resource)
+                                } else {
+                                    (user_resource, protocol_resource)
+                                };
+
+                            builder.ociswap_v2_pool_add_liquidity(
+                                pool_address,
+                                -3921i32,
+                                9942i32,
+                                x_bucket,
+                                y_bucket,
+                            )
+                        })
+                        .try_deposit_entire_worktop_or_abort(ephemeral_account, None)
+                        .build();
+                    execution_service.execute_manifest(manifest)?;
+                }
+            }
+        }
     }
 
     // Depositing the created badges into their accounts.
@@ -1063,7 +1177,11 @@ fn handle_ociswap_v2_exchange_information<N: NetworkConnectionProvider>(
 > {
     // No ociswap registry component is passed even through it is needed.
     let AdditionalInformation {
-        ociswap_v2_registry_component: Some(ociswap_v2_registry_component),
+        ociswap_v2_registry_component_and_dapp_definition:
+            Some((
+                ociswap_v2_registry_component,
+                ociswap_v2_dapp_definition_account,
+            )),
     } = additional_information
     else {
         return Ok(None);
@@ -1130,8 +1248,7 @@ fn handle_ociswap_v2_exchange_information<N: NetworkConnectionProvider>(
                                                 ManifestBucket,
                                             )>::new(
                                             ),
-                                            // TODO: Specify their dapp definition?
-                                            FAUCET,
+                                            ociswap_v2_dapp_definition_account,
                                         ),
                                     )
                                     .build();