Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Onchain trackid via paymentReceiver & refundReceiver #1057

Closed
wants to merge 3 commits into from
Closed
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
25 changes: 21 additions & 4 deletions packages/protocol-kit/src/Safe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ import { asHash, asHex } from './utils/types'
import { Hash, Hex } from 'viem'
import getPasskeyOwnerAddress from './utils/passkeys/getPasskeyOwnerAddress'
import createPasskeyDeploymentTransaction from './utils/passkeys/createPasskeyDeploymentTransaction'
import formatTrackId from './utils/on-chain-tracking/formatTrackId'

const EQ_OR_GT_1_4_1 = '>=1.4.1'
const EQ_OR_GT_1_3_0 = '>=1.3.0'
Expand All @@ -100,6 +101,9 @@ class Safe {
#MAGIC_VALUE = '0x1626ba7e'
#MAGIC_VALUE_BYTES = '0x20c13b0b'

// On-chain Analitics
#trackId: string = ''

/**
* Creates an instance of the Safe Core SDK.
* @param config - Ethers Safe configuration
Expand All @@ -124,7 +128,11 @@ class Safe {
* @throws "MultiSendCallOnly contract is not deployed on the current network"
*/
async #initializeProtocolKit(config: SafeConfig) {
const { provider, signer, isL1SafeSingleton, contractNetworks } = config
const { provider, signer, isL1SafeSingleton, contractNetworks, trackId } = config

if (trackId) {
this.#trackId = formatTrackId(trackId)
}

this.#safeProvider = await SafeProvider.init({
provider,
Expand Down Expand Up @@ -252,6 +260,7 @@ class Safe {
safeProvider: this.#safeProvider,
chainId,
customContracts: this.#contractManager.contractNetworks?.[chainId.toString()],
trackId: this.#trackId,
...this.#predictedSafe
})
}
Expand Down Expand Up @@ -284,6 +293,7 @@ class Safe {
chainId,
isL1SafeSingleton: this.#contractManager.isL1SafeSingleton,
customContracts: this.#contractManager.contractNetworks?.[chainId.toString()],
trackId: this.#trackId,
...this.#predictedSafe
})
}
Expand Down Expand Up @@ -534,7 +544,8 @@ class Safe {
predictedSafe: this.#predictedSafe,
provider: this.#safeProvider.provider,
tx: newTransaction,
contractNetworks: this.#contractManager.contractNetworks
contractNetworks: this.#contractManager.contractNetworks,
trackId: this.#trackId
})
)
}
Expand All @@ -547,7 +558,8 @@ class Safe {
safeContract: this.#contractManager.safeContract,
provider: this.#safeProvider.provider,
tx: newTransaction,
contractNetworks: this.#contractManager.contractNetworks
contractNetworks: this.#contractManager.contractNetworks,
trackId: this.#trackId
})
)
}
Expand Down Expand Up @@ -1545,7 +1557,8 @@ class Safe {
safeContract: safeSingletonContract,
safeAccountConfig: safeAccountConfig,
customContracts,
deploymentType
deploymentType,
trackId: this.#trackId
})

const safeDeployTransactionData = {
Expand Down Expand Up @@ -1698,6 +1711,10 @@ class Safe {
}): ContractInfo | undefined => {
return getContractInfo(contractAddress)
}

getTrackId(): string {
return this.#trackId
}
}

export default Safe
19 changes: 13 additions & 6 deletions packages/protocol-kit/src/contracts/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export interface PredictSafeAddressProps {
safeDeploymentConfig?: SafeDeploymentConfig
isL1SafeSingleton?: boolean
customContracts?: ContractNetworkConfig
trackId?: string
}

