Merge pull request #1495 from psgreco/elem-23.3.1-rc2

Prepare 23.3.1rc2

Author: psgreco

build_msvc/libelementssimplicity/libelementssimplicity.vcxproj

@@ -9,7 +9,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\simplicity\bitstream.c" />
-    <ClCompile Include="..\..\src\simplicity\cmr.c" />
     <ClCompile Include="..\..\src\simplicity\dag.c" />
     <ClCompile Include="..\..\src\simplicity\deserialize.c" />
     <ClCompile Include="..\..\src\simplicity\eval.c" />
@@ -20,11 +19,13 @@
     <ClCompile Include="..\..\src\simplicity\sha256.c" />
     <ClCompile Include="..\..\src\simplicity\type.c" />
     <ClCompile Include="..\..\src\simplicity\typeInference.c" />
-    <ClCompile Include="..\..\src\simplicity\primitive\elements\env.c" />
-    <ClCompile Include="..\..\src\simplicity\primitive\elements\exec.c" />
-    <ClCompile Include="..\..\src\simplicity\primitive\elements\elementsJets.c" />
-    <ClCompile Include="..\..\src\simplicity\primitive\elements\ops.c" />
-    <ClCompile Include="..\..\src\simplicity\primitive\elements\primitive.c" />
+    <ClCompile Include="..\..\src\simplicity\elements\cmr.c" />
+    <ClCompile Include="..\..\src\simplicity\elements\env.c" />
+    <ClCompile Include="..\..\src\simplicity\elements\exec.c" />
+    <ClCompile Include="..\..\src\simplicity\elements\elementsJets.c" />
+    <ClCompile Include="..\..\src\simplicity\elements\ops.c" />
+    <ClCompile Include="..\..\src\simplicity\elements\primitive.c" />
+    <ClCompile Include="..\..\src\simplicity\elements\txEnv.c" />
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>

ci/test/04_install.sh

@@ -11,7 +11,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
 fi
 
 if [ "$CI_OS_NAME" == "macos" ]; then
-  sudo -H pip3 install --upgrade --break-system-packages pip
+  sudo -H pip3 install --upgrade --break-system-packages --ignore-installed pip
   # shellcheck disable=SC2086
   IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
 fi

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 23)
 define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_BUILD, 1)
-define(_CLIENT_VERSION_RC, 1)
+define(_CLIENT_VERSION_RC, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2025)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

doc/tapscript_opcodes.md

@@ -17,7 +17,7 @@ Taproot already increases a lot of resource limitations from segwitv0, so there
 1. **Streaming Opcodes for streaming hashes**: There is an existing limitation of `MAX_SCRIPT_ELEMENT_SIZE`(520 bytes) because of which we cannot operate hash functions like `OP_SHA256` on messages more than 520 bytes. This allows hashing on more than 520 bytes while still preserving the existing security against resource exhaustion attacks. The proposal for this  by Russell O'Connor can be found in the description [here](https://github.com/ElementsProject/elements/pull/817).
    1. Define `OP_SUCCESS196` as `OP_SHA256INITIALIZE` which pops a bytestring and push SHA256 context creating by adding the bytestring to the initial SHA256 context.
    1. Define `OP_SUCCESS197` as `OP_SHA256UPDATE` which first pops a bytestring followed by another pop for SHA256 context and pushes an updated context by adding the bytestring to the data stream being hashed.
