Merge remote-tracking branch 'origin/main' into feat/muxed_keys

.github/workflows/binaries.yml

@@ -157,6 +157,6 @@ jobs:
               repo: context.repo.repo,
               release_id: ${{ github.event.release.id }},
               name: '${{ env.STELLAR_CLI_INSTALLER }}',
-              data: fs.readFileSync('Output/stellar-installer.exe'),
+              data: fs.readFileSync('${{ env.STELLAR_CLI_INSTALLER }}'),
             });
 

.github/workflows/bindings-ts.yml

@@ -19,7 +19,7 @@ jobs:
           NETWORK: local
           ENABLE_SOROBAN_RPC: true
         options: >-
-          --health-cmd "curl --no-progress-meter --fail-with-body -X POST \"http://localhost:8000/soroban/rpc\" -H 'Content-Type: application/json' -d '{\"jsonrpc\":\"2.0\",\"id\":8675309,\"method\":\"getNetwork\"}' && curl --no-progress-meter \"http://localhost:8000/friendbot\" | grep '\"invalid_field\": \"addr\"'"
+          --health-cmd "curl --no-progress-meter --fail-with-body -X POST \"http://localhost:8000/rpc\" -H 'Content-Type: application/json' -d '{\"jsonrpc\":\"2.0\",\"id\":8675309,\"method\":\"getNetwork\"}' && curl --no-progress-meter \"http://localhost:8000/friendbot\" | grep '\"invalid_field\": \"addr\"'"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 50

Cargo.toml

@@ -19,24 +19,24 @@ exclude = [
 ]
 
 [workspace.package]
-version = "22.0.1"
+version = "22.1.0"
 rust-version = "1.81.0"
 
 # Dependencies located in this repo:
 [workspace.dependencies.soroban-cli]
-version = "=22.0.1"
+version = "=22.1.0"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.soroban-spec-json]
-version = "=22.0.1"
+version = "=22.1.0"
 path = "./cmd/crates/soroban-spec-json"
 
 [workspace.dependencies.soroban-spec-typescript]
-version = "22.0.1"
+version = "22.1.0"
 path = "./cmd/crates/soroban-spec-typescript"
 
 [workspace.dependencies.soroban-spec-tools]
-version = "22.0.1"
+version = "22.1.0"
 path = "./cmd/crates/soroban-spec-tools"
 
 # Dependencies from the rs-stellar-xdr repo:

FULL_HELP_DOCS.md

@@ -944,7 +944,7 @@ Create and manage identities including keys and addresses
 * `generate` — Generate a new identity with a seed phrase, currently 12 words
 * `ls` — List identities
 * `rm` — Remove an identity
-* `show` — Given an identity return its private key
+* `secret` — Output an identity's secret key
 * `use` — Set the default identity that will be used on all commands. This allows you to skip `--source-account` or setting a environment variable, while reusing this value in all commands that require it
 
 
@@ -1070,11 +1070,11 @@ Remove an identity
 
 
 
-## `stellar keys show`
+## `stellar keys secret`
 
-Given an identity return its private key
+Output an identity's secret key
 
-**Usage:** `stellar keys show [OPTIONS] <NAME>`
+**Usage:** `stellar keys secret [OPTIONS] <NAME>`
 
 ###### **Arguments:**
 

cmd/crates/soroban-spec-typescript/ts-tests/.env

@@ -1,3 +1,3 @@
-SOROBAN_NETWORK_PASSPHRASE="Standalone Network ; February 2017"
-SOROBAN_RPC_URL="http://localhost:8000/soroban/rpc"
-SOROBAN_FRIENDBOT_URL="http://localhost:8000/friendbot"
+STELLAR_NETWORK_PASSPHRASE="Standalone Network ; February 2017"
+STELLAR_RPC_URL="http://localhost:8000/rpc"
+STELLAR_FRIENDBOT_URL="http://localhost:8000/friendbot"

cmd/crates/soroban-spec-typescript/ts-tests/initialize.sh

@@ -10,10 +10,10 @@ done
 unset IFS
 
 echo Network
