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

update master with develop #140

Merged
merged 59 commits into from
Jun 22, 2021
Merged

update master with develop #140

merged 59 commits into from
Jun 22, 2021

Conversation

mortelli
Copy link
Contributor

@mortelli mortelli commented Jun 18, 2021 •
edited
Loading

Bring the latest changes from develop to master.

Jonathan Franco and others added 30 commits April 9, 2021 14:19
Fixing details to run the relay without having to run multiple comman…
05e7def 
…ds, also adding a summary for the contract deploy
Merge remote-tracking branch 'enveloping/master'
13bcae1 
# Conflicts:
#	jsrelay/config/relay-config.json
#	migrations/2_deploy_contracts.js
Change truffle version
8a5126a
Adding startup scripts
035c8b9
Fixing truffle version since rskj doesn't support chainId field on tr…
8f612be 
…ansactions.
Keeping yarn.lock like master of enveloping since otherwise rskj does…
e5d91ea 
…n't work due to truffle error.
Keeping yarn.lock like master of enveloping since otherwise rskj does…
5fa7cef 
…n't work due to truffle error.
Keeping yarn.lock like master of enveloping since otherwise rskj does…
1baacc9 
…n't work due to truffle error.
Merge branch 'master' of github.com:rsksmart/enveloping
4303b64
Fixing deploy script to output correct addresses
92a1dfd
Merge branch 'feature/RLP-1067/enveloping-inception' of https://githu…
3274705 
…b.com/rsksmart/enveloping
Fixing gasOverhead on RelayHub and cushion parameter for open channel…
61fdc76 
… on lumino
Merge branch 'feature/RLP-1067/enveloping-inception' of https://githu…
7db44b0 
…b.com/rsksmart/enveloping
Create tests scripts
5a64690
Add execute tests script
6651d23
Fixing some details on documentation changes.
2bd8ee1
Changing execute-test context
f3cfeb6
Making changes on custom logic on tests
9b793a8
@mortelli
Merge remote-tracking branch 'origin/master' into feature/RLP-1067/en…
307e861 
…veloping-inception
Test if custom logic is called
5e4370c
Fix custom smart wallet dangling pointer
e83f144
Add failure test to custom logic
40511ce
Add duplicate nonce test to custom smart wallet
8eb5742
Improve the code a bit, missing more improvements
9450089
Do not create an image for tests
ab4abcf
Merge branch 'feature/RLP-1067/enveloping-inception' of github.com:rs…
c73f554 
…ksmart/enveloping into feature/3/fixing-tests
Fix some review comments
05bbc45
Fix linting issues
b3bef71
Undo unwanted changes
3116e36
Remove duplicated scripts
6f9a896
JONAF2103 and others added 5 commits June 21, 2021 10:43
Updating Readme with the new contract addresses (#129)
9760253 
* Updating Readme with the new contract addresses

* Update readme with testnet addresses

* Fix typo in readme

Co-authored-by: Mauricio Irace <mirace@infuy.com>
@mortelli
Merge remote-tracking branch 'origin/master' into develop
8522a2f 
# Conflicts:
#	src/relayclient/RelayProvider.ts
@mortelli
Merge remote-tracking branch 'origin/develop' into develop
7279312
@mortelli
remove duplicate getTransactionReceipt function declaration
8d8e362
@mortelli
apply js linter
6f3ceb2
@mortelli mortelli marked this pull request as ready for review June 22, 2021 12:04
@mortelli mortelli changed the title WIP: update master with develop update master with develop Jun 22, 2021
JONAF2103
JONAF2103 approved these changes Jun 22, 2021
View reviewed changes
Copy link

@JONAF2103 JONAF2103 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mortelli mortelli merged commit 41a529f into master Jun 22, 2021
@delete-merged-branch delete-merged-branch bot deleted the develop branch June 22, 2021 19:02
@mortelli mortelli restored the develop branch June 23, 2021 13:01
julianlen added a commit that referenced this pull request Jun 24, 2021
@julianlen
Rebased to commit in master: updated to master with develop (#140)
59d4195
julianlen added a commit that referenced this pull request Jun 24, 2021
@julianlen
Rebased to commit in master: updated to master with develop (#140)
8cb41cf
julianlen added a commit that referenced this pull request Jun 24, 2021
@julianlen
Rebased to commit in master: updated to master with develop (#140)
2ea4f37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JONAF2103 JONAF2103 JONAF2103 approved these changes

@mauricioirace mauricioirace Awaiting requested review from mauricioirace

Assignees

@JONAF2103 JONAF2103

@mauricioirace mauricioirace

@mortelli mortelli

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mortelli @JONAF2103 @mauricioirace