Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17,413 changes: 17,413 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/protocol-kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@safe-global/protocol-kit",
"version": "6.0.3",
"name": "@wdk-safe-global/protocol-kit",
"version": "6.0.7",
"description": "SDK that facilitates the interaction with Safe Smart Accounts",
"types": "dist/src/index.d.ts",
"main": "dist/cjs/src/index.cjs",
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol-kit/src/utils/getProtocolKitVersion.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const getProtocolKitVersion = () => '6.0.3'
export const getProtocolKitVersion = () => '6.0.7'
6 changes: 3 additions & 3 deletions packages/relay-kit/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const config = {
'^.+\\.ts?$': 'ts-jest'
},
moduleNameMapper: {
'^@safe-global/protocol-kit/tests/(.*)$': '<rootDir>/../protocol-kit/tests/$1',
'^@safe-global/relay-kit/test-utils$': '<rootDir>/test-utils',
'^@safe-global/relay-kit/(.*)$': '<rootDir>/src/$1'
'^@wdk-safe-global/protocol-kit/tests/(.*)$': '<rootDir>/../protocol-kit/tests/$1',
'^@wdk-safe-global/relay-kit/test-utils$': '<rootDir>/test-utils',
'^@wdk-safe-global/relay-kit/(.*)$': '<rootDir>/src/$1'
},
testTimeout: 20000
}
Expand Down
6 changes: 3 additions & 3 deletions packages/relay-kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@safe-global/relay-kit",
"version": "4.0.2",
"name": "@wdk-safe-global/relay-kit",
"version": "4.0.8",
"description": "SDK for Safe Smart Accounts with support for ERC-4337 and Relay",
"types": "dist/src/index.d.ts",
"main": "dist/cjs/src/index.cjs",
Expand Down Expand Up @@ -56,7 +56,7 @@
},
"dependencies": {
"@gelatonetwork/relay-sdk": "^5.6.0",
"@safe-global/protocol-kit": "^6.0.3",
"@wdk-safe-global/protocol-kit": "^6.0.7",
"@safe-global/safe-modules-deployments": "^2.2.7",
"@safe-global/types-kit": "^2.0.1",
"semver": "^7.7.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/relay-kit/src/RelayKitBasePack.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Safe from '@safe-global/protocol-kit'
import Safe from '@wdk-safe-global/protocol-kit'
type RelayKitBasePackTypes = {
EstimateFeeProps?: unknown
EstimateFeeResult?: unknown
Expand Down
10 changes: 5 additions & 5 deletions packages/relay-kit/src/packs/gelato/GelatoRelayPack.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import Safe, {
estimateSafeTxGas,
estimateSafeDeploymentGas,
createERC20TokenTransferTransaction
} from '@safe-global/protocol-kit'
} from '@wdk-safe-global/protocol-kit'
import { MetaTransactionData, OperationType, SafeTransaction } from '@safe-global/types-kit'

import {
GELATO_FEE_COLLECTOR,
GELATO_NATIVE_TOKEN_ADDRESS,
ZERO_ADDRESS
} from '@safe-global/relay-kit/constants'
} from '@wdk-safe-global/relay-kit/constants'
import { GelatoRelayPack } from './GelatoRelayPack'

enum TaskState {
Expand Down Expand Up @@ -71,7 +71,7 @@ jest.mock('@gelatonetwork/relay-sdk', () => {
}
})

jest.mock('@safe-global/protocol-kit')
jest.mock('@wdk-safe-global/protocol-kit')

// Cast the import to jest.Mocked type
const mockEstimateTxBaseGas = estimateTxBaseGas as jest.MockedFunction<typeof estimateTxBaseGas>
Expand All @@ -88,8 +88,8 @@ const mockedIsGasTokenCompatibleWithHandlePayment =
typeof isGasTokenCompatibleWithHandlePayment
>

