Merge branch 'master' into sep-0043-wallet-interface

stellar · Jun 11, 2024 · 837f126 · 837f126
2 parents 445f96a + fa21cd2
commit 837f126
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 54 deletions.
diff --git a/core/README.md b/core/README.md
@@ -67,6 +67,11 @@
 | [CAP-0046-10](cap-0046-10.md) | 20 | Smart Contract Budget Metering | Jay Geng | Final |
 | [CAP-0046-11](cap-0046-11.md) | 20 | Soroban Authorization Framework | Dmytro Kozhevin | Final |
 | [CAP-0046-12](cap-0046-12.md) | 20 | Soroban State Archival Interface | Garand Tyson | Final |
+| [CAP-0051](cap-0051.md) | 21 | Smart Contract Host Functionality: Secp256r1 Verification | Leigh McCulloch | Implemented |
+| [CAP-0053](cap-0053.md) | 21 | Separate host functions to extend the TTL for contract instance and contract code | Tommaso De Ponti | Implemented |
+| [CAP-0054](cap-0054.md) | 21 | Soroban refined VM instantiation cost model | Graydon Hoare | Implemented |
+| [CAP-0055](cap-0055.md) | 21 | Soroban streamlined linking | Graydon Hoare | Implemented |
+| [CAP-0056](cap-0056.md) | 21 | Soroban intra-transaction module caching | Graydon Hoare | Implemented |
 
 ### Draft Proposals
 | Number | Title | Author | Status |
@@ -85,11 +90,6 @@
 | [CAP-0043](cap-0043.md) | ECDSA Signers with P-256 and secp256k1 Curves | Leigh McCulloch | Draft |
 | [CAP-0044](cap-0044.md) | SPEEDEX - Configuration | Jonathan Jove | Draft |
 | [CAP-0045](cap-0045.md) | SPEEDEX - Pricing | Jonathan Jove | Draft |
-| [CAP-0051](cap-0051.md) | Smart Contract Host Functionality: Secp256r1 Verification | Leigh McCulloch | Accepted |
-| [CAP-0053](cap-0053.md) | Separate host functions to extend the TTL for contract instance and contract code | Tommaso De Ponti | Accepted |
-| [CAP-0054](cap-0054.md) | Soroban refined VM instantiation cost model | Graydon Hoare | Accepted |
-| [CAP-0055](cap-0055.md) | Soroban streamlined linking | Graydon Hoare | Accepted |
-| [CAP-0056](cap-0056.md) | Soroban intra-transaction module caching | Graydon Hoare | Accepted |
 
 ### Rejected Proposals
 | Number | Title | Author | Status |

diff --git a/core/cap-0051.md b/core/cap-0051.md
@@ -5,10 +5,10 @@ Working Group:
     Owner: Leigh McCulloch <@leighmcculloch>
     Authors: Leigh McCulloch <@leighmcculloch>
     Consulted: Graydon Hoare <@graydon>, Riad S. Wahby <@kwantam>
-Status: Accepted
+Status: Implemented
 Created: 2023-01-30
 Discussion: https://github.com/stellar/stellar-protocol/discussions/1435
-Protocol version: TBD
+Protocol version: 21
 ```
 
 ## Simple Summary

diff --git a/core/cap-0053.md b/core/cap-0053.md
@@ -7,10 +7,10 @@ Working Group:
     Owner: Anup Pani <@anupsdf>
     Authors: Tommaso De Ponti <@heytdep>
     Consulted: Leigh McCulloch <@leighmcculloch>, Dmytro Kozhevin <@dmkozh>
-Status: Accepted
+Status: Implemented
 Created: 2023-03-06
 Discussion: https://github.com/stellar/stellar-protocol/discussions/1447
-Protocol version: TBD
+Protocol version: 21
 ```
 
 ## Simple Summary

diff --git a/core/cap-0054.md b/core/cap-0054.md
@@ -7,10 +7,10 @@ Working Group:
     Owner: Graydon Hoare <@graydon>
     Authors: Graydon Hoare <@graydon>
     Consulted: Jay Geng <@jayz22>, Dmytro Kozhevin <@dmkozh>
