Skip to content

Commit

Permalink
removed rollup to focus on EVM
Browse files Browse the repository at this point in the history
  • Loading branch information
gjermundgaraba committed Nov 23, 2024
1 parent 4d80304 commit 720432b
Show file tree
Hide file tree
Showing 52 changed files with 75 additions and 7,694 deletions.
2 changes: 0 additions & 2 deletions docs/docs/developing/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ just install-simapps

There is a command that spins up a local test environment with the following components:
* Simapp (Cosmos SDK chain with Interchain Attestion integrated)
* Rollupsimapp (Rollkit rollup)
* Mock DA service (for the rollup)
* Sidecar
* Configuration
* Light clients
Expand Down
7 changes: 0 additions & 7 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ build:
cd configmodule && make build
cd sidecar && make build
cd testing/simapp && make build
cd testing/rollupsimapp && make build
cd testing/interchaintest && go build ./...

lint:
Expand All @@ -15,7 +14,6 @@ lint:
cd configmodule && golangci-lint run
cd sidecar && golangci-lint run
cd testing/simapp && golangci-lint run
cd testing/rollupsimapp && golangci-lint run
cd testing/interchaintest && golangci-lint run

lint-fix:
Expand All @@ -24,7 +22,6 @@ lint-fix:
cd configmodule && golangci-lint run --fix
cd sidecar && golangci-lint run --fix
cd testing/simapp && golangci-lint run --fix
cd testing/rollupsimapp && golangci-lint run --fix
cd testing/interchaintest && golangci-lint run --fix

tidy:
Expand All @@ -33,7 +30,6 @@ tidy:
cd configmodule && go mod tidy
cd sidecar && go mod tidy
cd testing/simapp && go mod tidy
cd testing/rollupsimapp && go mod tidy
cd testing/interchaintest && go mod tidy

proto-gen:
Expand All @@ -58,6 +54,3 @@ install-simapps:
@echo "Installing simapps"
cd testing && make install-simapps

serve:
@echo "Spinning up a test environment"
cd testing && make serve
50 changes: 3 additions & 47 deletions testing/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,71 +5,27 @@
install-simapps:
@echo "=========== Installing simapp ============"
@cd simapp && make install
@echo "=========== Installing rollupsimapp ============"
@cd rollupsimapp && make install

# Generate the `Counter.json` file containing the ABI of the Counter contract
# Requires `forge` to be installed on the system
# Requires `jq` to be installed on the system
# Requires `abigen` to be installed on the system to generate the go bindings for e2e tests
generate-abi:
@cd contracts && forge install && forge build
jq '.abi' contracts/out/Counter.sol/Counter.json > contracts/abi/Counter.json
@echo "ABI file created at 'contracts/abi/Counter.json'"
@echo "Generating go bindings for the end-to-end tests..."
abigen --abi contracts/abi/Counter.json --pkg counter --type Contract --out interchaintest/types/counter/contract.go
@echo "Done."

###############################################################################
### Docker ###
###############################################################################

docker-images: simapp-image rollupsimapp-image sidecar-image mock-da-image
docker-images: simapp-image sidecar-image

simapp-image:
@echo "Building ghcr.io/cosmos/interchain-attestation-simapp:local docker image"
docker build -t ghcr.io/cosmos/interchain-attestation-simapp:local -f simapp.Dockerfile ../

rollupsimapp-image:
@echo "Building ghcr.io/cosmos/interchain-attestation-rollupsimapp:local docker image"
docker build -t ghcr.io/cosmos/interchain-attestation-rollupsimapp:local -f rollupsimapp.Dockerfile ../

sidecar-image:
@echo "Building ghcr.io/cosmos/interchain-attestation-sidecar:local docker image"
docker build -t ghcr.io/cosmos/interchain-attestation-sidecar:local -f sidecar.Dockerfile ../

mock-da-image:
@echo "Building ghcr.io/cosmos/interchain-attestation-mock-da:local docker image"
docker build -t ghcr.io/cosmos/interchain-attestation-mock-da:local -f mock-da.Dockerfile .

###############################################################################
### Testing ###
###############################################################################

interchaintest:
@echo "Running interchaintest tests"
@cd interchaintest && go test -race -count=1 -v -run E2ETestSuite/TestCosmosRollupAttestation ./...

###############################################################################
### Serve ###
###############################################################################

serve: kill-all install-simapps mock-da-image
@echo "=========== Serve ============"
./scripts/serve-mock-da.sh
./scripts/serve-simapp.sh
./scripts/serve-rollupsimapp.sh
./scripts/serve-sidecar.sh

kill-all:
@echo "Killing simappd"
-@pkill simappd 2>/dev/null
@echo "Killing rollupsimappd"
-@pkill rollupsimappd 2>/dev/null
@echo "Killing attestation-sidecar"
-@pkill attestation-sidecar 2>/dev/null
@echo "Killing mock-da"
-@docker container stop mockda 2>/dev/null
-@docker container rm mockda 2>/dev/null
@cd interchaintest && go test -race -count=1 -v ./...

.PHONY: *
.PHONY: *
34 changes: 0 additions & 34 deletions testing/contracts/.github/workflows/test.yml

This file was deleted.

14 changes: 0 additions & 14 deletions testing/contracts/.gitignore

This file was deleted.

70 changes: 0 additions & 70 deletions testing/contracts/README.md

This file was deleted.

35 changes: 0 additions & 35 deletions testing/contracts/abi/Counter.json

This file was deleted.

6 changes: 0 additions & 6 deletions testing/contracts/foundry.toml

This file was deleted.

1 change: 0 additions & 1 deletion testing/contracts/lib/forge-std
Submodule forge-std deleted from 07263d
16 changes: 0 additions & 16 deletions testing/contracts/script/Counter.s.sol

This file was deleted.

14 changes: 0 additions & 14 deletions testing/contracts/src/Counter.sol

This file was deleted.

24 changes: 0 additions & 24 deletions testing/contracts/test/Counter.t.sol

This file was deleted.

Loading

0 comments on commit 720432b

Please sign in to comment.