diff --git a/pkg/chain/chain_constants.go b/pkg/chain/chain_constants.go
index 213e012..3f9869a 100644
--- a/pkg/chain/chain_constants.go
+++ b/pkg/chain/chain_constants.go
@@ -30,100 +30,88 @@ var L2_CHAIN_IDS = L2ChainIDs{
 }
 
 type L1Contracts struct {
-	l1CrossDomainMessenger string
-	stateCommitmentChain   string
-	optimismPortal         string
-	l2OutputOracle         string
+	stateCommitmentChain string
+	optimismPortal       string
+	l2OutputOracle       string
 }
 
 func GetContractAddressesByChainID(chainID uint64) map[string]L1Contracts {
 	CONTRACT_ADDRESSES := map[uint64]map[string]L1Contracts{
 		L2_CHAIN_IDS.OPTIMISM: {
 			"l1": {
-				l1CrossDomainMessenger: "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318",
-				stateCommitmentChain:   "0xBe5dAb4A2e9cd0F27300dB4aB94BeE3A233AEB19",
-				optimismPortal:         "0xbEb5Fc579115071764c7423A4f12eDde41f106Ed",
-				l2OutputOracle:         "0xdfe97868233d1aa22e815a266982f2cf17685a27",
+				stateCommitmentChain: "0xBe5dAb4A2e9cd0F27300dB4aB94BeE3A233AEB19",
+				optimismPortal:       "0xbEb5Fc579115071764c7423A4f12eDde41f106Ed",
+				l2OutputOracle:       "0xdfe97868233d1aa22e815a266982f2cf17685a27",
 			},
 		},
 		L2_CHAIN_IDS.OPTIMISM_GOERLI: {
 			"l1": {
-				l1CrossDomainMessenger: "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318",
-				stateCommitmentChain:   "0x9c945aC97Baf48cB784AbBB61399beB71aF7A378",
-				optimismPortal:         "0x5b47E1A08Ea6d985D6649300584e6722Ec4B1383",
-				l2OutputOracle:         "0xE6Dfba0953616Bacab0c9A8ecb3a9BBa77FC15c0",
+				stateCommitmentChain: "0x9c945aC97Baf48cB784AbBB61399beB71aF7A378",
+				optimismPortal:       "0x5b47E1A08Ea6d985D6649300584e6722Ec4B1383",
+				l2OutputOracle:       "0xE6Dfba0953616Bacab0c9A8ecb3a9BBa77FC15c0",
 			},
 		},
 		L2_CHAIN_IDS.OPTIMISM_SEPOLIA: {
 			"l1": {
-				l1CrossDomainMessenger: "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318",
-				stateCommitmentChain:   "0x0000000000000000000000000000000000000000",
-				optimismPortal:         "0x16Fc5058F25648194471939df75CF27A2fdC48BC",
-				l2OutputOracle:         "0x90E9c4f8a994a250F6aEfd61CAFb4F2e895D458F",
+				stateCommitmentChain: "0x0000000000000000000000000000000000000000",
+				optimismPortal:       "0x16Fc5058F25648194471939df75CF27A2fdC48BC",
+				l2OutputOracle:       "0x90E9c4f8a994a250F6aEfd61CAFb4F2e895D458F",
 			},
 		},
 		L2_CHAIN_IDS.OPTIMISM_HARDHAT_LOCAL: {
 			"l1": {
-				l1CrossDomainMessenger: "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318",
-				stateCommitmentChain:   "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
-				optimismPortal:         "0x0000000000000000000000000000000000000000",
-				l2OutputOracle:         "0x0000000000000000000000000000000000000000",
+				stateCommitmentChain: "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
+				optimismPortal:       "0x0000000000000000000000000000000000000000",
+				l2OutputOracle:       "0x0000000000000000000000000000000000000000",
 			},
 		},
 		L2_CHAIN_IDS.OPTIMISM_HARDHAT_DEVNET: {
 			"l1": {
-				l1CrossDomainMessenger: "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318",
-				stateCommitmentChain:   "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
-				optimismPortal:         "0x0000000000000000000000000000000000000000",
-				l2OutputOracle:         "0x0000000000000000000000000000000000000000",
+				stateCommitmentChain: "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
+				optimismPortal:       "0x0000000000000000000000000000000000000000",
+				l2OutputOracle:       "0x0000000000000000000000000000000000000000",
 			},
 		},
 		L2_CHAIN_IDS.OPTIMISM_BEDROCK_ALPHA_TESTNET: {
 			"l1": {
-				l1CrossDomainMessenger: "0x838a6DC4E37CA45D4Ef05bb776bf05eEf50798De",
-				stateCommitmentChain:   "0x0000000000000000000000000000000000000000",
-				optimismPortal:         "0xA581Ca3353DB73115C4625FFC7aDF5dB379434A8",
-				l2OutputOracle:         "0x3A234299a14De50027eA65dCdf1c0DaC729e04A6",
+				stateCommitmentChain: "0x0000000000000000000000000000000000000000",
+				optimismPortal:       "0xA581Ca3353DB73115C4625FFC7aDF5dB379434A8",
+				l2OutputOracle:       "0x3A234299a14De50027eA65dCdf1c0DaC729e04A6",
 			},
 		},
 		L2_CHAIN_IDS.BASE_GOERLI: {
 			"l1": {
-				l1CrossDomainMessenger: "0x8e5693140eA606bcEB98761d9beB1BC87383706D",
-				stateCommitmentChain:   "0x0000000000000000000000000000000000000000",
-				optimismPortal:         "0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA",
-				l2OutputOracle:         "0x2A35891ff30313CcFa6CE88dcf3858bb075A2298",
+				stateCommitmentChain: "0x0000000000000000000000000000000000000000",
+				optimismPortal:       "0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA",
+				l2OutputOracle:       "0x2A35891ff30313CcFa6CE88dcf3858bb075A2298",
 			},
 		},
 		L2_CHAIN_IDS.BASE_SEPOLIA: {
 			"l1": {
-				l1CrossDomainMessenger: "0xC34855F4De64F1840e5686e64278da901e261f20",
-				stateCommitmentChain:   "0x0000000000000000000000000000000000000000",
-				optimismPortal:         "0x49f53e41452C74589E85cA1677426Ba426459e85",
-				l2OutputOracle:         "0x84457ca9D0163FbC4bbfe4Dfbb20ba46e48DF254",
+				stateCommitmentChain: "0x0000000000000000000000000000000000000000",
+				optimismPortal:       "0x49f53e41452C74589E85cA1677426Ba426459e85",
+				l2OutputOracle:       "0x84457ca9D0163FbC4bbfe4Dfbb20ba46e48DF254",
 			},
 		},
 		L2_CHAIN_IDS.BASE_MAINNET: {
 			"l1": {
-				l1CrossDomainMessenger: "0x866E82a600A1414e583f7F13623F1aC5d58b0Afa",
-				stateCommitmentChain:   "0x0000000000000000000000000000000000000000",
-				optimismPortal:         "0x49048044D57e1C92A77f79988d21Fa8fAF74E97e",
-				l2OutputOracle:         "0x56315b90c40730925ec5485cf004d835058518A0",
+				stateCommitmentChain: "0x0000000000000000000000000000000000000000",
+				optimismPortal:       "0x49048044D57e1C92A77f79988d21Fa8fAF74E97e",
+				l2OutputOracle:       "0x56315b90c40730925ec5485cf004d835058518A0",
 			},
 		},
 		L2_CHAIN_IDS.ZORA_GOERLI: {
 			"l1": {
-				l1CrossDomainMessenger: "0xD87342e16352D33170557A7dA1e5fB966a60FafC",
-				stateCommitmentChain:   "0x0000000000000000000000000000000000000000",
-				optimismPortal:         "0xDb9F51790365e7dc196e7D072728df39Be958ACe",
-				l2OutputOracle:         "0xdD292C9eEd00f6A32Ff5245d0BCd7f2a15f24e00",
+				stateCommitmentChain: "0x0000000000000000000000000000000000000000",
+				optimismPortal:       "0xDb9F51790365e7dc196e7D072728df39Be958ACe",
+				l2OutputOracle:       "0xdD292C9eEd00f6A32Ff5245d0BCd7f2a15f24e00",
 			},
 		},
 		L2_CHAIN_IDS.ZORA_MAINNET: {
 			"l1": {
-				l1CrossDomainMessenger: "0xdC40a14d9abd6F410226f1E6de71aE03441ca506",
-				stateCommitmentChain:   "0x0000000000000000000000000000000000000000",
-				optimismPortal:         "0x1a0ad011913A150f69f6A19DF447A0CfD9551054",
-				l2OutputOracle:         "0x9E6204F750cD866b299594e2aC9eA824E2e5f95c",
+				stateCommitmentChain: "0x0000000000000000000000000000000000000000",
+				optimismPortal:       "0x1a0ad011913A150f69f6A19DF447A0CfD9551054",
+				l2OutputOracle:       "0x9E6204F750cD866b299594e2aC9eA824E2e5f95c",
 			},
 		},
 	}
diff --git a/pkg/chain/chain_constants_test.go b/pkg/chain/chain_constants_test.go
new file mode 100644
index 0000000..0101d63
--- /dev/null
+++ b/pkg/chain/chain_constants_test.go
@@ -0,0 +1,27 @@
+package chain
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetContractAddressesByChainID(t *testing.T) {
+	const availableChainID uint64 = 10
+
+	var contractAddresses = GetContractAddressesByChainID(availableChainID)
+
+	var ContractAddressesExpected = map[string]L1Contracts{
+		"l1": {
+			stateCommitmentChain: "0xBe5dAb4A2e9cd0F27300dB4aB94BeE3A233AEB19",
+			optimismPortal:       "0xbEb5Fc579115071764c7423A4f12eDde41f106Ed",
+			l2OutputOracle:       "0xdfe97868233d1aa22e815a266982f2cf17685a27",
+		}}
+
+	assert.Equal(t, ContractAddressesExpected, contractAddresses)
+
+	const unavailableChainID uint64 = 5
+
+	contractAddresses = GetContractAddressesByChainID(unavailableChainID)
+	assert.Equal(t, 0, len(contractAddresses))
+}
diff --git a/pkg/chain/contracts_test.go b/pkg/chain/contracts_test.go
new file mode 100644
index 0000000..fef1d20
--- /dev/null
+++ b/pkg/chain/contracts_test.go
@@ -0,0 +1 @@
+package chain