upgrade starshipjs v2.0.0

osmosis-labs · Jun 7, 2024 · b8d11e8 · b8d11e8
1 parent c456184
commit b8d11e8
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 63 deletions.
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -20,8 +20,8 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20.x'
-          cache: 'yarn'
+          node-version: "20.x"
+          cache: "yarn"
 
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -31,7 +31,7 @@ jobs:
 
       - name: Set Up Starship Infrastructure
         id: starship-infra
-        uses: cosmology-tech/[email protected].12
+        uses: cosmology-tech/[email protected].19
         with:
           values: packages/osmojs/starship/configs/config.workflow.yaml
           port-forward: true

diff --git a/packages/osmo-query/package.json b/packages/osmo-query/package.json
@@ -39,8 +39,7 @@
     "@protobufs/google": "^0.0.10",
     "@protobufs/ibc": "^0.1.0",
     "@protobufs/osmosis": "^0.4.0",
-    "@protobufs/tendermint": "^0.0.10",
-    "@starship-ci/cli": "1.5.0"
+    "@protobufs/tendermint": "^0.0.10"
   },
   "dependencies": {
     "@cosmjs/amino": "0.32.3",
@@ -56,4 +55,4 @@
     "dex",
     "tanstack"
   ]
-}
+}
diff --git a/packages/osmojs/package.json b/packages/osmojs/package.json
@@ -46,8 +46,8 @@
     "@protobufs/ibc": "^0.1.0",
     "@protobufs/osmosis": "^0.4.0",
     "@protobufs/tendermint": "^0.0.10",
-    "@starship-ci/cli": "^1.5.0",
-    "starshipjs": "^1.1.4"
+    "@starship-ci/cli": "^2.0.0",
+    "starshipjs": "^2.0.0"
   },
   "dependencies": {
     "@cosmjs/amino": "0.32.3",

diff --git a/packages/osmojs/starship/README.md b/packages/osmojs/starship/README.md
@@ -6,14 +6,11 @@ Deploy
 # setup helm/starship
 yarn starship setup
 
-# sanity check
-yarn starship get-pods
-
 # deploy starship
 yarn starship deploy
 
 # wait til STATUS=Running
-yarn starship get-pods
+yarn starship wait-for-pods 
 
 # port forwarding
 yarn starship start-ports

diff --git a/packages/osmojs/starship/__tests__/token.test.ts b/packages/osmojs/starship/__tests__/token.test.ts
@@ -82,7 +82,7 @@ describe('Token transfers', () => {
     const {
       chainInfo: cosmosChainInfo,
       getRpcEndpoint: cosmosRpcEndpoint
-    } = useChain('cosmos');
+    } = useChain('cosmoshub');
 
     const {
       getRpcEndpoint: osmosisRpcEndpoint

diff --git a/packages/osmojs/starship/configs/config.workflow.yaml b/packages/osmojs/starship/configs/config.workflow.yaml
@@ -1,6 +1,6 @@
 chains:
-  - name: osmosis-1
-    type: osmosis
+  - id: osmosis-1
+    name: osmosis
     image: pyramation/osmosis:v16.1.0
     numValidators: 1
     ports:
@@ -10,8 +10,8 @@ chains:
     resources:
       cpu: "0.2"
       memory: "200M"
-  - name: cosmos-2
-    type: cosmos
+  - id: cosmos-2
+    name: cosmoshub
     numValidators: 1
     ports:
       rest: 1313

diff --git a/packages/osmojs/starship/configs/config.yaml b/packages/osmojs/starship/configs/config.yaml
@@ -1,15 +1,15 @@
 chains:
-  - name: osmosis-1
-    type: osmosis
+  - id: osmosis-1
+    name: osmosis
     image: pyramation/osmosis:v16.1.0
     numValidators: 1
     ports:
       rest: 1317
       rpc: 26657
       faucet: 8007
 
-  - name: cosmos-2
-    type: cosmos
+  - id: cosmos-2
+    name: cosmoshub
     numValidators: 1
     ports:
       rest: 1313

diff --git a/packages/osmojs/starship/configs/starship.yaml b/packages/osmojs/starship/configs/starship.yaml
@@ -1,3 +1,3 @@
 helmName: osmojs
 helmFile: ./config.yaml
-helmVersion: v0.1.38
+helmVersion: v0.2.3
diff --git a/yarn.lock b/yarn.lock
@@ -2516,22 +2516,22 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
-"@starship-ci/cli@1.5.0", "@starship-ci/cli@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@starship-ci/cli/-/cli-1.5.0.tgz#c761dfe569bd862fa11599321faaab450ed6cc7b"
-  integrity sha512-Ks3fPCFpVfw1qGxY7S57qFEUe6Ew3Q9YiiYK6bUWH86xcQLtLAdNBJZF39XZom9RXBcKwnStxF0vI0TCBYc5QA==
+"@starship-ci/cli@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@starship-ci/cli/-/cli-2.0.0.tgz#757ea531f75d737222ca8008067f4896a362f6a8"
+  integrity sha512-o1e5bohkgD+J8fnNjj1+oYxkoi8BKAl5r5ItNzqy70HZyCHMmj39zzcosMwf9HmNi1/6h+jYi48QGCVk7oyS5w==
   dependencies:
-    "@starship-ci/client" "^1.3.0"
+    "@starship-ci/client" "^2.0.0"
     chalk "^4.1.0"
     deepmerge "^4.3.1"
     inquirerer "^1.9.0"
     js-yaml "^4.1.0"
     minimist "^1.2.8"
 
-"@starship-ci/client@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@starship-ci/client/-/client-1.3.0.tgz#7d60634da04bc65ac5519460ad3d41a8b44b02ab"
-  integrity sha512-zV5rygG34LhNxQG8RJiNxuoC2ZJ6fivm2EC/SpRIoxYJRC2NNVZDBhMiF9kTRBYCTkMM5mRUxiWdmRIwLR30JQ==
+"@starship-ci/client@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@starship-ci/client/-/client-2.0.0.tgz#b773d8c9e584ff9df381c184f7137eb2955b539e"
+  integrity sha512-zm2orIEeWCLx5GIcUnGQpx1W+q1ibFUbWefwM+OT0YLcL+An+9/wn/A7iYs+Hkm5pp/QtIH2v53fl6Oo2cHftQ==
   dependencies:
     chalk "^4.1.0"
     deepmerge "^4.3.1"
@@ -8306,10 +8306,10 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-starshipjs@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/starshipjs/-/starshipjs-1.1.4.tgz#92c465eef382de08ca57095605de1f022c06081d"
-  integrity sha512-O3dXm+K9KdTCwk72cg2dWDQSGEAhtG7VHshathDsxIDz3W4bM83xC+y391EwbfVEXjE2F0Dne/bkVWS/rc5u1A==
+starshipjs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/starshipjs/-/starshipjs-2.0.0.tgz#fff1cb9f20a1a55eb11a14bd3921e7c5f27b95f3"
+  integrity sha512-/HtP54nYaypWyREh1e98vw2YpkNEb2nwVDkwtCxAEY0xYL4xLNqnWyIA1xVju6t/uARNALSQynTR1hMp4QFzNg==
   dependencies:
     "@chain-registry/client" "1.18.1"
     js-yaml "^4.1.0"
@@ -8323,16 +8323,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -8377,7 +8368,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -8405,13 +8396,6 @@ strip-ansi@^5.1.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -9051,7 +9035,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -9069,15 +9053,6 @@ wrap-ansi@^6.0.1:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"