@layerzerolabs/protocol-stellar-v2 0.2.18 → 0.2.19

package/sdk/dist/generated/upgrader.d.ts

@@ -4,6 +4,21 @@ export * from '@stellar/stellar-sdk';
 export * as contract from '@stellar/stellar-sdk/contract';
 export * as rpc from '@stellar/stellar-sdk/rpc';
 export type MigrationData = void;
+/**
+ * Embedded WASM bytecode (base64-encoded)
+ * Size: 1597 bytes (1.56 KB)
+ */
+export declare const WASM_BASE64 = "AGFzbQEAAAABHAVgAX4BfmACfn4BfmADfn5+AX5gA35+fgBgAAACEwMBYgE4AAABdgFnAAEBZAFfAAIDBQQCAwQEBQMBABAGIQR/AUGAgMAAC38AQYCAwAALfwBBgIDAAAt/AEGAgMAACwc/BQZtZW1vcnkCABN1cGdyYWRlX2FuZF9taWdyYXRlAAMBXwMBCl9fZGF0YV9lbmQDAgtfX2hlYXBfYmFzZQMDCoUCBNIBAwF/AX4BfyOAgICAAEEQayIDJICAgIAAAkAgAEL/AYNCzQBSDQAgAUL/AYNCyABSDQAgARCAgICAAEKAgICAcINCgICAgIAEUg0AIAJC/wGDQssAUg0AIAMgATcDAEICIQRBASEFAkADQCAFRQ0BIAVBf2ohBSABIQQMAAsLIAMgBDcDCCAAQo7UqfPNresBIANBCGqtQiCGQgSEQoSAgIAQEIGAgIAAEISAgIAAIABCjtS58831ygEgAhCEgICAACADQRBqJICAgIAAQgIPCwALIQACQCAAIAEgAhCCgICAAEL/AYNCAlENABCGgICAAAALCwMAAAsJABCFgICAAAALCwkBAEGAgMAACwAA6wcOY29udHJhY3RzcGVjdjAAAAAAAAADWlVwZ3JhZGUgYSB0YXJnZXQgY29udHJhY3QgYW5kIHJ1biBpdHMgbWlncmF0aW9uIGluIGEgc2luZ2xlIHRyYW5zYWN0aW9uCgpUaGUgY2FsbGVyIG11c3QgYmUgYXV0aG9yaXplZCBhcyB0aGUgYXV0aG9yaXplciBvZiB0aGUgdGFyZ2V0IGNvbnRyYWN0LgpUaGlzIGlzIGVuZm9yY2VkIGJ5IHRoZSB0YXJnZXQgY29udHJhY3QncyBgI1tvbmx5X2F1dGhdYCBjaGVjay4KClRoaXMgaXMgdXNlZnVsIGZvciBhdG9taWMgdXBncmFkZXMgd2hlcmUgeW91IHdhbnQgdG8gZW5zdXJlIHRoZSBtaWdyYXRpb24KaGFwcGVucyBpbW1lZGlhdGVseSBhZnRlciB0aGUgdXBncmFkZSwgb3IgdGhlIGVudGlyZSBvcGVyYXRpb24gZmFpbHMuCgojIEFyZ3VtZW50cwoqIGBjb250cmFjdF9hZGRyZXNzYCAtIFRoZSBhZGRyZXNzIG9mIHRoZSBjb250cmFjdCB0byB1cGdyYWRlCiogYHdhc21faGFzaGAgLSBUaGUgaGFzaCBvZiB0aGUgbmV3IFdBU00gYnl0ZWNvZGUKKiBgbWlncmF0aW9uX2RhdGFgIC0gQSB2ZWN0b3Igb2YgdmFsdWVzIHRvIHBhc3MgdG8gdGhlIG1pZ3JhdGUgZnVuY3Rpb24uClRoZSB0eXBlcyBvZiB0aGVzZSB2YWx1ZXMgZGVwZW5kIG9uIHRoZSB0YXJnZXQgY29udHJhY3QncyBNaWdyYXRpb25EYXRhIHR5cGUuCgojIEV4YW1wbGUKYGBgaWdub3JlCi8vIEZvciBhIGNvbnRyYWN0IHdpdGggTWlncmF0aW9uRGF0YSA9ICh1MzIsIGJvb2wpCmxldCBtaWdyYXRpb25fZGF0YSA9IHZlYyFbCiZlbnYsCjQydTMyLmludG9fdmFsKCZlbnYpLAp0cnVlLmludG9fdmFsKCZlbnYpLApdOwp1cGdyYWRlci51cGdyYWRlX2FuZF9taWdyYXRlKCZjb250cmFjdF9hZGRyLCAmd2FzbV9oYXNoLCBtaWdyYXRpb25fZGF0YSk7CmBgYAAAAAAAE3VwZ3JhZGVfYW5kX21pZ3JhdGUAAAAAAwAAAAAAAAAQY29udHJhY3RfYWRkcmVzcwAAABMAAAAAAAAACXdhc21faGFzaAAAAAAAA+4AAAAgAAAAAAAAAA5taWdyYXRpb25fZGF0YQAAAAAD6gAAAAAAAAAAAB4RY29udHJhY3RlbnZtZXRhdjAAAAAAAAAAFwAAAAAAbw5jb250cmFjdG1ldGF2MAAAAAAAAAAFcnN2ZXIAAAAAAAAGMS45MC4wAAAAAAAAAAAACHJzc2RrdmVyAAAALzIzLjQuMCM2NzNkNmM0ZjIzNjhkMjgyZDI1ZGEyOWJkYTU1YzIxYjhiZTY5Y2E2AA==";
+/**
+ * Pre-computed WASM hash (SHA-256)
+ * Use this when the WASM is already uploaded on-chain
+ */
+export declare const WASM_HASH = "250cba854264d9d437c960e9f8ed838dbf39876947b4fb84c5a209a39b794da6";
+/**
+ * Get the WASM bytecode as a Buffer
+ * Use this to upload the WASM to the network
+ */
+export declare function getWasmBuffer(): Buffer;
 export interface Client {
     /**
      * Construct and simulate a upgrade_and_migrate transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.

package/sdk/dist/generated/upgrader.js

@@ -1,7 +1,25 @@
+import { Buffer } from "buffer";
 import { Client as ContractClient, Spec as ContractSpec, } from '@stellar/stellar-sdk/contract';
 export * from '@stellar/stellar-sdk';
 export * as contract from '@stellar/stellar-sdk/contract';
 export * as rpc from '@stellar/stellar-sdk/rpc';
+/**
+ * Embedded WASM bytecode (base64-encoded)
+ * Size: 1597 bytes (1.56 KB)
+ */
+export const WASM_BASE64 = "AGFzbQEAAAABHAVgAX4BfmACfn4BfmADfn5+AX5gA35+fgBgAAACEwMBYgE4AAABdgFnAAEBZAFfAAIDBQQCAwQEBQMBABAGIQR/AUGAgMAAC38AQYCAwAALfwBBgIDAAAt/AEGAgMAACwc/BQZtZW1vcnkCABN1cGdyYWRlX2FuZF9taWdyYXRlAAMBXwMBCl9fZGF0YV9lbmQDAgtfX2hlYXBfYmFzZQMDCoUCBNIBAwF/AX4BfyOAgICAAEEQayIDJICAgIAAAkAgAEL/AYNCzQBSDQAgAUL/AYNCyABSDQAgARCAgICAAEKAgICAcINCgICAgIAEUg0AIAJC/wGDQssAUg0AIAMgATcDAEICIQRBASEFAkADQCAFRQ0BIAVBf2ohBSABIQQMAAsLIAMgBDcDCCAAQo7UqfPNresBIANBCGqtQiCGQgSEQoSAgIAQEIGAgIAAEISAgIAAIABCjtS58831ygEgAhCEgICAACADQRBqJICAgIAAQgIPCwALIQACQCAAIAEgAhCCgICAAEL/AYNCAlENABCGgICAAAALCwMAAAsJABCFgICAAAALCwkBAEGAgMAACwAA6wcOY29udHJhY3RzcGVjdjAAAAAAAAADWlVwZ3JhZGUgYSB0YXJnZXQgY29udHJhY3QgYW5kIHJ1biBpdHMgbWlncmF0aW9uIGluIGEgc2luZ2xlIHRyYW5zYWN0aW9uCgpUaGUgY2FsbGVyIG11c3QgYmUgYXV0aG9yaXplZCBhcyB0aGUgYXV0aG9yaXplciBvZiB0aGUgdGFyZ2V0IGNvbnRyYWN0LgpUaGlzIGlzIGVuZm9yY2VkIGJ5IHRoZSB0YXJnZXQgY29udHJhY3QncyBgI1tvbmx5X2F1dGhdYCBjaGVjay4KClRoaXMgaXMgdXNlZnVsIGZvciBhdG9taWMgdXBncmFkZXMgd2hlcmUgeW91IHdhbnQgdG8gZW5zdXJlIHRoZSBtaWdyYXRpb24KaGFwcGVucyBpbW1lZGlhdGVseSBhZnRlciB0aGUgdXBncmFkZSwgb3IgdGhlIGVudGlyZSBvcGVyYXRpb24gZmFpbHMuCgojIEFyZ3VtZW50cwoqIGBjb250cmFjdF9hZGRyZXNzYCAtIFRoZSBhZGRyZXNzIG9mIHRoZSBjb250cmFjdCB0byB1cGdyYWRlCiogYHdhc21faGFzaGAgLSBUaGUgaGFzaCBvZiB0aGUgbmV3IFdBU00gYnl0ZWNvZGUKKiBgbWlncmF0aW9uX2RhdGFgIC0gQSB2ZWN0b3Igb2YgdmFsdWVzIHRvIHBhc3MgdG8gdGhlIG1pZ3JhdGUgZnVuY3Rpb24uClRoZSB0eXBlcyBvZiB0aGVzZSB2YWx1ZXMgZGVwZW5kIG9uIHRoZSB0YXJnZXQgY29udHJhY3QncyBNaWdyYXRpb25EYXRhIHR5cGUuCgojIEV4YW1wbGUKYGBgaWdub3JlCi8vIEZvciBhIGNvbnRyYWN0IHdpdGggTWlncmF0aW9uRGF0YSA9ICh1MzIsIGJvb2wpCmxldCBtaWdyYXRpb25fZGF0YSA9IHZlYyFbCiZlbnYsCjQydTMyLmludG9fdmFsKCZlbnYpLAp0cnVlLmludG9fdmFsKCZlbnYpLApdOwp1cGdyYWRlci51cGdyYWRlX2FuZF9taWdyYXRlKCZjb250cmFjdF9hZGRyLCAmd2FzbV9oYXNoLCBtaWdyYXRpb25fZGF0YSk7CmBgYAAAAAAAE3VwZ3JhZGVfYW5kX21pZ3JhdGUAAAAAAwAAAAAAAAAQY29udHJhY3RfYWRkcmVzcwAAABMAAAAAAAAACXdhc21faGFzaAAAAAAAA+4AAAAgAAAAAAAAAA5taWdyYXRpb25fZGF0YQAAAAAD6gAAAAAAAAAAAB4RY29udHJhY3RlbnZtZXRhdjAAAAAAAAAAFwAAAAAAbw5jb250cmFjdG1ldGF2MAAAAAAAAAAFcnN2ZXIAAAAAAAAGMS45MC4wAAAAAAAAAAAACHJzc2RrdmVyAAAALzIzLjQuMCM2NzNkNmM0ZjIzNjhkMjgyZDI1ZGEyOWJkYTU1YzIxYjhiZTY5Y2E2AA==";
+/**
+ * Pre-computed WASM hash (SHA-256)
+ * Use this when the WASM is already uploaded on-chain
+ */
+export const WASM_HASH = "250cba854264d9d437c960e9f8ed838dbf39876947b4fb84c5a209a39b794da6";
+/**
+ * Get the WASM bytecode as a Buffer
+ * Use this to upload the WASM to the network
+ */
+export function getWasmBuffer() {
+    return Buffer.from(WASM_BASE64, 'base64');
+}
 export class Client extends ContractClient {
     options;
     static async deploy(

package/sdk/dist/index.d.ts

@@ -11,5 +11,4 @@ export * as executor from './generated/executor.js';
 export * as executorFeeLib from './generated/executor_fee_lib.js';
 export * as executorHelper from './generated/executor_helper.js';
 export * as priceFeed from './generated/price_feed.js';
-export * as oftStd from './generated/oft_std.js';
-export * from './wasm.js';
+export * as oft from './generated/oft.js';

package/sdk/dist/index.js

@@ -14,6 +14,4 @@ export * as executorFeeLib from './generated/executor_fee_lib.js';
 export * as executorHelper from './generated/executor_helper.js';
 export * as priceFeed from './generated/price_feed.js';
 // OApp contracts
-export * as oftStd from './generated/oft_std.js';
-// WASM exports (auto-generated)
-export * from './wasm.js';
+export * as oft from './generated/oft.js';

package/sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@layerzerolabs/lz-v2-stellar-sdk",
-    "version": "0.2.18",
+    "version": "0.2.19",
     "private": false,
     "description": "TypeScript SDK for endpoint-v2 Stellar contract",
     "repository": {
@@ -17,6 +17,7 @@
         "test": "vitest --run --pass-with-no-tests --typecheck"
     },
     "dependencies": {
+        "@layerzerolabs/protocol-stellar-v2": "workspace:*",
         "@noble/hashes": "catalog:",
         "@noble/secp256k1": "catalog:",
         "@stellar/stellar-sdk": "catalog:",
@@ -25,7 +26,6 @@
     "devDependencies": {
         "@layerzerolabs/common-node-utils": "workspace:*",
         "@layerzerolabs/lz-v2-utilities": "catalog:",
-        "@layerzerolabs/protocol-stellar-v2": "workspace:*",
         "@layerzerolabs/tsup-configuration": "workspace:*",
         "@layerzerolabs/typescript-configuration": "workspace:*",
         "axios": "catalog:",
@@ -38,6 +38,7 @@
         "registry": "https://registry.npmjs.org/"
     },
     "implicitDependencies": {
+        "@layerzerolabs/protocol-stellar-v2": "workspace:*",
         "buffer": "catalog:"
     }
 }

package/sdk/src/index.ts

@@ -16,7 +16,4 @@ export * as executorHelper from './generated/executor_helper.js';
 export * as priceFeed from './generated/price_feed.js';
 
 // OApp contracts
-export * as oftStd from './generated/oft_std.js';
-
-// WASM exports (auto-generated)
-export * from './wasm.js';
+export * as oft from './generated/oft.js';

package/sdk/test/oft-sml.test.ts

@@ -16,7 +16,7 @@ import { PacketSerializer, PacketV1Codec } from '@layerzerolabs/lz-v2-utilities'
 
 import { Client as EndpointClient } from '../src/generated/endpoint';
 import { Client as ExecutorHelperClient } from '../src/generated/executor_helper';
-import { Client as OFTStdClient, OFTMode, SendParam } from '../src/generated/oft_std';
+import { Client as OFTClient, OftType, SendParam } from '../src/generated/oft';
 import { Client as SMLClient } from '../src/generated/sml';
 import {
     DEFAULT_DEPLOYER,
@@ -47,8 +47,8 @@ let mintBurnOftAddress = '';
 let endpointClient: EndpointClient;
 let smlClient: SMLClient;
 let executorHelperClient: ExecutorHelperClient;
-let lockUnlockOftClient: OFTStdClient;
-let mintBurnOftClient: OFTStdClient;
+let lockUnlockOftClient: OFTClient;
+let mintBurnOftClient: OFTClient;
 
 // Test accounts
 const TOKEN_ISSUER = Keypair.random();
@@ -80,7 +80,7 @@ describe('OFT E2E Testing with SAC (SML)', async () => {
         'release',
     );
 
-    const OFT_STD_WASM_PATH = path.join(wasmDir, 'oft_std.wasm');
+    const OFT_WASM_PATH = path.join(wasmDir, 'oft.wasm');
 
     beforeAll(async () => {
         // Inject protocol addresses from globalSetup
@@ -165,16 +165,16 @@ describe('OFT E2E Testing with SAC (SML)', async () => {
         });
 
         it('Deploy Lock/Unlock OFT', async () => {
-            lockUnlockOftClient = await deployContract<OFTStdClient>(
-                OFTStdClient,
-                OFT_STD_WASM_PATH,
+            lockUnlockOftClient = await deployContract<OFTClient>(
+                OFTClient,
+                OFT_WASM_PATH,
                 {
                     token: oftTokenAddress,
                     owner: DEFAULT_DEPLOYER.publicKey(),
                     endpoint: protocolAddresses.endpointV2,
                     delegate: DEFAULT_DEPLOYER.publicKey(),
                     shared_decimals: SHARED_DECIMALS,
-                    mode: OFTMode.LockUnlock, // Lock/Unlock mode
+                    oft_type: OftType.LockUnlock,
                 },
                 DEFAULT_DEPLOYER,
             );
@@ -183,21 +183,21 @@ describe('OFT E2E Testing with SAC (SML)', async () => {
             console.log('✅ Lock/Unlock OFT deployed:', lockUnlockOftAddress);
 
             // Verify it's in lock/unlock mode
-            const { result: mode } = await lockUnlockOftClient.mode();
-            expect(mode).toEqual(OFTMode.LockUnlock);
+            const { result: oftType } = await lockUnlockOftClient.oft_type();
+            expect(oftType).toEqual(OftType.LockUnlock);
         });
 
         it('Deploy Mint/Burn OFT', async () => {
-            mintBurnOftClient = await deployContract<OFTStdClient>(
-                OFTStdClient,
-                OFT_STD_WASM_PATH,
+            mintBurnOftClient = await deployContract<OFTClient>(
+                OFTClient,
+                OFT_WASM_PATH,
                 {
                     token: oftTokenAddress,
                     owner: DEFAULT_DEPLOYER.publicKey(),
                     endpoint: protocolAddresses.endpointV2,
                     delegate: DEFAULT_DEPLOYER.publicKey(),
                     shared_decimals: SHARED_DECIMALS,
-                    mode: OFTMode.MintBurn, // Mint/Burn mode
+                    oft_type: OftType.MintBurn, // Mint/Burn mode
                 },
                 DEFAULT_DEPLOYER,
             );
@@ -206,8 +206,8 @@ describe('OFT E2E Testing with SAC (SML)', async () => {
             console.log('✅ Mint/Burn OFT deployed:', mintBurnOftAddress);
 
             // Verify it's in mint/burn mode
-            const { result: mode } = await mintBurnOftClient.mode();
-            expect(mode).toEqual(OFTMode.MintBurn);
+            const { result: oftType } = await mintBurnOftClient.oft_type();
+            expect(oftType).toEqual(OftType.MintBurn);
         });
     });
 

package/sdk/turbo.json

@@ -0,0 +1,8 @@
+{
+    "extends": ["//"],
+    "tasks": {
+        "build": {
+            "dependsOn": ["@layerzerolabs/protocol-stellar-v2#build", "^build"]
+        }
+    }
+}

package/tools/ts-bindings-gen/Cargo.toml

@@ -11,4 +11,6 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1.0"
 soroban-spec-typescript = "23.0.3"
+sha2 = "0.10"
+base64 = "0.22"
 

package/tools/ts-bindings-gen/src/main.rs

@@ -1,4 +1,6 @@
 use anyhow::Result;
+use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
+use sha2::{Digest, Sha256};
 use soroban_spec_typescript::generate_from_file;
 use std::{fs, path::Path};
 
@@ -37,6 +39,44 @@ export type MigrationData = void;
 "#
 }
 
+/// Generate embedded WASM code section
+fn generate_wasm_embed(wasm_bytes: &[u8]) -> String {
+    // Compute SHA-256 hash (this is what Stellar uses for wasmHash)
+    let wasm_hash = Sha256::digest(wasm_bytes);
+    let wasm_hash_hex = format!("{:x}", wasm_hash);
+
+    // Base64 encode the WASM bytes
+    let wasm_base64 = BASE64.encode(wasm_bytes);
+
+    format!(
+        r#"/**
+ * Embedded WASM bytecode (base64-encoded)
+ * Size: {} bytes ({:.2} KB)
+ */
+export const WASM_BASE64 = "{}";
+
+/**
+ * Pre-computed WASM hash (SHA-256)
+ * Use this when the WASM is already uploaded on-chain
+ */
+export const WASM_HASH = "{}";
+
+/**
+ * Get the WASM bytecode as a Buffer
+ * Use this to upload the WASM to the network
+ */
+export function getWasmBuffer(): Buffer {{
+  return Buffer.from(WASM_BASE64, 'base64');
+}}
+
+"#,
+        wasm_bytes.len(),
+        wasm_bytes.len() as f64 / 1024.0,
+        wasm_base64,
+        wasm_hash_hex
+    )
+}
+
 fn main() -> Result<()> {
     println!("🚀 Generating TypeScript bindings for Stellar contracts...\n");
 
@@ -63,7 +103,7 @@ fn main() -> Result<()> {
         ("price_feed", "price_feed.ts"),
         // OApp contracts
         ("counter", "counter.ts"),
-        ("oft_std", "oft_std.ts"),
+        ("oft", "oft.ts"),
         // Add more contracts here as needed:
     ];
 
@@ -89,6 +129,13 @@ fn main() -> Result<()> {
             continue;
         }
 
+        // Read WASM bytes for embedding
+        let wasm_bytes = fs::read(&wasm_path)?;
+        println!("   WASM size: {} bytes ({:.2} KB)", wasm_bytes.len(), wasm_bytes.len() as f64 / 1024.0);
+
+        // Generate the embedded WASM section
+        let wasm_embed = generate_wasm_embed(&wasm_bytes);
+
         // Generate TypeScript bindings
         println!("   Generating bindings...");
         let wasm_path_str =
@@ -132,8 +179,8 @@ fn main() -> Result<()> {
   }"#,
         );
 
-        // Combine imports header with generated code
-        let complete_code = format!("{}{}", generate_imports_header(), ts_code);
+        // Combine imports header + embedded WASM + generated code
+        let complete_code = format!("{}{}{}", generate_imports_header(), wasm_embed, ts_code);
 
         // Write to contract-specific TypeScript file
         fs::write(&output_file, &complete_code)?;
@@ -145,7 +192,7 @@ fn main() -> Result<()> {
     }
 
     println!("\n✅ TypeScript binding generation complete!");
-    println!("   Generated {} contract(s)", generated_contracts.len());
+    println!("   Generated {} contract(s) with embedded WASM", generated_contracts.len());
 
     if generated_contracts.is_empty() {
         println!("\n💡 Tip: Build your contracts first before generating bindings:");

package/turbo.json

@@ -4,8 +4,6 @@
         "build": {
             "outputs": [
                 "sdk/src/generated/**",
-                "sdk/src/wasm/**",
-                "sdk/src/wasm.ts",
                 "target/wasm32v1-none/release/*.wasm",
                 "target/wasm32v1-none/release/*.d"
             ]

package/contracts/oapps/oft/src/interfaces/mint_burn_token.rs

@@ -1,23 +0,0 @@
-use soroban_sdk::{contractclient, Address, Env};
-
-/// Contract interface for mint and burn token operations.
-///
-/// This interface abstracts the token mint/burn functionality, allowing different
-/// token implementations (e.g., StellarAssetContract, custom tokens) to be used
-/// with the MintBurn OFT.
-#[contractclient(name = "MintBurnTokenClient")]
-pub trait MintBurnToken {
-    /// Mints tokens to the specified address.
-    ///
-    /// # Parameters
-    /// * `to` - The address to mint tokens to
-    /// * `amount` - The amount of tokens to mint (must be non-negative)
-    fn mint(env: Env, to: Address, amount: i128);
-
-    /// Burns tokens from the specified address.
-    ///
-    /// # Parameters
-    /// * `from` - The address to burn tokens from
-    /// * `amount` - The amount of tokens to burn (must be non-negative)
-    fn burn(env: Env, from: Address, amount: i128);
-}

package/contracts/oapps/oft/src/interfaces/mod.rs

@@ -1,3 +0,0 @@
-mod mint_burn_token;
-
-pub use mint_burn_token::*;

package/contracts/oapps/oft/src/oft_impl.rs

@@ -1,201 +0,0 @@
-//! Default OFT implementations.
-//!
-//! This module provides default standalone functions for common OFT operations that can be
-//! reused by trait implementations.
-
-use crate::{
-    codec::{oft_compose_msg_codec::OFTComposeMsg, oft_msg_codec::OFTMessage},
-    errors::OFTError,
-    events::{self, OFTSent},
-    oft::{OFTInternal, OFT},
-    storage::OFTStorage,
-    types::{self, OFTFeeDetail, OFTLimit, OFTReceipt, SendParam},
-    utils,
-};
-use ::utils::{option_ext::OptionExt, ownable::OwnableInitializer};
-use endpoint_v2::{MessagingComposerClient, MessagingFee, MessagingReceipt, Origin};
-use oapp::{oapp_core::initialize_oapp, oapp_options_type3::OAppOptionsType3};
-use soroban_sdk::{assert_with_error, token::TokenClient, vec, Address, Bytes, BytesN, Env, Vec};
-
-/// Initializes the OFT contract with token, endpoint, and decimal configuration.
-/// The `shared_decimals` must be <= token's local decimals.
-pub fn initialize_oft<T: OFT + OwnableInitializer>(
-    env: &Env,
-    owner: &Address,
-    token: &Address,
-    endpoint: &Address,
-    delegate: &Option<Address>,
-    shared_decimals: u32,
-) {
-    // Initialize OApp (includes owner initialization)
-    initialize_oapp::<T>(env, owner, endpoint, delegate);
-
-    let local_decimals = TokenClient::new(env, token).decimals();
-    assert_with_error!(env, local_decimals >= shared_decimals, OFTError::InvalidLocalDecimals);
-
-    // Initialize OFT storage
-    OFTStorage::set_token(env, token);
-    OFTStorage::set_decimal_conversion_rate(env, &10_i128.pow(local_decimals - shared_decimals));
-}
-
-/// Simulates a debit operation without executing, used for quoting.
-///
-/// # Arguments
-/// * `amount_ld` - The amount of tokens to send in local decimals
-/// * `min_amount_ld` - The minimum amount to send in local decimals (slippage protection)
-/// * `dst_eid` - The destination chain ID (unused in default implementation)
-///
-/// # Returns
-/// `OFTReceipt` containing the amount sent and amount received after dust removal
-pub fn debit_view(env: &Env, amount_ld: i128, min_amount_ld: i128, _dst_eid: u32) -> OFTReceipt {
-    let conversion_rate = OFTStorage::decimal_conversion_rate(env).unwrap_or_panic(env, OFTError::NotInitialized);
-    let amount_sent_ld = utils::remove_dust(amount_ld, conversion_rate);
-    let amount_received_ld = amount_sent_ld;
-
-    assert_with_error!(env, amount_received_ld >= min_amount_ld, OFTError::SlippageExceeded);
-
-    OFTReceipt { amount_sent_ld, amount_received_ld }
-}
-
-/// Builds the OFT message payload and combines enforced options for cross-chain transfer.
-///
-/// # Arguments
-/// * `from` - The address initiating the transfer
-/// * `send_param` - The send parameters including destination, recipient, and options
-/// * `receive_amount_ld` - The amount to be received in local decimals (after dust removal)
-///
-/// # Returns
-/// A tuple of (encoded message, combined options)
-pub fn build_msg_and_options<T: OAppOptionsType3>(
-    env: &Env,
-    from: &Address,
-    send_param: &SendParam,
-    receive_amount_ld: i128,
-) -> (Bytes, Bytes) {
-    let has_compose = !send_param.compose_msg.is_empty();
-    let conversion_rate = OFTStorage::decimal_conversion_rate(env).unwrap_or_panic(env, OFTError::NotInitialized);
-    let (msg, _) = OFTMessage {
-        send_to: send_param.to.clone(),
-        amount_sd: utils::to_sd(env, receive_amount_ld, conversion_rate),
-        compose_from: if has_compose { Some(utils::address_to_bytes32(from)) } else { None },
-        compose_msg: if has_compose { Some(send_param.compose_msg.clone()) } else { None },
-    }
-    .encode(env);
-    let msg_type = if has_compose { types::SEND_AND_CALL } else { types::SEND };
-
-    (msg, T::combine_options(env, send_param.dst_eid, msg_type, &send_param.extra_options))
-}
-
-/// Quotes an OFT transfer without executing.
-///
-/// # Arguments
-/// * `send_param` - The send parameters to quote
-///
-/// # Returns
-/// A tuple of (transfer limits, fee details, estimated receipt)
-pub fn quote_oft<T: OFTInternal>(env: &Env, send_param: &SendParam) -> (OFTLimit, Vec<OFTFeeDetail>, OFTReceipt) {
-    let limit = OFTLimit { min_amount_ld: 0, max_amount_ld: i128::MAX }; // No limits in default implementation
-    let fee_details = vec![env]; // No fee details in default implementation
-    let oft_receipt = T::__debit_view(env, send_param.amount_ld, send_param.min_amount_ld, send_param.dst_eid);
-    (limit, fee_details, oft_receipt)
-}
-
-/// Quotes the LayerZero messaging fee for a send operation.
-///
-/// # Arguments
-/// * `from` - The address initiating the transfer
-/// * `send_param` - The send parameters to quote
-/// * `pay_in_zro` - Whether to pay the fee in ZRO token
-///
-/// # Returns
-/// The messaging fee required for the transfer
-pub fn quote_send<T: OFT>(env: &Env, from: &Address, send_param: &SendParam, pay_in_zro: bool) -> MessagingFee {
-    let OFTReceipt { amount_received_ld, .. } =
-        T::__debit_view(env, send_param.amount_ld, send_param.min_amount_ld, send_param.dst_eid);
-
-    let (msg, options) = build_msg_and_options::<T>(env, from, send_param, amount_received_ld);
-    T::__quote(env, send_param.dst_eid, &msg, &options, pay_in_zro)
-}
-
-/// Executes a cross-chain token transfer via LayerZero.
-///
-/// Debits tokens from the `from` address, builds the message, and sends via the endpoint.
-/// The `from` address must be authenticated.
-///
-/// # Arguments
-/// * `from` - The address sending tokens (must authorize)
-/// * `send_param` - The send parameters (destination, recipient, amount, options)
-/// * `fee` - The messaging fee to pay
-/// * `refund_address` - The address to refund excess fees to
-///
-/// # Returns
-/// A tuple of (messaging receipt, OFT receipt with amounts)
-pub fn send<T: OFT>(
-    env: &Env,
-    from: &Address,
-    send_param: &SendParam,
-    fee: &MessagingFee,
-    refund_address: &Address,
-) -> (MessagingReceipt, OFTReceipt) {
-    from.require_auth();
-
-    let oft_receipt = T::__debit(env, from, send_param.amount_ld, send_param.min_amount_ld, send_param.dst_eid);
-
-    let (msg, options) = build_msg_and_options::<T>(env, from, send_param, oft_receipt.amount_received_ld);
-    let msg_receipt = T::__lz_send(env, send_param.dst_eid, &msg, &options, from, fee, refund_address);
-
-    OFTSent {
-        guid: msg_receipt.guid.clone(),
-        dst_eid: send_param.dst_eid,
-        from: from.clone(),
-        amount_sent_ld: oft_receipt.amount_sent_ld,
-        amount_received_ld: oft_receipt.amount_received_ld,
-    }
-    .publish(env);
-
-    (msg_receipt, oft_receipt)
-}
-
-/// Handles incoming cross-chain OFT transfer from LayerZero endpoint.
-///
-/// Credits tokens to the recipient and optionally queues a compose message.
-///
-/// # Arguments
-/// * `executor` - The address of the executor handling the message (unused in default implementation)
-/// * `origin` - The origin information (source chain, sender, nonce)
-/// * `guid` - The unique message identifier
-/// * `message` - The encoded OFT message payload
-/// * `extra_data` - Additional data (unused in default implementation)
-/// * `value` - The native token value sent with the message (unused in default implementation)
-pub fn lz_receive<T: OFTInternal>(
-    env: &Env,
-    _executor: &Address,
-    origin: &Origin,
-    guid: &BytesN<32>,
-    message: &Bytes,
-    _extra_data: &Bytes,
-    _value: i128,
-) {
-    let oft_msg = OFTMessage::decode(message);
-    let send_to = utils::resolve_address(env, &oft_msg.send_to);
-
-    let conversion_rate = OFTStorage::decimal_conversion_rate(env).unwrap_or_panic(env, OFTError::NotInitialized);
-    let amount_received_ld =
-        T::__credit(env, &send_to, utils::to_ld(oft_msg.amount_sd, conversion_rate), origin.src_eid);
-
-    if oft_msg.is_composed() {
-        let compose_msg = OFTComposeMsg {
-            nonce: origin.nonce,
-            src_eid: origin.src_eid,
-            amount_ld: amount_received_ld,
-            compose_from: oft_msg.compose_from.unwrap(),
-            compose_msg: oft_msg.compose_msg.unwrap(),
-        }
-        .encode(env);
-
-        let endpoint_client = MessagingComposerClient::new(env, &T::endpoint(env));
-        endpoint_client.send_compose(&env.current_contract_address(), &send_to, guid, &0, &compose_msg);
-    }
-
-    events::OFTReceived { guid: guid.clone(), src_eid: origin.src_eid, to: send_to, amount_received_ld }.publish(env);
-}

package/contracts/oapps/oft/src/tests/extensions/mod.rs

@@ -1,11 +0,0 @@
-//! Extension tests module.
-//!
-//! This module contains tests for OFT extensions (pausable, oft_fee, rate_limiter).
-
-pub mod setup;
-pub mod test_oft_fee;
-pub mod test_pausable;
-pub mod test_rate_limiter;
-
-// Re-export commonly used items for convenience
-pub use setup::{ExtensiveOFT, ExtensiveOFTClient, ExtensiveOFTTestSetup};