Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A0-2156-stop-the-world-calls #1079

Merged
merged 35 commits into from
Apr 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ca879e8
allow for dispatching
fbielejec Mar 23, 2023
579602e
edit trigger cond
fbielejec Mar 23, 2023
cdf98a5
edit trigger
fbielejec Mar 23, 2023
87f60bd
less tickets
fbielejec Mar 23, 2023
cd58637
allow setting auction length
fbielejec Mar 23, 2023
089846d
fix it
fbielejec Mar 23, 2023
a83d2b6
implement halting
fbielejec Mar 23, 2023
835a170
common trait
fbielejec Mar 24, 2023
81914aa
clippy
fbielejec Mar 24, 2023
5f25055
add round assert
fbielejec Mar 27, 2023
9e02927
simplified wA0
fbielejec Mar 27, 2023
229f4dd
Merge branch 'main' into A0-2156-stop-the-world
fbielejec Mar 27, 2023
f88708b
not needed deployment step
fbielejec Mar 27, 2023
9f0e146
forgot to commit
fbielejec Mar 27, 2023
2c3becd
simplified w_azero
fbielejec Mar 27, 2023
8107689
dex is migrated to default impls
fbielejec Mar 28, 2023
0fee956
added implementations
fbielejec Mar 28, 2023
ed670e6
reformat
fbielejec Mar 28, 2023
d8134b1
migrated button to default impls
fbielejec Mar 28, 2023
a9b5076
checks for contracts
fbielejec Mar 28, 2023
b2e0450
Merge branch 'main' into A0-2156-stop-the-world
fbielejec Mar 28, 2023
dd62e77
dev env too
fbielejec Mar 28, 2023
43b955d
install c-c
fbielejec Mar 28, 2023
c0af8f7
sdfg
fbielejec Mar 28, 2023
af69cef
shared traits
fbielejec Mar 28, 2023
ce7b226
cleanup
fbielejec Mar 28, 2023
7c1c597
Merge branch 'main' into A0-2156-stop-the-world
fbielejec Mar 29, 2023
7a6a9d0
this i can do
fbielejec Mar 29, 2023
310c2f5
wip : Internal
fbielejec Mar 29, 2023
b987c60
forgotten check
fbielejec Mar 29, 2023
3995d8e
Merge branch 'main' into A0-2156-stop-the-world
fbielejec Mar 29, 2023
e459058
explicit exports
fbielejec Mar 29, 2023
32b0481
uncomment
fbielejec Mar 30, 2023
40e6774
check role when halted
fbielejec Apr 11, 2023
2353879
Merge branch 'main' into A0-2156-stop-the-world
fbielejec Apr 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 0 additions & 248 deletions .github/scripts/assert.sh

This file was deleted.

28 changes: 22 additions & 6 deletions .github/workflows/_check-excluded-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,31 @@ jobs:
packages="${packages//'%0A'/$'\n'}"
for p in ${packages[@]}
do
# skip checking the contracts for now
if [ $p = "contracts/adder" ] || [ $p = "contracts/poseidon_host_bench" ]
then
continue
fi
echo "Checking package $p..."
pushd "$p"
rustup component add clippy rustfmt
rustup target add wasm32-unknown-unknown

rustup component add rust-src --toolchain nightly-2022-10-30-x86_64-unknown-linux-gnu
cargo install cargo-dylint dylint-link
cargo install cargo-contract --vers ^2.0 --force --locked

fbielejec marked this conversation as resolved.
Show resolved Hide resolved
if [ $p = "contracts/adder" ] ||
[ $p = "contracts/poseidon_host_bench" ] ||
[ $p = "contracts/access_control" ] ||
[ $p = "contracts/adder" ] ||
[ $p = "contracts/button" ] ||
[ $p = "contracts/game_token" ] ||
[ $p = "contracts/marketplace" ] ||
[ $p = "contracts/simple_dex" ] ||
[ $p = "contracts/ticket_token" ] ||
[ $p = "contracts/wrapped_azero" ]
then
cargo contract check
else
cargo clippy -- --no-deps -D warnings
fi
cargo fmt --all --check
cargo clippy -- --no-deps -D warnings
popd
done

Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/contracts-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
name: contracts-e2e-tests-and-deploy

on:
pull_request:
types: [labeled]
workflow_call:

# DO NOT TOUCH THIS !
Expand Down Expand Up @@ -51,7 +53,14 @@ jobs:
- '.github/workflows/contracts-deploy.yml'

build-and-deploy-contracts:
needs: [detect-contracts-changes]
# TODO: e2e test are flaky AF
# and they block the deployment
# which in turns stalls development
# as frontend developers rely heavily on the devnet environment.
# Therefore we made an executive decision to deploy to the devnet
# regardless of the contracts e2e tests status.
# Once fixed this dependency can be brough back
# needs: [detect-contracts-changes]
pmikolajczyk41 marked this conversation as resolved.
Show resolved Hide resolved
name: Deploy contracts on devnet
if: >
(needs.changes.outputs.button == 'true' &&
Expand All @@ -60,7 +69,7 @@ jobs:
(github.event_name == 'pull_request' &&
github.event.action == 'labeled' &&
github.event.label.name == '[AZERO] DEPLOY-CONTRACTS')
runs-on: ubuntu-20.04
runs-on: self-hosted
Marcin-Radecki marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -115,7 +124,6 @@ jobs:
- name: Run deploy.sh script
shell: bash
run: |
. "$HOME/.cargo/env"
pmikolajczyk41 marked this conversation as resolved.
Show resolved Hide resolved
source contracts/env/${{ env.CONTRACTS_ENVFILE }} && ./contracts/scripts/deploy.sh

- name: Update ABI arifacts and addresses.json file in the S3 bucket
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ exclude = [
"contracts/simple_dex",
"contracts/ticket_token",
"contracts/wrapped_azero",
"contracts/shared_traits",
"e2e-tests",
"flooder",
"fork-off",
Expand Down
Loading