fix(chain): state is being stored correctly again

Author: michaelfig

packages/cosmic-swingset/Makefile

@@ -87,7 +87,7 @@ scenario2-run-chain:
 		ba="$$ba "`cat $$acha`; \
 	done; \
 	ROLE=two_chain BOOT_ADDRESS="$$ba" $(NODE_DEBUG) \
-	  `$(BREAK_CHAIN) && echo --inspect-brk` $(AGC) start # --trace-store=trace.log
+	  `$(BREAK_CHAIN) && echo --inspect-brk` $(AGC) start --pruning=nothing
 scenario2-run-client:
 	cd t1/$(BASE_PORT) && ../../bin/ag-solo start --role=two_client
 

packages/cosmic-swingset/lib/ag-chain-cosmos

@@ -161,9 +161,14 @@ async function toSwingSet0(action, _replier) {
         action.ack,
         action.blockHeight,
         action.blockTime,
+        action.committed,
       );
     case BEGIN_BLOCK:
-      return deliverStartBlock(action.blockHeight, action.blockTime);
+      return deliverStartBlock(
+        action.blockHeight,
+        action.blockTime,
+        action.committed,
+      );
     default:
       throw new Error(`${action.type} not recognized. must be DELIVER_INBOUND or BEGIN_BLOCK`);
   }

packages/cosmic-swingset/lib/agcosmosdaemon.go

@@ -98,9 +98,9 @@ func ReplyToGo(replyPort C.int, isError C.int, str C.Body) C.int {
 func SendToGo(port C.int, str C.Body) C.Body {
 	goStr := C.GoString(str)
 	// fmt.Fprintln(os.Stderr, "Send to Go", goStr)
-	outstr, err := swingset.ReceiveFromNode(int(port), goStr)
+	outstr, err := swingset.ReceiveFromController(int(port), goStr)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "Cannot receive from node", err)
+		fmt.Fprintln(os.Stderr, "Cannot receive from controller", err)
 		return C.CString("")
 	}
 	return C.CString(outstr)

packages/cosmic-swingset/lib/launch-chain.js

@@ -70,56 +70,78 @@ export async function launch(kernelStateDBDir, mailboxStorage, vatsDir, argv) {
   );
 
   let mailboxLastData = djson.stringify(mbs.exportToData());
