Merge pull request #2524 from AmbireTech/feature/safe-sponsorship

Feature/safe sponsorship

Author: Oxbobby

contracts/compiled/SafeNoSignatureValidation.json

@@ -7,6 +7,13 @@ import { HardhatUserConfig } from 'hardhat/config'
 
 require('dotenv').config()
 
+const accounts = process.env.PRIVATE_KEY
+  ? [
+      process.env.PRIVATE_KEY,
+      ...(process.env.PAYMASTER_PRIVATE_KEY ? [process.env.PAYMASTER_PRIVATE_KEY] : [])
+    ]
+  : undefined
+
 const config: HardhatUserConfig = {
   solidity: {
     version: '0.8.19',
@@ -32,79 +39,119 @@ const config: HardhatUserConfig = {
   networks: {
     base: {
       url: 'https://mainnet.base.org',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     monad: {
       url: 'https://rpc.monad.xyz',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
+    },
+    polygon: {
+      url: 'https://invictus.ambire.com/polygon',
+      accounts
+    },
+    mantle: {
+      url: 'https://invictus.ambire.com/mantle',
+      accounts
+    },
+    plasma: {
+      url: 'https://rpc.plasma.to',
+      accounts
+    },
+    avalanche: {
+      url: 'https://invictus.ambire.com/avalanche',
+      accounts
+    },
+    ink: {
+      url: 'https://invictus.ambire.com/ink',
+      accounts
+    },
+    hype: {
+      url: 'https://invictus.ambire.com/hyperevm',
+      accounts
     },
     baseSepolia: {
       url: 'https://sepolia.base.org',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     opSepolia: {
       url: 'https://sepolia.optimism.io',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     sepolia: {
       url: 'https://invictus.ambire.com/sepolia',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     arbSepolia: {
       url: 'https://sepolia-rollup.arbitrum.io/rpc',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     optimism: {
       url: 'https://invictus.ambire.com/optimism',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     odyssey: {
       url: 'https://odyssey.ithaca.xyz',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     ethereum: {
       url: 'https://invictus.ambire.com/ethereum',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     linea: {
       url: 'https://linea-rpc.publicnode.com',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     binance: {
       url: 'https://invictus.ambire.com/binance-smart-chain',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     gnosis: {
       url: 'https://rpc.gnosischain.com',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     unichain: {
       url: 'https://unichain-rpc.publicnode.com',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     berachain: {
       url: 'https://rpc.berachain-apis.com',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     arbitrum: {
       url: 'https://invictus.ambire.com/arbitrum',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     berachainBepolia: {
       url: 'https://bepolia.rpc.berachain.com',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     katana: {
       url: 'https://rpc.katana.network',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     world: {
       url: 'https://invictus.ambire.com/world',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
     },
     celo: {
       url: 'https://forno.celo.org',
-      accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : undefined
+      accounts
+    },
+    robinhood: {
+      url: 'https://rpc.mainnet.chain.robinhood.com',
+      accounts
+    },
+    megaeth: {
+      url: 'https://mainnet.megaeth.com/rpc',
+      accounts
+    },
+    scroll: {
+      url: 'https://invictus.ambire.com/scroll',
+      accounts
+    },
+    kaia: {
+      url: 'https://public-en.node.kaia.io',
+      accounts
     }
   },
   etherscan: {
@@ -270,6 +317,30 @@ const config: HardhatUserConfig = {
           browserURL: 'https://monadvision.com'
         }
       },
+      {
+        network: 'polygon',
+        chainId: 137,
+        urls: {
+          apiURL: 'https://api.polygonscan.com/api',
+          browserURL: 'https://api.polygonscan.com'
+        }
+      },
+      {
+        network: 'mantle',
+        chainId: 5000,
+        urls: {
+          apiURL: 'https://api.mantlescan.xyz/api',
+          browserURL: 'https://api.mantlescan.xyz'
+        }
+      },
+      {
+        network: 'plasma',
+        chainId: 9745,
+        urls: {
+          apiURL: 'https://api.plasmascan.to/api',
+          browserURL: 'https://plasmascan.to'
+        }
+      },
       {
         network: 'world',
         chainId: 480,

hardhat.config.ts

@@ -0,0 +1,90 @@
+require('dotenv').config()
+
+const { ethers, network } = require('hardhat')
+const { Interface, keccak256, AbiCoder } = require('ethers')
+const AmbireFactory = require('../contracts/compiled/AmbireFactory.json')
+const { AMBIRE_ACCOUNT_FACTORY, AMBIRE_PAYMASTER_SIGNER } = require('@/consts/deploy')
+const { getSmartAccount } = require('@/libs/account/account')
+const { callToTuple } = require('@/libs/accountOp/accountOp')
+const { getActivatorCall } = require('@/libs/userOperation/userOperation')
+
+function wrapTypedData(chainId, verifyingAddr, executeHash) {
+  const domain = {
+    name: 'Ambire',
+    version: '1',
+    chainId: chainId.toString(),
+    verifyingContract: verifyingAddr,
+    salt: ethers.toBeHex(0, 32)
+  }
+  const types = {
+    AmbireOperation: [
+      { name: 'account', type: 'address' },
+      { name: 'hash', type: 'bytes32' }
+    ]
+  }
+  const value = {
+    account: verifyingAddr,
+    hash: executeHash
+  }
+
+  return {
+    domain,
+    types,
+    value
+  }
+}
+
+async function main() {
+  const [deployer, paymasterSigner] = await ethers.getSigners()
+
+  const ambireFactory = new Interface(AmbireFactory.abi)
+  const account = await getSmartAccount(
+    [
+      {
+        addr: AMBIRE_PAYMASTER_SIGNER,
+        hash: '0x0000000000000000000000000000000000000000000000000000000000000002' // full perm
+      }
+    ],
+    []
+  )
+  const providerNetwork = await ethers.provider.getNetwork()
+  const network = await ethers.provider.getNetwork()
+  const chainId = network.chainId
+  const abiCoder = new AbiCoder()
+  const entryPointAuthTxns = [callToTuple(getActivatorCall(account.addr))]
+  const executeHash = keccak256(
+    abiCoder.encode(
+      ['address', 'uint', 'uint', 'tuple(address, uint, bytes)[]'],
+      [account.addr, chainId, 0n, entryPointAuthTxns]
+    )
+  )
+  const typedData = wrapTypedData(chainId, account.addr, executeHash)
+  const s = await paymasterSigner.signTypedData(typedData.domain, typedData.types, typedData.value)
+  const signature = `${s}01`
+
+  const tx = {
+    to: AMBIRE_ACCOUNT_FACTORY,
+    value: 0n,
+    data: ambireFactory.encodeFunctionData('deployAndExecute', [
+      account.creation.bytecode,
+      account.creation.salt,
+      entryPointAuthTxns,
+      signature
+    ]),
+    gasLimit: 2000000n
+  }
+
+  // Send the transaction
+  const txResponse = await deployer.sendTransaction(tx)
+
+  // Wait for the transaction to be mined
+  const txReceipt = await txResponse.wait()
+
+  console.log('Transaction sent!')
+  console.log(txReceipt)
+}
+
+main().catch((error) => {
+  console.error(error)
+  process.exit(1)
+})

scripts/deploySafeSenderAccount.js

@@ -19,3 +19,4 @@ export const EIP_7702_AMBIRE_ACCOUNT = '0x5A7FC11397E9a8AD41BF10bf13F22B0a63f96f
 export const EIP_7702_METAMASK = '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B'
 export const EIP_7702_GRID_PLUS = '0x8D6220c9961E8DD1844108C854F514E120226E20'
 export const EIP_7702_KATANA = '0x8226995E02C70293595E0634C5F89547EDb08126'
+export const SAFE_SENDER = '0x3979FF5F4DF3128dd05b3d74CF9b7F462e0d9BF1'