Skip to content
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changelog/unreleased/features/1606-multisignature-draft.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Introduce multisignature account and transaction format.
Copy link
Collaborator

Choose a reason for hiding this comment

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

it would be nice to write a little bit more about this and/or link to docs for anyone who'll want to try it in the new release

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

we have docs almost ready, should I link them here?

Copy link
Collaborator

Choose a reason for hiding this comment

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

yes pls!

([\#1606](https://github.com/anoma/namada/pull/1606))
1 change: 1 addition & 0 deletions .github/workflows/scripts/e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"e2e::ledger_tests::masp_pinned_txs": 75,
"e2e::ledger_tests::masp_txs_and_queries": 282,
"e2e::ledger_tests::pos_bonds": 77,
"e2e::ledger_tests::implicit_account_reveal_pk": 30,
"e2e::ledger_tests::pos_init_validator": 40,
"e2e::ledger_tests::proposal_offline": 21,
"e2e::ledger_tests::pgf_governance_proposal": 100,
Expand Down
55 changes: 41 additions & 14 deletions apps/src/bin/namada-client/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub async fn main() -> Result<()> {
tx::submit_ibc_transfer::<HttpClient>(&client, ctx, args)
.await?;
}
Sub::TxUpdateVp(TxUpdateVp(mut args)) => {
Sub::TxUpdateAccount(TxUpdateAccount(mut args)) => {
let client = HttpClient::new(utils::take_config_address(
&mut args.tx.ledger_address,
))
Expand All @@ -76,8 +76,10 @@ pub async fn main() -> Result<()> {
.await
.proceed_or_else(error)?;
let args = args.to_sdk(&mut ctx);
tx::submit_update_vp::<HttpClient>(&client, &mut ctx, args)
.await?;
tx::submit_update_account::<HttpClient>(
&client, &mut ctx, args,
)
.await?;
}
Sub::TxInitAccount(TxInitAccount(mut args)) => {
let client = HttpClient::new(utils::take_config_address(
Expand Down Expand Up @@ -213,24 +215,39 @@ pub async fn main() -> Result<()> {
.proceed_or_else(error)?;
let args = args.to_sdk(&mut ctx);
let tx_args = args.tx.clone();
let (mut tx, addr, pk) = bridge_pool::build_bridge_pool_tx(
&client,
&mut ctx.wallet,
args,
)
.await
.unwrap();
let (mut tx, addr, public_keys) =
bridge_pool::build_bridge_pool_tx(
&client,
&mut ctx.wallet,
args,
)
.await
.unwrap();
tx::submit_reveal_aux(
&client,
&mut ctx,
&tx_args,
addr,
pk.clone(),
addr.clone(),
&public_keys,
&mut tx,
)
.await?;
signing::sign_tx(&mut ctx.wallet, &mut tx, &tx_args, &pk)
.await?;
let (account_public_keys_map, threshold) =
signing::aux_signing_data(
&client,
addr,
public_keys.clone(),
)
.await;
signing::sign_tx(
&mut ctx.wallet,
&mut tx,
&tx_args,
&account_public_keys_map,
&public_keys,
threshold,
)
.await?;
sdk_tx::process_tx(&client, &mut ctx.wallet, &tx_args, tx)
.await?;
}
Expand Down Expand Up @@ -433,6 +450,16 @@ pub async fn main() -> Result<()> {
let args = args.to_sdk(&mut ctx);
rpc::query_protocol_parameters(&client, args).await;
}
Sub::QueryAccount(QueryAccount(args)) => {
let client =
HttpClient::new(args.query.ledger_address.clone())
.unwrap();
wait_until_node_is_synched(&client)
.await
.proceed_or_else(error)?;
let args = args.to_sdk(&mut ctx);
rpc::query_account(&client, args).await;
}
}
}
cli::NamadaClient::WithoutContext(cmd, global_args) => match cmd {
Expand Down
2 changes: 1 addition & 1 deletion apps/src/bin/namada/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fn handle_command(cmd: cli::cmds::Namada, raw_sub_cmd: String) -> Result<()> {
| cli::cmds::Namada::TxCustom(_)
| cli::cmds::Namada::TxTransfer(_)
| cli::cmds::Namada::TxIbcTransfer(_)
| cli::cmds::Namada::TxUpdateVp(_)
| cli::cmds::Namada::TxUpdateAccount(_)
| cli::cmds::Namada::TxRevealPk(_)
| cli::cmds::Namada::TxInitProposal(_)
| cli::cmds::Namada::TxVoteProposal(_) => {
Expand Down
Loading