1

src/BaseClient.ts

@@ -292,7 +292,7 @@ export abstract class BaseClient {
   async getGasAmount() {
     // const balances = await this.axiosBalance()
     // const balances = await this.axiosBalance()
-    const balances = (await this.tucana.bank.balance(this.key.accAddress))[0]
+    const balances = (await this.lcd.bank.balance(this.key.accAddress))[0]
 
     try {
       const usdc = balances.filter(

src/InitiaClient.ts

@@ -929,4 +929,11 @@ export class InitiaClient extends InitiaTask {
 
     // const res = await this.newBridge2BlackWings()
   }
+
+  async week6task2() {
+    const tucBalance = await this.tucana.bank.balanceByDenom(
+      this.key.accAddress,
+      'utuc',
+    )
+  }
 }

src/JennieModule.ts

@@ -18,21 +18,45 @@ export abstract class JennieModule extends BaseClient {
     return viewResult
   }
   async drawFood() {
+    await this.claimableXp()
+
     const xp = await this.getXpAmount()
-    if (Number(xp) < 200) {
-      await this.claimableXp()
+    if (Number(xp) < 700 && Number(xp) > 200) {
+      const msg = new MsgExecute(
+        this.key.accAddress,
+        '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
+        'jennie',
+        'draw_food',
+        [],
+        ['AQ=='],
+      )
+
+      return await this.broadcast(msg)
+    } else if (Number(xp) >= 700 && Number(xp) < 1200) {
+      const msg = new MsgExecute(
+        this.key.accAddress,
+        '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
+        'jennie',
+        'draw_food',
+        [],
+        ['Ag=='],
+      )
+
+      return await this.broadcast(msg)
+    } else if (Number(xp) >= 1200) {
+      const msg = new MsgExecute(
+        this.key.accAddress,
+        '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
+        'jennie',
+        'draw_food',
+        [],
+        ['Aw=='],
+      )
+
+      return await this.broadcast(msg)
+    } else {
       return `done`
     }
-    const msg = new MsgExecute(
-      this.key.accAddress,
-      '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
-      'jennie',
-      'draw_food',
-      [],
-      ['AQ=='],
-    )
-
-    return await this.broadcast(msg)
   }
 
   async feedJennie() {
@@ -75,34 +99,34 @@ export abstract class JennieModule extends BaseClient {
     )
     const store = JSON.parse(rep.data.resource.move_resource)
     const data = store.data
-    if (Number(data.tier1) > 0) {
+    if (Number(data.tier2) > 0) {
       const msg = new MsgExecute(
         this.key.accAddress,
         '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
         'jennie',
         'feed_jennie',
         [],
-        ['AQ=='],
+        [bcs.u8().serialize(2).toBase64()],
       )
       return await this.broadcast(msg)
-    } else if (Number(data.tier2) > 0) {
+    } else if (Number(data.tier3) > 0) {
       const msg = new MsgExecute(
         this.key.accAddress,
         '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
         'jennie',
         'feed_jennie',
         [],
-        [bcs.u8().serialize(2).toBase64()],
+        [bcs.u8().serialize(3).toBase64()],
       )
       return await this.broadcast(msg)
-    } else if (Number(data.tier3) > 0) {
+    } else if (Number(data.tier1) > 0) {
       const msg = new MsgExecute(
         this.key.accAddress,
         '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
         'jennie',
         'feed_jennie',
         [],
-        [bcs.u8().serialize(3).toBase64()],
+        [bcs.u8().serialize(1).toBase64()],
       )
       return await this.broadcast(msg)
     } else {
@@ -232,34 +256,39 @@ export abstract class JennieModule extends BaseClient {
     )
 
     if (data.data.claimable_list.length > 0) {
-      const proofs = data.data.claimable_list[0].merkle_proofs
-      const proofsu8vec = proofs.map(p =>
-        Uint8Array.from(Buffer.from(p, 'base64')),
-      )
-      const sd = bcs
-        .vector(bcs.vector(bcs.u8()))
-        .serialize(proofsu8vec)
-        .toBase64()
-      const msg = new MsgExecute(
-        this.key.accAddress,
-        '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
-        'initia_xp',
-        'claim_point',
-        [],
-        [
-          bcs.u64().serialize(data.data.claimable_list[0].stage).toBase64(),
-          sd,
-          bcs
-            .u64()
-            .serialize(data.data.claimable_list[0].task_point)
-            .toBase64(),
-          bcs
-            .u64()
-            .serialize(data.data.claimable_list[0].referral_point)
-            .toBase64(),
-        ],
-      )
-      return await this.broadcast(msg)
+      const msgs = []
+      for (let i = 0; i < data.data.claimable_list.length; i++) {
+        const proofs = data.data.claimable_list[i].merkle_proofs
+        const proofsu8vec = proofs.map(p =>
+          Uint8Array.from(Buffer.from(p, 'base64')),
+        )
+        const sd = bcs
+          .vector(bcs.vector(bcs.u8()))
+          .serialize(proofsu8vec)
+          .toBase64()
+        const msg = new MsgExecute(
+          this.key.accAddress,
+          '0x9065fda28f52bb14ade545411f02e8e07a9cb4ba',
+          'initia_xp',
+          'claim_point',
+          [],
+          [
+            bcs.u64().serialize(data.data.claimable_list[0].stage).toBase64(),
+            sd,
+            bcs
+              .u64()
+              .serialize(data.data.claimable_list[0].task_point)
+              .toBase64(),
+            bcs
+              .u64()
+              .serialize(data.data.claimable_list[0].referral_point)
+              .toBase64(),
+          ],
+        )
+        msgs.push(msg)
+      }
+
+      return await this.broadcast(msgs)
       // console.log(broadcast.raw_log)
       // console.log(this.key.accAddress)
     } else {

src/onchain/finalTask.ts

@@ -23,15 +23,15 @@ async function startCheck(concurrency) {
         account.address,
         `move/944f8dd8dc49f96c25fea9849f16436dcfa6d564eec802f3ef7f8b3ea85368ff`,
       )
-      if (Number(gasGot.amount) < 3000000) {
-        // await DBClient.instance.account.update({
-        //   where: { id: account.id },
-        //   data: { status: -5 },
-        //   //可能领过还没到账的
-        // })
-        console.log(`balance not enough`)
-        return
-      }
+      // if (Number(gasGot.amount) < 300000) {
+      //   // await DBClient.instance.account.update({
+      //   //   where: { id: account.id },
+      //   //   data: { status: -5 },
+      //   //   //可能领过还没到账的
+      //   // })
+      //   console.log(`${account.address}:balance not enough,${gasGot.amount}`)
+      //   return
+      // }
       // if (!gasGot) {
       //   console.log(`gas got:`, gasGot)
       //   await DBClient.instance.account.update({

src/onchain/week3/randomWeek3.ts

@@ -31,13 +31,13 @@ async function startCheck(concurrency) {
         notDone.push(3)
       }
       if (account.task4 === 0) {
-        notDone.push(4)
+        // notDone.push(4)
       }
       if (account.task5 === 0) {
-        notDone.push(5)
+        // notDone.push(5)
       }
       if (account.task6 === 0) {
-        notDone.push(6)
+        // notDone.push(6)
       }
 
       console.log(