Merge branch 'dev' into misspelling

fractalplatform · Sep 2, 2019 · 4873b88 · 4873b88
2 parents d4244d8 + 7e20240
commit 4873b88
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 33 deletions.
diff --git a/processor/vm/runtime/contract/Ven/VEN.bin b/processor/vm/runtime/contract/Ven/VEN.bin
diff --git a/processor/vm/runtime/contract/Ven/VEN.sol b/processor/vm/runtime/contract/Ven/VEN.sol
@@ -489,7 +489,7 @@ contract VENSale is Owned{
         if (requested > 0) {
             ven.mint(msg.sender, requested, true, blockTime());
             // transfer ETH to vault
-            ethVault.transfer(ethCost);
+            ethVault.transfer(ethCost, msg.assetid);
 
             soldOut.official = requested.add(soldOut.official).toUINT120();
             onSold(msg.sender, requested, ethCost);        
@@ -498,7 +498,7 @@ contract VENSale is Owned{
         uint256 toReturn = msg.value.sub(ethCost);
         if(toReturn > 0) {
             // return over payed ETH
-            msg.sender.transfer(toReturn);
+            msg.sender.transfer(toReturn, msg.assetid);
         }        
     }