-echo "  RPC:        $SOROBAN_RPC_URL"
-echo "  Passphrase: \"$SOROBAN_NETWORK_PASSPHRASE\""
+echo "  RPC:        $STELLAR_RPC_URL"
+echo "  Passphrase: \"$STELLAR_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; }
+NETWORK_STATUS=$(curl -s -X POST "http://localhost:8000/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"
 
 if [[ "$NETWORK_STATUS" != "healthy" ]]; then
@@ -22,28 +22,28 @@ if [[ "$NETWORK_STATUS" != "healthy" ]]; then
 fi
 
 # Print command before executing, from https://stackoverflow.com/a/23342259/249801
-# Discussion: https://github.com/stellar/soroban-tools/pull/1034#pullrequestreview-1690667116
+# Discussion: https://github.com/stellar/stellar-tools/pull/1034#pullrequestreview-1690667116
 exe() { echo"${@/eval/}" ; "$@" ; }
 
 function fund_all() {
-  exe eval "./soroban keys generate root"
-  exe eval "./soroban keys fund root"
+  exe eval "./stellar keys generate --fund root"
 }
 function upload() {
-  exe eval "(./soroban contract $1 --quiet --source root --wasm $2 --ignore-checks) > $3"
+  exe eval "(./stellar contract $1 --quiet --source root --wasm $2 --ignore-checks) > $3"
 }
 function deploy_all() {
   upload deploy ../../../../target/wasm32-unknown-unknown/test-wasms/test_custom_types.wasm contract-id-custom-types.txt
-  # TODO: support `--wasm-hash` with `contract bindings`
   upload install ../../../../target/wasm32-unknown-unknown/test-wasms/test_constructor.wasm contract-wasm-hash-constructor.txt
+  exe eval "./stellar contract asset deploy --asset native --source root"
 }
 function bind() {
-  exe eval "./soroban contract bindings typescript $1 $2 --output-dir ./node_modules/$3 --overwrite"
+  exe eval "./stellar contract bindings typescript $1 $2 --output-dir ./node_modules/$3 --overwrite"
   exe eval "sh -c \"cd ./node_modules/$3 && npm install && npm run build\""
 }
 function bind_all() {
   bind --contract-id $(cat contract-id-custom-types.txt) test-custom-types
   bind --wasm-hash $(cat contract-wasm-hash-constructor.txt) test-constructor
+  bind --contract-id $(./stellar contract id asset --asset native) xlm
 }
 
 fund_all

cmd/crates/soroban-spec-typescript/ts-tests/src/test-xlm-lib-from-sac.ts

@@ -0,0 +1,15 @@
+import test from "ava"
+import { rpcUrl, root, signer } from "./util.js"
+import { Client, networks } from "xlm"
+
+const contract = new Client({
+  ...networks.standalone,
+  rpcUrl,
+  allowHttp: true,
+  publicKey: root.keypair.publicKey(),
+  ...signer,
+})
+
+test("can generate a lib from a Stellar Asset Contract", async (t) => {
+  t.is((await contract.symbol()).result, "native");
+});

cmd/crates/soroban-spec-typescript/ts-tests/src/util.ts

@@ -3,7 +3,7 @@ import { Address, Keypair } from "@stellar/stellar-sdk";
 import { basicNodeSigner } from "@stellar/stellar-sdk/contract";
 
 const rootKeypair = Keypair.fromSecret(
-  spawnSync("./soroban", ["keys", "show", "root"], {
+  spawnSync("./soroban", ["keys", "secret", "root"], {
     shell: true,
     encoding: "utf8",
   }).stdout.trim(),
@@ -14,9 +14,9 @@ export const root = {
   address: Address.fromString(rootKeypair.publicKey()),
 };
 
-export const rpcUrl = process.env.SOROBAN_RPC_URL ?? "http://localhost:8000/";
+export const rpcUrl = process.env.STELLAR_RPC_URL ?? "http://localhost:8000/";
 export const networkPassphrase =
-  process.env.SOROBAN_NETWORK_PASSPHRASE ??
+  process.env.STELLAR_NETWORK_PASSPHRASE ??
   "Standalone Network ; February 2017";
 
 export const signer = basicNodeSigner(root.keypair, networkPassphrase);

cmd/crates/soroban-test/src/lib.rs

@@ -285,7 +285,7 @@ impl TestEnv {
 
     /// Returns the private key corresponding to the test keys's `hd_path`
     pub fn test_show(&self, hd_path: usize) -> String {
-        self.cmd::<keys::show::Cmd>(&format!("--hd-path={hd_path}"))
+        self.cmd::<keys::secret::Cmd>(&format!("--hd-path={hd_path}"))
             .private_key()
             .unwrap()
             .to_string()

cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stellar-bye"
-version = "22.0.1"
+version = "22.1.0"
 edition = "2021"
 publish = false
 

cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "soroban-hello"
-version = "22.0.1"
+version = "22.1.0"
 edition = "2021"
 publish = false
 

cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_constructor"
-version = "22.0.1"
+version = "22.1.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"

cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_custom_account"
-version = "22.0.1"
+version = "22.1.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"

cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_custom_types"
-version = "22.0.1"
+version = "22.1.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"

cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_hello_world"
-version = "22.0.1"
+version = "22.1.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"

cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_swap"
-version = "22.0.1"
+version = "22.1.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"

cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_token"
-version = "22.0.1"
+version = "22.1.0"
 description = "Soroban standard token contract"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"

cmd/crates/soroban-test/tests/it/config.rs

@@ -283,7 +283,7 @@ fn use_env() {
 
     sandbox
         .new_assert_cmd("keys")
-        .arg("show")
+        .arg("secret")
         .arg("bob")
         .assert()
         .success()
@@ -330,7 +330,7 @@ fn config_dirs_precedence() {
 
     sandbox
         .new_assert_cmd("keys")
-        .arg("show")
+        .arg("secret")
         .arg("alice")
         .arg("--verbose")
         .assert()