Skip to content

Commit

Permalink
Support packaging failed transactions into layer2 block
Browse files Browse the repository at this point in the history
  • Loading branch information
Flouse committed May 23, 2022
1 parent 7dd9033 commit f167aa9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 97 deletions.
2 changes: 1 addition & 1 deletion testnet_v1_1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker-compose up -d

* RPC URL: https://godwoken-testnet-v1.ckbapp.dev
* Websocket RPC URL: wss://godwoken-testnet-v1.ckbapp.dev/ws
* Bridge: https://testnet.bridge.godwoken.io
* Godwoken Token Bridge: https://testnet.bridge.godwoken.io

* Polyjuice Creator ID: 4
```js
Expand Down
27 changes: 13 additions & 14 deletions testnet_v1_1/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: '3.9'
services:
gw-readonly:
container_name: gw-testnet_v1.1-readonly
image: ghcr.io/nervosnetwork/godwoken-prebuilds:v1.1
image: ghcr.io/nervosnetwork/godwoken-prebuilds:v1.1.3-beta-202205231016
healthcheck:
test: /healthcheck.sh
start_period: 10s
Expand All @@ -22,19 +22,18 @@ services:
- RUST_LOG=info
command: godwoken
expose:
- "8119"
- "8219"
- 8119
- 8219

postgres:
image: postgres:alpine
expose:
- "5432"
- 5432
environment:
POSTGRES_USER: user
POSTGRES_DB: lumos
POSTGRES_PASSWORD: password
volumes:
- ./web3-indexer-schema.sql:/docker-entrypoint-initdb.d/web3-indexer-schema.sql
- ./chain-data/postgresql/data:/var/lib/postgresql/data

redis:
Expand All @@ -44,31 +43,31 @@ services:
- ./chain-data/redis-data:/data

web3:
image: ghcr.io/nervosnetwork/godwoken-web3-prebuilds:compatibility-breaking-changes-2b1dc8e
image: ghcr.io/nervosnetwork/godwoken-web3-prebuilds:refactor-db-01b5da5
healthcheck:
test: curl http://127.0.0.1:3000 || exit 1
test: curl http://127.0.0.1:8024 || exit 1
volumes:
- ./web3.env:/godwoken-web3/packages/api-server/.env
working_dir: /godwoken-web3
command: bash -c 'set -ex ; yarn run build && yarn run start:prod'
command: bash -c 'set -ex ; yarn knex migrate:latest && yarn start:prod'
ports:
- '8024:3000'
depends_on:
- 8024
depends_on:
- redis
- postgres
- gw-readonly

web3-indexer:
image: ghcr.io/nervosnetwork/godwoken-web3-indexer-prebuilds:compatibility-breaking-changes-b97b1a5
volumes:
image: ghcr.io/nervosnetwork/godwoken-web3-indexer-prebuilds:refactor-db-01b5da5
volumes:
- ./web3-indexer-config.toml:/var/lib/web3-indexer/indexer-config.toml
working_dir: /var/lib/web3-indexer
command: [ "gw-web3-indexer" ]
environment:
- RUST_LOG=info
depends_on:
depends_on:
web3:
condition: service_started
condition: service_healthy
gw-readonly:
condition: service_healthy
postgres:
Expand Down
6 changes: 5 additions & 1 deletion testnet_v1_1/gw-testnet_v1.1-config-readonly.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ node_mode = 'readonly'
ckb_url = 'http://3.83.107.217:8114'
indexer_url = 'http://3.83.107.217:8116'

# Local Nodes
# indexer_url = 'http://172.17.0.1:18116'
# ckb_url = 'http://172.17.0.1:38114'

[rpc_server]
listen = '0.0.0.0:8119'
enable_methods = []
Expand Down Expand Up @@ -143,7 +147,7 @@ execute_l2tx_max_cycles = 100000000
restore_path = '/mnt/mem-pool/mem-block'

[store]
path = '/mnt/store20220508.db'
path = '/mnt/store20220523.db'
options_file = '/deploy/db.toml'
cache_size = 536870912
[store.options]
Expand Down
81 changes: 0 additions & 81 deletions testnet_v1_1/web3-indexer-schema.sql

This file was deleted.

0 comments on commit f167aa9

Please sign in to comment.