RFC 12 Implementation: On-chain proposal validation (#756)

Refs: #737 Here we present the fifth part of the changes meant to implement [RFC 12: Decentralized wallet coordination](https://github.com/keep-network/tbtc-v2/blob/main/docs/rfc/rfc-12.adoc) in the tBTC wallet client. This pull request focuses on the on-chain proposal validation, i.e. the `WalletProposalValidator` contract described in RFC 12. ### The `WalletProposalValidator` contract Here we introduce the read-only, non-upgradeable, `WalletProposalValidator` contract that allows validating wallet action proposals. This contract exposes three functions: - `validateDepositSweepProposal` that allows validating deposit sweep proposals. This function was ported from the `WalletCoordinator` contract. - `validateRedemptionProposal` that allows validating redemption proposals. This function was ported from the `WalletCoordinator` contract. - `validateHeartbeatProposal` that allows validating heartbeat proposals. ### Remove `WalletCoordinator` contract We are also removing the `WalletCoordinator` contract. It is no longer needed with the new RFC-12-based coordination mechanism. The relevant view validation functions were ported to the aforementioned `WalletProposalValidator` contract. By the way, we are also adjusting the deployment scripts to reflect contract changes made in this PR. ### Next steps The next steps on the way towards RFC 12 implementation are: - Integrate `WalletProposalValidator` contract with the client and cleanup `WalletCoordinator` leftovers there - Modify the SPV maintainer to not rely on `WalletCoordinator`'s events during unproven transactions lookup
keep-network · Dec 5, 2023 · cadead9 · cadead9
2 parents ead0fc7 + e14c494
commit cadead9
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 1,948 deletions.
diff --git a/...ty/contracts/bridge/WalletCoordinator.sol → ...tracts/bridge/WalletProposalValidator.sol b/...ty/contracts/bridge/WalletCoordinator.sol → ...tracts/bridge/WalletProposalValidator.sol
diff --git a/...37_deploy_light_relay_maintainer_proxy.ts → ...34_deploy_light_relay_maintainer_proxy.ts b/...37_deploy_light_relay_maintainer_proxy.ts → ...34_deploy_light_relay_maintainer_proxy.ts
diff --git a/solidity/deploy/34_deploy_wallet_coordinator.ts b/solidity/deploy/34_deploy_wallet_coordinator.ts
diff --git a/solidity/deploy/35_add_coordinator_address.ts b/solidity/deploy/35_add_coordinator_address.ts
diff --git a/...tainer_in_light_relay_maintainer_proxy.ts → ...tainer_in_light_relay_maintainer_proxy.ts b/...tainer_in_light_relay_maintainer_proxy.ts → ...tainer_in_light_relay_maintainer_proxy.ts
diff --git a/...light_relay_maintainer_proxy_ownership.ts → ...light_relay_maintainer_proxy_ownership.ts b/...light_relay_maintainer_proxy_ownership.ts → ...light_relay_maintainer_proxy_ownership.ts
diff --git a/solidity/deploy/36_transfer_wallet_coordinator_ownership.ts b/solidity/deploy/36_transfer_wallet_coordinator_ownership.ts
diff --git a/...maintainer_proxy_in_reimbursement_pool.ts → ...maintainer_proxy_in_reimbursement_pool.ts b/...maintainer_proxy_in_reimbursement_pool.ts → ...maintainer_proxy_in_reimbursement_pool.ts
diff --git a/..._relay_maintainer_proxy_in_light_relay.ts → ..._relay_maintainer_proxy_in_light_relay.ts b/..._relay_maintainer_proxy_in_light_relay.ts → ..._relay_maintainer_proxy_in_light_relay.ts
diff --git a/solidity/deploy/39_deploy_wallet_proposal_validator.ts b/solidity/deploy/39_deploy_wallet_proposal_validator.ts
@@ -0,0 +1,33 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { DeployFunction } from "hardhat-deploy/types"
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployments, helpers, getNamedAccounts } = hre
+  const { deploy } = deployments
+  const { deployer } = await getNamedAccounts()
+
+  const Bridge = await deployments.get("Bridge")
+
+  const walletProposalValidator = await deploy("WalletProposalValidator", {
+    from: deployer,
+    args: [Bridge.address],
+    log: true,
+    waitConfirmations: 1,
+  })
+
+  if (hre.network.tags.etherscan) {
+    await helpers.etherscan.verify(walletProposalValidator)
+  }
+
+  if (hre.network.tags.tenderly) {
+    await hre.tenderly.verify({
+      name: "WalletProposalValidator",
+      address: walletProposalValidator.address,
+    })
+  }
+}
+
+export default func
+
+func.tags = ["WalletProposalValidator"]
+func.dependencies = ["Bridge"]
diff --git a/solidity/deploy/81_upgrade_wallet_coordinator_v2.ts b/solidity/deploy/81_upgrade_wallet_coordinator_v2.ts
diff --git a/solidity/hardhat.config.ts b/solidity/hardhat.config.ts
@@ -240,12 +240,6 @@ const config: HardhatUserConfig = {
       sepolia: 0,
       // We are not setting SPV maintainer for mainnet in deployment scripts.
     },
-    coordinator: {
-      default: 9,
-      goerli: "0x4815cd81fFc21039a25aCFbD97CE75cCE8579042",
-      sepolia: "0x4815cd81fFc21039a25aCFbD97CE75cCE8579042",
-      mainnet: "0x0595acCca29654c43Bd67E18578b30a405265234",
-    },
     v1Redeemer: {
       default: 10,
       goerli: 0,