Skip to content

Commit

Permalink
Merge branch 'master' into fix-transactions-count
Browse files Browse the repository at this point in the history
  • Loading branch information
yaboiishere authored Jan 20, 2025
2 parents ec2006d + 61dcf19 commit 1f4e230
Show file tree
Hide file tree
Showing 35 changed files with 1,741 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/actions/node-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ runs:
- name: Setup Node
shell: bash
run: |
curl -L https://github.com/aeternity/aeternity/releases/download/v7.2.0/aeternity-v7.2.0-ubuntu-x86_64.tar.gz -o aeternity.tgz\
curl -L https://github.com/aeternity/aeternity/releases/download/v7.3.0-rc3/aeternity-v7.3.0-rc3-ubuntu-x86_64.tar.gz -o aeternity.tgz\
&& mkdir -p ${NODEROOT}/rel/aeternity && tar xf aeternity.tgz -C ${NODEROOT}/rel/aeternity && cp -rf ${NODEROOT}/rel/aeternity/lib/ ${NODEROOT}
3 changes: 2 additions & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: GoogleCloudPlatform/release-please-action@v2
- uses: googleapis/release-please-action@v3
with:
token: ${{secrets.BOT_GITHUB_TOKEN}}
release-type: elixir
pull-request-title-pattern: "chore: release${component} ${version}"
changelog-types: '[{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"ci","section":"CI / CD","hidden":false},{"type":"test","section":"Testing","hidden":false},{"type":"refactor","section":"Refactorings","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":false}]'
2 changes: 2 additions & 0 deletions .iex.exs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ alias AeMdw.Contract
alias AeMdw.Database
alias AeMdw.Validate
alias AeMdw.Sync.AsyncTasks
alias AeMdw.Hyperchain
alias AeMdw.Db.RocksDbCF

require Model
require Ex2ms
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [1.97.0](https://github.com/aeternity/ae_mdw/compare/v1.96.2...v1.97.0) (2025-01-17)


### Features

* add hyperchain sync support ([74e098d](https://github.com/aeternity/ae_mdw/commit/74e098d5b4dfbb6765f7b034b90f77d2eaa15fea))


### Miscellaneous

* bump release-please version to 4 ([#2062](https://github.com/aeternity/ae_mdw/issues/2062)) ([35af3fa](https://github.com/aeternity/ae_mdw/commit/35af3fab1be41d598ff86a54a6502a30e4dda5c2))
* downgrade release please ([#2070](https://github.com/aeternity/ae_mdw/issues/2070)) ([2903e0a](https://github.com/aeternity/ae_mdw/commit/2903e0a98e50b05740080318924d82cf07d3b213))
* get rid of runtime startup warnings ([#2039](https://github.com/aeternity/ae_mdw/issues/2039)) ([ddf61e5](https://github.com/aeternity/ae_mdw/commit/ddf61e520b343a208f64ca06a93c32367ca48329))

### [1.96.2](https://www.github.com/aeternity/ae_mdw/compare/v1.96.1...v1.96.2) (2025-01-07)


Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
ARG ELIXIR_VERSION=1.17.3
ARG OTP_VERSION=26.2.5.3
ARG NODE_VERSION=7.2.0
ARG NODE_VERSION=7.3.0-rc3
ARG DEBIAN_VERSION=bullseye-20240926-slim

ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
Expand Down
5 changes: 4 additions & 1 deletion config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ alias AeMdw.Db.Model

node_root = System.get_env("NODEROOT", "../aeternity/_build/local/")

config :esbuild,
version: "0.8.2"

config :ae_mdw, AeMdw.Db.RocksDb,
data_dir: "#{node_root}/rel/aeternity/data/mdw.db",
drop_tables: [
Expand Down Expand Up @@ -33,7 +36,7 @@ config :ae_mdw, AeMdwWeb.Endpoint,
url: [host: "localhost"],
secret_key_base: "kATf71kudJsgA1dgCQKcmgelicqJHG8EID8rwROwJHpWHb53EdzW7YDclJZ8mxLP",
render_errors: [view: AeMdwWeb.ErrorView, accepts: ~w(html json)],
pubsub: [name: AeMdw.PubSub, adapter: Phoenix.PubSub.PG2],
pubsub_server: AeMdw.PubSub,
live_view: [signing_salt: "Oy680JAN"],
code_reloader: false,
watchers: [],
Expand Down
50 changes: 50 additions & 0 deletions docker-compose-hc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
services:
ae_mdw_hc:
build:
context: .
dockerfile: ./Dockerfile
args:
RUNNER_IMAGE: "hexpm/elixir:1.17.3-erlang-26.2.5.3-debian-bullseye-20240926-slim"
USER: root
MIX_ENV: dev
NODE_IMAGE: aeternity/aeternity:v7.3.0-rc1
PATH_PREFIX: "/v3"
image: aeternity/ae_mdw_dev${IMAGE_NAME_SUFFIX:-}:latest
ports:
- "4000:4000" #MDW's default port
- "4001:4001" #MDW's websocket default port
- "3113:3113" #Node's default internal API port
- "3013:3013" #Node's default external API port
- "3014:3014" #Node's channels default websocket port
volumes:
- ${PWD}/data_hc/mnesia:/home/aeternity/node/local/rel/aeternity/data/mnesia
- ${PWD}/data_hc/mdw.db:/home/aeternity/node/local/rel/aeternity/data/mdw.db
- ${PWD}/hyperchain/aeternity.yaml:/home/aeternity/aeternity.yaml
- ${PWD}/docker/aeternity-dev.yaml:/home/aeternity/aeternity-dev.yaml
- ${PWD}/docker/accounts.json:/home/aeternity/node/local/rel/aeternity/data/aecore/.genesis/accounts_test.json
- ${PWD}/hyperchains/accounts.json:/home/aeternity/node/local/rel/aeternity/data/aecore/.ceres/hc_devnet_accounts.json
- ${PWD}/hyperchains/contracts.json:/home/aeternity/node/local/rel/aeternity/data/aecore/.ceres/hc_devnet_contracts.json
- ${PWD}/priv:/home/aeternity/node/ae_mdw/priv
- ${PWD}:/app
- ${PWD}/docker/gitconfig:/root/.gitconfig
environment:
- AETERNITY_CONFIG=${AETERNITY_CONFIG:-/home/aeternity/aeternity.yaml}
networks:
ae_mdw_net_hc:
aliases:
- mdw.aeternity.localhost
localnet_default:
node_sdk_hc:
image: node:20-alpine
working_dir: /app
volumes:
- ${PWD}/node_sdk:/app
entrypoint: ""
networks:
- ae_mdw_net_hc
networks:
ae_mdw_net_hc:
name: ae_mdw_net_hc
driver: bridge
localnet_default:
external: true
7 changes: 7 additions & 0 deletions docs/swagger_v3/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ components:
schema:
type: string
pattern: '(gen):\d+(-\d+)?'
HyperchainScopeParam:
in: query
name: scope
description: 'Scopes results in a hyperchain epoch range'
schema:
type: string
pattern: '(epoch):\d+(-\d+)?'
DirectionParam:
in: query
name: direction
Expand Down
Loading

0 comments on commit 1f4e230

Please sign in to comment.