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

Release/sbtc integration #6027

Merged
merged 39 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
490d5c7
chore: post-release merge back
leather-bot Nov 15, 2024
c38725a
refactor: use zod for rpc validation
kyranjamie Nov 15, 2024
e017e56
Merge pull request #5970 from leather-io/refactor/yup-zod
kyranjamie Nov 18, 2024
dda886f
refactor: generic network name validator
kyranjamie Nov 18, 2024
678b033
refactor: upgrade storybook
kyranjamie Nov 19, 2024
e25f351
fix: manage tokens toggle, closes #5974
alter-eggo Nov 19, 2024
08c2218
Merge pull request #5972 from leather-io/chore/network-validator
kyranjamie Nov 20, 2024
f48d56a
ci: remove storybook publish
kyranjamie Nov 19, 2024
92b96cd
Merge pull request #5980 from leather-io/remove-publish-job
kyranjamie Nov 20, 2024
41d75da
fix: insufficient funds in send max btc flow
alter-eggo Nov 19, 2024
fa305bc
test: new sbtc network
kyranjamie Nov 20, 2024
720fa86
fix: support regtest address validation
kyranjamie Nov 20, 2024
e5fb4a8
feat: add default set fees, closes #5930
alter-eggo Nov 21, 2024
e096ff2
feat: add mock alex prices
alter-eggo Nov 21, 2024
6704ac5
fix: virtuoso list fixed height, closes #5975
alter-eggo Nov 25, 2024
2fb0203
chore: post-release merge back
leather-bot Nov 25, 2024
91cf37f
fix: show loading state until total balance is fully loaded
tigranpetrossian Nov 29, 2024
5c7f1e1
feat: adds BNS punycode support gobally
alexp3y Dec 2, 2024
578f00c
ci: fix issues linking to test reports
kyranjamie Nov 5, 2024
742b38d
chore: fix links in readme
kyranjamie Nov 5, 2024
5153b22
feat: migrate legacy auth request to approver ux
kyranjamie Dec 6, 2024
c525f91
test: fix broken tests
kyranjamie Dec 6, 2024
788ba20
fix(ledger): legacy auth flow
kyranjamie Dec 12, 2024
238cb11
feat: convert rpc-methods to @leather.io/rpc types
camerow Dec 13, 2024
50ab064
chore: fix chrome eslint warning
camerow Dec 13, 2024
2533000
chore: restore @chrome/types
camerow Dec 14, 2024
cae6c9a
chore: update version of leather/rpc
camerow Dec 14, 2024
90ec152
chore: fix unused exports
camerow Dec 16, 2024
33881cc
fix: endless loading in ledger mode
alter-eggo Dec 17, 2024
0afa9ce
chore: post-release merge back
leather-bot Dec 17, 2024
fc1897a
feat: sbtc integration
kyranjamie Nov 27, 2024
1f61746
refactor: activity list deposit status
fbwoolf Dec 17, 2024
d92081e
fix(ledger): increase fee
kyranjamie Dec 17, 2024
2fc9629
feat: sponsored sbtc txns
alexp3y Dec 18, 2024
9c95c58
feat: redesign send rpc transfer flow
alter-eggo Dec 18, 2024
3a2535b
fix: broken integration test
alexp3y Dec 18, 2024
f96b3b6
fix: review screen errors
kyranjamie Dec 18, 2024
d0c2efc
fix: update earn banner
pete-watters Dec 18, 2024
cff46da
fix: disable ledger btc swap
fbwoolf Dec 18, 2024
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: 1 addition & 4 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,13 @@ module.exports = {
'plugin:storybook/csf',
],
ignorePatterns: ['./leather-styles'],
plugins: ['react', 'react-hooks', '@typescript-eslint', 'deprecation'],
plugins: ['react', 'react-hooks', '@typescript-eslint'],
settings: {
react: {
version: 'detect',
},
},
rules: {
// This rule helps highlight areas of the code that use deprecated
// methods, such as implicit use of signed transactions
'deprecation/deprecation': 'warn',
'no-console': ['error'],
'no-duplicate-imports': ['error'],
'prefer-const': [
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,21 @@ jobs:
- name: Extract and sanitize branch name
id: extract_branch
run: |
sanitized_branch=$(echo ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} | sed 's/[^a-zA-Z0-9_-]/-/g')
sanitized_branch=$(echo ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}})
echo "BRANCH_NAME=${sanitized_branch}" >> $GITHUB_ENV

