+
Skip to content

Conversation

cbeck88
Copy link
Contributor

@cbeck88 cbeck88 commented May 3, 2022

This PR cherry-picks a series of PRs in master branch which landed after Mixed transactions, to the candidate 1.2 branch.

It is staged after the PR that moves pieces of Mixed transactions to candidate 1.2 branch.

The PRs that are picked are:

a26b06f "Initial take on implementing Burn Redemption Memo" (eran)
e4038aa"Update Change Subaddress Index (#1880)" (bernie)
d991eee "API for generating burn txs in mobilecoind (#1872)" (eran)
83dcf52 "fix typo (#1883)" (eran)
3fac7a8 "Fix/slip10errors" #1893 (william)

If this passes tests and CD then I propose that we merge both PRs and then rename candidate-1.2 to release-1.2 or something like this.

@cbeck88 cbeck88 requested review from a team, dolanbernard, eranrund, jcape and remoun May 3, 2022 20:29
Copy link
Contributor

@iamalwaysuncomfortable iamalwaysuncomfortable left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see nothing out of order here, approved

@cbeck88 cbeck88 requested a review from wjuan-mob May 4, 2022 01:13
@cbeck88
Copy link
Contributor Author

cbeck88 commented May 4, 2022

this passed a deployment

Base automatically changed from port-improvements-to-amount-and-transaction-builder to candidate-1.2 May 4, 2022 18:40
eranrund and others added 7 commits May 4, 2022 12:42
There was no real conflict except that in the tests for the new memo builder,
the tests had to change the .add_output and .add_change_output APIs are different.
Set Change Subaddress Index to u64::MAX - 1
This conflict was resolved:

```
diff --cc mobilecoind/src/payments.rs
index 6424c3f,c3b6f0ed..00000000
--- a/mobilecoind/src/payments.rs
+++ b/mobilecoind/src/payments.rs
@@@ -867,18 -876,17 +876,32 @@@ impl<T: BlockchainConnection + UserTxCo
              fog_resolver_factory(&fog_uris).map_err(Error::Fog)?
          };

++<<<<<<< HEAD
 +        // TODO: Use RTH memo builder, optionally?
 +
 +        let fee_amount = Amount::new(fee, token_id);
 +
 +        // Create tx_builder.
 +        let mut tx_builder = TransactionBuilder::new(
 +            block_version,
 +            fee_amount,
 +            fog_resolver,
 +            EmptyMemoBuilder::default(),
 +        )
 +        .map_err(|err| Error::TxBuild(format!("Error cretaing TransactionBuilder: {}", err)))?;
++=======
+         // Create tx_builder.
+         // TODO (GH #1522): Use RTH memo builder, optionally?
+         let memo_builder: Box<dyn MemoBuilder + Send + Sync> =
+             opt_memo_builder.unwrap_or_else(|| Box::new(EmptyMemoBuilder::default()));
+
+         let fee_amount = Amount::new(fee, token_id);
+         let mut tx_builder =
+             TransactionBuilder::new_with_box(block_version, fee_amount, fog_resolver, memo_builder)
+                 .map_err(|err| {
+                     Error::TxBuild(format!("Error creating transaction builder: {}", err))
+                 })?;
++>>>>>>> d991eee... API for generating burn txs in mobilecoind (#1872)

          // Unzip each vec of tuples into a tuple of vecs.
          let mut rings_and_proofs: Vec<(Vec<TxOut>, Vec<TxOutMembershipProof>)> = rings
```
There was a very small conflict which I resolved
@cbeck88 cbeck88 force-pushed the port-to-candidate-1.2 branch from 31341b0 to c9364d3 Compare May 4, 2022 18:42
@cbeck88 cbeck88 merged commit 0577814 into candidate-1.2 May 4, 2022
@cbeck88 cbeck88 deleted the port-to-candidate-1.2 branch May 4, 2022 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

6 participants

点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载