h-agent-swap 2.1.8 → 3.0.0

package/src/agent-swap.js

@@ -19,6 +19,20 @@ class AgentSwap extends HI {
         this.lp = lp
     }
 
+    async transfer({ to,amount,contract }) {
+        let tokenItem = new ERC20({ ...this.network,contract })
+        let user = this.web3.eth.defaultAccount
+        let balance = await this.balanceOf({
+            token:contract,
+            address:user
+        })
+        if(parseFloat(balance) < parseFloat(amount)) {
+            return false
+        }
+        let result = await tokenItem.transfer(to,amount)
+        return result
+    }
+
     async estimate({ side = 0,amount = 0, point = 0 , wallet = "" ,usdt = "" }) {
         let usdt_precision = 6
         let tau_precision = 18
@@ -304,22 +318,11 @@ ${JSON.stringify(data,null,2)}`)
 
 
 
-    async updateConfig({ tokenIn,tokenOut,config,tax,usdt = '' }) {
+    async updateConfig({ tokenIn,tokenOut,config }) {
 
         config.feeRate = multiplication(division(config.feeRate,100),this.pointMax)
-        config.reward = multiplication(division(config.reward,100),this.pointMax)
-        config.feeMin = multiplication(division(config.feeMin,100),this.pointMax)
-        config.feeMax = multiplication(division(config.feeMax,100),this.pointMax)
-        config.rewardMin = multiplication(division(config.rewardMin,100),this.pointMax)
-        config.rewardMax = multiplication(division(config.rewardMax,100),this.pointMax)
-        config.range = multiplication(division(config.range,100),this.pointMax)
-        config.feeChange = multiplication(division(config.feeChange,100),this.pointMax)
-        config.rewardChange = multiplication(division(config.rewardChange,100),this.pointMax)
-        tax.tax = multiplication(division(tax.tax,100),this.pointMax)
-        tax.backBuy = multiplication(division(tax.backBuy,100),this.pointMax)
-        
-        let symbol = new HERC20({ ...this.network, contract: usdt ? usdt : tokenOut })
-        config.price = await symbol.toAmount(config.price)
+        config.burnRate = multiplication(division(config.burnRate,100),this.pointMax)
+
 
         let params = [
             tokenIn,
@@ -327,30 +330,83 @@ ${JSON.stringify(data,null,2)}`)
             [
                 config.feeReceipt,
                 config.feeRate,
-                config.rewardToken,
-                config.reward,
-                config.price,
-                config.feeMin,
-                config.feeMax,
-                config.rewardMin,
-                config.rewardMax,
-                config.range,
-                config.feeChange,
-                config.rewardChange
+                config.burnReceipt,
+                config.burnRate,
+                config.onoff
             ],
-            [
-                tax.taxReceipt,
-                tax.tax,
-                tax.backBuy,
-                tax.pricing
-            ]
-
         ]
-        console.log(params)
         let result = await this.manage("updateConfig",params)
         return result
     }
 
