viem 2.57.10 → 2.57.12
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/CHANGELOG.md +70 -0
- package/_cjs/actions/public/getTransactionConfirmations.js +6 -1
- package/_cjs/actions/public/getTransactionConfirmations.js.map +1 -1
- package/_cjs/actions/public/waitForTransactionReceipt.js +87 -24
- package/_cjs/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/_cjs/actions/public/watchEvent.js +3 -0
- package/_cjs/actions/public/watchEvent.js.map +1 -1
- package/_cjs/actions/token/approve.js +1 -1
- package/_cjs/actions/token/approve.js.map +1 -1
- package/_cjs/actions/token/getAllowance.js +1 -1
- package/_cjs/actions/token/getAllowance.js.map +1 -1
- package/_cjs/actions/token/getBalance.js +1 -1
- package/_cjs/actions/token/getBalance.js.map +1 -1
- package/_cjs/actions/token/getTotalSupply.js +1 -1
- package/_cjs/actions/token/getTotalSupply.js.map +1 -1
- package/_cjs/actions/token/transfer.js +1 -1
- package/_cjs/actions/token/transfer.js.map +1 -1
- package/_cjs/actions/wallet/sendCalls.js +1 -1
- package/_cjs/actions/wallet/sendCalls.js.map +1 -1
- package/_cjs/chains/definitions/hyperEvm.js +3 -0
- package/_cjs/chains/definitions/hyperEvm.js.map +1 -1
- package/_cjs/chains/definitions/hyperliquidEvmTestnet.js +3 -0
- package/_cjs/chains/definitions/hyperliquidEvmTestnet.js.map +1 -1
- package/_cjs/chains/definitions/monad.js +1 -1
- package/_cjs/chains/definitions/monadTestnet.js +1 -1
- package/_cjs/chains/definitions/valuechain.js +22 -0
- package/_cjs/chains/definitions/valuechain.js.map +1 -0
- package/_cjs/chains/definitions/valuechainTestnet.js +23 -0
- package/_cjs/chains/definitions/valuechainTestnet.js.map +1 -0
- package/_cjs/chains/definitions/zksyncEraTestnet.js +32 -0
- package/_cjs/chains/definitions/zksyncEraTestnet.js.map +1 -0
- package/_cjs/chains/index.js +8 -2
- package/_cjs/chains/index.js.map +1 -1
- package/_cjs/clients/createClient.js +1 -1
- package/_cjs/clients/createClient.js.map +1 -1
- package/_cjs/clients/decorators/public.js.map +1 -1
- package/_cjs/clients/transports/http.js +5 -1
- package/_cjs/clients/transports/http.js.map +1 -1
- package/_cjs/errors/node.js +1 -1
- package/_cjs/errors/node.js.map +1 -1
- package/_cjs/errors/request.js +20 -2
- package/_cjs/errors/request.js.map +1 -1
- package/_cjs/errors/typedData.js +3 -1
- package/_cjs/errors/typedData.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/op-stack/abis.js +52 -0
- package/_cjs/op-stack/abis.js.map +1 -1
- package/_cjs/op-stack/actions/getTimeToFinalize.js +53 -4
- package/_cjs/op-stack/actions/getTimeToFinalize.js.map +1 -1
- package/_cjs/op-stack/actions/getTimeToProve.js +29 -2
- package/_cjs/op-stack/actions/getTimeToProve.js.map +1 -1
- package/_cjs/op-stack/actions/getWithdrawalStatus.js +20 -4
- package/_cjs/op-stack/actions/getWithdrawalStatus.js.map +1 -1
- package/_cjs/op-stack/actions/waitToProve.js +28 -2
- package/_cjs/op-stack/actions/waitToProve.js.map +1 -1
- package/_cjs/op-stack/errors/withdrawal.js +12 -1
- package/_cjs/op-stack/errors/withdrawal.js.map +1 -1
- package/_cjs/tempo/Account.js +2 -5
- package/_cjs/tempo/Account.js.map +1 -1
- package/_cjs/tempo/Addresses.js +1 -2
- package/_cjs/tempo/Addresses.js.map +1 -1
- package/_cjs/tempo/Transport.js.map +1 -1
- package/_cjs/tempo/accounts/Config.js +1 -4
- package/_cjs/tempo/accounts/Config.js.map +1 -1
- package/_cjs/tempo/actions/accessKey.js +8 -8
- package/_cjs/tempo/actions/accessKey.js.map +1 -1
- package/_cjs/tempo/actions/accounts.js +5 -5
- package/_cjs/tempo/actions/accounts.js.map +1 -1
- package/_cjs/tempo/actions/amm.js +4 -4
- package/_cjs/tempo/actions/amm.js.map +1 -1
- package/_cjs/tempo/actions/channel.js +7 -7
- package/_cjs/tempo/actions/channel.js.map +1 -1
- package/_cjs/tempo/actions/dex.js +14 -14
- package/_cjs/tempo/actions/dex.js.map +1 -1
- package/_cjs/tempo/actions/earn/deployment.js +3 -3
- package/_cjs/tempo/actions/earn/deployment.js.map +1 -1
- package/_cjs/tempo/actions/earn.js +6 -6
- package/_cjs/tempo/actions/earn.js.map +1 -1
- package/_cjs/tempo/actions/fee.js +4 -4
- package/_cjs/tempo/actions/fee.js.map +1 -1
- package/_cjs/tempo/actions/nonce.js +1 -1
- package/_cjs/tempo/actions/nonce.js.map +1 -1
- package/_cjs/tempo/actions/policy.js +6 -6
- package/_cjs/tempo/actions/policy.js.map +1 -1
- package/_cjs/tempo/actions/propAmm.js +10 -10
- package/_cjs/tempo/actions/propAmm.js.map +1 -1
- package/_cjs/tempo/actions/receivePolicy.js +6 -6
- package/_cjs/tempo/actions/receivePolicy.js.map +1 -1
- package/_cjs/tempo/actions/reward.js +6 -6
- package/_cjs/tempo/actions/reward.js.map +1 -1
- package/_cjs/tempo/actions/token.js +21 -21
- package/_cjs/tempo/actions/token.js.map +1 -1
- package/_cjs/tempo/actions/validator.js +11 -11
- package/_cjs/tempo/actions/validator.js.map +1 -1
- package/_cjs/tempo/actions/virtualAddress.js +2 -2
- package/_cjs/tempo/actions/virtualAddress.js.map +1 -1
- package/_cjs/tempo/chainConfig.js +2 -1
- package/_cjs/tempo/chainConfig.js.map +1 -1
- package/_cjs/tempo/index.js.map +1 -1
- package/_cjs/tempo/internal/relay/accounts.js +1 -3
- package/_cjs/tempo/internal/relay/accounts.js.map +1 -1
- package/_cjs/utils/abi/getAbiItem.js +33 -12
- package/_cjs/utils/abi/getAbiItem.js.map +1 -1
- package/_cjs/utils/abi/parseEventLogs.js +18 -10
- package/_cjs/utils/abi/parseEventLogs.js.map +1 -1
- package/_cjs/utils/authorization/serializeAuthorizationList.js +4 -1
- package/_cjs/utils/authorization/serializeAuthorizationList.js.map +1 -1
- package/_cjs/utils/buildRequest.js +25 -14
- package/_cjs/utils/buildRequest.js.map +1 -1
- package/_cjs/utils/data/isHex.js +3 -1
- package/_cjs/utils/data/isHex.js.map +1 -1
- package/_cjs/utils/ens/avatar/parseAvatarRecord.js +4 -1
- package/_cjs/utils/ens/avatar/parseAvatarRecord.js.map +1 -1
- package/_cjs/utils/ens/avatar/utils.js +2 -1
- package/_cjs/utils/ens/avatar/utils.js.map +1 -1
- package/_cjs/utils/hash/normalizeSignature.js +1 -1
- package/_cjs/utils/hash/normalizeSignature.js.map +1 -1
- package/_cjs/utils/nonceManager.js +2 -2
- package/_cjs/utils/nonceManager.js.map +1 -1
- package/_cjs/utils/rpc/http.js +24 -4
- package/_cjs/utils/rpc/http.js.map +1 -1
- package/_cjs/utils/signature/compactSignatureToSignature.js +3 -2
- package/_cjs/utils/signature/compactSignatureToSignature.js.map +1 -1
- package/_cjs/utils/signature/hashTypedData.js +1 -2
- package/_cjs/utils/signature/hashTypedData.js.map +1 -1
- package/_cjs/utils/signature/signatureToCompactSignature.js +15 -7
- package/_cjs/utils/signature/signatureToCompactSignature.js.map +1 -1
- package/_cjs/utils/siwe/createSiweMessage.js +1 -1
- package/_cjs/utils/siwe/createSiweMessage.js.map +1 -1
- package/_cjs/utils/typedData.js +6 -7
- package/_cjs/utils/typedData.js.map +1 -1
- package/_cjs/utils/wait.js +1 -1
- package/_cjs/utils/wait.js.map +1 -1
- package/_esm/actions/public/getTransactionConfirmations.js +11 -1
- package/_esm/actions/public/getTransactionConfirmations.js.map +1 -1
- package/_esm/actions/public/waitForTransactionReceipt.js +111 -24
- package/_esm/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/_esm/actions/public/watchEvent.js +3 -0
- package/_esm/actions/public/watchEvent.js.map +1 -1
- package/_esm/actions/token/approve.js +1 -1
- package/_esm/actions/token/approve.js.map +1 -1
- package/_esm/actions/token/getAllowance.js +1 -1
- package/_esm/actions/token/getAllowance.js.map +1 -1
- package/_esm/actions/token/getBalance.js +1 -1
- package/_esm/actions/token/getBalance.js.map +1 -1
- package/_esm/actions/token/getTotalSupply.js +1 -1
- package/_esm/actions/token/getTotalSupply.js.map +1 -1
- package/_esm/actions/token/transfer.js +1 -1
- package/_esm/actions/token/transfer.js.map +1 -1
- package/_esm/actions/wallet/sendCalls.js +1 -1
- package/_esm/actions/wallet/sendCalls.js.map +1 -1
- package/_esm/chains/definitions/hyperEvm.js +3 -0
- package/_esm/chains/definitions/hyperEvm.js.map +1 -1
- package/_esm/chains/definitions/hyperliquidEvmTestnet.js +3 -0
- package/_esm/chains/definitions/hyperliquidEvmTestnet.js.map +1 -1
- package/_esm/chains/definitions/monad.js +1 -1
- package/_esm/chains/definitions/monadTestnet.js +1 -1
- package/_esm/chains/definitions/valuechain.js +20 -0
- package/_esm/chains/definitions/valuechain.js.map +1 -0
- package/_esm/chains/definitions/valuechainTestnet.js +21 -0
- package/_esm/chains/definitions/valuechainTestnet.js.map +1 -0
- package/_esm/chains/definitions/zksyncEraTestnet.js +29 -0
- package/_esm/chains/definitions/zksyncEraTestnet.js.map +1 -0
- package/_esm/chains/index.js +5 -0
- package/_esm/chains/index.js.map +1 -1
- package/_esm/clients/createClient.js +1 -1
- package/_esm/clients/createClient.js.map +1 -1
- package/_esm/clients/decorators/public.js.map +1 -1
- package/_esm/clients/transports/http.js +6 -1
- package/_esm/clients/transports/http.js.map +1 -1
- package/_esm/errors/node.js +1 -1
- package/_esm/errors/node.js.map +1 -1
- package/_esm/errors/request.js +22 -2
- package/_esm/errors/request.js.map +1 -1
- package/_esm/errors/typedData.js +3 -1
- package/_esm/errors/typedData.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/op-stack/abis.js +52 -0
- package/_esm/op-stack/abis.js.map +1 -1
- package/_esm/op-stack/actions/getTimeToFinalize.js +64 -6
- package/_esm/op-stack/actions/getTimeToFinalize.js.map +1 -1
- package/_esm/op-stack/actions/getTimeToProve.js +30 -2
- package/_esm/op-stack/actions/getTimeToProve.js.map +1 -1
- package/_esm/op-stack/actions/getWithdrawalStatus.js +24 -5
- package/_esm/op-stack/actions/getWithdrawalStatus.js.map +1 -1
- package/_esm/op-stack/actions/waitToProve.js +30 -3
- package/_esm/op-stack/actions/waitToProve.js.map +1 -1
- package/_esm/op-stack/errors/withdrawal.js +10 -0
- package/_esm/op-stack/errors/withdrawal.js.map +1 -1
- package/_esm/tempo/Account.js +2 -5
- package/_esm/tempo/Account.js.map +1 -1
- package/_esm/tempo/Addresses.js +0 -2
- package/_esm/tempo/Addresses.js.map +1 -1
- package/_esm/tempo/Transport.js.map +1 -1
- package/_esm/tempo/accounts/Config.js +1 -4
- package/_esm/tempo/accounts/Config.js.map +1 -1
- package/_esm/tempo/actions/accessKey.js +8 -8
- package/_esm/tempo/actions/accessKey.js.map +1 -1
- package/_esm/tempo/actions/accounts.js +7 -7
- package/_esm/tempo/actions/accounts.js.map +1 -1
- package/_esm/tempo/actions/amm.js +4 -4
- package/_esm/tempo/actions/amm.js.map +1 -1
- package/_esm/tempo/actions/channel.js +7 -7
- package/_esm/tempo/actions/channel.js.map +1 -1
- package/_esm/tempo/actions/dex.js +14 -14
- package/_esm/tempo/actions/dex.js.map +1 -1
- package/_esm/tempo/actions/earn/deployment.js +3 -3
- package/_esm/tempo/actions/earn/deployment.js.map +1 -1
- package/_esm/tempo/actions/earn.js +6 -6
- package/_esm/tempo/actions/earn.js.map +1 -1
- package/_esm/tempo/actions/fee.js +4 -4
- package/_esm/tempo/actions/fee.js.map +1 -1
- package/_esm/tempo/actions/nonce.js +1 -1
- package/_esm/tempo/actions/nonce.js.map +1 -1
- package/_esm/tempo/actions/policy.js +6 -6
- package/_esm/tempo/actions/policy.js.map +1 -1
- package/_esm/tempo/actions/propAmm.js +10 -10
- package/_esm/tempo/actions/propAmm.js.map +1 -1
- package/_esm/tempo/actions/receivePolicy.js +6 -6
- package/_esm/tempo/actions/receivePolicy.js.map +1 -1
- package/_esm/tempo/actions/reward.js +6 -6
- package/_esm/tempo/actions/reward.js.map +1 -1
- package/_esm/tempo/actions/token.js +21 -21
- package/_esm/tempo/actions/token.js.map +1 -1
- package/_esm/tempo/actions/validator.js +11 -11
- package/_esm/tempo/actions/validator.js.map +1 -1
- package/_esm/tempo/actions/virtualAddress.js +2 -2
- package/_esm/tempo/actions/virtualAddress.js.map +1 -1
- package/_esm/tempo/chainConfig.js +3 -1
- package/_esm/tempo/chainConfig.js.map +1 -1
- package/_esm/tempo/index.js.map +1 -1
- package/_esm/tempo/internal/relay/accounts.js +1 -3
- package/_esm/tempo/internal/relay/accounts.js.map +1 -1
- package/_esm/utils/abi/getAbiItem.js +36 -14
- package/_esm/utils/abi/getAbiItem.js.map +1 -1
- package/_esm/utils/abi/parseEventLogs.js +25 -11
- package/_esm/utils/abi/parseEventLogs.js.map +1 -1
- package/_esm/utils/authorization/serializeAuthorizationList.js +7 -1
- package/_esm/utils/authorization/serializeAuthorizationList.js.map +1 -1
- package/_esm/utils/buildRequest.js +29 -15
- package/_esm/utils/buildRequest.js.map +1 -1
- package/_esm/utils/data/isHex.js +3 -1
- package/_esm/utils/data/isHex.js.map +1 -1
- package/_esm/utils/ens/avatar/parseAvatarRecord.js +4 -1
- package/_esm/utils/ens/avatar/parseAvatarRecord.js.map +1 -1
- package/_esm/utils/ens/avatar/utils.js +2 -1
- package/_esm/utils/ens/avatar/utils.js.map +1 -1
- package/_esm/utils/hash/normalizeSignature.js +1 -1
- package/_esm/utils/hash/normalizeSignature.js.map +1 -1
- package/_esm/utils/hash/toSignature.js +1 -1
- package/_esm/utils/hash/toSignatureHash.js +1 -1
- package/_esm/utils/nonceManager.js +2 -2
- package/_esm/utils/nonceManager.js.map +1 -1
- package/_esm/utils/rpc/http.js +29 -7
- package/_esm/utils/rpc/http.js.map +1 -1
- package/_esm/utils/signature/compactSignatureToSignature.js +3 -2
- package/_esm/utils/signature/compactSignatureToSignature.js.map +1 -1
- package/_esm/utils/signature/hashTypedData.js +1 -2
- package/_esm/utils/signature/hashTypedData.js.map +1 -1
- package/_esm/utils/signature/signatureToCompactSignature.js +16 -7
- package/_esm/utils/signature/signatureToCompactSignature.js.map +1 -1
- package/_esm/utils/siwe/createSiweMessage.js +1 -1
- package/_esm/utils/siwe/createSiweMessage.js.map +1 -1
- package/_esm/utils/typedData.js +12 -8
- package/_esm/utils/typedData.js.map +1 -1
- package/_esm/utils/wait.js +2 -1
- package/_esm/utils/wait.js.map +1 -1
- package/_types/actions/public/getTransactionConfirmations.d.ts.map +1 -1
- package/_types/actions/public/waitForTransactionReceipt.d.ts +31 -1
- package/_types/actions/public/waitForTransactionReceipt.d.ts.map +1 -1
- package/_types/actions/public/watchEvent.d.ts.map +1 -1
- package/_types/chains/definitions/hyperEvm.d.ts +3 -1
- package/_types/chains/definitions/hyperEvm.d.ts.map +1 -1
- package/_types/chains/definitions/hyperliquidEvmTestnet.d.ts +3 -1
- package/_types/chains/definitions/hyperliquidEvmTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/monad.d.ts +1 -1
- package/_types/chains/definitions/monadTestnet.d.ts +1 -1
- package/_types/chains/definitions/valuechain.d.ts +53 -0
- package/_types/chains/definitions/valuechain.d.ts.map +1 -0
- package/_types/chains/definitions/valuechainTestnet.d.ts +53 -0
- package/_types/chains/definitions/valuechainTestnet.d.ts.map +1 -0
- package/_types/chains/definitions/zksyncEraTestnet.d.ts +82 -0
- package/_types/chains/definitions/zksyncEraTestnet.d.ts.map +1 -0
- package/_types/chains/index.d.ts +5 -0
- package/_types/chains/index.d.ts.map +1 -1
- package/_types/clients/createClient.d.ts +3 -3
- package/_types/clients/createClient.d.ts.map +1 -1
- package/_types/clients/decorators/public.d.ts +3 -0
- package/_types/clients/decorators/public.d.ts.map +1 -1
- package/_types/clients/transports/http.d.ts.map +1 -1
- package/_types/errors/node.d.ts.map +1 -1
- package/_types/errors/request.d.ts +7 -1
- package/_types/errors/request.d.ts.map +1 -1
- package/_types/errors/typedData.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/op-stack/abis.d.ts +40 -0
- package/_types/op-stack/abis.d.ts.map +1 -1
- package/_types/op-stack/actions/getTimeToFinalize.d.ts +3 -2
- package/_types/op-stack/actions/getTimeToFinalize.d.ts.map +1 -1
- package/_types/op-stack/actions/getTimeToProve.d.ts +3 -1
- package/_types/op-stack/actions/getTimeToProve.d.ts.map +1 -1
- package/_types/op-stack/actions/getWithdrawalStatus.d.ts +2 -2
- package/_types/op-stack/actions/getWithdrawalStatus.d.ts.map +1 -1
- package/_types/op-stack/actions/waitToProve.d.ts +3 -1
- package/_types/op-stack/actions/waitToProve.d.ts.map +1 -1
- package/_types/op-stack/errors/withdrawal.d.ts +8 -0
- package/_types/op-stack/errors/withdrawal.d.ts.map +1 -1
- package/_types/tempo/Account.d.ts +0 -5
- package/_types/tempo/Account.d.ts.map +1 -1
- package/_types/tempo/Addresses.d.ts +0 -2
- package/_types/tempo/Addresses.d.ts.map +1 -1
- package/_types/tempo/Transport.d.ts +2 -0
- package/_types/tempo/Transport.d.ts.map +1 -1
- package/_types/tempo/accounts/Config.d.ts.map +1 -1
- package/_types/tempo/actions/accounts.d.ts +2 -2
- package/_types/tempo/chainConfig.d.ts.map +1 -1
- package/_types/tempo/index.d.ts +5 -1
- package/_types/tempo/index.d.ts.map +1 -1
- package/_types/tempo/internal/relay/accounts.d.ts.map +1 -1
- package/_types/utils/abi/getAbiItem.d.ts.map +1 -1
- package/_types/utils/abi/parseEventLogs.d.ts.map +1 -1
- package/_types/utils/authorization/serializeAuthorizationList.d.ts.map +1 -1
- package/_types/utils/buildRequest.d.ts.map +1 -1
- package/_types/utils/data/isHex.d.ts +12 -1
- package/_types/utils/data/isHex.d.ts.map +1 -1
- package/_types/utils/ens/avatar/parseAvatarRecord.d.ts.map +1 -1
- package/_types/utils/ens/avatar/utils.d.ts.map +1 -1
- package/_types/utils/hash/toSignature.d.ts +1 -1
- package/_types/utils/hash/toSignatureHash.d.ts +1 -1
- package/_types/utils/rpc/http.d.ts +2 -2
- package/_types/utils/rpc/http.d.ts.map +1 -1
- package/_types/utils/signature/compactSignatureToSignature.d.ts +2 -1
- package/_types/utils/signature/compactSignatureToSignature.d.ts.map +1 -1
- package/_types/utils/signature/hashTypedData.d.ts.map +1 -1
- package/_types/utils/signature/signatureToCompactSignature.d.ts +2 -1
- package/_types/utils/signature/signatureToCompactSignature.d.ts.map +1 -1
- package/_types/utils/typedData.d.ts.map +1 -1
- package/_types/utils/wait.d.ts.map +1 -1
- package/actions/public/getTransactionConfirmations.ts +15 -1
- package/actions/public/waitForTransactionReceipt.ts +174 -34
- package/actions/public/watchEvent.ts +3 -0
- package/actions/wallet/sendCalls.ts +1 -1
- package/chains/definitions/hyperEvm.ts +3 -0
- package/chains/definitions/hyperliquidEvmTestnet.ts +3 -0
- package/chains/definitions/monad.ts +1 -1
- package/chains/definitions/monadTestnet.ts +1 -1
- package/chains/definitions/valuechain.ts +20 -0
- package/chains/definitions/valuechainTestnet.ts +21 -0
- package/chains/definitions/zksyncEraTestnet.ts +29 -0
- package/chains/index.ts +5 -0
- package/clients/createClient.ts +5 -4
- package/clients/decorators/public.ts +3 -0
- package/clients/transports/http.ts +6 -1
- package/errors/node.ts +1 -1
- package/errors/request.ts +15 -1
- package/errors/typedData.ts +3 -1
- package/errors/version.ts +1 -1
- package/op-stack/abis.ts +52 -0
- package/op-stack/actions/getTimeToFinalize.ts +89 -10
- package/op-stack/actions/getTimeToProve.ts +43 -2
- package/op-stack/actions/getWithdrawalStatus.ts +30 -6
- package/op-stack/actions/waitToProve.ts +45 -3
- package/op-stack/errors/withdrawal.ts +17 -0
- package/package.json +2 -2
- package/tempo/Account.ts +2 -14
- package/tempo/Addresses.ts +0 -3
- package/tempo/Transport.ts +2 -0
- package/tempo/accounts/Config.ts +1 -9
- package/tempo/actions/accounts.ts +2 -2
- package/tempo/chainConfig.ts +5 -1
- package/tempo/index.ts +4 -0
- package/tempo/internal/relay/accounts.ts +1 -3
- package/utils/abi/getAbiItem.ts +49 -17
- package/utils/abi/parseEventLogs.ts +32 -11
- package/utils/authorization/serializeAuthorizationList.ts +7 -1
- package/utils/buildRequest.ts +29 -14
- package/utils/data/isHex.ts +18 -1
- package/utils/ens/avatar/parseAvatarRecord.ts +7 -1
- package/utils/ens/avatar/utils.ts +2 -1
- package/utils/hash/normalizeSignature.ts +1 -1
- package/utils/hash/toSignature.ts +1 -1
- package/utils/hash/toSignatureHash.ts +1 -1
- package/utils/nonceManager.ts +2 -2
- package/utils/rpc/http.ts +33 -8
- package/utils/signature/compactSignatureToSignature.ts +4 -2
- package/utils/signature/hashTypedData.ts +1 -2
- package/utils/signature/signatureToCompactSignature.ts +13 -8
- package/utils/siwe/createSiweMessage.ts +1 -1
- package/utils/typedData.ts +11 -8
- package/utils/wait.ts +8 -4
|
@@ -6,6 +6,7 @@ const toBytes_js_1 = require("../encoding/toBytes.js");
|
|
|
6
6
|
const log_js_1 = require("../formatters/log.js");
|
|
7
7
|
const keccak256_js_1 = require("../hash/keccak256.js");
|
|
8
8
|
const toEventSelector_js_1 = require("../hash/toEventSelector.js");
|
|
9
|
+
const regex_js_1 = require("../regex.js");
|
|
9
10
|
const decodeEventLog_js_1 = require("./decodeEventLog.js");
|
|
10
11
|
function parseEventLogs(parameters) {
|
|
11
12
|
const { abi, args, logs, strict = true } = parameters;
|
|
@@ -55,11 +56,7 @@ function parseEventLogs(parameters) {
|
|
|
55
56
|
}
|
|
56
57
|
catch {
|
|
57
58
|
const isUnnamed = abiItem.abi.inputs?.some((x) => !('name' in x && x.name));
|
|
58
|
-
|
|
59
|
-
...formattedLog,
|
|
60
|
-
args: isUnnamed ? [] : {},
|
|
61
|
-
eventName: abiItem.abi.name,
|
|
62
|
-
};
|
|
59
|
+
event = { eventName: abiItem.abi.name, args: isUnnamed ? [] : {} };
|
|
63
60
|
}
|
|
64
61
|
}
|
|
65
62
|
if (!event || !abiItem)
|
|
@@ -70,6 +67,7 @@ function parseEventLogs(parameters) {
|
|
|
70
67
|
args: event.args,
|
|
71
68
|
inputs: abiItem.abi.inputs,
|
|
72
69
|
matchArgs: args,
|
|
70
|
+
topics: formattedLog.topics,
|
|
73
71
|
}))
|
|
74
72
|
return null;
|
|
75
73
|
return { ...event, ...formattedLog };
|
|
@@ -77,19 +75,29 @@ function parseEventLogs(parameters) {
|
|
|
77
75
|
.filter(Boolean);
|
|
78
76
|
}
|
|
79
77
|
function includesArgs(parameters) {
|
|
80
|
-
const { args, inputs, matchArgs } = parameters;
|
|
78
|
+
const { args, inputs, matchArgs, topics } = parameters;
|
|
81
79
|
if (!matchArgs)
|
|
82
80
|
return true;
|
|
83
81
|
if (!args)
|
|
84
82
|
return false;
|
|
83
|
+
const topicInputs = inputs
|
|
84
|
+
.filter((input) => input.indexed)
|
|
85
|
+
.slice(0, topics.length - 1);
|
|
85
86
|
function isEqual(input, value, arg) {
|
|
86
87
|
try {
|
|
87
88
|
if (input.type === 'address')
|
|
88
89
|
return (0, isAddressEqual_js_1.isAddressEqual)(value, arg);
|
|
89
|
-
if (input
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
90
|
+
if (topicInputs.includes(input) &&
|
|
91
|
+
(input.type === 'string' || input.type === 'bytes')) {
|
|
92
|
+
const bytes = input.type === 'string'
|
|
93
|
+
? (0, toBytes_js_1.stringToBytes)(value)
|
|
94
|
+
: (0, toBytes_js_1.toBytes)(value);
|
|
95
|
+
return (0, keccak256_js_1.keccak256)(bytes) === arg;
|
|
96
|
+
}
|
|
97
|
+
if (typeof value === 'string' &&
|
|
98
|
+
typeof arg === 'string' &&
|
|
99
|
+
regex_js_1.bytesRegex.test(input.type))
|
|
100
|
+
return value.toLowerCase() === arg.toLowerCase();
|
|
93
101
|
return value === arg;
|
|
94
102
|
}
|
|
95
103
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,11 +10,14 @@ function serializeAuthorizationList(authorizationList) {
|
|
|
10
10
|
for (const authorization of authorizationList) {
|
|
11
11
|
const { chainId, nonce, ...signature } = authorization;
|
|
12
12
|
const contractAddress = authorization.address;
|
|
13
|
+
const signatureArray = (0, serializeTransaction_js_1.toYParitySignatureArray)({}, signature);
|
|
14
|
+
if (signatureArray.length > 0 && signature.yParity)
|
|
15
|
+
signatureArray[0] = (0, toHex_js_1.toHex)(signature.yParity);
|
|
13
16
|
serializedAuthorizationList.push([
|
|
14
17
|
chainId ? (0, toHex_js_1.toHex)(chainId) : '0x',
|
|
15
18
|
contractAddress,
|
|
16
19
|
nonce ? (0, toHex_js_1.toHex)(nonce) : '0x',
|
|
17
|
-
...
|
|
20
|
+
...signatureArray,
|
|
18
21
|
]);
|
|
19
22
|
}
|
|
20
23
|
return serializedAuthorizationList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializeAuthorizationList.js","sourceRoot":"","sources":["../../../utils/authorization/serializeAuthorizationList.ts"],"names":[],"mappings":";;AAeA,
|
|
1
|
+
{"version":3,"file":"serializeAuthorizationList.js","sourceRoot":"","sources":["../../../utils/authorization/serializeAuthorizationList.ts"],"names":[],"mappings":";;AAeA,gEAwBC;AAlCD,mDAA4C;AAC5C,oFAAgF;AAShF,SAAgB,0BAA0B,CACxC,iBAA+D;IAE/D,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IAEnE,MAAM,2BAA2B,GAAG,EAAE,CAAA;IACtC,KAAK,MAAM,aAAa,IAAI,iBAAiB,EAAE,CAAC;QAC9C,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,GAAG,aAAa,CAAA;QACtD,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAA;QAC7C,MAAM,cAAc,GAAG,IAAA,iDAAuB,EAAC,EAAE,EAAE,SAAS,CAAC,CAAA;QAI7D,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,OAAO;YAChD,cAAc,CAAC,CAAC,CAAC,GAAG,IAAA,gBAAK,EAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAC9C,2BAA2B,CAAC,IAAI,CAAC;YAC/B,OAAO,CAAC,CAAC,CAAC,IAAA,gBAAK,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;YAC/B,eAAe;YACf,KAAK,CAAC,CAAC,CAAC,IAAA,gBAAK,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;YAC3B,GAAG,cAAc;SAClB,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,2BAAyE,CAAA;AAClF,CAAC"}
|
|
@@ -104,10 +104,14 @@ function buildRequest(request, options = {}) {
|
|
|
104
104
|
}
|
|
105
105
|
}, {
|
|
106
106
|
delay: ({ count, error }) => {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
107
|
+
const retryAfter = getHttpError(error)?.headers?.get('Retry-After');
|
|
108
|
+
if (retryAfter) {
|
|
109
|
+
const seconds = Number.parseInt(retryAfter, 10);
|
|
110
|
+
if (!Number.isNaN(seconds))
|
|
111
|
+
return seconds * 1000;
|
|
112
|
+
const delay = Date.parse(retryAfter) - Date.now();
|
|
113
|
+
if (delay > 0)
|
|
114
|
+
return delay;
|
|
111
115
|
}
|
|
112
116
|
return ~~(1 << count) * retryDelay;
|
|
113
117
|
},
|
|
@@ -120,6 +124,7 @@ function buildRequest(request, options = {}) {
|
|
|
120
124
|
function shouldRetry(error) {
|
|
121
125
|
if ((0, utils_js_1.isAbortError)(error))
|
|
122
126
|
return false;
|
|
127
|
+
const status = getHttpError(error)?.status;
|
|
123
128
|
if ('code' in error && typeof error.code === 'number') {
|
|
124
129
|
if (error.code === -1)
|
|
125
130
|
return true;
|
|
@@ -131,29 +136,35 @@ function shouldRetry(error) {
|
|
|
131
136
|
return true;
|
|
132
137
|
if (error.code === -32007)
|
|
133
138
|
return true;
|
|
134
|
-
|
|
139
|
+
if (!status)
|
|
140
|
+
return false;
|
|
135
141
|
}
|
|
136
|
-
if (
|
|
137
|
-
if (
|
|
142
|
+
if (status) {
|
|
143
|
+
if (status === 403)
|
|
138
144
|
return true;
|
|
139
|
-
if (
|
|
145
|
+
if (status === 408)
|
|
140
146
|
return true;
|
|
141
|
-
if (
|
|
147
|
+
if (status === 413)
|
|
142
148
|
return true;
|
|
143
|
-
if (
|
|
149
|
+
if (status === 429)
|
|
144
150
|
return true;
|
|
145
|
-
if (
|
|
151
|
+
if (status === 500)
|
|
146
152
|
return true;
|
|
147
|
-
if (
|
|
153
|
+
if (status === 502)
|
|
148
154
|
return true;
|
|
149
|
-
if (
|
|
155
|
+
if (status === 503)
|
|
150
156
|
return true;
|
|
151
|
-
if (
|
|
157
|
+
if (status === 504)
|
|
152
158
|
return true;
|
|
153
159
|
return false;
|
|
154
160
|
}
|
|
155
161
|
return true;
|
|
156
162
|
}
|
|
163
|
+
function getHttpError(error) {
|
|
164
|
+
if (!(error instanceof base_js_1.BaseError))
|
|
165
|
+
return undefined;
|
|
166
|
+
return error.walk((err) => err instanceof request_js_1.HttpRequestError || err instanceof request_js_1.RpcRequestError);
|
|
167
|
+
}
|
|
157
168
|
function hashString(str, seed = 0) {
|
|
158
169
|
let h1 = 0xdeadbeef ^ seed;
|
|
159
170
|
let h2 = 0x41c6ce57 ^ seed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildRequest.js","sourceRoot":"","sources":["../../utils/buildRequest.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"buildRequest.js","sourceRoot":"","sources":["../../utils/buildRequest.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils/data/isHex.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isHex = isHex;
|
|
4
|
-
function isHex(value, { strict = true } = {}) {
|
|
4
|
+
function isHex(value, { even = false, strict = true, } = {}) {
|
|
5
5
|
if (!value)
|
|
6
6
|
return false;
|
|
7
7
|
if (typeof value !== 'string')
|
|
8
8
|
return false;
|
|
9
|
+
if (even && value.length % 2 !== 0)
|
|
10
|
+
return false;
|
|
9
11
|
return strict ? /^0x[0-9a-fA-F]*$/.test(value) : value.startsWith('0x');
|
|
10
12
|
}
|
|
11
13
|
//# sourceMappingURL=isHex.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isHex.js","sourceRoot":"","sources":["../../../utils/data/isHex.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"isHex.js","sourceRoot":"","sources":["../../../utils/data/isHex.ts"],"names":[],"mappings":";;AAKA,sBAwBC;AAxBD,SAAgB,KAAK,CACnB,KAAc,EACd,EACE,IAAI,GAAG,KAAK,EACZ,MAAM,GAAG,IAAI,MAcX,EAAE;IAEN,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAA;IACxB,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAChD,OAAO,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;AACzE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseAvatarRecord = parseAvatarRecord;
|
|
4
|
+
const Base64 = require("ox/Base64");
|
|
4
5
|
const utils_js_1 = require("./utils.js");
|
|
5
6
|
async function parseAvatarRecord(client, { gatewayUrls, record, }) {
|
|
6
7
|
if (/eip155:/i.test(record))
|
|
@@ -16,7 +17,9 @@ async function parseNftAvatarUri(client, { gatewayUrls, record, }) {
|
|
|
16
17
|
resolvedNftUri.startsWith('{'))) {
|
|
17
18
|
const encodedJson = isEncoded
|
|
18
19
|
?
|
|
19
|
-
|
|
20
|
+
Base64.toString(resolvedNftUri
|
|
21
|
+
.replace('data:application/json;base64,', '')
|
|
22
|
+
.replace(/\s/g, ''))
|
|
20
23
|
:
|
|
21
24
|
resolvedNftUri;
|
|
22
25
|
const decoded = JSON.parse(encodedJson);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseAvatarRecord.js","sourceRoot":"","sources":["../../../../utils/ens/avatar/parseAvatarRecord.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"parseAvatarRecord.js","sourceRoot":"","sources":["../../../../utils/ens/avatar/parseAvatarRecord.ts"],"names":[],"mappings":";;AAwCA,8CAaC;AArDD,oCAAmC;AAQnC,yCAemB;AAiBZ,KAAK,UAAU,iBAAiB,CACrC,MAAgC,EAChC,EACE,WAAW,EACX,MAAM,GAIP;IAED,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;QACzB,OAAO,iBAAiB,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;IAC3D,OAAO,IAAA,yBAAc,EAAC,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAA;AACrD,CAAC;AAYD,KAAK,UAAU,iBAAiB,CAC9B,MAAgC,EAChC,EACE,WAAW,EACX,MAAM,GAIP;IAGD,MAAM,GAAG,GAAG,IAAA,sBAAW,EAAC,MAAM,CAAC,CAAA;IAE/B,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAc,EAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;IAEpD,MAAM,EACJ,GAAG,EAAE,cAAc,EACnB,SAAS,EACT,SAAS,GACV,GAAG,IAAA,2BAAgB,EAAC,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAA;IAGlD,IACE,SAAS;QACT,CAAC,cAAc,CAAC,QAAQ,CAAC,+BAA+B,CAAC;YACvD,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EACjC,CAAC;QACD,MAAM,WAAW,GAAG,SAAS;YAC3B,CAAC;gBACC,MAAM,CAAC,QAAQ,CACb,cAAc;qBACX,OAAO,CAAC,+BAA+B,EAAE,EAAE,CAAC;qBAC5C,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACtB;YACH,CAAC;gBACC,cAAc,CAAA;QAElB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACvC,OAAO,IAAA,yBAAc,EAAC,EAAE,GAAG,EAAE,IAAA,uBAAY,EAAC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAA;IACpE,CAAC;IAED,OAAO,IAAA,+BAAoB,EAAC;QAC1B,WAAW;QACX,GAAG,EAAE,IAAA,4BAAiB,EAAC,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;KACrD,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -9,6 +9,7 @@ exports.parseAvatarUri = parseAvatarUri;
|
|
|
9
9
|
exports.parseNftUri = parseNftUri;
|
|
10
10
|
exports.getNftTokenUri = getNftTokenUri;
|
|
11
11
|
exports.getNftMetadataUri = getNftMetadataUri;
|
|
12
|
+
const Base64 = require("ox/Base64");
|
|
12
13
|
const readContract_js_1 = require("../../../actions/public/readContract.js");
|
|
13
14
|
const ens_js_1 = require("../../../errors/ens.js");
|
|
14
15
|
const toHex_js_1 = require("../../encoding/toHex.js");
|
|
@@ -82,7 +83,7 @@ function resolveAvatarUri({ uri, gatewayUrls, }) {
|
|
|
82
83
|
}
|
|
83
84
|
let parsedUri = uri.replace(dataURIRegex, '');
|
|
84
85
|
if (parsedUri.startsWith('<svg')) {
|
|
85
|
-
parsedUri = `data:image/svg+xml;base64,${
|
|
86
|
+
parsedUri = `data:image/svg+xml;base64,${Base64.fromString(parsedUri)}`;
|
|
86
87
|
}
|
|
87
88
|
if (parsedUri.startsWith('data:') || parsedUri.startsWith('{')) {
|
|
88
89
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../utils/ens/avatar/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../utils/ens/avatar/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ function normalizeSignature(signature) {
|
|
|
19
19
|
if (!active)
|
|
20
20
|
continue;
|
|
21
21
|
if (level === 0) {
|
|
22
|
-
if (char === ' ' && ['event', 'function', ''].includes(result))
|
|
22
|
+
if (char === ' ' && ['event', 'function', 'error', ''].includes(result))
|
|
23
23
|
result = '';
|
|
24
24
|
else {
|
|
25
25
|
result += char;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeSignature.js","sourceRoot":"","sources":["../../../utils/hash/normalizeSignature.ts"],"names":[],"mappings":";;AAOA,gDAyDC;AAhED,kDAAgD;AAOhD,SAAgB,kBAAkB,CAChC,SAAuC;IAEvC,IAAI,MAAM,GAAG,IAAI,CAAA;IACjB,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAGzB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,GAAG,IAAI,CAAA;QAGjD,IAAI,IAAI,KAAK,GAAG;YAAE,KAAK,EAAE,CAAA;QACzB,IAAI,IAAI,KAAK,GAAG;YAAE,KAAK,EAAE,CAAA;QAGzB,IAAI,CAAC,MAAM;YAAE,SAAQ;QAGrB,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"normalizeSignature.js","sourceRoot":"","sources":["../../../utils/hash/normalizeSignature.ts"],"names":[],"mappings":";;AAOA,gDAyDC;AAhED,kDAAgD;AAOhD,SAAgB,kBAAkB,CAChC,SAAuC;IAEvC,IAAI,MAAM,GAAG,IAAI,CAAA;IACjB,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAGzB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,GAAG,IAAI,CAAA;QAGjD,IAAI,IAAI,KAAK,GAAG;YAAE,KAAK,EAAE,CAAA;QACzB,IAAI,IAAI,KAAK,GAAG;YAAE,KAAK,EAAE,CAAA;QAGzB,IAAI,CAAC,MAAM;YAAE,SAAQ;QAGrB,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACrE,MAAM,GAAG,EAAE,CAAA;iBACR,CAAC;gBACJ,MAAM,IAAI,IAAI,CAAA;gBAGd,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBACjB,KAAK,GAAG,IAAI,CAAA;oBACZ,MAAK;gBACP,CAAC;YACH,CAAC;YAED,SAAQ;QACV,CAAC;QAGD,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAGjB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrD,OAAO,GAAG,EAAE,CAAA;gBACZ,MAAM,GAAG,KAAK,CAAA;YAChB,CAAC;YACD,SAAQ;QACV,CAAC;QAED,MAAM,IAAI,IAAI,CAAA;QACd,OAAO,IAAI,IAAI,CAAA;IACjB,CAAC;IAED,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,mBAAS,CAAC,gCAAgC,CAAC,CAAA;IAEjE,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
@@ -37,8 +37,8 @@ function createNonceManager(parameters) {
|
|
|
37
37
|
promise = (async () => {
|
|
38
38
|
try {
|
|
39
39
|
const nonce = await source.get({ address, chainId, client });
|
|
40
|
-
const previousNonce = nonceMap.get(key)
|
|
41
|
-
if (previousNonce
|
|
40
|
+
const previousNonce = nonceMap.get(key);
|
|
41
|
+
if (previousNonce !== undefined && nonce <= previousNonce)
|
|
42
42
|
return previousNonce + 1;
|
|
43
43
|
nonceMap.delete(key);
|
|
44
44
|
return nonce;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonceManager.js","sourceRoot":"","sources":["../../utils/nonceManager.ts"],"names":[],"mappings":";;;AAyCA,gDA+DC;AAaD,0BAWC;AA9HD,qFAA8E;AAG9E,qCAAiC;AAoCjC,SAAgB,kBAAkB,CAChC,UAAwC;IAExC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;IAE7B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAA;IAC1B,MAAM,QAAQ,GAAG,IAAI,eAAM,CAAS,IAAI,CAAC,CAAA;IACzC,MAAM,UAAU,GAAG,IAAI,GAAG,EAA2B,CAAA;IAErD,MAAM,MAAM,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,EAAsB,EAAE,EAAE,CAC1D,GAAG,OAAO,IAAI,OAAO,EAAE,CAAA;IACzB,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;QACjC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC,CAAA;IAED,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;YACxC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;YACxC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;YAEtD,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;YACpC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAA;YAE3B,MAAM,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,CAAC,CAAA;YAC7C,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YAExB,OAAO,KAAK,CAAA;QACd,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE;YAClC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;YACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACpC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;QAC9B,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;YACpC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;YAExC,IAAI,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACjC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,GAAG,CAAC,KAAK,IAAI,EAAE;oBACpB,IAAI,CAAC;wBACH,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;wBAC5D,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"nonceManager.js","sourceRoot":"","sources":["../../utils/nonceManager.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils/rpc/http.js
CHANGED
|
@@ -82,10 +82,18 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
82
82
|
data = { error: data };
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
|
+
const error = Array.isArray(body) && Array.isArray(data) && data.length === 1
|
|
86
|
+
? data[0]
|
|
87
|
+
: data;
|
|
85
88
|
if (!response.ok) {
|
|
86
|
-
if (
|
|
87
|
-
|
|
88
|
-
|
|
89
|
+
if (isRpcError(error))
|
|
90
|
+
throw new request_js_1.RpcRequestError({
|
|
91
|
+
body,
|
|
92
|
+
error: error.error,
|
|
93
|
+
headers: response.headers,
|
|
94
|
+
status: response.status,
|
|
95
|
+
url,
|
|
96
|
+
});
|
|
89
97
|
throw new request_js_1.HttpRequestError({
|
|
90
98
|
body,
|
|
91
99
|
details: (0, stringify_js_1.stringify)(data.error) || response.statusText,
|
|
@@ -94,7 +102,13 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
94
102
|
url,
|
|
95
103
|
});
|
|
96
104
|
}
|
|
97
|
-
|
|
105
|
+
if (!Array.isArray(body) || !body.length)
|
|
106
|
+
return data;
|
|
107
|
+
if (Array.isArray(data) && data.length >= body.length)
|
|
108
|
+
return data;
|
|
109
|
+
if (!isRpcError(error))
|
|
110
|
+
throw new Error(`Expected ${body.length} responses to batch request.`);
|
|
111
|
+
return body.map(() => error);
|
|
98
112
|
}
|
|
99
113
|
catch (err) {
|
|
100
114
|
if (signal_?.aborted)
|
|
@@ -105,6 +119,8 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
105
119
|
throw err;
|
|
106
120
|
if (err instanceof request_js_1.ResponseBodyTooLargeError)
|
|
107
121
|
throw err;
|
|
122
|
+
if (err instanceof request_js_1.RpcRequestError)
|
|
123
|
+
throw err;
|
|
108
124
|
if (err instanceof request_js_1.TimeoutError)
|
|
109
125
|
throw err;
|
|
110
126
|
throw new request_js_1.HttpRequestError({
|
|
@@ -187,6 +203,10 @@ async function readResponseBody(response, { maxResponseBodySize }) {
|
|
|
187
203
|
reader.releaseLock();
|
|
188
204
|
}
|
|
189
205
|
}
|
|
206
|
+
function isRpcError(data) {
|
|
207
|
+
return (typeof data?.error?.code === 'number' &&
|
|
208
|
+
typeof data?.error?.message === 'string');
|
|
209
|
+
}
|
|
190
210
|
function parseUrl(url_) {
|
|
191
211
|
try {
|
|
192
212
|
const url = new URL(url_);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/rpc/http.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/rpc/http.ts"],"names":[],"mappings":";;AA8FA,4CAmJC;AA6FD,4BAwBC;AAtWD,wDASgC;AAChC,oDAI8B;AAG9B,8DAGkC;AAClC,kDAA2C;AAC3C,mCAAiC;AAgEjC,MAAM,0BAA0B,GAAG,UAAU,CAAA;AAQ7C,SAAgB,gBAAgB,CAC9B,IAAY,EACZ,UAAgC,EAAE;IAElC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;IAEpD,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,MAAM;YAClB,MAAM,EACJ,IAAI,EACJ,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,EAClC,mBAAmB,GAAG,OAAO,CAAC,mBAAmB;gBAC/C,0BAA0B,EAC5B,SAAS,GAAG,OAAO,CAAC,SAAS,EAC7B,UAAU,GAAG,OAAO,CAAC,UAAU,EAC/B,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,MAAM,GACpC,GAAG,MAAM,CAAA;YAEV,MAAM,YAAY,GAAG;gBACnB,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;gBAC/B,GAAG,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;aAC/B,CAAA;YAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAA;YAEzD,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,4BAAW,EAClD,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE;oBAGlC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;wBACpC,OAAO;wBACP,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;qBACnC,CAAC,CAAA;oBACF,IAAI,CAAC;wBACH,MAAM,IAAI,GAAgB;4BACxB,GAAG,YAAY;4BACf,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gCACvB,CAAC,CAAC,IAAA,wBAAS,EACP,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oCAClB,OAAO,EAAE,KAAK;oCACd,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,eAAO,CAAC,IAAI,EAAE;oCAC7B,GAAG,IAAI;iCACR,CAAC,CAAC,CACJ;gCACH,CAAC,CAAC,IAAA,wBAAS,EAAC;oCACR,OAAO,EAAE,KAAK;oCACd,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,eAAO,CAAC,IAAI,EAAE;oCAC7B,GAAG,IAAI;iCACR,CAAC;4BACN,OAAO,EAAE;gCACP,GAAG,WAAW;gCACd,cAAc,EAAE,kBAAkB;gCAClC,GAAG,OAAO;6BACX;4BACD,MAAM,EAAE,MAAM,IAAI,MAAM;4BACxB,MAAM;yBACP,CAAA;wBACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;wBACtC,MAAM,IAAI,GAAG,CAAC,MAAM,SAAS,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI;4BACjD,GAAG,IAAI;4BACP,GAAG;yBACJ,CAAA;wBACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,CAAC,CAAA;wBAErD,IAAI,UAAU;4BAAE,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAA;wBAI1C,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE;4BACpD,mBAAmB;yBACpB,CAAC,CAAA;wBACF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;oBACnC,CAAC;4BAAS,CAAC;wBACT,OAAO,EAAE,CAAA;oBACX,CAAC;gBACH,CAAC,EACD;oBACE,aAAa,EAAE,IAAI,yBAAY,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;oBAC9C,OAAO;oBACP,MAAM,EAAE,IAAI;iBACb,CACF,CAAA;gBAED,IAAI,IAAS,CAAA;gBACb,IACE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,kBAAkB,CAAC;oBAEpE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;qBAC5B,CAAC;oBACJ,IAAI,GAAG,YAAY,CAAA;oBACnB,IAAI,CAAC;wBACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;oBACjC,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,IAAI,QAAQ,CAAC,EAAE;4BAAE,MAAM,GAAG,CAAA;wBAC1B,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;oBACxB,CAAC;gBACH,CAAC;gBAID,MAAM,KAAK,GACT,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;oBAC7D,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBACT,CAAC,CAAC,IAAI,CAAA;gBAEV,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;oBAGjB,IAAI,UAAU,CAAC,KAAK,CAAC;wBACnB,MAAM,IAAI,4BAAe,CAAC;4BACxB,IAAI;4BACJ,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB,OAAO,EAAE,QAAQ,CAAC,OAAO;4BACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;4BACvB,GAAG;yBACJ,CAAC,CAAA;oBAEJ,MAAM,IAAI,6BAAgB,CAAC;wBACzB,IAAI;wBACJ,OAAO,EAAE,IAAA,wBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,UAAU;wBACrD,OAAO,EAAE,QAAQ,CAAC,OAAO;wBACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;wBACvB,GAAG;qBACJ,CAAC,CAAA;gBACJ,CAAC;gBAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;oBAAE,OAAO,IAAI,CAAA;gBACrD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM;oBAAE,OAAO,IAAI,CAAA;gBAClE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,CAAC,MAAM,8BAA8B,CAAC,CAAA;gBACxE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;YAC9B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,OAAO,EAAE,OAAO;oBAAE,MAAM,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAA;gBAClD,IAAI,IAAA,uBAAY,EAAC,GAAG,CAAC;oBAAE,MAAM,GAAG,CAAA;gBAChC,IAAI,GAAG,YAAY,6BAAgB;oBAAE,MAAM,GAAG,CAAA;gBAC9C,IAAI,GAAG,YAAY,sCAAyB;oBAAE,MAAM,GAAG,CAAA;gBACvD,IAAI,GAAG,YAAY,4BAAe;oBAAE,MAAM,GAAG,CAAA;gBAC7C,IAAI,GAAG,YAAY,yBAAY;oBAAE,MAAM,GAAG,CAAA;gBAC1C,MAAM,IAAI,6BAAgB,CAAC;oBACzB,IAAI;oBACJ,KAAK,EAAE,GAAY;oBACnB,GAAG;iBACJ,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAMD,SAAS,SAAS,CAAC,OAAoD;IACrE,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACrD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QACrB,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAA;IAE3D,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,OAAO,EAAE,CAAA;QACT,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;IACrE,CAAC,CAAA;IACD,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,KAAK,MAAM,MAAM,IAAI,QAAQ;YAAE,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7E,CAAC,CAAA;IAED,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,CAAA;YACT,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC/B,MAAK;QACP,CAAC;QACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC3C,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,CAAA;AAC/C,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,QAAkB,EAClB,EAAE,mBAAmB,EAA2C;IAEhE,IAAI,mBAAmB,KAAK,KAAK;QAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAA;IAEzD,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;IAC5D,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAA;QAClC,IAAI,IAAI,GAAG,mBAAmB;YAC5B,MAAM,IAAI,sCAAyB,CAAC;gBAClC,OAAO,EAAE,mBAAmB;gBAC5B,IAAI;aACL,CAAC,CAAA;IACN,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;QAClD,IAAI,IAAI,GAAG,mBAAmB;YAC5B,MAAM,IAAI,sCAAyB,CAAC;gBAClC,OAAO,EAAE,mBAAmB;gBAC5B,IAAI;aACL,CAAC,CAAA;QACJ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAA;IACxC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;IACjC,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI,IAAI,GAAG,CAAC,CAAA;IAEZ,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YAC3C,IAAI,IAAI;gBAAE,MAAK;YACf,IAAI,IAAI,KAAK,CAAC,UAAU,CAAA;YACxB,IAAI,IAAI,GAAG,mBAAmB,EAAE,CAAC;gBAC/B,MAAM,MAAM,CAAC,MAAM,EAAE,CAAA;gBACrB,MAAM,IAAI,sCAAyB,CAAC;oBAClC,OAAO,EAAE,mBAAmB;oBAC5B,IAAI;iBACL,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACjD,CAAC;QACD,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,WAAW,EAAE,CAAA;IACtB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAS;IAC3B,OAAO,CACL,OAAO,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,QAAQ;QACrC,OAAO,IAAI,EAAE,KAAK,EAAE,OAAO,KAAK,QAAQ,CACzC,CAAA;AACH,CAAC;AAGD,SAAgB,QAAQ,CAAC,IAAY;IACnC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;QAEzB,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE;YAEnB,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACjB,MAAM,WAAW,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAA;gBAC7F,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;gBACjB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;gBAEjB,OAAO;oBACL,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;oBACnB,OAAO,EAAE,EAAE,aAAa,EAAE,SAAS,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE;iBACzD,CAAA;YACH,CAAC;YAED,OAAM;QACR,CAAC,CAAC,EAAE,CAAA;QAEJ,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,MAAM,EAAE,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;IACtB,CAAC;AACH,CAAC"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.compactSignatureToSignature = compactSignatureToSignature;
|
|
4
|
+
const pad_js_1 = require("../data/pad.js");
|
|
4
5
|
const toBytes_js_1 = require("../encoding/toBytes.js");
|
|
5
6
|
const toHex_js_1 = require("../encoding/toHex.js");
|
|
6
7
|
function compactSignatureToSignature({ r, yParityAndS, }) {
|
|
7
|
-
const yParityAndS_bytes = (0, toBytes_js_1.hexToBytes)(yParityAndS);
|
|
8
|
+
const yParityAndS_bytes = (0, toBytes_js_1.hexToBytes)((0, pad_js_1.pad)(yParityAndS));
|
|
8
9
|
const yParity = yParityAndS_bytes[0] & 0x80 ? 1 : 0;
|
|
9
10
|
const s = yParityAndS_bytes;
|
|
10
11
|
if (yParity === 1)
|
|
11
12
|
s[0] &= 0x7f;
|
|
12
|
-
return { r, s: (0, toHex_js_1.bytesToHex)(s), yParity };
|
|
13
|
+
return { r: (0, pad_js_1.pad)(r), s: (0, toHex_js_1.bytesToHex)(s), yParity };
|
|
13
14
|
}
|
|
14
15
|
//# sourceMappingURL=compactSignatureToSignature.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compactSignatureToSignature.js","sourceRoot":"","sources":["../../../utils/signature/compactSignatureToSignature.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"compactSignatureToSignature.js","sourceRoot":"","sources":["../../../utils/signature/compactSignatureToSignature.ts"],"names":[],"mappings":";;AA6BA,kEASC;AApCD,2CAAuD;AACvD,uDAA6E;AAC7E,mDAA2E;AAyB3E,SAAgB,2BAA2B,CAAC,EAC1C,CAAC,EACD,WAAW,GACM;IACjB,MAAM,iBAAiB,GAAG,IAAA,uBAAU,EAAC,IAAA,YAAG,EAAC,WAAW,CAAC,CAAC,CAAA;IACtD,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACnD,MAAM,CAAC,GAAG,iBAAiB,CAAA;IAC3B,IAAI,OAAO,KAAK,CAAC;QAAE,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;IAC/B,OAAO,EAAE,CAAC,EAAE,IAAA,YAAG,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAA,qBAAU,EAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAA;AACjD,CAAC"}
|
|
@@ -82,8 +82,7 @@ function encodeType({ primaryType, types, }) {
|
|
|
82
82
|
return result;
|
|
83
83
|
}
|
|
84
84
|
function findTypeDependencies({ primaryType: primaryType_, types, }, results = new Set()) {
|
|
85
|
-
const
|
|
86
|
-
const primaryType = match?.[0];
|
|
85
|
+
const primaryType = primaryType_.replace(/(\[[0-9]*\])+$/, '');
|
|
87
86
|
if (results.has(primaryType) || types[primaryType] === undefined) {
|
|
88
87
|
return results;
|
|
89
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hashTypedData.js","sourceRoot":"","sources":["../../../utils/signature/hashTypedData.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hashTypedData.js","sourceRoot":"","sources":["../../../utils/signature/hashTypedData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.signatureToCompactSignature = signatureToCompactSignature;
|
|
4
|
+
const pad_js_1 = require("../data/pad.js");
|
|
4
5
|
const toBytes_js_1 = require("../encoding/toBytes.js");
|
|
5
6
|
const toHex_js_1 = require("../encoding/toHex.js");
|
|
6
7
|
function signatureToCompactSignature(signature) {
|
|
7
8
|
const { r, s, v, yParity } = signature;
|
|
8
|
-
const yParity_ =
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
const yParity_ = (() => {
|
|
10
|
+
if (yParity === 0 || yParity === 1)
|
|
11
|
+
return yParity;
|
|
12
|
+
if (v === 0n || v === 1n)
|
|
13
|
+
return Number(v);
|
|
14
|
+
if (v && (v === 27n || v === 28n || v >= 35n))
|
|
15
|
+
return v % 2n === 0n ? 1 : 0;
|
|
16
|
+
throw new Error('Invalid `v` or `yParity` value');
|
|
17
|
+
})();
|
|
18
|
+
const bytes = (0, toBytes_js_1.hexToBytes)((0, pad_js_1.pad)(s));
|
|
19
|
+
if (bytes[0] & 0x80)
|
|
20
|
+
throw new Error('Invalid `s` value');
|
|
21
|
+
if (yParity_ === 1)
|
|
12
22
|
bytes[0] |= 0x80;
|
|
13
|
-
|
|
14
|
-
}
|
|
15
|
-
return { r, yParityAndS };
|
|
23
|
+
return { r: (0, pad_js_1.pad)(r), yParityAndS: (0, toHex_js_1.bytesToHex)(bytes) };
|
|
16
24
|
}
|
|
17
25
|
//# sourceMappingURL=signatureToCompactSignature.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signatureToCompactSignature.js","sourceRoot":"","sources":["../../../utils/signature/signatureToCompactSignature.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"signatureToCompactSignature.js","sourceRoot":"","sources":["../../../utils/signature/signatureToCompactSignature.ts"],"names":[],"mappings":";;AA6BA,kEAeC;AA1CD,2CAAuD;AACvD,uDAA6E;AAC7E,mDAA2E;AAyB3E,SAAgB,2BAA2B,CACzC,SAAoB;IAEpB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;IACtC,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE;QACrB,IAAI,OAAO,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC;YAAE,OAAO,OAAO,CAAA;QAClD,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;YAAE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;QAC1C,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,GAAG,CAAC;YAAE,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3E,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;IACnD,CAAC,CAAC,EAAE,CAAA;IACJ,MAAM,KAAK,GAAG,IAAA,uBAAU,EAAC,IAAA,YAAG,EAAC,CAAC,CAAC,CAAC,CAAA;IAEhC,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;IACzD,IAAI,QAAQ,KAAK,CAAC;QAAE,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;IACpC,OAAO,EAAE,CAAC,EAAE,IAAA,YAAG,EAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAA,qBAAU,EAAC,KAAK,CAAC,EAAE,CAAA;AACtD,CAAC"}
|
|
@@ -117,7 +117,7 @@ function createSiweMessage(parameters) {
|
|
|
117
117
|
}
|
|
118
118
|
return `${prefix}\n${suffix}`;
|
|
119
119
|
}
|
|
120
|
-
const domainRegex = /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(:[0-9]{1,5})?$/;
|
|
120
|
+
const domainRegex = /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+([a-zA-Z]{2,63}|[xX][nN]--[a-zA-Z0-9-]{0,58}[a-zA-Z0-9])(:[0-9]{1,5})?$/;
|
|
121
121
|
const ipRegex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:[0-9]{1,5})?$/;
|
|
122
122
|
const localhostRegex = /^localhost(:[0-9]{1,5})?$/;
|
|
123
123
|
const nonceRegex = /^[a-zA-Z0-9]{8,}$/;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSiweMessage.js","sourceRoot":"","sources":["../../../utils/siwe/createSiweMessage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"createSiweMessage.js","sourceRoot":"","sources":["../../../utils/siwe/createSiweMessage.ts"],"names":[],"mappings":"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"}
|