Skip to content

Commit

Permalink
Develop to master merge (#136)
Browse files Browse the repository at this point in the history
* Add EVM webb anchor contracts w/ CHAIN_ID (#123)

* Adds merkle extension directory (#124)

* Add EVM webb anchor contracts w/ CHAIN_ID

* zkutil script

* Add old evm files and wasm project for merkle extension

* update toml

* Add yarn lock

* Upload to crates (#120)

* Added orml pallets

* Update config and types

* Added native currency id to config

* Runtime config, benchmark errors

* Testing mixer with non-native currency

* Updated deps, remove wasm-utils

* Using merkle from crates

* Return back to local merkle dep

* Improve events (#122)

Co-authored-by: Shady Khalifa <shekohex@gmail.com>

* Multiasset integration (#119)

* Added orml pallets

* Update config and types

* Added native currency id to config

* Runtime config, benchmark errors

* Testing mixer with non-native currency

* Making create_new non-dispatchable

Co-authored-by: Drew Stone <drewstone329@gmail.com>

* Remove chain id

* Renames group to tree (#126)

* Renames group to tree

* Rename more

* Fix naming err

* Update pallets/mixer/src/lib.rs

Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>

Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>

* Update rust

* Give basic weight to create_new

* Add RPC `merkle.treeLeaves` to `Merkle` pallet (#129)

* remove yarn.lock

* add rpc crate

* add merkle rpc impl

* fix some tests

* Update runtime/src/lib.rs

* Update pallets/merkle/src/lib.rs

* Update pallets/merkle/src/lib.rs

* Update pallets/merkle/rpc/src/lib.rs

Co-authored-by: Drew Stone <drewstone329@gmail.com>

* Chain id removal

* New Github actions and Dockerfile (#131)

* github actions and Dockerfile

* dockerignore

* fmt

* cache lints

* disable clippy for now

* add build to the CI

* remove old actions

* no-override

* Fix docker build (#132)

* fix image name

* New token pallet (#134)

* Updates

* Updates

* Merge pallet_assets w/ orml_tokens

* Pallets compile, node doesn't

* [wip] comment out frontier for now

* Comment out EVM/Frontier, get node compiling

* remove frontier service file from git

* Newlines

* ups (#133)

* Test updates

* Fix merge account

* Fix no_op test

* Updates, dust test not working

* Fix all tests

Co-authored-by: Shady Khalifa <shekohex@gmail.com>

* Adds frontier back (#135)

* Updates

* Updates

* Merge pallet_assets w/ orml_tokens

* Pallets compile, node doesn't

* [wip] comment out frontier for now

* Comment out EVM/Frontier, get node compiling

* remove frontier service file from git

* Newlines

* ups (#133)

* Test updates

* Fix merge account

* Fix no_op test

* Updates, dust test not working

* Fix all tests

* Toml updates

* Adds frontier, mocks orml for as new local packages

* Add all rpc methods back, fix service

* Change to webb node from template

* Organising

* Optional rpc in toml

* Fix conflict

* Update tests and mocks

* Reverts

Co-authored-by: Shady Khalifa <shekohex@gmail.com>

* fix failing tests

* Update contracts, add mocks

* Add ts-tests from edgeware/frontier for local anon testing

* Tsconfig,  package.json update

* ups

* Add edgeware types back

* Add truffle config

* Update to master substrate (#137)

* Update to master substrate

* Fix benchmarks and tests

* Formatting/lint

Co-authored-by: Filip Lazovic <lazoviccorp@gmail.com>
Co-authored-by: Shady Khalifa <shekohex@gmail.com>
  • Loading branch information
3 people committed Apr 27, 2021
1 parent dc63f92 commit b19a55a
Show file tree
Hide file tree
Showing 158 changed files with 42,747 additions and 3,789 deletions.
8 changes: 8 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.DS_STORE
/target
runtime/target
**/*.rs.bk
/*/**/target
.vscode
cache
artifacts
20 changes: 20 additions & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Security Audit

on:
schedule:
- cron: '0 0 * * *'
push:
paths:
- '**/Cargo.toml'
- '**/Cargo.lock'
pull_request:

jobs:
audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions-rs/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
38 changes: 0 additions & 38 deletions .github/workflows/build.yml

This file was deleted.

40 changes: 40 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
on: [push, pull_request]

name: CI

jobs:
ci:
name: CI
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Install nightly toolchain
id: rust_toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: false
components: rustfmt

- name: Cache Cargo
uses: actions/cache@v2
with:
path: |
~/.cargo/registry
~/.cargo/git
~/.cargo/bin
target
key: ${{ runner.os }}-cargo-cache

- name: Setup Build tools
run: sudo apt install -y cmake pkg-config libssl-dev git build-essential clang libclang-dev curl

- name: Run Test
run: ./scripts/test.sh

- name: Run Build
run: ./scripts/build.sh

77 changes: 77 additions & 0 deletions .github/workflows/image-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Container Image Release

on:
push:
# Publish `master` as Container `latest` image.
# Publish `develop` as Container `edge` image.
branches:
- master
- develop

# Publish `v1.2.3` tags as releases.
tags:
- v*

jobs:
push:
runs-on: ubuntu-latest
if: github.event_name == 'push'

steps:
- uses: actions/checkout@v2

- name: Install nightly toolchain
uses: actions-rs/toolchain@v1
id: rust_toolchain
with:
profile: minimal
toolchain: nightly
override: false
components: rustfmt

- name: Cache Cargo
uses: actions/cache@v2
with:
path: |
~/.cargo/registry
~/.cargo/git
~/.cargo/bin
target
key: ${{ runner.os }}-cargo-${{ steps.rust_toolchain.outputs.rustc_hash }}-release

- name: Build node
run: ./scripts/build.sh

- name: Copy binaries
run: mkdir -p build && cp target/release/webb-node build/webb-node

- name: Build Image
run: docker build . --tag image

- name: Log into registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin

- name: Push image
run: |
IMAGE_ID=docker.pkg.github.com/webb-tools/anon/node
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "master" ] && VERSION=latest
# Use Docker `edge` tag
[ "$VERSION" == "develop" ] && VERSION=edge
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
docker tag image $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
58 changes: 58 additions & 0 deletions .github/workflows/lints.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
on: [push, pull_request]

name: Lints

jobs:
clippy:
name: Clippy
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Install nightly toolchain with clippy available
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: false
components: clippy, rustfmt

- name: Cache Cargo
uses: actions/cache@v2
with:
path: |
~/.cargo/registry
~/.cargo/git
~/.cargo/bin
target
key: ${{ runner.os }}-cargo-lints

- name: Run cargo clippy
uses: actions-rs/cargo@v1
continue-on-error: true # remove this once we start using clippy
with:
command: clippy
args: -- -D warnings

rustfmt:
name: Format
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Install nightly toolchain with rustfmt available
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: false
components: rustfmt

- name: Run cargo fmt
uses: actions-rs/cargo@v1
continue-on-error: false
with:
command: fmt
args: --all -- --check
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,8 @@ runtime/target
**/*.rs.bk
/*/**/target
.vscode
node_modules
build
cache
artifacts
db

0 comments on commit b19a55a

Please sign in to comment.