export interface encodeSetupCallDataProps {
Expand All @@ -84,6 +85,7 @@ export interface encodeSetupCallDataProps {
customContracts?: ContractNetworkConfig
customSafeVersion?: SafeVersion
deploymentType?: DeploymentType
trackId?: string
}

export function encodeCreateProxyWithNonce(
Expand All @@ -109,7 +111,8 @@ export async function encodeSetupCallData({
safeContract,
customContracts,
customSafeVersion,
deploymentType
deploymentType,
trackId
}: encodeSetupCallDataProps): Promise<string> {
const {
owners,
Expand All @@ -119,7 +122,7 @@ export async function encodeSetupCallData({
fallbackHandler,
paymentToken = ZERO_ADDRESS,
payment = 0,
paymentReceiver = ZERO_ADDRESS
paymentReceiver = trackId || ZERO_ADDRESS
} = safeAccountConfig

const safeVersion = customSafeVersion || safeContract.safeVersion
Expand Down Expand Up @@ -255,7 +258,8 @@ export async function getPredictedSafeAddressInitCode({
safeAccountConfig,
safeDeploymentConfig = {},
isL1SafeSingleton,
customContracts
customContracts,
trackId = ''
}: PredictSafeAddressProps): Promise<string> {
validateSafeAccountConfig(safeAccountConfig)
validateSafeDeploymentConfig(safeDeploymentConfig)
Expand Down Expand Up @@ -289,7 +293,8 @@ export async function getPredictedSafeAddressInitCode({
safeContract,
customContracts,
customSafeVersion: safeVersion, // it is more efficient if we provide the safeVersion manually
deploymentType
deploymentType,
trackId
})

const encodedNonce = safeProvider.encodeParameters('uint256', [saltNonce])
Expand All @@ -315,7 +320,8 @@ export async function predictSafeAddress({
safeAccountConfig,
safeDeploymentConfig = {},
isL1SafeSingleton,
customContracts
customContracts,
trackId = ''
}: PredictSafeAddressProps): Promise<string> {
validateSafeAccountConfig(safeAccountConfig)
validateSafeDeploymentConfig(safeDeploymentConfig)
Expand Down Expand Up @@ -357,7 +363,8 @@ export async function predictSafeAddress({
safeContract,
customContracts,
customSafeVersion: safeVersion, // it is more efficient if we provide the safeVersion manuall
deploymentType
deploymentType,
trackId
})
const initializerHash = keccak256(asHex(initializer))

Expand Down
2 changes: 2 additions & 0 deletions packages/protocol-kit/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import {
} from './utils/eip-712'
import { createPasskeyClient } from './utils/passkeys/PasskeyClient'
import getPasskeyOwnerAddress from './utils/passkeys/getPasskeyOwnerAddress'
import formatTrackId from './utils/on-chain-tracking/formatTrackId'

export {
estimateTxBaseGas,
Expand All @@ -75,6 +76,7 @@ export {
estimateSafeDeploymentGas,
extractPasskeyData,
extractPasskeyCoordinates,
formatTrackId,
ContractManager,
CreateCallBaseContract,
createERC20TokenTransferTransaction,
Expand Down
4 changes: 4 additions & 0 deletions packages/protocol-kit/src/types/safeConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ export type SafeConfigProps = {
isL1SafeSingleton?: boolean
/** contractNetworks - Contract network configuration */
contractNetworks?: ContractNetworksConfig
// on-chain analitics
trackId?: string
}

export type SafeConfigWithSafeAddress = SafeConfigProps & SafeConfigWithSafeAddressProps
Expand Down Expand Up @@ -75,6 +77,8 @@ type ConnectSafeConfigProps = {
isL1SafeSingleton?: boolean
/** contractNetworks - Contract network configuration */
contractNetworks?: ContractNetworksConfig
// on-chain analitics
trackId?: string
}

export type ConnectSafeConfigWithSafeAddress = ConnectSafeConfigProps &
Expand Down
1 change: 1 addition & 0 deletions packages/protocol-kit/src/types/transactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type StandardizeSafeTransactionData = {
tx: SafeTransactionDataPartial
/** contractNetworks - Contract network configuration */
contractNetworks?: ContractNetworksConfig
trackId: string
}

export type StandardizeSafeTxDataWithSafeContract = StandardizeSafeTransactionData &
Expand Down
14 changes: 14 additions & 0 deletions packages/protocol-kit/src/utils/on-chain-tracking/formatTrackId.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { keccak256, toHex } from 'viem'

/**
* Formats a trackId to convert it into an Ethereum address. This address can be used in
* fields like `paymentReceiver` and `refundReceiver` to track Safe transactions and deployments.
*
* @param {string} trackId - The identifier provided by the user.
* @returns {`0x${string}`} - The Ethereum address derived from the identifier.
*/
function formatTrackId(trackId: string): `0x${string}` {
return `0x${keccak256(toHex(trackId)).substring(2, 42)}` // only first 40 chars from the hash
}

export default formatTrackId
5 changes: 3 additions & 2 deletions packages/protocol-kit/src/utils/transactions/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ export async function standardizeSafeTransactionData({
predictedSafe,
provider,
tx,
contractNetworks
contractNetworks,
trackId
}: StandardizeSafeTransactionDataProps): Promise<SafeTransactionData> {
const standardizedTxs = {
to: tx.to,
Expand All @@ -71,7 +72,7 @@ export async function standardizeSafeTransactionData({
baseGas: tx.baseGas ?? '0',
gasPrice: tx.gasPrice ?? '0',
gasToken: tx.gasToken || ZERO_ADDRESS,
refundReceiver: tx.refundReceiver || ZERO_ADDRESS,
refundReceiver: tx.refundReceiver || trackId || ZERO_ADDRESS,
nonce: tx.nonce ?? (safeContract ? Number(await safeContract.getNonce()) : 0)
}

Expand Down
Loading
Loading