From b71cdae03421e2ff940b5185d4d59dd7a808a2d6 Mon Sep 17 00:00:00 2001 From: David Mohl Date: Tue, 28 Jun 2022 11:17:03 +0900 Subject: [PATCH] Fix nits - formatting, order, whitespace --- packages/wallets/saifu/package.json | 3 +-- packages/wallets/saifu/src/adapter.ts | 17 ++++++----------- packages/wallets/wallets/package.json | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/packages/wallets/saifu/package.json b/packages/wallets/saifu/package.json index 0b83899f8..7c9464e66 100644 --- a/packages/wallets/saifu/package.json +++ b/packages/wallets/saifu/package.json @@ -30,8 +30,7 @@ "@solana/web3.js": "^1.36.0" }, "dependencies": { - "@solana/wallet-adapter-base": "^0.9.4", - "@solflare-wallet/sdk": "^1.0.11" + "@solana/wallet-adapter-base": "^0.9.4" }, "devDependencies": { "@solana/web3.js": "^1.36.0" diff --git a/packages/wallets/saifu/src/adapter.ts b/packages/wallets/saifu/src/adapter.ts index 21f4457ef..f4e6ea156 100644 --- a/packages/wallets/saifu/src/adapter.ts +++ b/packages/wallets/saifu/src/adapter.ts @@ -16,7 +16,7 @@ import { WalletSignTransactionError, WalletWindowClosedError, } from '@solana/wallet-adapter-base'; -import {Connection, PublicKey, SendOptions, Transaction, TransactionSignature} from '@solana/web3.js'; +import { Connection, PublicKey, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; interface SaifuWalletEvents { connect(...args: unknown[]): unknown; @@ -29,14 +29,13 @@ interface SaifuWallet extends EventEmitter { isConnected: boolean; signTransaction(transaction: Transaction): Promise; signAllTransactions(transactions: Transaction[]): Promise; - signAndSendTransaction( + signAndSendTransaction?( transaction: Transaction, options?: SendOptions ): Promise<{ signature: TransactionSignature }>; signMessage(message: Uint8Array): Promise<{ signature: Uint8Array }>; connect(): Promise; disconnect(): Promise; - _handleDisconnect(...args: unknown[]): unknown; } interface SolanaWindow extends Window { @@ -45,16 +44,14 @@ interface SolanaWindow extends Window { declare const window: SolanaWindow; -export interface SaifuWalletAdapterConfig { -} +export interface SaifuWalletAdapterConfig {} export const SaifuWalletName = 'Saifu' as WalletName; export class SaifuWalletAdapter extends BaseMessageSignerWalletAdapter { name = SaifuWalletName; url = 'https://saifuwallet.com'; - icon = - 'data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8"?>
<svg width="541px" height="541px" viewBox="0 0 541 541" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>Artboard Copy 9</title>
    <defs>
        <linearGradient x1="1.79987216%" y1="0%" x2="98.3971051%" y2="97.990291%" id="linearGradient-1">
            <stop stop-color="#FB923C" offset="0%"></stop>
            <stop stop-color="#EC4899" offset="100%"></stop>
        </linearGradient>
    </defs>
    <g id="Artboard-Copy-9" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <path d="M232.270044,-7.85672971e-15 L307.729956,7.85672971e-15 C379.465376,-5.32085332e-15 412.337379,8.81843306 443.300342,25.3776069 C474.263305,41.9367807 498.563219,66.2366952 515.122393,97.1996582 C531.681567,128.162621 540.5,161.034624 540.5,232.770044 L540.5,308.229956 C540.5,379.965376 531.681567,412.837379 515.122393,443.800342 C498.563219,474.763305 474.263305,499.063219 443.300342,515.622393 C412.337379,532.181567 379.465376,541 307.729956,541 L232.270044,541 C160.534624,541 127.662621,532.181567 96.6996582,515.622393 C65.7366952,499.063219 41.4367807,474.763305 24.8776069,443.800342 C8.31843306,412.837379 -0.5,379.965376 -0.5,308.229956 L-0.5,232.770044 C-0.5,161.034624 8.31843306,128.162621 24.8776069,97.1996582 C41.4367807,66.2366952 65.7366952,41.9367807 96.6996582,25.3776069 C127.662621,8.81843306 160.534624,5.32085332e-15 232.270044,-7.85672971e-15 Z" id="Rectangle" fill="url(#linearGradient-1)"></path>
        <g id="Layer" transform="translate(107.502764, 87.021589)" fill="#FFFFFF">
            <path d="M161.325147,323.863421 C142.829694,323.797655 123.273405,323.181628 115.620054,322.423693 C108.262602,321.695055 96.1852553,319.92531 88.7815073,318.490862 C81.3777603,317.056444 70.5224893,314.312273 64.6586893,312.392718 C58.7948893,310.473131 50.3144513,307.121172 45.8132763,304.943865 C41.3120933,302.766588 33.9823823,298.237139 29.5250303,294.878435 C25.0676713,291.519701 19.1695313,286.005694 16.4180433,282.625017 C13.6665553,279.244402 9.68309629,273.037371 7.56590129,268.831621 C5.44871329,264.625872 2.87964429,257.650896 1.85685529,253.331621 C0.540937287,247.774493 0,241.677569 0,232.478411 C0,223.953753 0.623693287,216.380083 1.80641729,210.478411 C2.79842929,205.528399 4.96278929,197.428423 6.61611729,192.478411 C8.26944529,187.528399 11.3705273,179.537096 13.5074213,174.719927 C17.3926683,165.961443 17.3926683,165.961443 14.8492413,161.059099 C13.2573683,157.990832 12.2480903,154.306505 12.1515253,151.211184 C12.0666633,148.491122 12.6259593,144.513506 13.3943993,142.372027 C14.1628403,140.230547 17.9481943,134.216479 21.8063033,129.007433 C25.6644113,123.798388 33.1356873,115.075609 38.4091393,109.623492 C43.6825923,104.171374 51.5972423,96.6757384 55.9972363,92.9664794 C60.3972303,89.2572504 67.8222333,83.6799194 72.4972363,80.5724364 C77.1722393,77.4649224 85.4059273,72.6543754 90.7943253,69.8823114 C96.1827223,67.1102474 104.585981,63.3571044 109.468214,61.5419494 C114.350462,59.7268244 121.416761,57.4363274 125.171125,56.4519834 C128.925489,55.4676084 132.379438,54.3286614 132.846571,53.9209774 C133.313703,53.5132934 133.393491,52.2268854 133.023863,51.0623044 C132.654234,49.8977234 130.654432,48.0789364 128.579847,47.0205564 C126.505262,45.9621764 123.331693,43.4149654 121.527464,41.3600644 C119.723234,39.3051634 117.62834,36.1430844 116.872144,34.3332694 C116.115949,32.5234244 115.497236,28.3137384 115.497236,24.9784114 C115.497236,21.6430844 116.186155,17.2653374 117.028181,15.2501094 C117.870191,13.2348814 119.698103,10.0927914 121.090193,8.26765743 C122.482267,6.44255343 125.828397,3.83082843 128.525999,2.46382443 C132.338423,0.531939425 134.941419,-0.0167055746 140.213987,0 C144.617948,0.0146354254 148.413847,0.665819425 151.035948,1.85689043 C153.257231,2.86589343 156.96974,5.84434743 159.285948,8.47572543 C163.497236,13.2599974 163.497236,13.2599974 167.708524,8.47572543 C170.024732,5.84434743 173.737241,2.86589343 175.958524,1.85689043 C178.580625,0.665819425 182.376539,0.0146354254 186.78047,0 C192.053053,-0.0167055746 194.656049,0.531939425 198.468458,2.46382443 C201.16609,3.83082843 204.473005,6.41832243 205.817182,8.21382443 C207.16136,10.0093564 208.98924,12.9185664 209.879194,14.6787594 C210.88188,16.6619444 211.497236,20.3822204 211.497236,24.4608634 C211.497236,28.0808594 210.878523,32.5234244 210.122328,34.3332694 C209.366132,36.1430844 207.271253,39.3051634 205.467024,41.3600644 C203.662794,43.4149654 200.48921,45.9621764 198.414625,47.0205564 C196.34004,48.0789364 194.340223,49.8977234 193.970625,51.0623044 C193.600996,52.2268854 193.680769,53.5082884 194.147901,53.9098384 C194.615034,54.3113884 197.697248,55.3705314 200.997236,56.2634454 C204.297224,57.1563594 210.153089,58.9694394 214.010206,60.2924984 C217.867353,61.6155264 224.364729,64.1646294 228.448835,65.9571714 C232.532942,67.7497124 240.292066,71.8393734 245.691297,75.0453364 C251.090528,78.2512994 258.993147,83.4642814 263.252668,86.6297174 C267.51219,89.7951834 277.116682,98.4810974 284.596021,105.93175 C292.075361,113.382403 301.412428,123.835467 305.345075,129.160784 C309.277693,134.486071 312.945753,140.02788 313.496259,141.475878 C314.046797,142.923876 314.497236,146.937289 314.497236,150.394564 C314.497236,155.130129 313.898115,157.807299 312.068189,161.248919 C309.639173,165.817324 309.639173,165.817324 314.628217,177.589831 C317.372175,184.064715 320.738752,193.213457 322.109449,197.920367 C323.480177,202.627276 325.298017,210.978411 326.149091,216.478411 C327.215009,223.366686 327.518842,229.901324 327.125501,237.478411 C326.797437,243.797686 325.680464,251.59688 324.500562,255.807024 C323.370893,259.837786 321.156812,265.690783 319.580396,268.813677 C318.00395,271.936602 314.555708,277.363055 311.917646,280.872454 C309.279554,284.381884 303.824781,289.872698 299.795942,293.074297 C295.767072,296.275866 289.664198,300.463885 286.233991,302.380968 C282.803785,304.298083 275.875013,307.457751 270.836744,309.402483 C265.798475,311.347246 257.248457,314.090594 251.836744,315.498827 C246.425001,316.907061 236.597242,318.91469 229.997236,319.960284 C223.39723,321.005846 212.519788,322.337664 205.825147,322.919848 C199.130506,323.502062 179.105497,323.926684 161.325147,323.863421 Z" id="Shape"></path>
        </g>
    </g>
</svg>'; + icon = 'data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8"?>
<svg width="541px" height="541px" viewBox="0 0 541 541" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>Artboard Copy 9</title>
    <defs>
        <linearGradient x1="1.79987216%" y1="0%" x2="98.3971051%" y2="97.990291%" id="linearGradient-1">
            <stop stop-color="#FB923C" offset="0%"></stop>
            <stop stop-color="#EC4899" offset="100%"></stop>
        </linearGradient>
    </defs>
    <g id="Artboard-Copy-9" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <path d="M232.270044,-7.85672971e-15 L307.729956,7.85672971e-15 C379.465376,-5.32085332e-15 412.337379,8.81843306 443.300342,25.3776069 C474.263305,41.9367807 498.563219,66.2366952 515.122393,97.1996582 C531.681567,128.162621 540.5,161.034624 540.5,232.770044 L540.5,308.229956 C540.5,379.965376 531.681567,412.837379 515.122393,443.800342 C498.563219,474.763305 474.263305,499.063219 443.300342,515.622393 C412.337379,532.181567 379.465376,541 307.729956,541 L232.270044,541 C160.534624,541 127.662621,532.181567 96.6996582,515.622393 C65.7366952,499.063219 41.4367807,474.763305 24.8776069,443.800342 C8.31843306,412.837379 -0.5,379.965376 -0.5,308.229956 L-0.5,232.770044 C-0.5,161.034624 8.31843306,128.162621 24.8776069,97.1996582 C41.4367807,66.2366952 65.7366952,41.9367807 96.6996582,25.3776069 C127.662621,8.81843306 160.534624,5.32085332e-15 232.270044,-7.85672971e-15 Z" id="Rectangle" fill="url(#linearGradient-1)"></path>
        <g id="Layer" transform="translate(107.502764, 87.021589)" fill="#FFFFFF">
            <path d="M161.325147,323.863421 C142.829694,323.797655 123.273405,323.181628 115.620054,322.423693 C108.262602,321.695055 96.1852553,319.92531 88.7815073,318.490862 C81.3777603,317.056444 70.5224893,314.312273 64.6586893,312.392718 C58.7948893,310.473131 50.3144513,307.121172 45.8132763,304.943865 C41.3120933,302.766588 33.9823823,298.237139 29.5250303,294.878435 C25.0676713,291.519701 19.1695313,286.005694 16.4180433,282.625017 C13.6665553,279.244402 9.68309629,273.037371 7.56590129,268.831621 C5.44871329,264.625872 2.87964429,257.650896 1.85685529,253.331621 C0.540937287,247.774493 0,241.677569 0,232.478411 C0,223.953753 0.623693287,216.380083 1.80641729,210.478411 C2.79842929,205.528399 4.96278929,197.428423 6.61611729,192.478411 C8.26944529,187.528399 11.3705273,179.537096 13.5074213,174.719927 C17.3926683,165.961443 17.3926683,165.961443 14.8492413,161.059099 C13.2573683,157.990832 12.2480903,154.306505 12.1515253,151.211184 C12.0666633,148.491122 12.6259593,144.513506 13.3943993,142.372027 C14.1628403,140.230547 17.9481943,134.216479 21.8063033,129.007433 C25.6644113,123.798388 33.1356873,115.075609 38.4091393,109.623492 C43.6825923,104.171374 51.5972423,96.6757384 55.9972363,92.9664794 C60.3972303,89.2572504 67.8222333,83.6799194 72.4972363,80.5724364 C77.1722393,77.4649224 85.4059273,72.6543754 90.7943253,69.8823114 C96.1827223,67.1102474 104.585981,63.3571044 109.468214,61.5419494 C114.350462,59.7268244 121.416761,57.4363274 125.171125,56.4519834 C128.925489,55.4676084 132.379438,54.3286614 132.846571,53.9209774 C133.313703,53.5132934 133.393491,52.2268854 133.023863,51.0623044 C132.654234,49.8977234 130.654432,48.0789364 128.579847,47.0205564 C126.505262,45.9621764 123.331693,43.4149654 121.527464,41.3600644 C119.723234,39.3051634 117.62834,36.1430844 116.872144,34.3332694 C116.115949,32.5234244 115.497236,28.3137384 115.497236,24.9784114 C115.497236,21.6430844 116.186155,17.2653374 117.028181,15.2501094 C117.870191,13.2348814 119.698103,10.0927914 121.090193,8.26765743 C122.482267,6.44255343 125.828397,3.83082843 128.525999,2.46382443 C132.338423,0.531939425 134.941419,-0.0167055746 140.213987,0 C144.617948,0.0146354254 148.413847,0.665819425 151.035948,1.85689043 C153.257231,2.86589343 156.96974,5.84434743 159.285948,8.47572543 C163.497236,13.2599974 163.497236,13.2599974 167.708524,8.47572543 C170.024732,5.84434743 173.737241,2.86589343 175.958524,1.85689043 C178.580625,0.665819425 182.376539,0.0146354254 186.78047,0 C192.053053,-0.0167055746 194.656049,0.531939425 198.468458,2.46382443 C201.16609,3.83082843 204.473005,6.41832243 205.817182,8.21382443 C207.16136,10.0093564 208.98924,12.9185664 209.879194,14.6787594 C210.88188,16.6619444 211.497236,20.3822204 211.497236,24.4608634 C211.497236,28.0808594 210.878523,32.5234244 210.122328,34.3332694 C209.366132,36.1430844 207.271253,39.3051634 205.467024,41.3600644 C203.662794,43.4149654 200.48921,45.9621764 198.414625,47.0205564 C196.34004,48.0789364 194.340223,49.8977234 193.970625,51.0623044 C193.600996,52.2268854 193.680769,53.5082884 194.147901,53.9098384 C194.615034,54.3113884 197.697248,55.3705314 200.997236,56.2634454 C204.297224,57.1563594 210.153089,58.9694394 214.010206,60.2924984 C217.867353,61.6155264 224.364729,64.1646294 228.448835,65.9571714 C232.532942,67.7497124 240.292066,71.8393734 245.691297,75.0453364 C251.090528,78.2512994 258.993147,83.4642814 263.252668,86.6297174 C267.51219,89.7951834 277.116682,98.4810974 284.596021,105.93175 C292.075361,113.382403 301.412428,123.835467 305.345075,129.160784 C309.277693,134.486071 312.945753,140.02788 313.496259,141.475878 C314.046797,142.923876 314.497236,146.937289 314.497236,150.394564 C314.497236,155.130129 313.898115,157.807299 312.068189,161.248919 C309.639173,165.817324 309.639173,165.817324 314.628217,177.589831 C317.372175,184.064715 320.738752,193.213457 322.109449,197.920367 C323.480177,202.627276 325.298017,210.978411 326.149091,216.478411 C327.215009,223.366686 327.518842,229.901324 327.125501,237.478411 C326.797437,243.797686 325.680464,251.59688 324.500562,255.807024 C323.370893,259.837786 321.156812,265.690783 319.580396,268.813677 C318.00395,271.936602 314.555708,277.363055 311.917646,280.872454 C309.279554,284.381884 303.824781,289.872698 299.795942,293.074297 C295.767072,296.275866 289.664198,300.463885 286.233991,302.380968 C282.803785,304.298083 275.875013,307.457751 270.836744,309.402483 C265.798475,311.347246 257.248457,314.090594 251.836744,315.498827 C246.425001,316.907061 236.597242,318.91469 229.997236,319.960284 C223.39723,321.005846 212.519788,322.337664 205.825147,322.919848 C199.130506,323.502062 179.105497,323.926684 161.325147,323.863421 Z" id="Shape"></path>
        </g>
    </g>
</svg>'; private _connecting: boolean; private _wallet: SaifuWallet | null; @@ -115,7 +112,6 @@ export class SaifuWalletAdapter extends BaseMessageSignerWalletAdapter { // 3. Wallet with authorize the user and emit 'connect' // 4. 'connect' will resolve the full promise await new Promise((resolve, reject) => { - // connect will get called post auth // resolving this promise will unblock the outer part // so this should happen last @@ -133,7 +129,6 @@ export class SaifuWalletAdapter extends BaseMessageSignerWalletAdapter { }); }); } catch (error: any) { - if (error instanceof WalletError) throw error; throw new WalletConnectionError(error?.message, error); } } @@ -189,7 +184,7 @@ export class SaifuWalletAdapter extends BaseMessageSignerWalletAdapter { if (!wallet) throw new WalletNotConnectedError(); // fallback to parent if not implemented yet - if (!('signAndSendTransaction' in wallet)) { + if (!wallet.signAndSendTransaction) { return super.sendTransaction(transaction, connection, options); } @@ -239,7 +234,7 @@ export class SaifuWalletAdapter extends BaseMessageSignerWalletAdapter { if (!wallet) throw new WalletNotConnectedError(); try { - const {signature} = await wallet.signMessage(message); + const { signature } = await wallet.signMessage(message); return signature; } catch (error: any) { throw new WalletSignTransactionError(error?.message, error); diff --git a/packages/wallets/wallets/package.json b/packages/wallets/wallets/package.json index fe6cee31d..1aa4a3c4b 100644 --- a/packages/wallets/wallets/package.json +++ b/packages/wallets/wallets/package.json @@ -41,13 +41,13 @@ "@solana/wallet-adapter-mathwallet": "^0.9.2", "@solana/wallet-adapter-phantom": "^0.9.2", "@solana/wallet-adapter-safepal": "^0.5.2", + "@solana/wallet-adapter-saifu": "^0.1.0", "@solana/wallet-adapter-slope": "^0.5.2", "@solana/wallet-adapter-solflare": "^0.6.3", "@solana/wallet-adapter-sollet": "^0.11.0", "@solana/wallet-adapter-solong": "^0.9.2", "@solana/wallet-adapter-tokenpocket": "^0.4.2", "@solana/wallet-adapter-torus": "^0.11.10", - "@solana/wallet-adapter-walletconnect": "^0.1.0", - "@solana/wallet-adapter-saifu": "^0.1.0" + "@solana/wallet-adapter-walletconnect": "^0.1.0" } }