feat: include changes from agoric-sdk#8452

0xpatrickdev · Oct 12, 2023 · 6deb908 · 6deb908
1 parent 7f61ad7
commit 6deb908
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -71,16 +71,16 @@ _Before deploying bundles, you will want to query the chain [1.a.](#1a-verify-bu
 NODE=https://devnet.rpc.agoric.net:443
 WALLET=dev-local
 CHAIN_ID=agoricdev-20
-B1=b1-3253e162d5dd497dbc103651d0c2be3656448d3563e80e1ca9b0a9a020013b69089f365daad492b346d8970df92fe8fcc589a71b067c6ffc10b8fd548bce6f4e.json
-B2=b1-8e2dcf513daf9530d347112cf403e8b3fd4f384e041cfa8f0819baa06a79e7f9f2b49fa77801e2d9bbf1717652004c4e65c1ca84d7345c4b44b97512cf8d1fdd.json
-B3=b1-00093b027ab00556082702da2a5579fe311170e3bc45ec4d33dee2405f820fef3fb8b71c166fd31b5b8f2f9387e3a942649cfb7fb010c7f2aa2cca23fcbf85a4.json
-B4=b1-69d40a0f9adc747213263332b35e6abc03b6b0299fc5ef27b690d406213150562d5ddd0bb92de85edd9e5cb6a1aed4f79caa067840d070babe588cafa14c4726.json
+B1=b1-8e2dcf513daf9530d347112cf403e8b3fd4f384e041cfa8f0819baa06a79e7f9f2b49fa77801e2d9bbf1717652004c4e65c1ca84d7345c4b44b97512cf8d1fdd.json
+B2=b1-d17444291f831122875555d2bf0518f6b762d2f34c26a2b6d17b5c1c2b01157dcdc94b7e8f39144cbe2b36232e048d7aed461de4b9eaa800f8a1431fc70fe5cd.json
+B3=b1-a190115d105bd5d7041f2981a89e9a9294c57ecd5706772a75839a65d70a530ace7a3670234e486fed05a03d84749034e77bdafcbd6f357d2770788397fd7fc8.json
+B4=b1-b9e881e987d10e9ee5aa5d827a1574a3aff2a4eee694b39da50ce28a5ba0c24753dea4f18a50338af6aa0ba0ca97a5544f5eef4db2263ca0ae9e4dd4d8f903be.json
 
 cd bundles
 agd tx swingset install-bundle @$B1 --node $NODE --from $WALLET --chain-id $CHAIN_ID --gas=auto --gas-adjustment=1.2 -y
 agd tx swingset install-bundle @$B2 --node $NODE --from $WALLET --chain-id $CHAIN_ID --gas=auto --gas-adjustment=1.2 -y
 agd tx swingset install-bundle @$B3 --node $NODE --from $WALLET --chain-id $CHAIN_ID --gas=auto --gas-adjustment=1.2 -y
-agd tx swingset install-bundle @$B4 --node $NODE --from $WALLET --chain-id $CHAIN_ID --gas=auto --gas-adjustment=1.2 -y
+agd tx swingset install-bundle @$B4 --node $NODE --from $WALLET --chain-id $CHAIN_ID --gas=auto --gas-adjustment=1.2 -y -b block
 ```
 _Alternatively, the `deploy-bundles.sh` script can be used to ensure only un-published bundles are submitted._
 
@@ -100,7 +100,7 @@ jq -r '.value | fromjson | .values | map(fromjson) | .[-1] | .body[1:] | fromjso
 ```zsh
 NODE=https://devnet.rpc.agoric.net:443
 WALLET=dev-local
-CHAIN_ID=agoricdev-20
+CHAIN_ID=agoricdev-21 // see https://devnet.agoric.net/ for latest chain id
 agd tx gov submit-proposal swingset-core-eval \
   add-stATOM-permit.json add-stATOM.js \
   add-stATOM-oracles-permit.json add-stATOM-oracles.js \

diff --git a/add-stATOM-oracles.js b/add-stATOM-oracles.js
@@ -1,31 +1,27 @@
 // This is generated by writeCoreProposal; please edit!
 /* eslint-disable */
 
-const manifestBundleRef = {bundleID:"b1-00093b027ab00556082702da2a5579fe311170e3bc45ec4d33dee2405f820fef3fb8b71c166fd31b5b8f2f9387e3a942649cfb7fb010c7f2aa2cca23fcbf85a4"};
+const manifestBundleRef = {
+  bundleID:
+    "b1-b9e881e987d10e9ee5aa5d827a1574a3aff2a4eee694b39da50ce28a5ba0c24753dea4f18a50338af6aa0ba0ca97a5544f5eef4db2263ca0ae9e4dd4d8f903be",
+};
 const getManifestCall = harden([
   "getManifestForPriceFeed",
   {
-    AGORIC_INSTANCE_NAME: "stATOM-USD price feed",
+    AGORIC_INSTANCE_NAME: "stATOM3-USD price feed",
     IN_BRAND_DECIMALS: 6,
-    IN_BRAND_LOOKUP: [
-      "agoricNames",
-      "oracleBrand",
-      "stATOM",
-    ],
-    IN_BRAND_NAME: "stATOM",
+    IN_BRAND_LOOKUP: ["agoricNames", "oracleBrand", "stATOM3"],
+    IN_BRAND_NAME: "stATOM3",
     OUT_BRAND_DECIMALS: 4,
-    OUT_BRAND_LOOKUP: [
-      "agoricNames",
-      "oracleBrand",
-      "USD",
-    ],
+    OUT_BRAND_LOOKUP: ["agoricNames", "oracleBrand", "USD"],
     OUT_BRAND_NAME: "USD",
     brandInRef: undefined,
     brandOutRef: undefined,
     contractTerms: {
       POLL_INTERVAL: 30n,
       maxSubmissionCount: 1000,
-      maxSubmissionValue: 115792089237316195423570985008687907853269984665640564039457584007913129639936n,
+      maxSubmissionValue:
+        115792089237316195423570985008687907853269984665640564039457584007913129639936n,
       minSubmissionCount: 2,
       minSubmissionValue: 1n,
       restartDelay: 1,
@@ -44,7 +40,8 @@ const getManifestCall = harden([
       "agoric1w5wmck6q2xrt20ax3njlk2k87m4t4l2y2xgw2d",
     ],
     priceAggregatorRef: {
-      bundleID: "b1-69d40a0f9adc747213263332b35e6abc03b6b0299fc5ef27b690d406213150562d5ddd0bb92de85edd9e5cb6a1aed4f79caa067840d070babe588cafa14c4726",
+      bundleID:
+        "b1-a190115d105bd5d7041f2981a89e9a9294c57ecd5706772a75839a65d70a530ace7a3670234e486fed05a03d84749034e77bdafcbd6f357d2770788397fd7fc8",
     },
   },
 ]);

diff --git a/add-stATOM-permit.json b/add-stATOM-permit.json
@@ -14,8 +14,7 @@
   },
   "produce": {
     "bankMints": true,
-    "vBankKits": true,
-    "scaledPriceAuthorityKits": true
+    "vBankKits": true
   },
   "installation": {
     "consume": {
@@ -24,14 +23,15 @@
     },
     "produce": "makeCoreProposalBehavior"
   },
+  "instance": {
+    "produce": true,
+    "consume": true
+  },
   "brand": {
     "consume": {
       "IST": true
     }
   },
-  "instance": {
-    "consume": true
-  },
   "evaluateBundleCap": "makeCoreProposalBehavior",
   "modules": {
     "utils": {

diff --git a/add-stATOM.js b/add-stATOM.js
@@ -1,24 +1,29 @@
 // This is generated by writeCoreProposal; please edit!
 /* eslint-disable */
 
-const manifestBundleRef = {bundleID:"b1-3253e162d5dd497dbc103651d0c2be3656448d3563e80e1ca9b0a9a020013b69089f365daad492b346d8970df92fe8fcc589a71b067c6ffc10b8fd548bce6f4e"};
+const manifestBundleRef = {
+  bundleID:
+    "b1-d17444291f831122875555d2bf0518f6b762d2f34c26a2b6d17b5c1c2b01157dcdc94b7e8f39144cbe2b36232e048d7aed461de4b9eaa800f8a1431fc70fe5cd",
+};
 const getManifestCall = harden([
   "getManifestForAddAssetToVault",
   {
     debtLimitValue: undefined,
     interchainAssetOptions: {
       decimalPlaces: 6,
-      denom: "ibc/49C630713B2AB60653F76C0C58D43C2A64956803B4D422CACB6DD4AD016ED846",
+      denom:
+        "ibc/42225F147137DDEB5FEF0F1D0A92F2AD57557AFA2C4D6F30B21E0D983001C002",
       initialPrice: undefined,
       issuerBoardId: undefined,
-      issuerName: "stATOM",
-      keyword: "STATOM",
-      oracleBrand: "stATOM",
-      proposedName: "stATOM",
+      issuerName: "stATOM3",
+      keyword: "STATOM3",
+      oracleBrand: "stATOM3",
+      proposedName: "stATOM3",
     },
     interestRateValue: undefined,
     scaledPriceAuthorityRef: {
-      bundleID: "b1-8e2dcf513daf9530d347112cf403e8b3fd4f384e041cfa8f0819baa06a79e7f9f2b49fa77801e2d9bbf1717652004c4e65c1ca84d7345c4b44b97512cf8d1fdd",
+      bundleID:
+        "b1-8e2dcf513daf9530d347112cf403e8b3fd4f384e041cfa8f0819baa06a79e7f9f2b49fa77801e2d9bbf1717652004c4e65c1ca84d7345c4b44b97512cf8d1fdd",
     },
   },
 ]);
@@ -68,8 +73,8 @@ const overrideManifest = {
         scaledPriceAuthority: true,
       },
     },
-    produce: {
-      scaledPriceAuthorityKits: true,
+    instance: {
+      produce: true,
     },
   },
 };

diff --git a/...ec4d33dee2405f820fef3fb8b71c166fd31b5b8f2f9387e3a942649cfb7fb010c7f2aa2cca23fcbf85a4.json b/...ec4d33dee2405f820fef3fb8b71c166fd31b5b8f2f9387e3a942649cfb7fb010c7f2aa2cca23fcbf85a4.json
diff --git a/...0e1ca9b0a9a020013b69089f365daad492b346d8970df92fe8fcc589a71b067c6ffc10b8fd548bce6f4e.json b/...0e1ca9b0a9a020013b69089f365daad492b346d8970df92fe8fcc589a71b067c6ffc10b8fd548bce6f4e.json
diff --git a/...ef27b690d406213150562d5ddd0bb92de85edd9e5cb6a1aed4f79caa067840d070babe588cafa14c4726.json b/...ef27b690d406213150562d5ddd0bb92de85edd9e5cb6a1aed4f79caa067840d070babe588cafa14c4726.json
diff --git a/...772a75839a65d70a530ace7a3670234e486fed05a03d84749034e77bdafcbd6f357d2770788397fd7fc8.json b/...772a75839a65d70a530ace7a3670234e486fed05a03d84749034e77bdafcbd6f357d2770788397fd7fc8.json
diff --git a/...b39da50ce28a5ba0c24753dea4f18a50338af6aa0ba0ca97a5544f5eef4db2263ca0ae9e4dd4d8f903be.json b/...b39da50ce28a5ba0c24753dea4f18a50338af6aa0ba0ca97a5544f5eef4db2263ca0ae9e4dd4d8f903be.json
diff --git a/...a2b6d17b5c1c2b01157dcdc94b7e8f39144cbe2b36232e048d7aed461de4b9eaa800f8a1431fc70fe5cd.json b/...a2b6d17b5c1c2b01157dcdc94b7e8f39144cbe2b36232e048d7aed461de4b9eaa800f8a1431fc70fe5cd.json