Merge branch 'main' into tbaut-papi

.github/workflows/cypress-tests.yaml

@@ -62,16 +62,16 @@ jobs:
           # custom test command to run
           command: yarn test:ci
       # store the screenshots if the tests fail
-      - name: Store screenshots
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: cypress-screenshots
-          path: packages/ui/cypress/screenshots
-      # store the videos if the tests fail
-      - name: Store videos
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: cypress-videos
-          path: packages/ui/cypress/videos
+      # - name: Store screenshots
+      #   uses: actions/upload-artifact@v4
+      #   if: failure()
+      #   with:
+      #     name: cypress-screenshots
+      #     path: packages/ui/cypress/screenshots
+      # # store the videos if the tests fail
+      # - name: Store videos
+      #   uses: actions/upload-artifact@v4
+      #   if: failure()
+      #   with:
+      #     name: cypress-videos
+      #     path: packages/ui/cypress/videos

packages/ui/README.md

@@ -27,7 +27,7 @@ It correctly bundles React in production mode and optimizes the build for the be
 
 To ease the development of the front-end, you don't have to run an indexer.
 After `yarn && yarn start` you can directly visit the locally hosted front-end at [http://localhost:3333](http://localhost:3333).
-You will be connected to the default network, e.g http://localhost:3333?network=rococo
+You will be connected to the default network, e.g http://localhost:3333?network=paseo
 
 The front-end will automatically connect to a hosted blockchain node, as well as its associated indexer.
 

packages/ui/cypress/fixtures/knownMultisigs.ts

@@ -1,24 +1,54 @@
 import { testAccounts } from './testAccounts'
 
 export const knownMultisigs = {
-  'test-multisig-1': {
-    address: '5CmwqwwLEkEtsmB9gFaTJdCfurz33xyggHnvwHaGKtvmQNxq',
+  // this multisig is doing transactions and
+  // has logic to remove the pending tx
+  'test-simple-multisig-1': {
+    address: '1iEzHCQ6XWNKJBfdtdTSn2pmUygkGXpknXR6aZcsyxHaped',
+    publicKey: '0x1f7425dfe88e50fbef6826d117bb06c9d7d672b6ddfc1d578c581c7359beeb52',
     threshold: 2,
     signatories: [
       testAccounts['Multisig Member Account 1'].address,
       testAccounts['Multisig Member Account 2'].address
     ]
   },
-  'multisig-with-unknown-transaction': {
-    address: '5CNUH7K6RgXqEo4zK3i9cEDX1CDozJkmvuK6cRZ3z8ovY5CN',
-    pureAddress: '5GeQBX3xT9oV5PVjnuakx6tRFEwxKGqnohfduWpp4MVt1uC6',
-    purePublicKey: '0xcaa3c7393cdc0d101797a216222c1d44a92bdc3653f6d0fadfad040adad4e091',
+  'multisig-with-pure': {
+    name: 'Multisig With Pure',
+    address: '1gkDr5CdZZ6BodjWkVTgALLH75vVKU1SSSgibBC7UPMXS3A',
+    pureAddress: '161hfudUKvdgBMRzHviDGm6MZM55VoyA1thjnUFN12fYD7Jv',
+    purePublicKey: '0xddb613d315b4a0bb1aeb28fb256cc28d41f4704cc92191faae0881ebf99412d4',
     threshold: 2,
-    hashOfUknownCall: '0x49478dcdda5a328ba4918e8faca68f347462f41903c461122a36b7c51483768f',
-    callData: '0x000060556e6b6e6f776e205472616e73616374696f6e2054657374',
     signatories: [
-      testAccounts['Signatory 1 Of Multisig With Unknown Tx'].address,
-      testAccounts['Signatory 2 Of Multisig With Unknown Tx'].address
+      testAccounts['Multisig Member Account 1'].address,
+      testAccounts['Multisig Member Account 2'].address,
+      testAccounts['Multisig Member Account 3'].address
+    ]
+  },
+  // this multisig has 2 unkown tx that should
+  // not be removed
+  // it needs to have unique users never used in any other multisig
+  'multisigs-unique-users': {
+    name: 'Unique multisig',
+    address: '1MJF5WZd31i3vvsLmvgVx4uN1y9AqAGrCXhjnNThxPUVbM1',
+    publicKey: '0x0f7af3c714b7cb4b0365aca43c586371bb10560b770f53f20a2dddad8db1365d',
+    threshold: 2,
+    hashOfUknownCall: '0x15d556c6576d26ff46f46ce9032d4a2a2107ceb2974a7bfc84124faa36d5cee7',
+    callData: '0x0000286d756c74697820667477',
+    signatories: [
+      testAccounts['Multisig Member Account 4'].address,
+      testAccounts['Multisig Member Account 5'].address
+    ]
+  },
+  'watched-multisig-with-pure': {
+    name: 'Multisig With Pure',
+    address: '12sRk3vQ8CQb8HjXwBpp22QBT8ep6L9x919evDrwZXbsvaYi',
+    publicKey: '0x52b1cb22ddaf992455d8a0bec7f7aec86095715292f08f55fcd28b178b2de545',
+    pureAddress: '13RLuy3muymPYb8JR3Yqyy5uYP2fuA3WvKiZtCLo2XfcGj5Z',
+    purePublicKey: '0x6b0963f535d131f0fbf49a064b91f27d6106cf1522a93669e0d45175481665a3',
+    threshold: 2,
+    signatories: [
+      '13EUU9775dB3Cai7fuR92UitxW4gZ3erzjcPFqyn3BUXWRtL',
+      '16Am9gucwcbW92W4P7Y8gqXvNb3U98KGWBsg4zkBUyfePfn4'
     ]
   }
 }

packages/ui/cypress/fixtures/landingData.ts

@@ -1,8 +1,8 @@
 export const baseUrl = 'http://localhost:3333'
-export const defaultNetwork = 'rococo'
+export const defaultNetwork = 'paseo'
 const WATCH_ACCOUNT_ANCHOR = 'watched-accounts'
 export const landingPageNetwork = (networkName: string) => `${baseUrl}?network=${networkName}`
-export const landingPageUrl = landingPageNetwork('rococo')
+export const landingPageUrl = landingPageNetwork(defaultNetwork)
 export const getSettingsPageUrl = (network = defaultNetwork) =>
   `${baseUrl}/settings?network=${network}`
 export const getSettingsPageWatchAccountUrl = (network = defaultNetwork) =>

packages/ui/cypress/fixtures/testAccounts.ts

@@ -7,21 +7,43 @@ export interface InjectedAccountWitMnemonic extends InjectedAccount {
 
 export const testAccounts = {
   'Multisig Member Account 1': {
-    address: '5H679cx9tkuHqyReUgBxeTqXKjVikVwLySDH1buiYuoqhi2w',
+    address: '162QHxDDkYAmHWSASKExncfgBMVNSoVV3vwmAtu56zqMt1mJ',
     publicKey: '0xde3ed24acdfe71c13b4d42539c5390ddee147ba6b29b0593ce842e77ff034445',
     name: 'Multisig Member Account 1',
     type: 'sr25519',
     mnemonic: 'climb worth pioneer mushroom cloth expose tube high half final curtain toward'
   } as InjectedAccountWitMnemonic,
   'Multisig Member Account 2': {
-    address: '5GCXBrumiRDQ8KQsgbG39HdBNLQKt6XCQbeHZJccGdZbYTgt',
+    address: '158pLCAqaCUsZrRPeEK3HSTLDxPyaQ5LV6Nmibbxpib7iu4R',
     publicKey: '0xb6e6fb4f2a2268bf6e8a211d958cbf602881418bcc533216cadfae3e24785f28',
     name: 'Multisig Member Account 2',
     type: 'sr25519',
     mnemonic: 'divorce lottery slender again adapt process slow pigeon suit chase news begin'
   } as InjectedAccountWitMnemonic,
+  'Multisig Member Account 3': {
+    address: '14fm5WcyMvkVkEpTyEhFFgjDQRZspee5jfuX9QtsyNEuc9if',
+    publicKey: '0xa244679c3186eb336beb3a8335e0a6f6ab0256618f0fcb0cbc493a14cfdc765d',
+    name: 'Multisig Member Account 3',
+    type: 'sr25519',
+    mnemonic: 'double smoke neglect nasty door atom general health doctor subject regret romance'
+  } as InjectedAccountWitMnemonic,
+  'Multisig Member Account 4': {
+    address: '15a1VoMnixXyQnCf7nae89gkmbu5WMGZTniWiixxJD36NGLZ',
+    publicKey: '0xca1db422d29bc27114e68e10e98f6ae6d5981ae412de2e21b8647b46a221ae53',
+    name: 'Multisig Member Account 4',
+    type: 'sr25519',
+    mnemonic: 'prefer live muscle virtual embrace arm stone museum weasel escape ten float'
+  } as InjectedAccountWitMnemonic,
+  'Multisig Member Account 5': {
+    address: '1t8g1ZXypq36LpGCDG5nbiW42chjTScGPhAVBiejZFU5A5s',
+    publicKey: '0x26ff58054d290e16efedc0e9be37d9197791d50ad071c1a9bff12eda2737992a',
+    name: 'Multisig Member Account 5',
+    type: 'sr25519',
+    mnemonic: 'hunt pause dawn identify month ahead ship ribbon brother fit fabric fabric'
+  } as InjectedAccountWitMnemonic,
+
   'Non Multisig Member 1': {
-    address: '5EnfL3AjWckttY6xuUqfFsfjcbxr1KqdzUKHTmh7cWrDKjGd',
+    address: '13ixUNRoNQ2NL57Us7tfQ2VtUDxVhdPn4y3md4gUAbsjW8PS',
     publicKey: '0x78784374dbeba13ff9789fca0e46c4960e219a1fff11ea69d6f0b57a7f3bfb61',
     name: 'Non Multisig Member 1',
     type: 'sr25519',
@@ -34,13 +56,6 @@ export const testAccounts = {
     type: 'sr25519',
     mnemonic: 'erosion never fee pill vocal fetch enforce soap betray zero answer hollow'
   } as InjectedAccountWitMnemonic,
-  'Many Multisig And Pure Member 1': {
-    address: '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
-    publicKey: '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d',
-    name: 'Many Multisig And Pure Member 1',
-    type: 'sr25519',
-    mnemonic: 'bottom drive obey lake curtain smoke basket hold race lonely fit walk//Alice'
-  } as InjectedAccountWitMnemonic,
   'Funded Account 1 Chopsticks Kusama': {
     address: 'JEqfw2FPda5eycsqqXN2Ay67eEh5R85aSHcArs3XdUYjj5H',
     publicKey: '0xfa8e003cb5d22db1e8658e05245c3bab0851e516b71a8256bc3edf006b817161',
@@ -68,19 +83,5 @@ export const testAccounts = {
     name: 'Not Funded Account 4 Chopsticks',
     type: 'sr25519',
     mnemonic: 'bottom drive obey lake curtain smoke basket hold race lonely fit walk//chopsticks/4'
-  } as InjectedAccountWitMnemonic,
-  'Signatory 1 Of Multisig With Unknown Tx': {
-    address: '5C5RWYL7zoV6V2vdwXENSpSzWHXUxyhHBrEzhfySdQmkiF9d',
-    publicKey: '0x008c37659f858da7ec1416ce01b975af4c6eb5931805047d173d63123174a74e',
-    name: 'Signatory 1 Of Multisig With Unknown Tx',
-    type: 'sr25519',
-    mnemonic: 'various sun sell patch follow stove warfare worry cupboard kick wise wild'
-  } as InjectedAccountWitMnemonic,
-  'Signatory 2 Of Multisig With Unknown Tx': {
-    address: '5DAA5LQP8C4Cus1caXr3rwDa5LuPCJmXeoj3HrCUWEpGUV7g',
-    publicKey: '0x3064b82d59077c4d2d7b924b72e63fb9b829b5cd0706b9236c35b79ffa89995b',
-    name: 'Signatory 2 Of Multisig With Unknown Tx',
-    type: 'sr25519',
-    mnemonic: 'canyon narrow primary zoo purpose double rice faculty critic embark trophy economy'
   } as InjectedAccountWitMnemonic
 }