Merge branch 'main' into meeting-notes

stellar-deprecated · Feb 9, 2024 · 2245067 · 2245067
2 parents 8edb1b1 + 6009c60
commit 2245067
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 22,941 deletions.
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ basics:
 [Docusaurus]: https://docusaurus.io
 [MDX]: https://mdxjs.com
 [yarn]: https://yarnpkg.com/
-[Soroban RPC]: https://github.com/stellar.org/soroban-tools/cmd/soroban-rpc
+[Soroban RPC]: https://github.com/stellar.org/soroban-rpc/cmd/soroban-rpc
 [OpenRPC specification]: https://github.com/stellar/soroban-docs/blob/main/static/openrpc.json
 [create an issue]: https://github.com/stellar/soroban-docs/issues
 [Dapps Challenge]: https://soroban.stellar.org/dapps

diff --git a/docs/getting-started/hello-world.mdx b/docs/getting-started/hello-world.mdx
@@ -76,7 +76,7 @@ The `testutils` are automatically enabled inside [Rust unit tests] inside the sa
 
 ### Configure the `release` Profile
 
-Configuring the `release` profile to optimize the contract build is critical. Soroban contracts have a maximum size of 256KB. Rust programs, even small ones, without these configurations almost always exceed this size.
+Configuring the `release` profile to optimize the contract build is critical. Soroban contracts have a maximum size of 64KB. Rust programs, even small ones, without these configurations almost always exceed this size.
 
 Add the following to your `Cargo.toml` and use the `release` profile when building.
 

diff --git a/docs/reference/rpc.mdx b/docs/reference/rpc.mdx
@@ -27,7 +27,7 @@ The Quickstart image with the RPC service can run on a standard laptop with 8GB
 - [Friendbot server] - HTTP API for creating and funding new accounts on test networks.
 
 [Stellar Core]: https://github.com/stellar/stellar-core
-[Soroban RPC]: https://github.com/stellar/soroban-tools/tree/main/cmd/soroban-rpc
+[Soroban RPC]: https://github.com/stellar/soroban-rpc/tree/main/cmd/soroban-rpc
 [Horizon server]: https://github.com/stellar/go/tree/master/services/horizon
 [Friendbot server]: https://github.com/stellar/go/tree/master/services/friendbot
 
@@ -515,7 +515,7 @@ Note that the above generated configuration contains the default values and you
 
 ### Build From Source
 
