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

feat: add possibility to use fixed gas cost (silo) #746

Merged
merged 47 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
4363fbb
feat: add possibility to use fixed gas cost (silo)
aleksuss Apr 25, 2023
df3e531
chore: add test for testing remove_entry_from_whitelist transaction
aleksuss Apr 25, 2023
890ead3
fix: reward the relayer with fixed gas cost
aleksuss Apr 26, 2023
fca93c6
chore: add some documentation and comments
aleksuss May 2, 2023
b4d0745
Merge branch 'develop' into feat/aleksuss/silo
aleksuss May 3, 2023
fd05d8f
chore: rollback Cargo.lock
aleksuss May 3, 2023
42d760a
Merge branch 'develop' into feat/aleksuss/silo
aleksuss May 8, 2023
3938663
chore: fix artifacts after merge
aleksuss May 8, 2023
dc3fbd5
Merge branch 'develop' into feat/aleksuss/silo
aleksuss May 8, 2023
0e4fb0a
Merge branch 'develop' into feat/aleksuss/silo
aleksuss May 12, 2023
0de3198
chore: add `Copy` marker
aleksuss May 12, 2023
e2953ed
Merge branch 'develop' into feat/aleksuss/silo
aleksuss May 16, 2023
664ea73
chore: add serde serialization for silo's parameters via feature
aleksuss May 16, 2023
33a5c75
chore: tiny refactoring of the silo module
aleksuss May 18, 2023
aad3fc6
Merge branch 'develop' into feat/aleksuss/silo
aleksuss May 31, 2023
21d923e
chore: fix path to borsh deps
aleksuss Jun 1, 2023
07b6a14
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Jun 26, 2023
6a368e2
chore: fix repro test
aleksuss Jun 26, 2023
826bae9
Restrict receiving erc20 tokens (#765)
karim-en Jul 17, 2023
cfd29f4
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Jul 19, 2023
1c367b9
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Jul 21, 2023
17f80cd
chore: fixe merge conflicts
aleksuss Jul 21, 2023
41aa01b
chore: derive some traits for KeyType
aleksuss Jul 24, 2023
ee99376
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Jul 26, 2023
a92dfe6
Merge remote-tracking branch 'origin/develop' into feat/aleksuss/silo
joshuajbouw Jul 27, 2023
a0b0777
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Aug 2, 2023
9a17263
chore: add contract running check for silo methods
aleksuss Aug 2, 2023
0c14bc1
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Aug 3, 2023
31912f3
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Aug 4, 2023
b5ae328
chore: fix deserialization in set_silo_params tx
aleksuss Aug 4, 2023
788cea6
feat: splitting nep-141 logic (silo) (#813)
aleksuss Aug 7, 2023
a100b93
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Aug 7, 2023
72ecee7
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Aug 10, 2023
2d605d8
Feat: core hashchain logic (#816)
birchmd Aug 14, 2023
888062b
Chore: Update to SputnikVM version 0.38.3 (#826)
birchmd Aug 22, 2023
4330324
Fix(standalone): Do not eagerly commit transactions to the DB (#825)
birchmd Aug 23, 2023
77c284a
chore: update release notes in develop branch (#829)
aleksuss Aug 28, 2023
ed31dfe
fix: fix in the exit_to_eth precompile (#834)
aleksuss Sep 7, 2023
664669a
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Sep 18, 2023
d1a032d
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Sep 25, 2023
d19f5e6
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Sep 27, 2023
85343be
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Oct 3, 2023
1ec3eed
chore: use contract file depending on the provided feature
aleksuss Oct 3, 2023
34285fd
fix: order of BorshableTransactionKind
aleksuss Sep 15, 2023
27da909
feat: mirroring erc-20 contracts (#845)
aleksuss Oct 11, 2023
de9781c
Merge branch 'develop' into feat/aleksuss/silo
aleksuss Oct 11, 2023
cc7a5ea
chore: use set_eth_connector_contract_account from connector module i…
aleksuss Oct 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
10 changes: 10 additions & 0 deletions .env/mainnet-silo.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CARGO_FEATURES_BUILD="mainnet,ext-connector"
CARGO_FEATURES_BUILD_TEST="mainnet,integration-test,ext-connector"
CARGO_FEATURES_TEST="mainnet-test,ext-connector"
RUSTC_FLAGS_BUILD="-C link-arg=-s"
NEAR_EVM_ACCOUNT="aurora"
WASM_FILE="aurora-mainnet-silo.wasm"
WASM_FILE_TEST="aurora-mainnet-silo-test.wasm"
NEAR_CLI="near"
PROFILE="mainnet-silo"
IS_PROD=true
10 changes: 10 additions & 0 deletions .env/testnet-silo.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CARGO_FEATURES_BUILD="testnet,ext-connector"
CARGO_FEATURES_BUILD_TEST="testnet,integration-test,ext-connector"
CARGO_FEATURES_TEST="testnet-test,ext-connector"
RUSTC_FLAGS_BUILD="-C link-arg=-s"
NEAR_EVM_ACCOUNT="aurora"
WASM_FILE="aurora-testnet-silo.wasm"
WASM_FILE_TEST="aurora-testnet-silo-test.wasm"
NEAR_CLI="near"
PROFILE="testnet-silo"
IS_PROD=false
2 changes: 1 addition & 1 deletion .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: [self-hosted, heavy]
strategy:
matrix:
profile: [mainnet, testnet]
profile: [mainnet, mainnet-silo, testnet, testnet-silo]
steps:
- name: Potential broken submodules fix
run: |
Expand Down
36 changes: 22 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,30 @@ jobs:
run: cache-util restore cargo_git cargo_registry yarn_cache rocksdb:/root/rocksdb
- name: Preparing rocksdb library
run: scripts/ci/build_rocksdb.sh
- name: Build contracts
run: cargo make build-contracts
- name: Test contracts
run: cargo make test-contracts
- name: Build mainnet test WASM
run: cargo make --profile mainnet build-test
- name: List mainnet WASM directory and root directory
run: ls -la target/wasm32-unknown-unknown/release && ls -la
- name: Test mainnet
run: cargo make --profile mainnet test-workspace
- name: Build testnet test WASM
run: cargo make --profile testnet build-test
- name: List testnet WASM directory and root directory
run: ls -la target/wasm32-unknown-unknown/release && ls -la
run: cargo make --profile mainnet test-flow
- name: Test testnet
run: cargo make --profile testnet test-workspace
run: cargo make --profile testnet test-flow
- name: Save cache
run: cache-util save cargo_git cargo_registry yarn_cache

test_silo:
name: Test Silo suite (mainnet-silo, testnet-silo)
runs-on: [ self-hosted, heavy ]
steps:
- name: Potential broken submodules fix
run: |
git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
- name: Clone the repository
uses: actions/checkout@v3
- name: Restore cache
run: cache-util restore cargo_git cargo_registry yarn_cache rocksdb:/root/rocksdb
- name: Preparing rocksdb library
run: scripts/ci/build_rocksdb.sh
- name: Test mainnet
run: cargo make --profile mainnet-silo test-flow
- name: Test testnet
run: cargo make --profile testnet-silo test-flow
- name: Save cache
run: cache-util save cargo_git cargo_registry yarn_cache

Expand Down
12 changes: 11 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changes

- Changed structure `SetEthConnectorContractAccountArgs` for setting eth connector account. It was extended with
additional field: `withdraw_serialize_type` for defining serialization type for withdraw arguments by [@aleksuss]. ([#834])

## [3.1.0] 2023-09-25

### Additions

- Added the possibility to use native NEAR instead of wNEAR on Aurora by [@karim-en]. ([#750])

- Added hashchain integration by [@birchmd]. ([#831])
Expand All @@ -18,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

[#750]: https://github.com/aurora-is-near/aurora-engine/pull/750
[#831]: https://github.com/aurora-is-near/aurora-engine/pull/831
[#834]: https://github.com/aurora-is-near/aurora-engine/pull/834
[#837]: https://github.com/aurora-is-near/aurora-engine/pull/837

## [3.0.0] 2023-08-28
Expand Down Expand Up @@ -498,7 +506,9 @@ struct SubmitResult {

## [1.0.0] - 2021-05-12

[Unreleased]: https://github.com/aurora-is-near/aurora-engine/compare/2.10.2...develop
[Unreleased]: https://github.com/aurora-is-near/aurora-engine/compare/3.1.0...develop
[3.1.0]: https://github.com/aurora-is-near/aurora-engine/compare/3.0.0...3.1.0
[3.0.0]: https://github.com/aurora-is-near/aurora-engine/compare/3.0.0...2.10.2
[2.10.2]: https://github.com/aurora-is-near/aurora-engine/compare/2.10.1...2.10.2
[2.10.1]: https://github.com/aurora-is-near/aurora-engine/compare/2.10.0...2.10.1
[2.10.0]: https://github.com/aurora-is-near/aurora-engine/compare/2.9.3...2.10.0
Expand Down
Loading
Loading