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

Jump to bottom

Merge Develop into Main #67

Open
wants to merge 50 commits into
base: main
Choose a base branch
from
Open

Merge Develop into Main #67

wants to merge 50 commits into from

Conversation

OT-kraftchain
Copy link
Member

No description provided.

csmuller and others added 30 commits June 16, 2022 18:06
@csmuller
Remove migration scripts from _deploy method and remove migration tes…
b8e2450 
…ts. The migration on mainnet was successful, i.e., the code ase can be cleaned for the next updates.
@csmuller
Fix comment.
0c72c25
@csmuller
Remove migration scripts from invocations.
8b0ac18
@csmuller
Upgrade to neowej 3.21.1
54965f8
@OT-kraftchain
feat: (#39) Add evm contracts
fe43b16
@OT-kraftchain
chore: (#45) Fix failing java tests (#46)
905e359 
* chore: (#45) Fix failing java tests

* Apply changes after review

* Apply changes to formatting
@OT-kraftchain
Feat/#40 Send proposal and execute (#48)
365987f 
* feat: (#40) Add events for proposal and execution

* fix: Changes after review

* fix: Update evmVersion
@mialbu
feat: add draft for bridge adaptor
59a29c1
@mialbu
feat: add test for raw intents for releasing gas via the bridge
b24c37b
@mialbu
feat: improve receive/bridge in adapter and add onlyOwner in setters
bce6ed4
@mialbu
feat: add whitelisted funder and expect treasury to pay bridge fee
c5d92f1
@mialbu
feat: update adapter and improve proposal builder
5c86a76
@mialbu
feat: add intent building for Neo fund request
d08c84b
@mialbu
feat: add update functionality in adapter contract
35a5090
@mialbu
chore: improve proposal builder functions
ca187c1
@mialbu
test: add tests for script building
874faea
@mialbu
test: add test for adapter contract update
8fbf369
@mialbu
chore: remove redundant backend account from adapter contract
5fabec8
@mialbu
chore: reorganize adapter contract
aef2437
@mialbu
test: add tests for setters and general authorization checks
7a95eb2
@mialbu
chore: rename proposal and intent bytes builder functions
8d58dbe
@mialbu
Merge pull request #52 from AxLabs/feature/bridge-adapter
a632a4b 
Bridge Adapter
@mialbu
feat: add neox testnet and use hh vars for account
bef47f1
@mialbu
chore: use forge formatter and update foundry.toml
24477c9
@mialbu
feat: use Ownable2StepUpgradeable instead of access control (#55)
e1f8459 
* forge install: openzeppelin-foundry-upgrades

v0.4.0

* fix: add .env to .gitignore and fs_permissions to foundry.toml

* feat: use Ownable2StepUpgradeable

* feat: disable initializers in implementation contract

* fix: add foundry out env in build.gradle

* fix: set ffi to true in foundry.toml

* fix: add initialOwner param in constructor NatSpec
@OT-kraftchain
chore: Clean artifacts
6c81595
@OT-kraftchain
chore: rename intent to intents
3b570c9
@mialbu
feat: add adapter deployment script
d6b2426
@mialbu
feat: use current bridge interface in adapter
d43a54d
@mialbu
feat: add compilation helper and update script
dbface8
OT-kraftchain and others added 20 commits February 12, 2025 16:15
@OT-kraftchain
chore: (#60) Redeploy GrantSharesRelayer with test address from hh co…
d791fbd 
…nfig (#61)

* chore: (#60) Redeploy GrantSharesRelayer with test address from hh config

* chore: Add description to manual test script function
@mialbu
feat: use the bridge v2 interface in the adapter
8c5c8d3
@mialbu
feat: fix permissions and whitelisted funder storage key
7efe66f
@mialbu
remove bridge adapter
0c9c658
@mialbu
test: update adapter contract update test
3f4907f
@mialbu
feat: update bridge adapter for bridge v2/v3 support without contract…
71abf90 
… update
@mialbu
Merge branch 'develop' into feat/adapter-combined
cece747
@mialbu
feat: use testnet constants for bridge adapter in deploy source set
78a45a3
@mialbu
feat: improve adapter's onNEP17Payment and refine bridge function
e835c39
@mialbu
Merge pull request #62 from AxLabs/feat/adapter-combined
ecfbdd7 
Bridge Adapter supporting bridge v2 and v3 without contract update
@mialbu
(minor) chore: remove some redundant imports
e766c74
@mialbu
feat: use wallet with password for adapter deployment/update
b5720c9
@mialbu
Merge pull request #63 from AxLabs/feat/deploy-wallet
93faa3f 
Use encrypted wallet file and env variables for adapter deployment
@mialbu
fix: (minor) correct .env.template entry
744443c
@mialbu
chore: add more documentation to bridge adapter contract
31d6ed7
@mialbu
fix: add AllowCall call flags to bridge's fee functions in adapter
10bb8de
@mialbu
chore: add bridge adapter contract hash of testnet/mainnet in update …
73bf39d 
…file
@OT-kraftchain
fix: Allow fee withdrawal to owner's address (#65)
3451dad
@OT-kraftchain
chore: Add tests for withrawal (#66)
50ae0ea
@OT-kraftchain
chore: Deploy Relayer to mainnet
728d55b
@OT-kraftchain OT-kraftchain requested a review from mialbu February 18, 2025 21:39
@OT-kraftchain OT-kraftchain self-assigned this Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mialbu mialbu Awaiting requested review from mialbu

Assignees

@OT-kraftchain OT-kraftchain

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@OT-kraftchain @csmuller @mialbu