-Status: Accepted
+Status: Implemented
 Created: 2024-03-11
 Discussion: https://github.com/stellar/stellar-protocol/discussions/1460
-Protocol version: TBD
+Protocol version: 21
 ```
 
 ## Simple Summary

diff --git a/core/cap-0055.md b/core/cap-0055.md
@@ -5,10 +5,10 @@ Working Group:
     Owner: Graydon Hoare <@graydon>
     Authors: Graydon Hoare <@graydon>
     Consulted: Jay Geng <@jayz22>, Dmytro Kozhevin <@dmkozh>
-Status: Accepted
+Status: Implemented
 Created: 2024-03-13
 Discussion: https://github.com/stellar/stellar-protocol/discussions/1460
-Protocol version: TBD
+Protocol version: 21
 ```
 
 ## Simple Summary

diff --git a/core/cap-0056.md b/core/cap-0056.md
@@ -5,10 +5,10 @@ Working Group:
     Owner: Graydon Hoare <@graydon>
     Authors: Graydon Hoare <@graydon>
     Consulted: Jay Geng <@jayz22>, Dmytro Kozhevin <@dmkozh>, Nicolas Barry <@MonsieurNicolas>, Tomer Weller <@tomerweller>
-Status: Accepted
+Status: Implemented
 Created: 2024-03-13
 Discussion: https://github.com/stellar/stellar-protocol/discussions/1460
-Protocol version: TBD
+Protocol version: 21
 ```
 
 ## Simple Summary

diff --git a/ecosystem/sep-0001.md b/ecosystem/sep-0001.md
@@ -251,7 +251,7 @@ ORG_LOGO="https://www.domain.com/awesomelogo.png"
 ORG_DESCRIPTION="Description of issuer"
 ORG_PHYSICAL_ADDRESS="123 Sesame Street, New York, NY 12345, United States"
 ORG_PHYSICAL_ADDRESS_ATTESTATION="https://www.domain.com/address_attestation.jpg"
-ORG_PHONE_NUMBER="1 (123)-456-7890"
+ORG_PHONE_NUMBER="+14155552671"
 ORG_PHONE_NUMBER_ATTESTATION="https://www.domain.com/phone_attestation.jpg"
 ORG_KEYBASE="accountname"
 ORG_TWITTER="orgtweet"

diff --git a/ecosystem/sep-0006.md b/ecosystem/sep-0006.md
@@ -6,8 +6,8 @@ Title: Deposit and Withdrawal API
 Author: SDF
 Status: Active (Interactive components are deprecated in favor of SEP-24)
 Created: 2017-10-30
-Updated: 2024-02-21
-Version 4.0.0
+Updated: 2024-05-07
+Version 4.1.0
 ```
 
 ## Simple Summary
@@ -1426,6 +1426,7 @@ Each object in the `transactions` array should have the following fields:
 | `started_at`              | UTC ISO 8601 string | (optional) Start date and time of transaction.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `updated_at`              | UTC ISO 8601 string | (optional) The date and time of transaction reaching the current status.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | `completed_at`            | UTC ISO 8601 string | (optional) Completion date and time of transaction.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `user_action_required_by` | UTC ISO 8601 string | (optional) The date and time by when the user action is required. In certain statuses, such as `pending_user_transfer_start` or `incomplete`, anchor waits for the user action and `user_action_required_by` field should be used to show the time anchors gives for the user to make an action before transaction will automatically be moved into a different status (such as `expired` or to be `refunded`). `user_action_required_by` should only be specified for statuses where user action is required, and omitted for all other. Anchor should specify the action waited on using message or `more_info_url`.         |
 | `stellar_transaction_id`  | string              | (optional) transaction_id on Stellar network of the transfer that either completed the deposit or started the withdrawal.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | `external_transaction_id` | string              | (optional) ID of transaction on external network that either started the deposit or completed the withdrawal.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | `message`                 | string              | (optional) Human readable explanation of transaction status, if needed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
