Merge remote-tracking branch 'origin/v2.1-dev' into refactor/dapi-rewrite-to-rust

Author: lklimek

.github/workflows/swift-sdk-build.yml

@@ -23,12 +23,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Select Xcode 16
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: '16.*'
-
-      - name: Show Xcode and Swift versions
+      - name: Show Xcode and Swift versions (use default on self-hosted runner)
         run: |
           xcodebuild -version
           swift --version
@@ -98,12 +93,19 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          # Use the same rust-dashcore revision as rs-dpp (parse single-line dep)
-          REV=$(grep -E '^[[:space:]]*dashcore[[:space:]]*=[[:space:]]*\{.*rev[[:space:]]*=' packages/rs-dpp/Cargo.toml \
-                | sed -E 's/.*rev[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/' \
+          # Use the same rust-dashcore revision/tag as rs-dpp
+          # Try to find tag first (preferred format)
+          REV=$(grep -E '^[[:space:]]*dashcore[[:space:]]*=[[:space:]]*\{.*tag[[:space:]]*=' packages/rs-dpp/Cargo.toml \
+                | sed -E 's/.*tag[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/' \
                 | head -n1 || true)
+          # If no tag found, try rev format
+          if [ -z "${REV:-}" ]; then
+            REV=$(grep -E '^[[:space:]]*dashcore[[:space:]]*=[[:space:]]*\{.*rev[[:space:]]*=' packages/rs-dpp/Cargo.toml \
+                  | sed -E 's/.*rev[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/' \
+                  | head -n1 || true)
+          fi
           if [ -z "${REV:-}" ]; then
-            echo "Failed to determine rust-dashcore revision from Cargo.toml" >&2
+            echo "Failed to determine rust-dashcore revision or tag from Cargo.toml" >&2
             exit 1
           fi
           echo "rev=$REV" >> "$GITHUB_OUTPUT"

Cargo.lock

@@ -29,11 +29,14 @@ export interface ConnectionOptions {
 export interface EvoSDKOptions extends ConnectionOptions {
   network?: 'testnet' | 'mainnet';
   trusted?: boolean;
+  // Custom masternode addresses. When provided, network and trusted options are ignored.
+  // Example: ['https://127.0.0.1:1443', 'https://192.168.1.100:1443']
+  addresses?: string[];
 }
 
 export class EvoSDK {
   private wasmSdk?: wasm.WasmSdk;
-  private options: Required<Pick<EvoSDKOptions, 'network' | 'trusted'>> & ConnectionOptions;
+  private options: Required<Pick<EvoSDKOptions, 'network' | 'trusted'>> & ConnectionOptions & { addresses?: string[] };
 
   public documents!: DocumentsFacade;
   public identities!: IdentitiesFacade;
@@ -47,8 +50,8 @@ export class EvoSDK {
   public voting!: VotingFacade;
   constructor(options: EvoSDKOptions = {}) {
     // Apply defaults while preserving any future connection options
-    const { network = 'testnet', trusted = false, ...connection } = options;
-    this.options = { network, trusted, ...connection };
+    const { network = 'testnet', trusted = false, addresses, ...connection } = options;
+    this.options = { network, trusted, addresses, ...connection };
 
     this.documents = new DocumentsFacade(this);
     this.identities = new IdentitiesFacade(this);
@@ -80,10 +83,20 @@ export class EvoSDK {
     if (this.wasmSdk) return; // idempotent
     await initWasm();
 
-    const { network, trusted, version, proofs, settings, logs } = this.options;
+    const { network, trusted, version, proofs, settings, logs, addresses } = this.options;
 
     let builder: wasm.WasmSdkBuilder;
-    if (network === 'mainnet') {
+
+    // If specific addresses are provided, use them instead of network presets
+    if (addresses && addresses.length > 0) {
+      // Prefetch trusted quorums for the network before creating builder with addresses
+      if (network === 'mainnet') {
+        await wasm.WasmSdk.prefetchTrustedQuorumsMainnet();
+      } else if (network === 'testnet') {
+        await wasm.WasmSdk.prefetchTrustedQuorumsTestnet();
+      }
+      builder = wasm.WasmSdkBuilder.withAddresses(addresses, network);
+    } else if (network === 'mainnet') {
       await wasm.WasmSdk.prefetchTrustedQuorumsMainnet();
 
       builder = trusted ? wasm.WasmSdkBuilder.mainnetTrusted() : wasm.WasmSdkBuilder.mainnet();
@@ -131,6 +144,24 @@ export class EvoSDK {
   static mainnet(options: ConnectionOptions = {}): EvoSDK { return new EvoSDK({ network: 'mainnet', ...options }); }
   static testnetTrusted(options: ConnectionOptions = {}): EvoSDK { return new EvoSDK({ network: 'testnet', trusted: true, ...options }); }
   static mainnetTrusted(options: ConnectionOptions = {}): EvoSDK { return new EvoSDK({ network: 'mainnet', trusted: true, ...options }); }
+
+  /**
+   * Create an EvoSDK instance configured with specific masternode addresses.
+   *
+   * @param addresses - Array of HTTPS URLs to masternodes (e.g., ['https://127.0.0.1:1443'])
+   * @param network - Network identifier: 'mainnet', 'testnet' (default: 'testnet')
+   * @param options - Additional connection options
+   * @returns A configured EvoSDK instance (not yet connected - call .connect() to establish connection)
+   *
+   * @example
+   * ```typescript
+   * const sdk = EvoSDK.withAddresses(['https://52.12.176.90:1443'], 'testnet');
+   * await sdk.connect();
+   * ```
+   */
+  static withAddresses(addresses: string[], network: 'mainnet' | 'testnet' = 'testnet', options: ConnectionOptions = {}): EvoSDK {
+    return new EvoSDK({ addresses, network, ...options });
+  }
 }
 
 export { DocumentsFacade } from './documents/facade.js';