@sparkdreamnft/sparkdreamjs 0.0.39 → 0.0.41

package/sparkdream/session/v1/tx.amino.d.ts

@@ -1,4 +1,5 @@
 import { MsgUpdateParams, MsgUpdateOperationalParams, MsgCreateSession, MsgRevokeSession } from "./tx";
+import { Coin } from "../../../cosmos/base/v1beta1/coin";
 export declare const AminoConverter: {
     "/sparkdream.session.v1.MsgUpdateParams": {
         aminoType: string;
@@ -25,4 +26,68 @@ export declare const AminoConverter: {
         toAmino(message: any): any;
         fromAmino(object: any): any;
     };
+    "/sparkdream.session.v1.MsgCreateGrant": {
+        aminoType: string;
+        toAmino(message: any): any;
+        fromAmino(object: any): any;
+    };
+    "/sparkdream.session.v1.MsgClaimRecurringPull": {
+        toAmino: (m: any) => {
+            [x: string]: any;
+            grant_id: string;
+        };
+        fromAmino: (o: any) => {
+            [x: string]: any;
+            grantId: bigint;
+        };
+        aminoType: string;
+    };
+    "/sparkdream.session.v1.MsgPullAllowance": {
+        aminoType: string;
+        toAmino: (m: any) => {
+            grantee: any;
+            grant_id: string;
+            recipient: any;
+            amount: import("../../../cosmos/base/v1beta1/coin").CoinAmino;
+        };
+        fromAmino: (o: any) => {
+            grantee: any;
+            grantId: bigint;
+            recipient: any;
+            amount: Coin;
+        };
+    };
+    "/sparkdream.session.v1.MsgRetryScheduledOneshot": {
+        toAmino: (m: any) => {
+            [x: string]: any;
+            grant_id: string;
+        };
+        fromAmino: (o: any) => {
+            [x: string]: any;
+            grantId: bigint;
+        };
+        aminoType: string;
+    };
+    "/sparkdream.session.v1.MsgRevokeGrant": {
+        toAmino: (m: any) => {
+            [x: string]: any;
+            grant_id: string;
+        };
+        fromAmino: (o: any) => {
+            [x: string]: any;
+            grantId: bigint;
+        };
+        aminoType: string;
+    };
+    "/sparkdream.session.v1.MsgDeclineGrant": {
+        toAmino: (m: any) => {
+            [x: string]: any;
+            grant_id: string;
+        };
+        fromAmino: (o: any) => {
+            [x: string]: any;
+            grantId: bigint;
+        };
+        aminoType: string;
+    };
 };

package/sparkdream/session/v1/tx.amino.js

@@ -3,8 +3,33 @@
 // HAND-WRITTEN OVERRIDE — overlaid by scripts/codegen.ts after telescope.
 // See ../../commons/v1/tx.amino.ts for rationale.
 //
-// MsgExecSession has `repeated google.protobuf.Any msgs = 3` (note the
-// shorter field name `msgs`, not `messages`). Same recursive-Any problem.
+// Because this file replaces the generated one wholesale, EVERY Msg in
+// session/v1/tx.proto must have an entry here — a message added to the proto
+// but not to this map ships in the registry with no amino converter, and
+// Keplr/Ledger (amino-json) signing of it fails.
+//
+// Three shapes telescope gets wrong for this module:
+//
+//   1. MsgExecSession / OneshotExec carry google.protobuf.Any, which needs the
+//      recursive conversion in ../../../nested-amino.
+//   2. MsgCreateGrant.payload and ScheduledOneshotPayload.action are oneofs
+//      with (amino.oneof_name). cosmossdk.io/x/tx/signing/aminojson renders a
+//      set oneof member as
+//
+//        "<CamelCase oneof name>": {"type": "<oneof_name>", "value": {"<field>": {...}}}
+//
+//      e.g. "Payload": {"type": "sparkdream/session/RecurringPullPayload",
+//                        "value": {"recurring_pull": {...}}}
+//
+//      while telescope emits the bare member ("recurring_pull": {...}).
+//   3. Repeated fields must be omitted when empty (omitempty), never `[]`.
+//
+// cosmjs rebuilds the TxBody from fromAmino(signed msgs), so each fromAmino
+// below must exactly invert its toAmino.
+//
+// 64-bit ints are coerced here rather than trusting callers to pass BigInt:
+// cosmjs hands toAmino the caller's raw value (no fromPartial), and a Number
+// 0 would otherwise sign a key the chain omits.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AminoConverter = void 0;
 const tx_1 = require("./tx");
@@ -12,6 +37,123 @@ const coin_1 = require("../../../cosmos/base/v1beta1/coin");
 const timestamp_1 = require("../../../google/protobuf/timestamp");
 const helpers_1 = require("../../../helpers");
 const nested_amino_1 = require("../../../nested-amino");
+const str = (v) => (v === "" || v === undefined || v === null ? undefined : v);
+const int64 = (v) => {
+    if (v === undefined || v === null || v === "")
+        return undefined;
+    const b = BigInt(v);
+    return b === BigInt(0) ? undefined : b.toString();
+};
+const bool = (v) => (v ? true : undefined);
+const list = (v) => ((v?.length ?? 0) > 0 ? v.map((e) => e) : undefined);
+const coin = (v) => (v ? coin_1.Coin.toAmino(coin_1.Coin.fromPartial(v)) : undefined);
+const time = (v) => (v ? timestamp_1.Timestamp.toAmino((0, helpers_1.toTimestamp)(v)) : undefined);
+const toBig = (v) => (v === undefined || v === null ? BigInt(0) : BigInt(v));
+const fromCoin = (v) => (v ? coin_1.Coin.fromAmino(v) : undefined);
+const fromTime = (v) => (v ? (0, helpers_1.fromTimestamp)(timestamp_1.Timestamp.fromAmino(v)) : undefined);
+// ── Payloads ────────────────────────────────────────────────────────────
+const sessionKeyToAmino = (p) => ({
+    allowed_msg_types: list(p.allowedMsgTypes),
+    spend_limit: coin(p.spendLimit),
+    spent: coin(p.spent),
+    max_exec_count: int64(p.maxExecCount),
+    exec_count: int64(p.execCount),
+    last_used_at: time(p.lastUsedAt),
+    allow_self_revoke: bool(p.allowSelfRevoke),
+});
+const sessionKeyFromAmino = (o) => ({
+    allowedMsgTypes: o.allowed_msg_types ?? [],
+    spendLimit: fromCoin(o.spend_limit),
+    spent: fromCoin(o.spent),
+    maxExecCount: toBig(o.max_exec_count),
+    execCount: toBig(o.exec_count),
+    lastUsedAt: fromTime(o.last_used_at),
+    allowSelfRevoke: o.allow_self_revoke ?? false,
+});
+const recurringPullToAmino = (p) => ({
+    amount_per_period: coin(p.amountPerPeriod),
+    period_seconds: int64(p.periodSeconds),
+    start_time: int64(p.startTime),
+    last_claim_advance: int64(p.lastClaimAdvance),
+    claims_made: int64(p.claimsMade),
+    max_per_epoch: str(p.maxPerEpoch),
+});
+const recurringPullFromAmino = (o) => ({
+    amountPerPeriod: fromCoin(o.amount_per_period),
+    periodSeconds: toBig(o.period_seconds),
+    startTime: toBig(o.start_time),
+    lastClaimAdvance: toBig(o.last_claim_advance),
+    claimsMade: toBig(o.claims_made),
+    maxPerEpoch: o.max_per_epoch ?? "",
+});
+const spendingAllowanceToAmino = (p) => ({
+    max_per_period: coin(p.maxPerPeriod),
+    period_seconds: int64(p.periodSeconds),
+    current_period_start: int64(p.currentPeriodStart),
+    spent_in_current_period: coin(p.spentInCurrentPeriod),
+    allowed_recipients: list(p.allowedRecipients),
+    denom: str(p.denom),
+});
+const spendingAllowanceFromAmino = (o) => ({
+    maxPerPeriod: fromCoin(o.max_per_period),
+    periodSeconds: toBig(o.period_seconds),
+    currentPeriodStart: toBig(o.current_period_start),
+    spentInCurrentPeriod: fromCoin(o.spent_in_current_period),
+    allowedRecipients: o.allowed_recipients ?? [],
+    denom: o.denom ?? "",
+});
+const scheduledOneshotToAmino = (p) => {
+    let action = undefined;
+    if (p.transfer) {
+        action = {
+            type: "sparkdream/session/OneshotTransfer",
+            value: { transfer: { recipient: str(p.transfer.recipient), amount: coin(p.transfer.amount) } },
+        };
+    }
+    else if (p.exec) {
+        action = {
+            type: "sparkdream/session/OneshotExec",
+            value: {
+                exec: {
+                    msg: p.exec.msg ? (0, nested_amino_1.anyToAmino)(p.exec.msg) : undefined,
+                    gas_limit: int64(p.exec.gasLimit),
+                },
+            },
+        };
+    }
+    return {
+        // aminojson writes `null` for an unset oneof rather than omitting it.
+        Action: action ?? null,
+        fire_at: int64(p.fireAt),
+        fire_error: str(p.fireError),
+    };
+};
+const scheduledOneshotFromAmino = (o) => {
+    const v = o.Action?.value ?? {};
+    return {
+        transfer: v.transfer
+            ? { recipient: v.transfer.recipient ?? "", amount: fromCoin(v.transfer.amount) }
+            : undefined,
+        exec: v.exec
+            ? { msg: v.exec.msg ? (0, nested_amino_1.aminoToAny)(v.exec.msg) : undefined, gasLimit: toBig(v.exec.gas_limit) }
+            : undefined,
+        fireAt: toBig(o.fire_at),
+        fireError: o.fire_error ?? "",
+    };
+};
+const PAYLOADS = [
+    ["sessionKey", "session_key", "sparkdream/session/SessionKeyPayload", sessionKeyToAmino, sessionKeyFromAmino],
+    ["recurringPull", "recurring_pull", "sparkdream/session/RecurringPullPayload", recurringPullToAmino, recurringPullFromAmino],
+    ["spendingAllowance", "spending_allowance", "sparkdream/session/SpendingAllowancePayload", spendingAllowanceToAmino, spendingAllowanceFromAmino],
+    ["scheduledOneshot", "scheduled_oneshot", "sparkdream/session/ScheduledOneshotPayload", scheduledOneshotToAmino, scheduledOneshotFromAmino],
+];
+// ── Messages ────────────────────────────────────────────────────────────
+// {<signer>, grant_id} messages; each signer field name is a single word, so
+// the proto and amino spellings coincide.
+const grantIdMsg = (signer) => ({
+    toAmino: (m) => ({ [signer]: str(m[signer]), grant_id: int64(m.grantId) }),
+    fromAmino: (o) => ({ [signer]: o[signer] ?? "", grantId: toBig(o.grant_id) }),
+});
 exports.AminoConverter = {
     "/sparkdream.session.v1.MsgUpdateParams": {
         aminoType: "sparkdream/x/session/MsgUpdateParams",
@@ -67,4 +209,64 @@ exports.AminoConverter = {
             };
         },
     },
+    "/sparkdream.session.v1.MsgCreateGrant": {
+        aminoType: "sparkdream/x/session/MsgCreateGrant",
+        toAmino(message) {
+            const set = PAYLOADS.find(([key]) => message[key]);
+            return {
+                granter: str(message.granter),
+                grantee: str(message.grantee),
+                expires_at: time(message.expiresAt),
+                note: str(message.note),
+                Payload: set
+                    ? { type: set[2], value: { [set[1]]: set[3](message[set[0]]) } }
+                    : null,
+            };
+        },
+        fromAmino(object) {
+            const out = {
+                granter: object.granter ?? "",
+                grantee: object.grantee ?? "",
+                expiresAt: fromTime(object.expires_at),
+                note: object.note ?? "",
+            };
+            const inner = object.Payload?.value ?? {};
+            for (const [key, field, , , fromAmino] of PAYLOADS) {
+                if (inner[field])
+                    out[key] = fromAmino(inner[field]);
+            }
+            return out;
+        },
+    },
+    "/sparkdream.session.v1.MsgClaimRecurringPull": {
+        aminoType: "sparkdream/x/session/MsgClaimRecurringPull",
+        ...grantIdMsg("grantee"),
+    },
+    "/sparkdream.session.v1.MsgPullAllowance": {
+        aminoType: "sparkdream/x/session/MsgPullAllowance",
+        toAmino: (m) => ({
+            grantee: str(m.grantee),
+            grant_id: int64(m.grantId),
+            recipient: str(m.recipient),
+            amount: coin(m.amount),
+        }),
+        fromAmino: (o) => ({
+            grantee: o.grantee ?? "",
+            grantId: toBig(o.grant_id),
+            recipient: o.recipient ?? "",
+            amount: fromCoin(o.amount),
+        }),
+    },
+    "/sparkdream.session.v1.MsgRetryScheduledOneshot": {
+        aminoType: "sparkdream/x/session/MsgRetryScheduledOneshot",
+        ...grantIdMsg("caller"),
+    },
+    "/sparkdream.session.v1.MsgRevokeGrant": {
+        aminoType: "sparkdream/x/session/MsgRevokeGrant",
+        ...grantIdMsg("granter"),
+    },
+    "/sparkdream.session.v1.MsgDeclineGrant": {
+        aminoType: "sparkdream/x/session/MsgDeclineGrant",
+        ...grantIdMsg("grantee"),
+    },
 };