From 57627ef0590e93689358e64d7bab3f61646952df Mon Sep 17 00:00:00 2001 From: Lukasz Zimnoch Date: Fri, 12 Apr 2024 12:57:26 +0200 Subject: [PATCH] Update contract artifacts in the SDK Some smart contract upgrades landed recently. Here we update contract artifacts in the SDK to reflect that. --- .../ethereum/artifacts/mainnet/Bridge.json | 195 +++++++++++++++++- .../artifacts/mainnet/WalletRegistry.json | 4 +- .../ethereum/artifacts/sepolia/Bridge.json | 99 +++++++-- 3 files changed, 267 insertions(+), 31 deletions(-) diff --git a/typescript/src/lib/ethereum/artifacts/mainnet/Bridge.json b/typescript/src/lib/ethereum/artifacts/mainnet/Bridge.json index 5ca597163..71565a5d8 100644 --- a/typescript/src/lib/ethereum/artifacts/mainnet/Bridge.json +++ b/typescript/src/lib/ethereum/artifacts/mainnet/Bridge.json @@ -591,6 +591,19 @@ "name": "RedemptionTimedOut", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "redemptionWatchtower", + "type": "address" + } + ], + "name": "RedemptionWatchtowerSet", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -983,6 +996,11 @@ "internalType": "uint32", "name": "sweptAt", "type": "uint32" + }, + { + "internalType": "bytes32", + "name": "extraData", + "type": "bytes32" } ], "internalType": "struct Deposit.DepositRequest", @@ -1062,6 +1080,19 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "getRedemptionWatchtower", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "governance", @@ -1371,6 +1402,24 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes20", + "name": "walletPubKeyHash", + "type": "bytes20" + }, + { + "internalType": "bytes", + "name": "redeemerOutputScript", + "type": "bytes" + } + ], + "name": "notifyRedemptionVeto", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -1691,6 +1740,96 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "components": [ + { + "internalType": "bytes4", + "name": "version", + "type": "bytes4" + }, + { + "internalType": "bytes", + "name": "inputVector", + "type": "bytes" + }, + { + "internalType": "bytes", + "name": "outputVector", + "type": "bytes" + }, + { + "internalType": "bytes4", + "name": "locktime", + "type": "bytes4" + } + ], + "internalType": "struct BitcoinTx.Info", + "name": "fundingTx", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint32", + "name": "fundingOutputIndex", + "type": "uint32" + }, + { + "internalType": "bytes8", + "name": "blindingFactor", + "type": "bytes8" + }, + { + "internalType": "bytes20", + "name": "walletPubKeyHash", + "type": "bytes20" + }, + { + "internalType": "bytes20", + "name": "refundPubKeyHash", + "type": "bytes20" + }, + { + "internalType": "bytes4", + "name": "refundLocktime", + "type": "bytes4" + }, + { + "internalType": "address", + "name": "vault", + "type": "address" + } + ], + "internalType": "struct Deposit.DepositRevealInfo", + "name": "reveal", + "type": "tuple" + }, + { + "internalType": "bytes32", + "name": "extraData", + "type": "bytes32" + } + ], + "name": "revealDepositWithExtraData", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "redemptionWatchtower", + "type": "address" + } + ], + "name": "setRedemptionWatchtower", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -1791,6 +1930,16 @@ "internalType": "bytes", "name": "bitcoinHeaders", "type": "bytes" + }, + { + "internalType": "bytes32", + "name": "coinbasePreimage", + "type": "bytes32" + }, + { + "internalType": "bytes", + "name": "coinbaseProof", + "type": "bytes" } ], "internalType": "struct BitcoinTx.Proof", @@ -1915,6 +2064,16 @@ "internalType": "bytes", "name": "bitcoinHeaders", "type": "bytes" + }, + { + "internalType": "bytes32", + "name": "coinbasePreimage", + "type": "bytes32" + }, + { + "internalType": "bytes", + "name": "coinbaseProof", + "type": "bytes" } ], "internalType": "struct BitcoinTx.Proof", @@ -2044,6 +2203,16 @@ "internalType": "bytes", "name": "bitcoinHeaders", "type": "bytes" + }, + { + "internalType": "bytes32", + "name": "coinbasePreimage", + "type": "bytes32" + }, + { + "internalType": "bytes", + "name": "coinbaseProof", + "type": "bytes" } ], "internalType": "struct BitcoinTx.Proof", @@ -2128,6 +2297,16 @@ "internalType": "bytes", "name": "bitcoinHeaders", "type": "bytes" + }, + { + "internalType": "bytes32", + "name": "coinbasePreimage", + "type": "bytes32" + }, + { + "internalType": "bytes", + "name": "coinbaseProof", + "type": "bytes" } ], "internalType": "struct BitcoinTx.Proof", @@ -2610,15 +2789,15 @@ "status": 1, "byzantium": true }, - "numDeployments": 2, + "numDeployments": 4, "libraries": { - "Deposit": "0x1Ac1841a47054E070236F1664991e52c30C04dC5", - "DepositSweep": "0xE6F919e62c370Ef04EDF4cA5E2a901Ea1aa87085", - "Redemption": "0xfa4FC53BEB5B7721d173342FfC24058e9D47a1Ff", - "Wallets": "0xC67913137429985416DbCe28D9fa9ec960BA47BF", - "Fraud": "0xd040Def4bC6372Cd27b433288008aDCe7c9de71C", - "MovingFunds": "0xB857117ae7639255d7305DdbC7346b4a644CA432" + "Deposit": "0xCD2EbDA2beA80484C55675e1965149054dCcD137", + "DepositSweep": "0x392635646Bc22FC13C86859d1f02B27974aC9b95", + "Redemption": "0x8EF1BEDA734E696CC055269b46BB5a0EC7Ac9f5E", + "Wallets": "0xc989d3E486AAe6355F65281B4d0bde08c8e32fBC", + "Fraud": "0x51bBeF1c7cC3a1D3bC5E64CE6C3BA6E66fbA3559", + "MovingFunds": "0x3E0407765FaC663d391aE738f3Aa0c98EAb67a90" }, - "implementation": "0x8D014903BF7867260584d714e11809fea5293234", + "implementation": "0xA4996De73682BDF9CF514fbf238ee387C1a21A26", "devdoc": "Contract deployed as upgradable proxy" } diff --git a/typescript/src/lib/ethereum/artifacts/mainnet/WalletRegistry.json b/typescript/src/lib/ethereum/artifacts/mainnet/WalletRegistry.json index 380a69761..1090d405b 100644 --- a/typescript/src/lib/ethereum/artifacts/mainnet/WalletRegistry.json +++ b/typescript/src/lib/ethereum/artifacts/mainnet/WalletRegistry.json @@ -1953,10 +1953,10 @@ "0xc2731fb2823af3Efc2694c9bC86F444d5c5bb4Dc", "0x01B67b1194C75264d06F808A921228a95C765dd7" ], - "numDeployments": 1, + "numDeployments": 2, "libraries": { "EcdsaInactivity": "0x8263eFCb8F28246697585c89Fed0501Cd946F764" }, - "implementation": "0xFbaE130e06Bbc8CA198861BEeCae6e2B830398fb", + "implementation": "0x08D7e8ce124921CAaFd7670502379Ced0065c832", "devdoc": "Contract deployed as upgradable proxy" } diff --git a/typescript/src/lib/ethereum/artifacts/sepolia/Bridge.json b/typescript/src/lib/ethereum/artifacts/sepolia/Bridge.json index dde394078..c69ec6819 100644 --- a/typescript/src/lib/ethereum/artifacts/sepolia/Bridge.json +++ b/typescript/src/lib/ethereum/artifacts/sepolia/Bridge.json @@ -591,6 +591,19 @@ "name": "RedemptionTimedOut", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "redemptionWatchtower", + "type": "address" + } + ], + "name": "RedemptionWatchtowerSet", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -1067,6 +1080,19 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "getRedemptionWatchtower", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "governance", @@ -1376,6 +1402,24 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes20", + "name": "walletPubKeyHash", + "type": "bytes20" + }, + { + "internalType": "bytes", + "name": "redeemerOutputScript", + "type": "bytes" + } + ], + "name": "notifyRedemptionVeto", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -1773,6 +1817,19 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "redemptionWatchtower", + "type": "address" + } + ], + "name": "setRedemptionWatchtower", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -2702,45 +2759,45 @@ "type": "function" } ], - "transactionHash": "0x0e6fce7a195d82e8205d9535864353bb667bf7136c202c6a5f8e901c9020e70b", + "transactionHash": "0xe239619b368853a39ada7704bc2dd6bf848ed50782e8ae3acc642c03e2988eda", "receipt": { "to": "0x39f60B25C4598Caf7e922d6fC063E9002db45845", "from": "0x68ad60CC5e8f3B7cC53beaB321cf0e6036962dBc", "contractAddress": null, - "transactionIndex": 10, + "transactionIndex": 72, "gasUsed": "38760", - "logsBloom": "0x00000000000000000000000000000000408000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000220000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000", - "blockHash": "0xc130afc0dd68742cb1a7de16a0befc5fd6b04e0fe99fdf88f4b82ff966e3d748", - "transactionHash": "0x0e6fce7a195d82e8205d9535864353bb667bf7136c202c6a5f8e901c9020e70b", + "logsBloom": "0x00000000000000000000000000000000408000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000020000020000000000020000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "blockHash": "0x508ed9421a7af02b1f7759a50ba6730ec0490963c5fe79da2b8185824b140529", + "transactionHash": "0xe239619b368853a39ada7704bc2dd6bf848ed50782e8ae3acc642c03e2988eda", "logs": [ { - "transactionIndex": 10, - "blockNumber": 4929904, - "transactionHash": "0x0e6fce7a195d82e8205d9535864353bb667bf7136c202c6a5f8e901c9020e70b", + "transactionIndex": 72, + "blockNumber": 5340702, + "transactionHash": "0xe239619b368853a39ada7704bc2dd6bf848ed50782e8ae3acc642c03e2988eda", "address": "0x9b1a7fE5a16A15F2f9475C5B231750598b113403", "topics": [ "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b", - "0x000000000000000000000000219b0b14b961b703f5cfd07f83c9d911f181e2ae" + "0x000000000000000000000000c1cee2b8dfcc4d3bd315f2cd44a9ee77ec3b808e" ], "data": "0x", - "logIndex": 10, - "blockHash": "0xc130afc0dd68742cb1a7de16a0befc5fd6b04e0fe99fdf88f4b82ff966e3d748" + "logIndex": 80, + "blockHash": "0x508ed9421a7af02b1f7759a50ba6730ec0490963c5fe79da2b8185824b140529" } ], - "blockNumber": 4929904, - "cumulativeGasUsed": "2196491", + "blockNumber": 5340702, + "cumulativeGasUsed": "9325415", "status": 1, "byzantium": true }, - "numDeployments": 4, + "numDeployments": 5, "libraries": { - "Deposit": "0xb9cD067b78B4D9769837a46486464638893D4C70", - "DepositSweep": "0xA5157Fcd7067D93e037F85B35ce2598fB1Fb7BEd", - "Redemption": "0x0672276D7aC52AFa6e75Acaa20a3f05902173897", - "Wallets": "0x2A2e6C3B5B135A6128a9EF454a058C1f9DBfaB44", - "Fraud": "0x5bd37811daea439B94B62b7178Fe574f94Bcb5bC", - "MovingFunds": "0xAce37767d828b8EE7e40591c6b5C5399ce586D85" + "Deposit": "0xad39ED2D3aF448C14b960746F1F63451D366000c", + "DepositSweep": "0x762B5E9dE8b3cF81d71Cc6f5ea1a9a7B7Eb7b8cB", + "Redemption": "0x88BEEF1F01cD6c74063E398da1114eb4B8C985a6", + "Wallets": "0x21eB46af48705A52f122931ddb8E9df036D8F2c1", + "Fraud": "0xe60FFb5037aC31603B1AeDEf440fFad088dF0a17", + "MovingFunds": "0xbF138155D789007c43dda3cc39B75fB70991e7E3" }, - "implementation": "0xeaA95421a1811E61A3Ff5b8F34E855fd28431eEE", + "implementation": "0xC1Cee2B8dfCC4d3BD315F2cD44A9EE77eC3B808e", "devdoc": "Contract deployed as upgradable proxy" }