mirror of
https://github.com/aljazceru/ark.git
synced 2025-12-18 12:44:19 +01:00
Add support for Out Of Round txs (#359)
* [common] rework address encoding * new address encoding * replace offchain address by vtxo output key in DB * merge migrations files into init one * fix txbuilder fixtures * fix transaction events * OOR scheme * fix conflicts * [sdk] OOR * update WASM wrappers * revert renaming * revert API changes * update parser.go * fix vtxosToTxsCovenantless * add settled and spent in Utxo and Transaction * Fixes (#5) * Revert unneeded changes and rename claim to settle * Revert changes to wasm and rename claim to settle --------- Co-authored-by: Pietralberto Mazza <18440657+altafan@users.noreply.github.com>
This commit is contained in:
@@ -359,7 +359,7 @@ func (c *grpcClient) GetTransactionsStream(
|
||||
Round: &client.RoundTransaction{
|
||||
Txid: tx.Round.Txid,
|
||||
SpentVtxos: outpointsFromProto(tx.Round.SpentVtxos),
|
||||
SpendableVtxos: vtxosFromProto(tx.Round.SpendableVtxos),
|
||||
SpendableVtxos: vtxos(tx.Round.SpendableVtxos).toVtxos(),
|
||||
ClaimedBoardingUtxos: outpointsFromProto(tx.Round.ClaimedBoardingUtxos),
|
||||
},
|
||||
}
|
||||
@@ -368,7 +368,7 @@ func (c *grpcClient) GetTransactionsStream(
|
||||
Redeem: &client.RedeemTransaction{
|
||||
Txid: tx.Redeem.Txid,
|
||||
SpentVtxos: outpointsFromProto(tx.Redeem.SpentVtxos),
|
||||
SpendableVtxos: vtxosFromProto(tx.Redeem.SpendableVtxos),
|
||||
SpendableVtxos: vtxos(tx.Redeem.SpendableVtxos).toVtxos(),
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -394,24 +394,3 @@ func outpointsFromProto(protoOutpoints []*arkv1.Outpoint) []client.Outpoint {
|
||||
}
|
||||
return outpoints
|
||||
}
|
||||
|
||||
func vtxosFromProto(protoVtxos []*arkv1.Vtxo) []client.Vtxo {
|
||||
vtxos := make([]client.Vtxo, len(protoVtxos))
|
||||
for i, v := range protoVtxos {
|
||||
expiresAt := time.Unix(v.ExpireAt, 0)
|
||||
vtxos[i] = client.Vtxo{
|
||||
Outpoint: client.Outpoint{
|
||||
Txid: v.Outpoint.Txid,
|
||||
VOut: v.Outpoint.Vout,
|
||||
},
|
||||
Pubkey: v.Pubkey,
|
||||
Amount: v.Amount,
|
||||
RoundTxid: v.RoundTxid,
|
||||
ExpiresAt: &expiresAt,
|
||||
RedeemTx: v.RedeemTx,
|
||||
Pending: v.Pending,
|
||||
SpentBy: v.SpentBy,
|
||||
}
|
||||
}
|
||||
return vtxos
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user