-Instructions for building Soroban RPC from source can be found [here](https://github.com/stellar/soroban-tools/blob/main/cmd/soroban-rpc/README.md).
+Instructions for building Soroban RPC from source can be found [here](https://github.com/stellar/soroban-rpc/blob/main/cmd/soroban-rpc/README.md).
 
 ### Hardware Requirements
 

diff --git a/docs/releases.mdx b/docs/releases.mdx
@@ -14,6 +14,41 @@ Release candidates are software releases that are also released to the [Testnet]
 
 [Testnet]: reference/networks.mdx
 
+## Stable v20.1.0 (January 11, 2024)
+
+### Software
+
+| Software                     | Version                                                                                                                            |
+| ---------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
+| XDR                          | [bb54e505f814386a3f45172e0b7e95b7badbe969](https://github.com/stellar/stellar-xdr/commit/bb54e505f814386a3f45172e0b7e95b7badbe969) |
+| Soroban Environment          | `v20.1.0`                                                                                                                          |
+| Soroban Interface Version    | `0`                                                                                                                                |
+| Stellar Core                 | `v20.1.0`                                                                                                                          |
+| Soroban Rust SDK             | `v20.2.0`                                                                                                                          |
+| Soroban CLI                  | `v20.2.0`                                                                                                                          |
+| Soroban RPC                  | `v20.2.0`                                                                                                                          |
+| Stellar Horizon              | `v2.27.0`                                                                                                                          |
+| Stellar Friendbot            | `TBD`                                                                                                                              |
+| Stellar Quickstart           | `docker.io/stellar/quickstart:soroban-dev@sha256:64b2d14b8a531c534560e287768846f538b2f063fc776aa9ca016c788e86c782`                 |
+| Stellar JS Stellar Base      | [`v10.0.1`](https://github.com/stellar/js-stellar-base/releases/tag/v10.0.1)                                                       |
+| Stellar JS Stellar SDK       | [`v11.2.0`](https://github.com/stellar/js-stellar-sdk/releases/tag/v11.2.0)                                                        |
+| Freighter                    | `5.9.0`                                                                                                                            |
+| Laboratory                   | `TBD`                                                                                                                              |
+| Soroban React Payment dapp   | `TBD`                                                                                                                              |
+| Soroban Mint Token dapp      | `TBD`                                                                                                                              |
+| Soroban Swap Token dapp      | `TBD`                                                                                                                              |
+| Futurenet Network Passphrase | `Test SDF Future Network ; October 2022`                                                                                           |
+| Testnet Network Passphrase   | `Test SDF Network ; September 2015`                                                                                                |
+
+### Changelog
+
+#### Soroban Rust SDK
+
+- Fix bug with Timepoint/Duration as parameters/returns
+- Add storage update fns
+- Export functions for creating Timepoint/Duration
+- Allow `&Env` in contract fns
+
 ## Stable v20.0.0 (December 18, 2023)
 
 ### Software

diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -22,18 +22,6 @@ const config = {
   },
   plugins: [
     "docusaurus-plugin-sass",
-    // [
-    //   '@docusaurus/plugin-content-docs',
-    //   {
-    //     id: 'guides',
-    //     path: 'guides',
-    //     routeBasePath: 'guides',
-    //     sidebarPath: require.resolve('./sidebarsGuides.js'),
-    //     sidebarItemsGenerator: require('./src/sidebar-generator'),
-    //     editUrl: "https://github.com/stellar/soroban-docs/tree/main/",
-    //     showLastUpdateTime: true,
-    //   },
-    // ],
     [
       '@docusaurus/plugin-content-docs',
       {
@@ -71,6 +59,7 @@ const config = {
           showLastUpdateTime: true,
           showLastUpdateAuthor: true,
           breadcrumbs: true,
+          routeBasePath: "/docs",
           sidebarPath: require.resolve("./sidebars.js"),
           editUrl: "https://github.com/stellar/soroban-docs/tree/main/",
           sidebarItemsGenerator: require('./src/sidebar-generator'),
@@ -92,15 +81,14 @@ const config = {
       docs: {
         sidebar: {
           autoCollapseCategories: false,
-          // hideable: true,
         }
       },
       navbar: {
         logo: {
           width: 100,
           src: "img/soroban-wordmark-temp.svg",
           srcDark: "img/soroban-wordmark-temp-dark.svg",
-          href: "/",
+          href: "/docs",
         },
         items: [
           {
@@ -124,11 +112,6 @@ const config = {
             label: 'Dapps',
             position: 'left'
           },
-          // {
-          //   to: '/guides',
-          //   label: 'Guides',
-          //   position: 'left'
-          // },
           {
             href: 'https://github.com/stellar/soroban-docs',
             label: 'GitHub',

diff --git a/nginx/conf.d/default.conf b/nginx/conf.d/default.conf
@@ -6,13 +6,16 @@ server {
     server_name _;
     include includes/redirects.conf;
 
-    index index.html;
+    # index index.html;
     error_page 404 /404.html;
 
-    rewrite ^/(.*)/$ /$1 permanent;
+    location = / {
+        rewrite ^/$ /docs/ permanent;
+    }
 
     location / {
-        try_files $uri/index.html $uri/ $uri index.html =404;
+        rewrite ^/(.*)/$ /$1 permanent;
+        try_files $uri $uri/index.html $uri/ =404; # /index.html index.html =404;
     }
     location /diagrams/ {
         try_files $uri $uri/ =404;

diff --git a/nginx/includes/redirects.conf b/nginx/includes/redirects.conf
@@ -21,6 +21,7 @@ rewrite "^/docs/SDKs/rust$" "/docs/reference/sdks/write-contracts" permanent;
 rewrite "^/docs/getting-started/connect-freighter-wallet$" "/docs/reference/freighter" permanent;
 rewrite "^/docs/common-interfaces/token$" "/docs/tokens/token-interface" permanent;
 rewrite "^/docs/how-to-guides/tokens$" "/docs/tutorials/tokens" permanent;
+rewrite "^/dapps/category/challenges$" "/dashboard" permanent;
 # BEGIN re-structure redirects
 rewrite "^/sorobanathon" "/" permanent;
 rewrite "^/docs/reference/interfaces/token-interface" "/docs/tokens/token-interface" permanent;
@@ -38,5 +39,5 @@ rewrite "^/docs/fundamentals-and-concepts/(built-in-types|custom-types|fully-typ
 rewrite "^/docs/fundamentals-and-concepts/invoking-contracts-with-transactions$" "/docs/soroban-internals/contract-interactions/stellar-transaction" permanent;
 rewrite "^/docs/soroban-internals/contract-interactions/stellar-transactions$" "/docs/soroban-internals/contract-interactions/stellar-transaction" permanent;
 rewrite "^/docs/fundamentals-and-concepts/interacting-with-contracts$" "/docs/soroban-internals/contract-interactions" permanent;
-rewrite "^/docs/(basic|advanced)-tutorials(/.*)$" "/docs/tutorials/$2" permanent;
-rewrite "^/docs/fundamentals-and-concepts(/.*)$" "/docs/soroban-internals/$1" permanent;
+rewrite "^/docs/(basic|advanced)-tutorials(/.*)$" "/docs/tutorials$2" permanent;
+rewrite "^/docs/fundamentals-and-concepts(/.*)$" "/docs/soroban-internals$1" permanent;