fix: merge conflict

Author: web3rover

CHANGELOG.md

@@ -1,3 +1,23 @@
+## [2.15.0-dev.2](https://github.com/VenusProtocol/oracle/compare/v2.15.0-dev.1...v2.15.0-dev.2) (2025-10-20)
+
+
+### Bug Fixes
+
+* enable sourcify ([3b3bc87](https://github.com/VenusProtocol/oracle/commit/3b3bc87c49d9c0024df4347fb77e9ca6fef5320f))
+* fixed etherscan verification ([757fd98](https://github.com/VenusProtocol/oracle/commit/757fd986c79425b87c0b61f936427e562f50b086))
+* fixed hardhat config ([f8a4683](https://github.com/VenusProtocol/oracle/commit/f8a4683ac3c5509bd60fdba450e2535212b75072))
+* fixed yarn.lock ([0bc0d7d](https://github.com/VenusProtocol/oracle/commit/0bc0d7d82baeac828e246339f36cb525bf56bd3d))
+* merge conflict ([f462ef3](https://github.com/VenusProtocol/oracle/commit/f462ef34044171dcd1230ca91c472775bf010855))
+* removed etherscan verify ([1961046](https://github.com/VenusProtocol/oracle/commit/1961046f585d35f8b4c70b18d6c5055e85d0676c))
+
+## [2.15.0-dev.1](https://github.com/VenusProtocol/oracle/compare/v2.14.1-dev.1...v2.15.0-dev.1) (2025-10-16)
+
+
+### Features
+
+* finish usdt chainlink oracle deployment script and corresponding deployment ([3756352](https://github.com/VenusProtocol/oracle/commit/37563526172c5c636623d7049849625262b5c947))
+* updating deployment files ([37a2bc6](https://github.com/VenusProtocol/oracle/commit/37a2bc614d178eb0b68fd56d31da3bc4a84fc13c))
+
 ## [2.14.1-dev.1](https://github.com/VenusProtocol/oracle/compare/v2.14.0...v2.14.1-dev.1) (2025-09-29)
 
 

README.md

@@ -104,7 +104,7 @@ $ yarn hardhat export --network <network-name> --export ./deployments/<network-n
 ## Verify Contracts
 
 ```
-npx hardhat etherscan-verify --network <network-name>
+npx hardhat verify --network <network-name> <contract-address> <constructor-arg1> <constructor-arg2>
 ```
 
 ## Hardhat Commands

deploy/25-deploy-usdt-chainlink-oracle.ts

@@ -0,0 +1,51 @@
+import hre from "hardhat";
+import { DeployFunction } from "hardhat-deploy/dist/types";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+
+import { ADDRESSES, SEQUENCER } from "../helpers/deploymentConfig";
+
+const func: DeployFunction = async function ({ getNamedAccounts, deployments, network }: HardhatRuntimeEnvironment) {
+  const { deploy } = deployments;
+  const { deployer } = await getNamedAccounts();
+  const proxyOwnerAddress = network.live ? ADDRESSES[network.name].timelock : deployer;
+  const defaultProxyAdmin = await hre.artifacts.readArtifact(
+    "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
+  );
+
+  const sequencer = SEQUENCER[network.name];
+  let contractName = "ChainlinkOracle";
+  if (sequencer !== undefined) contractName = "SequencerChainlinkOracle";
+
+  await deploy("USDTChainlinkOracle", {
+    contract: network.live ? contractName : "MockChainlinkOracle",
+    from: deployer,
+    log: true,
+    deterministicDeployment: false,
+    skipIfAlreadyDeployed: true,
+    args: sequencer ? [sequencer] : [],
+    proxy: {
+      owner: proxyOwnerAddress,
+      proxyContract: "OptimizedTransparentUpgradeableProxy",
+      execute: {
+        methodName: "initialize",
+        args: network.live ? [ADDRESSES[network.name].acm] : [],
+      },
+      viaAdminContract: {
+        name: "DefaultProxyAdmin",
+        artifact: defaultProxyAdmin,
+      },
+    },
+  });
+
+  const usdtChainlinkOracle = await hre.ethers.getContract("USDTChainlinkOracle");
+  const usdtChainlinkOracleOwner = await usdtChainlinkOracle.owner();
+
+  if (usdtChainlinkOracleOwner === deployer && network.live) {
+    await usdtChainlinkOracle.transferOwnership(proxyOwnerAddress);
+    console.log(`Ownership of ChainlinkOracle transfered from deployer to Timelock (${proxyOwnerAddress})`);
+  }
+};
+
+func.tags = ["deploy-usdt-chainlink-oracle"];
+func.skip = async env => !env.network.live;
+export default func;