Merge pull request #5301 from Agoric/mhofman/5227-update-xs

chore(xsnap): Upgrade moddable submodule
Agoric · May 6, 2022 · a7fb401 · a7fb401
2 parents a1d8251 + 786c66f
commit a7fb401
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/deployment-test.yml b/.github/workflows/deployment-test.yml
@@ -90,7 +90,6 @@ jobs:
         env:
           NETWORK_NAME: chaintest
       - name: capture results
-        if: failure()
         run: |
           NOW=$(date -u +%Y%m%dT%H%M%S)
           echo "NOW=$NOW" >> "$GITHUB_ENV"
@@ -99,7 +98,7 @@ jobs:
           /usr/src/agoric-sdk/packages/deployment/scripts/setup.sh play stop || true
 
           # Get the results.
-          /usr/src/agoric-sdk/packages/deployment/scripts/capture-integration-results.sh
+          /usr/src/agoric-sdk/packages/deployment/scripts/capture-integration-results.sh "${{ job.status == 'failure' }}"
 
           # Tear down the nodes.
           echo yes | /usr/src/agoric-sdk/packages/deployment/scripts/setup.sh destroy

diff --git a/packages/SwingSet/test/snapshots/test-xsnap-store.js.md b/packages/SwingSet/test/snapshots/test-xsnap-store.js.md
@@ -8,12 +8,12 @@ Generated by [AVA](https://avajs.dev).
 
 > initial snapshot
 
-    'e156f1f2d0ff15cff67e704ebb77f5bf1bf137af288d273f4c2a02264d199d42'
+    'f9e6b21628f2cc7ca4b5c24ab8951e468c5a7c74fe062bad45fcd83a4d97aa88'
 
 > after SES boot - sensitive to SES-shim, XS, and supervisor
 
-    'e48339a392bbcf34fe316dc20fe8bb218f6ab39b9022e462c125ab1e12ebd18d'
+    '98c5a0f2ee533681290f8e55a783cb75b44af0de262e50f028841cd7888010bb'
 
 > after use of harden() - sensitive to SES-shim, XS, and supervisor
 
-    'e3acc0e9480525de15225829e44a7e9be53c8decae561ae896411eca1519f7c4'
+    '58499425de4cb5665b1407c5267330dd589a0041f38eb910d1f4e558776bdff2'
diff --git a/packages/SwingSet/test/snapshots/test-xsnap-store.js.snap b/packages/SwingSet/test/snapshots/test-xsnap-store.js.snap
diff --git a/packages/deployment/scripts/capture-integration-results.sh b/packages/deployment/scripts/capture-integration-results.sh
@@ -10,13 +10,30 @@ export AG_SETUP_COSMOS_HOME=${AG_SETUP_COSMOS_HOME-"$PWD/$NETWORK_NAME/setup"}
 RESULTSDIR=${RESULTSDIR-"$NETWORK_NAME/results"}
 mkdir -p "$RESULTSDIR"
 
+home=/home/ag-chain-cosmos/.ag-chain-cosmos
+
+for node in validator{0,1}; do
+  "$thisdir/setup.sh" ssh "$node" cat "$home/data/swingstore-trace" > "$RESULTSDIR/$node-swingstore-trace" || true
+done
+
+val0len=$(wc -l < $RESULTSDIR/validator0-swingstore-trace)
+val1len=$(wc -l < $RESULTSDIR/validator1-swingstore-trace)
+commonlen=$((val0len < val1len ? val0len : val1len))
+
+diff -U0 <(head -n $commonlen $RESULTSDIR/validator0-swingstore-trace) <(head -n $commonlen $RESULTSDIR/validator1-swingstore-trace) > $RESULTSDIR/validator-swingstore-trace.diff
+ret=$?
+
+failedtest=${1:-"unknown"}
+
+[ $ret -eq 0 -a "$failedtest" = "false" ] && exit
+
 for node in validator{0,1}; do
-  home=/home/ag-chain-cosmos/.ag-chain-cosmos
   "$thisdir/setup.sh" ssh "$node" cat "$home/config/genesis.json" > "$RESULTSDIR/$node-genesis.json" || true
   "$thisdir/setup.sh" ssh "$node" cat "$home/data/chain.slog" > "$RESULTSDIR/$node.slog" || true
   "$thisdir/setup.sh" ssh "$node" cat "$home/data/ag-cosmos-chain-state/flight-recorder.bin" > "$RESULTSDIR/$node-flight-recorder.bin" || true
-  "$thisdir/setup.sh" ssh "$node" cat "$home/data/swingstore-trace" > "$RESULTSDIR/$node-swingstore-trace" || true
   "$thisdir/setup.sh" ssh "$node" cat "$home/data/kvstore-trace" > "$RESULTSDIR/$node-kvstore-trace" || true
   mkdir -p "$RESULTSDIR/$node-xsnap-trace" && "$thisdir/setup.sh" ssh "$node" tar -c -C "$home/data/xsnap-trace" . | tar -x -C "$RESULTSDIR/$node-xsnap-trace" || true
   mkdir -p "$RESULTSDIR/$node-xs-snapshots" && "$thisdir/setup.sh" ssh "$node" tar -c -C "$home/data/ag-cosmos-chain-state/xs-snapshots" . | tar -x -C "$RESULTSDIR/$node-xs-snapshots" || true
 done
+
+exit $ret
diff --git a/packages/xsnap/moddable b/packages/xsnap/moddable
+6 −6		build/devices/esp32/targets/esp32s3/manifest.json
+4 −1		build/devices/esp32/xsProj-esp32s3/CMakeLists.txt
+2 −1		build/devices/esp32/xsProj-esp32s3/main/CMakeLists.txt
+66 −48		build/devices/esp32/xsProj-esp32s3/main/main.c
+434 −275		build/devices/esp32/xsProj-esp32s3/sdkconfig.defaults
+10 −8		documentation/Moddable SDK - Getting Started.md
+47 −27		documentation/devices/esp32.md
+3 −3		documentation/devices/esp8266.md
+69 −68		documentation/network/ble/ble.md
+ −		examples/assets/images/robby.5fps/robbie004.png
+1 −1		examples/commodetto/fonts/manifest.json
+52 −12		examples/io/spi/display-ili9341/display.c
+3 −0		examples/io/spi/display-ili9341/display.js
+37 −3		examples/io/spi/display-ili9341/main.js
+8 −0		examples/piu/epaper-photos/manifest.json
+1 −1		modules/commodetto/commodettoPoco.c
+1 −4		modules/commodetto/commodettoPocoBlit.c
+12 −7		modules/data/text/decoder/textdecoder.c
+7 −3		modules/data/text/encoder/textencoder.c
+2 −2		modules/io/common/builtinCommon.c
+16 −8		modules/io/common/builtinCommon.h
+2 −1		modules/io/digital/esp32/digitalbank.c
+5 −53		modules/io/manifest.json
+55 −0		modules/io/manifests/esp/manifest.json
+57 −0		modules/io/manifests/esp32/manifest.json
+20 −0		modules/io/manifests/mac/manifest.json
+10 −0		modules/io/manifests/mac/system.js
+0 −0		modules/io/socket/lwip/listener.js
+2 −0		modules/io/socket/lwip/tcp.c
+0 −0		modules/io/socket/lwip/tcp.js
+7 −3		modules/io/socket/lwip/udp.c
+0 −0		modules/io/socket/lwip/udp.js
+32 −0		modules/io/socket/mac/tcp.js
+560 −0		modules/io/socket/mac/tcp.m
+36 −0		modules/io/socket/mac/udp.js
+310 −0		modules/io/socket/mac/udp.m
+2 −2		modules/piu/All/piuContent.c
+1 −0		modules/piu/PC/mac/piuView.m
+2 −2		tools/testmc/manifest.json
+17 −22		tools/xsbug/DebugBehavior.c
+13 −14		tools/xsbug/DebugBehavior.js
+2 −0		xs/makefiles/lin/xst.mk
+3 −1		xs/makefiles/mac/xst.mk
+2 −0		xs/makefiles/win/xst.mak
+15 −0		xs/sources/xsAll.h
+0 −6		xs/sources/xsArguments.c
+1 −1		xs/sources/xsCommon.c
+2 −2		xs/sources/xsCommon.h
+7 −2		xs/sources/xsFunction.c
+1 −1		xs/sources/xsGlobal.c
+864 −0		xs/sources/xsLockdown.c
+40 −10		xs/sources/xsMemory.c
+73 −23		xs/sources/xsModule.c
+4 −1		xs/sources/xsPromise.c
+0 −3		xs/sources/xsProperty.c
+27 −22		xs/sources/xsSnapshot.c
+13 −5		xs/sources/xsString.c
+14 −0		xs/sources/xsType.c
+2 −1		xs/sources/xsre.c
+1 −0		xs/tools/xslStrip.c
+42 −0		xs/tools/xst.c