Merge pull request #28 from Darlington02/develop

feat: Implement TBAStarknetWindowObject

connector/package.json

@@ -12,6 +12,7 @@
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
+    "get-starknet-core": "^3.2.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",
@@ -43,6 +44,7 @@
     "starknet": "^6.0.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
-    "vite-plugin-dts": "^3.5.1"
+    "vite-plugin-dts": "^3.5.1",
+    "zod": "^3.22.4"
   }
 }

connector/src/connector/windowObject/TBAStarknetWindowObject.ts

@@ -1,4 +1,36 @@
-// modified and updated version of the starknetWindowObject, important links below:
+import type { 
+    ConnectedStarknetWindowObject, 
+    StarknetWindowObject 
+} from "get-starknet-core";
 
-// https://github.com/argentlabs/starknetkit/blob/develop/src/connectors/webwallet/starknetWindowObject/argentStarknetWindowObject.ts
-// https://github.com/starknet-io/get-starknet/blob/master/packages/core/src/StarknetWindowObject.ts#L75
+import type { 
+    AccountInterface, 
+    ProviderInterface 
+} from "starknet";
+
+import { TokenboundAccount } from "./tokenboundAccount";
+
+export async function updateStarknetWindowObject(
+    wallet: StarknetWindowObject,
+    provider: ProviderInterface,
+    tokenboundAddress: string,
+    parentAccount: AccountInterface
+): Promise<ConnectedStarknetWindowObject> {
+    const chainId = await provider.getChainId()
+
+    const valuesToAssign: Pick<
+        ConnectedStarknetWindowObject, "id" | "name" | "icon" | "version" | "isConnected" | "chainId" | "selectedAddress" | "account" | "provider"
+    > = {
+        id: "TBA",
+        name: "Tokenbound Account",
+        icon: "https://tokenbound.org/_next/image?url=%2Ftb-mark.svg&w=96&q=75",
+        version: "1.0.0",
+        isConnected: true,
+        chainId,
+        selectedAddress: tokenboundAddress,
+        account: new TokenboundAccount(provider, tokenboundAddress, parentAccount),
+        provider
+    } 
+
+    return Object.assign(wallet, valuesToAssign)
+}

connector/src/connector/windowObject/tokenboundAccount.ts

@@ -0,0 +1,62 @@
+import { 
+    Signature,
+    Account,
+    AccountInterface,
+    ProviderInterface,
+    SignerInterface,
+    Call,
+    CallData,
+} from "starknet";
+
+class UnimplementedSigner implements SignerInterface {
+    async getPubKey(): Promise<string> {
+        throw new Error("Method not implemented");
+    }
+
+    async signMessage(): Promise<Signature> {
+        throw new Error("Method not implemented");
+    }
+
+    async signTransaction(): Promise<Signature> {
+        throw new Error("Method not implemented");
+    }
+
+    async signDeclareTransaction(): Promise<Signature> {
+        throw new Error("Method not implemented");
+    }
+
+    async signDeployAccountTransaction(): Promise<Signature> {
+        throw new Error("Method not implemented");
+    }
+}
+
+ export class TokenboundAccount extends Account implements AccountInterface {
+    public signer = new UnimplementedSigner();
+
+    constructor(
+        provider: ProviderInterface,
+        public address: string,
+        public parentAccount: AccountInterface
+    ) {
+        super(provider, address, new UnimplementedSigner);
+    }
+
+    override execute = async (
+        calls: Call[]
+    ) => {
+        try {
+            let call: Call = {
+                contractAddress: this.address,
+                entrypoint: '__execute__',
+                calldata: CallData.compile({
+                    calls
+                })
+            }
+            return await this.parentAccount.execute(call);
+        }
+        catch(error) {
+            console.log(error);
+            throw new Error("Error while executing a transaction");
+        }
+    }
+}

connector/src/modal/index.tsx

@@ -1 +1,9 @@
-// modal UI goes here
+import React from "react";
+
+function index() {
+  return (
+    <div>Modal goes in here</div>
+  )
+}
+
+export default index

connector/vite.config.ts

@@ -7,7 +7,7 @@ export default defineConfig({
   build: {
     lib: {
       // Could also be a dictionary or array of multiple entry points
-      entry: resolve(__dirname, 'src/index.ts'),
+      entry: resolve(__dirname, 'src/modal/index.ts'),
       name: 'tokenbound-connector',
       // the proper extensions will be added
       fileName: 'starknet-tokenbound-connector',

sdk/src/TokenboundClient.ts

@@ -1,6 +1,24 @@
-import { AccountInterface, Contract, BigNumberish, CallData, cairo, TypedData } from "starknet"
+import { 
+    AccountInterface,
+    Contract, 
+    BigNumberish, 
+    CallData, 
+    cairo 
+} from "starknet"
+
+import { 
+    LockOptions, 
+    Call, 
+    CreateAccountOptions, 
+    GetAccountOptions, 
+    TokenboundClientOptions, 
+    GetOwnerOptions, 
+    ERC20TransferOptions, 
+    NFTTransferOptions, 
+    MultiCall 
+} from "./types/TokenboundClient"
+
 import { accountClient } from "./utils/account"
-import { LockOptions, Call, CreateAccountOptions, GetAccountOptions, TokenboundClientOptions, GetOwnerOptions, ERC20TransferOptions, NFTTransferOptions, MultiCall } from "./types/TokenboundClient"
 import { getProvider } from "./utils/provider"
 
 import registryAbi from "./abis/registry.abi.json"
@@ -204,12 +222,5 @@ export class TokenboundClient {
         }
     }
 
-    public async signMessage(typedData: TypedData) {
-        try {
-            return await this.account.signMessage(typedData)
-        }
-        catch (error) {
-            throw error
-        }
-    }
+    // implement signMessage method
 }

sdk/src/types/index.ts

@@ -1,2 +1,14 @@
-export type { TokenboundClientOptions, GetAccountOptions, CreateAccountOptions, AccountStatus, Call, LockOptions, LockStatus, GetOwnerOptions, ERC20TransferOptions, NFTTransferOptions } from "./TokenboundClient"
+export type { 
+    TokenboundClientOptions, 
+    GetAccountOptions, 
+    CreateAccountOptions, 
+    AccountStatus, 
+    Call, 
+    LockOptions, 
+    LockStatus, 
+    GetOwnerOptions, 
+    ERC20TransferOptions, 
+    NFTTransferOptions 
+} from "./TokenboundClient"
+
 export type { WalletClient } from "./walletClient"

sdk/src/utils/account.ts

@@ -2,7 +2,10 @@ import { Account } from "starknet"
 import { getProvider } from "./provider"
 import { WalletClient } from "../types/walletClient"
 
-export function accountClient(jsonRPC: string, walletClient?: WalletClient): Account {
+export function accountClient(
+    jsonRPC: string, 
+    walletClient?: WalletClient
+): Account {
     const account = new Account(getProvider(jsonRPC), walletClient!.address, walletClient!.privateKey)
     return account
 }