Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

Merge main into mardizzone/node-16 #490

Merged
merged 63 commits into from
Dec 1, 2023
Merged

Merge main into mardizzone/node-16 #490

merged 63 commits into from
Dec 1, 2023

Conversation

leovct
Copy link
Contributor

@leovct leovct commented Nov 30, 2023 •
edited
Loading

Description

  • Merge main into mardizzone/node-16.
  • Update CI job (bump actions versions, enable to cancel in-progress jobs and add env variable to specify node version).
  • Use bor latest version in tests.

Test

  • Run and simulate load on our docker PoS setup using this branch.

Denis Ermolin and others added 30 commits July 26, 2021 17:09
new: support typed tx for erc20 burn predicate
2e3d42c
chg: ERC721 burn only predicate upgrade
4ecdedf
chg: use ExitPlayloadReader in WithdrawManager
59f545e
chg: skip in flight test, we are not using it (it requires offsets)
b769ae9
chg: remove unused registry from ctor
d616537
misc: avoid breaking flattener
a13ebf8
chg: use internal to avoid linking and external call
de8200a
chg: avoid using incoming in-flight exits (due to unused offsets)
f8cb56e
fix: deployer for tests
ea7f311
fix: do not use registry fora burn only erc20 predicate
bedc930
fix: forbid implementation to initialize
e7505c9
@zorancuc
update npm module
64bb0cf
@zorancuc
solve deployment issue
209dbeb
@zorancuc
update node version
be58c3c
@zorancuc
remove bordevnet
38f467a
@jdkanani
Merge pull request #375 from maticnetwork/0.3.0/deploy_issue
702b271 
update npm module
fix: set of checks
5d02dc9
misc: remove .only
6884336
chg: remove depositing on onERC721Received
f8cb82c
fix: use OZ ERC721Holder
2909b5a
some refactoring
16198ff
@jdkanani
Merge branch 'v0.3.0-backport' into typed-transactions
71ccb30
@jdkanani
Merge pull request #380 from maticnetwork/erc721-check
aac51fb 
fix: set of checks
@imyourm8
Merge branch 'v0.3.0-backport' into typed-transactions
a03c4dc
@jdkanani
Merge pull request #366 from maticnetwork/typed-transactions
17e3087 
Typed transactions
@jdkanani
Add v0.3.0-backport for ci
9564ece
@jdkanani
Update ci.yml
aa63354
@jdkanani
Merge pull request #373 from maticnetwork/auto-init-implementation
718bf86 
fix: forbid implementation to initialize
bump
283b8d2
fix
c581ed6
Denis Ermolin and others added 17 commits January 20, 2022 22:39
@leovct leovct marked this pull request as ready for review November 30, 2023 14:51
@leovct leovct requested a review from marcello33 November 30, 2023 14:51
marcello33
marcello33 reviewed Nov 30, 2023
View reviewed changes
.github/workflows/ci.yml Show resolved Hide resolved
test-blockchain/run-docker.sh Outdated Show resolved Hide resolved
@marcello33 marcello33 merged commit 4291b97 into mardizzone/node-16 Dec 1, 2023
2 of 3 checks passed
@marcello33 marcello33 deleted the leovct/node-16 branch December 1, 2023 07:30
@leovct leovct mentioned this pull request Dec 4, 2023
Merged
12 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@marcello33 marcello33 marcello33 left review comments

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

Successfully merging this pull request may close these issues.
7 participants
@leovct @jdkanani @marcello33 @zorancuc @imyourm8 @gretzke @DhairyaSethi