- name: Storybook parsed branch name
id: storybook_branch
run: echo "STORYBOOK_BRANCH=${{ env.BRANCH_NAME }}" >> $GITHUB_ENV
run: |
sanitized_branch=$(echo ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} | sed 's/[^a-zA-Z0-9_-]/-/g')
echo "STORYBOOK_BRANCH=${{ env.BRANCH_NAME }}" >> $GITHUB_ENV

- uses: kyranjamie/[email protected]
env:
EXTENSION_BUILD_LINK: '[Extension build](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})'
TEST_REPORT_LINK: '[Test report](https://leather-io.github.io/playwright-reports/${{ env.BRANCH_NAME }})'
STORYBOOK_LINK: '[Storybook](https://${{ env.BRANCH_NAME }}--65982789c7e2278518f189e7.chromatic.com)'
CHROMATIC_LINK: '[Chromatic](https://www.chromatic.com/library?appId=65982789c7e2278518f189e7&branch=${{ env.BRANCH_NAME }})'
STORYBOOK_LINK: '[Storybook](https://${{ env.STORYBOOK_BRANCH }}--65982789c7e2278518f189e7.chromatic.com)'
CHROMATIC_LINK: '[Chromatic](https://www.chromatic.com/library?appId=65982789c7e2278518f189e7&branch=${{ env.STORYBOOK_BRANCH }})'
with:
GITHUB_TOKEN: ${{ secrets.LEATHER_BOT }}
header: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Leather

