Release / v2.104.0

.github/workflows/tests.yml

@@ -1,6 +1,7 @@
 name: Execute Unit Tests
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - v2

contracts/deployless/EnsGetter.sol

@@ -9,6 +9,16 @@ interface IUniversalResolver {
   ) external view returns (string memory resolvedName, address resolver, address reverseResolver);
 }
 
+interface IBaseRegistrar {
+  function nameExpires(uint256 id) external view returns (uint256);
+
+  function GRACE_PERIOD() external view returns (uint256);
+}
+
+interface INameWrapper {
+  function getData(uint256 id) external view returns (address owner, uint32 fuses, uint64 expiry);
+}
+
 contract EnsGetter {
   struct ReverseLookupResult {
     string resolvedName;
@@ -19,6 +29,15 @@ contract EnsGetter {
     bool needsOffchainLookup;
   }
 
+  struct ExpiryResult {
+    // Registration expiry, in seconds
+    uint256 expiry;
+    // Grace period, in seconds. 0 on the NameWrapper path (the wrapper expiry has no separate grace)
+    uint256 gracePeriod;
+    // block.timestamp of the eth_call, so the caller's updatedAt is consistent with the expiry snapshot
+    uint256 blockTimestamp;
+  }
+
   // EIP-3668
   bytes4 constant OFFCHAIN_LOOKUP_SELECTOR = 0x556f1830;
 
@@ -67,4 +86,25 @@ contract EnsGetter {
       gateways
     );
   }
+
+  // Batches ENS expiry calls. Routing is decided by the caller:
+  // - useRegistrar == true: `.eth` 2LD, read from the BaseRegistrar (expiry + separate GRACE_PERIOD).
+  // - useRegistrar == false: subnames / non-`.eth` names, read from the NameWrapper (no grace period).
+  // `id` is the registrar token id (labelhash of the first label) or the wrapper node (namehash),
+  function getExpiry(
+    bool useRegistrar,
+    address baseRegistrar,
+    address nameWrapper,
+    uint256 id
+  ) external view returns (ExpiryResult memory result) {
+    result.blockTimestamp = block.timestamp;
+
+    if (useRegistrar) {
+      result.expiry = IBaseRegistrar(baseRegistrar).nameExpires(id);
+      result.gracePeriod = IBaseRegistrar(baseRegistrar).GRACE_PERIOD();
+    } else {
+      (, , uint64 wrapperExpiry) = INameWrapper(nameWrapper).getData(id);
+      result.expiry = wrapperExpiry;
+    }
+  }
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.103.3",
+  "version": "2.104.0",
   "name": "ambire-common",
   "description": "Common ground for the Ambire apps",
   "scripts": {
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@ambire/signature-validator": "^1.5.0",
+    "@corpus-core/colibri-stateless": "^1.1.30",
     "@lifi/types": "^17.7.1",
     "@metamask/eth-sig-util": "^8.2.0",
     "@safe-global/api-kit": "^4.2.0",

scripts/deployBalanceGetter.js

@@ -0,0 +1,46 @@
+require('dotenv').config()
+
+const { ethers } = require('hardhat')
+const { Interface } = require('ethers')
+const balanceGetter = require('../contracts/compiled/BalanceGetter.json')
+
+async function main() {
+  const [deployer] = await ethers.getSigners()
+
+  const bytecode = balanceGetter.bin
+  const salt = '0x0000000000000000000000000000000000000000000000000000000000000000'
+  const singletonABI = [
+    {
+      inputs: [
+        { internalType: 'bytes', name: '_initCode', type: 'bytes' },
+        { internalType: 'bytes32', name: '_salt', type: 'bytes32' }
+      ],
+      name: 'deploy',
+      outputs: [{ internalType: 'address payable', name: 'createdContract', type: 'address' }],
+      stateMutability: 'nonpayable',
+      type: 'function'
+    }
+  ]
+  const singletonInterface = new Interface(singletonABI)
+
+  const tx = {
+    to: '0xce0042B868300000d44A59004Da54A005ffdcf9f', // the singleton
+    value: 0n,
+    data: singletonInterface.encodeFunctionData('deploy', [bytecode, salt]),
+    gasLimit: 3500000n
+  }
+
+  // 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/deployNftGetter.js

@@ -0,0 +1,46 @@
+require('dotenv').config()
+
+const { ethers } = require('hardhat')
+const { Interface } = require('ethers')
+const nftGetter = require('../contracts/compiled/NftGetter.json')
+
+async function main() {
+  const [deployer] = await ethers.getSigners()
+
+  const bytecode = nftGetter.bin
+  const salt = '0x0000000000000000000000000000000000000000000000000000000000000000'
+  const singletonABI = [
+    {
+      inputs: [
+        { internalType: 'bytes', name: '_initCode', type: 'bytes' },
+        { internalType: 'bytes32', name: '_salt', type: 'bytes32' }
+      ],
+      name: 'deploy',
+      outputs: [{ internalType: 'address payable', name: 'createdContract', type: 'address' }],
+      stateMutability: 'nonpayable',
+      type: 'function'
+    }
+  ]
+  const singletonInterface = new Interface(singletonABI)
+
+  const tx = {
+    to: '0xce0042B868300000d44A59004Da54A005ffdcf9f', // the singleton
+    value: 0n,
+    data: singletonInterface.encodeFunctionData('deploy', [bytecode, salt]),
+    gasLimit: 3000000n
+  }
+
+  // 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)
+})

src/consts/autoLogin.ts

@@ -0,0 +1,20 @@
+export const DEFAULT_AUTO_LOGIN_DURATION_OPTION = {
+  label: '30 days',
+  value: 30 * 24 * 60 * 60 * 1000
+}
+
+// Implemented here to ensure consistency between the controller and the UI
+// Also, in the future when the duration setting becomes exposed to the UI we
+// will need to validate the input from the UI, so these will be useful
+export const AUTO_LOGIN_DURATION_OPTIONS = [
+  { label: '24 hours', value: 24 * 60 * 60 * 1000 },
+  {
+    label: '7 days',
+    value: 7 * 24 * 60 * 60 * 1000
+  },
+  {
+    label: '14 days',
+    value: 14 * 24 * 60 * 60 * 1000
+  },
+  DEFAULT_AUTO_LOGIN_DURATION_OPTION
+]

src/consts/deploy.ts

@@ -20,3 +20,7 @@ export const EIP_7702_METAMASK = '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B'
 export const EIP_7702_GRID_PLUS = '0x8D6220c9961E8DD1844108C854F514E120226E20'
 export const EIP_7702_KATANA = '0x8226995E02C70293595E0634C5F89547EDb08126'
 export const SAFE_SENDER = '0x3979FF5F4DF3128dd05b3d74CF9b7F462e0d9BF1'
+
+// used for colibri verification
+export const BALANCE_GETTER = '0x3f58D86408988FBD8aeEA5AD063173F249f5B214'
+export const NFT_GETTER = '0xE8340AEFEd909d64117929c1Ce5F6e217faf4362'

src/controllers/activity/activity.test.ts

@@ -1,3 +1,4 @@
+import { getAddress } from 'ethers'
 import fetch from 'node-fetch'
 
 import { generateUuid } from '@/utils/uuid'
@@ -167,14 +168,14 @@ describe('Activity Controller ', () => {
       const { controller } = await prepareTest()
 
       const trustedRecipient = '0xF0cD725D2195b1D3f4BD038c3786005B793237DB'
-      const poisoningRecipient4 = '0xF0cDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa37DB'
-      const poisoningRecipient5 = '0xF0cD7bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb237DB'
-      const poisoningRecipient6 = '0xF0cD72ccccccccccccccccccccccccccccc237DB'
-      const poisoningRecipient4to8 = '0xF0cDdddddddddddddddddddddddddddd793237DB'
-      const poisoningRecipient3to8 = '0xF0ceeeeeeeeeeeeeeeeeeeeeeeeeeeee793237DB'
-      const poisoningRecipient0to8 = '0xAb12ffffffffffffffffffffffffffff793237DB'
-      const poisoningRecipient3to4 = '0xF0caaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa37DB'
-      const poisoningRecipient0to0 = '0xAb12eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeCDef'
+      const poisoningRecipient4 = '0xF0cdAaAaaAAAaAAAaaaAaAaAAaAaaaAaAaaA37Db'
+      const poisoningRecipient5 = '0xf0cd7BbbBbbbBbBBbbbBBBBbbbbBBbbbbbb237DB'
+      const poisoningRecipient6 = '0xf0cd72ccCCccCcCccCCCCcCCcCcCCCCccCC237DB'
+      const poisoningRecipient4to8 = '0xF0CdDDDddddDdDdDdDDDDDDDDdddDDDD793237db'
+      const poisoningRecipient3to8 = '0xF0cEEeeeEEEEEeEEEEeeEEEEeeEeeeEe793237db'
+      const poisoningRecipient0to8 = '0xaB12ffFFfFFFFfFfFFFffffFffFFFfFF793237DB'
+      const poisoningRecipient3to4 = '0xF0cAAaAaAaaaAAaAAaaaaAAaaaAaAAAaAAaa37dB'
+      const poisoningRecipient0to0 = '0xAB12eeeeeeeEeeeEeeeEEeeeEEEEEeeEeEeeCdef'
 
       await controller.addAccountOp({
         ...SUBMITTED_ACCOUNT_OP,
@@ -304,7 +305,7 @@ describe('Activity Controller ', () => {
     test('should not detect poisoning without transaction history', async () => {
       const { controller } = await prepareTest()
 
-      const poisoningRecipient4to4 = '0xF0cDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa37DB'
+      const poisoningRecipient4to4 = '0xF0cdAaAaaAAAaAAAaaaAaAaAAaAaaaAaAaaA37Db'
       const normalizedPoisoningRecipient4to4 = poisoningRecipient4to4.toLowerCase()
 
       const firstTimeSendResult = await controller.hasAccountOpsSentTo(
@@ -1176,4 +1177,63 @@ describe('Activity Controller ', () => {
     expect(controller.accountsOps[sessionId]!.result!.items.length).toEqual(0)
     expect(controller.signedMessages[sessionId]!.result!.items.length).toEqual(0)
   })
+
+  describe('Sent-to history', () => {
+    const DOMAIN_ADDR_A = '0xF0cD725D2195b1D3f4BD038c3786005B793237DB'
+    const DOMAIN_ADDR_B = '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045'
+
+    const SENT_AT = new Date('2024-03-01T10:00:00Z').getTime()
+    const SENT_AT_LATER = new Date('2024-06-15T18:30:00Z').getTime()
+
+    it('records and reads the address a domain was sent to (global, case-insensitive)', async () => {
+      const { controller } = await prepareTest()
+
+      // await controller.recordSentToDomain('alice.eth', DOMAIN_ADDR_A, SENT_AT)
+      await controller.addAccountOp({
+        ...SUBMITTED_ACCOUNT_OP,
+        calls: [{ to: DOMAIN_ADDR_A, recipientDomain: 'alice.eth', value: 0n, data: '0x' }]
+      })
+
+      // Checksummed, and the domain lookup is case-insensitive.
+      expect(controller.getSentToDomainAddress('alice.eth')).toBe(getAddress(DOMAIN_ADDR_A))
+      expect(controller.getSentToDomainAddress('ALICE.eth')).toBe(getAddress(DOMAIN_ADDR_A))
+    })
+
+    it('overwrites with the most recent address', async () => {
+      const { controller } = await prepareTest()
+
+      await controller.addAccountOp({
+        ...SUBMITTED_ACCOUNT_OP,
+        timestamp: SENT_AT,
+        calls: [{ to: DOMAIN_ADDR_B, recipientDomain: 'alice.eth', value: 0n, data: '0x' }]
+      })
+      await controller.addAccountOp({
+        ...SUBMITTED_ACCOUNT_OP,
+        timestamp: SENT_AT_LATER,
+        calls: [{ to: DOMAIN_ADDR_A, recipientDomain: 'alice.eth', value: 0n, data: '0x' }]
+      })
+
+      expect(controller.getSentToDomainAddress('alice.eth')).toBe(getAddress(DOMAIN_ADDR_A))
+    })
+
+    it('stores recipients checksummed', async () => {
+      const { controller } = await prepareTest()
+
+      const recipientLower = '0xf0cd725d2195b1d3f4bd038c3786005b793237db'
+      await controller.addAccountOp({
+        ...SUBMITTED_ACCOUNT_OP,
+        nonce: 302n,
+        txnId: '0x4c8a1d6f93b072e5af18c34d9e6072b1f5a83c0d7e29b46f1a0c5d8e3b97f246',
+        timestamp: SENT_AT_LATER,
+        calls: [{ to: recipientLower, value: 0n, data: '0x' }]
+      })
+
+      const stored = await storage.get('sentToHistory', { domains: {}, recipients: {} })
+      const recipientsForAccount = stored.recipients[SUBMITTED_ACCOUNT_OP.accountAddr]
+      expect(recipientsForAccount).toBeDefined()
+
+      expect(recipientsForAccount![getAddress(recipientLower)]).toBe(SENT_AT_LATER)
+      expect(recipientsForAccount![recipientLower]).toBeUndefined()
+    })
+  })
 })