@theliem/xmarket-sdk 4.0.3 → 4.1.1

package/dist/index.d.mts

@@ -65,6 +65,7 @@ interface Condition {
     yesMint: PublicKey;
     noMint: PublicKey;
     authorizedClob: PublicKey;
+    authorizedResolver: PublicKey;
     isResolved: boolean;
     resolvedAt: number;
     bump: number;
@@ -94,6 +95,7 @@ interface QuestionMarketConfig {
     owner: PublicKey;
     admin: PublicKey;
     oracle: PublicKey;
+    oracleProgram: PublicKey;
     conditionalTokensProgram: PublicKey;
     questionCount: number;
     approvedCount: number;
@@ -300,7 +302,7 @@ declare class CtfClient {
      * so that wallet can later sign reportPayouts.
      * payer covers rent for condition + mints.
      */
-    prepareCondition(questionId: Uint8Array, oracle: PublicKey, collateralMint: PublicKey, authorizedClob: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<{
+    prepareCondition(questionId: Uint8Array, oracle: PublicKey, collateralMint: PublicKey, authorizedClob: PublicKey, authorizedResolver?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<{
         signature: string;
         conditionPda: PublicKey;
         yesMint: PublicKey;
@@ -387,7 +389,7 @@ declare class MarketClient {
     feeConfigOwner?: PublicKey;
     constructor(program: anchor.Program, provider: anchor.AnchorProvider, programIds: ProgramIds, ownerPubkey: PublicKey);
     get walletPubkey(): PublicKey;
-    initialize(admin: PublicKey, oracle: PublicKey, owner?: PublicKey): Promise<Transaction>;
+    initialize(admin: PublicKey, oracle: PublicKey, oracleProgram: PublicKey, owner?: PublicKey): Promise<Transaction>;
     /**
      * Build createQuestionAdmin transaction (whitelist/admin path — status = Approved immediately).
      * @param creator - Whitelisted creator (must be in whitelist or be admin/owner)
@@ -405,6 +407,7 @@ declare class MarketClient {
         newOracle?: PublicKey;
         isPaused?: boolean;
         newConditionalTokensProgram?: PublicKey;
+        newOracleProgram?: PublicKey;
     }, authority?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /** Set the admin (owner only). Replaces any existing admin. */
     addAdmin(newAdmin: PublicKey, owner?: PublicKey): Promise<Transaction>;

package/dist/index.d.ts

@@ -65,6 +65,7 @@ interface Condition {
     yesMint: PublicKey;
     noMint: PublicKey;
     authorizedClob: PublicKey;
+    authorizedResolver: PublicKey;
     isResolved: boolean;
     resolvedAt: number;
     bump: number;
@@ -94,6 +95,7 @@ interface QuestionMarketConfig {
     owner: PublicKey;
     admin: PublicKey;
     oracle: PublicKey;
+    oracleProgram: PublicKey;
     conditionalTokensProgram: PublicKey;
     questionCount: number;
     approvedCount: number;
@@ -300,7 +302,7 @@ declare class CtfClient {
      * so that wallet can later sign reportPayouts.
      * payer covers rent for condition + mints.
      */
-    prepareCondition(questionId: Uint8Array, oracle: PublicKey, collateralMint: PublicKey, authorizedClob: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<{
+    prepareCondition(questionId: Uint8Array, oracle: PublicKey, collateralMint: PublicKey, authorizedClob: PublicKey, authorizedResolver?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<{
         signature: string;
         conditionPda: PublicKey;
         yesMint: PublicKey;
@@ -387,7 +389,7 @@ declare class MarketClient {
     feeConfigOwner?: PublicKey;
     constructor(program: anchor.Program, provider: anchor.AnchorProvider, programIds: ProgramIds, ownerPubkey: PublicKey);
     get walletPubkey(): PublicKey;
-    initialize(admin: PublicKey, oracle: PublicKey, owner?: PublicKey): Promise<Transaction>;
+    initialize(admin: PublicKey, oracle: PublicKey, oracleProgram: PublicKey, owner?: PublicKey): Promise<Transaction>;
     /**
      * Build createQuestionAdmin transaction (whitelist/admin path — status = Approved immediately).
      * @param creator - Whitelisted creator (must be in whitelist or be admin/owner)
@@ -405,6 +407,7 @@ declare class MarketClient {
         newOracle?: PublicKey;
         isPaused?: boolean;
         newConditionalTokensProgram?: PublicKey;
+        newOracleProgram?: PublicKey;
     }, authority?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /** Set the admin (owner only). Replaces any existing admin. */
     addAdmin(newAdmin: PublicKey, owner?: PublicKey): Promise<Transaction>;

package/dist/index.js

@@ -505,11 +505,12 @@ var MarketClient = class {
     return this.provider.wallet.publicKey;
   }
   // ─── Instructions (return Transaction — caller signs + sends) ───────────────
-  async initialize(admin, oracle, owner = this.walletPubkey) {
+  async initialize(admin, oracle, oracleProgram, owner = this.walletPubkey) {
     return this.program.methods.initialize({
       admin,
       conditionalTokensProgram: this.programIds.conditionalTokens,
-      oracle
+      oracle,
+      oracleProgram
     }).accounts({
       owner,
       config: this.configPda,
@@ -576,7 +577,8 @@ var MarketClient = class {
       newAdmin: params.newAdmin ?? null,
       newOracle: params.newOracle ?? null,
       isPaused: params.isPaused ?? null,
-      newConditionalTokensProgram: params.newConditionalTokensProgram ?? null
+      newConditionalTokensProgram: params.newConditionalTokensProgram ?? null,
+      newOracleProgram: params.newOracleProgram ?? null
     }).accounts({
       authority,
       payer,
@@ -638,6 +640,7 @@ var MarketClient = class {
         owner: acc.owner,
         admin: acc.admin,
         oracle: acc.oracle,
+        oracleProgram: acc.oracleProgram,
         conditionalTokensProgram: acc.conditionalTokensProgram,
         questionCount: acc.questionCount.toNumber(),
         approvedCount: acc.approvedCount.toNumber(),
@@ -964,7 +967,7 @@ var CtfClient = class {
    * so that wallet can later sign reportPayouts.
    * payer covers rent for condition + mints.
    */
-  async prepareCondition(questionId, oracle, collateralMint, authorizedClob, payer = this.walletPubkey, signers = []) {
+  async prepareCondition(questionId, oracle, collateralMint, authorizedClob, authorizedResolver = oracle, payer = this.walletPubkey, signers = []) {
     const [conditionPda] = PDA.condition(oracle, questionId, this.programIds);
     const [yesMint] = PDA.yesMint(conditionPda, this.programIds);
     const [noMint] = PDA.noMint(conditionPda, this.programIds);
@@ -972,7 +975,8 @@ var CtfClient = class {
     const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
     const sig = await this.program.methods.prepareCondition(
       Array.from(questionId),
-      authorizedClob
+      authorizedClob,
+      authorizedResolver
     ).accounts({
       oracle,
       condition: conditionPda,
@@ -1224,6 +1228,7 @@ var CtfClient = class {
         yesMint: acc.yesMint,
         noMint: acc.noMint,
         authorizedClob: acc.authorizedClob,
+        authorizedResolver: acc.authorizedResolver,
         isResolved: acc.isResolved,
         resolvedAt: acc.resolvedAt?.toNumber() ?? 0,
         bump: acc.bump
@@ -3889,7 +3894,7 @@ var DisputeClient = class {
 
 // src/idls/oracle.json
 var oracle_default = {
-  address: "JE3iUvfv2DjhHnEqf2cFtzMtqn1AYQ5s32e1fzkL6KTo",
+  address: "8uNiLDZnarxyFyoCi1bE1qkBMsLs2Tpyohtdzdvjkg8j",
   metadata: {
     name: "oracle_v2",
     version: "0.1.0",
@@ -4614,7 +4619,7 @@ var oracle_default = {
 
 // src/idls/question_market.json
 var question_market_default = {
-  address: "6aYGVgSPNgFxNB9f25UvKrzMs91cGh7urNZKdtnMUm6k",
+  address: "FkpHo3zb5h2nNS5n6tWAvDwXPTXR2qqVLjDmEkMayott",
   metadata: {
     name: "question_market_v2",
     version: "0.1.0",
@@ -4948,19 +4953,19 @@ var question_market_default = {
         },
         {
           name: "fee_management_program",
-          address: "HZ5ec3NbwceUfyzZkwGEzDxQHpr4p4L9JV1gmcPDyXYw"
+          address: "8S6hxqbDc8kgHf4uUzq2t15PeY36QSCYEpBVvM4Fhrkm"
         },
         {
           name: "presale_program",
-          address: "H9GzTEu5giM1k9HJm126Pp6C6b3iKWahbF7RJj8Jr3zJ"
+          address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"
         },
         {
           name: "market_oracle_program",
-          address: "4o7VyLGV79AynuTjTxDvsUfZKS11bX5SkSsk5zHKVovG"
+          address: "Agt6beCbghi4jV9A8v9geRP5dnt2wDkJBVgy9oM33zit"
         },
         {
           name: "admin_program",
-          address: "3E2b2H3ZDMXjqQ1VKDz8zsVXWdRaH5Mjdd7qFB13Uejn"
+          address: "2HsyCdr59W5ndeboaE9JAmhEQ46m5Gm2ZWBfYEs1tC1i"
         },
         {
           name: "token_program",
@@ -5222,11 +5227,11 @@ var question_market_default = {
         },
         {
           name: "presale_program",
-          address: "H9GzTEu5giM1k9HJm126Pp6C6b3iKWahbF7RJj8Jr3zJ"
+          address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"
         },
         {
           name: "admin_program",
-          address: "3E2b2H3ZDMXjqQ1VKDz8zsVXWdRaH5Mjdd7qFB13Uejn"
+          address: "2HsyCdr59W5ndeboaE9JAmhEQ46m5Gm2ZWBfYEs1tC1i"
         },
         {
           name: "token_program",
@@ -5308,7 +5313,7 @@ var question_market_default = {
         },
         {
           name: "market_oracle_program",
-          address: "4o7VyLGV79AynuTjTxDvsUfZKS11bX5SkSsk5zHKVovG"
+          address: "Agt6beCbghi4jV9A8v9geRP5dnt2wDkJBVgy9oM33zit"
         }
       ],
       args: []
@@ -5536,7 +5541,7 @@ var question_market_default = {
         },
         {
           name: "presale_program",
-          address: "H9GzTEu5giM1k9HJm126Pp6C6b3iKWahbF7RJj8Jr3zJ"
+          address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"
         },
         {
           name: "token_program",
@@ -5672,7 +5677,7 @@ var question_market_default = {
         },
         {
           name: "fee_management_program",
-          address: "HZ5ec3NbwceUfyzZkwGEzDxQHpr4p4L9JV1gmcPDyXYw"
+          address: "8S6hxqbDc8kgHf4uUzq2t15PeY36QSCYEpBVvM4Fhrkm"
         },
         {
           name: "token_program",
@@ -5865,7 +5870,7 @@ var question_market_default = {
         },
         {
           name: "presale_program",
-          address: "H9GzTEu5giM1k9HJm126Pp6C6b3iKWahbF7RJj8Jr3zJ"
+          address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"
         }
       ],
       args: []
@@ -6085,7 +6090,8 @@ var question_market_default = {
         {
           name: "condition",
           docs: [
-            "The Condition account in CTF (will be updated via CPI)"
+            "The Condition account in CTF (will be updated via CPI).",
+            "Must match question.condition \u2014 prevents cross-market resolution."
           ],
           writable: true
         },
@@ -6098,7 +6104,7 @@ var question_market_default = {
         {
           name: "oracle_program",
           docs: [
-            "Oracle program (for reading QuestionResult)"
+            "Oracle program (for reading QuestionResult) \u2014 must match config.oracle_program"
           ]
         },
         {
@@ -6721,7 +6727,14 @@ var question_market_default = {
           {
             name: "oracle",
             docs: [
-              "Oracle pubkey that will resolve conditions"
+              "Oracle config PDA that will resolve conditions"
+            ],
+            type: "pubkey"
+          },
+          {
+            name: "oracle_program",
+            docs: [
+              "Oracle program ID \u2014 used to validate oracle proofs in resolve_question"
             ],
             type: "pubkey"
           }
@@ -7193,7 +7206,14 @@ var question_market_default = {
           {
             name: "oracle",
             docs: [
-              "Oracle pubkey that will resolve conditions"
+              "Oracle config PDA that will resolve conditions"
+            ],
+            type: "pubkey"
+          },
+          {
+            name: "oracle_program",
+            docs: [
+              "Oracle program ID \u2014 pinned for CPI validation in resolve_question"
             ],
             type: "pubkey"
           },
@@ -7266,7 +7286,7 @@ var question_market_default = {
             type: {
               array: [
                 "u8",
-                440
+                408
               ]
             }
           }
@@ -7464,6 +7484,15 @@ var question_market_default = {
             type: {
               option: "pubkey"
             }
+          },
+          {
+            name: "new_oracle_program",
+            docs: [
+              "New oracle program ID (optional) \u2014 used to validate oracle proofs in resolve_question"
+            ],
+            type: {
+              option: "pubkey"
+            }
           }
         ]
       }
@@ -7473,7 +7502,7 @@ var question_market_default = {
 
 // src/idls/conditional_tokens.json
 var conditional_tokens_default = {
-  address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB",
+  address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT",
   metadata: {
     name: "conditional_tokens_v2",
     version: "0.1.0",
@@ -7894,6 +7923,10 @@ var conditional_tokens_default = {
         {
           name: "authorized_clob",
           type: "pubkey"
+        },
+        {
+          name: "authorized_resolver",
+          type: "pubkey"
         }
       ]
     },
@@ -8023,9 +8056,6 @@ var conditional_tokens_default = {
         },
         {
           name: "collateral_vault",
-          docs: [
-            "Use canonical bump derivation (no bump = vault.bump) so corrupt bump doesn't block us"
-          ],
           writable: true,
           pda: {
             seeds: [
@@ -8059,9 +8089,6 @@ var conditional_tokens_default = {
         },
         {
           name: "vault_token_account",
-          docs: [
-            "Existing vault token account \u2014 just update the reference"
-          ],
           writable: true,
           pda: {
             seeds: [
@@ -8739,6 +8766,14 @@ var conditional_tokens_default = {
             ],
             type: "u8"
           },
+          {
+            name: "admin",
+            docs: [
+              "Admin pubkey \u2014 only this address can call reinitialize_vault.",
+              "Set at initialize_vault time. If Pubkey::default(), first caller sets it (bootstrap)."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             docs: [
@@ -8747,7 +8782,7 @@ var conditional_tokens_default = {
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -8825,12 +8860,20 @@ var conditional_tokens_default = {
             name: "bump",
             type: "u8"
           },
+          {
+            name: "authorized_resolver",
+            docs: [
+              "QuestionMarket config PDA authorized to call set_payout.",
+              "Uses first 32 bytes of old _reserved \u2014 existing accounts read as Pubkey::default()."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -9176,7 +9219,7 @@ var conditional_tokens_default = {
 
 // src/idls/clob_exchange.json
 var clob_exchange_default = {
-  address: "43ubx86ZnGJ4bzD8uZY91uoUzJdK2jULwSSVk8zHjzEY",
+  address: "AFT8SM1Vv8g8AQTf81LoE5oLteUTyhWzWTLj7SKZjkY1",
   metadata: {
     name: "clob_exchange_v2",
     version: "0.1.0",
@@ -9369,7 +9412,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "token_program",
@@ -9520,7 +9563,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "token_program",
@@ -9667,7 +9710,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "token_program",
@@ -10030,7 +10073,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "token_program",
@@ -10302,7 +10345,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "collateral_token_program",
@@ -10578,7 +10621,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "collateral_token_program",
@@ -11318,6 +11361,14 @@ var clob_exchange_default = {
             ],
             type: "u8"
           },
+          {
+            name: "admin",
+            docs: [
+              "Admin pubkey \u2014 only this address can call reinitialize_vault.",
+              "Set at initialize_vault time. If Pubkey::default(), first caller sets it (bootstrap)."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             docs: [
@@ -11326,7 +11377,7 @@ var clob_exchange_default = {
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -11475,12 +11526,20 @@ var clob_exchange_default = {
             name: "bump",
             type: "u8"
           },
+          {
+            name: "authorized_resolver",
+            docs: [
+              "QuestionMarket config PDA authorized to call set_payout.",
+              "Uses first 32 bytes of old _reserved \u2014 existing accounts read as Pubkey::default()."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -11686,7 +11745,7 @@ var clob_exchange_default = {
 
 // src/idls/fee_management.json
 var fee_management_default = {
-  address: "DuYyXguB5PVSKg6E2p4XPrrXZSCJnuBhoGpkGCBN5bBb",
+  address: "8S6hxqbDc8kgHf4uUzq2t15PeY36QSCYEpBVvM4Fhrkm",
   metadata: {
     name: "fee_management",
     version: "0.1.0",
@@ -13156,7 +13215,7 @@ var fee_management_default = {
 
 // src/idls/presale.json
 var presale_default = {
-  address: "2Rnw1VoEtsUMQ7wkvYZjDehqSqRob6uNkeymDfvKrquB",
+  address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C",
   metadata: {
     name: "presale",
     version: "0.1.0",
@@ -14823,7 +14882,7 @@ var presale_default = {
 
 // src/idls/market_oracle.json
 var market_oracle_default = {
-  address: "ADWF4J3nCJ2kWnCtycuem2jhu7amUqJWQG3oa5xF67QJ",
+  address: "Agt6beCbghi4jV9A8v9geRP5dnt2wDkJBVgy9oM33zit",
   metadata: {
     name: "market_oracle",
     version: "0.1.0",
@@ -15524,7 +15583,7 @@ var market_oracle_default = {
 
 // src/idls/admin_contract.json
 var admin_contract_default = {
-  address: "4NdD5962SfGqofmeyjfifJpdGnwTAiKaUKB5Z42UDc9T",
+  address: "2HsyCdr59W5ndeboaE9JAmhEQ46m5Gm2ZWBfYEs1tC1i",
   metadata: {
     name: "admin_contract",
     version: "0.1.0",
@@ -16375,11 +16434,29 @@ var admin_contract_default = {
   accounts: [
     {
       name: "AdminConfig",
-      discriminator: [156, 10, 79, 161, 71, 9, 62, 77]
+      discriminator: [
+        156,
+        10,
+        79,
+        161,
+        71,
+        9,
+        62,
+        77
+      ]
     },
     {
       name: "ClaimRecord",
-      discriminator: [57, 229, 0, 9, 65, 62, 96, 7]
+      discriminator: [
+        57,
+        229,
+        0,
+        9,
+        65,
+        62,
+        96,
+        7
+      ]
     }
   ],
   types: [
@@ -16470,9 +16547,9 @@ var admin_contract_default = {
 
 // src/idls/referral.json
 var referral_default = {
-  address: "7b5ohWDqrQ2KRcDJMWwj1dwgRkt5ZJdMavSmrXn9oBgL",
+  address: "9kyNMtUEFR6hDeZHUTbRKH3t1EJisfSvWQKKUev7ujoC",
   metadata: {
-    name: "referral",
+    name: "referral_v2",
     version: "0.1.0",
     spec: "0.1.0",
     description: "Referral program for XMarket \u2014 whitelist-gated batch USDS distribution"
@@ -16961,9 +17038,9 @@ var referral_default = {
 
 // src/idls/dispute.json
 var dispute_default = {
-  address: "4toSDWDCcx37R6HZ78P71nDp3NNoJvcmQpzP4sfivVvL",
+  address: "8gqHPY1WtGFGmYNbrGrPVoct1kqPL6cCaUtJ17EHSsFp",
   metadata: {
-    name: "dispute",
+    name: "dispute_v2",
     version: "0.1.0",
     spec: "0.1.0",
     description: "Dispute program for XMarket \u2014 raise/resolve/claim disputes on prediction markets"