Skip to content

Commit 0bb2ff5

Browse files
bitwiseguybitwiseguy
authored
repo: rename plasma --> altDA (#11370)
* update superchain-registry import * replace all plasma with altda * replace plasma with altda in filenames * contracts: update snapshots * go: update superchain import * go: update superchain import after rebase * go: run mod tidy * op-batcher: fix altda env vars passed in devnet docker-compose * go: update superchain import * go: use main commit for superchain import
1 parent eaed52d commit 0bb2ff5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+500
-561
lines changed

‎.circleci/config.yml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -207,17 +207,17 @@ jobs:
207207
name: Copy L2OO allocs to .devnet-l2oo
208208
command: cp -r .devnet/ .devnet-l2oo/
209209
- run:
210-
name: Generate Plasma allocs
211-
command: DEVNET_PLASMA="true" make devnet-allocs
210+
name: Generate AltDA allocs
211+
command: DEVNET_ALTDA="true" make devnet-allocs
212212
- run:
213-
name: Copy Plasma allocs to .devnet-plasma
214-
command: cp -r .devnet/ .devnet-plasma/
213+
name: Copy AltDA allocs to .devnet-altda
214+
command: cp -r .devnet/ .devnet-altda/
215215
- run:
216-
name: Generate Generic Plasma allocs
217-
command: DEVNET_PLASMA="true" GENERIC_PLASMA="true" make devnet-allocs
216+
name: Generate Generic AltDA allocs
217+
command: DEVNET_ALTDA="true" GENERIC_ALTDA="true" make devnet-allocs
218218
- run:
219-
name: Copy Plasma allocs to .devnet-plasma
220-
command: cp -r .devnet/ .devnet-plasma-generic/
219+
name: Copy AltDA allocs to .devnet-altda
220+
command: cp -r .devnet/ .devnet-altda-generic/
221221
- run:
222222
name: Generate default allocs
223223
command: make devnet-allocs
@@ -239,18 +239,18 @@ jobs:
239239
- ".devnet-l2oo/allocs-l2-ecotone.json"
240240
- ".devnet-l2oo/allocs-l2-fjord.json"
241241
- ".devnet-l2oo/allocs-l2-granite.json"
242-
- ".devnet-plasma/allocs-l1.json"
243-
- ".devnet-plasma/addresses.json"
244-
- ".devnet-plasma/allocs-l2-delta.json"
245-
- ".devnet-plasma/allocs-l2-ecotone.json"
246-
- ".devnet-plasma/allocs-l2-fjord.json"
247-
- ".devnet-plasma/allocs-l2-granite.json"
248-
- ".devnet-plasma-generic/allocs-l1.json"
249-
- ".devnet-plasma-generic/addresses.json"
250-
- ".devnet-plasma-generic/allocs-l2-delta.json"
251-
- ".devnet-plasma-generic/allocs-l2-ecotone.json"
252-
- ".devnet-plasma-generic/allocs-l2-fjord.json"
253-
- ".devnet-plasma-generic/allocs-l2-granite.json"
242+
- ".devnet-altda/allocs-l1.json"
243+
- ".devnet-altda/addresses.json"
244+
- ".devnet-altda/allocs-l2-delta.json"
245+
- ".devnet-altda/allocs-l2-ecotone.json"
246+
- ".devnet-altda/allocs-l2-fjord.json"
247+
- ".devnet-altda/allocs-l2-granite.json"
248+
- ".devnet-altda-generic/allocs-l1.json"
249+
- ".devnet-altda-generic/addresses.json"
250+
- ".devnet-altda-generic/allocs-l2-delta.json"
251+
- ".devnet-altda-generic/allocs-l2-ecotone.json"
252+
- ".devnet-altda-generic/allocs-l2-fjord.json"
253+
- ".devnet-altda-generic/allocs-l2-granite.json"
254254
- "packages/contracts-bedrock/deploy-config/devnetL1.json"
255255
- "packages/contracts-bedrock/deployments/devnetL1"
256256
- notify-failures-on-develop
@@ -838,11 +838,11 @@ jobs:
838838
command: echo 'export OP_E2E_USE_L2OO=true' >> $BASH_ENV
839839
- when:
840840
condition:
841-
equal: ['-plasma', <<parameters.variant>>]
841+
equal: ['-altda', <<parameters.variant>>]
842842
steps:
843843
- run:
844-
name: Set OP_E2E_USE_PLASMA = true
845-
command: echo 'export OP_E2E_USE_PLASMA=true' >> $BASH_ENV
844+
name: Set OP_E2E_USE_ALTDA = true
845+
command: echo 'export OP_E2E_USE_ALTDA=true' >> $BASH_ENV
846846
- check-changed:
847847
patterns: op-(.+),cannon,contracts-bedrock
848848
- run:
@@ -1067,26 +1067,26 @@ jobs:
10671067
DEVNET_NO_BUILD: 'true'
10681068
# Default value; Can be overridden.
10691069
DEVNET_L2OO: 'false'
1070-
DEVNET_PLASMA: 'false'
1070+
DEVNET_ALTDA: 'false'
10711071
steps:
10721072
- checkout
10731073
- when:
10741074
condition:
1075-
equal: ['plasma', <<parameters.variant>>]
1075+
equal: ['altda', <<parameters.variant>>]
10761076
steps:
10771077
- run:
1078-
name: Set DEVNET_PLASMA = true
1079-
command: echo 'export DEVNET_PLASMA=true' >> $BASH_ENV
1078+
name: Set DEVNET_ALTDA = true
1079+
command: echo 'export DEVNET_ALTDA=true' >> $BASH_ENV
10801080
- when:
10811081
condition:
1082-
equal: ['plasma-generic', <<parameters.variant>>]
1082+
equal: ['altda-generic', <<parameters.variant>>]
10831083
steps:
10841084
- run:
1085-
name: Set DEVNET_PLASMA = true
1086-
command: echo 'export DEVNET_PLASMA=true' >> $BASH_ENV
1085+
name: Set DEVNET_ALTDA = true
1086+
command: echo 'export DEVNET_ALTDA=true' >> $BASH_ENV
10871087
- run:
1088-
name: Set GENERIC_PLASMA = true
1089-
command: echo 'export GENERIC_PLASMA=true' >> $BASH_ENV
1088+
name: Set GENERIC_ALTDA = true
1089+
command: echo 'export GENERIC_ALTDA=true' >> $BASH_ENV
10901090
- check-changed:
10911091
patterns: op-(.+),packages,ops-bedrock,bedrock-devnet
10921092
- run:
@@ -1576,7 +1576,7 @@ workflows:
15761576
name: op-e2e-action-tests<< matrix.variant >>
15771577
matrix:
15781578
parameters:
1579-
variant: ["", "-l2oo", "-plasma"]
1579+
variant: ["", "-l2oo", "-altda"]
15801580
module: op-e2e
15811581
target: test-actions
15821582
parallelism: 1
@@ -1621,7 +1621,7 @@ workflows:
16211621
- op-e2e-HTTP-tests
16221622
- op-e2e-fault-proof-tests
16231623
- op-e2e-action-tests
1624-
- op-e2e-action-tests-plasma
1624+
- op-e2e-action-tests-altda
16251625
- docker-build:
16261626
name: op-node-docker-build
16271627
docker_name: op-node
@@ -1678,7 +1678,7 @@ workflows:
16781678
- devnet:
16791679
matrix:
16801680
parameters:
1681-
variant: ["default", "plasma", "plasma-generic"]
1681+
variant: ["default", "altda", "altda-generic"]
16821682
requires:
16831683
- pnpm-monorepo
16841684
- op-batcher-docker-build

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/op-heartbeat @ethereum-optimism/go-reviewers
1515
/op-node @ethereum-optimism/go-reviewers
1616
/op-node/rollup @protolambda @ajsutton
17-
/op-plasma @ethereum-optimism/go-reviewers
17+
/op-alt-da @ethereum-optimism/go-reviewers
1818
/op-preimage @ethereum-optimism/go-reviewers
1919
/op-program @ethereum-optimism/go-reviewers
2020
/op-proposer @ethereum-optimism/go-reviewers

‎bedrock-devnet/devnet/__init__.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
# Global environment variables
2828
DEVNET_NO_BUILD = os.getenv('DEVNET_NO_BUILD') == "true"
2929
DEVNET_L2OO = os.getenv('DEVNET_L2OO') == "true"
30-
DEVNET_PLASMA = os.getenv('DEVNET_PLASMA') == "true"
31-
GENERIC_PLASMA = os.getenv('GENERIC_PLASMA') == "true"
30+
DEVNET_ALTDA = os.getenv('DEVNET_ALTDA') == "true"
31+
GENERIC_ALTDA = os.getenv('GENERIC_ALTDA') == "true"
3232

3333
class Bunch:
3434
def __init__(self, **kwds):
@@ -123,9 +123,9 @@ def init_devnet_l1_deploy_config(paths, update_timestamp=False):
123123
deploy_config['l1GenesisBlockTimestamp'] = '{:#x}'.format(int(time.time()))
124124
if DEVNET_L2OO:
125125
deploy_config['useFaultProofs'] = False
126-
if DEVNET_PLASMA:
127-
deploy_config['usePlasma'] = True
128-
if GENERIC_PLASMA:
126+
if DEVNET_ALTDA:
127+
deploy_config['useAltDA'] = True
128+
if GENERIC_ALTDA:
129129
deploy_config['daCommitmentType'] = "GenericCommitment"
130130
write_json(paths.devnet_config_path, deploy_config)
131131

@@ -175,7 +175,7 @@ def devnet_deploy(paths):
175175
log.info('L1 genesis already generated.')
176176
else:
177177
log.info('Generating L1 genesis.')
178-
if not os.path.exists(paths.allocs_l1_path) or DEVNET_L2OO or DEVNET_PLASMA:
178+
if not os.path.exists(paths.allocs_l1_path) or DEVNET_L2OO or DEVNET_ALTDA:
179179
# If this is a devnet variant then we need to generate the allocs
180180
# file here always. This is because CI will run devnet-allocs
181181
# without setting the appropriate env var which means the allocs will be wrong.
@@ -267,19 +267,19 @@ def devnet_deploy(paths):
267267
docker_env['DG_TYPE'] = '254'
268268
docker_env['PROPOSAL_INTERVAL'] = '12s'
269269

270-
if DEVNET_PLASMA:
271-
docker_env['PLASMA_ENABLED'] = 'true'
270+
if DEVNET_ALTDA:
271+
docker_env['ALTDA_ENABLED'] = 'true'
272272
docker_env['DA_TYPE'] = 'calldata'
273273
else:
274-
docker_env['PLASMA_ENABLED'] = 'false'
274+
docker_env['ALTDA_ENABLED'] = 'false'
275275
docker_env['DA_TYPE'] = 'blobs'
276276

277-
if GENERIC_PLASMA:
278-
docker_env['PLASMA_GENERIC_DA'] = 'true'
279-
docker_env['PLASMA_DA_SERVICE'] = 'true'
277+
if GENERIC_ALTDA:
278+
docker_env['ALTDA_GENERIC_DA'] = 'true'
279+
docker_env['ALTDA_SERVICE'] = 'true'
280280
else:
281-
docker_env['PLASMA_GENERIC_DA'] = 'false'
282-
docker_env['PLASMA_DA_SERVICE'] = 'false'
281+
docker_env['ALTDA_GENERIC_DA'] = 'false'
282+
docker_env['ALTDA_SERVICE'] = 'false'
283283

284284
# Bring up the rest of the services.
285285
log.info('Bringing up `op-node`, `op-proposer` and `op-batcher`.')
@@ -291,7 +291,7 @@ def devnet_deploy(paths):
291291
run_command(['docker', 'compose', 'up', '-d', 'op-challenger'], cwd=paths.ops_bedrock_dir, env=docker_env)
292292

293293
# Optionally bring up Alt-DA Mode components.
294-
if DEVNET_PLASMA:
294+
if DEVNET_ALTDA:
295295
log.info('Bringing up `da-server`, `sentinel`.') # TODO(10141): We don't have public sentinel images yet
296296
run_command(['docker', 'compose', 'up', '-d', 'da-server'], cwd=paths.ops_bedrock_dir, env=docker_env)
297297

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/crate-crypto/go-kzg-4844 v1.0.0
1212
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
1313
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
14-
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240813170044-d5be5587e58f
14+
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240814192743-ea7e768a02a6
1515
github.com/ethereum/go-ethereum v1.14.7
1616
github.com/fsnotify/fsnotify v1.7.0
1717
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z
176176
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
177177
github.com/ethereum-optimism/op-geth v1.101407.0-rc.1.0.20240812224053-8d99ca68bb1a h1:OK3wB7HbdhCneSowC1XZusHaLIVdXoRLuCWgXp5Tjuc=
178178
github.com/ethereum-optimism/op-geth v1.101407.0-rc.1.0.20240812224053-8d99ca68bb1a/go.mod h1:9pT+bF20XwCBE7WkjfRSsCg6RN6Njdbr924DtQ3+geY=
179-
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240813170044-d5be5587e58f h1:JTnVOiaYVQcXc+zgsSjnTQ18k3uOLOpch8SiPjO1eTo=
180-
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240813170044-d5be5587e58f/go.mod h1:zy9f3TNPS7pwW4msMitF83fp0Wf452tZ6+Fg6d4JyXM=
179+
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240814192743-ea7e768a02a6 h1:s51nSnpwPJRRU/F6mob/fnOebFmuPz3Ab1J/HCtC40U=
180+
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240814192743-ea7e768a02a6/go.mod h1:zy9f3TNPS7pwW4msMitF83fp0Wf452tZ6+Fg6d4JyXM=
181181
github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
182182
github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
183183
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=

‎op-plasma/.gitignore‎ renamed to ‎op-alt-da/.gitignore‎

File renamed without changes.

‎op-plasma/Dockerfile‎ renamed to ‎op-alt-da/Dockerfile‎

File renamed without changes.

‎op-plasma/Dockerfile.dockerignore‎ renamed to ‎op-alt-da/Dockerfile.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
*
22

33
!/op-service
4-
!/op-plasma
4+
!/op-alt-da
55
!/go.mod
66
!/go.sum

‎op-plasma/Makefile‎ renamed to ‎op-alt-da/Makefile‎

File renamed without changes.

‎op-plasma/bindings/dataavailabilitychallenge.go‎ renamed to ‎op-alt-da/bindings/dataavailabilitychallenge.go‎

File renamed without changes.

0 commit comments

Comments
 (0)