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.

Sign up for GitHub

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

Near-plugins integration #178

Merged
merged 37 commits into from
Oct 5, 2023
Merged

Near-plugins integration #178

Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2c80d84
ft-locker: replace `admin_controlled` with near plugins
karim-en Nov 4, 2022
a9be4d5
Token factory: replace `admin_controlled` with near plugins
karim-en Nov 6, 2022
85b5840
Exclude owner and self from pause
karim-en Nov 7, 2022
a59801b
Bridge token: replace `admin_controlled` with near plugins
karim-en Nov 7, 2022
15a3d94
Fix set owner of the bridge-token
karim-en Nov 8, 2022
dd236ca
Bridge token: check predecessor account on init
karim-en Nov 24, 2022
ea77f59
Update wasm builds
karim-en Nov 25, 2022
2376936
Factory: update near plugins
karim-en Mar 23, 2023
c66cd39
Ft connector: update near plugins
karim-en Mar 23, 2023
1688478
Fix tests
karim-en Mar 28, 2023
7377701
Revert changes
karim-en Mar 28, 2023
3305531
Fix token locker tests
karim-en Mar 28, 2023
bf96fdc
Update contracts builds
karim-en Mar 28, 2023
d62d113
Make the bridge token upgradable
karim-en Apr 28, 2023
47e7b73
Fix access role
karim-en Apr 28, 2023
679eb6d
Bump contracts versions
karim-en May 1, 2023
b1a4f21
Use `tokio::test` for integration tests
karim-en May 1, 2023
309b510
Fix `version()` method
karim-en May 1, 2023
5fffd1f
Fix upgrade & pause withdraw
karim-en May 2, 2023
803c8ca
Add tests for upgrade from `0.1.6`
karim-en May 2, 2023
a446d81
Update contracts builds
karim-en May 3, 2023
81d1353
Merge branch 'master' into add-near-plugins
karim-en Oct 2, 2023
d1cb464
Update `near-plugins`
karim-en Oct 2, 2023
bc43e2f
Use batch to upgrade and migrate the tokens
karim-en Oct 2, 2023
21e6122
Remove `Upgradable` plugin & Add `DAO` role
karim-en Oct 2, 2023
c1bd04e
Remove `migrate_icon` feature
karim-en Oct 2, 2023
fd00b33
Don't assign `owner_pk` on deploying new tokens
karim-en Oct 2, 2023
577e773
Remove `Upgradable` plugin & Add `DAO` role
karim-en Oct 2, 2023
e549691
Update contracts builds
karim-en Oct 2, 2023
5273abe
Re-add upgradable & bump rust version
karim-en Oct 3, 2023
e266cb8
Minor improvments
karim-en Oct 3, 2023
dc21138
Downgrade toolchain version
karim-en Oct 3, 2023
27529e2
Update contracts build
karim-en Oct 3, 2023
d22458d
add comment
olga24912 Oct 4, 2023
e90a21e
update wasm
olga24912 Oct 4, 2023
30fdfb8
Use dynamic amount of gas
karim-en Oct 4, 2023
0130c92
Update contracts builds
karim-en Oct 4, 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
141 changes: 6 additions & 135 deletions bridge-common/Cargo.lock
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions bridge-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eth-types = { git = "https://github.com/near/rainbow-bridge", rev = "67966a151122815039f07b02065ab3a2bba09804" }
admin-controlled = { git = "https://github.com/near/rainbow-bridge", rev = "67966a151122815039f07b02065ab3a2bba09804" }
eth-types = { git = "https://github.com/near/rainbow-bridge", rev = "4b24cbd5a6e098fd8a9cd24fbb194fa8e0fc51e4", default-features = false}
ethabi = "12.0.0"
near-sdk = "4.0.0"
tiny-keccak = "1.4.0"
Expand Down
3 changes: 0 additions & 3 deletions bridge-common/src/prover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::convert::From;

use admin_controlled::Mask;
use eth_types::*;
use ethabi::param_type::Writer;
use ethabi::{Event, EventParam, Hash, Log, ParamType, RawLog, Token};
Expand All @@ -14,8 +13,6 @@ pub type EthAddress = [u8; 20];

pub const NO_DEPOSIT: Balance = 0;

pub const PAUSE_DEPOSIT: Mask = 1 << 1;

/// Gas to call verify_log_entry on prover.
pub const VERIFY_LOG_ENTRY_GAS: Gas = Gas(Gas::ONE_TERA.0 * 50);

Expand Down
Loading