Merge branch 'master' into typescript-fixups

stellar · Sep 12, 2024 · 6b17c83 · 6b17c83
2 parents c5c5f9b + 83c4960
commit 6b17c83
Show file tree

Hide file tree

Showing 20 changed files with 5,074 additions and 677 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 * Add missing methods to TypeScript definitions ([#766](https://github.com/stellar/js-stellar-base/pull/766)).
+* Fix the TypeScript definition of `walkInvocationTree` to allow void returns on the callback function as intended rather than forcing a `return null` ([#765](https://github.com/stellar/js-stellar-base/pull/765)).
 
 
 ## [`v12.1.0`](https://github.com/stellar/js-stellar-base/compare/v12.0.1...v12.1.0)

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-XDR_BASE_URL_CURR=https://github.com/stellar/stellar-xdr/raw/1a04392432dacc0092caaeae22a600ea1af3c6a5
+XDR_BASE_URL_CURR=https://github.com/stellar/stellar-xdr/raw/4ec28d95dd84b109253e22b151314478d6f00522
 XDR_BASE_LOCAL_CURR=xdr/curr
 XDR_FILES_CURR= \
 	Stellar-SCP.x \
@@ -14,7 +14,7 @@ XDR_FILES_CURR= \
 	Stellar-contract-config-setting.x
 XDR_FILES_LOCAL_CURR=$(addprefix xdr/curr/,$(XDR_FILES_CURR))
 
-XDR_BASE_URL_NEXT=https://github.com/stellar/stellar-xdr/raw/4bd4827b3361f266d295cbc83c5d7f7396d782d9
+XDR_BASE_URL_NEXT=https://github.com/stellar/stellar-xdr/raw/86b4ff573c3e9a475f9280b97645cc75e2c75b6e
 XDR_BASE_LOCAL_NEXT=xdr/next
 XDR_FILES_NEXT= \
 	Stellar-SCP.x \