cosmos(upgrade): fold in b:enable-orchestration

Agoric · Sep 5, 2024 · 6b45090 · 6b45090
1 parent 641891a
commit 6b45090
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 6 deletions.
diff --git a/...oposals/b:enable-orchestration/.gitignore → ...proposals/f:test-orchestration/.gitignore b/...oposals/b:enable-orchestration/.gitignore → ...proposals/f:test-orchestration/.gitignore
diff --git a/...posals/b:enable-orchestration/.yarnrc.yml → ...roposals/f:test-orchestration/.yarnrc.yml b/...posals/b:enable-orchestration/.yarnrc.yml → ...roposals/f:test-orchestration/.yarnrc.yml
diff --git a/...roposals/b:enable-orchestration/README.md → .../proposals/f:test-orchestration/README.md b/...roposals/b:enable-orchestration/README.md → .../proposals/f:test-orchestration/README.md
@@ -1,4 +1,4 @@
-# CoreEvalProposal to enable orchestration features
+# CoreEvalProposal to test orchestration features
 
 The `submission` for this proposal is automatically generated during `yarn build`
 in [a3p-integration](../..) using the code in agoric-sdk through

diff --git a/...ls/b:enable-orchestration/initial.test.js → ...sals/f:test-orchestration/initial.test.js b/...ls/b:enable-orchestration/initial.test.js → ...sals/f:test-orchestration/initial.test.js
diff --git a/...osals/b:enable-orchestration/package.json → ...oposals/f:test-orchestration/package.json b/...osals/b:enable-orchestration/package.json → ...oposals/f:test-orchestration/package.json
@@ -3,10 +3,8 @@
     "type": "/agoric.swingset.CoreEvalProposal",
     "source": "subdir",
     "sdk-generate": [
-      "smart-wallet/build-wallet-factory2-upgrade.js",
       "testing/start-valueVow.js start-valueVow",
-      "testing/restart-valueVow.js restart-valueVow",
-      "vats/init-orchestration.js"
+      "testing/restart-valueVow.js restart-valueVow"
     ]
   },
   "type": "module",

diff --git a/.../b:enable-orchestration/test-lib/chain.js → ...ls/f:test-orchestration/test-lib/chain.js b/.../b:enable-orchestration/test-lib/chain.js → ...ls/f:test-orchestration/test-lib/chain.js
diff --git a/.../b:enable-orchestration/test-lib/index.js → ...ls/f:test-orchestration/test-lib/index.js b/.../b:enable-orchestration/test-lib/index.js → ...ls/f:test-orchestration/test-lib/index.js
diff --git a/...ls/b:enable-orchestration/test-lib/rpc.js → ...sals/f:test-orchestration/test-lib/rpc.js b/...ls/b:enable-orchestration/test-lib/rpc.js → ...sals/f:test-orchestration/test-lib/rpc.js
diff --git a/...b:enable-orchestration/test-lib/wallet.js → ...s/f:test-orchestration/test-lib/wallet.js b/...b:enable-orchestration/test-lib/wallet.js → ...s/f:test-orchestration/test-lib/wallet.js
diff --git a/.../proposals/b:enable-orchestration/test.sh → ...on/proposals/f:test-orchestration/test.sh b/.../proposals/b:enable-orchestration/test.sh → ...on/proposals/f:test-orchestration/test.sh
diff --git a/...s/b:enable-orchestration/valueVow.test.js → ...als/f:test-orchestration/valueVow.test.js b/...s/b:enable-orchestration/valueVow.test.js → ...als/f:test-orchestration/valueVow.test.js
diff --git a/...roposals/b:enable-orchestration/yarn.lock → .../proposals/f:test-orchestration/yarn.lock b/...roposals/b:enable-orchestration/yarn.lock → .../proposals/f:test-orchestration/yarn.lock
diff --git a/golang/cosmos/app/upgrade.go b/golang/cosmos/app/upgrade.go
@@ -92,8 +92,14 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte
 			// Each CoreProposalStep runs sequentially, and can be constructed from
 			// one or more modules executing in parallel within the step.
 			CoreProposalSteps = []vm.CoreProposalStep{
-				// Upgrade orch-core to the latest version.
-				vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgrade-orch-core.js"),
+				vm.CoreProposalStepForModules(
+					// Upgrade to new liveslots for repaired vow usage.
+					"@agoric/builders/scripts/vats/upgrade-orch-core.js",
+					// Upgrade to new liveslots and support vows.
+					"@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js",
+					// Create vat-orchestration.
+					"@agoric/builders/scripts/vats/init-orchestration.js",
+				),
 			}
 		}