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.

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

Sync with upstream changes #80

Merged

Conversation

matjazv
Copy link

@matjazv matjazv commented Nov 27, 2024

What was the problem?

This PR resolves #LISK-1355

How was it solved?

  • Merge upstream changes to current master branch
  • Resolve package.json conflicts

How was it tested?

sh ./scripts/lisk/docker/dev/composeStart.sh
sh ./scripts/lisk/docker/dev/composeStop.sh

nicholaspai and others added 16 commits November 14, 2024 11:54
…ocol#1910)

* feat: Manual withdrawals of ERC20 on OpStack lite chains

Updates script `withdrawFromOpStack` to support ERC20 withdrawals (e.g. USDT) and updates finalizer to automate these. Helps with withdrawing ERC20's from Lite chains

* Update OpStackStandardBridgeL2.json

* Update withdrawFromOpStack.ts

* Update opStack.ts

* Refactor

* Update scripts/withdrawFromOpStack.ts

Co-authored-by: Paul <[email protected]>

* Update scripts/withdrawFromOpStack.ts

Co-authored-by: Paul <[email protected]>

* Revert "Refactor"

This reverts commit 19345e0.

* Update withdrawFromOpStack.ts

* Update withdrawFromOpStack.ts

---------

Co-authored-by: Paul <[email protected]>
…rotocol#1911)

Permit the ACROSS_API_HOST env var to override the standard
app.across.to and testnet.across.to API hostnames.

While here, sub out some hardcoded chain IDs.
…map (across-protocol#1916)

* improve(arweave): Change arweave data key from list of chain ID's to map

We've received feedback from a user of the arweave data that its easier if the arweave `tag` (i.e. data key) is a mapping of chainId to bundle block ranges. I see no issue with this outside of any topic length constraints, which I've added logic to check for and protect against. The tag now only uses the end blocks, to reduce its length.

* refactor

* Update Dataworker.ts

* Update Dataworker.ts
* Reapply "improve(arweave): Change arweave data key from list of chain ID's to map (across-protocol#1916)" (across-protocol#1917)

This reverts commit fc59ea0.

* improve(dataworker): Update arweave bundle data

Duplicate of across-protocol@0823a68 but updates the arweave key logic to read from the SDK so we don't have two separate computations of the arweave key.

* bump sdk

* Update Dataworker.ts
Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: nicholaspai <[email protected]>
…ons (across-protocol#1909)

* feat(AlephZero): Add manual withdrawal script and automate finalizations

Similar to across-protocol#1866 for OpStack but for Arbitrum Orbit.

Replaces original PR across-protocol#1898 with smaller commit history. I essentially took the core changes and copied and pasted here, to avoid rebase hell

* WIP

* WIP

* wip

* Update ContractAddresses.ts

* Update arbStack.ts

* Update arbStack.ts

* Update arbStack.ts

* fix
Goal:
Provide a standardised way of logging performance metrics.
The API is similar to using Node's native perf_hooks, but slightly easier to use.

The Profiler will ensure { datadog: true } is appended to all logs so we can ingest this by searching for this key.

Since the Profiler class holds some state, each instance should be created within a function scope so it can be garbage collected.

---------

Co-authored-by: Paul <[email protected]>
@matjazv matjazv self-assigned this Nov 27, 2024
@sameersubudhi sameersubudhi merged commit 514900b into master Nov 28, 2024
2 checks passed
@sameersubudhi sameersubudhi deleted the LISK-1355-Merge-upstream-changes-for-Across-Relayer branch November 28, 2024 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants