对接V3成功

test/CalcTest.ts

@@ -3,7 +3,7 @@ import fee from "../config/fee";
 import contracts from "../config/contracts";
 
 describe('Calc test', () => {
-  let inAmount = 1e17.toString()
+  let inAmount = 1e15.toString()
 
   it('Univ3 calc test', async () => {
     const CALC_ABI = require('../artifacts/contracts/Calc.sol/Calc.json').abi
@@ -12,14 +12,4 @@ describe('Calc test', () => {
 
     await calc.methods.getQuoteHandleFee(contracts.WETH, inAmount, contracts.USDT, fee._30_per_10000).call().then(console.log)
   })
-
-  it('Quoter calc test', async () => {
-    const QUOTER_ABI = require('../abi/QUOTER_ABI.json')
-
-    let quoter = new web3.eth.Contract(QUOTER_ABI, contracts.QUOTER)
-
-    await quoter.methods
-        .quoteExactInputSingle(contracts.WETH, contracts.USDT, fee._30_per_10000, inAmount, 0)
-        .call().then(console.log)
-  })
 })

test/Univ3Test.ts

@@ -4,8 +4,10 @@ import deployer from "../.secret";
 import fee from "../config/fee";
 
 describe('Uniswap v3 test', () => {
+    let inAmount = 1e15.toString()
+
     it('Univ3 swap test', async () => {
-        const UNIV3_ABI = require('../abi/UNIV3_ABI.json')
+        const UNIV3_ABI = require('../abi/UNIV3_ROUTER_ABI.json')
 
         let univ3_contract = new web3.eth.Contract(UNIV3_ABI, contracts.UNIV3)
 
@@ -16,7 +18,7 @@ describe('Uniswap v3 test', () => {
             gasLimit: 1_000_000
         }
 
-        let amountIn = 1_000_000
+        let amountIn = inAmount
         let amountOutMin = 1
         let path = [contracts.WETH, contracts.HEX]
         let to = deployer.address
@@ -27,7 +29,7 @@ describe('Uniswap v3 test', () => {
     })
 
     it('Univ3 `exactInput` test', async () => {
-        const UNIV3_ABI = require('../abi/UNIV3_ABI.json')
+        const UNIV3_ABI = require('../abi/UNIV3_ROUTER_ABI.json')
 
         let univ3_contract = new web3.eth.Contract(UNIV3_ABI, contracts.UNIV3)
 
@@ -38,7 +40,6 @@ describe('Uniswap v3 test', () => {
             gasLimit: 1e6
         }
 
-        let amountIn = 1e17.toString()
         let amountOutMin = 1
         let deadline = parseInt(String(new Date().getTime() / 1e3)) + 60
         let path = [contracts.WETH, fee._30_per_10000, contracts.USDT]
@@ -48,7 +49,7 @@ describe('Uniswap v3 test', () => {
             path: ethers.utils.solidityPack(['address', 'uint24', 'address'], path),
             recipient: to,
             deadline: deadline,
-            amountIn: amountIn,
+            amountIn: inAmount,
             amountOutMinimum: amountOutMin
         }
 
@@ -56,4 +57,14 @@ describe('Uniswap v3 test', () => {
             .exactInput(params)
             .send(rawTx).then(console.log)
     })
+
+    it('Quoter calc test', async () => {
+        const QUOTER_ABI = require('../abi/QUOTER_ABI.json')
+
+        let quoter = new web3.eth.Contract(QUOTER_ABI, contracts.QUOTER)
+
+        await quoter.methods
+            .quoteExactInputSingle(contracts.WETH, contracts.USDT, fee._30_per_10000, inAmount, 0)
+            .call().then(console.log)
+    })
 })