-   1. Define `OP_SUCCESS198` as `OP_SHA256FINALIZE` which first pops a pops a bytestring followed by another pop for SHA256 context and finally pushes a SHA256 hash value after adding the bytestring and completing the padding.
+   1. Define `OP_SUCCESS198` as `OP_SHA256FINALIZE` which first pops a bytestring followed by another pop for SHA256 context and finally pushes a SHA256 hash value after adding the bytestring and completing the padding.
 
 
 2. **Transaction Introspection codes**: Transaction introspection is already possible in elements script by use of `OP_CHECKSIGFROMSTACKVERIFY`, however the current solutions are really expensive in applications like [covenants](https://github.com/sanket1729/covenants-demo). Therefore, we are not adding any new functionality by supporting introspection, only making it easier to use. The warning still remains the same as with covenants, if the user is inspecting data from parts of the transaction that are not signed, the script can cause unexpected behavior.

src/chainparams.cpp

@@ -227,6 +227,7 @@ class CMainParams : public CChainParams {
         consensus.connect_genesis_outputs = false;
         consensus.subsidy_asset = CAsset();
         anyonecanspend_aremine = false;
+        accept_unlimited_issuances = false;
         enforce_pak = false;
         multi_data_permitted = false;
         accept_discount_ct = false;
@@ -374,6 +375,7 @@ class CTestNetParams : public CChainParams {
         consensus.subsidy_asset = CAsset();
         anyonecanspend_aremine = false;
         enforce_pak = false;
+        accept_unlimited_issuances = false;
         multi_data_permitted = false;
         accept_discount_ct = false;
         create_discount_ct = false;
@@ -538,6 +540,7 @@ class SigNetParams : public CChainParams {
         consensus.subsidy_asset = CAsset();
         anyonecanspend_aremine = false;
         enforce_pak = false;
+        accept_unlimited_issuances = false;
         multi_data_permitted = false;
         accept_discount_ct = false;
         create_discount_ct = false;
@@ -641,6 +644,7 @@ class CRegTestParams : public CChainParams {
         consensus.subsidy_asset = CAsset();
         anyonecanspend_aremine = false;
         enforce_pak = false;
+        accept_unlimited_issuances = false;
         multi_data_permitted = false;
         accept_discount_ct = false;
         create_discount_ct = false;
@@ -909,6 +913,8 @@ class CCustomParams : public CRegTestParams {
 
         enforce_pak = args.GetBoolArg("-enforce_pak", false);
 
+        accept_unlimited_issuances = args.GetBoolArg("-acceptunlimitedissuances", accept_unlimited_issuances);
+
         // Allow multiple op_return outputs by relay policy
         multi_data_permitted = args.GetBoolArg("-multi_data_permitted", enforce_pak);
 
@@ -1167,6 +1173,8 @@ class CLiquidV1Params : public CChainParams {
 
         enforce_pak = true;
 
+        accept_unlimited_issuances = false;
+
         multi_data_permitted = true;
         create_discount_ct = args.GetBoolArg("-creatediscountct", false);
         accept_discount_ct = args.GetBoolArg("-acceptdiscountct", true) || create_discount_ct;
@@ -1525,6 +1533,8 @@ class CLiquidV1TestParams : public CLiquidV1Params {
 
         enforce_pak = args.GetBoolArg("-enforce_pak", enforce_pak);
 
+        accept_unlimited_issuances = args.GetBoolArg("-acceptunlimitedissuances", accept_unlimited_issuances);
+
         multi_data_permitted = args.GetBoolArg("-multi_data_permitted", multi_data_permitted);
         create_discount_ct = args.GetBoolArg("-creatediscountct", create_discount_ct);
         accept_discount_ct = args.GetBoolArg("-acceptdiscountct", accept_discount_ct) || create_discount_ct;

src/chainparams.h

@@ -134,6 +134,7 @@ class CChainParams
     const std::string& ParentBech32HRP() const { return parent_bech32_hrp; }
     const std::string& ParentBlech32HRP() const { return parent_blech32_hrp; }
     bool GetEnforcePak() const { return enforce_pak; }
+    bool GetAcceptUnlimitedIssuances() const { return accept_unlimited_issuances; }
     bool GetMultiDataPermitted() const { return multi_data_permitted; }
     bool GetAcceptDiscountCT() const { return accept_discount_ct; }
     bool GetCreateDiscountCT() const { return create_discount_ct; }
@@ -168,6 +169,7 @@ class CChainParams
     std::string parent_bech32_hrp;
     std::string parent_blech32_hrp;
     bool enforce_pak;
+    bool accept_unlimited_issuances;
     bool multi_data_permitted;
     bool accept_discount_ct;
     bool create_discount_ct;

src/chainparamsbase.cpp

@@ -61,6 +61,7 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman)
     argsman.AddArg("-total_valid_epochs", "Per-chain parameter that sets how long a particular fedpegscript is in effect for.", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
     argsman.AddArg("-evbparams=deployment:start:end:period:threshold", "Use given start/end times for specified version bits deployment (regtest or custom only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::ELEMENTS);
     argsman.AddArg("-con_start_p2wsh_script", "Create p2wsh addresses when starting in dynafed mode (regtest or custom only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::ELEMENTS);
+    argsman.AddArg("-acceptunlimitedissuances", "Allow unblinded issuance amounts to exceed 21 million units", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
     // END ELEMENTS
     //
 }

src/confidential_validation.cpp

@@ -1,4 +1,5 @@
 
+#include <chainparams.h>
 #include <confidential_validation.h>
 #include <issuance.h>
 #include <pegins.h>
@@ -30,8 +31,9 @@ bool HasValidFee(const CTransaction& tx) {
         CAmount fee = 0;
         if (tx.vout[i].IsFee()) {
             fee = tx.vout[i].nValue.GetAmount();
-            if (fee == 0 || !MoneyRange(fee))
+            if (fee == 0 || !MoneyRange(fee)) {
                 return false;
+            }
             totalFee[tx.vout[i].nAsset.GetAsset()] += fee;
             if (!MoneyRange(totalFee)) {
                 return false;
@@ -102,14 +104,13 @@ static bool VerifyIssuanceAmount(secp256k1_pedersen_commitment& value_commit, se
 
     // Build value commitment
     if (value.IsExplicit()) {
-        if (!MoneyRange(value.GetAmount()) || value.GetAmount() == 0) {
+        if ((asset == Params().GetConsensus().pegged_asset && !MoneyRange(value.GetAmount())) || value.GetAmount() <= 0) {
             return false;
         }
         if (!rangeproof.empty()) {
             return false;
         }
 
-
         ret = secp256k1_pedersen_commit(secp256k1_ctx_verify_amounts, &value_commit, explicit_blinds, value.GetAmount(), &asset_gen);
         // The explicit_blinds are all 0, and the amount is not 0. So secp256k1_pedersen_commit does not fail.
         assert(ret == 1);

src/key_io.cpp

@@ -152,11 +152,14 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par
     uint160 hash;
     error_str = "";
 
+    bool is_bech32 = !(bech32::Decode(str).encoding == bech32::Encoding::INVALID);
+    bool is_blech32 = !(blech32::Decode(str).encoding == blech32::Encoding::INVALID);
+
     // Note this will be false if it is a valid Bech32 address for a different network
-    bool is_bech32 = (ToLower(str.substr(0, params.Bech32HRP().size())) == params.Bech32HRP());
-    bool is_blech32 = (ToLower(str.substr(0, params.Blech32HRP().size())) == params.Blech32HRP());
+    bool is_bech32_hrp = (ToLower(str.substr(0, params.Bech32HRP().size())) == params.Bech32HRP());
+    bool is_blech32_hrp = (ToLower(str.substr(0, params.Blech32HRP().size())) == params.Blech32HRP());
 
-    if (!is_bech32 && !is_blech32 && DecodeBase58Check(str, data, 55)) {
+    if (!is_bech32 && !is_blech32 && !is_bech32_hrp && !is_blech32_hrp && DecodeBase58Check(str, data, 55)) {
         // base58-encoded Bitcoin addresses.
         // Public-key-hash-addresses have version 0 (or 111 testnet).
         // The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
@@ -206,14 +209,14 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par
             error_str = "Invalid prefix for Base58-encoded address";
         }
         return CNoDestination();
-    } else if (!is_bech32 && !is_blech32) {
+    } else if (!is_bech32 && !is_blech32 && !is_bech32_hrp && !is_blech32_hrp) {
         // Try Base58 decoding without the checksum, using a much larger max length
         if (!DecodeBase58(str, data, 100)) {
             error_str = "Not a valid Bech32 or Base58 encoding";
         } else {
             error_str = "Invalid checksum or length of Base58 address";
         }
-        // return CNoDestination(); // ELEMENTS: FIXME
+        return CNoDestination();
     }
 
     data.clear();

src/policy/policy.cpp

@@ -308,6 +308,20 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
     return true;
 }
 
+bool IsIssuanceInMoneyRange(const CTransaction& tx)
+{
+    for (size_t i = 0; i < tx.vin.size(); ++i) {
+        const CAssetIssuance& issuance = tx.vin[i].assetIssuance;
+        if (issuance.IsNull()) {
+            continue;
+        }
+        if (issuance.nAmount.IsExplicit() && !MoneyRange(issuance.nAmount.GetAmount())) {
+            return false;
+        }
+    }
+    return true;
+}
+
 int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost, unsigned int bytes_per_sigop)
 {
     return (std::max(nWeight, nSigOpCost * bytes_per_sigop) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR;