Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into refactor/event-name…
Browse files Browse the repository at this point in the history
…d-field

* origin/master:
  Cancel Scheduled Calls with Vote Greater than Original Call (#1701)
  optimize internal swap (#1704)
  Support eip-1559 (#1709)
  fix: update KBTC and KINT keys (#1710)
  Refund extra tip (#1706)
  Support LiquidCroadloan and ForeignAsset for TradingPair (#1703)
  Update README.md
  bug bounty (#1699)
  Update transaction-payment (#1682)
  rename create_network_contract (#1686)
  Bump @openzeppelin/contracts from 4.3.3 to 4.4.1 in /ts-tests (#1698)

# Conflicts:
#	modules/auction-manager/src/lib.rs
#	modules/cdp-engine/src/tests.rs
Roy Yang committed Dec 19, 2021
2 parents a0b2329 + 7ce724b commit 914e1f8
Showing 62 changed files with 2,145 additions and 967 deletions.
120 changes: 97 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
- [3. Building](#3-building)
- [4. Run](#4-run)
- [5. Development](#5-development)
- [6. Bug Bounty :bug:](#6-bug-bounty-bug)

<!-- /TOC -->

@@ -149,7 +150,12 @@ make update

__Note:__ All build command from Makefile are designed for local development purposes and hence have `SKIP_WASM_BUILD` enabled to speed up build time and use `--execution native` to only run use native execution mode.

# 6. Bench Bot
# 6. Bug Bounty :bug:

The Bug Bounty Program includes only on-chain vulnerabilities that can lead to significant economic loss or instability of the network. You check details of the Bug Bounty or Submit a vulnerability here:
https://immunefi.com/bounty/acala/

# 7. Bench Bot
Bench bot can take care of syncing branch with `master` and generating WeightInfos for module or runtime.

## Generate module weights
@@ -166,7 +172,7 @@ To generate weights for all modules just pass `*` as `module_name` i.e: `/bench

Bench bot will do the benchmarking, generate weights file push changes into your branch.

# 7. Migration testing runtime
# 8. Migration testing runtime
If modify the storage, should test the data migration before upgrade the runtime.

## Try testing runtime
@@ -187,7 +193,7 @@ cargo run --features with-mandala-runtime --features try-runtime -- try-runtime
cargo run --features with-mandala-runtime --features try-runtime -- try-runtime --wasm-execution=compiled --block-at=0x9def608d5674f6d16574f53849218fe13d80ec1042ef7c2d4de7d4c50abab806 --url="wss://karura.api.onfinality.io/public-ws" offchain-worker snap -s snapshot.bin
```

# 8. Run local testnet with `RelayChain` and `Parachain`
# 9. Run local testnet with `RelayChain` and `Parachain`
Build RelayChain and Parachain local testnet to develop.

```bash
@@ -226,7 +232,7 @@ docker volume rm [volume_name]
docker volume prune
```

# 9. Build For Release
# 10. Build For Release

For release artifacts, a more optimized build config is used.
This config takes around 2x to 3x longer to build, but produces an more optimized binary to run.
Loading

0 comments on commit 914e1f8

Please sign in to comment.