[monorepo] replace Transfer.sol mechanism with Interpreters

packages/apps/contracts/HighRollerApp.sol

@@ -1,7 +1,8 @@
 pragma solidity 0.5.8;
 pragma experimental "ABIEncoderV2";
 
-import "@counterfactual/contracts/contracts/CounterfactualApp.sol";
+import "@counterfactual/contracts/contracts/interfaces/CounterfactualApp.sol";
+import "@counterfactual/contracts/contracts/interfaces/TwoPartyOutcome.sol";
 
 
 /// @title High Roller App
@@ -33,7 +34,6 @@ contract HighRollerApp is CounterfactualApp {
   }
 
   struct AppState {
-    address[2] playerAddrs;
     Stage stage;
     bytes32 salt;
     bytes32 commitHash;
@@ -120,59 +120,39 @@ contract HighRollerApp is CounterfactualApp {
     return abi.encode(nextState);
   }
 
-  function resolve(bytes calldata encodedState, Transfer.Terms calldata terms)
+  function resolve(bytes calldata encodedState)
     external
     pure
-    returns (Transfer.Transaction memory)
+    returns (bytes memory)
   {
     AppState memory appState = abi.decode(encodedState, (AppState));
 
-    uint256[] memory amounts = new uint256[](2);
-    address[] memory to = new address[](2);
-    to[0] = appState.playerAddrs[0];
-    to[1] = appState.playerAddrs[1];
     bytes32 expectedCommitHash = keccak256(
       abi.encodePacked(appState.salt, appState.playerFirstNumber)
     );
     if (expectedCommitHash == appState.commitHash) {
-      amounts = getWinningAmounts(
-        appState.playerFirstNumber, appState.playerSecondNumber, terms.limit
-      );
+      return abi.encode(getWinningAmounts(
+        appState.playerFirstNumber, appState.playerSecondNumber
+      ));
     } else {
-      amounts[0] = 0;
-      amounts[1] = terms.limit;
+      return abi.encode(TwoPartyOutcome.Resolution.SEND_TO_ADDR_TWO);
     }
-
-    bytes[] memory data = new bytes[](2);
-
-    return Transfer.Transaction(
-      terms.assetType,
-      terms.token,
-      to,
-      amounts,
-      data
-    );
   }
 
-  function getWinningAmounts(uint256 num1, uint256 num2, uint256 termsLimit)
+  function getWinningAmounts(uint256 num1, uint256 num2)
     internal
     pure
-    returns (uint256[] memory)
+    returns (TwoPartyOutcome.Resolution)
   {
-    uint256[] memory amounts = new uint256[](2);
     bytes32 randomSalt = calculateRandomSalt(num1, num2);
     (uint8 playerFirstTotal, uint8 playerSecondTotal) = highRoller(randomSalt);
     if (playerFirstTotal > playerSecondTotal) {
-      amounts[0] = termsLimit;
-      amounts[1] = 0;
+      return TwoPartyOutcome.Resolution.SEND_TO_ADDR_ONE;
     } else if (playerFirstTotal < playerSecondTotal) {
-      amounts[0] = 0;
-      amounts[1] = termsLimit;
+      return TwoPartyOutcome.Resolution.SEND_TO_ADDR_TWO;
     } else {
-      amounts[0] = termsLimit / 2;
-      amounts[1] = termsLimit / 2;
+      return TwoPartyOutcome.Resolution.SPLIT_AND_SEND_TO_BOTH_ADDRS;
     }
-    return amounts;
   }
 
   function highRoller(bytes32 randomness)

packages/apps/contracts/NimApp.sol

@@ -1,7 +1,8 @@
 pragma solidity 0.5.8;
 pragma experimental "ABIEncoderV2";
 
-import "@counterfactual/contracts/contracts/CounterfactualApp.sol";
+import "@counterfactual/contracts/contracts/interfaces/CounterfactualApp.sol";
+import "@counterfactual/contracts/contracts/interfaces/TwoPartyOutcome.sol";
 
 
 /*
@@ -16,7 +17,6 @@ contract NimApp is CounterfactualApp {
   }
 
   struct AppState {
-    address[2] players;
     uint256 turnNum;
     uint256[3] pileHeights;
   }
@@ -64,35 +64,20 @@ contract NimApp is CounterfactualApp {
     return abi.encode(ret);
   }
 
-  function resolve(
-    bytes calldata encodedState, Transfer.Terms calldata terms
-  )
+  function resolve(bytes calldata encodedState)
     external
     pure
-    returns (Transfer.Transaction memory)
+    returns (bytes memory)
   {
     AppState memory state = abi.decode(encodedState, (AppState));
 
     require(isWin(state), "Resolution state was not in a winning position");
-    address loser = state.players[state.turnNum % 2];
-    address winner = state.players[1 - (state.turnNum % 2)];
-
-    uint256[] memory amounts = new uint256[](2);
-    amounts[0] = terms.limit;
-    amounts[1] = 0;
-
-    address[] memory to = new address[](2);
-    to[0] = loser;
-    to[1] = winner;
-    bytes[] memory data = new bytes[](2);
-
-    return Transfer.Transaction(
-      terms.assetType,
-      terms.token,
-      to,
-      amounts,
-      data
-    );
+
+    if (state.turnNum % 2 == 0) {
+      return abi.encode(TwoPartyOutcome.Resolution.SEND_TO_ADDR_ONE);
+    } else {
+      return abi.encode(TwoPartyOutcome.Resolution.SEND_TO_ADDR_TWO);
+    }
   }
 
   function isWin(AppState memory state)

packages/apps/contracts/TicTacToeApp.sol

@@ -1,7 +1,9 @@
 pragma solidity 0.5.8;
 pragma experimental "ABIEncoderV2";
 
-import "@counterfactual/contracts/contracts/CounterfactualApp.sol";
+import "@counterfactual/contracts/contracts/interfaces/Interpreter.sol";
+import "@counterfactual/contracts/contracts/interfaces/CounterfactualApp.sol";
+import "@counterfactual/contracts/contracts/interfaces/TwoPartyOutcome.sol";
 
 
 contract TicTacToeApp is CounterfactualApp {
@@ -37,7 +39,6 @@ contract TicTacToeApp is CounterfactualApp {
   uint256 constant EMPTY_SQUARE = 0;
 
   struct AppState {
-    address[2] players;
     uint256 turnNum;
     uint256 winner;
     uint256[3][3] board;
@@ -102,50 +103,20 @@ contract TicTacToeApp is CounterfactualApp {
     return abi.encode(postState);
   }
 
-  function resolve(bytes calldata encodedState, Transfer.Terms calldata terms)
+  function resolve(bytes calldata encodedState)
     external
     pure
-    returns (Transfer.Transaction memory)
+    returns (bytes memory)
   {
     AppState memory state = abi.decode(encodedState, (AppState));
     require(state.winner != 0, "Winner was set to 0; invalid");
 
-    uint256[] memory amounts = new uint256[](2);
-    address[] memory to = new address[](2);
-    bytes[] memory data = new bytes[](2);
-
-    if (state.winner == 3) {
-      amounts[0] = terms.limit / 2;
-      amounts[1] = terms.limit / 2;
-
-      to[0] = state.players[0];
-      to[1] = state.players[1];
-
-      return Transfer.Transaction(
-        terms.assetType,
-        terms.token,
-        to,
-        amounts,
-        data
-      );
-
-    } else {
-      address winner = state.players[state.winner - 1];
-      address loser = state.players[2 - state.winner];
-
-      amounts[0] = terms.limit;
-      amounts[1] = 0;
-
-      to[0] = winner;
-      to[1] = loser;
-
-      return Transfer.Transaction(
-        terms.assetType,
-        terms.token,
-        to,
-        amounts,
-        data
-      );
+    if (state.winner == 2) {
+      return abi.encode(TwoPartyOutcome.Resolution.SEND_TO_ADDR_TWO);
+    } else if (state.winner == 1) {
+      return abi.encode(TwoPartyOutcome.Resolution.SEND_TO_ADDR_ONE);
+    } else /* state.winner == 3, or fallback */ {
+      return abi.encode(TwoPartyOutcome.Resolution.SPLIT_AND_SEND_TO_BOTH_ADDRS);
     }
 
   }
@@ -223,4 +194,12 @@ contract TicTacToeApp is CounterfactualApp {
     }
   }
 
+  function resolveType()
+    external
+    pure
+    returns (uint256)
+  {
+    return uint256(Interpreter.ResolutionType.TWO_PARTY_OUTCOME);
+  }
+
 }