Testing CA

.github/workflows/push-webapp.yml

@@ -9,6 +9,7 @@ on:
       - webapp
       - webapp-dev
       - webapp-demo
+      - webapp-ca
 
 jobs:
   master:
@@ -45,9 +46,9 @@ jobs:
       with:
         apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
         accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-        projectName: ${{ vars.CLOUDFLARE_PAGES_PROJECT_NAME }}
+        projectName: ${{ github.ref_name == 'webapp-ca' && 'chain-abstraction' || vars.CLOUDFLARE_PAGES_PROJECT_NAME }}
         gitHubToken: ${{ secrets.GH_AUTOMATION_TOKEN }}
-        branch: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || github.ref_name }}
+        branch: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || github.ref_name }} # Branch webapp & webapp-ca will be production branch
         directory: './packages/webapp/build'
         wranglerVersion: '3'
     - if: "github.ref_name == 'webapp-dev' && github.event_name == 'push'"

README.md

@@ -116,7 +116,7 @@ Cronjob is define in folder `packages/extension-koni-base/src/cron`.
 ### Add new redux store
 - Subwallet extension use [redux-tookit](https://redux-toolkit.js.org/) to generate store.
 - Define redux store reducers and state into separate file by method `createSlice` of redux toolkit.
-- Map reducer into root store in file index.ts
+- Map reducer into root store in file klaster.ts
 
 ### Add new message caller
 Read "Add a message handle"

package.json

@@ -104,7 +104,8 @@
     "@polkadot/types-support": "^12.0.2",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/chain-list": "0.2.87",
+    "@uniswap/v3-periphery": "1.4.4",
+    "@subwallet/chain-list": "0.2.89-beta.5",
     "@subwallet/keyring": "^0.1.6",
     "@subwallet/react-ui": "5.1.2-b79",
     "@subwallet/ui-keyring": "^0.1.6",

packages/extension-base/package.json

@@ -35,6 +35,7 @@
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
+    "@particle-network/aa": "^2.0.2",
     "@polkadot-api/merkleize-metadata": "^1.1.0",
     "@polkadot/api": "^11.0.3",
     "@polkadot/api-base": "^10.11.2",
@@ -55,13 +56,16 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.87",
+    "@subwallet/chain-list": "0.2.89-beta.5",
     "@subwallet/extension-base": "^1.2.30-0",
     "@subwallet/extension-chains": "^1.2.30-0",
     "@subwallet/extension-dapp": "^1.2.30-0",
     "@subwallet/extension-inject": "^1.2.30-0",
     "@subwallet/keyring": "^0.1.6",
     "@subwallet/ui-keyring": "^0.1.6",
+    "@uniswap/sdk-core": "^5.3.1",
+    "@uniswap/v3-periphery": "^1.4.4",
+    "@uniswap/v3-sdk": "^3.13.1",
     "@walletconnect/keyvaluestorage": "^1.1.1",
     "@walletconnect/sign-client": "^2.14.0",
     "@walletconnect/types": "^2.14.0",
@@ -85,12 +89,14 @@
     "is-buffer": "^2.0.5",
     "joi": "^17.13.3",
     "json-rpc-engine": "^6.1.0",
+    "klaster-sdk": "^0.5.11",
     "manta-extension-sdk": "^1.1.0",
     "moment": "^2.29.4",
     "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
     "sails-js": "^0.1.6",
     "uuid": "^9.0.0",
+    "viem": "^2.21.2",
     "web3": "^1.10.0",
     "web3-core": "^1.10.0",
     "web3-core-helpers": "^1.10.0",

packages/extension-base/src/background/KoniTypes.ts

@@ -6,6 +6,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
 import { AccountAuthType, AccountJson, AddressJson, AuthorizeRequest, ConfirmationRequestBase, RequestAccountList, RequestAccountSubscribe, RequestAccountUnsubscribe, RequestAuthorizeCancel, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
 import { RequestOptimalTransferProcess } from '@subwallet/extension-base/services/balance-service/helpers';
+import { BridgeProvider, CAProvider } from '@subwallet/extension-base/services/chain-abstraction-service/helper/util';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { AppBannerData, AppConfirmationData, AppPopupData } from '@subwallet/extension-base/services/mkt-campaign-service/types';
@@ -445,7 +446,7 @@ export interface UiSettings {
   unlockType: WalletUnlockType;
   enableChainPatrol: boolean;
   // On-ramp service account reference
-  walletReference: string;
+  walletReference: string
 }
 
 export type RequestSettingsType = UiSettings;
@@ -708,6 +709,7 @@ export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType
   additionalInfo?: any,
   startBlock?: number,
   nonce?: number,
+  caProvider?: CAProvider
 }
 
 export interface SWError extends Error {
@@ -1879,6 +1881,11 @@ export interface PassPhishing {
   pass: boolean;
 }
 
+export interface CaSetting {
+  caProvider: CAProvider,
+  bridgeProvider: BridgeProvider
+}
+
 export interface RequestPassPhishingPage {
   url: string;
 }
@@ -2448,6 +2455,8 @@ export interface KoniRequestSignatures {
   /* Ledger */
 
   'pri(ledger.generic.allow)': [null, string[], string[]];
+  'pri(ca.setConfig)': [CaSetting, null];
+  'pri(ca.getConfig)': [null, CaSetting];
 }
 
 export interface ApplicationMetadataType {

packages/extension-base/src/background/types.ts

@@ -11,6 +11,7 @@ import type { SignerPayloadJSON, SignerPayloadRaw } from '@polkadot/types/types'
 import type { HexString } from '@polkadot/util/types';
 import type { KeypairType } from '@polkadot/util-crypto/types';
 
+import { AccountContract } from '@particle-network/aa';
 import { CurrentNetworkInfo, KoniRequestSignatures, NetworkJson } from '@subwallet/extension-base/background/KoniTypes';
 
 import { TypeRegistry } from '@polkadot/types';
@@ -97,6 +98,24 @@ export interface AccountJson extends AbstractAddressJson {
   source?: string;
   /** Derivate path */
   suri?: string;
+
+  /** Account abstraction */
+
+  /** Is smart account */
+  isSmartAccount?: boolean;
+  /** Smart account owner */
+  smartAccountOwner?: string;
+  /** AA sdk */
+  aaSdk?: 'particle' | 'klaster';
+  /** AA provider */
+  aaProvider?: AccountContract;
+
+  /** Account abstraction */
+}
+
+export interface SmartAccountData {
+  owner: string;
+  provider?: AccountContract;
 }
 
 export interface AddressJson extends AbstractAddressJson {

packages/extension-base/src/koni/api/contract-handler/evm/web3.ts

@@ -49,3 +49,12 @@ export async function getERC20SpendingApprovalTx (spender: _Address, owner: _Add
     maxPriorityFeePerGas: priority.maxPriorityFeePerGas?.toString()
   } as TransactionConfig;
 }
+
+export function encodeSpendingApproval (spender: _Address, owner: _Address, contractAddress: _Address, evmApi: _EvmApi, amount = '115792089237316195423570985008687907853269984665640564039457584007913129639935'): string {
+  const tokenContract = getERC20Contract(contractAddress, evmApi);
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const approveCall = tokenContract.methods.approve(spender, amount); // TODO: need test
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  return approveCall.encodeABI() as string;
+}