@crediolabs/policy-synth 0.4.0 → 0.5.0

package/dist/adapters/interpreter/adapter.d.ts

@@ -12,9 +12,9 @@ export interface InterpreterAdapterConfig {
      *  rejected as `SCOPE_SELF_CALL`. */
     smartAccountAddress: string;
 }
-/** The result of compiling a PolicyIR for this backend. */
+/** The result of compiling a `ComposedRule` for this backend. */
 export interface CompileResult {
-    /** false => some IR construct this backend cannot express (see `uncovered`). */
+    /** false => some constraint this backend cannot express (see `uncovered`). */
     covered: boolean;
     /** Human-readable list of unsupported constructs. */
     uncovered: string[];

package/dist/adapters/interpreter/adapter.js

@@ -1,6 +1,6 @@
-// src/adapters/interpreter/adapter.ts - the interpreter-policy CustodyAdapter.
+// src/adapters/interpreter/adapter.ts - the interpreter-policy adapter.
 //
-// Compiles a PolicyIR to a single interpreter `PolicyDocument` + `PolicyRef`
+// Compiles a `ComposedRule` to a single interpreter `PolicyDocument` + `PolicyRef`
 // carrying the canonical predicate encoding from `predicate/encode.ts`. This is
 // the only backend; the compose step lowers every constraint to it.
 //
@@ -133,7 +133,11 @@ function assertNoSelfCall(node, config) {
         }
     };
     switch (node.op) {
+        // Both boolean nodes recurse. `or` is listed explicitly rather than left
+        // to a default branch: this is a security check, and a new node kind must
+        // fail to compile here rather than silently skip it.
         case 'and':
+        case 'or':
             for (const c of node.children)
                 assertNoSelfCall(c, config);
             return;
@@ -142,7 +146,11 @@ function assertNoSelfCall(node, config) {
             for (const h of node.haystack)
                 checkLeaf(h);
             return;
-        default:
+        case 'eq':
+        case 'lt':
+        case 'lte':
+        case 'gt':
+        case 'gte':
             checkLeaf(node.left);
             checkLeaf(node.right);
     }

package/dist/errors.d.ts

@@ -1,4 +1,9 @@
-export type ErrorCode = 'RECORDING_FAILED' | 'RECORDING_VALIDATION_FAILED' | 'SCOPE_UNRESOLVED' | 'SYNTHESIS_ERROR' | 'MALFORMED_PREDICATE' | 'SIMULATION_ERROR' | 'VERIFICATION_FAILED' | 'DENY_CASE_FAILURE' | 'PERMIT_CASE_FAILED' | 'SUMMARY_DRIFT' | 'INSTALL_BUILD_FAILED' | 'INSTALL_CONFIRM_MISSING' | 'INSTALL_CONFIRM_EXPIRED' | 'REVOKE_BUILD_FAILED' | 'REVOKE_CONFIRM_MISSING' | 'USER_REJECTED_SIGN' | 'WALLET_TIMEOUT' | 'WALLET_UNAVAILABLE' | 'PREDICATE_TOO_LARGE' | 'PREDICATE_TOO_DEEP' | 'TOO_MANY_LEAVES' | 'IN_OPERAND_LIMIT' | 'POLICY_CAP_EXCEEDED' | 'WASM_TOO_LARGE' | 'MASTER_AUTH_REQUIRED' | 'NONCE_REPLAY' | 'VERSION_MISMATCH' | 'ARITHMETIC_OVERFLOW' | 'AMOUNT_OVERFLOW' | 'RULE_SIGNERS_CHANGED' | 'SCOPE_SELF_CALL' | 'ARG_MISMATCH' | 'CONTRACT_SCOPE' | 'UNSUPPORTED_NODE' | 'STATEFUL_BOUND' | 'NOT_IN_ALLOWLIST' | 'COMPILE_OK' | 'COMPILE_GATE_FAILED';
+export type ErrorCode = 'RECORDING_FAILED' | 'RECORDING_VALIDATION_FAILED' | 'SCOPE_UNRESOLVED' | 'SYNTHESIS_ERROR' | 'MALFORMED_PREDICATE' | 'SIMULATION_ERROR' | 'VERIFICATION_FAILED' | 'DENY_CASE_FAILURE' | 'PERMIT_CASE_FAILED' | 'SUMMARY_DRIFT' | 'INSTALL_BUILD_FAILED' | 'INSTALL_CONFIRM_MISSING' | 'INSTALL_CONFIRM_EXPIRED' | 'REVOKE_BUILD_FAILED' | 'REVOKE_CONFIRM_MISSING' | 'USER_REJECTED_SIGN' | 'WALLET_TIMEOUT' | 'WALLET_UNAVAILABLE' | 'PREDICATE_TOO_LARGE' | 'PREDICATE_TOO_DEEP' | 'TOO_MANY_LEAVES' | 'IN_OPERAND_LIMIT' | 'POLICY_CAP_EXCEEDED' | 'WASM_TOO_LARGE' | 'MASTER_AUTH_REQUIRED' | 'NONCE_REPLAY' | 'VERSION_MISMATCH' | 'ARITHMETIC_OVERFLOW' | 'AMOUNT_OVERFLOW' | 'RULE_SIGNERS_CHANGED' | 'SCOPE_SELF_CALL' | 'ARG_MISMATCH' | 'CONTRACT_SCOPE' | 'UNSUPPORTED_NODE' | 'STATEFUL_BOUND' | 'NOT_IN_ALLOWLIST'
+/** A comparison against a `call_arg_scaled` operand failed (contract 107). */
+ | 'SLIPPAGE_FLOOR'
+/** A `call_arg_scaled` ratio is zero or non-positive. Refused at install
+ *  (contract 214) and mirrored at encode. */
+ | 'INVALID_SCALED_RATIO' | 'COMPILE_OK' | 'COMPILE_GATE_FAILED';
 export interface ToolError {
     code: ErrorCode;
     message: string;

package/dist/install/authority-overlap.js

@@ -125,6 +125,18 @@ export function permittedSelectors(node) {
                 acc = intersectSelectors(acc, permittedSelectors(child));
             return acc;
         }
+        case 'or': {
+            // Any branch may hold, so the permitted set is the UNION. A union of
+            // over-approximations is still an over-approximation, so this keeps the
+            // fail-safe direction while staying tighter than the wildcard the
+            // default branch would give. Precision matters here: `or` is how a
+            // policy says "pair A or pair B", and widening that to the wildcard
+            // would report an overlap against every rule on the account.
+            const acc = [];
+            for (const child of node.children)
+                acc.push(...permittedSelectors(child));
+            return dedupe(acc);
+        }
         case 'eq': {
             const sel = selectorFromEq(node.left, node.right);
             return sel === null ? [WILDCARD] : [sel];

package/dist/install/build-add-context-rule.d.ts

@@ -23,7 +23,7 @@ export interface BuildAddContextRuleArgs {
      *  before the chain does; the contract will refuse a mismatch again. */
     grammarVersion?: number;
 }
-export declare const DEFAULT_GRAMMAR_VERSION: 3;
+export declare const DEFAULT_GRAMMAR_VERSION: 4;
 /** The verb `add_context_rule` takes on the wire. */
 export declare const ADD_CONTEXT_RULE_SYMBOL: "add_context_rule";
 /** Tuple of `ScVal` arguments to pass to `Operation.invokeHostFunction` for

package/dist/install/read-account-rules.d.ts

@@ -0,0 +1,79 @@
+import { rpc, xdr } from '@stellar/stellar-sdk';
+import type { SignerDraft } from '../types.ts';
+import type { ContextType, ObservedRule } from './authority-overlap.ts';
+/** `storage.rs` - the third element of the persistent doc key tuple. */
+export declare const K_DOC = 1;
+/** Persistent-storage key for a rule's stored document:
+ *  `(account, rule_id, K_DOC)`. */
+export declare function docKeyScVal(smartAccount: string, ruleId: number): xdr.ScVal;
+/** Ledger key for the interpreter's persistent entry holding that document. */
+export declare function docLedgerKey(interpreter: string, smartAccount: string, ruleId: number): xdr.LedgerKey;
+/** OZ `ContextRuleType`. An unrecognised tag is reported as `default`, which
+ *  is the widest reading and therefore the safe one: it makes the rule look
+ *  like it could serve any call, so overlap is over-reported, never missed. */
+export declare function decodeContextType(v: xdr.ScVal | undefined): ContextType;
+/** OZ `Signer::Delegated(Address) | Signer::External(Address, Bytes)`. */
+export declare function decodeSigner(v: xdr.ScVal): SignerDraft | undefined;
+/** A full OZ `ContextRule` as returned by `get_context_rule(id)`.
+ *  `predicate` is filled in separately from the ledger entry. */
+export declare function decodeContextRule(v: xdr.ScVal): ObservedRule | undefined;
+/** The interpreter's `StoredDoc { predicate_bytes }`. */
+export declare function decodeStoredPredicateBytes(v: xdr.ScVal): Buffer | undefined;
+/** The three reads the scan needs. Kept as an interface so the collection
+ *  below is testable without a network. */
+export interface AccountRuleReader {
+    /** OZ `get_context_rules_count()`. */
+    getContextRuleCount(smartAccount: string): Promise<number>;
+    /** OZ `get_context_rule(id)`. Undefined when the id is absent. */
+    getContextRule(smartAccount: string, ruleId: number): Promise<xdr.ScVal | undefined>;
+    /** The interpreter's persistent `StoredDoc` entry, read as a ledger entry.
+     *  Undefined when no document is stored for that rule. */
+    getStoredDoc(interpreter: string, smartAccount: string, ruleId: number): Promise<xdr.ScVal | undefined>;
+}
+/** How far the id scan will probe before giving up. OZ imposes no per-account
+ *  rule cap, so there is no exact bound to derive; this one is far above any
+ *  realistic account and keeps a malformed `Count` from spinning forever. */
+export declare const MAX_RULE_ID_SCAN = 512;
+export interface CollectedRules {
+    rules: ObservedRule[];
+    /** Rule ids whose stored predicate could not be read even though the
+     *  interpreter is attached. Such a rule is reported without a predicate,
+     *  which classifies it as opaque rather than as safely narrow. */
+    unreadablePredicateRuleIds: number[];
+    /** True when the scan stopped before accounting for every live rule. The
+     *  result is then a SUBSET of the account's rules, so an empty overlap list
+     *  proves nothing and the caller must not present it as safety. */
+    incomplete: boolean;
+}
+/**
+ * Every context rule on the account, with predicates filled in for the rules
+ * our interpreter polices.
+ *
+ * Rule ids are NOT contiguous. OZ assigns them from a monotonic `NextId` and
+ * decrements `Count` on removal without ever reusing an id, so after any
+ * removal `Count < NextId` and the live ids have gaps. Iterating `0..Count-1`
+ * would silently skip live rules at higher ids, and a skipped rule is a missed
+ * overlap - the one error that reports safety which does not exist. Instead the
+ * scan walks ids upward until it has accounted for `Count` live rules.
+ *
+ * A rule whose predicate cannot be read is deliberately left without one. That
+ * demotes it to the `foreign` class, so the scan reports it as opaque instead
+ * of assuming it is narrow.
+ */
+export declare function collectObservedRules(args: {
+    reader: AccountRuleReader;
+    smartAccount: string;
+    interpreterAddress: string;
+    maxRuleIdScan?: number;
+}): Promise<CollectedRules>;
+/**
+ * An `AccountRuleReader` over a live RPC server.
+ *
+ * The two OZ getters are read-only simulations: the source account is
+ * constructed locally because a simulation never checks its sequence number,
+ * and asking the network for a random key would 404.
+ *
+ * The stored document is fetched as a ledger entry rather than a contract
+ * call, because the interpreter publishes no getter for it.
+ */
+export declare function accountRuleReaderFromServer(server: rpc.Server, networkPassphrase: string): AccountRuleReader;

package/dist/install/read-account-rules.js

@@ -0,0 +1,241 @@
+//! Reading an OpenZeppelin smart account's context rules back off chain.
+//!
+//! `authority-overlap.ts` needs to know what a signer can already do before a
+//! new policy is installed. That means every rule on the account: its context
+//! type, its signers, its attached policies, and - for rules our interpreter
+//! polices - the predicate itself.
+//!
+//! Without this, the overlap scan can only report on rules the CALLER supplied,
+//! which means it answers "what did you tell me about" rather than "what is on
+//! the account". Those are different questions, and only the second one is
+//! worth anything to someone deciding whether to sign.
+//!
+//! The predicate is NOT reachable through a contract call. The interpreter
+//! publishes only `grammar_version`, `install`, `enforce`, `uninstall` and
+//! `rotate_master_signer_set`, so the stored document is read as a ledger entry
+//! instead. That keeps this a purely client-side capability: adding a getter
+//! would change a deployed contract's ABI and force a redeploy plus re-audit to
+//! obtain data the ledger already exposes.
+//!
+//! The decoders are pure so they can be tested without a network; the caller
+//! supplies raw `ScVal`s.
+import { Account, Address, BASE_FEE, Contract, Keypair, rpc, TransactionBuilder, xdr, } from '@stellar/stellar-sdk';
+import { decodePredicate } from "../predicate/decode.js";
+/** `storage.rs` - the third element of the persistent doc key tuple. */
+export const K_DOC = 1;
+/** Persistent-storage key for a rule's stored document:
+ *  `(account, rule_id, K_DOC)`. */
+export function docKeyScVal(smartAccount, ruleId) {
+    return xdr.ScVal.scvVec([
+        new Address(smartAccount).toScVal(),
+        xdr.ScVal.scvU32(ruleId),
+        xdr.ScVal.scvU32(K_DOC),
+    ]);
+}
+/** Ledger key for the interpreter's persistent entry holding that document. */
+export function docLedgerKey(interpreter, smartAccount, ruleId) {
+    return xdr.LedgerKey.contractData(new xdr.LedgerKeyContractData({
+        contract: new Address(interpreter).toScAddress(),
+        key: docKeyScVal(smartAccount, ruleId),
+        durability: xdr.ContractDataDurability.persistent(),
+    }));
+}
+// ---- ScVal helpers -----
+/** Field of a `#[contracttype]` struct, which the host encodes as a map keyed
+ *  by field-name symbol. Returns undefined when the field is absent so a
+ *  caller can distinguish "not there" from "there and empty". */
+function mapField(v, name) {
+    if (v.switch() !== xdr.ScValType.scvMap())
+        return undefined;
+    for (const entry of v.map() ?? []) {
+        const key = entry.key();
+        if (key.switch() === xdr.ScValType.scvSymbol() && key.sym().toString() === name) {
+            return entry.val();
+        }
+    }
+    return undefined;
+}
+function u32Of(v) {
+    return v?.switch() === xdr.ScValType.scvU32() ? v.u32() : undefined;
+}
+function addressOf(v) {
+    if (!v || v.switch() !== xdr.ScValType.scvAddress())
+        return undefined;
+    return Address.fromScAddress(v.address()).toString();
+}
+/** An enum variant of a `#[contracttype]` enum: `ScVal::Vec([Symbol, ...args])`. */
+function enumVariant(v) {
+    if (!v || v.switch() !== xdr.ScValType.scvVec())
+        return undefined;
+    const items = v.vec() ?? [];
+    const head = items[0];
+    if (!head || head.switch() !== xdr.ScValType.scvSymbol())
+        return undefined;
+    return { tag: head.sym().toString(), args: items.slice(1) };
+}
+// ---- decoders -----
+/** OZ `ContextRuleType`. An unrecognised tag is reported as `default`, which
+ *  is the widest reading and therefore the safe one: it makes the rule look
+ *  like it could serve any call, so overlap is over-reported, never missed. */
+export function decodeContextType(v) {
+    const variant = enumVariant(v);
+    if (!variant)
+        return { kind: 'default' };
+    if (variant.tag === 'CallContract') {
+        const addr = addressOf(variant.args[0]);
+        return addr ? { kind: 'call_contract', contract: addr } : { kind: 'default' };
+    }
+    if (variant.tag === 'CreateContract') {
+        const arg = variant.args[0];
+        const hash = arg?.switch() === xdr.ScValType.scvBytes() ? arg.bytes().toString('hex') : '';
+        return { kind: 'create_contract', wasmHash: hash };
+    }
+    return { kind: 'default' };
+}
+/** OZ `Signer::Delegated(Address) | Signer::External(Address, Bytes)`. */
+export function decodeSigner(v) {
+    const variant = enumVariant(v);
+    if (!variant)
+        return undefined;
+    if (variant.tag === 'Delegated') {
+        const addr = addressOf(variant.args[0]);
+        return addr ? { kind: 'delegated', address: addr } : undefined;
+    }
+    if (variant.tag === 'External') {
+        const verifier = addressOf(variant.args[0]);
+        const keyArg = variant.args[1];
+        const keyBytes = keyArg?.switch() === xdr.ScValType.scvBytes() ? keyArg.bytes().toString('hex') : '';
+        return verifier ? { kind: 'external', verifier, keyBytes } : undefined;
+    }
+    return undefined;
+}
+/** A full OZ `ContextRule` as returned by `get_context_rule(id)`.
+ *  `predicate` is filled in separately from the ledger entry. */
+export function decodeContextRule(v) {
+    const id = u32Of(mapField(v, 'id'));
+    if (id === undefined)
+        return undefined;
+    const signersVal = mapField(v, 'signers');
+    const signers = [];
+    if (signersVal?.switch() === xdr.ScValType.scvVec()) {
+        for (const s of signersVal.vec() ?? []) {
+            const decoded = decodeSigner(s);
+            if (decoded)
+                signers.push(decoded);
+        }
+    }
+    const policiesVal = mapField(v, 'policies');
+    const policyAddresses = [];
+    if (policiesVal?.switch() === xdr.ScValType.scvVec()) {
+        for (const p of policiesVal.vec() ?? []) {
+            const addr = addressOf(p);
+            if (addr)
+                policyAddresses.push(addr);
+        }
+    }
+    return {
+        id,
+        contextType: decodeContextType(mapField(v, 'context_type')),
+        signers,
+        policyAddresses,
+    };
+}
+/** The interpreter's `StoredDoc { predicate_bytes }`. */
+export function decodeStoredPredicateBytes(v) {
+    const field = mapField(v, 'predicate_bytes');
+    if (!field || field.switch() !== xdr.ScValType.scvBytes())
+        return undefined;
+    return field.bytes();
+}
+/** How far the id scan will probe before giving up. OZ imposes no per-account
+ *  rule cap, so there is no exact bound to derive; this one is far above any
+ *  realistic account and keeps a malformed `Count` from spinning forever. */
+export const MAX_RULE_ID_SCAN = 512;
+/**
+ * Every context rule on the account, with predicates filled in for the rules
+ * our interpreter polices.
+ *
+ * Rule ids are NOT contiguous. OZ assigns them from a monotonic `NextId` and
+ * decrements `Count` on removal without ever reusing an id, so after any
+ * removal `Count < NextId` and the live ids have gaps. Iterating `0..Count-1`
+ * would silently skip live rules at higher ids, and a skipped rule is a missed
+ * overlap - the one error that reports safety which does not exist. Instead the
+ * scan walks ids upward until it has accounted for `Count` live rules.
+ *
+ * A rule whose predicate cannot be read is deliberately left without one. That
+ * demotes it to the `foreign` class, so the scan reports it as opaque instead
+ * of assuming it is narrow.
+ */
+export async function collectObservedRules(args) {
+    const count = await args.reader.getContextRuleCount(args.smartAccount);
+    const limit = args.maxRuleIdScan ?? MAX_RULE_ID_SCAN;
+    const rules = [];
+    const unreadablePredicateRuleIds = [];
+    let id = 0;
+    while (rules.length < count && id < limit) {
+        const raw = await args.reader.getContextRule(args.smartAccount, id);
+        id++;
+        if (!raw)
+            continue;
+        const rule = decodeContextRule(raw);
+        if (!rule)
+            continue;
+        if (rule.policyAddresses.includes(args.interpreterAddress)) {
+            const doc = await args.reader.getStoredDoc(args.interpreterAddress, args.smartAccount, rule.id);
+            const bytes = doc ? decodeStoredPredicateBytes(doc) : undefined;
+            if (bytes) {
+                try {
+                    rule.predicate = decodePredicate(bytes);
+                }
+                catch {
+                    unreadablePredicateRuleIds.push(rule.id);
+                }
+            }
+            else {
+                unreadablePredicateRuleIds.push(rule.id);
+            }
+        }
+        rules.push(rule);
+    }
+    return { rules, unreadablePredicateRuleIds, incomplete: rules.length < count };
+}
+/**
+ * An `AccountRuleReader` over a live RPC server.
+ *
+ * The two OZ getters are read-only simulations: the source account is
+ * constructed locally because a simulation never checks its sequence number,
+ * and asking the network for a random key would 404.
+ *
+ * The stored document is fetched as a ledger entry rather than a contract
+ * call, because the interpreter publishes no getter for it.
+ */
+export function accountRuleReaderFromServer(server, networkPassphrase) {
+    async function simulateCall(contract, method, ...args) {
+        const account = new Account(Keypair.random().publicKey(), '0');
+        const tx = new TransactionBuilder(account, { fee: BASE_FEE, networkPassphrase })
+            .addOperation(new Contract(contract).call(method, ...args))
+            .setTimeout(30)
+            .build();
+        const sim = await server.simulateTransaction(tx);
+        if (rpc.Api.isSimulationError(sim))
+            return undefined;
+        return sim.result?.retval;
+    }
+    return {
+        async getContextRuleCount(smartAccount) {
+            const val = await simulateCall(smartAccount, 'get_context_rules_count');
+            return u32Of(val) ?? 0;
+        },
+        async getContextRule(smartAccount, ruleId) {
+            return simulateCall(smartAccount, 'get_context_rule', xdr.ScVal.scvU32(ruleId));
+        },
+        async getStoredDoc(interpreter, smartAccount, ruleId) {
+            const key = docLedgerKey(interpreter, smartAccount, ruleId);
+            const res = await server.getLedgerEntries(key);
+            const entry = res.entries?.[0]?.val;
+            if (!entry || entry.switch() !== xdr.LedgerEntryType.contractData())
+                return undefined;
+            return entry.contractData().val();
+        },
+    };
+}

package/dist/predicate/decode.js

@@ -55,6 +55,15 @@ function expectSymbol(v, what) {
         throw malformed(`${what} is not a symbol`);
     return v.sym().toString();
 }
+/** Strict i128, returned as a decimal string. Strict on purpose: the Rust
+ *  decoder refuses a u32 in an i128 slot rather than widening it, so
+ *  accepting one here would let a predicate decode off chain and be refused
+ *  on chain. */
+function expectI128(v, what) {
+    if (!v || v.switch() !== xdr.ScValType.scvI128())
+        throw malformed(`${what} is not an i128`);
+    return scValToBigInt(v).toString();
+}
 /** Arity check with the same intent as the Rust `check_arity`: a selector with
  *  the wrong element count is malformed, not silently truncated. */
 function arity(items, n, selector) {
@@ -84,6 +93,14 @@ function decodeSelectorLeaf(items, sym) {
                 element: expectU32(items[2], 'call_arg_field element'),
                 field: expectSymbol(items[3], 'call_arg_field field'),
             };
+        case 'call_arg_scaled':
+            arity(items, 4, sym);
+            return {
+                kind: 'call_arg_scaled',
+                index: expectU32(items[1], 'call_arg_scaled index'),
+                num: expectI128(items[2], 'call_arg_scaled num'),
+                den: expectI128(items[3], 'call_arg_scaled den'),
+            };
         default:
             // Deliberately NOT a literal_vec fallback - see the header note.
             throw malformed(`unknown selector symbol '${sym}'`);
@@ -120,7 +137,8 @@ export function decodeNode(v) {
     if (op === null)
         throw malformed('node does not start with an operator symbol');
     switch (op) {
-        case 'and': {
+        case 'and':
+        case 'or': {
             arity(items, 2, op);
             const children = expectVec(items[1], `${op} children`).map(decodeNode);
             if (children.length === 0)
@@ -128,7 +146,10 @@ export function decodeNode(v) {
             return { op, children };
         }
         case 'eq':
+        case 'lt':
         case 'lte':
+        case 'gt':
+        case 'gte':
             arity(items, 3, op);
             return {
                 op,

package/dist/predicate/encode.js

@@ -80,7 +80,8 @@ function computeStats(node) {
 }
 function walk(node, inCounts, counters) {
     switch (node.op) {
-        case 'and': {
+        case 'and':
+        case 'or': {
             if (node.children.length === 0) {
                 throw capError('MALFORMED_PREDICATE', `\`${node.op}\` with no children: the contract refuses it at decode (MALFORMED_PREDICATE), so it can never be installed`);
             }
@@ -95,7 +96,10 @@ function walk(node, inCounts, counters) {
             return { depth: maxChildDepth + 1, leaves: totalLeaves };
         }
         case 'eq':
-        case 'lte': {
+        case 'lt':
+        case 'lte':
+        case 'gt':
+        case 'gte': {
             collectSelector(node.left, counters);
             collectSelector(node.right, counters);
             return { depth: 1, leaves: leafCount(node.left) + leafCount(node.right) };
@@ -143,14 +147,20 @@ function collectSelector(leaf, counters) {
 }
 function encodeNode(node) {
     switch (node.op) {
-        case 'and': {
+        case 'and':
+        case 'or': {
             const encoded = node.children.map(encodeNode);
-            // sort children by their canonical XDR bytes ascending.
+            // sort children by their canonical XDR bytes ascending. Both operators
+            // are commutative for the permit decision, so sorting costs no meaning
+            // and buys a stable hash for logically-identical predicates.
             const sorted = sortByCanonicalBytes(encoded);
             return xdr.ScVal.scvVec([symbol(node.op), xdr.ScVal.scvVec(sorted)]);
         }
         case 'eq':
-        case 'lte': {
+        case 'lt':
+        case 'lte':
+        case 'gt':
+        case 'gte': {
             return xdr.ScVal.scvVec([symbol(node.op), encodeLeaf(node.left), encodeLeaf(node.right)]);
         }
         case 'in': {
@@ -181,6 +191,15 @@ function encodeLeaf(leaf) {
                 xdr.ScVal.scvU32(leaf.element),
                 xdr.ScVal.scvSymbol(leaf.field),
             ]);
+        case 'call_arg_scaled':
+            // num/den are i128 on the wire. The Rust decoder type-checks both
+            // slots, so a u32 here would be refused rather than widened.
+            return xdr.ScVal.scvVec([
+                symbol('call_arg_scaled'),
+                xdr.ScVal.scvU32(leaf.index),
+                scvI128FromDecimal(leaf.num),
+                scvI128FromDecimal(leaf.den),
+            ]);
         case 'literal_address':
             return scvAddressFromStrkey(leaf.value);
         case 'literal_i128':
@@ -266,6 +285,30 @@ function validateLeafValues(node) {
                     throw malformed(`call_arg_field.element out of u32 range at ${path}`);
                 }
                 return;
+            case 'call_arg_scaled': {
+                if (!Number.isInteger(leaf.index) || leaf.index < 0 || leaf.index > U32_MAX) {
+                    throw malformed(`call_arg_scaled.index out of u32 range at ${path}`);
+                }
+                // Mirror of the contract's install gate (214). Without it the TS
+                // self-verify would green-light a ratio the chain refuses, which is
+                // exactly the divergence this validator exists to prevent.
+                let num;
+                let den;
+                try {
+                    num = BigInt(leaf.num);
+                    den = BigInt(leaf.den);
+                }
+                catch {
+                    throw malformed(`call_arg_scaled num/den must be i128 decimal strings at ${path}`);
+                }
+                if (den === 0n) {
+                    throw malformed(`call_arg_scaled.den is zero at ${path}: the contract refuses it at install (INVALID_SCALED_RATIO)`);
+                }
+                if (num <= 0n || den < 0n) {
+                    throw malformed(`call_arg_scaled ratio ${leaf.num}/${leaf.den} at ${path} is not positive: a negative ratio inverts the comparison, so the floor would permit what it was written to refuse. The contract refuses it at install (INVALID_SCALED_RATIO)`);
+                }
+                return;
+            }
             case 'call_contract':
             case 'call_fn':
             case 'literal_address':
@@ -276,12 +319,16 @@ function validateLeafValues(node) {
     function walkNode(n, path) {
         switch (n.op) {
             case 'and':
+            case 'or':
                 n.children.forEach((c, i) => {
                     walkNode(c, `${path}.children[${i}]`);
                 });
                 return;
             case 'eq':
+            case 'lt':
             case 'lte':
+            case 'gt':
+            case 'gte':
                 walkLeaf(n.left, `${path}.left`);
                 walkLeaf(n.right, `${path}.right`);
                 return;

package/dist/predicate/from-json.js

@@ -17,9 +17,13 @@ export function jsonToAst(value) {
     const v = value;
     switch (v.op) {
         case 'and':
-            return { op: 'and', children: arrayOf(v.children, jsonToAst) };
+        case 'or':
+            return { op: v.op, children: arrayOf(v.children, jsonToAst) };
         case 'eq':
+        case 'lt':
         case 'lte':
+        case 'gt':
+        case 'gte':
             return { op: v.op, left: jsonToLeaf(v.left), right: jsonToLeaf(v.right) };
         case 'in':
             return { op: 'in', needle: jsonToLeaf(v.needle), haystack: arrayOf(v.haystack, jsonToLeaf) };
@@ -44,6 +48,15 @@ function jsonToLeaf(value) {
             return { kind: 'call_arg', index: numberField(v, 'index') };
         case 'call_arg_len':
             return { kind: 'call_arg_len', index: numberField(v, 'index') };
+        case 'call_arg_scaled':
+            // num/den stay decimal STRINGS: an i128 ratio does not survive a JS
+            // number, and silently rounding one would change the floor.
+            return {
+                kind: 'call_arg_scaled',
+                index: numberField(v, 'index'),
+                num: stringField(v, 'num'),
+                den: stringField(v, 'den'),
+            };
         case 'literal_address':
             return { kind: 'literal_address', value: stringField(v, 'value') };
         case 'literal_i128':