From dde4cdd64e8f793572e177fd166f77237ec53f4c Mon Sep 17 00:00:00 2001
From: kyriediculous <vergauwennico@gmail.com>
Date: Thu, 23 Nov 2023 19:11:38 +0100
Subject: [PATCH] testnet: helper updates and deploy scripts

---
 script/Tenderize_Deploy.s.sol | 2 +-
 script/XYZ_Deploy.s.sol       | 2 +-
 script/XYZ_Faucet.s.sol       | 2 +-
 script/arbgoerli_testnet.sh   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/Tenderize_Deploy.s.sol b/script/Tenderize_Deploy.s.sol
index c344166..5b7942c 100644
--- a/script/Tenderize_Deploy.s.sol
+++ b/script/Tenderize_Deploy.s.sol
@@ -25,7 +25,7 @@ contract Tenderize_Deploy is Script {
     // Contracts are deployed deterministically.
     // e.g. `foo = new Foo{salt: salt}(constructorArgs)`
     // The presence of the salt argument tells forge to use https://github.com/Arachnid/deterministic-deployment-proxy
-    bytes32 private constant salt = 0x0;
+    bytes32 private constant salt = bytes32(uint256(1));
 
     function run() public {
         string memory json_output;
diff --git a/script/XYZ_Deploy.s.sol b/script/XYZ_Deploy.s.sol
index a47ea37..81cb483 100644
--- a/script/XYZ_Deploy.s.sol
+++ b/script/XYZ_Deploy.s.sol
@@ -20,7 +20,7 @@ import { Registry } from "core/registry/Registry.sol";
 import { Factory } from "core/factory/Factory.sol";
 
 contract XYZ_Deploy is Script {
-    bytes32 private constant salt = 0x0;
+    bytes32 private constant salt = bytes32(uint256(1));
 
     function run() public {
         address registry = vm.envAddress("REGISTRY");
diff --git a/script/XYZ_Faucet.s.sol b/script/XYZ_Faucet.s.sol
index 7b5b844..5d5b0e9 100644
--- a/script/XYZ_Faucet.s.sol
+++ b/script/XYZ_Faucet.s.sol
@@ -22,7 +22,7 @@ import { TokenFaucet } from "../test/helpers/Faucet.sol";
 import { ERC20 } from "solmate/tokens/ERC20.sol";
 
 contract XYZ_Faucet is Script {
-    bytes32 private constant salt = 0x0;
+    bytes32 private constant salt = bytes32(uint256(1));
 
     function run() public {
         uint256 privKey = vm.envUint("PRIVATE_KEY");
diff --git a/script/arbgoerli_testnet.sh b/script/arbgoerli_testnet.sh
index 0e8b221..dda8552 100644
--- a/script/arbgoerli_testnet.sh
+++ b/script/arbgoerli_testnet.sh
@@ -8,8 +8,8 @@ curl -H "Content-Type: application/json" -X POST --data '{"jsonrpc":"2.0","id":6
 source .env
 
 # Deterministic
-export REGISTRY=0x8A89ee359EF0C92e3A8c3af11d1D675d3DF16B2f
-export FACTORY=0x3cB1E8d050E126bBE05782c7206Cf53856FDaA77
+export REGISTRY=0x6232894e592F104FB561c1Fb59a52ea01ee7D867
+export FACTORY=0x62536191D4EB10D4CA5909D60232593A1b40BE10
 
 # forge script script/Tenderize_Deploy.s.sol:Tenderize_Deploy --rpc-url ${ARBITRUM_GOERLI_RPC} --broadcast --private-key $PRIVATE_KEY -vvvv