tmp

Author: shermike

.gitignore

@@ -17,7 +17,7 @@ exporter.yaml
 *.abi
 
 # Ignore console.sol because it is generated and intended for internal debug only
-/nil/contracts/solidity/system/console.sol
+/nil/contracts/solidity/lib/console.sol
 
 *.hash.json
 

docs/tests/AsyncToken.sol

@@ -5,12 +5,12 @@ pragma solidity ^0.8.21;
 
 import "@nilfoundation/smart-contracts/contracts/Nil.sol";
 
-contract AsyncTokenSender {
-    function sendTokenAsync(uint amount, address dst) public {
+contract AsyncTokenSender is NilBase {
+    function sendTokenAsync(uint amount, address dst) public async(2_000_000) {
         Nil.Token[] memory tokens = Nil.txnTokens();
         Nil.asyncCallWithTokens(
             dst,
-            msg.sender,
+            Nil.msgSender(),
             address(this),
             0,
             Nil.FORWARD_REMAINING,

docs/tests/Caller.sol

@@ -5,15 +5,15 @@ pragma solidity ^0.8.9;
 
 import "@nilfoundation/smart-contracts/contracts/Nil.sol";
 
-contract Caller {
+contract Caller is NilBase {
     using Nil for address;
 
     receive() external payable {}
 
     function call(address dst) public async(2_000_000) {
         Nil.asyncCall(
             dst,
-            msg.sender,
+            Nil.msgSender(),
             0,
             abi.encodeWithSignature("increment()")
         );

docs/tests/CallerAsync.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.9;
 
 import "@nilfoundation/smart-contracts/contracts/Nil.sol";
 
-contract CallerAsync {
+contract CallerAsync is NilBase {
     using Nil for address;
 
     event CallCompleted(address indexed dst);

docs/tests/CallerAsyncBasicPattern.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.9;
 
 import "@nilfoundation/smart-contracts/contracts/Nil.sol";
 
-contract Caller {
+contract Caller is NilBase {
     using Nil for address;
 
     event CallCompleted(address indexed dst);

docs/tests/CallerCounter.sol

@@ -4,15 +4,15 @@ pragma solidity ^0.8.9;
 
 import "@nilfoundation/smart-contracts/contracts/Nil.sol";
 
-contract Caller {
+contract Caller is NilBase {
     using Nil for address;
 
     receive() external payable {}
 
     function call(address dst) public async(2_000_000) {
         Nil.asyncCall(
             dst,
-            msg.sender,
+            Nil.msgSender(),
             0,
             abi.encodeWithSignature("increment()")
         );

docs/tests/CheckEffectsInteraction.sol

@@ -11,9 +11,9 @@ contract CheckEffectsInteraction is NilBase, NilAwaitable {
     mapping(address => uint) balances;
 
     function badCheckEffectsInteraction(address dst, uint amount) public async(2_000_000) {
-        require(balances[msg.sender] >= amount);
+        require(balances[Nil.msgSender()] >= amount);
 
-        balances[msg.sender] -= amount;
+        balances[Nil.msgSender()] -= amount;
 
         Nil.asyncCall(dst, address(this), amount, "");
     }
@@ -23,9 +23,9 @@ contract CheckEffectsInteraction is NilBase, NilAwaitable {
     //startGoodCheckEffectsInteraction
     mapping(address => uint) exampleBalances;
 
-    function goodCheckEffectInteration(address dst, uint amount) public {
-        require(exampleBalances[msg.sender] >= amount);
-        exampleBalances[msg.sender] -= amount;
+    function goodCheckEffectInteration(address dst, uint amount) public async(2_000_000) {
+        require(exampleBalances[Nil.msgSender()] >= amount);
+        exampleBalances[Nil.msgSender()] -= amount;
 
         bytes memory context = abi.encode(amount);
         sendRequest(dst, amount, Nil.ASYNC_REQUEST_MIN_GAS, context, "", callback);
@@ -38,7 +38,7 @@ contract CheckEffectsInteraction is NilBase, NilAwaitable {
     ) public payable onlyResponse {
         uint amount = abi.decode(context, (uint));
         if (!success) {
-            exampleBalances[msg.sender] += amount;
+            exampleBalances[Nil.msgSender()] += amount;
         }
     }
 

docs/tests/CloneFactory.sol

@@ -22,10 +22,12 @@ contract MasterChild {
     }
 }
 
-contract CloneFactory {
+contract CloneFactory is NilBase {
     address public masterChildAddress;
 
-    constructor(address _masterChildAddress) {
+    event counterCloneCreated(address indexed addr);
+
+    constructor(address _masterChildAddress) payable {
         masterChildAddress = _masterChildAddress;
     }
 
@@ -49,14 +51,18 @@ contract CloneFactory {
         finalBytecode = code;
     }
 
-    function createCounterClone(uint256 salt) public returns (address) {
+    function createCounterClone(uint256 salt) public async(2_000_000) returns (address) {
+        //console.log("createCounterClone 1");
         bytes memory cloneBytecode = createCloneBytecode(masterChildAddress);
+        //console.log("createCounterClone 2: %_", cloneBytecode.length);
         uint shardId = Nil.getShardId(masterChildAddress);
+        //console.log("createCounterClone 3: %_", shardId);
         uint shardIdFactory = Nil.getShardId(address(this));
         require(
             shardId == shardIdFactory,
             "factory and child are not on the same shard!"
         );
+        //console.log("createCounterClone 4");
         address result = Nil.asyncDeploy(
             shardId,
             address(this),
@@ -67,17 +73,26 @@ contract CloneFactory {
             cloneBytecode,
             salt
         );
+        emit counterCloneCreated(result);
+        //console.log("createCounterClone 5");
 
         return result;
     }
 }
 
-contract FactoryManager {
+contract FactoryManager is NilBase {
     mapping(uint => address) public factories;
     mapping(uint => address) public masterChildren;
     bytes private code = type(CloneFactory).creationCode;
 
-    function deployNewMasterChild(uint shardId, uint256 salt) public {
+    event factoryDeployed(address indexed addr);
+    event masterChildDeployed(address indexed addr);
+
+    constructor() payable {}
+
+    function deployNewMasterChild(uint shardId, uint256 salt) public async(2_000_000) {
+        //console.log("deployNewMasterChild 1");
+
         address result = Nil.asyncDeploy(
             shardId,
             address(this),
@@ -88,11 +103,12 @@ contract FactoryManager {
             type(MasterChild).creationCode,
             salt
         );
+        emit masterChildDeployed(result);
 
         masterChildren[shardId] = result;
     }
 
-    function deployNewFactory(uint shardId, uint256 salt) public {
+    function deployNewFactory(uint shardId, uint256 salt) public async(2_000_000) {
         require(factories[shardId] == address(0), "factory already exists!");
         bytes memory data = bytes.concat(
             type(CloneFactory).creationCode,
@@ -104,10 +120,11 @@ contract FactoryManager {
             address(this),
             0,
             Nil.FORWARD_REMAINING,
-            0,
+            5000000 * tx.gasprice,
             data,
             salt
         );
+        emit factoryDeployed(result);
 
         factories[shardId] = result;
     }

docs/tests/CounterBug.sol

@@ -2,13 +2,15 @@
 //startContract
 pragma solidity ^0.8.0;
 
+import "@nilfoundation/smart-contracts/contracts/Nil.sol";
+
 contract CounterBug {
     uint256 private value;
 
     event ValueChanged(uint256 newValue);
 
     function increment() public {
-        require(msg.sender == address(0));
+        require(Nil.msgSender() == address(0));
         value += 1;
         emit ValueChanged(value);
     }

docs/tests/EnglishAuction.sol

@@ -3,15 +3,15 @@
 pragma solidity ^0.8.0;
 
 import "@nilfoundation/smart-contracts/contracts/Nil.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "@nilfoundation/smart-contracts/contracts/NilOwnable.sol";
 
 /**
  * @title EnglishAuction
  * @author =nil; Foundation
  * @notice This contract implements an auction where contracts can place bids
  * @notice and the contract owner decides when to start and end the auction.
  */
-contract EnglishAuction is Ownable {
+contract EnglishAuction is NilOwnable, NilBase {
     event Start();
     event Bid(address indexed sender, uint256 amount);
     event Withdraw(address indexed bidder, uint256 amount);
@@ -38,10 +38,10 @@ contract EnglishAuction is Ownable {
      * and accepts the initial bid.
      * @param _nft The address of the NFT contract.
      */
-    constructor(address _nft) payable Ownable(msg.sender) {
+    constructor(address _nft, uint _highestBid) payable NilOwnable(Nil.msgSender()) {
         nft = _nft;
         isOngoing = false;
-        highestBid = msg.value;
+        highestBid = _highestBid;
     }
 
     //endContractProperties
@@ -83,30 +83,30 @@ contract EnglishAuction is Ownable {
             bids[highestBidder] += highestBid;
         }
 
-        highestBidder = msg.sender;
+        highestBidder = Nil.msgSender();
         highestBid = msg.value;
 
-        emit Bid(msg.sender, msg.value);
+        emit Bid(Nil.msgSender(), msg.value);
     }
 
     /**
      * @notice This function exists so a bidder can withdraw their funds
      * if they change their mind.
      */
     function withdraw() public async(2_000_000) {
-        uint256 bal = bids[msg.sender];
-        bids[msg.sender] = 0;
+        uint256 bal = bids[Nil.msgSender()];
+        bids[Nil.msgSender()] = 0;
 
-        Nil.asyncCall(msg.sender, address(this), bal, "");
+        Nil.asyncCall(Nil.msgSender(), address(this), bal, "");
 
-        emit Withdraw(msg.sender, bal);
+        emit Withdraw(Nil.msgSender(), bal);
     }
 
     /**
      * @notice This function ends the auction and requests the NFT contract
      * to provide the NFT to the winner.
      */
-    function end() public onlyOwner {
+    function end() public payable onlyOwner async(2_000_000) {
         require(isOngoing, "the auction has not started");
 
         isOngoing = false;
@@ -117,7 +117,7 @@ contract EnglishAuction is Ownable {
             address(this),
             0,
             Nil.FORWARD_REMAINING,
-            0,
+            msg.value,
             abi.encodeWithSignature("sendNFT(address)", highestBidder)
         );