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

Fix merge conflicts between master and v0.6.0 #255

Merged
merged 9 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
### Breaking
- `Asset#toAtomicAmount` now returns a BigInt instead of a Decimal

## [0.5.1] - 2024-09-12

### Fixed
- Fixed a bug that blocked arbitrum mainnet wallets from being created

## [0.5.0] - 2024-09-11

- Add Arbitrum-Mainnet support for Native transfers.
Expand Down
4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ module.exports = {
maxWorkers: 1,
coverageThreshold: {
"./src/coinbase/**": {
branches: 78,
branches: 77,
functions: 90,
statements: 85,
lines: 88,
lines: 87,
},
},
};
162 changes: 152 additions & 10 deletions quickstart-template/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions quickstart-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"start": "node index.js",
"start-trade-assets": "node trade-assets.js",
"start-mass-payout": "node mass-payout.js",
"start-webhook": "node webhook.js"
"start-webhook": "node webhook.js",
"start-register-basename": "node register-basename.js"
},
"keywords": [],
"author": "",
Expand All @@ -16,6 +17,7 @@
"dependencies": {
"@coinbase/coinbase-sdk": "^0.6.0",
"csv-parse": "^5.5.6",
"csv-writer": "^1.6.0"
"csv-writer": "^1.6.0",
"viem": "^2.21.6"
}
}
Loading
Loading