-  // save the initial state immediately
-  commit();
-
-  // then arrange for inbound messages to be processed, after which we save
-  async function turnCrank() {
+  function saveState(runTime = undefined) {
     let start = Date.now();
-    await controller.run();
-    const runTime = Date.now() - start;
+
     // now check mbs
-    start = Date.now();
     const newState = mbs.exportToData();
     const newData = djson.stringify(newState);
     if (newData !== mailboxLastData) {
       console.log(`outbox changed`);
-      for (const peer of Object.getOwnPropertyNames(newState)) {
-        const data = {
-          outbox: newState[peer].outbox,
-          ack: newState[peer].inboundAck,
-        };
-        mailboxStorage.set(`mailbox.${peer}`, djson.stringify(data));
-      }
-      mailboxStorage.set(`mailbox`, newData);
-      mailboxLastData = newData;
     }
+
+    for (const peer of Object.getOwnPropertyNames(newState)) {
+      const data = {
+        outbox: newState[peer].outbox,
+        ack: newState[peer].inboundAck,
+      };
+      mailboxStorage.set(`mailbox.${peer}`, djson.stringify(data));
+    }
+    mailboxStorage.set('mailbox', newData);
+    mailboxLastData = newData;
+
     const mbTime = Date.now() - start;
+
+    // Save the rest of the kernel state.
     start = Date.now();
-    const mailboxSize = mailboxLastData.length;
+    commit();
     const saveTime = Date.now() - start;
+
+    const mailboxSize = mailboxLastData.length;
+    const runTimeStr = runTime === undefined ? '' : `run=${runTime}ms, `;
     console.log(
-      `wrote SwingSet checkpoint (mailbox=${mailboxSize}), [run=${runTime}ms, mb=${mbTime}ms, save=${saveTime}ms]`,
+      `wrote SwingSet checkpoint (mailbox=${mailboxSize}), [${runTimeStr}mb=${mbTime}ms, save=${saveTime}ms]`,
     );
   }
 
-  async function deliverInbound(sender, messages, ack) {
+  // save the initial state immediately
+  saveState();
+
+  // then arrange for inbound messages to be processed, after which we save
+  async function turnCrank(committed) {
+    const start = Date.now();
+    await controller.run();
+    const runTime = Date.now() - start;
+    if (committed) {
+      saveState(runTime);
+    } else {
+      console.log(`proposed SwingSet transaction [run=${runTime}ms]`);
+    }
+  }
+
+  async function deliverInbound(sender, messages, ack, committed) {
     if (!(messages instanceof Array)) {
       throw new Error(`inbound given non-Array: ${messages}`);
     }
     if (mb.deliverInbound(sender, messages, ack)) {
       console.log(`mboxDeliver:   ADDED messages`);
-      await turnCrank();
+      await turnCrank(committed);
+    } else if (committed) {
+      // We need to save our state on every commitment.
+      saveState();
     }
   }
 
-  async function deliverStartBlock(blockHeight, blockTime) {
+  async function deliverStartBlock(blockHeight, blockTime, committed) {
     const addedToQueue = timer.poll(blockTime);
     console.log(
       `polled; blockTime:${blockTime}, h:${blockHeight} ADDED: ${addedToQueue}`,
     );
     if (addedToQueue) {
-      await turnCrank();
+      await turnCrank(committed);
+    } else if (committed) {
+      // We need to save our state on every commitment.
+      saveState();
     }
   }
 

packages/cosmic-swingset/s2.sh

@@ -9,3 +9,4 @@ EOF
   ag-cosmos-helper tx swingset deliver --keyring-backend=test $addr @/tmp/s2.json --gas=auto --gas-adjustment=1.05 --from=ag-solo -ojson --broadcast-mode=block --yes --output=json $opts
 fi
 ag-cosmos-helper query swingset mailbox $addr $opts
+#ag-cosmos-helper query swingset mailbox ${addr}z $opts

packages/cosmic-swingset/x/swingset/handler.go

@@ -21,13 +21,15 @@ type deliverInboundAction struct {
 	StoragePort int             `json:"storagePort"`
 	BlockHeight int64           `json:"blockHeight"`
 	BlockTime   int64           `json:"blockTime"`
+	Committed   bool            `json:"committed"`
 }
 
 type beginBlockAction struct {
 	Type        string `json:"type"`
 	StoragePort int    `json:"storagePort"`
 	BlockHeight int64  `json:"blockHeight"`
 	BlockTime   int64  `json:"blockTime"`
+	Committed   bool   `json:"committed"`
 }
 
 // NewHandler returns a handler for "swingset" type messages.
@@ -64,7 +66,7 @@ func UnregisterPortHandler(portNum int) error {
 	return nil
 }
 
-func ReceiveFromNode(portNum int, msg string) (string, error) {
+func ReceiveFromController(portNum int, msg string) (string, error) {
 	handler := portToHandler[portNum]
 	if handler == nil {
 		return "", errors.New("Unregistered port " + fmt.Sprintf("%d", portNum))
@@ -101,7 +103,9 @@ func handleMsgDeliverInbound(ctx sdk.Context, keeper Keeper, msg MsgDeliverInbou
 		StoragePort: newPort,
 		BlockHeight: ctx.BlockHeight(),
 		BlockTime:   ctx.BlockTime().Unix(),
+		Committed:   !ctx.IsCheckTx(),
 	}
+	// fmt.Fprintf(os.Stderr, "Context is %+v\n", ctx)
 	b, err := json.Marshal(action)
 	if err != nil {
 		return nil, err
@@ -129,6 +133,7 @@ func handleMsgBeginBlock(ctx sdk.Context, keeper Keeper) (*sdk.Result, error) {
 		BlockHeight: ctx.BlockHeight(),
 		BlockTime:   ctx.BlockTime().Unix(),
 		StoragePort: newPort,
+		Committed:   !ctx.IsCheckTx(),
 	}
 	b, err := json.Marshal(action)
 	if err != nil {

packages/cosmic-swingset/x/swingset/internal/keeper/keeper.go

@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"fmt"
-	"os"
 	"sort"
 	"strings"
 
@@ -111,20 +109,13 @@ func (k Keeper) SetStorage(ctx sdk.Context, path string, storage types.Storage)
 		keyNode.Keys = keyList
 		keysStore.Set([]byte(oneUp), k.cdc.MustMarshalBinaryLengthPrefixed(keyNode))
 	}
-	if addr, ok := os.LookupEnv("SS_DEBUG_MAILBOX"); ok {
-		fmt.Println("mailbox has value", k.storeKey, store.Has([]byte("data:mailbox."+addr)))
-	}
 }
 
 // Gets the entire mailbox struct for a peer
 func (k Keeper) GetMailbox(ctx sdk.Context, peer string) types.Storage {
 	store := ctx.KVStore(k.storeKey)
 	dataStore := prefix.NewStore(store, types.DataPrefix)
 	path := "mailbox." + peer
-	if addr, ok := os.LookupEnv("SS_DEBUG_MAILBOX"); ok {
-		fmt.Println("peer == addr", addr == peer)
-		fmt.Println("mailbox still has value", dataStore.Has([]byte("mailbox."+addr)))
-	}
 	if !dataStore.Has([]byte(path)) {
 		return types.NewMailbox()
 	}

packages/deployment/main.js

@@ -404,7 +404,7 @@ show-config      display the client connection parameters
         needReMain([
           'play',
           'install',
-          `-eexecline=${shellEscape('/usr/src/cosmic-swingset/lib/ag-chain-cosmos start --proxy_app=kvstore')}`,
+          `-eexecline=${shellEscape('/usr/src/cosmic-swingset/lib/ag-chain-cosmos start --pruning=nothing')}`,
           `-eserviceLines="Environment=BOOT_ADDRESS=${bootAddress}"`,
         ]),
       );