Fix merge conflicts between master and v0.6.0 #255
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[0.5.1][hotfix] Add arbitrum to network list
* base names quickstart * [PSDK-443] Quickstart Register Basenames for MPC Wallet
alex-stone
approved these changes
Sep 18, 2024
rohan-agarwal-coinbase
added a commit
that referenced
this pull request
Sep 18, 2024
This reverts commit 390c067.
howard-at-cb
pushed a commit
that referenced
this pull request
Sep 19, 2024
* fix arb * update version * remove network check logic from sdk * fix coverage * fix lint * [PSDK-443] Quickstart Basenames Registration (#243) * base names quickstart * [PSDK-443] Quickstart Register Basenames for MPC Wallet * [hotfix] Fix L2 Resolver Address on Register Basenames Quickstart (#244) --------- Co-authored-by: Jayasudha Jayakumaran <jayasudha.jayakumaran@coinbase.com> Co-authored-by: Jayasudha Jayakumaran <121061531+jazz-cb@users.noreply.github.com> Co-authored-by: John Peterson <98187317+John-peterson-coinbase@users.noreply.github.com>
howard-at-cb
pushed a commit
that referenced
this pull request
Sep 24, 2024
* fix arb * update version * remove network check logic from sdk * fix coverage * fix lint * [PSDK-443] Quickstart Basenames Registration (#243) * base names quickstart * [PSDK-443] Quickstart Register Basenames for MPC Wallet * [hotfix] Fix L2 Resolver Address on Register Basenames Quickstart (#244) --------- Co-authored-by: Jayasudha Jayakumaran <jayasudha.jayakumaran@coinbase.com> Co-authored-by: Jayasudha Jayakumaran <121061531+jazz-cb@users.noreply.github.com> Co-authored-by: John Peterson <98187317+John-peterson-coinbase@users.noreply.github.com>
howard-at-cb
pushed a commit
that referenced
this pull request
Sep 24, 2024
* fix arb * update version * remove network check logic from sdk * fix coverage * fix lint * [PSDK-443] Quickstart Basenames Registration (#243) * base names quickstart * [PSDK-443] Quickstart Register Basenames for MPC Wallet * [hotfix] Fix L2 Resolver Address on Register Basenames Quickstart (#244) --------- Co-authored-by: Jayasudha Jayakumaran <jayasudha.jayakumaran@coinbase.com> Co-authored-by: Jayasudha Jayakumaran <121061531+jazz-cb@users.noreply.github.com> Co-authored-by: John Peterson <98187317+John-peterson-coinbase@users.noreply.github.com>
howard-at-cb
pushed a commit
that referenced
this pull request
Sep 25, 2024
* fix arb * update version * remove network check logic from sdk * fix coverage * fix lint * [PSDK-443] Quickstart Basenames Registration (#243) * base names quickstart * [PSDK-443] Quickstart Register Basenames for MPC Wallet * [hotfix] Fix L2 Resolver Address on Register Basenames Quickstart (#244) --------- Co-authored-by: Jayasudha Jayakumaran <jayasudha.jayakumaran@coinbase.com> Co-authored-by: Jayasudha Jayakumaran <121061531+jazz-cb@users.noreply.github.com> Co-authored-by: John Peterson <98187317+John-peterson-coinbase@users.noreply.github.com>
howard-at-cb
added a commit
that referenced
this pull request
Sep 25, 2024
) * add eventTypeFilter * Update types.ts * Update webhook_test.ts * Update webhook.ts * Update webhook_test.ts * Update webhook.ts * Update webhook_test.ts * Update webhook_test.ts * Update webhook_test.ts * Update webhook_test.ts * Update webhook_test.ts * wallet.create_webhook * Changelog * Update wallet.ts * Update wallet.ts * Update wallet_test.ts * Update wallet_test.ts * Update wallet_test.ts * Update wallet_test.ts * Update wallet_test.ts * fmt * Update wallet_test.ts * Update wallet_test.ts * Update webhook.ts * Update wallet_test.ts * Update wallet_test.ts * address comments * fix test * Update wallet_test.ts * Update wallet_test.ts * Update wallet_test.ts * Update wallet_test.ts * Update jest.config.js * add sol, lamport asset suppport * Fix Asset toAtomicAmount to not return scientific notation (#250) * Fix merge conflicts between master and v0.6.0 (#255) * fix arb * update version * remove network check logic from sdk * fix coverage * fix lint * [PSDK-443] Quickstart Basenames Registration (#243) * base names quickstart * [PSDK-443] Quickstart Register Basenames for MPC Wallet * [hotfix] Fix L2 Resolver Address on Register Basenames Quickstart (#244) --------- Co-authored-by: Jayasudha Jayakumaran <jayasudha.jayakumaran@coinbase.com> Co-authored-by: Jayasudha Jayakumaran <121061531+jazz-cb@users.noreply.github.com> Co-authored-by: John Peterson <98187317+John-peterson-coinbase@users.noreply.github.com> * address comments * Update api.ts * Update CHANGELOG.md * apply new changes * fix tests * Update wallet.ts * Update CHANGELOG.md * Update CHANGELOG.md * Update jest.config.js --------- Co-authored-by: Rohan Agarwal <rohan.agarwal.1@coinbase.com> Co-authored-by: Rohit Durvasula <rohit.durvasula@coinbase.com> Co-authored-by: Jayasudha Jayakumaran <jayasudha.jayakumaran@coinbase.com> Co-authored-by: Jayasudha Jayakumaran <121061531+jazz-cb@users.noreply.github.com> Co-authored-by: John Peterson <98187317+John-peterson-coinbase@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changed? Why?
Merging in the
masterbranchQualified Impact