+    async sync({ tokenIn,tokenOut }) {
+
+        let params = [
+            tokenIn,
+            tokenOut,
+        ]
+        let result = await this.manage("sync",params)
+        return result
+    }
+
+
+    async updateWhite({ address,onoff }) {
+
+        let params = [
+            address,
+            onoff
+        ]
+        let result = await this.manage("updateWhite",params)
+        return result
+    }
+
+
+    async setMaxAllowedOffset(percent) {
+        percent = multiplication(division(percent,100),this.pointMax)
+        let params = [
+            percent
+        ]
+        let result = await this.manage("setMaxAllowedOffset",params)
+        return result
+    }
+    async getMaxAllowedOffset() {
+        let result = await this.SC.methods.maxAllowedOffset().call()
+     
+        return division(result,this.pointMax)
+    }
+
+    async setMaxSwapRatioBps(percent) {
+        percent = multiplication(division(percent,100),this.pointMax)
+        let params = [
+            percent
+        ]
+        let result = await this.manage("setMaxSwapRatioBps",params)
+        return result
+    }
+    async getMaxSwapRatioBps() {
+        let result = await this.SC.methods.maxSwapRatioBps().call()
+     
+        return division(result,this.pointMax)
+    }
+
+
+
+    async setTwapPeriod(period) {
+ 
+        let params = [
+            period
+        ]
+        let result = await this.manage("setTwapPeriod",params)
+        return result
+    }
+    async getTwapPeriod() {
+        let result = await this.SC.methods.twapPeriod().call()
+     
+        return result
+    }
+
+    
+
 
     async route() {
         if (!this.ROUTER) {
@@ -376,27 +432,10 @@ ${JSON.stringify(data,null,2)}`)
     }
 
 
-    async getConfig({ tokenIn,tokenOut,usdt = '' }) {
-        let result1 = await this.SC.methods.runConfig(tokenIn,tokenOut).call()
-        let result2 = await this.SC.methods.taxConfig(tokenIn,tokenOut).call()
-        let usdtToken = new HERC20({ ...this.network, contract: usdt ? usdt : tokenOut })
-        let result = {
-            ...result1,
-            ...result2
-        }
-        result.feeChange = multiplication(division(result.feeChange,this.pointMax),100)
-        result.rewardChange = multiplication(division(result.rewardChange,this.pointMax),100)
-        result.feeMax = multiplication(division(result.feeMax,this.pointMax),100)
-        result.feeMin = multiplication(division(result.feeMin,this.pointMax),100)
-        result.feeRate = multiplication(division(result.feeRate,this.pointMax),100)
-        result.range = multiplication(division(result.range,this.pointMax),100)
-        result.price = await usdtToken.fromAmount(result.price)
-        result.reward = multiplication(division(result.reward,this.pointMax),100)
-
-        result.rewardMax = multiplication(division(result.rewardMax,this.pointMax),100)
-        result.rewardMin = multiplication(division(result.rewardMin,this.pointMax),100)
-        result.tax = multiplication(division(result.tax,this.pointMax),100)
-        result.backBuy = multiplication(division(result.backBuy,this.pointMax),100)
+    async getConfig({ tokenIn,tokenOut }) {
+        let result = await this.SC.methods.runConfig(tokenIn,tokenOut).call()
+
+
         return result
     }
 
@@ -505,8 +544,29 @@ ${JSON.stringify(data,null,2)}`)
     
 
     async tradeConfig({ amount,path,side = 0,point = 1000, target = "" }) {
+        if(path.length != 2) {
+            throw "仅支持单一交易对计算"
+        }
+        if(side != 0) {
+            throw "仅支持固定输入计算"
+        }
         let inToken = path[0]
         let outToken = path[path.length - 1]
+
+        let config = await this.getConfig({ tokenIn:inToken,tokenOut:outToken })
+        if(!config.onoff) {
+            throw "交易对未开启"
+        }
+        // amount 为固定输入金额
+        // 扣除手续费 以及 销毁费用
+        amount = await this.pointOffset({
+            point:plus(config.feeRate,config.burnRate),
+            amount,
+            isplus:false
+        })
+        console.log("扣除费用后金额:",amount)
+
+
         let IToken = new HERC20({ ...this.network, contract: inToken })
         let OToken = new HERC20({ ...this.network, contract: outToken })
         let outAmount;
@@ -516,51 +576,12 @@ ${JSON.stringify(data,null,2)}`)
             inAmount = amount
             outAmount = await this.computeAmount({ amount,path,side,point })
             inputAmount = await IToken.toAmount(amount)
-        } else {
-            inAmount = await this.computeAmount({ amount,path,side,point,format:true })
-            outAmount = await OToken.toAmount(amount)
-            inputAmount = await IToken.toAmount(amount)
+            console.log("预计输出金额:",outAmount)
         }
-        let user = target ? target : this.web3.eth.defaultAccount
-        console.log([inToken,outToken,path,inputAmount,outAmount,user])
-
-        let result;
-        let decimals = await OToken.decimals()
-        try{
-            
-            result = await this.SC.methods.fundRead(inToken,outToken,path,inputAmount,outAmount,user).call()
-            console.log(result)
-            
-            result.feeAmount = toSmall(result.group.feeAmount,decimals)
-            result.outReal = toSmall(result.group.outAmount,decimals)
-            result.taxAmount = toSmall(result.group.taxAmount,decimals)
-            result.backAmount = toSmall(result.group.backAmount,decimals)
-            result.buyAmount = toSmall(result.group.buyAmount,decimals)
-            result.change = toSmall(result.group.change,decimals)
-            result.win = result.group.win
-
-            result.feeRate = division(result.config.feeRate,this.pointMax)
-            result.reward = division(result.config.reward,this.pointMax)
-            result.rewardAmount = multiplication(result.reward,toSmall(outAmount,decimals))
-            result.outAmount = toSmall(outAmount,decimals)
-            result.inAmount = inAmount
-        }catch(err){
-            console.log(err)
-            result = {}
-            result.outAmount = toSmall(outAmount,decimals)
-            result.inAmount = inAmount
-            result.feeAmount = 0
-            result.outReal = 0
-            result.taxAmount = 0
-            result.buyAmount = 0
-            result.change = 0
-            result.win = false
-        }
-        
-        console.log(result)
         
+        let outputAmount = await OToken.fromAmount(outAmount)
         
-        return result
+        return outputAmount
     }
 
     
@@ -652,6 +673,7 @@ ${JSON.stringify(data,null,2)}`)
             ethAmount = inAmount
         }
 
