Use new transaction fromJSON and toJSON

examples/add-example-Web3Id/package.json

@@ -8,6 +8,6 @@
         "start": "live-server ./index.html --mount=/sdk.js:../../node_modules/@concordium/web-sdk/lib/concordium.min.js --mount=/helpers.js:../../packages/browser-wallet-api-helpers/lib/concordiumHelpers.min.js"
     },
     "dependencies": {
-        "@concordium/web-sdk": "^7.1.0"
+        "@concordium/web-sdk": "^7.3.2"
     }
 }

examples/eSealing/package.json

@@ -5,7 +5,7 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@concordium/react-components": "^0.4.0",
-        "@concordium/web-sdk": "^7.1.0",
+        "@concordium/web-sdk": "^7.3.2",
         "@thi.ng/leb128": "^2.1.18",
         "@types/sha256": "^0.2.0",
         "@walletconnect/types": "^2.1.4",

examples/nft-minting/package.json

@@ -3,7 +3,7 @@
     "packageManager": "[email protected]",
     "dependencies": {
         "@concordium/browser-wallet-api-helpers": "workspace:^",
-        "@concordium/web-sdk": "^7.1.0",
+        "@concordium/web-sdk": "^7.3.2",
         "cors": "^2.8.5",
         "express": "^4.18.1",
         "express-fileupload": "^1.4.0",

examples/piggybank/package.json

@@ -3,7 +3,7 @@
     "packageManager": "[email protected]",
     "dependencies": {
         "@concordium/browser-wallet-api-helpers": "workspace:^",
-        "@concordium/web-sdk": "^7.1.0",
+        "@concordium/web-sdk": "^7.3.2",
         "react": "^18.1.0",
         "react-dom": "^18.1.0"
     },

examples/two-step-transfer/package.json

@@ -8,6 +8,6 @@
         "start": "live-server ../two-step-transfer/index.html --mount=/sdk.js:../../node_modules/@concordium/web-sdk/lib/min/concordium.web.min.js --mount=/helpers.js:../../packages/browser-wallet-api-helpers/lib/concordiumHelpers.min.js"
     },
     "dependencies": {
-        "@concordium/web-sdk": "^7.1.0"
+        "@concordium/web-sdk": "^7.3.2"
     }
 }

examples/voting/package.json