@@ -1443,6 +1444,9 @@ Each object in the `transactions` array should have the following fields:
   status when waiting on Bitcoin or other external crypto network to complete a transaction, or when waiting on a bank
   transfer.
 - `pending_anchor` -- deposit/withdrawal is being processed internally by anchor.
+- `on_hold` -- deposit/withdrawal is currently on hold for additional checks after receiving user's funds. Anchor may
+  use this status to indicate to the user that transaction is being reviewed (for example, for compliance reasons). Once
+  this status cleared, transaction should follow the regular flow.
 - `pending_stellar` -- deposit/withdrawal operation has been submitted to Stellar network, but is not yet confirmed.
 - `pending_trust` -- the user must add a trust-line for the asset for the deposit to complete.
 - `pending_user` -- the user must take additional action before the deposit / withdrawal can complete.
@@ -1785,6 +1789,8 @@ object containing an error message.
 
 ## Changelog
 
+- `v4.1.0` Add `user_action_required_by` field to transaction responses and add new `on_hold` status
+  ([#1484](https://github.com/stellar/stellar-protocol/pull/1484/))
 - `v4.0.0`: Update flow to delegate getting KYC fields to SEP-12
   ([#1432](https://github.com/stellar/stellar-protocol/pull/1431))
 - `v3.26.0`: Add `location_id` to deposit/withdrawal requests
@@ -1814,8 +1820,7 @@ object containing an error message.
   ([#1333](https://github.com/stellar/stellar-protocol/pull/1333))
 * `v3.16.0`: Add `refund_memo` and `refund_memo_type` to requests initiating transactions.
   ([#1321](https://github.com/stellar/stellar-protocol/pull/1321))
-* `v3.15.0`: Add `lang` to `/transactions` & `/transaction` parameters, update format to [RFC 4646].
-  ([#1320](https://github.com/stellar/stellar-protocol/pull/1320))
+* `v3.15.0`: Add `lang` to `/transactions` & `/transaction` parameters, update format to [RFC 4646]. ([#1320](https://github.com/stellar/stellar-protocol/pull/1320))
 * `v3.14.0`: Add `quote_id` to the transaction object schema.
   ([#1268](https://github.com/stellar/stellar-protocol/pull/1268))
 * `v3.13.0`: Add callback signature requirement. ([#1262](https://github.com/stellar/stellar-protocol/pull/1262))

diff --git a/ecosystem/sep-0008.md b/ecosystem/sep-0008.md
@@ -32,15 +32,15 @@ Implementing a regulated asset requires these parts:
 
 - Issuer account with appropriate [authorization flags] set.
 - [SEP-1 stellar.toml] used for discovering [Approval Server].
-- [Approval Server] that validates client transactions according to the service's approval criteria. Validated
-  transactions are signed by the asset's issuing account.
+- [Approval Server] that validates client transactions according to the service's approval criteria. Validated transactions
+  are signed by the asset's issuing account.
 
 ## Regulated Assets Transaction Flow
 
 1. Wallet creates and signs a transaction.
 2. Wallet resolves asset information and detects that it's an asset that requires authorization.
-   1. Wallet can detect whether an asset requires authorization by checking the [authorization flags] of the asset
-      issuer's account
+   1. Wallet can detect whether an asset requires authorization by checking the [authorization flags] of the asset issuer's
+      account
 3. Wallet detects that it's a regulated asset.
    1. Wallet can detect whether an asset is a regulated asset by checking for an approval server via [SEP-1
       stellar.toml] set up by the issuer
@@ -64,8 +64,8 @@ account. This allows the issuer to grant and revoke authorization to transact th
 
 ## SEP-1 stellar.toml
 
-Issuers advertise the existence of an Approval Service through their [SEP-1 stellar.toml] file. This is done in the
-`[[CURRENCIES]]` section as different assets can have different requirements.
+Issuers advertise the existence of an Approval Service through their [SEP-1 stellar.toml] file. This is done in the `[[CURRENCIES]]`
+section as different assets can have different requirements.
 
 ### Fields: