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

Feat/v3.5 #64

Merged
merged 56 commits into from
Sep 18, 2024
Merged

Feat/v3.5 #64

merged 56 commits into from
Sep 18, 2024

Conversation

iulianpascalau
Copy link
Contributor

No description provided.

cosmatudor and others added 30 commits August 21, 2024 14:25
@cosmatudor
Add BridgeProxy contract and state variables
382c867
@cosmatudor
add deposit endpoint
266aad9
@cosmatudor
add logic for deposit funds in Bridge contract
2e08dd9
@cosmatudor
moved structs to SharedStructs
c0aa688
@cosmatudor
Merge branch 'CII-56-pending-transactions-management' into CII-53-dep…
b004524 
…osit-endpoint
@cosmatudor
add counter for transactions
cb71bf9
@cosmatudor
add execute endpoint
cfb9263
@cosmatudor
fixed BridgeMock bug
4ed8787
@cosmatudor
Merge branch 'CII-53-deposit-endpoint' into CII-54-execute-endpoint
36075e9
@cosmatudor
add executeCallback private method
5f51c43
@cosmatudor
add finishExecuteGracefully private method
c8478bd
@dragos-rebegea
Merge pull request #42 from multiversx/CII-56-pending-transactions-ma…
873c584 
…nagement

CII-56: Pending transactions management
@cosmatudor
add refund method and view functions
bf7feab
@cosmatudor
removed token payments mapping and refactored
35509e2
@cosmatudor
Merge branch 'CII-53-deposit-endpoint' into CII-54-execute-endpoint
77d9018
@cosmatudor
Merge branch 'CII-54-execute-endpoint' into CII-55-finish-execute-gra…
dc3b320 
…cefully
@cosmatudor
removed token payment
152b651
@cosmatudor
Merge branch 'CII-55-finish-execute-gracefully' into CII-58-refund-wo…
2f95346 
…rkflow
@cosmatudor
fixed logic after removing token payments
2bf24e6
@cosmatudor
Merge branch 'CII-54-execute-endpoint' into CII-55-finish-execute-gra…
093e45c 
…cefully
@cosmatudor
Merge branch 'CII-55-finish-execute-gracefully' into CII-58-refund-wo…
ea91fda 
…rkflow
@cosmatudor
add setter for Bridge address
5d704da
@cosmatudor
refactored tests for Bridge, MintBurnERC20 and ERC20Safe contracts
7257749
@cosmatudor
refactored deposit endpoint
25faae2
@cosmatudor
removed state variable bridgeAddress
07721ef
@dragos-rebegea
Merge pull request #45 from multiversx/CII-53-deposit-endpoint
554ec5f 
CII-53: Deposit Endpoint
@dragos-rebegea
Merge pull request #47 from multiversx/CII-54-execute-endpoint
b7a6f53 
CII-54: Execute endpoint
@dragos-rebegea
Merge pull request #48 from multiversx/CII-55-finish-execute-gracefully
b1084e7 
CII-55: Finish execute gracefully
@dragos-rebegea
Merge pull request #51 from multiversx/CII-58-refund-workflow
d50a18a 
CII-58: Refund workflow
@cosmatudor
small gas optimization for getPendingTransaction view function
8b28c00
cosmatudor and others added 23 commits August 26, 2024 18:05
@cosmatudor
lowestIndexId and calldata encoding fixes
f05e4da
@cosmatudor
add unit tests for BridgeProxy contract
79529b5
@cosmatudor
refactored execute endpoint
bbc701f
@dragos-rebegea
Merge pull request #53 from multiversx/CII-57-bridge-proxy-testing
1578588 
CII-57: Bridge proxy testing
@cosmatudor
add logic for deleting pending txns
5d776a4
@cosmatudor
add test for txns with endpoints with no args
82678b5
@cosmatudor
Merge branch 'CII-57-bridge-proxy-testing' into feat-v3.5
f6bcaf2
@cosmatudor
Merge branch 'feat/v3' into feat-v3.5
084a44e
@cosmatudor
Merge remote-tracking branch 'origin/feat/v3' into feat-v3.5
886c783
@cosmatudor
made BridgeProxy contract upgradable
2b0440d
@cosmatudor
test fixes after merge
3beeb5e
@cosmatudor
add test for BridgeProxy contract upgrade
21e4633
@dragos-rebegea
Merge pull request #54 from multiversx/merge-3.5-3
af5cc52 
Merge 3.5 3
@dragos-rebegea
Merge branch 'feat/v3.5' into feat-v3.5
f8a2e46
@cosmatudor
add isPendingTransaction private function
0152098
@cosmatudor
Merge branch 'feat-v3.5' of https://github.com/multiversx/mx-bridge-e…
1f99ceb 
…th-sc-sol into feat-v3.5
@cosmatudor
temporar fixes
4707f2a
@cosmatudor
fixes after review
47cf9bd
@cosmatudor
renamed BridgeProxy to BridgeExecutor
16a2c21
@cosmatudor
more fixes
72e586a
@cosmatudor
refactor execute function
7c953fe
@cosmatudor
renamed variables
76999c4
@cosmatudor
Merge pull request #52 from multiversx/feat-v3.5
3e64909 
Feat v3.5
@iulianpascalau iulianpascalau changed the base branch from feat/v3 to feat/v3.5.0 September 18, 2024 13:17
@cosmatudor cosmatudor merged commit 06bc10c into feat/v3.5.0 Sep 18, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@evelinemolnar evelinemolnar evelinemolnar approved these changes

@cosmatudor cosmatudor cosmatudor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@iulianpascalau @evelinemolnar @cosmatudor @dragos-rebegea