@ar.io/sdk 4.0.0-solana.24 → 4.0.0-solana.25

package/lib/esm/solana/deserialize.js

@@ -108,6 +108,12 @@ class BorshReader {
             return undefined;
         return this.readU32();
     }
+    readOptionU16() {
+        const tag = this.readU8();
+        if (tag === 0)
+            return undefined;
+        return this.readU16();
+    }
     skip(bytes) {
         this.offset += bytes;
     }
@@ -332,6 +338,15 @@ export function deserializeGatewayWithAccumulator(data) {
     const delegateRewardShareRatio = r.readU16() / 100;
     const minDelegatedStake = r.readU64AsNumber();
     const allowlistEnabled = r.readBool();
+    // GATEWAY_VERSION 1.1.0 added two fields to GatewaySettings2 — MUST read them
+    // here to keep the byte stream aligned for every field after `settings`.
+    //   - pending_delegate_reward_share_ratio: Option<u16> (Fix #7) — basis points
+    //     of a deferred reward-share change applied at the next epoch's tally.
+    //   - delegation_disabled_at: Option<i64> (Fix #6) — unix seconds the operator
+    //     disabled delegation; starts the re-enable cooldown.
+    const pendingRatioRaw = r.readOptionU16();
+    const pendingDelegateRewardShareRatio = pendingRatioRaw === undefined ? undefined : pendingRatioRaw / 100;
+    const delegationDisabledAt = r.readOptionI64();
     // RegistryIndex (index: u32, _reserved: u8 — was is_registered:bool)
     r.readU32(); // registryIndex
     r.readU8(); // _reserved (layout-preserving placeholder for the legacy is_registered byte)
@@ -378,6 +393,8 @@ export function deserializeGatewayWithAccumulator(data) {
         fqdn,
         port,
         protocol: 'https', // protocolIdx: 0=Http, 1=Https — only HTTPS in practice
+        pendingDelegateRewardShareRatio, // Fix #7: undefined when no change is queued
+        delegationDisabledAt, // Fix #6: undefined when delegation is enabled
     };
     return {
         operator: operator,

package/lib/esm/solana/io-readable.js

@@ -1743,6 +1743,39 @@ export class SolanaARIOReadable {
         }
         return out;
     }
+    /**
+     * Enumerate Joined Gateway PDAs whose delegation has been DISABLED
+     * (`allow_delegated_staking == false`) yet still hold delegated stake
+     * (`total_delegated_stake > 0`) — i.e. delegates that an operator's disable
+     * left stranded (WP §6.3 / Fix #6). Each such gateway's delegates must be
+     * cranked out via
+     * {@link SolanaARIOWriteable.claimDelegateFromDisabledGateway} (enumerate
+     * them with {@link getGatewayDelegates}) before the operator can re-enable
+     * delegation. This is the discovery primitive a cranker uses to sweep them.
+     */
+    async getDisabledGatewaysWithDelegatedStake() {
+        const accounts = await this.getAccountsByDiscriminator(this.garProgram, GATEWAY_DISCRIMINATOR);
+        const decoder = getGatewayDecoder();
+        const out = [];
+        for (const { pubkey, data } of accounts) {
+            try {
+                const g = decoder.decode(data);
+                if (g.status !== GatewayStatus.Joined)
+                    continue;
+                if (!g.settings.allowDelegatedStaking && g.totalDelegatedStake > 0n) {
+                    out.push({
+                        pubkey,
+                        operator: g.operator,
+                        totalDelegatedStake: g.totalDelegatedStake,
+                    });
+                }
+            }
+            catch {
+                // skip malformed
+            }
+        }
+        return out;
+    }
     /**
      * Enumerate Delegation PDAs with `amount == 0`. Eligible for
      * `closeEmptyDelegation` (rent refund to the original delegator).

package/lib/esm/solana/io-writeable.js

@@ -38,7 +38,7 @@ function toGeneratedFundingSourceSpec(s) {
 import { getSyncAttributesInstruction } from '@ar.io/solana-contracts/ant';
 import { getApprovePrimaryNameInstructionAsync, getCloseExpiredRequestInstruction, getCreateVaultInstructionAsync, getExtendVaultInstructionAsync, getIncreaseVaultInstructionAsync, getReleaseVaultInstructionAsync, getRemovePrimaryNameInstructionAsync, getRequestAndSetPrimaryNameFromFundingPlanInstructionAsync, getRequestAndSetPrimaryNameInstructionAsync, getRequestPrimaryNameFromFundingPlanInstructionAsync, getRequestPrimaryNameInstructionAsync, getRevokeVaultInstructionAsync, getVaultedTransferInstructionAsync, } from '@ar.io/solana-contracts/core';
 import { getDelegationDecoder, getGatewayDecoder, } from '@ar.io/solana-contracts/gar';
-import { Protocol, getAllowDelegateInstructionAsync, getCancelWithdrawalInstruction, getClaimDelegateFromLeavingGatewayInstructionAsync, getClaimWithdrawalInstructionAsync, getCloseDrainedWithdrawalInstruction, getCloseEmptyDelegationInstruction, getCloseEpochInstructionAsync, getCloseObservationInstructionAsync, getCreateEpochInstructionAsync, getDecreaseDelegateStakeInstructionAsync, getDecreaseOperatorStakeInstructionAsync, getDelegateStakeInstructionAsync, getDisallowDelegateInstructionAsync, getDistributeEpochInstructionAsync, getFinalizeGoneInstructionAsync, getIncreaseOperatorStakeInstructionAsync, getInstantWithdrawalInstructionAsync, getJoinNetworkInstructionAsync, getLeaveNetworkInstructionAsync, getPrescribeEpochInstructionAsync, getPruneGatewayInstructionAsync, getRedelegateStakeInstructionAsync, getSaveObservationsInstructionAsync, getSetAllowlistEnabledInstructionAsync, getTallyWeightsInstructionAsync, getUpdateGatewaySettingsInstructionAsync, } from '@ar.io/solana-contracts/gar';
+import { Protocol, getAllowDelegateInstructionAsync, getCancelWithdrawalInstruction, getClaimDelegateFromDisabledGatewayInstructionAsync, getClaimDelegateFromLeavingGatewayInstructionAsync, getClaimWithdrawalInstructionAsync, getCloseDrainedWithdrawalInstruction, getCloseEmptyDelegationInstruction, getCloseEpochInstructionAsync, getCloseObservationInstructionAsync, getCreateEpochInstructionAsync, getDecreaseDelegateStakeInstructionAsync, getDecreaseOperatorStakeInstructionAsync, getDelegateStakeInstructionAsync, getDisallowDelegateInstructionAsync, getDistributeEpochInstructionAsync, getFinalizeGoneInstructionAsync, getIncreaseOperatorStakeInstructionAsync, getInstantWithdrawalInstructionAsync, getJoinNetworkInstructionAsync, getLeaveNetworkInstructionAsync, getPrescribeEpochInstructionAsync, getPruneGatewayInstructionAsync, getRedelegateStakeInstructionAsync, getSaveObservationsInstructionAsync, getSetAllowlistEnabledInstructionAsync, getTallyWeightsInstructionAsync, getUpdateGatewaySettingsInstructionAsync, } from '@ar.io/solana-contracts/gar';
 import { getTransferCheckedInstruction } from '@solana-program/token';
 import { ARIO_ANT_PROGRAM_ID, TOKEN_DECIMALS } from './constants.js';
 import { SolanaARIOReadable } from './io-readable.js';
@@ -1771,6 +1771,47 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
         return { id: sig };
     }
     // =========================================
+    // Claim delegation from gateway with delegation DISABLED (ario-gar, Fix #6)
+    // =========================================
+    /**
+     * Claim a delegate's stake out of a gateway that has DISABLED delegation
+     * (`allow_delegated_staking == false`), moving it into the delegate's own
+     * withdrawal vault (WP §6.3 / Fix #6). This is the disabled-gateway analog of
+     * {@link claimDelegateFromLeavingGateway}: the on-chain instruction is
+     * permissionless, so a cranker can sweep delegates out (the operator cannot
+     * re-enable delegation until `total_delegated_stake == 0` and the cooldown
+     * elapses). The withdrawal-counter and withdrawal PDAs are seeded by the
+     * DELEGATOR, so a cranker must pass that delegate's `delegatorAddress`.
+     *
+     * @param params.gatewayAddress  The gateway whose delegation was disabled.
+     * @param params.delegatorAddress  The delegate to claim for. Defaults to the
+     *   signer (self-claim). Pass another address to crank on a delegate's behalf;
+     *   the signer covers rent (`payer`) but stake still routes to the delegate's
+     *   own vault (the delegator key is bound by the delegation PDA seeds).
+     */
+    async claimDelegateFromDisabledGateway(params, _options) {
+        const gateway = address(params.gatewayAddress);
+        const delegator = params.delegatorAddress
+            ? address(params.delegatorAddress)
+            : this.signer.address;
+        const [gatewayPda] = await getGatewayPDA(gateway, this.garProgram);
+        const [delegationPda] = await getDelegationPDA(gateway, delegator, this.garProgram);
+        // Withdrawal counter + vault are PDA-seeded by the delegator, not the payer.
+        const nextId = await this.getNextWithdrawalId(delegator);
+        const [withdrawalPda] = await getWithdrawalPDA(delegator, nextId, this.garProgram);
+        const ix = await getClaimDelegateFromDisabledGatewayInstructionAsync({
+            gateway: gatewayPda,
+            delegation: delegationPda,
+            withdrawal: withdrawalPda,
+            // `delegator` is an unsigned seeds-derivation key; `payer` (the signer)
+            // covers rent on the init_if_needed counter + the new withdrawal.
+            delegator,
+            payer: this.signer,
+        }, { programAddress: this.garProgram });
+        const sig = await this.sendTransaction([ix], 1_000_000);
+        return { id: sig };
+    }
+    // =========================================
     // Delegation allowlist (ario-gar)
     // =========================================
     /** Add an address to the gateway's delegation allowlist. */

package/lib/esm/version.js

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '4.0.0-solana.24';
+export const version = '4.0.0-solana.25';

package/lib/types/solana/deserialize.d.ts

@@ -46,6 +46,7 @@ declare class BorshReader {
     readString(): string;
     readOptionI64(): number | undefined;
     readOptionU32(): number | undefined;
+    readOptionU16(): number | undefined;
     skip(bytes: number): void;
     getOffset(): number;
     remaining(): number;

package/lib/types/solana/io-readable.d.ts

@@ -309,6 +309,21 @@ export declare class SolanaARIOReadable {
         pubkey: Address;
         operator: Address;
     }>>;
+    /**
+     * Enumerate Joined Gateway PDAs whose delegation has been DISABLED
+     * (`allow_delegated_staking == false`) yet still hold delegated stake
+     * (`total_delegated_stake > 0`) — i.e. delegates that an operator's disable
+     * left stranded (WP §6.3 / Fix #6). Each such gateway's delegates must be
+     * cranked out via
+     * {@link SolanaARIOWriteable.claimDelegateFromDisabledGateway} (enumerate
+     * them with {@link getGatewayDelegates}) before the operator can re-enable
+     * delegation. This is the discovery primitive a cranker uses to sweep them.
+     */
+    getDisabledGatewaysWithDelegatedStake(): Promise<Array<{
+        pubkey: Address;
+        operator: Address;
+        totalDelegatedStake: bigint;
+    }>>;
     /**
      * Enumerate Delegation PDAs with `amount == 0`. Eligible for
      * `closeEmptyDelegation` (rent refund to the original delegator).

package/lib/types/solana/io-writeable.d.ts

@@ -422,6 +422,26 @@ export declare class SolanaARIOWriteable extends SolanaARIOReadable {
     claimDelegateFromLeavingGateway(params: {
         gatewayAddress: string;
     }, _options?: WriteOptions): Promise<MessageResult>;
+    /**
+     * Claim a delegate's stake out of a gateway that has DISABLED delegation
+     * (`allow_delegated_staking == false`), moving it into the delegate's own
+     * withdrawal vault (WP §6.3 / Fix #6). This is the disabled-gateway analog of
+     * {@link claimDelegateFromLeavingGateway}: the on-chain instruction is
+     * permissionless, so a cranker can sweep delegates out (the operator cannot
+     * re-enable delegation until `total_delegated_stake == 0` and the cooldown
+     * elapses). The withdrawal-counter and withdrawal PDAs are seeded by the
+     * DELEGATOR, so a cranker must pass that delegate's `delegatorAddress`.
+     *
+     * @param params.gatewayAddress  The gateway whose delegation was disabled.
+     * @param params.delegatorAddress  The delegate to claim for. Defaults to the
+     *   signer (self-claim). Pass another address to crank on a delegate's behalf;
+     *   the signer covers rent (`payer`) but stake still routes to the delegate's
+     *   own vault (the delegator key is bound by the delegation PDA seeds).
+     */
+    claimDelegateFromDisabledGateway(params: {
+        gatewayAddress: string;
+        delegatorAddress?: string;
+    }, _options?: WriteOptions): Promise<MessageResult>;
     /** Add an address to the gateway's delegation allowlist. */
     allowDelegate(params: {
         delegate: string;

package/lib/types/types/io.d.ts

@@ -232,6 +232,22 @@ export type GatewaySettings = {
     fqdn: string;
     port: number;
     protocol: 'https';
+    /**
+     * Solana only (GATEWAY_VERSION 1.1.0+). A `delegateRewardShareRatio` change
+     * requested mid-epoch is staged here and applied at the next epoch's
+     * `tally_weights` (WP §6.3 / Fix #7), so the active value stays epoch-stable.
+     * When set, render the active `delegateRewardShareRatio` as the current rate
+     * and this as "pending until next epoch". Percent (0-95), same scale as
+     * `delegateRewardShareRatio`. Undefined when no change is queued.
+     */
+    pendingDelegateRewardShareRatio?: number;
+    /**
+     * Solana only (GATEWAY_VERSION 1.1.0+). Unix seconds when the operator
+     * disabled delegation (WP §6.3 / Fix #6). Re-enabling is blocked until every
+     * delegate has been withdrawn AND the withdrawal-period cooldown has elapsed
+     * since this time. Undefined when delegation is enabled.
+     */
+    delegationDisabledAt?: number;
 };
 export type BalanceWithAddress = {
     address: WalletAddress;

package/lib/types/version.d.ts

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare const version = "4.0.0-solana.23";
+export declare const version = "4.0.0-solana.24";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ar.io/sdk",
-  "version": "4.0.0-solana.24",
+  "version": "4.0.0-solana.25",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ar-io/ar-io-sdk.git"
@@ -123,7 +123,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@ar.io/solana-contracts": "0.4.0",
+    "@ar.io/solana-contracts": "0.5.0-staging.15",
     "@solana-program/address-lookup-table": "^0.11.0",
     "@solana-program/compute-budget": "^0.15.0",
     "@solana-program/token": "^0.13.0",