From 0dc113f073215f05f080ed471eca447a79489a7c Mon Sep 17 00:00:00 2001 From: Antonio Pancorbo <48168255+apancorb@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:36:04 +0200 Subject: [PATCH 1/3] refactor(ip): update RSKIP419 with svp spend tx hash unsigned naming --- IPs/RSKIP419.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/IPs/RSKIP419.md b/IPs/RSKIP419.md index 942aa6e6..cb0b74a1 100644 --- a/IPs/RSKIP419.md +++ b/IPs/RSKIP419.md @@ -143,7 +143,7 @@ Since the `proposedFederation` still exists, this implies the proof transaction - Add it to a new storage set, key `svpSpendTxWaitingForSignatures` - Set it in a new Storage entry: ``` - KEY: "svpSpendTxHash" + KEY: "svpSpendTxHashUnsigned" VALUE: hash of SVP proof tx without signatures ``` - Remove the `svpFundTxHashSigned` from the storage @@ -185,7 +185,7 @@ The proof transaction should be signed as any other peg-out, but by the proposed The first one should perform the exact same actions as the `getStateForBtcReleaseClient` but to inform if the SVP spend tx is waiting for signatures (i.e., that `svpSpendTxWaitingForSignatures` is not empty). -The second one should perform the exact same actions as the `addSignature` but to accept signatures from public keys that belong to the proposed Powpeg instead of the active/retiring ones (let's recall the proposed Powpeg is not active at this point), and to check that the hash of the transaction intended to be signed exists in the `svpSpendTxHash` storage entry. +The second one should perform the exact same actions as the `addSignature` but to accept signatures from public keys that belong to the proposed Powpeg instead of the active/retiring ones (let's recall the proposed Powpeg is not active at this point), and to check that the hash of the transaction intended to be signed exists in the `svpSpendTxHashUnsigned` storage entry. Once fully signed, the Bridge should remove the entry from the `svpSpendTxWaitingForSignatures`. @@ -198,7 +198,7 @@ The proof transaction should be registered through a new `registerSvpSpendTransa - Transaction hash without signatures is registered in the `svpSpendTxHash` storage key. If the hash matches the one registered in the storage, then the SVP process is considered completed and we can proceed with the committment of the proposed -and now validated- Powpeg. -The `svpSpendTxHash` and the `proposedFederation` will be removed from storage. The utxo sent to the current Powpeg will be registered so it can be spend. +The `svpSpendTxHashUnsigned` and the `proposedFederation` will be removed from storage. The utxo sent to the current Powpeg will be registered so it can be spend. ### Validation phase duration @@ -219,7 +219,7 @@ The recommendation is that this phase takes approximately the blocks a peg-out c |proposedFederation | voted federation pending to be validated| |svpFundTxHashUnsigned | hash of SVP funding tx unsigned| |svpFundTxHashSigned | hash of SVP funding tx signed| -|svpSpendTxHash | hash of SVP proof tx| +|svpSpendTxHashUnisgned | hash of SVP proof tx| |svpSpendTxWaitingForSignatures | SVP proof tx that is to be signed| ### New Bridge methods From 6ef0938ea3703130cff8a748f7a0b86dc00015e3 Mon Sep 17 00:00:00 2001 From: Antonio Pancorbo <48168255+apancorb@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:39:57 +0200 Subject: [PATCH 2/3] refactor(ip): update RSKIP419 typo --- IPs/RSKIP419.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPs/RSKIP419.md b/IPs/RSKIP419.md index cb0b74a1..e065bdf2 100644 --- a/IPs/RSKIP419.md +++ b/IPs/RSKIP419.md @@ -219,7 +219,7 @@ The recommendation is that this phase takes approximately the blocks a peg-out c |proposedFederation | voted federation pending to be validated| |svpFundTxHashUnsigned | hash of SVP funding tx unsigned| |svpFundTxHashSigned | hash of SVP funding tx signed| -|svpSpendTxHashUnisgned | hash of SVP proof tx| +|svpSpendTxHashUnsigned | hash of SVP proof tx| |svpSpendTxWaitingForSignatures | SVP proof tx that is to be signed| ### New Bridge methods From 412cd09c77bfbd539cf989448fbf418213f4d15d Mon Sep 17 00:00:00 2001 From: Antonio Pancorbo <48168255+apancorb@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:43:53 +0200 Subject: [PATCH 3/3] refactor(ip): update RSKIP419 Co-authored-by: julia zack <83707069+julia-zack@users.noreply.github.com> --- IPs/RSKIP419.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPs/RSKIP419.md b/IPs/RSKIP419.md index e065bdf2..9d2c8c68 100644 --- a/IPs/RSKIP419.md +++ b/IPs/RSKIP419.md @@ -195,7 +195,7 @@ With the SVP proof transaction broadcasted, the Bridge now needs to validate it The proof transaction should be registered through a new `registerSvpSpendTransaction` method that would behave similar to the `registerBtcTransaction`. As before, it should verify: - SVP period is ongoing -- Transaction hash without signatures is registered in the `svpSpendTxHash` storage key. +- Transaction hash without signatures is registered in the `svpSpendTxHashUnsigned` storage key. If the hash matches the one registered in the storage, then the SVP process is considered completed and we can proceed with the committment of the proposed -and now validated- Powpeg. The `svpSpendTxHashUnsigned` and the `proposedFederation` will be removed from storage. The utxo sent to the current Powpeg will be registered so it can be spend.