jest.doMock('@safe-global/protocol-kit', () => ({
...jest.requireActual('@safe-global/protocol-kit'),
jest.doMock('@wdk-safe-global/protocol-kit', () => ({
...jest.requireActual('@wdk-safe-global/protocol-kit'),
estimateTxBaseGas: mockEstimateTxBaseGas,
estimateSafeTxGas: mockEstimateSafeTxGas,
estimateSafeDeploymentGas: mockEstimateSafeDeploymentGas,
Expand Down
6 changes: 3 additions & 3 deletions packages/relay-kit/src/packs/gelato/GelatoRelayPack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import {
estimateSafeDeploymentGas,
createERC20TokenTransferTransaction,
isGasTokenCompatibleWithHandlePayment
} from '@safe-global/protocol-kit'
import { RelayKitBasePack } from '@safe-global/relay-kit/RelayKitBasePack'
} from '@wdk-safe-global/protocol-kit'
import { RelayKitBasePack } from '@wdk-safe-global/relay-kit/RelayKitBasePack'
import {
GELATO_FEE_COLLECTOR,
GELATO_GAS_EXECUTION_OVERHEAD,
GELATO_NATIVE_TOKEN_ADDRESS,
GELATO_TRANSFER_GAS_COST,
ZERO_ADDRESS
} from '@safe-global/relay-kit/constants'
} from '@wdk-safe-global/relay-kit/constants'
import {
MetaTransactionOptions,
RelayTransaction,
Expand Down
2 changes: 1 addition & 1 deletion packages/relay-kit/src/packs/gelato/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Safe from '@safe-global/protocol-kit'
import Safe from '@wdk-safe-global/protocol-kit'
import {
MetaTransactionData,
MetaTransactionOptions,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EthSafeSignature } from '@safe-global/protocol-kit'
import { EthSafeSignature } from '@wdk-safe-global/protocol-kit'
import SafeOperationV07 from './SafeOperationV07'
import { fixtures } from '@safe-global/relay-kit/test-utils'
import { fixtures } from '@wdk-safe-global/relay-kit/test-utils'

describe('BaseSafeOperation', () => {
it('should add and get signatures', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/relay-kit/src/packs/safe-4337/BaseSafeOperation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {
SafeUserOperation,
UserOperation
} from '@safe-global/types-kit'
import { buildSignatureBytes } from '@safe-global/protocol-kit'
import { buildSignatureBytes } from '@wdk-safe-global/protocol-kit'
import {
EIP712_SAFE_OPERATION_TYPE_V06,
EIP712_SAFE_OPERATION_TYPE_V07
} from '@safe-global/relay-kit/packs/safe-4337/constants'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'

abstract class BaseSafeOperation implements SafeOperation {
userOperation: UserOperation
Expand Down
6 changes: 3 additions & 3 deletions packages/relay-kit/src/packs/safe-4337/Safe4337Pack.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import crypto from 'crypto'
import dotenv from 'dotenv'
import * as viem from 'viem'
import Safe, * as protocolKit from '@safe-global/protocol-kit'
import { WebAuthnCredentials, createMockPasskey } from '@safe-global/protocol-kit/test-utils'
import Safe, * as protocolKit from '@wdk-safe-global/protocol-kit'
import { WebAuthnCredentials, createMockPasskey } from '@wdk-safe-global/protocol-kit/test-utils'
import {
getSafeModuleSetupDeployment,
getSafe4337ModuleDeployment
Expand All @@ -16,7 +16,7 @@ import {
fixtures,
createSafe4337Pack,
generateTransferCallData
} from '@safe-global/relay-kit/test-utils'
} from '@wdk-safe-global/relay-kit/test-utils'

dotenv.config()

Expand Down
16 changes: 8 additions & 8 deletions packages/relay-kit/src/packs/safe-4337/Safe4337Pack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import Safe, {
PasskeyClient,
SafeProvider,
generateOnChainIdentifier
} from '@safe-global/protocol-kit'
import { RelayKitBasePack } from '@safe-global/relay-kit/RelayKitBasePack'
} from '@wdk-safe-global/protocol-kit'
import { RelayKitBasePack } from '@wdk-safe-global/relay-kit/RelayKitBasePack'
import {
OperationType,
SafeOperationConfirmation,
Expand All @@ -22,8 +22,8 @@ import {
getSafeWebAuthnShareSignerDeployment
} from '@safe-global/safe-modules-deployments'
import { Hash, encodeFunctionData, zeroAddress, Hex, concat } from 'viem'
import BaseSafeOperation from '@safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import SafeOperationFactory from '@safe-global/relay-kit/packs/safe-4337/SafeOperationFactory'
import BaseSafeOperation from '@wdk-safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import SafeOperationFactory from '@wdk-safe-global/relay-kit/packs/safe-4337/SafeOperationFactory'
import {
EstimateFeeProps,
Safe4337CreateTransactionProps,
Expand All @@ -34,22 +34,22 @@ import {
UserOperationWithPayload,
PaymasterOptions,
BundlerClient
} from '@safe-global/relay-kit/packs/safe-4337/types'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/types'
import {
ABI,
DEFAULT_SAFE_VERSION,
DEFAULT_SAFE_MODULES_VERSION,
RPC_4337_CALLS
} from '@safe-global/relay-kit/packs/safe-4337/constants'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'
import {
entryPointToSafeModules,
getDummySignature,
createBundlerClient,
userOperationToHexValues,
getRelayKitVersion,
createUserOperation
} from '@safe-global/relay-kit/packs/safe-4337/utils'
import { PimlicoFeeEstimator } from '@safe-global/relay-kit/packs/safe-4337/estimators/pimlico/PimlicoFeeEstimator'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/utils'
import { PimlicoFeeEstimator } from '@wdk-safe-global/relay-kit/packs/safe-4337/estimators/pimlico/PimlicoFeeEstimator'

const MAX_ERC20_AMOUNT_TO_APPROVE =
0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffn
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import {
UserOperationV07,
SafeOperationOptions
} from '@safe-global/types-kit'
import SafeOperationV06 from '@safe-global/relay-kit/packs/safe-4337/SafeOperationV06'
import SafeOperationV07 from '@safe-global/relay-kit/packs/safe-4337/SafeOperationV07'
import BaseSafeOperation from '@safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import { isEntryPointV6 } from '@safe-global/relay-kit/packs/safe-4337/utils'
import SafeOperationV06 from '@wdk-safe-global/relay-kit/packs/safe-4337/SafeOperationV06'
import SafeOperationV07 from '@wdk-safe-global/relay-kit/packs/safe-4337/SafeOperationV07'
import BaseSafeOperation from '@wdk-safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import { isEntryPointV6 } from '@wdk-safe-global/relay-kit/packs/safe-4337/utils'

class SafeOperationFactory {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Hex, encodePacked } from 'viem'
import { EthSafeSignature } from '@safe-global/protocol-kit'
import { fixtures } from '@safe-global/relay-kit/test-utils'
import { EthSafeSignature } from '@wdk-safe-global/protocol-kit'
import { fixtures } from '@wdk-safe-global/relay-kit/test-utils'
import SafeOperationV06 from './SafeOperationV06'
import BaseSafeOperation from './BaseSafeOperation'

Expand Down
4 changes: 2 additions & 2 deletions packages/relay-kit/src/packs/safe-4337/SafeOperationV06.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
SafeUserOperation,
SafeOperationOptions
} from '@safe-global/types-kit'
import BaseSafeOperation from '@safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import { EIP712_SAFE_OPERATION_TYPE_V06 } from '@safe-global/relay-kit/packs/safe-4337/constants'
import BaseSafeOperation from '@wdk-safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import { EIP712_SAFE_OPERATION_TYPE_V06 } from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'

class SafeOperationV06 extends BaseSafeOperation {
userOperation!: UserOperationV06
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Hex, concat, encodePacked } from 'viem'
import { EthSafeSignature } from '@safe-global/protocol-kit'
import { fixtures } from '@safe-global/relay-kit/test-utils'
import { EthSafeSignature } from '@wdk-safe-global/protocol-kit'
import { fixtures } from '@wdk-safe-global/relay-kit/test-utils'
import SafeOperationV07 from './SafeOperationV07'
import BaseSafeOperation from './BaseSafeOperation'

Expand Down
4 changes: 2 additions & 2 deletions packages/relay-kit/src/packs/safe-4337/SafeOperationV07.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
SafeOperationOptions
} from '@safe-global/types-kit'
import { concat, Hex, isAddress, pad, toHex } from 'viem'
import BaseSafeOperation from '@safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import { EIP712_SAFE_OPERATION_TYPE_V07 } from '@safe-global/relay-kit/packs/safe-4337/constants'
import BaseSafeOperation from '@wdk-safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import { EIP712_SAFE_OPERATION_TYPE_V07 } from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'

class SafeOperationV07 extends BaseSafeOperation {
userOperation!: UserOperationV07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import {
EstimateFeeFunctionProps,
IFeeEstimator,
UserOperationStringValues
} from '@safe-global/relay-kit/packs/safe-4337/types'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/types'
import { createPublicClient, http } from 'viem'
import {
createBundlerClient,
userOperationToHexValues
} from '@safe-global/relay-kit/packs/safe-4337/utils'
import { RPC_4337_CALLS } from '@safe-global/relay-kit/packs/safe-4337/constants'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/utils'
import { RPC_4337_CALLS } from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'
import { PaymasterRpcSchema } from './types'

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { UserOperationStringValues } from '@safe-global/relay-kit/packs/safe-4337/types'
import { RPC_4337_CALLS } from '@safe-global/relay-kit/packs/safe-4337/constants'
import { UserOperationStringValues } from '@wdk-safe-global/relay-kit/packs/safe-4337/types'
import { RPC_4337_CALLS } from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'

export type GetPaymasterStubDataRpcSchema = [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PimlicoFeeEstimator } from './PimlicoFeeEstimator'
import { fixtures } from '@safe-global/relay-kit/test-utils'
import { fixtures } from '@wdk-safe-global/relay-kit/test-utils'
import { PIMLICO_CUSTOM_RPC_4337_CALLS } from './types'
import { RPC_4337_CALLS } from '../../constants'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {
EstimateFeeFunctionProps,
IFeeEstimator,
UserOperationStringValues
} from '@safe-global/relay-kit/packs/safe-4337/types'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/types'
import {
createBundlerClient,
userOperationToHexValues
} from '@safe-global/relay-kit/packs/safe-4337/utils'
import { RPC_4337_CALLS } from '@safe-global/relay-kit/packs/safe-4337/constants'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/utils'
import { RPC_4337_CALLS } from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'
import { PIMLICO_CUSTOM_RPC_4337_CALLS, PimlicoCustomRpcSchema } from './types'

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UserOperationStringValues } from '@safe-global/relay-kit/packs/safe-4337/types'
import { UserOperationStringValues } from '@wdk-safe-global/relay-kit/packs/safe-4337/types'

export enum PIMLICO_CUSTOM_RPC_4337_CALLS {
GET_USER_OPERATION_GAS_PRICE = 'pimlico_getUserOperationGasPrice',
Expand Down
6 changes: 3 additions & 3 deletions packages/relay-kit/src/packs/safe-4337/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import Safe, {
DeploymentType,
SafeProviderConfig,
OnchainAnalyticsProps
} from '@safe-global/protocol-kit'
} from '@wdk-safe-global/protocol-kit'
import {
EstimateGasData,
MetaTransactionData,
SafeOperationResponse,
SafeVersion,
UserOperation
} from '@safe-global/types-kit'
import BaseSafeOperation from '@safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import { RPC_4337_CALLS } from '@safe-global/relay-kit/packs/safe-4337/constants'
import BaseSafeOperation from '@wdk-safe-global/relay-kit/packs/safe-4337/BaseSafeOperation'
import { RPC_4337_CALLS } from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'

type ExistingSafeOptions = {
safeAddress: string
Expand Down
4 changes: 2 additions & 2 deletions packages/relay-kit/src/packs/safe-4337/utils/entrypoint.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Safe from '@safe-global/protocol-kit'
import Safe from '@wdk-safe-global/protocol-kit'
import {
ENTRYPOINT_ABI,
ENTRYPOINT_ADDRESS_V06,
ENTRYPOINT_ADDRESS_V07
} from '@safe-global/relay-kit/packs/safe-4337/constants'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'

const EQ_0_2_0 = '0.2.0'

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const getRelayKitVersion = () => '4.0.2'
export const getRelayKitVersion = () => '4.0.8'
6 changes: 3 additions & 3 deletions packages/relay-kit/src/packs/safe-4337/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Hex, PublicRpcSchema, createPublicClient, encodeFunctionData, http, rpcSchema } from 'viem'
import { OperationType, MetaTransactionData } from '@safe-global/types-kit'
import { encodeMultiSendData } from '@safe-global/protocol-kit'
import { ABI } from '@safe-global/relay-kit/packs/safe-4337/constants'
import { encodeMultiSendData } from '@wdk-safe-global/protocol-kit'
import { ABI } from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'
import {
BundlerClient,
RpcSchemaEntry,
Safe4337RpcSchema
} from '@safe-global/relay-kit/packs/safe-4337/types'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/types'

/**
* Gets the EIP-4337 bundler provider.
Expand Down
2 changes: 1 addition & 1 deletion packages/relay-kit/src/packs/safe-4337/utils/signing.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Hex, encodePacked, toHex } from 'viem'
import { EthSafeSignature, buildSignatureBytes } from '@safe-global/protocol-kit'
import { EthSafeSignature, buildSignatureBytes } from '@wdk-safe-global/protocol-kit'

/**
* Passkey Dummy client data JSON fields. This can be used for gas estimations, as it pads the fields enough
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Safe from '@safe-global/protocol-kit'
import Safe from '@wdk-safe-global/protocol-kit'
import { encodeFunctionData, getAddress, Hex, hexToBytes, sliceHex, toHex } from 'viem'
import {
MetaTransactionData,
Expand All @@ -11,13 +11,13 @@ import {
isEntryPointV6,
isEntryPointV7,
encodeMultiSendCallData
} from '@safe-global/relay-kit/packs/safe-4337/utils'
import { ABI } from '@safe-global/relay-kit/packs/safe-4337/constants'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/utils'
import { ABI } from '@wdk-safe-global/relay-kit/packs/safe-4337/constants'
import {
ERC20PaymasterOption,
PaymasterOptions,
UserOperationStringValues
} from '@safe-global/relay-kit/packs/safe-4337/types'
} from '@wdk-safe-global/relay-kit/packs/safe-4337/types'

/**
* Encode the UserOperation execution from a transaction.
Expand Down
Loading
Loading