thirdweb 5.50.1-nightly-b407bc9fd8379bf304ffb963f8cb8e64493914b5-20240904000351 → 5.50.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/contract/deployment/deploy-via-autofactory.js +11 -0
- package/dist/cjs/contract/deployment/deploy-via-autofactory.js.map +1 -1
- package/dist/cjs/contract/deployment/publisher.js +3 -0
- package/dist/cjs/contract/deployment/publisher.js.map +1 -1
- package/dist/cjs/contract/deployment/utils/bootstrap.js +41 -1
- package/dist/cjs/contract/deployment/utils/bootstrap.js.map +1 -1
- package/dist/cjs/contract/deployment/zksync/zkDeployContract.js +43 -0
- package/dist/cjs/contract/deployment/zksync/zkDeployContract.js.map +1 -0
- package/dist/cjs/contract/deployment/zksync/zkDeployCreate2Factory.js +55 -0
- package/dist/cjs/contract/deployment/zksync/zkDeployCreate2Factory.js.map +1 -0
- package/dist/cjs/contract/deployment/zksync/zkDeployDeterministic.js +86 -0
- package/dist/cjs/contract/deployment/zksync/zkDeployDeterministic.js.map +1 -0
- package/dist/cjs/contract/deployment/zksync/zkDeployProxy.js +41 -0
- package/dist/cjs/contract/deployment/zksync/zkDeployProxy.js.map +1 -0
- package/dist/cjs/exports/extensions/erc4337.js +16 -1
- package/dist/cjs/exports/extensions/erc4337.js.map +1 -1
- package/dist/cjs/exports/extensions/permissions.js +11 -3
- package/dist/cjs/exports/extensions/permissions.js.map +1 -1
- package/dist/cjs/exports/extensions/thirdweb.js +9 -2
- package/dist/cjs/exports/extensions/thirdweb.js.map +1 -1
- package/dist/cjs/extensions/erc4337/account/addAdmin.js +16 -0
- package/dist/cjs/extensions/erc4337/account/addAdmin.js.map +1 -1
- package/dist/cjs/extensions/erc4337/account/addSessionKey.js +16 -0
- package/dist/cjs/extensions/erc4337/account/addSessionKey.js.map +1 -1
- package/dist/cjs/extensions/erc4337/account/removeAdmin.js +16 -0
- package/dist/cjs/extensions/erc4337/account/removeAdmin.js.map +1 -1
- package/dist/cjs/extensions/erc4337/account/removeSessionKey.js +16 -0
- package/dist/cjs/extensions/erc4337/account/removeSessionKey.js.map +1 -1
- package/dist/cjs/extensions/permissions/read/getAllMembers.js +18 -0
- package/dist/cjs/extensions/permissions/read/getAllMembers.js.map +1 -1
- package/dist/cjs/extensions/permissions/read/getRoleAdmin.js +3 -0
- package/dist/cjs/extensions/permissions/read/getRoleAdmin.js.map +1 -1
- package/dist/cjs/extensions/permissions/read/getRoleMember.js +3 -0
- package/dist/cjs/extensions/permissions/read/getRoleMember.js.map +1 -1
- package/dist/cjs/extensions/permissions/read/getRoleMemberCount.js +3 -0
- package/dist/cjs/extensions/permissions/read/getRoleMemberCount.js.map +1 -1
- package/dist/cjs/extensions/permissions/read/hasRole.js +3 -0
- package/dist/cjs/extensions/permissions/read/hasRole.js.map +1 -1
- package/dist/cjs/extensions/permissions/write/{grant.js → grantRole.js} +4 -1
- package/dist/cjs/extensions/permissions/write/grantRole.js.map +1 -0
- package/dist/cjs/extensions/permissions/write/renounceRole.js +3 -0
- package/dist/cjs/extensions/permissions/write/renounceRole.js.map +1 -1
- package/dist/cjs/extensions/permissions/write/revokeRole.js +3 -0
- package/dist/cjs/extensions/permissions/write/revokeRole.js.map +1 -1
- package/dist/cjs/extensions/prebuilts/deploy-published.js +39 -13
- package/dist/cjs/extensions/prebuilts/deploy-published.js.map +1 -1
- package/dist/cjs/extensions/thirdweb/read/contractType.js +49 -0
- package/dist/cjs/extensions/thirdweb/read/contractType.js.map +1 -0
- package/dist/cjs/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.js +33 -0
- package/dist/cjs/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.js.map +1 -0
- package/dist/cjs/react/web/hooks/transaction/useSendTransaction.js +6 -5
- package/dist/cjs/react/web/hooks/transaction/useSendTransaction.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/ConnectButton.js +3 -0
- package/dist/cjs/react/web/ui/ConnectWallet/ConnectButton.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/Details.js +37 -30
- package/dist/cjs/react/web/ui/ConnectWallet/Details.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +22 -17
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js +44 -25
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js +13 -2
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.js +2 -2
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js +16 -11
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js.map +1 -1
- package/dist/cjs/stories/ConnectButton/hideButtons.stories.js +74 -0
- package/dist/cjs/stories/ConnectButton/hideButtons.stories.js.map +1 -0
- package/dist/cjs/stories/{ConnectButton.stories.js → ConnectButton/themes.stories.js} +4 -5
- package/dist/cjs/stories/ConnectButton/themes.stories.js.map +1 -0
- package/dist/cjs/transaction/actions/send-transaction.js +8 -0
- package/dist/cjs/transaction/actions/send-transaction.js.map +1 -1
- package/dist/cjs/transaction/actions/zksync/getEip721Domain.js +4 -3
- package/dist/cjs/transaction/actions/zksync/getEip721Domain.js.map +1 -1
- package/dist/cjs/transaction/extract-error.js +4 -2
- package/dist/cjs/transaction/extract-error.js.map +1 -1
- package/dist/cjs/utils/abi/encodeAbiParameters.js +1 -1
- package/dist/cjs/utils/abi/encodeAbiParameters.js.map +1 -1
- package/dist/cjs/utils/any-evm/deploy-metadata.js +9 -2
- package/dist/cjs/utils/any-evm/deploy-metadata.js.map +1 -1
- package/dist/cjs/utils/any-evm/zksync/computeDeploymentAddress.js +15 -0
- package/dist/cjs/utils/any-evm/zksync/computeDeploymentAddress.js.map +1 -0
- package/dist/cjs/utils/any-evm/zksync/constants.js +43 -0
- package/dist/cjs/utils/any-evm/zksync/constants.js.map +1 -0
- package/dist/cjs/utils/any-evm/zksync/create2Address.js +21 -0
- package/dist/cjs/utils/any-evm/zksync/create2Address.js.map +1 -0
- package/dist/cjs/utils/any-evm/zksync/isZkSyncChain.js +10 -0
- package/dist/cjs/utils/any-evm/zksync/isZkSyncChain.js.map +1 -0
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/version.js.map +1 -1
- package/dist/cjs/wallets/smart/index.js +2 -2
- package/dist/cjs/wallets/smart/index.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/utils.js +0 -7
- package/dist/cjs/wallets/smart/lib/utils.js.map +1 -1
- package/dist/esm/contract/deployment/deploy-via-autofactory.js +11 -0
- package/dist/esm/contract/deployment/deploy-via-autofactory.js.map +1 -1
- package/dist/esm/contract/deployment/publisher.js +3 -0
- package/dist/esm/contract/deployment/publisher.js.map +1 -1
- package/dist/esm/contract/deployment/utils/bootstrap.js +41 -1
- package/dist/esm/contract/deployment/utils/bootstrap.js.map +1 -1
- package/dist/esm/contract/deployment/zksync/zkDeployContract.js +40 -0
- package/dist/esm/contract/deployment/zksync/zkDeployContract.js.map +1 -0
- package/dist/esm/contract/deployment/zksync/zkDeployCreate2Factory.js +52 -0
- package/dist/esm/contract/deployment/zksync/zkDeployCreate2Factory.js.map +1 -0
- package/dist/esm/contract/deployment/zksync/zkDeployDeterministic.js +83 -0
- package/dist/esm/contract/deployment/zksync/zkDeployDeterministic.js.map +1 -0
- package/dist/esm/contract/deployment/zksync/zkDeployProxy.js +38 -0
- package/dist/esm/contract/deployment/zksync/zkDeployProxy.js.map +1 -0
- package/dist/esm/exports/extensions/erc4337.js +14 -13
- package/dist/esm/exports/extensions/erc4337.js.map +1 -1
- package/dist/esm/exports/extensions/permissions.js +8 -8
- package/dist/esm/exports/extensions/permissions.js.map +1 -1
- package/dist/esm/exports/extensions/thirdweb.js +5 -0
- package/dist/esm/exports/extensions/thirdweb.js.map +1 -1
- package/dist/esm/extensions/erc4337/account/addAdmin.js +16 -1
- package/dist/esm/extensions/erc4337/account/addAdmin.js.map +1 -1
- package/dist/esm/extensions/erc4337/account/addSessionKey.js +16 -1
- package/dist/esm/extensions/erc4337/account/addSessionKey.js.map +1 -1
- package/dist/esm/extensions/erc4337/account/removeAdmin.js +16 -1
- package/dist/esm/extensions/erc4337/account/removeAdmin.js.map +1 -1
- package/dist/esm/extensions/erc4337/account/removeSessionKey.js +16 -1
- package/dist/esm/extensions/erc4337/account/removeSessionKey.js.map +1 -1
- package/dist/esm/extensions/permissions/read/getAllMembers.js +19 -2
- package/dist/esm/extensions/permissions/read/getAllMembers.js.map +1 -1
- package/dist/esm/extensions/permissions/read/getRoleAdmin.js +1 -0
- package/dist/esm/extensions/permissions/read/getRoleAdmin.js.map +1 -1
- package/dist/esm/extensions/permissions/read/getRoleMember.js +1 -0
- package/dist/esm/extensions/permissions/read/getRoleMember.js.map +1 -1
- package/dist/esm/extensions/permissions/read/getRoleMemberCount.js +1 -0
- package/dist/esm/extensions/permissions/read/getRoleMemberCount.js.map +1 -1
- package/dist/esm/extensions/permissions/read/hasRole.js +1 -0
- package/dist/esm/extensions/permissions/read/hasRole.js.map +1 -1
- package/dist/esm/extensions/permissions/write/{grant.js → grantRole.js} +2 -1
- package/dist/esm/extensions/permissions/write/grantRole.js.map +1 -0
- package/dist/esm/extensions/permissions/write/renounceRole.js +1 -0
- package/dist/esm/extensions/permissions/write/renounceRole.js.map +1 -1
- package/dist/esm/extensions/permissions/write/revokeRole.js +1 -0
- package/dist/esm/extensions/permissions/write/revokeRole.js.map +1 -1
- package/dist/esm/extensions/prebuilts/deploy-published.js +39 -13
- package/dist/esm/extensions/prebuilts/deploy-published.js.map +1 -1
- package/dist/esm/extensions/thirdweb/read/contractType.js +45 -0
- package/dist/esm/extensions/thirdweb/read/contractType.js.map +1 -0
- package/dist/esm/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.js +30 -0
- package/dist/esm/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.js.map +1 -0
- package/dist/esm/react/web/hooks/transaction/useSendTransaction.js +6 -5
- package/dist/esm/react/web/hooks/transaction/useSendTransaction.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/ConnectButton.js +3 -0
- package/dist/esm/react/web/ui/ConnectWallet/ConnectButton.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/Details.js +37 -30
- package/dist/esm/react/web/ui/ConnectWallet/Details.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +23 -18
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js +41 -24
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js +12 -2
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.js +2 -2
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js +17 -12
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js.map +1 -1
- package/dist/esm/stories/ConnectButton/hideButtons.stories.js +71 -0
- package/dist/esm/stories/ConnectButton/hideButtons.stories.js.map +1 -0
- package/dist/esm/stories/{ConnectButton.stories.js → ConnectButton/themes.stories.js} +4 -5
- package/dist/esm/stories/ConnectButton/themes.stories.js.map +1 -0
- package/dist/esm/transaction/actions/send-transaction.js +8 -0
- package/dist/esm/transaction/actions/send-transaction.js.map +1 -1
- package/dist/esm/transaction/actions/zksync/getEip721Domain.js +4 -3
- package/dist/esm/transaction/actions/zksync/getEip721Domain.js.map +1 -1
- package/dist/esm/transaction/extract-error.js +4 -2
- package/dist/esm/transaction/extract-error.js.map +1 -1
- package/dist/esm/utils/abi/encodeAbiParameters.js +1 -1
- package/dist/esm/utils/abi/encodeAbiParameters.js.map +1 -1
- package/dist/esm/utils/any-evm/deploy-metadata.js +9 -2
- package/dist/esm/utils/any-evm/deploy-metadata.js.map +1 -1
- package/dist/esm/utils/any-evm/zksync/computeDeploymentAddress.js +12 -0
- package/dist/esm/utils/any-evm/zksync/computeDeploymentAddress.js.map +1 -0
- package/dist/esm/utils/any-evm/zksync/constants.js +40 -0
- package/dist/esm/utils/any-evm/zksync/constants.js.map +1 -0
- package/dist/esm/utils/any-evm/zksync/create2Address.js +18 -0
- package/dist/esm/utils/any-evm/zksync/create2Address.js.map +1 -0
- package/dist/esm/utils/any-evm/zksync/isZkSyncChain.js +7 -0
- package/dist/esm/utils/any-evm/zksync/isZkSyncChain.js.map +1 -0
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/esm/wallets/smart/index.js +2 -2
- package/dist/esm/wallets/smart/index.js.map +1 -1
- package/dist/esm/wallets/smart/lib/utils.js +0 -6
- package/dist/esm/wallets/smart/lib/utils.js.map +1 -1
- package/dist/types/contract/deployment/deploy-via-autofactory.d.ts.map +1 -1
- package/dist/types/contract/deployment/publisher.d.ts.map +1 -1
- package/dist/types/contract/deployment/utils/bootstrap.d.ts +4 -2
- package/dist/types/contract/deployment/utils/bootstrap.d.ts.map +1 -1
- package/dist/types/contract/deployment/zksync/zkDeployContract.d.ts +12 -0
- package/dist/types/contract/deployment/zksync/zkDeployContract.d.ts.map +1 -0
- package/dist/types/contract/deployment/zksync/zkDeployCreate2Factory.d.ts +6 -0
- package/dist/types/contract/deployment/zksync/zkDeployCreate2Factory.d.ts.map +1 -0
- package/dist/types/contract/deployment/zksync/zkDeployDeterministic.d.ts +13 -0
- package/dist/types/contract/deployment/zksync/zkDeployDeterministic.d.ts.map +1 -0
- package/dist/types/contract/deployment/zksync/zkDeployProxy.d.ts +12 -0
- package/dist/types/contract/deployment/zksync/zkDeployProxy.d.ts.map +1 -0
- package/dist/types/exports/extensions/erc4337.d.ts +14 -13
- package/dist/types/exports/extensions/erc4337.d.ts.map +1 -1
- package/dist/types/exports/extensions/permissions.d.ts +8 -8
- package/dist/types/exports/extensions/permissions.d.ts.map +1 -1
- package/dist/types/exports/extensions/thirdweb.d.ts +1 -0
- package/dist/types/exports/extensions/thirdweb.d.ts.map +1 -1
- package/dist/types/extensions/erc4337/account/addAdmin.d.ts +13 -0
- package/dist/types/extensions/erc4337/account/addAdmin.d.ts.map +1 -1
- package/dist/types/extensions/erc4337/account/addSessionKey.d.ts +13 -0
- package/dist/types/extensions/erc4337/account/addSessionKey.d.ts.map +1 -1
- package/dist/types/extensions/erc4337/account/removeAdmin.d.ts +13 -0
- package/dist/types/extensions/erc4337/account/removeAdmin.d.ts.map +1 -1
- package/dist/types/extensions/erc4337/account/removeSessionKey.d.ts +13 -0
- package/dist/types/extensions/erc4337/account/removeSessionKey.d.ts.map +1 -1
- package/dist/types/extensions/permissions/read/getAllMembers.d.ts +13 -0
- package/dist/types/extensions/permissions/read/getAllMembers.d.ts.map +1 -1
- package/dist/types/extensions/permissions/read/getRoleAdmin.d.ts +1 -0
- package/dist/types/extensions/permissions/read/getRoleAdmin.d.ts.map +1 -1
- package/dist/types/extensions/permissions/read/getRoleMember.d.ts +1 -0
- package/dist/types/extensions/permissions/read/getRoleMember.d.ts.map +1 -1
- package/dist/types/extensions/permissions/read/getRoleMemberCount.d.ts +1 -0
- package/dist/types/extensions/permissions/read/getRoleMemberCount.d.ts.map +1 -1
- package/dist/types/extensions/permissions/read/hasRole.d.ts +1 -0
- package/dist/types/extensions/permissions/read/hasRole.d.ts.map +1 -1
- package/dist/types/extensions/permissions/write/{grant.d.ts → grantRole.d.ts} +2 -1
- package/dist/types/extensions/permissions/write/grantRole.d.ts.map +1 -0
- package/dist/types/extensions/permissions/write/renounceRole.d.ts +1 -0
- package/dist/types/extensions/permissions/write/renounceRole.d.ts.map +1 -1
- package/dist/types/extensions/permissions/write/revokeRole.d.ts +1 -0
- package/dist/types/extensions/permissions/write/revokeRole.d.ts.map +1 -1
- package/dist/types/extensions/prebuilts/deploy-published.d.ts.map +1 -1
- package/dist/types/extensions/thirdweb/read/contractType.d.ts +31 -0
- package/dist/types/extensions/thirdweb/read/contractType.d.ts.map +1 -0
- package/dist/types/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.d.ts +61 -0
- package/dist/types/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.d.ts.map +1 -0
- package/dist/types/react/core/hooks/connection/ConnectButtonProps.d.ts +18 -0
- package/dist/types/react/core/hooks/connection/ConnectButtonProps.d.ts.map +1 -1
- package/dist/types/react/web/hooks/transaction/useSendTransaction.d.ts +6 -5
- package/dist/types/react/web/hooks/transaction/useSendTransaction.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/Details.d.ts +3 -0
- package/dist/types/react/web/ui/ConnectWallet/Details.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.d.ts +28 -7
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.d.ts +6 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.d.ts +0 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.d.ts.map +1 -1
- package/dist/types/stories/ConnectButton/hideButtons.stories.d.ts +23 -0
- package/dist/types/stories/ConnectButton/hideButtons.stories.d.ts.map +1 -0
- package/dist/types/stories/{ConnectButton.stories.d.ts → ConnectButton/themes.stories.d.ts} +3 -4
- package/dist/types/stories/ConnectButton/themes.stories.d.ts.map +1 -0
- package/dist/types/transaction/actions/send-transaction.d.ts.map +1 -1
- package/dist/types/transaction/actions/zksync/getEip721Domain.d.ts.map +1 -1
- package/dist/types/transaction/extract-error.d.ts.map +1 -1
- package/dist/types/utils/any-evm/deploy-metadata.d.ts.map +1 -1
- package/dist/types/utils/any-evm/zksync/computeDeploymentAddress.d.ts +11 -0
- package/dist/types/utils/any-evm/zksync/computeDeploymentAddress.d.ts.map +1 -0
- package/dist/types/utils/any-evm/zksync/constants.d.ts +29 -0
- package/dist/types/utils/any-evm/zksync/constants.d.ts.map +1 -0
- package/dist/types/utils/any-evm/zksync/create2Address.d.ts +9 -0
- package/dist/types/utils/any-evm/zksync/create2Address.d.ts.map +1 -0
- package/dist/types/utils/any-evm/zksync/isZkSyncChain.d.ts +3 -0
- package/dist/types/utils/any-evm/zksync/isZkSyncChain.d.ts.map +1 -0
- package/dist/types/utils/domains.d.ts +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/dist/types/wallets/smart/index.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/utils.d.ts +0 -2
- package/dist/types/wallets/smart/lib/utils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/contract/deployment/deploy-via-autofactory.ts +13 -0
- package/src/contract/deployment/publisher.ts +5 -0
- package/src/contract/deployment/utils/bootstrap.ts +56 -3
- package/src/contract/deployment/zksync/zkDeployContract.ts +52 -0
- package/src/contract/deployment/zksync/zkDeployCreate2Factory.ts +65 -0
- package/src/contract/deployment/zksync/zkDeployDeterministic.ts +106 -0
- package/src/contract/deployment/zksync/zkDeployProxy.ts +55 -0
- package/src/exports/extensions/erc4337.ts +35 -7
- package/src/exports/extensions/permissions.ts +9 -1
- package/src/exports/extensions/thirdweb.ts +10 -0
- package/src/extensions/erc4337/account/addAdmin.ts +20 -1
- package/src/extensions/erc4337/account/addSessionKey.ts +20 -1
- package/src/extensions/erc4337/account/removeAdmin.ts +20 -1
- package/src/extensions/erc4337/account/removeSessionKey.ts +20 -1
- package/src/extensions/permissions/permissions.test.ts +1 -1
- package/src/extensions/permissions/read/getAllMembers.ts +30 -2
- package/src/extensions/permissions/read/getRoleAdmin.ts +2 -0
- package/src/extensions/permissions/read/getRoleMember.ts +2 -0
- package/src/extensions/permissions/read/getRoleMemberCount.ts +2 -0
- package/src/extensions/permissions/read/hasRole.ts +2 -0
- package/src/extensions/permissions/write/{grant.ts → grantRole.ts} +2 -0
- package/src/extensions/permissions/write/renounceRole.ts +2 -0
- package/src/extensions/permissions/write/revokeRole.ts +2 -0
- package/src/extensions/prebuilts/deploy-published.ts +58 -26
- package/src/extensions/thirdweb/read/contractType.ts +46 -0
- package/src/extensions/zksync/__generated__/ContractDeployer/events/ContractDeployed.ts +55 -0
- package/src/react/core/hooks/connection/ConnectButtonProps.ts +21 -0
- package/src/react/web/hooks/transaction/useSendTransaction.tsx +6 -5
- package/src/react/web/ui/ConnectWallet/ConnectButton.tsx +3 -0
- package/src/react/web/ui/ConnectWallet/Details.tsx +108 -73
- package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx +37 -29
- package/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts +73 -33
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx +37 -2
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.tsx +5 -10
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx +27 -20
- package/src/stories/ConnectButton/hideButtons.stories.tsx +83 -0
- package/src/stories/{ConnectButton.stories.ts → ConnectButton/themes.stories.tsx} +3 -4
- package/src/transaction/actions/send-transaction.ts +11 -0
- package/src/transaction/actions/to-serializable-transaction.test.ts +3 -4
- package/src/transaction/actions/zksync/getEip721Domain.ts +4 -2
- package/src/transaction/actions/zksync/send-eip712-transaction.test.ts +27 -2
- package/src/transaction/extract-error.ts +7 -2
- package/src/utils/abi/encode-abi-parameters.test.ts +1 -1
- package/src/utils/abi/encodeAbiParameters.ts +1 -1
- package/src/utils/any-evm/deploy-metadata.ts +11 -2
- package/src/utils/any-evm/zksync/computeDeploymentAddress.ts +24 -0
- package/src/utils/any-evm/zksync/constants.ts +49 -0
- package/src/utils/any-evm/zksync/create2Address.ts +26 -0
- package/src/utils/any-evm/zksync/isZkSyncChain.ts +10 -0
- package/src/utils/domains.ts +1 -1
- package/src/version.ts +1 -1
- package/src/wallets/smart/index.ts +2 -3
- package/src/wallets/smart/lib/utils.ts +0 -10
- package/dist/cjs/extensions/permissions/write/grant.js.map +0 -1
- package/dist/cjs/stories/ConnectButton.stories.js.map +0 -1
- package/dist/esm/extensions/permissions/write/grant.js.map +0 -1
- package/dist/esm/stories/ConnectButton.stories.js.map +0 -1
- package/dist/types/extensions/permissions/write/grant.d.ts.map +0 -1
- package/dist/types/stories/ConnectButton.stories.d.ts.map +0 -1
@@ -5,16 +5,16 @@ import { useDebouncedValue } from "../../../../hooks/useDebouncedValue.js";
|
|
5
5
|
import { NATIVE_TOKEN } from "../../nativeToken.js";
|
6
6
|
import { currencies, usdCurrency, } from "../fiat/currencies.js";
|
7
7
|
// handle states for token and chain selection
|
8
|
-
export function
|
9
|
-
const activeChain = useActiveWalletChain();
|
8
|
+
export function useToTokenSelectionStates(options) {
|
10
9
|
const { payOptions, supportedDestinations } = options;
|
10
|
+
// --------------------------------------------------------------------------
|
11
11
|
// buy token amount ---------------------------------------------------------
|
12
12
|
// NOTE - for transaction / direct payment modes, the token amount is set when the user tap continue
|
13
13
|
const prefillBuy = payOptions?.prefillBuy;
|
14
|
+
const activeChain = useActiveWalletChain();
|
14
15
|
const initialTokenAmount = prefillBuy?.amount || "";
|
15
16
|
const [tokenAmount, setTokenAmount] = useState(initialTokenAmount);
|
16
17
|
const deferredTokenAmount = useDebouncedValue(tokenAmount, 300);
|
17
|
-
// --------------------------------------------------------------------------
|
18
18
|
// Destination chain and token selection -----------------------------------
|
19
19
|
const [toChain, setToChain] = useState(
|
20
20
|
// use prefill chain if available
|
@@ -29,23 +29,51 @@ export function useUISelectionStates(options) {
|
|
29
29
|
const [toToken, setToToken] = useState(prefillBuy?.token ||
|
30
30
|
(payOptions.mode === "direct_payment" && payOptions.paymentInfo.token) ||
|
31
31
|
NATIVE_TOKEN);
|
32
|
+
return {
|
33
|
+
toChain,
|
34
|
+
setToChain,
|
35
|
+
toToken,
|
36
|
+
setToToken,
|
37
|
+
tokenAmount,
|
38
|
+
setTokenAmount,
|
39
|
+
deferredTokenAmount,
|
40
|
+
};
|
41
|
+
}
|
42
|
+
export function useFromTokenSelectionStates(options) {
|
43
|
+
const { payOptions, supportedSources } = options;
|
32
44
|
// --------------------------------------------------------------------------
|
45
|
+
const firstSupportedSource = supportedSources?.length
|
46
|
+
? supportedSources[0]
|
47
|
+
: undefined;
|
33
48
|
// Source token and chain selection ---------------------------------------------------
|
34
|
-
const [
|
49
|
+
const [fromChain_, setFromChain] = useState();
|
35
50
|
// use prefill chain if available
|
36
|
-
(payOptions.buyWithCrypto !== false &&
|
51
|
+
const fromChainDevSpecified = (payOptions.buyWithCrypto !== false &&
|
37
52
|
payOptions.buyWithCrypto?.prefillSource?.chain) ||
|
38
53
|
(payOptions.mode === "transaction" && payOptions.transaction?.chain) ||
|
39
|
-
(payOptions.mode === "direct_payment" && payOptions.paymentInfo?.chain)
|
40
|
-
|
41
|
-
|
42
|
-
|
54
|
+
(payOptions.mode === "direct_payment" && payOptions.paymentInfo?.chain);
|
55
|
+
const fromChainFromApi = firstSupportedSource?.chain
|
56
|
+
? firstSupportedSource.chain
|
57
|
+
: undefined;
|
58
|
+
const fromChain = fromChain_ || fromChainDevSpecified || fromChainFromApi || polygon;
|
59
|
+
const [fromToken_, setFromToken] = useState();
|
43
60
|
// use prefill token if available
|
44
|
-
(payOptions.buyWithCrypto !== false &&
|
61
|
+
const fromTokenDevSpecified = (payOptions.buyWithCrypto !== false &&
|
45
62
|
payOptions.buyWithCrypto?.prefillSource?.token) ||
|
46
|
-
(payOptions.mode === "direct_payment" && payOptions.paymentInfo.token)
|
47
|
-
|
48
|
-
|
63
|
+
(payOptions.mode === "direct_payment" && payOptions.paymentInfo.token);
|
64
|
+
// May be updated in the future
|
65
|
+
const fromTokenFromApi = NATIVE_TOKEN;
|
66
|
+
// supported tokens query in here
|
67
|
+
const fromToken = fromToken_ || fromTokenDevSpecified || fromTokenFromApi || NATIVE_TOKEN;
|
68
|
+
return {
|
69
|
+
fromChain,
|
70
|
+
setFromChain,
|
71
|
+
fromToken,
|
72
|
+
setFromToken,
|
73
|
+
};
|
74
|
+
}
|
75
|
+
export function useFiatCurrencySelectionStates(options) {
|
76
|
+
const { payOptions } = options;
|
49
77
|
// --------------------------------------------------------------------------
|
50
78
|
const devSpecifiedDefaultCurrency = payOptions.buyWithFiat !== false
|
51
79
|
? payOptions.buyWithFiat?.prefillSource?.currency
|
@@ -54,17 +82,6 @@ export function useUISelectionStates(options) {
|
|
54
82
|
const [selectedCurrency, setSelectedCurrency] = useState(currencies.find((x) => x.shorthand === defaultSelectedCurrencyShorthand) ||
|
55
83
|
usdCurrency);
|
56
84
|
return {
|
57
|
-
tokenAmount,
|
58
|
-
setTokenAmount,
|
59
|
-
toChain,
|
60
|
-
setToChain,
|
61
|
-
deferredTokenAmount,
|
62
|
-
fromChain,
|
63
|
-
setFromChain,
|
64
|
-
toToken,
|
65
|
-
setToToken,
|
66
|
-
fromToken,
|
67
|
-
setFromToken,
|
68
85
|
selectedCurrency,
|
69
86
|
setSelectedCurrency,
|
70
87
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useUISelectionStates.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,0DAA0D,CAAC;AAMnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAC;AACpG,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAA2B,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAEL,UAAU,EACV,WAAW,GACZ,MAAM,uBAAuB,CAAC;
|
1
|
+
{"version":3,"file":"useUISelectionStates.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts"],"names":[],"mappings":"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"}
|
@@ -20,7 +20,6 @@ import { Text } from "../../../../components/text.js";
|
|
20
20
|
import { StyledDiv } from "../../../../design-system/elements.js";
|
21
21
|
import { PayTokenIcon } from "../PayTokenIcon.js";
|
22
22
|
import { Step } from "../Stepper.js";
|
23
|
-
import { SwapFees } from "./Fees.js";
|
24
23
|
import { formatSeconds } from "./formatSeconds.js";
|
25
24
|
import { addPendingTx } from "./pendingSwapTx.js";
|
26
25
|
/**
|
@@ -35,7 +34,7 @@ export function SwapConfirmationScreen(props) {
|
|
35
34
|
const sender = props.quote.swapDetails.fromAddress;
|
36
35
|
const isDifferentRecipient = receiver.toLowerCase() !== sender.toLowerCase();
|
37
36
|
const ensName = useEnsName({ client: props.client, address: receiver });
|
38
|
-
return (_jsxs(Container, { p: "lg", children: [_jsx(ModalHeader, { title: props.title, onBack: props.onBack }), props.isFiatFlow ? (_jsxs(_Fragment, { children: [_jsx(Spacer, { y: "lg" }), _jsx(StepBar, { steps: 2, currentStep: 2 }), _jsx(Spacer, { y: "sm" }), _jsxs(Text, { size: "xs", children: ["Step 2 of 2 - Converting ", props.fromTokenSymbol, " to", " ", props.toTokenSymbol] }), _jsx(Spacer, { y: "md" })] })) : (_jsx(Spacer, { y: "lg" })), _jsx(ConfirmItem, { label: "Pay", children: _jsx(RenderTokenInfo, { chain: props.fromChain, amount: String(formatNumber(Number(props.fromAmount), 6)), symbol: props.fromTokenSymbol || "", token: props.fromToken, client: props.client }) }), !isDifferentRecipient && (_jsx(ConfirmItem, { label: "Receive", children: _jsx(RenderTokenInfo, { chain: props.toChain, amount: String(formatNumber(Number(props.toAmount), 6)), symbol: props.toTokenSymbol, token: props.toToken, client: props.client }) })), _jsx(ConfirmItem, { label: "Fees", children: _jsx(
|
37
|
+
return (_jsxs(Container, { p: "lg", children: [_jsx(ModalHeader, { title: props.title, onBack: props.onBack }), props.isFiatFlow ? (_jsxs(_Fragment, { children: [_jsx(Spacer, { y: "lg" }), _jsx(StepBar, { steps: 2, currentStep: 2 }), _jsx(Spacer, { y: "sm" }), _jsxs(Text, { size: "xs", children: ["Step 2 of 2 - Converting ", props.fromTokenSymbol, " to", " ", props.toTokenSymbol] }), _jsx(Spacer, { y: "md" })] })) : (_jsx(Spacer, { y: "lg" })), _jsx(ConfirmItem, { label: "Pay", children: _jsx(RenderTokenInfo, { chain: props.fromChain, amount: String(formatNumber(Number(props.fromAmount), 6)), symbol: props.fromTokenSymbol || "", token: props.fromToken, client: props.client }) }), !isDifferentRecipient && (_jsx(ConfirmItem, { label: "Receive", children: _jsx(RenderTokenInfo, { chain: props.toChain, amount: String(formatNumber(Number(props.toAmount), 6)), symbol: props.toTokenSymbol, token: props.toToken, client: props.client }) })), _jsx(ConfirmItem, { label: "Fees", children: _jsx(SwapFeesRightAligned, { quote: props.quote }) }), _jsx(ConfirmItem, { label: "Time", children: _jsxs(Text, { size: "sm", color: "primaryText", children: ["~", formatSeconds(props.quote.swapDetails.estimated.durationSeconds || 0)] }) }), isDifferentRecipient && (_jsx(ConfirmItem, { label: "Seller", children: _jsx(Text, { color: "primaryText", size: "sm", children: ensName.data || shortenAddress(receiver) }) })), _jsx(Spacer, { y: "xl" }), isApprovalRequired && (_jsxs(_Fragment, { children: [_jsx(Spacer, { y: "sm" }), _jsxs(Container, { gap: "sm", flex: "row", style: {
|
39
38
|
justifyContent: "space-between",
|
40
39
|
}, center: "y", color: "accentText", children: [_jsx(Step, { isDone: step === "swap", isActive: step === "approval", label: step === "approval" ? "Approve" : "Approved" }), _jsx(ConnectorLine, {}), _jsx(Step, { isDone: false, label: "Confirm", isActive: step === "swap" })] }), _jsx(Spacer, { y: "lg" })] })), status === "error" && (_jsxs(_Fragment, { children: [_jsxs(Container, { flex: "row", gap: "xs", center: "both", color: "danger", children: [_jsx(CrossCircledIcon, { width: iconSize.sm, height: iconSize.sm }), _jsx(Text, { color: "danger", size: "sm", children: step === "approval" ? "Failed to Approve" : "Failed to Confirm" })] }), _jsx(Spacer, { y: "md" })] })), props.payer.chain.id !== props.fromChain.id ? (_jsx(SwitchNetworkButton, { fullWidth: true, variant: "accent", switchChain: async () => {
|
41
40
|
await props.payer.wallet.switchChain(props.fromChain);
|
@@ -111,4 +110,15 @@ function ConfirmItem(props) {
|
|
111
110
|
justifyContent: "space-between",
|
112
111
|
}, children: [_jsx(Text, { size: "sm", color: "secondaryText", children: props.label }), props.children] }), _jsx(Line, {})] }));
|
113
112
|
}
|
113
|
+
/**
|
114
|
+
* @internal
|
115
|
+
*/
|
116
|
+
export function SwapFeesRightAligned(props) {
|
117
|
+
return (_jsx(Container, { flex: "column", gap: "xs", style: {
|
118
|
+
alignItems: "flex-end",
|
119
|
+
}, children: props.quote.processingFees.map((fee) => {
|
120
|
+
const feeAmount = formatNumber(Number(fee.amount), 6);
|
121
|
+
return (_jsxs(Container, { flex: "row", gap: "xxs", children: [_jsxs(Text, { color: "primaryText", size: "sm", children: [feeAmount === 0 ? "~" : "", feeAmount, " ", fee.token.symbol] }), _jsxs(Text, { color: "secondaryText", size: "sm", children: ["($", (fee.amountUSDCents / 100).toFixed(2), ")"] })] }, `${fee.token.chainId}_${fee.token.tokenAddress}_${feeAmount}`));
|
122
|
+
}) }));
|
123
|
+
}
|
114
124
|
//# sourceMappingURL=ConfirmationScreen.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ConfirmationScreen.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIjC,OAAO,EAAE,eAAe,EAAE,MAAM,8DAA8D,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,6DAA6D,CAAC;AAC7F,OAAO,EACL,QAAQ,EACR,QAAQ,GACT,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,sDAAsD,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"ConfirmationScreen.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx"],"names":[],"mappings":"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"}
|
@@ -8,10 +8,10 @@ import { Text } from "../../../../components/text.js";
|
|
8
8
|
*/
|
9
9
|
export function SwapFees(props) {
|
10
10
|
return (_jsx(Container, { flex: "column", gap: "xs", style: {
|
11
|
-
alignItems:
|
11
|
+
alignItems: "flex-start",
|
12
12
|
}, children: props.quote.processingFees.map((fee) => {
|
13
13
|
const feeAmount = formatNumber(Number(fee.amount), 6);
|
14
|
-
return (_jsxs(Container, { flex: "
|
14
|
+
return (_jsxs(Container, { flex: "row", gap: "xxs", children: [_jsxs(Text, { color: "primaryText", size: "sm", children: [feeAmount === 0 ? "~" : "", feeAmount, " ", fee.token.symbol] }), _jsxs(Text, { color: "secondaryText", size: "sm", children: ["($", (fee.amountUSDCents / 100).toFixed(2), ")"] })] }, `${fee.token.chainId}_${fee.token.tokenAddress}_${feeAmount}`));
|
15
15
|
}) }));
|
16
16
|
}
|
17
17
|
/**
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Fees.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAEtD;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,
|
1
|
+
{"version":3,"file":"Fees.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.tsx"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
2
|
-
import { CheckCircledIcon
|
2
|
+
import { CheckCircledIcon } from "@radix-ui/react-icons";
|
3
3
|
import { useState } from "react";
|
4
4
|
import { NATIVE_TOKEN_ADDRESS } from "../../../../../../../constants/addresses.js";
|
5
5
|
import { getContract } from "../../../../../../../contract/contract.js";
|
@@ -26,7 +26,7 @@ import { ConnectorLine } from "./ConfirmationScreen.js";
|
|
26
26
|
export function TransferConfirmationScreen(props) {
|
27
27
|
const { title, onBack, receiverAddress, client, payer, onDone, chain, token, tokenAmount, transactionMode, setTransactionHash, } = props;
|
28
28
|
const [step, setStep] = useState("transfer");
|
29
|
-
const [status, setStatus] = useState("idle");
|
29
|
+
const [status, setStatus] = useState({ id: "idle" });
|
30
30
|
const { symbol } = useChainSymbol(chain);
|
31
31
|
return (_jsxs(Container, { p: "lg", children: [_jsx(ModalHeader, { title: title, onBack: onBack }), _jsx(Spacer, { y: "xl" }), transactionMode && (_jsxs(_Fragment, { children: [_jsx(StepBar, { steps: 2, currentStep: step === "transfer" ? 1 : 2 }), _jsx(Spacer, { y: "sm" }), _jsx(Text, { size: "sm", children: step === "transfer"
|
32
32
|
? "Step 1 of 2 - Transfer funds"
|
@@ -36,15 +36,17 @@ export function TransferConfirmationScreen(props) {
|
|
36
36
|
justifyContent: "space-between",
|
37
37
|
}, children: [_jsx(Text, { size: "sm", children: "To" }), _jsx(WalletRow, { address: receiverAddress, client: client })] }), _jsx(Spacer, { y: "md" }), _jsx(Line, {}), _jsx(Spacer, { y: "md" }), _jsx(TokenInfoRow, { chainId: chain.id, client: client, label: "Amount", tokenAmount: tokenAmount, tokenSymbol: isNativeToken(token) ? symbol || "" : token.symbol, tokenAddress: isNativeToken(token) ? NATIVE_TOKEN_ADDRESS : token.address }), _jsx(Spacer, { y: "lg" }), transactionMode && (_jsxs(_Fragment, { children: [_jsx(Spacer, { y: "sm" }), _jsxs(Container, { gap: "sm", flex: "row", style: {
|
38
38
|
justifyContent: "space-between",
|
39
|
-
}, center: "y", color: "accentText", children: [_jsx(Step, { isDone: step === "execute", isActive: step === "transfer", label: step === "transfer" ? "Transfer" : "Done" }), _jsx(ConnectorLine, {}), _jsx(Step, { isDone: false, label: "Finalize", isActive: step === "execute" })] }), _jsx(Spacer, { y: "lg" })] })), status === "error" && (_jsxs(_Fragment, { children: [
|
39
|
+
}, center: "y", color: "accentText", children: [_jsx(Step, { isDone: step === "execute", isActive: step === "transfer", label: step === "transfer" ? "Transfer" : "Done" }), _jsx(ConnectorLine, {}), _jsx(Step, { isDone: false, label: "Finalize", isActive: step === "execute" })] }), _jsx(Spacer, { y: "lg" })] })), status.id === "error" && (_jsxs(_Fragment, { children: [_jsx(Container, { flex: "row", gap: "xs", center: "both", color: "danger", children: _jsx(Text, { color: "danger", size: "sm", style: { textAlign: "center" }, children: step === "transfer"
|
40
|
+
? `${status.error || "Failed to Transfer"}`
|
41
|
+
: "Failed to Execute" }) }), _jsx(Spacer, { y: "md" })] })), !transactionMode && step === "execute" && status.id === "done" && (_jsxs(_Fragment, { children: [_jsxs(Container, { flex: "row", gap: "xs", center: "both", color: "success", children: [_jsx(CheckCircledIcon, { width: iconSize.sm, height: iconSize.sm }), _jsx(Text, { color: "success", size: "sm", children: "Payment completed" })] }), _jsx(Spacer, { y: "md" })] })), payer.chain.id !== chain.id ? (_jsx(SwitchNetworkButton, { fullWidth: true, variant: "accent", switchChain: async () => {
|
40
42
|
await props.payer.wallet.switchChain(chain);
|
41
|
-
} })) : (_jsxs(Button, { variant: "accent", fullWidth: true, disabled: status === "pending", onClick: async () => {
|
43
|
+
} })) : (_jsxs(Button, { variant: "accent", fullWidth: true, disabled: status.id === "pending", onClick: async () => {
|
42
44
|
if (step === "execute") {
|
43
45
|
onDone();
|
44
46
|
return;
|
45
47
|
}
|
46
48
|
try {
|
47
|
-
setStatus("pending");
|
49
|
+
setStatus({ id: "pending" });
|
48
50
|
// TRANSACTION MODE = transfer funds to another one of your wallets before executing the tx
|
49
51
|
if (transactionMode) {
|
50
52
|
const transaction = isNativeToken(token)
|
@@ -69,7 +71,7 @@ export function TransferConfirmationScreen(props) {
|
|
69
71
|
});
|
70
72
|
// switch to execute step
|
71
73
|
setStep("execute");
|
72
|
-
setStatus("idle");
|
74
|
+
setStatus({ id: "idle" });
|
73
75
|
}
|
74
76
|
else {
|
75
77
|
const transferResponse = await getBuyWithCryptoTransfer({
|
@@ -83,7 +85,6 @@ export function TransferConfirmationScreen(props) {
|
|
83
85
|
amount: tokenAmount,
|
84
86
|
purchaseData: undefined, // TODO (pay): add purchase data
|
85
87
|
});
|
86
|
-
console.log("transferResponse", transferResponse);
|
87
88
|
if (transferResponse.approval) {
|
88
89
|
setStep("approve");
|
89
90
|
// approve the transfer
|
@@ -101,15 +102,19 @@ export function TransferConfirmationScreen(props) {
|
|
101
102
|
});
|
102
103
|
// switches to the status polling screen
|
103
104
|
setTransactionHash(tx.transactionHash);
|
104
|
-
setStatus("idle");
|
105
|
+
setStatus({ id: "idle" });
|
105
106
|
}
|
107
|
+
// biome-ignore lint/suspicious/noExplicitAny: catch multiple errors
|
106
108
|
}
|
107
109
|
catch (e) {
|
108
110
|
console.error(e);
|
109
|
-
setStatus(
|
111
|
+
setStatus({
|
112
|
+
id: "error",
|
113
|
+
error: "error" in e ? e.error?.message : e?.message,
|
114
|
+
});
|
110
115
|
}
|
111
|
-
}, gap: "xs", children: [step === "execute" && (status === "done" ? "Done" : "Continue"), step === "transfer" &&
|
112
|
-
(status === "pending" ? "Confirming" : "Confirm"), step === "approve" &&
|
113
|
-
(status === "pending" ? "Approving" : "Approve"), status === "pending" && (_jsx(Spinner, { size: "sm", color: "accentButtonText" }))] }))] }));
|
116
|
+
}, gap: "xs", children: [step === "execute" && (status.id === "done" ? "Done" : "Continue"), step === "transfer" &&
|
117
|
+
(status.id === "pending" ? "Confirming" : "Confirm"), step === "approve" &&
|
118
|
+
(status.id === "pending" ? "Approving" : "Approve"), status.id === "pending" && (_jsx(Spinner, { size: "sm", color: "accentButtonText" }))] }))] }));
|
114
119
|
}
|
115
120
|
//# sourceMappingURL=TransferConfirmationScreen.js.map
|
package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"TransferConfirmationScreen.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,
|
1
|
+
{"version":3,"file":"TransferConfirmationScreen.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,71 @@
|
|
1
|
+
import { ConnectButton } from "../../react/web/ui/ConnectWallet/ConnectButton.js";
|
2
|
+
import { storyClient } from "../utils.js";
|
3
|
+
const meta = {
|
4
|
+
title: "Connect/ConnectButton/hide buttons",
|
5
|
+
component: ConnectButton,
|
6
|
+
parameters: {
|
7
|
+
layout: "centered",
|
8
|
+
},
|
9
|
+
args: {
|
10
|
+
client: storyClient,
|
11
|
+
},
|
12
|
+
};
|
13
|
+
export const Default = {
|
14
|
+
args: {},
|
15
|
+
};
|
16
|
+
export const HideSend = {
|
17
|
+
args: {
|
18
|
+
detailsModal: {
|
19
|
+
hideSendFunds: true,
|
20
|
+
},
|
21
|
+
},
|
22
|
+
};
|
23
|
+
export const HideReceive = {
|
24
|
+
args: {
|
25
|
+
detailsModal: {
|
26
|
+
hideReceiveFunds: true,
|
27
|
+
},
|
28
|
+
},
|
29
|
+
};
|
30
|
+
export const HideBuy = {
|
31
|
+
args: {
|
32
|
+
detailsModal: {
|
33
|
+
hideBuyFunds: true,
|
34
|
+
},
|
35
|
+
},
|
36
|
+
};
|
37
|
+
export const HideSendReceive = {
|
38
|
+
args: {
|
39
|
+
detailsModal: {
|
40
|
+
hideSendFunds: true,
|
41
|
+
hideReceiveFunds: true,
|
42
|
+
},
|
43
|
+
},
|
44
|
+
};
|
45
|
+
export const HideSendBuy = {
|
46
|
+
args: {
|
47
|
+
detailsModal: {
|
48
|
+
hideSendFunds: true,
|
49
|
+
hideBuyFunds: true,
|
50
|
+
},
|
51
|
+
},
|
52
|
+
};
|
53
|
+
export const HideReceiveBuy = {
|
54
|
+
args: {
|
55
|
+
detailsModal: {
|
56
|
+
hideReceiveFunds: true,
|
57
|
+
hideBuyFunds: true,
|
58
|
+
},
|
59
|
+
},
|
60
|
+
};
|
61
|
+
export const HideSendReceiveBuy = {
|
62
|
+
args: {
|
63
|
+
detailsModal: {
|
64
|
+
hideSendFunds: true,
|
65
|
+
hideReceiveFunds: true,
|
66
|
+
hideBuyFunds: true,
|
67
|
+
},
|
68
|
+
},
|
69
|
+
};
|
70
|
+
export default meta;
|
71
|
+
//# sourceMappingURL=hideButtons.stories.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"hideButtons.stories.js","sourceRoot":"","sources":["../../../../src/stories/ConnectButton/hideButtons.stories.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,IAAI,GAAG;IACX,KAAK,EAAE,oCAAoC;IAC3C,SAAS,EAAE,aAAa;IACxB,UAAU,EAAE;QACV,MAAM,EAAE,UAAU;KACnB;IACD,IAAI,EAAE;QACJ,MAAM,EAAE,WAAW;KACpB;CACmC,CAAC;AAIvC,MAAM,CAAC,MAAM,OAAO,GAAU;IAC5B,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAU;IAC7B,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,aAAa,EAAE,IAAI;SACpB;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAU;IAChC,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,gBAAgB,EAAE,IAAI;SACvB;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAU;IAC5B,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,YAAY,EAAE,IAAI;SACnB;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAU;IACpC,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,aAAa,EAAE,IAAI;YACnB,gBAAgB,EAAE,IAAI;SACvB;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAU;IAChC,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,aAAa,EAAE,IAAI;YACnB,YAAY,EAAE,IAAI;SACnB;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAU;IACnC,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,gBAAgB,EAAE,IAAI;YACtB,YAAY,EAAE,IAAI;SACnB;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAU;IACvC,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,aAAa,EAAE,IAAI;YACnB,gBAAgB,EAAE,IAAI;YACtB,YAAY,EAAE,IAAI;SACnB;KACF;CACF,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
@@ -1,12 +1,11 @@
|
|
1
|
-
import { ConnectButton } from "
|
2
|
-
import { storyClient } from "
|
1
|
+
import { ConnectButton } from "../../react/web/ui/ConnectWallet/ConnectButton.js";
|
2
|
+
import { storyClient } from "../utils.js";
|
3
3
|
const meta = {
|
4
|
-
title: "Connect/ConnectButton",
|
4
|
+
title: "Connect/ConnectButton/themes",
|
5
5
|
component: ConnectButton,
|
6
6
|
parameters: {
|
7
7
|
layout: "centered",
|
8
8
|
},
|
9
|
-
tags: ["autodocs"],
|
10
9
|
args: {
|
11
10
|
client: storyClient,
|
12
11
|
},
|
@@ -22,4 +21,4 @@ export const Light = {
|
|
22
21
|
},
|
23
22
|
};
|
24
23
|
export default meta;
|
25
|
-
//# sourceMappingURL=
|
24
|
+
//# sourceMappingURL=themes.stories.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"themes.stories.js","sourceRoot":"","sources":["../../../../src/stories/ConnectButton/themes.stories.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,IAAI,GAAG;IACX,KAAK,EAAE,8BAA8B;IACrC,SAAS,EAAE,aAAa;IACxB,UAAU,EAAE;QACV,MAAM,EAAE,UAAU;KACnB;IACD,IAAI,EAAE;QACJ,MAAM,EAAE,WAAW;KACpB;CACmC,CAAC;AAIvC,MAAM,CAAC,MAAM,IAAI,GAAU;IACzB,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM;KACd;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAU;IAC1B,IAAI,EAAE;QACJ,KAAK,EAAE,OAAO;KACf;CACF,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
@@ -118,6 +118,14 @@ export async function sendTransaction(options) {
|
|
118
118
|
if (account.onTransactionRequested) {
|
119
119
|
await account.onTransactionRequested(transaction);
|
120
120
|
}
|
121
|
+
// if zksync transaction params are set, send with eip712
|
122
|
+
if (options.transaction.eip712) {
|
123
|
+
const { sendEip712Transaction } = await import("./zksync/send-eip712-transaction.js");
|
124
|
+
return sendEip712Transaction({
|
125
|
+
account,
|
126
|
+
transaction,
|
127
|
+
});
|
128
|
+
}
|
121
129
|
const serializableTransaction = await toSerializableTransaction({
|
122
130
|
transaction: transaction,
|
123
131
|
from: account.address,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"send-transaction.js","sourceRoot":"","sources":["../../../../src/transaction/actions/send-transaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAoB7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgHG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAA+B;IAE/B,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAElD,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;QACnC,MAAM,OAAO,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,uBAAuB,GAAG,MAAM,yBAAyB,CAAC;QAC9D,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,OAAO,CAAC,OAAO;KACtB,CAAC,CAAC;IAEH,kCAAkC;IAClC,IAAI,OAAO,EAAE,CAAC;QACZ,sFAAsF;QACtF,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAC7C,uCAAuC,CACxC,CAAC;QACF,OAAO,sBAAsB,CAAC;YAC5B,OAAO;YACP,WAAW;YACX,uBAAuB;YACvB,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;IACtE,wBAAwB;IACxB,qBAAqB,CAAC;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE;KAC9B,CAAC,CAAC;IACH,OAAO,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC;AAC7E,CAAC"}
|
1
|
+
{"version":3,"file":"send-transaction.js","sourceRoot":"","sources":["../../../../src/transaction/actions/send-transaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAoB7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgHG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAA+B;IAE/B,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAElD,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;QACnC,MAAM,OAAO,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,yDAAyD;IACzD,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAC5C,qCAAqC,CACtC,CAAC;QACF,OAAO,qBAAqB,CAAC;YAC3B,OAAO;YACP,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED,MAAM,uBAAuB,GAAG,MAAM,yBAAyB,CAAC;QAC9D,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,OAAO,CAAC,OAAO;KACtB,CAAC,CAAC;IAEH,kCAAkC;IAClC,IAAI,OAAO,EAAE,CAAC;QACZ,sFAAsF;QACtF,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAC7C,uCAAuC,CACxC,CAAC;QACF,OAAO,sBAAsB,CAAC;YAC5B,OAAO;YACP,WAAW;YACX,uBAAuB;YACvB,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;IACtE,wBAAwB;IACxB,qBAAqB,CAAC;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE;KAC9B,CAAC,CAAC;IACH,OAAO,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC;AAC7E,CAAC"}
|
@@ -1,3 +1,5 @@
|
|
1
|
+
import { hashBytecode } from "viem/zksync";
|
2
|
+
import { toHex } from "../../../utils/encoding/hex.js";
|
1
3
|
export const gasPerPubdataDefault = 50000n;
|
2
4
|
export const getEip712Domain = (transaction) => {
|
3
5
|
const message = transactionToMessage(transaction);
|
@@ -29,7 +31,7 @@ export const getEip712Domain = (transaction) => {
|
|
29
31
|
};
|
30
32
|
};
|
31
33
|
function transactionToMessage(transaction) {
|
32
|
-
const { gas, nonce, to, from, value, maxFeePerGas, maxPriorityFeePerGas, paymaster, paymasterInput, gasPerPubdata, data, } = transaction;
|
34
|
+
const { gas, nonce, to, from, value, maxFeePerGas, maxPriorityFeePerGas, paymaster, paymasterInput, gasPerPubdata, data, factoryDeps, } = transaction;
|
33
35
|
return {
|
34
36
|
txType: 113n,
|
35
37
|
from: BigInt(from),
|
@@ -42,8 +44,7 @@ function transactionToMessage(transaction) {
|
|
42
44
|
nonce: nonce ? BigInt(nonce) : 0n,
|
43
45
|
value: value ?? 0n,
|
44
46
|
data: data ? data : "0x0",
|
45
|
-
|
46
|
-
factoryDeps: [],
|
47
|
+
factoryDeps: factoryDeps?.map((dep) => toHex(hashBytecode(dep))) ?? [],
|
47
48
|
paymasterInput: paymasterInput ? paymasterInput : "0x",
|
48
49
|
};
|
49
50
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getEip721Domain.js","sourceRoot":"","sources":["../../../../../src/transaction/actions/zksync/getEip721Domain.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"getEip721Domain.js","sourceRoot":"","sources":["../../../../../src/transaction/actions/zksync/getEip721Domain.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,7 @@
|
|
1
1
|
import { decodeErrorResult } from "viem";
|
2
2
|
import { resolveContractAbi } from "../contract/actions/resolve-abi.js";
|
3
|
+
import { isHex } from "../utils/encoding/hex.js";
|
4
|
+
import { stringify } from "../utils/json.js";
|
3
5
|
/**
|
4
6
|
* @internal
|
5
7
|
*/
|
@@ -9,7 +11,7 @@ export async function extractError(args) {
|
|
9
11
|
// try to parse RPC error
|
10
12
|
const errorObj = error;
|
11
13
|
if (errorObj.data) {
|
12
|
-
if (errorObj.data !== "0x") {
|
14
|
+
if (errorObj.data !== "0x" && isHex(errorObj.data)) {
|
13
15
|
let abi = contract?.abi;
|
14
16
|
if (contract && !abi) {
|
15
17
|
abi = await resolveContractAbi(contract).catch(() => undefined);
|
@@ -20,7 +22,7 @@ export async function extractError(args) {
|
|
20
22
|
});
|
21
23
|
return new TransactionError(`${parsedError.errorName}${parsedError.args ? ` - ${parsedError.args}` : ""}`, contract);
|
22
24
|
}
|
23
|
-
return new TransactionError(
|
25
|
+
return new TransactionError(`Execution Reverted: ${stringify(errorObj)}`, contract);
|
24
26
|
}
|
25
27
|
}
|
26
28
|
return error;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"extract-error.js","sourceRoot":"","sources":["../../../src/transaction/extract-error.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;
|
1
|
+
{"version":3,"file":"extract-error.js","sourceRoot":"","sources":["../../../src/transaction/extract-error.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAkB,IAGnD;IACC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,yBAAyB;QACzB,MAAM,QAAQ,GAAG,KAIhB,CAAC;QACF,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnD,IAAI,GAAG,GAAG,QAAQ,EAAE,GAAG,CAAC;gBACxB,IAAI,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC;oBACrB,GAAG,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAClE,CAAC;gBACD,MAAM,WAAW,GAAG,iBAAiB,CAAC;oBACpC,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,GAAG;iBACJ,CAAC,CAAC;gBACH,OAAO,IAAI,gBAAgB,CACzB,GAAG,WAAW,CAAC,SAAS,GACtB,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAChD,EAAE,EACF,QAAQ,CACT,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,gBAAgB,CACzB,uBAAuB,SAAS,CAAC,QAAQ,CAAC,EAAE,EAC5C,QAAQ,CACT,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AAE7D,MAAM,gBAAkC,SAAQ,KAAK;IAInD,YAAY,MAAc,EAAE,QAAgC;QAC1D,IAAI,OAAO,GAAG,MAAM,CAAC;QACrB,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;YACxB,yBAAyB;YACzB,OAAO,GAAG;gBACR,MAAM;gBACN,EAAE;gBACF,aAAa,QAAQ,CAAC,OAAO,EAAE;gBAC/B,YAAY,QAAQ,CAAC,KAAK,EAAE,EAAE,EAAE;aACjC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,CAAC;QAdV;;;;;WAAoC;QACpC;;;;;WAA4B;QAcjC,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,QAAQ,EAAE,OAAO,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF"}
|
@@ -118,7 +118,7 @@ function encodeParams(preparedParams) {
|
|
118
118
|
export function encodeAddress(value) {
|
119
119
|
// We allow empty strings for deployment transactions where there is no to address
|
120
120
|
if (value !== "" && value !== undefined && !isAddress(value)) {
|
121
|
-
throw new Error(
|
121
|
+
throw new Error(`Invalid address: ${value}`);
|
122
122
|
}
|
123
123
|
return { dynamic: false, encoded: padHex(value.toLowerCase()) };
|
124
124
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"encodeAbiParameters.js","sourceRoot":"","sources":["../../../../src/utils/abi/encodeAbiParameters.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"encodeAbiParameters.js","sourceRoot":"","sources":["../../../../src/utils/abi/encodeAbiParameters.ts"],"names":[],"mappings":"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"}
|