Removed contractId and added made contracts required, signAndSendTran…

examples/angular/src/app/components/content/content.component.ts

@@ -292,14 +292,14 @@ export class ContentComponent implements OnInit, OnDestroy {
   }
 
   async addMessages(message: string, donation: string, multiple: boolean) {
-    const { contract } = this.selector.store.getState();
     const wallet = await this.selector.wallet();
 
     if (!multiple) {
       return wallet
         .signAndSendTransaction({
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           signerId: this.accountId!,
+          receiverId: CONTRACT_ID,
           actions: [
             {
               type: "FunctionCall",
@@ -328,7 +328,7 @@ export class ContentComponent implements OnInit, OnDestroy {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         signerId: this.accountId!,
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        receiverId: contract!.contractId,
+        receiverId: CONTRACT_ID,
         actions: [
           {
             type: "FunctionCall",

examples/angular/src/app/pages/wallet-selector/wallet-selector.component.ts

@@ -88,7 +88,7 @@ export class WalletSelectorComponent implements OnInit {
     });
 
     const _modal = setupModal(_selector, {
-      contractId: CONTRACT_ID,
+      contracts: [{ receiverId: CONTRACT_ID, methodNames: [] }],
     });
     const state = _selector.store.getState();
 

examples/react/components/Content.tsx

@@ -161,12 +161,12 @@ const Content: React.FC = () => {
 
   const addMessages = useCallback(
     async (message: string, donation: string, multiple: boolean) => {
-      const { contract } = selector.store.getState();
       const wallet = await selector.wallet();
       if (!multiple) {
         return wallet
           .signAndSendTransaction({
             signerId: accountId!,
+            receiverId: CONTRACT_ID,
             actions: [
               {
                 type: "FunctionCall",
@@ -192,7 +192,7 @@ const Content: React.FC = () => {
       for (let i = 0; i < 2; i += 1) {
         transactions.push({
           signerId: accountId!,
-          receiverId: contract!.contractId,
+          receiverId: CONTRACT_ID,
           actions: [
             {
               type: "FunctionCall",

examples/react/contexts/WalletSelectorContext.tsx

@@ -98,7 +98,7 @@ export const WalletSelectorContextProvider: React.FC<{
       ],
     });
     const _modal = setupModal(_selector, {
-      contractId: CONTRACT_ID,
+      contracts: [{ receiverId: CONTRACT_ID, methodNames: [] }],
     });
     const state = _selector.store.getState();
     setAccounts(state.accounts);

packages/bitget-wallet/src/lib/bitget-wallet.ts

@@ -191,15 +191,15 @@ const BitgetWallet: WalletBehaviourFactory<InjectedWallet> = async ({
     async signAndSendTransaction({ signerId, receiverId, actions }) {
       logger.log("signAndSendTransaction", { signerId, receiverId, actions });
 
-      const { contract } = store.getState();
+      const { contracts } = store.getState();
 
-      if (!_state.wallet.isSignedIn() || !contract) {
+      if (!_state.wallet.isSignedIn() || contracts.length < 1) {
         throw new Error("Wallet not signed in");
       }
 
       return _state.wallet
         .signAndSendTransaction({
-          receiverId: receiverId || contract.contractId,
+          receiverId: receiverId,
           actions: actions,
         })
         .then((res) => {

packages/coin98-wallet/src/lib/coin98-wallet.ts

@@ -70,11 +70,11 @@ const Coin98Wallet: WalletBehaviourFactory<InjectedWallet> = async ({
   };
 
   const transformTransactions = (
-    transactions: Array<Optional<Transaction, "signerId" | "receiverId">>
+    transactions: Array<Optional<Transaction, "signerId">>
   ): Array<Transaction> => {
-    const { contract } = store.getState();
+    const { contracts } = store.getState();
 
-    if (!contract) {
+    if (contracts.length < 1) {
       throw new Error("Wallet not signed in");
     }
 
@@ -87,7 +87,7 @@ const Coin98Wallet: WalletBehaviourFactory<InjectedWallet> = async ({
     return transactions.map((transaction) => {
       return {
         signerId: transaction.signerId || account.accountId,
-        receiverId: transaction.receiverId || contract.contractId,
+        receiverId: transaction.receiverId,
         actions: transaction.actions,
       };
     });

packages/core/docs/api/state.md

@@ -22,7 +22,7 @@ console.log(contract); // { contractId: "test.testnet", methodNames: [] }
 
 **Returns**
 
-- `MultiContractState | null`
+- `MultiContractState`
   - `contractId` (`string`): Account ID of the Smart Contract.
   - `methodNames` (`Array<string>`): List of methods that can only be invoked on the Smart Contract. Empty list means no restriction.
 

packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts

@@ -89,9 +89,8 @@ export class WalletModules {
       PENDING_CONTRACT
     );
 
-    const pendingContracts = await jsonStorage.getItem<MultiContractState>(
-      PENDING_CONTRACTS
-    );
+    const pendingContracts =
+      (await jsonStorage.getItem<MultiContractState>(PENDING_CONTRACTS)) || [];
 
     if (pendingSelectedWalletId && pendingContract) {
       const accounts = await this.validateWallet(pendingSelectedWalletId);
@@ -119,15 +118,14 @@ export class WalletModules {
 
         return {
           accounts,
-          contract: pendingContract,
           selectedWalletId: pendingSelectedWalletId,
           recentlySignedInWallets: recentlySignedInWalletsFromPending,
           contracts: pendingContracts,
         };
       }
     }
 
-    const { contract, selectedWalletId, contracts } = this.store.getState();
+    const { selectedWalletId, contracts } = this.store.getState();
     const accounts = await this.validateWallet(selectedWalletId);
 
     const recentlySignedInWallets = await jsonStorage.getItem<Array<string>>(
@@ -137,16 +135,14 @@ export class WalletModules {
     if (!accounts.length) {
       return {
         accounts: [],
-        contract: null,
         selectedWalletId: null,
         recentlySignedInWallets: recentlySignedInWallets || [],
-        contracts: null,
+        contracts: [],
       };
     }
 
     return {
       accounts,
-      contract,
       selectedWalletId,
       recentlySignedInWallets: recentlySignedInWallets || [],
       contracts,
@@ -190,26 +186,21 @@ export class WalletModules {
 
   private async onWalletSignedIn(
     walletId: string,
-    { accounts, contractId, methodNames, contracts }: WalletEvents["signedIn"]
+    { accounts, contracts }: WalletEvents["signedIn"]
   ) {
     const { selectedWalletId } = this.store.getState();
     const jsonStorage = new JsonStorage(this.storage, PACKAGE_NAME);
-    const contract = { contractId, methodNames };
 
     if (!accounts.length) {
       const module = this.getModule(walletId)!;
       // We can't guarantee the user will actually sign in with browser wallets.
       // Best we can do is set in storage and validate on init.
       if (module.type === "browser") {
         await jsonStorage.setItem(PENDING_SELECTED_WALLET_ID, walletId);
-        await jsonStorage.setItem<ContractState>(PENDING_CONTRACT, contract);
-
-        if (contracts) {
-          await jsonStorage.setItem<MultiContractState>(
-            PENDING_CONTRACTS,
-            contracts
-          );
-        }
+        await jsonStorage.setItem<MultiContractState>(
+          PENDING_CONTRACTS,
+          contracts
+        );
       }
 
       return;
@@ -227,7 +218,6 @@ export class WalletModules {
       type: "WALLET_CONNECTED",
       payload: {
         walletId,
-        contract,
         accounts,
         recentlySignedInWallets,
         contracts,
@@ -236,8 +226,6 @@ export class WalletModules {
 
     this.emitter.emit("signedIn", {
       walletId,
-      contractId,
-      methodNames,
       accounts,
       contracts,
     });
@@ -319,9 +307,7 @@ export class WalletModules {
       const { contractId, methodNames = [] } = params as SignInParams;
       await this.onWalletSignedIn(wallet.id, {
         accounts,
-        contractId,
-        methodNames,
-        contracts: null,
+        contracts: [{ contractId, methodNames }],
       });
 
       return accounts;
@@ -341,8 +327,6 @@ export class WalletModules {
       }));
       await this.onWalletSignedIn(wallet.id, {
         accounts,
-        contractId: contracts[0].contractId,
-        methodNames: contracts[0].methodNames,
         contracts,
       });
 
@@ -467,20 +451,14 @@ export class WalletModules {
 
     this.modules = modules;
 
-    const {
-      accounts,
-      contract,
-      selectedWalletId,
-      recentlySignedInWallets,
-      contracts,
-    } = await this.resolveStorageState();
+    const { accounts, selectedWalletId, recentlySignedInWallets, contracts } =
+      await this.resolveStorageState();
 
     this.store.dispatch({
       type: "SETUP_WALLET_MODULES",
       payload: {
         modules,
         accounts,
-        contract,
         selectedWalletId,
         recentlySignedInWallets,
         contracts,

packages/core/src/lib/store.ts

@@ -9,10 +9,10 @@ import type {
 } from "./store.types";
 import {
   PACKAGE_NAME,
-  CONTRACT,
   SELECTED_WALLET_ID,
   RECENTLY_SIGNED_IN_WALLETS,
   CONTRACTS,
+  CONTRACT,
 } from "./constants";
 
 const reducer = (
@@ -26,7 +26,6 @@ const reducer = (
       const {
         modules,
         accounts,
-        contract,
         selectedWalletId,
         recentlySignedInWallets,
         contracts,
@@ -43,20 +42,14 @@ const reducer = (
         ...state,
         modules,
         accounts: accountStates,
-        contract,
         selectedWalletId,
         recentlySignedInWallets,
         contracts,
       };
     }
     case "WALLET_CONNECTED": {
-      const {
-        walletId,
-        contract,
-        accounts,
-        recentlySignedInWallets,
-        contracts,
-      } = action.payload;
+      const { walletId, accounts, recentlySignedInWallets, contracts } =
+        action.payload;
 
       if (!accounts.length) {
         return state;
@@ -75,7 +68,6 @@ const reducer = (
 
       return {
         ...state,
-        contract,
         accounts: accountStates,
         selectedWalletId: walletId,
         recentlySignedInWallets,
@@ -91,10 +83,9 @@ const reducer = (
 
       return {
         ...state,
-        contract: null,
         accounts: [],
         selectedWalletId: null,
-        contracts: null,
+        contracts: [],
       };
     }
     case "ACCOUNTS_CHANGED": {
@@ -144,16 +135,27 @@ const reducer = (
   }
 };
 
+const updateOldContractState = async (storage: JsonStorage) => {
+  const oldState = await storage.getItem(CONTRACT);
+
+  if (oldState) {
+    await storage.setItem(CONTRACTS, [oldState]);
+    await storage.removeItem(CONTRACT);
+  }
+};
+
 export const createStore = async (storage: StorageService): Promise<Store> => {
   const jsonStorage = new JsonStorage(storage, PACKAGE_NAME);
+
+  await updateOldContractState(jsonStorage);
+
   const initialState: WalletSelectorState = {
     modules: [],
     accounts: [],
-    contract: await jsonStorage.getItem(CONTRACT),
     selectedWalletId: await jsonStorage.getItem(SELECTED_WALLET_ID),
     recentlySignedInWallets:
       (await jsonStorage.getItem(RECENTLY_SIGNED_IN_WALLETS)) || [],
-    contracts: await jsonStorage.getItem(CONTRACTS),
+    contracts: (await jsonStorage.getItem(CONTRACTS)) || [],
   };
 
   const state$ = new BehaviorSubject(initialState);
@@ -182,7 +184,6 @@ export const createStore = async (storage: StorageService): Promise<Store> => {
   let prevState = state$.getValue();
   state$.subscribe((state) => {
     syncStorage(prevState, state, SELECTED_WALLET_ID, "selectedWalletId");
-    syncStorage(prevState, state, CONTRACT, "contract");
     syncStorage(
       prevState,
       state,