From 4176d60e97fe374b6b6379b6a487bd927645deed Mon Sep 17 00:00:00 2001 From: Ryan Collins Date: Tue, 7 Oct 2025 17:00:20 -0400 Subject: [PATCH 1/4] feat: v0.9.0 deployment details --- contracts/deployments/7683/v0.9.0.json | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 contracts/deployments/7683/v0.9.0.json diff --git a/contracts/deployments/7683/v0.9.0.json b/contracts/deployments/7683/v0.9.0.json new file mode 100644 index 00000000..0cede9d6 --- /dev/null +++ b/contracts/deployments/7683/v0.9.0.json @@ -0,0 +1,39 @@ +{ + "metadata": { + "version": "v0.9.0", + "date": "2025-10-06", + "by": "Ryan", + "from_machine": "localhost", + "from_branch": "xCR/v09-deploy", + "from_commit": "ff51e9ad7d82878f011b9a2ddf1f104f04ce9124" + }, + "addresses": { + "arbitrum": { + "signer": "0x4d9c1A0407946a2F3E975311518608859f4d1f67", + "t1ProxyAdmin": "0xb45A6e9e6920A3bfa7Ac5D6783A060bc157DEC5b", + "t1XChainRead": { + "implementation": "0x49da78210674D38D92d24a0F59a566baEEb2BC5c", + "proxy": "0xe5416f9D4ED269d490107081d68aF10601C98Fa6" + }, + "t1ERC7683": { + "implementation": "0xA8137237088027c8CEEBaB090BcAdB813bf3F941", + "proxy": "0x996f3583BD967bbA19694733AA7A7623E6D780eb" + }, + "auctionWitness": "0x4EeE6e5a0B9BD206dE5D38aa4EdC7ead70B9cD8D" + }, + "base": { + "signer": "0x4d9c1A0407946a2F3E975311518608859f4d1f67", + "t1ProxyAdmin": "0x9BCcbCB790Ec8f7D2F5e1316E9256054D77cdeDf", + "t1XChainRead": { + "implementation": "0xCBdF20496012e3b5dCF50382B8d3d28D89176427", + "proxy": "0x34FBdDbE1F61b1A027352A32B8ebF35B857aa319" + }, + "t1ERC7683": { + "implementation": "0x551b416a5D21eB05ab8Da60B1159822c2C710683", + "proxy": "0xdbA711a6c1b187479e9a5b33020E5217D0BD5A1f" + }, + "auctionWitness": "0x5bA9d8193Ac43bE825743576b396473C6Ad73119" + }, + "deployerAddress": "0x4EeE6e5a0B9BD206dE5D38aa4EdC7ead70B9cD8D" + } +} From 0fea10fa5345ac95ea66dfa701459f39513edd2f Mon Sep 17 00:00:00 2001 From: Ryan Collins Date: Wed, 8 Oct 2025 07:01:14 -0400 Subject: [PATCH 2/4] fix: incorrect addresses --- contracts/deployments/7683/v0.9.0.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/deployments/7683/v0.9.0.json b/contracts/deployments/7683/v0.9.0.json index 0cede9d6..0e672631 100644 --- a/contracts/deployments/7683/v0.9.0.json +++ b/contracts/deployments/7683/v0.9.0.json @@ -32,8 +32,8 @@ "implementation": "0x551b416a5D21eB05ab8Da60B1159822c2C710683", "proxy": "0xdbA711a6c1b187479e9a5b33020E5217D0BD5A1f" }, - "auctionWitness": "0x5bA9d8193Ac43bE825743576b396473C6Ad73119" + "auctionWitness": "0x4EeE6e5a0B9BD206dE5D38aa4EdC7ead70B9cD8D" }, - "deployerAddress": "0x4EeE6e5a0B9BD206dE5D38aa4EdC7ead70B9cD8D" + "deployerAddress": "0xEB5B6d2aF900151A7Fc4C57c1087F1ED9916D788" } } From d551fe245b3c124e83e4869b77bc29446e2fcf58 Mon Sep 17 00:00:00 2001 From: Ryan Collins Date: Wed, 8 Oct 2025 09:29:11 -0400 Subject: [PATCH 3/4] fix: init scripts for xChainReader --- .../7683/InitializeArbT1XChainReader.s.sol | 19 +++++++++++++++++++ .../7683/InitializeBaseT1XChainReader.s.sol | 19 +++++++++++++++++++ .../deploy/DeployArbT1XChainReader.s.sol | 4 ++-- .../deploy/DeployBaseT1XChainReader.s.sol | 4 ++-- 4 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 contracts/script/configure/7683/InitializeArbT1XChainReader.s.sol create mode 100644 contracts/script/configure/7683/InitializeBaseT1XChainReader.s.sol diff --git a/contracts/script/configure/7683/InitializeArbT1XChainReader.s.sol b/contracts/script/configure/7683/InitializeArbT1XChainReader.s.sol new file mode 100644 index 00000000..7a2ea196 --- /dev/null +++ b/contracts/script/configure/7683/InitializeArbT1XChainReader.s.sol @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity ^0.8.30; + +import { DeploymentUtils } from "../../lib/DeploymentUtils.sol"; +import { T1XChainReader } from "../../../src/libraries/xChain/T1XChainReader.sol"; + +contract InitializeArbT1XChainReader is DeploymentUtils { + address internal proxy = vm.envAddress("ARB_T1_X_CHAIN_READ_PROXY_ADDR"); + address internal MANAGER_MULTISIG = vm.envAddress("MANAGER_MULTISIG_ADDR"); + + function init() external { + selectMainnetOrSepoliaFork("arbitrum"); + startBroadcastWithDeployerKeyIfItExists(); + + T1XChainReader(address(proxy)).initialize(MANAGER_MULTISIG); + + vm.stopBroadcast(); + } +} \ No newline at end of file diff --git a/contracts/script/configure/7683/InitializeBaseT1XChainReader.s.sol b/contracts/script/configure/7683/InitializeBaseT1XChainReader.s.sol new file mode 100644 index 00000000..582ea5bf --- /dev/null +++ b/contracts/script/configure/7683/InitializeBaseT1XChainReader.s.sol @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity ^0.8.30; + +import { DeploymentUtils } from "../../lib/DeploymentUtils.sol"; +import { T1XChainReader } from "../../../src/libraries/xChain/T1XChainReader.sol"; + +contract InitializeBaseT1XChainReader is DeploymentUtils { + address internal proxy = vm.envAddress("BASE_T1_X_CHAIN_READ_PROXY_ADDR"); + address internal MANAGER_MULTISIG = vm.envAddress("MANAGER_MULTISIG_ADDR"); + + function init() external { + selectMainnetOrSepoliaFork("base"); + startBroadcastWithDeployerKeyIfItExists(); + + T1XChainReader(address(proxy)).initialize(MANAGER_MULTISIG); + + vm.stopBroadcast(); + } +} \ No newline at end of file diff --git a/contracts/script/deploy/DeployArbT1XChainReader.s.sol b/contracts/script/deploy/DeployArbT1XChainReader.s.sol index 9c6dc47a..efc2e252 100644 --- a/contracts/script/deploy/DeployArbT1XChainReader.s.sol +++ b/contracts/script/deploy/DeployArbT1XChainReader.s.sol @@ -25,12 +25,12 @@ contract DeployArbT1XChainReader is DeploymentUtils { T1XChainReader impl = new T1XChainReader(PROVER); logAddress("ARB_T1_X_CHAIN_READ_IMPLEMENTATION_ADDR", address(impl)); - impl.initialize(MANAGER_MULTISIG); - TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0)); logAddress("ARB_T1_X_CHAIN_READ_PROXY_ADDR", address(proxy)); + T1XChainReader(address(proxy)).initialize(MANAGER_MULTISIG); + vm.stopBroadcast(); logEnd("DeployXChainRead to ARB"); diff --git a/contracts/script/deploy/DeployBaseT1XChainReader.s.sol b/contracts/script/deploy/DeployBaseT1XChainReader.s.sol index f3f7ca9c..0b6f4d4f 100644 --- a/contracts/script/deploy/DeployBaseT1XChainReader.s.sol +++ b/contracts/script/deploy/DeployBaseT1XChainReader.s.sol @@ -24,12 +24,12 @@ contract DeployBaseT1XChainReader is DeploymentUtils { T1XChainReader impl = new T1XChainReader(PROVER); logAddress("BASE_T1_X_CHAIN_READ_IMPLEMENTATION_ADDR", address(impl)); - impl.initialize(MANAGER_MULTISIG); - TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0)); logAddress("BASE_T1_X_CHAIN_READ_PROXY_ADDR", address(proxy)); + T1XChainReader(address(proxy)).initialize(MANAGER_MULTISIG); + vm.stopBroadcast(); logEnd("DeployXChainRead to BASE"); From 6975d3fbf43a77d9e069b9a5185c0a69a1180a47 Mon Sep 17 00:00:00 2001 From: Ryan Collins Date: Wed, 8 Oct 2025 10:08:37 -0400 Subject: [PATCH 4/4] fix: forge fmt --- .../script/configure/7683/InitializeArbT1XChainReader.s.sol | 2 +- .../script/configure/7683/InitializeBaseT1XChainReader.s.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/script/configure/7683/InitializeArbT1XChainReader.s.sol b/contracts/script/configure/7683/InitializeArbT1XChainReader.s.sol index 7a2ea196..1c1ff7fd 100644 --- a/contracts/script/configure/7683/InitializeArbT1XChainReader.s.sol +++ b/contracts/script/configure/7683/InitializeArbT1XChainReader.s.sol @@ -16,4 +16,4 @@ contract InitializeArbT1XChainReader is DeploymentUtils { vm.stopBroadcast(); } -} \ No newline at end of file +} diff --git a/contracts/script/configure/7683/InitializeBaseT1XChainReader.s.sol b/contracts/script/configure/7683/InitializeBaseT1XChainReader.s.sol index 582ea5bf..885ee3e1 100644 --- a/contracts/script/configure/7683/InitializeBaseT1XChainReader.s.sol +++ b/contracts/script/configure/7683/InitializeBaseT1XChainReader.s.sol @@ -16,4 +16,4 @@ contract InitializeBaseT1XChainReader is DeploymentUtils { vm.stopBroadcast(); } -} \ No newline at end of file +}