Concordium · soerenbf · Oct 31, 2023 · Oct 13, 2023 · Oct 13, 2023 · Oct 16, 2023
diff --git a/.eslintignore b/.eslintignore
@@ -8,4 +8,4 @@ dist
 package.json
 !.storybook
 
-packages/browser-wallet-api-helpers/lib
+packages/browser-wallet-api-helpers/lib
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,8 +7,8 @@ module.exports = {
         ecmaFeatures: {
             jsx: true,
         },
-        project: 'tsconfig.json',
-        createDefaultProgram: true,
+        project: ['./tsconfig.json', './packages/browser-wallet/tsconfig.eslint.json', './examples/*/tsconfig.json'],
+        tsconfigRootDir: __dirname,
     },
     env: {
         browser: true,

diff --git a/examples/add-example-Web3Id/package.json b/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": "^6.3.0"
+        "@concordium/web-sdk": "^7.0.0"
     }
 }
diff --git a/examples/eSealing/Dockerfile b/examples/eSealing/Dockerfile
@@ -5,12 +5,14 @@ FROM ${base_image} AS build
 WORKDIR /app
 COPY ./package.json ./package.json
 COPY ./tsconfig.json ./tsconfig.json
-COPY ./esbuild.config.ts ./
-COPY ./types ./types
+COPY ./index.html ./
+COPY ./vite.config.ts ./
+COPY ./public ./public
 COPY ./src ./src
 
 RUN yarn && yarn cache clean
 RUN yarn build
 
 FROM nginx
 COPY --from=build ./app/dist ./usr/share/nginx/html
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/examples/eSealing/esbuild.config.ts b/examples/eSealing/esbuild.config.ts
diff --git a/examples/eSealing/index.html b/examples/eSealing/index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <style>
+            body {
+                background-image: url(/esealing_bg.jpeg);
+                background-color: #1e1e1e;
+                background-repeat: no-repeat;
+                background-attachment: fixed;
+                background-size: cover;
+            }
+        </style>
+
+        <link rel="icon" type="image/x-icon" href="/concordium_favicon.svg" />
+        <meta charset="utf-8" />
+    </head>
+
+    <body>
+        <div id="root"></div>
+        <script src="src/index.tsx" type="module"></script>
+    </body>
+</html>
diff --git a/examples/eSealing/nginx.conf b/examples/eSealing/nginx.conf
@@ -0,0 +1,42 @@
+# Enable Gzip
+gzip  on;
+gzip_http_version 1.0;
+gzip_comp_level 2;
+gzip_min_length 1100;
+gzip_buffers     4 8k;
+gzip_proxied any;
+gzip_types
+    text/css
+    text/javascript
+    text/xml
+    text/plain
+    text/x-component
+    application/javascript
+    application/json
+    application/xml
+    application/wasm
+    application/rss+xml
+    font/truetype
+    font/opentype
+    application/vnd.ms-fontobject
+    image/svg+xml
+    image/jpeg;
+
+gzip_static on;
+
+gzip_proxied        expired no-cache no-store private auth;
+gzip_disable        "MSIE [1-6]\.";
+gzip_vary           on;
+
+server {
+    listen 80 default;
+    server_name _;
+    root /usr/share/nginx/html;
+
+    # Set expires max on static file types
+    location ~* ^.+\.(css|js|jpg|jpeg|gif|png|ico|gz|svg|svgz|ttf|otf|woff|eot|mp4|ogg|ogv|webm|wasm)$ {
+        expires max;
+        root   /usr/share/nginx/html;
+        access_log off;
+    }
+}
diff --git a/examples/eSealing/package.json b/examples/eSealing/package.json
@@ -1,11 +1,11 @@
 {
     "name": "e_sealing",
     "packageManager": "[email protected]",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "license": "Apache-2.0",
     "dependencies": {
-        "@concordium/react-components": "^0.3.0",
-        "@concordium/web-sdk": "^6.3.0",
+        "@concordium/react-components": "0.4.0-rc.5",
+        "@concordium/web-sdk": "^7.0.0",
         "@thi.ng/leb128": "^2.1.18",
         "@types/sha256": "^0.2.0",
         "@walletconnect/types": "^2.1.4",
@@ -16,22 +16,20 @@
         "sha256": "^0.2.0"
     },
     "devDependencies": {
-        "@craftamap/esbuild-plugin-html": "^0.4.0",
         "@types/node": "^18.7.23",
         "@types/react": "^18.0.9",
         "@types/react-dom": "^18.0.5",
-        "cross-env": "^7.0.3",
-        "esbuild": "^0.14.42",
-        "esbuild-plugin-svgr": "^1.0.1",
-        "fs": "^0.0.1-security",
-        "live-server": "^1.2.2",
+        "@vitejs/plugin-react-swc": "^3.4.0",
         "process": "^0.11.10",
-        "ts-node": "^10.8.0",
-        "typescript": "^5.2.2"
+        "typescript": "^5.2.2",
+        "vite": "^4.5.0",
+        "vite-plugin-svgr": "^4.1.0",
+        "vite-plugin-top-level-await": "^1.3.1",
+        "vite-plugin-wasm": "^3.2.2"
     },
     "scripts": {
-        "build": "node --loader ts-node/esm ./esbuild.config.ts; cp ./src/assets/* ./dist",
-        "watch": "cross-env WATCH=1 yarn build",
-        "start": "live-server ./dist"
+        "build": "tsc && vite build",
+        "dev": "vite",
+        "start": "vite preview"
     }
 }
