content modifications for demo dapp (aptos-labs#201)

nightly-labs · Nov 16, 2023 · f7984d9 · f7984d9
1 parent d5e29cc
commit f7984d9
Show file tree

Hide file tree

Showing 5 changed files with 333 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+> **_NOTE:_** Use the Wallet Adapter v2.0.0 and up with the Aptos TypeScript SDK V2
+
 # Aptos Wallet Adapter
 
 A monorepo modular wallet adapter developed and maintained by Aptos for wallet and dapp builders that includes:
@@ -19,7 +21,7 @@ Note: These are in alphabetical order, any new wallets must be in alphabetical o
 - [Fewcha](https://www.npmjs.com/package/fewcha-plugin-wallet-adapter)
 - [Flipper](https://www.npmjs.com/package/@flipperplatform/wallet-adapter-plugin)
 - [Martian](https://www.npmjs.com/package/@martianwallet/aptos-wallet-adapter)
-- [MSafe](https://www.npmjs.com/package/@msafe/aptos-wallet-adapter) 
+- [MSafe](https://www.npmjs.com/package/@msafe/aptos-wallet-adapter)
 - [Nightly](https://www.npmjs.com/package/@nightlylabs/aptos-wallet-adapter-plugin)
 - [OpenBlock](https://www.npmjs.com/package/@openblockhq/aptos-wallet-adapter)
 - [Petra](https://www.npmjs.com/package/petra-plugin-wallet-adapter)

diff --git a/apps/nextjs-example/components/transactionFlow/SingleSigner.tsx b/apps/nextjs-example/components/transactionFlow/SingleSigner.tsx
@@ -44,9 +44,7 @@ export default function SingleSignerTransaction({
       nonce: Math.random().toString(16),
     };
     const response = await signMessage(payload);
-    setSuccessAlertMessage(
-      JSON.stringify({ onSignMessageAndVerify: response })
-    );
+    setSuccessAlertMessage(JSON.stringify({ onSignMessage: response }));
   };
 
   const onSignAndSubmitTransaction = async () => {

diff --git a/apps/nextjs-example/pages/index.tsx b/apps/nextjs-example/pages/index.tsx
@@ -14,6 +14,9 @@ import MultiAgentTransaction from "../components/transactionFlow/MultiAgent";
 import Row from "../components/Row";
 import Col from "../components/Col";
 import { Network } from "@aptos-labs/ts-sdk";
+import { Typography } from "antd";
+
+const { Link } = Typography;
 
 const WalletButtons = dynamic(() => import("../components/WalletButtons"), {
   suspense: false,
@@ -44,6 +47,13 @@ export default function App() {
       <h1 className="flex justify-center mt-2 mb-4 text-4xl font-extrabold tracking-tight leading-none text-black">
         Aptos Wallet Adapter Tester ({network?.name ?? ""})
       </h1>
+      <Link
+        href="https://github.com/aptos-labs/aptos-wallet-adapter/tree/main/apps/nextjs-example"
+        target="_blank"
+        className="flex justify-center tracking-tight leading-none text-black"
+      >
+        Demo app source code
+      </Link>
       <table className="table-auto w-full border-separate border-spacing-y-8 shadow-lg bg-white border-separate">
         <tbody>
           <WalletSelect />

diff --git a/packages/wallet-adapter-react/README.md b/packages/wallet-adapter-react/README.md
@@ -1,3 +1,5 @@
+> **_NOTE:_** This documentation is for Wallet Adapter `v2.0.0` and up that is fully comatible with the Aptos TypeScript SDK V2. For Wallet Adapter `v^1.*.*` refer to [this guide](./READMEV1.md)
+
 # Wallet Adapter React Provider
 
 A react provider wrapper for the Aptos Wallet Adapter
@@ -26,6 +28,7 @@ signMessage
 signTransaction
 signMessageAndVerify
 signAndSubmitBCSTransaction
+submitTransaction
 ```
 
 ### Usage
@@ -113,6 +116,13 @@ You can find it [here](../wallet-adapter-ant-design/) with instructions on how t
 
 #### Examples
 
+##### Initialize Aptos
+
+```js
+const aptosConfig = new AptosConfig({ network: Network.TESTNET });
+const aptos = new Aptos(aptosConfig);
+```
+
 ##### connect(walletName)
 
 ```js
@@ -132,61 +142,51 @@ const onConnect = async (walletName) => {
 ##### signAndSubmitTransaction(payload)
 
 ```js
-  const onSignAndSubmitTransaction = async () => {
-    const payload: Types.TransactionPayload = {
-      type: "entry_function_payload",
+const onSignAndSubmitTransaction = async () => {
+  const response = await signAndSubmitTransaction({
+    sender: account.address,
+    data: {
       function: "0x1::coin::transfer",
-      type_arguments: ["0x1::aptos_coin::AptosCoin"],
-      arguments: [account?.address, 1], // 1 is in Octas
-    };
-    const response = await signAndSubmitTransaction(payload);
-    // if you want to wait for transaction
-    try {
-      await aptosClient.waitForTransaction(response?.hash || "");
-    } catch (error) {
-      console.error(error);
-    }
-  };
+      typeArguments: ["0x1::aptos_coin::AptosCoin"],
+      functionArguments: [account.address, 1],
+    },
+  });
+  // if you want to wait for transaction
+  try {
+    await aptos.waitForTransaction({ transactionHash: response.hash });
+  } catch (error) {
+    console.error(error);
+  }
+};
 
 <button onClick={onSignAndSubmitTransaction}>
   Sign and submit transaction
-</button>
+</button>;
 ```
 
 ##### signAndSubmitBCSTransaction(payload)
 
 ```js
-   const onSignAndSubmitBCSTransaction = async () => {
-    const token = new TxnBuilderTypes.TypeTagStruct(
-      TxnBuilderTypes.StructTag.fromString("0x1::aptos_coin::AptosCoin")
-    );
-    const entryFunctionBCSPayload =
-      new TxnBuilderTypes.TransactionPayloadEntryFunction(
-        TxnBuilderTypes.EntryFunction.natural(
-          "0x1::coin",
-          "transfer",
-          [token],
-          [
-            BCS.bcsToBytes(
-              TxnBuilderTypes.AccountAddress.fromHex(account!.address)
-            ),
-            BCS.bcsSerializeUint64(2),
-          ]
-        )
-      );
-
-    const response = await signAndSubmitBCSTransaction(entryFunctionBCSPayload);
-    // if you want to wait for transaction
-    try {
-      await aptosClient.waitForTransaction(response?.hash || "");
-    } catch (error) {
-      console.error(error);
-    }
-  };
+const onSignAndSubmitBCSTransaction = async () => {
+  const response = await signAndSubmitTransaction({
+    sender: account.address,
+    data: {
+      function: "0x1::coin::transfer",
+      typeArguments: [parseTypeTag(APTOS_COIN)],
+      functionArguments: [AccountAddress.from(account.address), new U64(1)],
+    },
+  });
+  // if you want to wait for transaction
+  try {
+    await aptos.waitForTransaction({ transactionHash: response.hash });
+  } catch (error) {
+    console.error(error);
+  }
+};
 
 <button onClick={onSignAndSubmitTransaction}>
   Sign and submit BCS transaction
-</button>
+</button>;
 ```
 
 ##### signMessage(payload)
@@ -235,19 +235,17 @@ const onSignMessage = async () => {
 ##### signTransaction(payload)
 
 ```js
-  const onSignTransaction = async () => {
-    const payload: Types.TransactionPayload = {
-      type: "entry_function_payload",
-      function: "0x1::coin::transfer",
-      type_arguments: ["0x1::aptos_coin::AptosCoin"],
-      arguments: [account?.address, 1], // 1 is in Octas
-    };
-    const response = await signTransaction(payload);
+const onSignTransaction = async () => {
+  const payload = {
+    type: "entry_function_payload",
+    function: "0x1::coin::transfer",
+    type_arguments: ["0x1::aptos_coin::AptosCoin"],
+    arguments: [account?.address, 1], // 1 is in Octas
   };
+  const response = await signTransaction(payload);
+};
 
-<button onClick={onSignTransaction}>
-  Sign transaction
-</button>
+<button onClick={onSignTransaction}>Sign transaction</button>;
 ```
 
 ##### signMessageAndVerify(payload)