@jpool/bond-sdk 0.9.0-next.20 → 0.9.0-next.22

package/dist/index.mjs

@@ -4984,9 +4984,6 @@ var jbond_default = {
         210
       ],
       accounts: [
-        {
-          name: "global_state"
-        },
         {
           name: "bond_state",
           writable: true,
@@ -5021,10 +5018,7 @@ var jbond_default = {
         {
           name: "authority",
           writable: true,
-          signer: true,
-          relations: [
-            "global_state"
-          ]
+          signer: true
         },
         {
           name: "reserve"
@@ -5573,6 +5567,80 @@ var jbond_default = {
       ],
       args: []
     },
+    {
+      name: "migrate_bond",
+      docs: [
+        "Migrates validator bond data from legacy structure to new structure."
+      ],
+      discriminator: [
+        107,
+        119,
+        59,
+        110,
+        76,
+        18,
+        37,
+        163
+      ],
+      accounts: [
+        {
+          name: "bond_state",
+          writable: true
+        },
+        {
+          name: "legacy_validator_bond",
+          writable: true
+        },
+        {
+          name: "legacy_vote_account"
+        },
+        {
+          name: "validator_bond",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  118,
+                  97,
+                  108,
+                  105,
+                  100,
+                  97,
+                  116,
+                  111,
+                  114,
+                  95,
+                  98,
+                  111,
+                  110,
+                  100
+                ]
+              },
+              {
+                kind: "account",
+                path: "bond_state"
+              },
+              {
+                kind: "account",
+                path: "legacy_vote_account"
+              }
+            ]
+          }
+        },
+        {
+          name: "creator",
+          writable: true,
+          signer: true
+        },
+        {
+          name: "system_program",
+          address: "11111111111111111111111111111111"
+        }
+      ],
+      args: []
+    },
     {
       name: "session_finish",
       docs: [
@@ -6584,10 +6652,8 @@ var JBondClient = class _JBondClient {
    * Build initialize instruction
    */
   async buildBondInitializeIx(props) {
-    const [globalState] = this.pda.globalState();
     const [bondState] = this.pda.bondState(props.bondType, props.name);
     const accounts = {
-      globalState,
       bondState,
       authority: props.authority ?? this.program.provider.wallet?.publicKey,
       reserve: props.reserve,
@@ -6632,7 +6698,7 @@ var JBondClient = class _JBondClient {
     if (!creator) {
       throw new Error("Missing creator");
     }
-    const collateralType = (await this.getBondState(bondType, name)).bond_state.collateralType;
+    const collateralType = (await this.getBondState(bondType, name)).bondState.collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6675,7 +6741,7 @@ var JBondClient = class _JBondClient {
         creator: props.payer
       }));
     }
-    const collateralType = (await this.getBondState(bondType, name)).bond_state.collateralType;
+    const collateralType = (await this.getBondState(bondType, name)).bondState.collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6712,7 +6778,7 @@ var JBondClient = class _JBondClient {
     if (!payer || !destination) {
       throw new Error("Missing payer/destination");
     }
-    const collateralType = (await this.getBondState(bondType, name)).bond_state.collateralType;
+    const collateralType = (await this.getBondState(bondType, name)).bondState.collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6740,12 +6806,12 @@ var JBondClient = class _JBondClient {
     const { bondType, name } = props;
     const [bondState] = this.pda.bondState(bondType, name);
     const [validatorBond] = this.pda.validatorBond(bondType, name, props.voteAccount);
-    const reserve = props.reserve ?? (await this.getBondState(bondType, name)).bond_state.reserve;
+    const reserve = props.reserve ?? (await this.getBondState(bondType, name)).bondState.reserve;
     const authority = props.authority ?? this.program.provider.wallet?.publicKey;
     if (!reserve) {
       throw new Error("Reserve not set");
     }
-    const collateralType = (await this.getBondState(bondType, name)).bond_state.collateralType;
+    const collateralType = (await this.getBondState(bondType, name)).bondState.collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6787,6 +6853,28 @@ var JBondClient = class _JBondClient {
       authority: this.program.provider.wallet?.publicKey
     }).instruction();
   }
+  async migrateBond(props) {
+    const ix = await this.buildBondMigrateIx(props);
+    return this.provider.sendAndConfirm?.(new Transaction().add(ix));
+  }
+  async buildBondMigrateIx(props) {
+    const [bondState] = this.pda.bondState(props.bondType, props.name);
+    const [legacyValidatorBond] = PublicKey.findProgramAddressSync(
+      [
+        Buffer.from("validator_bond"),
+        new PublicKey(props.voteAccount).toBuffer()
+      ],
+      this.programId
+    );
+    const [validatorBond] = this.pda.validatorBond(props.bondType, props.name, props.voteAccount);
+    return this.program.methods.migrateBond().accountsPartial({
+      bondState,
+      legacyValidatorBond,
+      legacyVoteAccount: new PublicKey(props.voteAccount),
+      validatorBond,
+      creator: this.program.provider.wallet?.publicKey
+    }).instruction();
+  }
   async buildBondStartIx(props) {
     const [bondState] = this.pda.bondState(props.bondType, props.name);
     return this.program.methods.sessionStart(new import_bn2.BN(props.duration_secs)).accountsPartial({
@@ -6810,8 +6898,8 @@ var JBondClient = class _JBondClient {
   async getBondState(bondType, bondName, withStats = false) {
     const bondState = await this.program.account.bondState.fetch(this.pda.bondState(bondType, bondName)[0]);
     return {
-      bond_state: bondState,
-      state_stats: withStats ? await this.getBondStateStats(bondState) : null
+      bondState,
+      stateStats: withStats ? await this.getBondStateStats(bondState) : null
     };
   }
   /**
@@ -6883,7 +6971,7 @@ var JBondClient = class _JBondClient {
    */
   async getBondCollateralType(bondType, bondName) {
     const bondState = await this.getBondState(bondType, bondName);
-    return bondState.bond_state.collateralType;
+    return bondState.bondState.collateralType;
   }
   /**
    * Get validator bond account balance (in SOL)
@@ -6895,7 +6983,7 @@ var JBondClient = class _JBondClient {
   async getValidatorBondBalance(bondType, bondName, vote) {
     const [address] = this.pda.validatorBond(bondType, bondName, new PublicKey(vote));
     const bondStateData = await this.getBondState(bondType, bondName);
-    const bondStateCollateralType = bondStateData.bond_state.collateralType;
+    const bondStateCollateralType = bondStateData.bondState.collateralType;
     return await matchVariant(bondStateCollateralType, {
       native: async () => {
         const accountInfo = await this.connection.getAccountInfo(address).catch(() => null);
@@ -6922,7 +7010,7 @@ var JBondClient = class _JBondClient {
    */
   async getBondStateTotalCollected(bondType, bondName, votes) {
     const bondStateData = await this.getBondState(bondType, bondName);
-    const bondStateCollateralType = bondStateData.bond_state.collateralType;
+    const bondStateCollateralType = bondStateData.bondState.collateralType;
     const chunk = (arr, n = 100) => {
       const res = [];
       for (let i = 0; i < arr.length; i += n) {