fix: stargate & statistics

js-runtime/src/script/layerzero/stargate/crossStargate.js

@@ -51,19 +51,6 @@ router.post("/", async (req, res) => {
     let rt_addr = networks[params.source_chain].router_address;
     let rt_eth_addr = networks[params.source_chain].router_eth_address;
     let net_work = networks[params.source_chain].network;
-    // if (params.distChain === "eth") {
-    //     distChainId = ethChainId;
-    //     wrap_addr = wrapperEth;
-    //     rt_addr = routerAddress;
-    //     rt_eth_addr = routerEthAddress;
-    //     net_work = network;
-    // } else if (params.distChain === "arb") {
-    //     distChainId = arbChainId;
-    //     wrap_addr = wrapperArbEthAddress;
-    //     rt_addr = routerArbAddress;
-    //     rt_eth_addr = routerArbEthAddress;
-    //     net_work = arbNetwork;
-    // }
     const provider = ethers.getDefaultProvider(net_work);
     const signer = new ethers.Wallet(wallet.privateKey, provider);
     // const router = new Contract(rt_addr, RouterAbi, signer);

js-runtime/src/script/zksync2/mute/swapUsdcForEth.js

@@ -62,10 +62,6 @@ router.post("/", async (req, res) => {
     } else {
         throw new Error("approve error");
     }
-
-    // } else {
-    //     result = await sendSwapTx(amountNumber, routerContract, signer, provider, wallet, 0);
-    // }
     res.send(result);
 })
 

src/main/java/com/ichaoj/ams/controller/StatisticsController.java

@@ -109,6 +109,7 @@ public class StatisticsController {
     @Operation(summary = "统计任务进度")
     @AuthResource
     public PublicResult<List<TaskProgressResponse>> countTaskProgress() {
+        String userId = SuperWhaleContext.getContext(PublicUserInfo.class).getUserId();
         List<TaskProgressResponse> responseList = new ArrayList<>();
         List<AmsAirdropTask> list = taskService.list();
         for (AmsAirdropTask task : list) {
@@ -119,6 +120,7 @@ public class StatisticsController {
                     new LambdaQueryWrapper<AmsExecuteRecord>()
                             .eq(AmsExecuteRecord::getTaskId, task.getAmsTaskId())
                             .eq(AmsExecuteRecord::getExecuteStatus, 1)
+                            .eq(AmsExecuteRecord::getUserId, userId)
             );
             response.setFinishCount((int) count);
             response.setTaskName(task.getTaskName());

src/main/java/com/ichaoj/ams/script/layerzero/cross/LayerZeroCrossScript.java

@@ -11,13 +11,14 @@ import com.ichaoj.ams.script.annotation.ScriptType;
  */
 @Script(name = "layer0-cross",
         type = ScriptType.Js,
+
         params = {
                 @ScriptParam(name = "amountMin", note = "最小金额"),
                 @ScriptParam(name = "amountMax", note = "最大金额"),
                 @ScriptParam(name = "accuracy", note = "精度"),
                 @ScriptParam(name = "crossGas", note = "跨链Gas"),
-                @ScriptParam(name = "dist_chain", note = "目标链"),
-                @ScriptParam(name = "source_chain", note = "源链")
+                @ScriptParam(name = "dist_chain", note = "目标链(arb/opt/eth)"),
+                @ScriptParam(name = "source_chain", note = "源链(arb/opt/eth)")
         }
 )
 public class LayerZeroCrossScript extends JsScript {

src/test/java/com/ichaoj/ams/layerzero/LayerZeroTest.java

@@ -16,12 +16,12 @@ public class LayerZeroTest {
     void cross() {
         JsScript script = new LayerZeroCrossScript();
         HashMap<String, AirdropParam> params = new HashMap<>();
-        params.put("minAmount", new AirdropParam("minAmount", null, "0.0101"));
-        params.put("maxAmount", new AirdropParam("maxAmount", null, "0.0102"));
+        params.put("minAmount", new AirdropParam("minAmount", null, "0.0001"));
+        params.put("maxAmount", new AirdropParam("maxAmount", null, "0.0002"));
         params.put("accuracy", new AirdropParam("accuracy", null, "5"));
-        params.put("source_chain", new AirdropParam("source_chain", null, "eth"));
+        params.put("source_chain", new AirdropParam("source_chain", null, "opt"));
         params.put("dist_chain", new AirdropParam("dist_chain", null, "arb"));
-        params.put("crossGas", new AirdropParam("crossGas", null, "0.0008"));
+        params.put("crossGas", new AirdropParam("crossGas", null, "0.0006"));
         AirdropWallet airdropWallet = new AirdropWallet();
         airdropWallet.setAddress("0x368715F09C1AB5E0B55bF5bA19cD887189A28DBE");
         airdropWallet.setPrivateKey("f9eac039449802f20cf0a38bc0b6f4064508fa61897d9c4fcb6cb66bd1311674");