+  
         let amountIn = await IToken.fromAmount(inAmount)
         await IToken.tradeApprove(this.contract,amountIn)
    
@@ -661,7 +683,7 @@ ${JSON.stringify(data,null,2)}`)
         deadline = deadline ? deadline : plus(multiplication(60, 30), now)
 
         let parma_list = [
-            path,inAmount, outAmount,side, deadline,point
+            path,inAmount,side, deadline,point
         ]
         console.log(parma_list)
         let parmas = await this.buildTx("swapToken", parma_list, ethAmount)

package/src/index.js

@@ -3,16 +3,22 @@ let AgentSwap = require("./agent-swap")
 let SwapFactory = require("./swap-factory")
 let SwapRouter = require("./swap-router")
 let SwapLP = require("./swap-pair")
+let Poker = require("./poker")
+let BERC20 = require("./BERC20")
 if (window) {
     window.AgentSwap = AgentSwap
     window.SwapFactory = SwapFactory
     window.SwapRouter = SwapRouter
     window.SwapLP = SwapLP
+    window.Poker = Poker
+    window.BERC20 = BERC20
 }
 
 module.exports = {
     AgentSwap,
     SwapFactory,
     SwapRouter,
-    SwapLP
+    SwapLP,
+    Poker,
+    BERC20
 }

package/src/poker.js

@@ -0,0 +1,31 @@
+let { HI, HERC20, HERC721 } = require("h-token-staking")
+let { abi } = require("./abi/PancakePair.json")
+
+let { plus, reduce, multiplication, division, saveNum, charCompare, longHandle, toSmall } = require("h-token-staking/src/utils")
+
+
+class Poker extends HI {
+    constructor({ provider, account, rpcUrl, privateKey, contract }) {
+        super({ provider, account, rpcUrl, privateKey, contract, abi })
+        this.mainToken = "0x0000000000000000000000000000000000000000"
+        this.maxVal = "999000000000000000000000000000000000000000000000000"
+    }
+
+    async manage(method, param = []) {
+
+        let parmas = await this.buildTx(method, param)
+        let result = parmas && await this.broadTx(parmas)
+        return result
+    }
+
+    async batchShuffleDeck() {
+        let result = await this.manage("batchShuffleDeck", [
+            [4, 9, ["BCN3flPvQG7WwA0QeJf6zQ==", "AyiTbgXKnzBBRL5k3RalkA==", "oNmVY+Hfd+AhCfIbWntkvA==", "LS1ntlTCXaCmNSddhA2UhQ==", "YmgD1T8gdEKPKCy40rAxww==", "K6k0LZ9Ccf9YaD4W1SyrUA==", "aQ+UMN31NIt+CGa5gggxzA==", "eX5FqgHkrdjDnPzr8aNwyQ==", "t3uWwv5pZ6cCNWdZGooCpw==", "gxmozokr7q2CNHRk/3Tn6w==", "0XwEbSmXDQoaumvC1Lxfxg==", "IuuC5ijJJU6YEh/GjGtr5g==", "fw50pD+WozmGqsCM39g3/Q==", "PsS+8aKEvtrKPr48q2Tblw==", "IJ+AJ9pOpRsIC60DPjbs5w==", "f5Q6mNRz+7bWeT4CdCNk8g==", "7AlL0l8qaH2nWAWK5VtLmg==", "d8dmOZvHEgzikh6C7PTGKw==", "izr8d/Ejgdq/SpO2BNrFIQ==", "j8GnE/dF0Zs4Mh8XUP68dg==", "0HnGukrdknUBDc4ZufwuRQ==", "95vYaGn/RHmOygp8ClvWfg==", "G7+iavf+Akm1sHiPQsm0TQ=="]],
+            [5, 9, ["ONczmRH95zmrfXTMtDyIsA==", "TM804gczm1uAcrK2ZVzbHA==", "QnfEXRsRwduSrTAzOgrRUA==", "IH56WOzJ8NRJXP79zUCWIw==", "GWxNo4EwLHc1lpeg5yCnoQ==", "3VcZqi5W47B6wcWsQxxNUQ==", "zE0cMG5ipNKX3bEUjpFsJA==", "SyDKRiDl+Rz5hg0HHE1PCQ==", "dirNT5ChBfPC0oZ8ctgw7A==", "xskDjAwxVOZkAIPMvUW5Zw==", "IgSv0F+ibJ9ErlwetUSv6w==", "pyWQcNmzIJ9UnxP3AhBo4A==", "WmU99woVsPCeOCP34k90gQ==", "Eu5+JU6/ePC7broKWAdJiQ==", "9COwh60lVtLnIEPZQGUuQA==", "yJxEDNvI4YOwsF45aYv9pw==", "iEPUJbpYkubUK6w1iJoQ+A==", "W/ktKxAKmW/rtP6PZCdCgg==", "SNJ7MlIbXg4zRCThzBlQqA==", "q6pnlFj1pw5E8l40gQ0tKw==", "25UjeQsif+UPUN1kweaJQA==", "WSVlQ2S6BhjCtST7EFGSgQ==", "UbNeaEmRW+p4LcLrwYXrFg=="]],
+            [6, 9, ["TTgHdcIPOQujo+F7xWe1Zw==", "uJ1ABPwWhGjrQJlkK+dTFA==", "cvLZwIjGLxGxG5DSSAUETg==", "VGHKdF0Tzcg7VeeLAHZstg==", "9ILIiwQotAnoYzVjv5uP0Q==", "vJb5KNoPn+oXg6t0asn5yw==", "VIfQbLiUBxx3R7ST6Eh5eg==", "gwSr3saCHQlvvgXNHuWgbw==", "HUqm1Mhy37wagPu/5wvsLw==", "lZ4+kbTK4LGqlf/Sy7OWeg==", "9EHrARME1VU32x/ut1cPbQ==", "etW9wU1SM44kwm1TUpt1lQ==", "Ck37jaaJNRicKIdyQE+k9w==", "AeQRDUsdIGZzb4NVeHeZyg==", "AxLm8wmsM64owMIB1u3gYg==", "SpbGHhdf9NX6QRo1plI8nw==", "9Jd+HHMW8DHTacnI84wBkQ==", "F8PG/m+HX+cAlgb9cvDDjQ==", "PwDw83D/pt5wF9x9ChJ6mw==", "kTOv28m/s7spI3A6Rib3rQ==", "ACJ4H18jt/G354z3wP+9Yg==", "hj50cQZQgjs5LHc5juDSXA==", "2GyE9ZOegwM43KT9dMCNtQ=="]]
+        ])
+        return result
+    }
+}
+
+module.exports = Poker

package/src/swap-router.js

@@ -2,6 +2,7 @@ let { HI, HERC20, HERC721 } = require("h-token-staking")
 let { abi, bytecode } = require("./abi/SwapRouter.json")
 let SwapFactory = require("./swap-factory")
 let SwapPair = require("./swap-pair")
+let { plus, reduce, multiplication, division, saveNum, charCompare,longHandle,toSmall } = require("h-token-staking/src/utils")
 class SwapRouter extends HI {
     constructor({ provider, account, rpcUrl, privateKey, contract,factory = "" }) {
         super({ provider, account, rpcUrl, privateKey, contract, abi })
@@ -65,12 +66,29 @@ class SwapRouter extends HI {
     async getTokenAmounts(liquidityId) {
         let user = this.web3.eth.defaultAccount
         let amounts = await this.SC.methods.getTokenAmounts(liquidityId,user).call()
+        let Token0 = new HERC20({ ...this.network, contract: amounts.token0 })
+        let Token1 = new HERC20({ ...this.network, contract: amounts.token1 })
+        amounts.reserve0 = await Token0.fromAmount(amounts.reserve0)
+        amounts.reserve1 = await Token1.fromAmount(amounts.reserve1)
+        amounts.balance0 = await Token0.fromAmount(amounts.balance0)
+        amounts.balance1 = await Token1.fromAmount(amounts.balance1)
+        amounts.totalSupply = toSmall(amounts.totalSupply,18)
+        amounts.balance = toSmall(amounts.balance,18)
+        amounts.liquidity = toSmall(amounts.liquidity,18)
         return amounts
     }
 
     async getTokens({ tokenA,tokenB }) {
         let user = this.web3.eth.defaultAccount
         let amounts = await this.SC.methods.getTokens(tokenA,tokenB,user).call()
+        let Token0 = new HERC20({ ...this.network, contract: amounts.token0 })
+        let Token1 = new HERC20({ ...this.network, contract: amounts.token1 })
+        amounts.reserve0 = await Token0.fromAmount(amounts.reserve0)
+        amounts.reserve1 = await Token1.fromAmount(amounts.reserve1)
+        amounts.balance0 = await Token0.fromAmount(amounts.balance0)
+        amounts.balance1 = await Token1.fromAmount(amounts.balance1)
+        amounts.totalSupply = toSmall(amounts.totalSupply,18)
+        amounts.balance = toSmall(amounts.balance,18)
         return amounts
     }
 
@@ -89,7 +107,18 @@ class SwapRouter extends HI {
         now = parseInt(division(now, 1000))
         let deadline = plus(multiplication(60, 5), now)
 
-        let result = await this.manage("addLiquidity", [
+        /* let result = await this.manage("addLiquidity", [
+            token0,
+            token1,
+            amount0,
+            amount1,
+            1,
+            1,
+            user,
+            deadline
+        ]) */
+
+        let parmas = await this.buildTx("addLiquidity", [
             token0,
             token1,
             amount0,
@@ -99,7 +128,9 @@ class SwapRouter extends HI {
             user,
             deadline
         ])
+        let result = parmas && await this.broadTx(parmas)
         return result
+        // return result
     }
 
     async returnLiquidity({ liquidityId,token0,token1,liquidity,amount0,amount1 }) {
@@ -111,6 +142,7 @@ class SwapRouter extends HI {
 
         amount0 = await Token0.toAmount(amount0)
         amount1 = await Token1.toAmount(amount1)
+        liquidity = longHandle(liquidity,18)
 
         let factory = new SwapFactory({
             ...this.network,
@@ -127,7 +159,17 @@ class SwapRouter extends HI {
         now = parseInt(division(now, 1000))
         let deadline = plus(multiplication(60, 5), now)
 
-        let result = await this.manage("returnLiquidity", [
+        /* let result = await this.manage("returnLiquidity", [
+            liquidityId,
+            token0,
+            token1,
+            liquidity,
+            amount0,
+            amount1,
+            user,
+            deadline
+        ]) */
+        let parmas = await this.buildTx("returnLiquidity", [
             liquidityId,
             token0,
             token1,
@@ -137,6 +179,7 @@ class SwapRouter extends HI {
             user,
             deadline
         ])
+        let result = parmas && await this.broadTx(parmas)
         return result
     }