From b60eefa3fa7f351b2c936f5a34320c2f319feda7 Mon Sep 17 00:00:00 2001 From: Aaron DeRuvo Date: Wed, 11 Sep 2024 17:25:06 +0200 Subject: [PATCH 1/6] add op contract addresses for alfajores --- .changeset/nasty-doors-wash.md | 5 +++++ src/celo/chainConfig.ts | 2 ++ src/chains/definitions/celoAlfajores.ts | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 .changeset/nasty-doors-wash.md diff --git a/.changeset/nasty-doors-wash.md b/.changeset/nasty-doors-wash.md new file mode 100644 index 0000000000..cdc097abb2 --- /dev/null +++ b/.changeset/nasty-doors-wash.md @@ -0,0 +1,5 @@ +--- +"viem": patch +--- + +update celo alfajores chain to include op contract addresses diff --git a/src/celo/chainConfig.ts b/src/celo/chainConfig.ts index 2049911857..7b2f3e80de 100644 --- a/src/celo/chainConfig.ts +++ b/src/celo/chainConfig.ts @@ -1,8 +1,10 @@ import { fees } from './fees.js' import { formatters } from './formatters.js' import { serializers } from './serializers.js' +import { contracts } from '../op-stack/contracts.js' export const chainConfig = { + contracts, formatters, serializers, fees, diff --git a/src/chains/definitions/celoAlfajores.ts b/src/chains/definitions/celoAlfajores.ts index e87254e7e5..00d115f505 100644 --- a/src/chains/definitions/celoAlfajores.ts +++ b/src/chains/definitions/celoAlfajores.ts @@ -1,6 +1,8 @@ import { chainConfig } from '../../celo/chainConfig.js' import { defineChain } from '../../utils/chain/defineChain.js' +const sourceId = 11_155_111 // sepolia + export const celoAlfajores = /*#__PURE__*/ defineChain({ ...chainConfig, id: 44_787, @@ -23,10 +25,31 @@ export const celoAlfajores = /*#__PURE__*/ defineChain({ }, }, contracts: { + ...chainConfig.contracts, multicall3: { address: '0xcA11bde05977b3631167028862bE2a173976CA11', blockCreated: 14569001, }, + disputeGameFactory: { + [sourceId]: { + address: '0x831f39053688f05698ad0fB5f4DE7e56B2949c55', + }, + }, + l2OutputOracle: { + [sourceId]: { + address: '0x419577592C884868C3ed85B97169b93362581855', + }, + }, + portal: { + [sourceId]: { + address: '0xB29597c6866c6C2870348f1035335B75eEf79d07', + }, + }, + l1StandardBridge: { + [sourceId]: { + address: '0x9FEBd0F16b97e0AEF9151AF07106d733E87B1be4', + }, + }, }, testnet: true, }) From 952bf8a830d46731453c8f060cd6fd884cdd037d Mon Sep 17 00:00:00 2001 From: Aaron DeRuvo Date: Wed, 11 Sep 2024 17:25:40 +0200 Subject: [PATCH 2/6] lint --- src/celo/chainConfig.ts | 2 +- src/chains/definitions/celoAlfajores.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/celo/chainConfig.ts b/src/celo/chainConfig.ts index 7b2f3e80de..7ab857367a 100644 --- a/src/celo/chainConfig.ts +++ b/src/celo/chainConfig.ts @@ -1,7 +1,7 @@ +import { contracts } from '../op-stack/contracts.js' import { fees } from './fees.js' import { formatters } from './formatters.js' import { serializers } from './serializers.js' -import { contracts } from '../op-stack/contracts.js' export const chainConfig = { contracts, diff --git a/src/chains/definitions/celoAlfajores.ts b/src/chains/definitions/celoAlfajores.ts index 00d115f505..2844223674 100644 --- a/src/chains/definitions/celoAlfajores.ts +++ b/src/chains/definitions/celoAlfajores.ts @@ -1,7 +1,7 @@ import { chainConfig } from '../../celo/chainConfig.js' import { defineChain } from '../../utils/chain/defineChain.js' -const sourceId = 11_155_111 // sepolia +const sourceId = 11_155_111 // sepolia export const celoAlfajores = /*#__PURE__*/ defineChain({ ...chainConfig, From 01cd34f15e1c549073343dfee176c59341cc6a03 Mon Sep 17 00:00:00 2001 From: Aaron DeRuvo Date: Thu, 12 Sep 2024 12:00:19 +0200 Subject: [PATCH 3/6] use the addresses that worked on the test app https://github.com/aaronmgdr/celo-op-example/blob/main/config.ts add celoscan as block explorer --- src/chains/definitions/celoAlfajores.ts | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/chains/definitions/celoAlfajores.ts b/src/chains/definitions/celoAlfajores.ts index 2844223674..d18b2a157f 100644 --- a/src/chains/definitions/celoAlfajores.ts +++ b/src/chains/definitions/celoAlfajores.ts @@ -23,6 +23,11 @@ export const celoAlfajores = /*#__PURE__*/ defineChain({ url: 'https://explorer.celo.org/alfajores', apiUrl: 'https://explorer.celo.org/api', }, + celoscan: { + name: 'CeloScan', + url: 'https://alfajores.celoscan.io/', + apiUrl: 'https://api-alfajores.celoscan.io/api', + } }, contracts: { ...chainConfig.contracts, @@ -30,26 +35,31 @@ export const celoAlfajores = /*#__PURE__*/ defineChain({ address: '0xcA11bde05977b3631167028862bE2a173976CA11', blockCreated: 14569001, }, - disputeGameFactory: { + portal: { [sourceId]: { - address: '0x831f39053688f05698ad0fB5f4DE7e56B2949c55', + address: "0x969d247cB586C0bF02212B9ae6e690e8b0d762bA" }, }, - l2OutputOracle: { + disputeGameFactory: { [sourceId]: { - address: '0x419577592C884868C3ed85B97169b93362581855', + address: '0xB0C46509E24a0745d201114016fD666D6D1E3f8e', }, }, - portal: { + l2OutputOracle: { [sourceId]: { - address: '0xB29597c6866c6C2870348f1035335B75eEf79d07', + address: '0x58eeeEC56C6e92b1898367fa7372ab3f6483F054', }, }, l1StandardBridge: { [sourceId]: { - address: '0x9FEBd0F16b97e0AEF9151AF07106d733E87B1be4', + address: '0x65E8f629B13535f902020668Fe73aEc24e52F5D8', }, }, + l2StandardBridge: { + [sourceId]: { + address: '0x4200000000000000000000000000000000000010', + }, + } }, testnet: true, }) From 0f21aaa45c9e03ed2055b2ee7ecba47601df7b11 Mon Sep 17 00:00:00 2001 From: Aaron DeRuvo Date: Thu, 12 Sep 2024 12:01:11 +0200 Subject: [PATCH 4/6] lint --- src/chains/definitions/celoAlfajores.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chains/definitions/celoAlfajores.ts b/src/chains/definitions/celoAlfajores.ts index d18b2a157f..9846096794 100644 --- a/src/chains/definitions/celoAlfajores.ts +++ b/src/chains/definitions/celoAlfajores.ts @@ -27,7 +27,7 @@ export const celoAlfajores = /*#__PURE__*/ defineChain({ name: 'CeloScan', url: 'https://alfajores.celoscan.io/', apiUrl: 'https://api-alfajores.celoscan.io/api', - } + }, }, contracts: { ...chainConfig.contracts, @@ -37,7 +37,7 @@ export const celoAlfajores = /*#__PURE__*/ defineChain({ }, portal: { [sourceId]: { - address: "0x969d247cB586C0bF02212B9ae6e690e8b0d762bA" + address: '0x969d247cB586C0bF02212B9ae6e690e8b0d762bA', }, }, disputeGameFactory: { @@ -59,7 +59,7 @@ export const celoAlfajores = /*#__PURE__*/ defineChain({ [sourceId]: { address: '0x4200000000000000000000000000000000000010', }, - } + }, }, testnet: true, }) From 991c473930edc1b41151e5e6576dc98d6578eeee Mon Sep 17 00:00:00 2001 From: Aaron DeRuvo Date: Thu, 12 Sep 2024 12:09:14 +0200 Subject: [PATCH 5/6] ammend changeset --- .changeset/nasty-doors-wash.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/nasty-doors-wash.md b/.changeset/nasty-doors-wash.md index cdc097abb2..fdf132168f 100644 --- a/.changeset/nasty-doors-wash.md +++ b/.changeset/nasty-doors-wash.md @@ -2,4 +2,4 @@ "viem": patch --- -update celo alfajores chain to include op contract addresses +update celo alfajores chain to include op contract addresses and celoscan From a7747624c159b5b418c831cc461f9386e766bdb6 Mon Sep 17 00:00:00 2001 From: Aaron DeRuvo Date: Fri, 13 Sep 2024 10:22:34 +0200 Subject: [PATCH 6/6] abort celoscan addition --- .changeset/nasty-doors-wash.md | 2 +- src/chains/definitions/celoAlfajores.ts | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.changeset/nasty-doors-wash.md b/.changeset/nasty-doors-wash.md index fdf132168f..cdc097abb2 100644 --- a/.changeset/nasty-doors-wash.md +++ b/.changeset/nasty-doors-wash.md @@ -2,4 +2,4 @@ "viem": patch --- -update celo alfajores chain to include op contract addresses and celoscan +update celo alfajores chain to include op contract addresses diff --git a/src/chains/definitions/celoAlfajores.ts b/src/chains/definitions/celoAlfajores.ts index 9846096794..11aec6b710 100644 --- a/src/chains/definitions/celoAlfajores.ts +++ b/src/chains/definitions/celoAlfajores.ts @@ -23,11 +23,6 @@ export const celoAlfajores = /*#__PURE__*/ defineChain({ url: 'https://explorer.celo.org/alfajores', apiUrl: 'https://explorer.celo.org/api', }, - celoscan: { - name: 'CeloScan', - url: 'https://alfajores.celoscan.io/', - apiUrl: 'https://api-alfajores.celoscan.io/api', - }, }, contracts: { ...chainConfig.contracts,