fix(bindings-ts): latest RPC & stellar-sdk

- update to `[email protected]` - fetch expiration using new `getFootprint` logic - improve `initialize.sh` to show network status - latest RPC returns better error messages - deal with these and parse `getHealth` response
stellar · Dec 14, 2023 · 873ad47 · 873ad47
1 parent c1fef8f
commit 873ad47
Show file tree

Hide file tree

Showing 5 changed files with 335 additions and 351 deletions.
diff --git a/cmd/crates/soroban-spec-typescript/src/project_template/package.json b/cmd/crates/soroban-spec-typescript/src/project_template/package.json
@@ -4,7 +4,7 @@
     "dependencies": {
         "@stellar/freighter-api": "1.7.1",
         "buffer": "6.0.3",
-        "stellar-sdk": "11.0.0-beta.6"
+        "stellar-sdk": "11.0.0"
     },
     "scripts": {
         "build": "node ./scripts/build.mjs"

diff --git a/cmd/crates/soroban-spec-typescript/src/project_template/src/assembled-tx.ts b/cmd/crates/soroban-spec-typescript/src/project_template/src/assembled-tx.ts
@@ -297,16 +297,15 @@ export class AssembledTransaction<T> {
   }
 
   getStorageExpiration = async () => {
-    const key = new Contract(this.options.contractId).getFootprint()[1]
-
-    const expirationKey = xdr.LedgerKey.expiration(
-      new xdr.LedgerKeyExpiration({ keyHash: hash(key.toXDR()) }),
+    const entryRes = await this.server.getLedgerEntries(
+      new Contract(this.options.contractId).getFootprint()
     )
-
-    const entryRes = await this.server.getLedgerEntries(expirationKey)
-    if (!(entryRes.entries && entryRes.entries.length)) throw new Error('failed to get ledger entry')
-
-    return entryRes.entries[0].val.expiration().expirationLedgerSeq()
+    if (
+      !entryRes.entries ||
+      !entryRes.entries.length ||
+      !entryRes.entries[0].liveUntilLedgerSeq
+    ) throw new Error('failed to get ledger entry')
+    return entryRes.entries[0].liveUntilLedgerSeq
   }
 
   /**

diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/initialize.sh b/cmd/crates/soroban-spec-typescript/ts-tests/initialize.sh
@@ -13,6 +13,9 @@ echo Network
 echo "  RPC:        $SOROBAN_RPC_URL"
 echo "  Passphrase: \"$SOROBAN_NETWORK_PASSPHRASE\""
 
+NETWORK_STATUS=$(curl -s -X POST "http://localhost:8000/soroban/rpc" -H "Content-Type: application/json" -d '{ "jsonrpc": "2.0", "id": 8675309, "method": "getHealth" }' | sed 's/.*"status":"\(.*\)".*/\1/') || { echo "Make sure you're running local RPC network on localhost:8000" && exit 1; }
+echo "  Status:     $NETWORK_STATUS"
+
 # Print command before executing, from https://stackoverflow.com/a/23342259/249801
 # Discussion: https://github.com/stellar/soroban-tools/pull/1034#pullrequestreview-1690667116
 exe() { echo"${@/eval/}" ; "$@" ; }