@@ -5,7 +5,7 @@
     "packageManager": "[email protected]",
     "dependencies": {
         "@concordium/browser-wallet-api-helpers": "^3.0.0",
-        "@concordium/web-sdk": "^7.1.0",
+        "@concordium/web-sdk": "^7.3.2",
         "bootstrap": "^5.2.1",
         "moment": "^2.29.4",
         "react": "^18.2.0",

examples/wCCD/package.json

@@ -5,7 +5,7 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@concordium/react-components": "^0.4.0",
-        "@concordium/web-sdk": "^7.1.0",
+        "@concordium/web-sdk": "^7.3.2",
         "@thi.ng/leb128": "^2.1.18",
         "@walletconnect/types": "^2.1.4",
         "mathjs": "^11.4.0",

packages/browser-wallet-api/package.json

@@ -10,7 +10,7 @@
         "@concordium/browser-wallet-api-helpers": "workspace:^",
         "@concordium/browser-wallet-message-hub": "workspace:^",
         "@concordium/common-sdk": "^9.5.3",
-        "@concordium/web-sdk": "^7.1.0",
+        "@concordium/web-sdk": "^7.3.2",
         "@protobuf-ts/grpcweb-transport": "^2.8.2",
         "@protobuf-ts/runtime-rpc": "^2.8.2",
         "buffer": "^6.0.3",

packages/browser-wallet-api/src/compatibility.ts

@@ -30,6 +30,10 @@ import {
     SimpleTransferWithMemoPayload,
     UpdateCredentialsPayload,
     DataBlob,
+    AccountTransactionPayload,
+    Parameter,
+    getAccountTransactionHandler,
+    AccountTransactionPayloadJSON,
 } from '@concordium/web-sdk/types';
 import { IdStatement } from '@concordium/web-sdk/id';
 
@@ -346,7 +350,7 @@ function sanitizePayload(type: AccountTransactionType, payload: SendTransactionP
 export type SanitizedSendTransactionInput = {
     accountAddress: AccountAddress.Type;
     type: AccountTransactionType;
-    payload: SendTransactionPayload;
+    payload: AccountTransactionPayloadJSON;
     parameters?: SmartContractParameters;
     schema?: SchemaWithContext;
     schemaVersion?: SchemaVersion;
@@ -366,6 +370,28 @@ export function sanitizeSendTransactionInput(
     const sanitizedAccountAddress = sanitizeAccountAddress(accountAddress);
     const sanitizedPayload = sanitizePayload(type, payload);
 
+    let accountTransactionPayload: AccountTransactionPayload;
+    switch (type) {
+        case AccountTransactionType.Update:
+            accountTransactionPayload = {
+                ...(sanitizedPayload as SendTransactionUpdateContractPayload),
+                message: Parameter.empty(),
+            };
+            break;
+        case AccountTransactionType.InitContract:
+            accountTransactionPayload = {
+                ...(sanitizedPayload as SendTransactionInitContractPayload),
+                param: Parameter.empty(),
+            };
+            break;
+        default:
+            accountTransactionPayload = sanitizedPayload as AccountTransactionPayload;
+            break;
+    }
+
+    const handler = getAccountTransactionHandler(type);
+    const sanitizedPayloadJSON = handler.toJSON(accountTransactionPayload);
+
     let sanitizedSchema: SchemaWithContext | undefined;
     if (typeof schema === 'string' || schema instanceof String) {
         sanitizedSchema = {
@@ -379,7 +405,7 @@ export function sanitizeSendTransactionInput(
     return {
         accountAddress: sanitizedAccountAddress,
         type,
-        payload: sanitizedPayload,
+        payload: sanitizedPayloadJSON,
         parameters,
         schema: sanitizedSchema,
         schemaVersion,

packages/browser-wallet-api/src/util.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { CcdAmount, jsonStringify } from '@concordium/web-sdk/types';
+import { CcdAmount } from '@concordium/web-sdk/types';
 import { Buffer } from 'buffer/';
 import { isGtuAmount } from './compatibility';
 import { serializationTypes } from './constants';
@@ -29,5 +29,5 @@ export function replacer(this: any, k: string, value: any) {
  * Stringify that acts as an inverse for parse from browser-wallet @shared/utils/payload-helpers
  */
 export function stringify(input: any) {
-    return jsonStringify(input, replacer);
+    return JSON.stringify(input, replacer);
 }

packages/browser-wallet-api/src/wallet-api.ts

@@ -133,6 +133,7 @@ class WalletApi extends EventEmitter implements IWalletApi {
         schemaVersion?: SchemaVersion
     ): Promise<string> {
         const input = sanitizeSendTransactionInput(accountAddress, type, payload, parameters, schema, schemaVersion);
+
         const response = await this.messageHandler.sendMessage<MessageStatusWrapper<string>>(
             MessageType.SendTransaction,
             {

packages/browser-wallet-api/test/compatibility.test.ts

@@ -14,16 +14,18 @@ import {
     DeployModulePayload,
     Energy,
     EntrypointName,
+    getAccountTransactionHandler,
     IdStatementBuilder,
-    jsonParse,
-    jsonStringify,
+    InitContractPayload,
     ModuleReference,
     OpenStatus,
+    Parameter,
     ReceiveName,
     RegisterDataPayload,
     SchemaVersion,
     SimpleTransferPayload,
     SimpleTransferWithMemoPayload,
+    UpdateContractPayload,
     UpdateCredentialsPayload,
 } from '@concordium/web-sdk';
 import {
@@ -146,10 +148,17 @@ describe(sanitizeSendTransactionInput, () => {
         const parameters: SmartContractParameters = { obj: 'test' };
         const schema = 'VGhpcyBpcyBiYXNlNjQK';
 
+        const handler = getAccountTransactionHandler(type);
+        const accountTransactionPayload = {
+            ...payload,
+            message: Parameter.empty(),
+        };
+        const payloadJSON = handler.toJSON(accountTransactionPayload);
+
         let expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload,
+            payload: payloadJSON,
         };
 
         let result = sanitizeSendTransactionInput(accountAddress, type, payload);
@@ -174,16 +183,20 @@ describe(sanitizeSendTransactionInput, () => {
             '23513bcb5dbc81216fa4e12d3165a818e2b8699a1c9ef5c699f46ca3b1024ebf'
         );
 
-        const expectedPayload: SendTransactionInitContractPayload = {
+        const expectedPayload: InitContractPayload = {
             moduleRef,
             maxContractExecutionEnergy: Energy.create(maxContractExecutionEnergy),
             amount: CcdAmount.fromMicroCcd(amount),
             initName: ContractName.fromString(contractName),
+            param: Parameter.empty(),
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
+
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: expectedPayload,
+            payload: expectedPayloadJSON,
         };
 
         const v0: InitContractPayloadV0 = {
@@ -231,19 +244,22 @@ describe(sanitizeSendTransactionInput, () => {
         const type = AccountTransactionType.Update;
         const receiveName = `${contractName}.${entrypointName}`;
 
-        const expectedPayload: SendTransactionUpdateContractPayload = {
+        const expectedPayload: UpdateContractPayload = {
             maxContractExecutionEnergy: Energy.create(maxContractExecutionEnergy),
             amount: CcdAmount.fromMicroCcd(amount),
             address: ContractAddress.create(contractIndex, contractSubindex),
             receiveName: ReceiveName.create(
                 ContractName.fromString(contractName),
                 EntrypointName.fromString(entrypointName)
             ),
+            message: Parameter.empty(),
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: expectedPayload,
+            payload: expectedPayloadJSON,
         };
 
         const v0: UpdateContractPayloadV0 = {
@@ -289,10 +305,12 @@ describe(sanitizeSendTransactionInput, () => {
             version,
             source,
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: expectedPayload,
+            payload: expectedPayloadJSON,
         };
 
         const v0: DeployModulePayloadV0 = {
@@ -319,10 +337,12 @@ describe(sanitizeSendTransactionInput, () => {
             toAddress: AccountAddress.fromBase58(accountAddress),
             amount: CcdAmount.fromMicroCcd(amount),
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: expectedPayload,
+            payload: expectedPayloadJSON,
         };
 
         const v0: SimpleTransferPayloadV0 = {
@@ -359,10 +379,12 @@ describe(sanitizeSendTransactionInput, () => {
             amount: CcdAmount.fromMicroCcd(amount),
             memo,
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: expectedPayload,
+            payload: expectedPayloadJSON,
         };
 
         const v0: SimpleTransferWithMemoPayloadV0 = {
@@ -403,11 +425,13 @@ describe(sanitizeSendTransactionInput, () => {
             amount: CcdAmount.fromMicroCcd(amount),
             memo,
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
 
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: expectedPayload,
+            payload: expectedPayloadJSON,
         };
 
         const payload: SimpleTransferWithMemoPayload = {
@@ -428,9 +452,6 @@ describe(sanitizeSendTransactionInput, () => {
 
         const result = sanitizeSendTransactionInput(accountAddress, type, payload);
         expect(result).toEqual(expected);
-        const parsed = jsonParse(jsonStringify(result));
-        expect(() => parsed.payload.memo.toJSON()).not.toThrow();
-        expect(parsed).toEqual(expected);
     });
 
     test('Transforms "ConfigureBaker" transaction input as expected', () => {
@@ -460,10 +481,13 @@ describe(sanitizeSendTransactionInput, () => {
             transactionFeeCommission,
             finalizationRewardCommission,
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
+
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: expectedPayload,
+            payload: expectedPayloadJSON,
         };
 
         const v0: ConfigureBakerPayloadV0 = {
@@ -505,10 +529,13 @@ describe(sanitizeSendTransactionInput, () => {
             restakeEarnings,
             delegationTarget,
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
+
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: expectedPayload,
+            payload: expectedPayloadJSON,
         };
 
         const v0: ConfigureDelegationPayloadV0 = {
@@ -536,14 +563,16 @@ describe(sanitizeSendTransactionInput, () => {
         const payload: RegisterDataPayload = {
             data: new DataBlob(Buffer.from('This is data!')),
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(payload);
+
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload,
+            payload: expectedPayloadJSON,
         };
         const result = sanitizeSendTransactionInput(accountAddress, type, payload);
         expect(result).toEqual(expected);
-        expect((result.payload as RegisterDataPayload).data).toStrictEqual(payload.data);
     });
 
     test('Transformed "RegisterData" transaction input with "DataBlob"-like parameter can be parsed', () => {
@@ -556,19 +585,20 @@ describe(sanitizeSendTransactionInput, () => {
             } as unknown as DataBlob,
         };
 
+        const expectedPayload: RegisterDataPayload = {
+            data: new DataBlob(Buffer.from('This is data!')),
+        };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(expectedPayload);
+
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload: {
-                data: new DataBlob(Buffer.from('This is data!')),
-            },
+            payload: expectedPayloadJSON,
         };
 
         const result = sanitizeSendTransactionInput(accountAddress, type, payload);
         expect(result).toEqual(expected);
-        const parsed = jsonParse(jsonStringify(result));
-        expect(() => parsed.payload.data.toJSON()).not.toThrow();
-        expect(parsed).toEqual(expected);
     });
 
     test('Transforms "UpdateCredentials" transaction input as expected', () => {
@@ -607,10 +637,13 @@ describe(sanitizeSendTransactionInput, () => {
             removeCredentialIds: ['010302'],
             currentNumberOfCredentials: 1n,
         };
+        const handler = getAccountTransactionHandler(type);
+        const expectedPayloadJSON = handler.toJSON(payload);
+
         const expected: SanitizedSendTransactionInput = {
             accountAddress: AccountAddress.fromBase58(accountAddress),
             type,
-            payload,
+            payload: expectedPayloadJSON,
         };
         const result = sanitizeSendTransactionInput(accountAddress, type, payload);
         expect(result).toEqual(expected);