diff --git a/...Sealing/src/assets/concordium_favicon.svg → ...es/eSealing/public/concordium_favicon.svg b/...Sealing/src/assets/concordium_favicon.svg → ...es/eSealing/public/concordium_favicon.svg
diff --git a/examples/eSealing/public/esealing_bg.jpeg b/examples/eSealing/public/esealing_bg.jpeg
diff --git a/examples/eSealing/src/assets/Concordium_background.svg b/examples/eSealing/src/assets/Concordium_background.svg
diff --git a/examples/eSealing/src/eSealing.tsx b/examples/eSealing/src/eSealing.tsx
@@ -5,6 +5,11 @@ import {
     deserializeReceiveReturnValue,
     serializeUpdateContractParameters,
     ConcordiumGRPCClient,
+    ContractName,
+    EntrypointName,
+    ContractAddress,
+    ReceiveName,
+    ReturnValue,
 } from '@concordium/web-sdk';
 import sha256 from 'sha256';
 import { useGrpcClient, TESTNET, WalletConnectionProps, useConnection, useConnect } from '@concordium/react-components';
@@ -96,15 +101,15 @@ const InputFieldStyle = {
 
 async function viewFile(rpcClient: ConcordiumGRPCClient, fileHashHex: string) {
     const param = serializeUpdateContractParameters(
-        E_SEALING_CONTRACT_NAME,
-        'getFile',
+        ContractName.fromString(E_SEALING_CONTRACT_NAME),
+        EntrypointName.fromString('getFile'),
         fileHashHex,
         toBuffer(E_SEALING_RAW_SCHEMA, 'base64')
     );
 
     const res = await rpcClient.invokeContract({
-        method: `${E_SEALING_CONTRACT_NAME}.getFile`,
-        contract: { index: E_SEALING_CONTRACT_INDEX, subindex: CONTRACT_SUB_INDEX },
+        method: ReceiveName.fromString(`${E_SEALING_CONTRACT_NAME}.getFile`),
+        contract: ContractAddress.create(E_SEALING_CONTRACT_INDEX, CONTRACT_SUB_INDEX),
         parameter: param,
     });
 
@@ -115,10 +120,10 @@ async function viewFile(rpcClient: ConcordiumGRPCClient, fileHashHex: string) {
     }
 
     const returnValues = deserializeReceiveReturnValue(
-        toBuffer(res.returnValue, 'hex'),
+        ReturnValue.toBuffer(res.returnValue),
         toBuffer(E_SEALING_RAW_SCHEMA, 'base64'),
-        E_SEALING_CONTRACT_NAME,
-        'getFile',
+        ContractName.fromString(E_SEALING_CONTRACT_NAME),
+        EntrypointName.fromString('getFile'),
         2
     );
 

diff --git a/examples/eSealing/src/index.html b/examples/eSealing/src/index.html
diff --git a/examples/eSealing/src/utils.ts b/examples/eSealing/src/utils.ts
@@ -1,5 +1,5 @@
 import { createContext } from 'react';
-import { AccountTransactionType, CcdAmount } from '@concordium/web-sdk';
+import { AccountTransactionType, CcdAmount, ContractAddress, Energy, ReceiveName } from '@concordium/web-sdk';
 import { WalletConnection, moduleSchemaFromBase64 } from '@concordium/react-components';
 import { E_SEALING_CONTRACT_NAME, E_SEALING_RAW_SCHEMA } from './constants';
 
@@ -17,13 +17,10 @@ export async function register(
         account,
         AccountTransactionType.Update,
         {
-            amount: new CcdAmount(BigInt(0n)),
-            address: {
-                index,
-                subindex,
-            },
-            receiveName: `${E_SEALING_CONTRACT_NAME}.registerFile`,
-            maxContractExecutionEnergy: 30000n,
+            amount: CcdAmount.fromMicroCcd(0),
+            address: ContractAddress.create(index, subindex),
+            receiveName: ReceiveName.fromString(`${E_SEALING_CONTRACT_NAME}.registerFile`),
+            maxContractExecutionEnergy: Energy.create(30000n),
         },
         {
             parameters: fileHashHex,

diff --git a/examples/eSealing/tsconfig.json b/examples/eSealing/tsconfig.json
@@ -2,25 +2,21 @@
     "compilerOptions": {
         "target": "ES2020",
         "lib": ["dom", "dom.iterable", "esnext"],
+        "baseUrl": ".",
         "allowJs": true,
         "skipLibCheck": true,
         "esModuleInterop": true,
         "allowSyntheticDefaultImports": true,
         "strict": true,
         "noFallthroughCasesInSwitch": true,
         "module": "esnext",
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
         "downlevelIteration": true,
-        "baseUrl": ".",
         "noEmit": true,
-        "jsx": "react"
-    },
-    "ts-node": {
-        "compilerOptions": {
-            "module": "CommonJS"
-        }
+        "jsx": "react",
+        "types": ["vite-plugin-svgr/client"]
     },
     "include": ["./**/*"]
 }
diff --git a/examples/eSealing/types/svg.d.ts b/examples/eSealing/types/svg.d.ts
diff --git a/examples/eSealing/vite.config.ts b/examples/eSealing/vite.config.ts
@@ -0,0 +1,21 @@
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react-swc';
+import svgr from 'vite-plugin-svgr';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import wasm from 'vite-plugin-wasm';
+import topLevelAwait from 'vite-plugin-top-level-await';
+
+export default defineConfig({
+    plugins: [
+        react(),
+        svgr(),
+        wasm(),
+        topLevelAwait(), // For legacy browser compatibility
+    ],
+    resolve: {
+        alias: {
+            '@concordium/rust-bindings': '@concordium/rust-bindings/bundler', // Resolve bundler-specific wasm entrypoints.
+        },
+    },
+});
diff --git a/examples/nft-minting/esbuild.config.ts b/examples/nft-minting/esbuild.config.ts
@@ -36,24 +36,12 @@ const config: BuildOptions = {
     ],
 };
 
-if (watch) {
-    config.watch = {
-        onRebuild(error) {
-            if (error) {
-                console.error('watch build failed:', error);
-                return;
-            }
-
-            console.log('rebuild successful');
-        },
-    };
-}
-
-esbuild
-    .build(config)
-    .then(() => {
-        if (watch) {
-            console.log('watching for changes...');
-        }
-    })
-    .catch(() => process.exit(1));
+(async () => {
+    if (watch) {
+        const ctx = await esbuild.context(config);
+        await ctx.watch();
+        console.log('watching for changes...');
+    } else {
+        esbuild.build(config).catch(() => process.exit(1));
+    }
+})();