Changed Auction logics: previous bidder get his money back when greater bid appears

Author: pivoo81

auction/readme.md

@@ -3,7 +3,7 @@
 This is an auction dApp.
 You can start auction for any token(s) for some period of time (counted in blocks).
 If somebody took part in the auction, then the organizer will get the winners bid, and the winner will get token(s).
-Everyone who particapated, but didn't win - will have ability to get their money back after the auction end.
+Once next bid provided, the previous bid is returned to it's sender
 
 ## Starting auction
 Everybody can start an auction with invokeScript 'startAuction' attaching Tokens to it.
@@ -15,6 +15,6 @@ Before auction finish anybody can bid. The bid is only accepted if it is greater
 If the same address will bid again, his new bid will be added to the previous ones.
 
 #Withdraw
-Calling 'withdraw':
-- if called by the participant who haven't won - returning his bid
-- if called by the winner or organizer - transfering bid of the winner to organizer and token(s) to the winner
+Anyone can call 'withdraw':
+As a result bid of the winner will be transfered to organizer and token(s) to the winner.
+In case noone made bid, organizer will get his token(s) back.

auction/ride/auction.ride

@@ -3,7 +3,6 @@
 {-# SCRIPT_TYPE ACCOUNT #-}
 
 
-
 let maxAuctionDuration = 1440 * 30 
 # ~ 30 days
 
@@ -12,13 +11,13 @@ let maxAuctionDuration = 1440 * 30
 func startAuction(duration: Int, startPrice: Int, priceAssetId:String) = {
 
     let auctionId = toBase58String(i.transactionId)
-    let auctionEndHeight = lastBlock.height + duration
+    let endHeight = lastBlock.height + duration
 
     let pmt = extract(i.payment)
 
     if (duration > maxAuctionDuration) then throw("Duration is too long. Must be less than " + toString(maxAuctionDuration)) else
     WriteSet( 
-            [   DataEntry(auctionId, auctionEndHeight), 
+            [   DataEntry(auctionId, endHeight), 
                 DataEntry(auctionId + "_organizer", i.caller.bytes.toBase58String()), 
                 DataEntry(auctionId + "_lot_assetId", if (isDefined(pmt.assetId)) then toBase58String(value(pmt.assetId)) else "WAVES"),
                 DataEntry(auctionId + "_lot_amount", pmt.amount), 
@@ -34,27 +33,44 @@ func bid(auctionId: String) = {
     let pmtAssetIdStr = if (isDefined(pmt.assetId)) then toBase58String(value(pmt.assetId)) else "WAVES"
     let callerAddressStr = i.caller.bytes.toBase58String()
 
-    let auctionEndHeight = getIntegerValue(this, auctionId)
-    let auctionPriceAssetId = getStringValue(this, auctionId + "_priceAssetId")
-    let auctionWinAmount = getInteger(this, auctionId + "_winAmount")
-
-    let bidderAmount = getInteger(this, auctionId + "_bidder_" + callerAddressStr)
-    let curBidderAmount = if isDefined(bidderAmount) then value(bidderAmount) else 0
+    let endHeight = getIntegerValue(this, auctionId)
+    let startPrice = getIntegerValue(this, auctionId + "_startPrice")
+    let priceAssetId = getStringValue(this, auctionId + "_priceAssetId")
+    let winAmount = getInteger(this, auctionId + "_winAmount")
+    let winner = getString(this, auctionId + "_winner")
 
-    let totalBidAmount = curBidderAmount + pmt.amount
+    let bidFromTheSameUser = isDefined(winner) && value(winner) == callerAddressStr
+    let totalBidAmount = pmt.amount + if bidFromTheSameUser then
+                                         value(winAmount) else 0
 
-    if (lastBlock.height >= auctionEndHeight) then 
+    if (lastBlock.height >= endHeight) then 
         throw("Auction already finished") else
-    if (auctionPriceAssetId != pmtAssetIdStr) then 
-        throw("Bid must be in asset '" + auctionPriceAssetId + "'") else
-    if (isDefined(auctionWinAmount) && totalBidAmount <= value(auctionWinAmount)) then 
-        throw("Bid must be more then " + toString(totalBidAmount)) 
+    if (priceAssetId != pmtAssetIdStr) then 
+        throw("Bid must be in asset '" + priceAssetId + "'") else
+    if (isDefined(winAmount) && totalBidAmount <= value(winAmount) ||
+        !isDefined(winAmount) && totalBidAmount <= startPrice) then 
+        throw("Bid must be more then " 
+           + toString(if isDefined(winAmount) then value(winAmount) else startPrice)) 
     else
-        WriteSet([
-            DataEntry(auctionId + "_bidder_" + callerAddressStr, totalBidAmount),
-            DataEntry(auctionId + "_winner", callerAddressStr),
-            DataEntry(auctionId + "_winAmount", totalBidAmount)
-        ])
+        if (bidFromTheSameUser || !isDefined(winner)) then
+            WriteSet([
+                DataEntry(auctionId + "_winner", callerAddressStr),
+                DataEntry(auctionId + "_winAmount", totalBidAmount)
+            ])
+        else {
+            let previousBidderAddr = addressFromStringValue(value(winner))
+            let priceAsset = if (priceAssetId == "WAVES" || priceAssetId == "") then unit else fromBase58String(priceAssetId)
+            ScriptResult(
+                WriteSet([
+                    DataEntry(auctionId + "_winner", callerAddressStr),
+                    DataEntry(auctionId + "_winAmount", totalBidAmount)
+                ]),
+                TransferSet([
+                    ScriptTransfer(previousBidderAddr, value(winAmount), priceAsset)
+                ])
+            )
+        }
+
 }
 
 
@@ -65,59 +81,42 @@ func withdraw(auctionId: String) = {
     let pmtAssetIdStr = if (isDefined(pmt.assetId)) then toBase58String(value(pmt.assetId)) else "WAVES"
     let callerAddressStr = i.caller.bytes.toBase58String()
 
-    let auctionEndHeight = getIntegerValue(this, auctionId)
-    let auctionOrganizer = getStringValue(this, auctionId + "_organizer")
-    let auctionWinner = getString(this, auctionId + "_winner")
-    let auctionLotAssetId = getStringValue(this, auctionId + "_lot_assetId")
-    let auctionLotAmount = getIntegerValue(this, auctionId + "_lot_amount")
-    let auctionPriceAssetId = getStringValue(this, auctionId + "_priceAssetId")
-    let auctionWinAmount = getIntegerValue(this, auctionId + "_winAmount")
+    let endHeight = getIntegerValue(this, auctionId)
+    let organizer = getStringValue(this, auctionId + "_organizer")
+    let winner = getString(this, auctionId + "_winner")
+    let lotAssetId = getStringValue(this, auctionId + "_lot_assetId")
+    let lotAmount = getIntegerValue(this, auctionId + "_lot_amount")
+    let priceAssetId = getStringValue(this, auctionId + "_priceAssetId")
+    let winAmount = getIntegerValue(this, auctionId + "_winAmount")
 
-    let auctionLotAsset = if (auctionLotAssetId == "WAVES") then unit else fromBase58String(auctionLotAssetId)
-    let auctionPriceAsset = if (auctionPriceAssetId == "WAVES" || auctionPriceAssetId == "") then unit else fromBase58String(auctionPriceAssetId)
-    let auctionWinnerAddr = addressFromStringValue(value(auctionWinner))
-    let auctionOrganizerAddr = addressFromStringValue(value(auctionOrganizer))
+    let lotAsset = if (lotAssetId == "WAVES") then unit else fromBase58String(lotAssetId)
+    let priceAsset = if (priceAssetId == "WAVES" || priceAssetId == "") then unit else fromBase58String(priceAssetId)
+    let winnerAddr = addressFromStringValue(value(winner))
+    let organizerAddr = addressFromStringValue(value(organizer))
 
     let betAmount = getInteger(this, auctionId + "_bidder_" + callerAddressStr)
 
-    if (lastBlock.height < auctionEndHeight) then 
+    if (lastBlock.height < endHeight) then 
         throw("Auction is not finished yet") else
 
-    if (!isDefined(auctionWinner)) then {
-        if (callerAddressStr == auctionOrganizer) then 
-            if (!isDefined(getString(this, auctionId + "_lot_passed"))) then
-                throw("You have already got your lot back")
-            else
-                ScriptResult(
-                    WriteSet([DataEntry(auctionId + "_lot_passed", i.caller.bytes.toBase58String())]),
-                    TransferSet([ScriptTransfer(i.caller, auctionLotAmount, auctionLotAsset)])
-                )
+    if (!isDefined(winner)) then {
+        if (isDefined(getString(this, auctionId + "_lot_passed"))) then
+            throw("Organizer has already got his lot back")
         else
-            throw("You haven't participate in this auction")
+            ScriptResult(
+                WriteSet([DataEntry(auctionId + "_lot_passed", organizer)]),
+                TransferSet([ScriptTransfer(organizerAddr, lotAmount, lotAsset)])
+            )
     }
     else {
-        if (callerAddressStr == auctionOrganizer || callerAddressStr == auctionWinner) then {
-            # Lot -> winner, winner's bet -> organizer
-            if (isDefined(getString(this, auctionId + "_lot_passed"))) then
-                throw("Lot is already passed to the winner, and organizer got his reward")
-            else
-                ScriptResult(
-                    WriteSet([DataEntry(auctionId + "_lot_passed", auctionWinnerAddr.bytes.toBase58String())]),
-                    TransferSet([ScriptTransfer(auctionWinnerAddr, auctionLotAmount, auctionLotAsset),
-                                ScriptTransfer(auctionOrganizerAddr, auctionWinAmount, auctionPriceAsset)])
-                    # We don't mark winner's bid as returned here because it's not neccessary
-                )
-        }
-        else {
-            if (!isDefined(betAmount)) then 
-                throw("You didn't bid anything")
-            else if (isDefined(getBoolean(this, auctionId + "_bidder_" + callerAddressStr + "_return"))) then
-                throw("You have already got your bid back")
-            else 
-                ScriptResult(
-                    WriteSet([DataEntry(auctionId + "_bidder_" + callerAddressStr + "_return", true)]),
-                    TransferSet([ScriptTransfer(i.caller, value(betAmount), auctionPriceAsset)]) # return bet which loose
-                )
-        }            
+        # Lot -> winner, winner's bet -> organizer
+        if (isDefined(getString(this, auctionId + "_lot_passed"))) then
+            throw("Lot is already passed to the winner, and organizer got his reward")
+        else
+            ScriptResult(
+                WriteSet([DataEntry(auctionId + "_lot_passed", winnerAddr.bytes.toBase58String())]),
+                TransferSet([ScriptTransfer(winnerAddr, lotAmount, lotAsset),
+                            ScriptTransfer(organizerAddr, winAmount, priceAsset)])
+            )
     }
 }

auction/test/auction_test.js

@@ -10,7 +10,7 @@ const ADD_FEE = 0.004 * WAVES
 var issueTxId
 var auctionId
 var auctionStartTx
-
+var customer2Before
 
 async function rememberBalances(text, forAddress, tokenId) {
     const tokenBal = await assetBalance(tokenId, forAddress)
@@ -64,7 +64,17 @@ describe('Auction test Suite', async function(){
         console.log("Start auction height : " + auctionStartTx.height)
     })
 
+    it('Unable to bid less then start price', async function(){
+        const invTx = invokeScript({fee:INV_FEE, dApp: address(accounts.auction), call: {function:"bid", args:[{type:"string", value: auctionId}]}, 
+                        payment: [{amount: 999999, assetId:null }]}, 
+                        accounts.customer2)
+        expect(broadcast(invTx)).rejectedWith("Bid must be more then 1000000")
+    })
+    
     it('Customer2: bid 0.1 WAVES', async function(){
+
+        customer2Before = await balance(address(accounts.customer2))
+
         const invTx = invokeScript({fee:INV_FEE, dApp: address(accounts.auction), call: {function:"bid", args:[{type:"string", value: auctionId}]}, 
                         payment: [{amount: 10000000, assetId:null }]}, 
                         accounts.customer2)
@@ -86,6 +96,11 @@ describe('Auction test Suite', async function(){
         const resp = await broadcast(invTx)
         await waitForTx(invTx.id)
     })
+
+    it('Previous bid returned to bidder', async function(){
+        const customer2After = await balance(address(accounts.customer2))
+        expect(customer2After).to.equal(customer2Before - INV_FEE, "Bid must be returned")
+    })    
 
     it('Wait for auction end', async function(){
         const timeout = 180000