[![Chrome Web Store](https://img.shields.io/chrome-web-store/stars/ldinpeekobnhjjdofggfgjlcehhmanlj?label=Chrome%20Web%20Store)](https://chrome.google.com/webstore/detail/stacks-wallet/ldinpeekobnhjjdofggfgjlcehhmanlj)
[![coverage](https://raw.githubusercontent.com/leather-wallet/extension/gh-pages/badge.svg)](https://leather-wallet.github.io/extension/)
[![Chrome Web Store](https://img.shields.io/chrome-web-store/stars/ldinpeekobnhjjdofggfgjlcehhmanlj?label=Chrome%20Web%20Store)](https://chromewebstore.google.com/detail/leather/ldinpeekobnhjjdofggfgjlcehhmanlj)
[![coverage](https://raw.githubusercontent.com/leather-io/extension/gh-pages/badge.svg)](https://leather-io.github.io/extension/)
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
[![storybook](https://raw.githubusercontent.com/storybooks/brand/master/badge/badge-storybook.svg)](https://storybook.leather.io)

Expand Down
12 changes: 9 additions & 3 deletions config/wallet-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,22 @@
"runesEnabled": true,
"swapsEnabled": true,
"sbtc": {
"enabled": false,
"enabled": true,
"emilyApiUrl": "https://sbtc-emily.com",
"showPromoLinkOnNetworks": ["mainnet", "testnet", "sbtcTestnet"],
"sponsorshipsEnabled": true,
"sponsorshipApiUrl": {
"mainnet": "https://sponsor.leather.io",
"testnet": "http://testnet-13-60-14-218.nip.io"
},
"contracts": {
"mainnet": {
"address": "SM3VDXK3WZZSA84XXFKAFAF15NNZX32CTSG82JFQ4.sbtc-token::sbtc-token"
},
"testnet": {
"address": "SNGWPN3XDAQE673MXYXF81016M50NHF5X5PWWM70.sbtc-token::sbtc-token"
}
},
"showPromoLinkOnNetworks": ["testnet", "sbtcTestnet"]
}
},
"tokensEnabledByDefault": [
"DOGGOTOTHEMOON",
Expand Down
21 changes: 21 additions & 0 deletions config/wallet-config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,27 @@
"type": "boolean",
"description": "Determines whether or not SBTC is enabled"
},
"sponsorshipsEnabled": {
"type": "boolean",
"description": "Determines whether or not sponsored sBTC transactions are enabled"
},
"emilyApiUrl": {
"type": "string",
"description": "URL for the Emily API"
},
"sponsorshipApiUrl": {
"type": "object",
"properties": {
"mainnet": {
"type": "string",
"description": "Mainnet URL for the Leather Sponsor API"
},
"testnet": {
"type": "string",
"description": "Testnet URL for the Leather Sponsor API"
}
}
},
"showPromoLinkOnNetworks": {
"type": "array",
"description": "Networks on which the promo link should be shown",
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@
"@hirosystems/token-metadata-api-client": "1.2.0",
"@hookform/resolvers": "3.9.1",
"@leather.io/analytics": "2.0.1",
"@leather.io/bitcoin": "0.16.5",
"@leather.io/constants": "0.13.3",
"@leather.io/crypto": "1.6.12",
"@leather.io/models": "0.21.0",
"@leather.io/query": "2.23.0",
"@leather.io/stacks": "1.3.5",
"@leather.io/bitcoin": "0.17.0",
"@leather.io/constants": "0.13.5",
"@leather.io/crypto": "1.6.14",
"@leather.io/models": "0.22.0",
"@leather.io/query": "2.26.1",
"@leather.io/stacks": "1.4.0",
"@leather.io/tokens": "0.12.1",
"@leather.io/ui": "1.37.0",
"@leather.io/utils": "0.19.1",
"@leather.io/ui": "1.44.4",
"@leather.io/utils": "0.21.1",
"@ledgerhq/hw-transport-webusb": "6.27.19",
"@noble/hashes": "1.5.0",
"@noble/secp256k1": "2.1.0",
Expand Down Expand Up @@ -193,7 +193,6 @@
"@types/lodash.uniqby": "4.7.7",
"@typescript-eslint/eslint-plugin": "7.5.0",
"@zondax/ledger-stacks": "1.0.4",
"alex-sdk": "2.1.4",
"are-passive-events-supported": "1.1.1",
"argon2-browser": "1.18.0",
"assert": "2.1.0",
Expand Down Expand Up @@ -249,6 +248,7 @@
"redux-persist": "6.0.0",
"remark-gfm": "4.0.0",
"rxjs": "7.8.1",
"sbtc": "0.3.1",
"style-loader": "3.3.4",
"ts-debounce": "4.0.0",
"url": "0.11.3",
Expand All @@ -268,9 +268,9 @@
"@btckit/types": "0.0.19",
"@chromatic-com/storybook": "3.2.2",
"@leather.io/eslint-config": "0.7.0",
"@leather.io/panda-preset": "0.5.2",
"@leather.io/panda-preset": "0.8.0",
"@leather.io/prettier-config": "0.6.0",
"@leather.io/rpc": "2.1.18",
"@leather.io/rpc": "2.4.0",
"@ls-lint/ls-lint": "2.2.3",
"@mdx-js/loader": "3.0.0",
"@pandacss/dev": "0.46.1",
Expand All @@ -297,7 +297,7 @@
"@svgr/webpack": "8.1.0",
"@types/argon2-browser": "1.18.4",
"@types/bn.js": "5.1.6",
"@types/chrome": "0.0.273",
"@types/chrome": "0.0.287",
"@types/dompurify": "3.0.5",
"@types/download": "8.0.5",
"@types/html-webpack-plugin": "3.2.9",
Expand Down
Loading
Loading