From 93fa04cbe7ae9d3c79f284e01a8515b4c68f797e Mon Sep 17 00:00:00 2001
From: "xuesong.zhang" <xuesong.zhang@okg.com>
Date: Tue, 24 Dec 2024 17:07:58 +0800
Subject: [PATCH] optimize script codes

---
 hardhat.config.js          |  2 +-
 scripts/18_change_owner.js | 50 ++++++++++++++++++--------------------
 scripts/deploy_dex_imp.js  |  1 -
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/hardhat.config.js b/hardhat.config.js
index 13fc254..bcd697a 100644
--- a/hardhat.config.js
+++ b/hardhat.config.js
@@ -129,7 +129,7 @@ module.exports = {
       },
     },
     eth: {
-      url: ALCHEMY_KEY == '' ? "https://eth.llamarpc.com" : `https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}`,
+      url: ALCHEMY_KEY == '' ? "https://rpc.ankr.com/eth" : `https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}`,
       accounts: [`${PRIVATE_KEY}`],
       settings: {
         optimizer: {
diff --git a/scripts/18_change_owner.js b/scripts/18_change_owner.js
index beb940d..a959b35 100644
--- a/scripts/18_change_owner.js
+++ b/scripts/18_change_owner.js
@@ -5,44 +5,42 @@ const { upgrades } = require('hardhat');
 async function main() {
   console.log("##CHANGE OWNER BEGIN");
 
-  const newOwner = "0xE1C7Db7575BABF0d3369835678ec9b7F15c0886B"; //资管账号
-  //const oldAdmin = "0xc82Ea2afE1Fd1D61C4A12f5CeB3D7000f564F5C6"; //旧admin
-  const newAdmin = "0x06C95a3934d94d5ae5bf54731bD2840ceFee6F87"; //新admin
-  const newLogicContract = "0xb5eA4cD719D4C73e062D6195b17f703792543904"; //flare new logic
+  const newOwner = "0xE1C7Db7575BABF0d3369835678ec9b7F15c0886B";         // 资管账号
+  const newAdmin = "0x06C95a3934d94d5ae5bf54731bD2840ceFee6F87";         // 新admin
+  const newLogicContract = "0x1BDB7aB4C359769fDFE83d8813d61942f9DE8f01"; // flare new logic
 
   // ProxyAdmin
-  //ETHW: 0x91597356448f771363Ae3C3d7B87C8D6f2f63B25
-  //Fantom: 0x5703B683c7F928b721CA95Da988d73a3299d4757
-  //Cronos: 0x5703B683c7F928b721CA95Da988d73a3299d4757
-  //Flare: 0x2c34A2Fb1d0b4f55de51E1d0bDEfaDDce6b7cDD6
+  // ETHW: 0x91597356448f771363Ae3C3d7B87C8D6f2f63B25
+  // Fantom: 0x5703B683c7F928b721CA95Da988d73a3299d4757
+  // Cronos: 0x5703B683c7F928b721CA95Da988d73a3299d4757
+  // Flare: 0x2c34A2Fb1d0b4f55de51E1d0bDEfaDDce6b7cDD6
 
   const dexRouter = await ethers.getContractAt(
     "DexRouter",
-    deployed.base.dexRouter
+    newLogicContract
   );
-  console.log("dexRouter:", deployed.base.dexRouter);
+  // console.log("dexRouter:", deployed.base.dexRouter);
   console.log("dexRouter.owner:", await dexRouter.owner());
-  console.log("dexRouter.tmpAdmin:", await dexRouter.tmpAdmin());
   console.log("dexRouter.admin:", await dexRouter.admin());
-  console.log("\n");
+  // console.log("\n");
 
-  const instance = await upgrades.admin.getInstance();
-  const proxyAdminAddress = await instance.getProxyAdmin(deployed.base.dexRouter);
-  console.log("proxyAdmin:", proxyAdminAddress);
+  // const instance = await upgrades.admin.getInstance();
+  // const proxyAdminAddress = await instance.getProxyAdmin(deployed.base.dexRouter);
+  // console.log("proxyAdmin:", proxyAdminAddress);
 
-  proxyAdmin = await ethers.getContractAt(
-    "ProxyAdmin",
-    proxyAdminAddress
-  );
-
-  console.log("proxyAdmin.owner:", await proxyAdmin.owner());
-  console.log("proxyAdmin.logicContract:", await proxyAdmin.getProxyImplementation(deployed.base.dexRouter));
-  console.log("owner nonce:", await ethers.provider.getTransactionCount(newAdmin));
+  // proxyAdmin = await ethers.getContractAt(
+  //   "ProxyAdmin",
+  //   proxyAdminAddress
+  // );
 
+  // console.log("proxyAdmin.owner:", await proxyAdmin.owner());
+  // console.log("proxyAdmin.logicContract:", await proxyAdmin.getProxyImplementation(deployed.base.dexRouter));
+  // console.log("owner nonce:", await ethers.provider.getTransactionCount(newAdmin));
 
-  //转移owner
-  //await dexRouter.transferOwnership(newAdmin);
-  //await proxyAdmin.transferOwnership(newAdmin);
+  // 转移 owner
+  await dexRouter.setProtocolAdmin(newOwner);
+  await dexRouter.transferOwnership(newOwner);
+  // await proxyAdmin.transferOwnership(newAdmin);
 
   //升级逻辑合约
   //await proxyAdmin.upgrade(deployed.base.dexRouter, newLogicContract);
diff --git a/scripts/deploy_dex_imp.js b/scripts/deploy_dex_imp.js
index 38559d8..042ff31 100644
--- a/scripts/deploy_dex_imp.js
+++ b/scripts/deploy_dex_imp.js
@@ -1,6 +1,5 @@
 const { ethers, upgrades } = require("hardhat");
 const deployed = require('./deployed');
-const { dexRouter } = require("./deployed/eth/base");
 
 async function main() {
     console.log(deployed.base);