diff --git a/.pnp.js b/.pnp.js
index 7b2851ac..4b48ecd0 100755
--- a/.pnp.js
+++ b/.pnp.js
@@ -725,6 +725,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.22.1"],
             ["bip39", "npm:3.0.4"],
             ["bn.js", "npm:4.12.0"],
+            ["buffer", "npm:6.0.3"],
             ["elliptic", "npm:6.5.4"],
             ["eslint", "npm:7.26.0"],
             ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"],
@@ -775,6 +776,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.22.1"],
             ["base64-js", "npm:1.5.1"],
             ["bech32", "npm:1.1.4"],
+            ["buffer", "npm:6.0.3"],
             ["eslint", "npm:7.26.0"],
             ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"],
             ["eslint-import-resolver-node", "npm:0.3.4"],
@@ -1044,6 +1046,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@typescript-eslint/eslint-plugin", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.22.1"],
             ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.22.1"],
             ["bn.js", "npm:4.12.0"],
+            ["buffer", "npm:6.0.3"],
             ["eslint", "npm:7.26.0"],
             ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"],
             ["eslint-import-resolver-node", "npm:0.3.4"],
@@ -1333,6 +1336,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@types/node", "npm:15.0.1"],
             ["@typescript-eslint/eslint-plugin", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.22.1"],
             ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.22.1"],
+            ["buffer", "npm:6.0.3"],
             ["eslint", "npm:7.26.0"],
             ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"],
             ["eslint-import-resolver-node", "npm:0.3.4"],
@@ -3878,6 +3882,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["ieee754", "npm:1.2.1"]
           ],
           "linkType": "HARD",
+        }],
+        ["npm:6.0.3", {
+          "packageLocation": "./.yarn/cache/buffer-npm-6.0.3-cd90dfedfe-a8cf6a5857.zip/node_modules/buffer/",
+          "packageDependencies": [
+            ["buffer", "npm:6.0.3"],
+            ["base64-js", "npm:1.5.1"],
+            ["ieee754", "npm:1.2.1"]
+          ],
+          "linkType": "HARD",
         }]
       ]],
       ["buffer-from", [
diff --git a/.yarn/cache/buffer-npm-6.0.3-cd90dfedfe-a8cf6a5857.zip b/.yarn/cache/buffer-npm-6.0.3-cd90dfedfe-a8cf6a5857.zip
new file mode 100644
index 00000000..dc9701d8
--- /dev/null
+++ b/.yarn/cache/buffer-npm-6.0.3-cd90dfedfe-a8cf6a5857.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72693131a92065c688af67d378839fbeb10308d94542cd71433e31dfe002beb5
+size 24061
diff --git a/packages/crypto/package.json b/packages/crypto/package.json
index a9a96221..46738f33 100644
--- a/packages/crypto/package.json
+++ b/packages/crypto/package.json
@@ -66,6 +66,7 @@
     "@types/sha.js": "^2.4.0",
     "@typescript-eslint/eslint-plugin": "^4.22.1",
     "@typescript-eslint/parser": "^4.22.1",
+    "buffer": "^6.0.3",
     "eslint": "^7.5",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.4",
diff --git a/packages/crypto/webpack.web.config.js b/packages/crypto/webpack.web.config.js
index 4f35464a..b7841075 100644
--- a/packages/crypto/webpack.web.config.js
+++ b/packages/crypto/webpack.web.config.js
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 const glob = require("glob");
 const path = require("path");
+const webpack = require("webpack");
 
 const target = "web";
 const distdir = path.join(__dirname, "dist", "web");
@@ -14,6 +15,11 @@ module.exports = [
       path: distdir,
       filename: "tests.js",
     },
+    plugins: [
+      new webpack.ProvidePlugin({
+        Buffer: ["buffer", "Buffer"],
+      }),
+    ],
     resolve: {
       fallback: {
         buffer: false,
diff --git a/packages/encoding/package.json b/packages/encoding/package.json
index c87b3980..3ded6fcb 100644
--- a/packages/encoding/package.json
+++ b/packages/encoding/package.json
@@ -54,6 +54,7 @@
     "@types/node": "^15.0.1",
     "@typescript-eslint/eslint-plugin": "^4.22.1",
     "@typescript-eslint/parser": "^4.22.1",
+    "buffer": "^6.0.3",
     "eslint": "^7.5",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.4",
diff --git a/packages/encoding/webpack.web.config.js b/packages/encoding/webpack.web.config.js
index 9d5836a8..88edd9d4 100644
--- a/packages/encoding/webpack.web.config.js
+++ b/packages/encoding/webpack.web.config.js
@@ -1,5 +1,6 @@
 const glob = require("glob");
 const path = require("path");
+const webpack = require("webpack");
 
 const target = "web";
 const distdir = path.join(__dirname, "dist", "web");
@@ -13,5 +14,15 @@ module.exports = [
       path: distdir,
       filename: "tests.js",
     },
+    plugins: [
+      new webpack.ProvidePlugin({
+        Buffer: ["buffer", "Buffer"],
+      }),
+    ],
+    resolve: {
+      fallback: {
+        buffer: false,
+      }
+    }
   },
 ];
diff --git a/packages/math/package.json b/packages/math/package.json
index eaf76cb8..98aebe3e 100644
--- a/packages/math/package.json
+++ b/packages/math/package.json
@@ -51,6 +51,7 @@
     "@types/karma-jasmine-html-reporter": "^1",
     "@typescript-eslint/eslint-plugin": "^4.22.1",
     "@typescript-eslint/parser": "^4.22.1",
+    "buffer": "^6.0.3",
     "eslint": "^7.5",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.4",
diff --git a/packages/math/webpack.web.config.js b/packages/math/webpack.web.config.js
index bfb398c6..a6c6b933 100644
--- a/packages/math/webpack.web.config.js
+++ b/packages/math/webpack.web.config.js
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 const glob = require("glob");
 const path = require("path");
+const webpack = require("webpack");
 
 const target = "web";
 const distdir = path.join(__dirname, "dist", "web");
@@ -14,5 +15,10 @@ module.exports = [
       path: distdir,
       filename: "tests.js",
     },
+    plugins: [
+      new webpack.ProvidePlugin({
+        Buffer: ["buffer", "Buffer"],
+      }),
+    ],
   },
 ];
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 1a69e514..a1d2ede2 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -48,6 +48,7 @@
     "@types/node": "^15.0.1",
     "@typescript-eslint/eslint-plugin": "^4.22.1",
     "@typescript-eslint/parser": "^4.22.1",
+    "buffer": "^6.0.3",
     "eslint": "^7.5",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.4",
diff --git a/packages/utils/webpack.web.config.js b/packages/utils/webpack.web.config.js
index bfb398c6..a6c6b933 100644
--- a/packages/utils/webpack.web.config.js
+++ b/packages/utils/webpack.web.config.js
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 const glob = require("glob");
 const path = require("path");
+const webpack = require("webpack");
 
 const target = "web";
 const distdir = path.join(__dirname, "dist", "web");
@@ -14,5 +15,10 @@ module.exports = [
       path: distdir,
       filename: "tests.js",
     },
+    plugins: [
+      new webpack.ProvidePlugin({
+        Buffer: ["buffer", "Buffer"],
+      }),
+    ],
   },
 ];
diff --git a/yarn.lock b/yarn.lock
index e0de2552..1b02efe9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -533,6 +533,7 @@ __metadata:
     "@typescript-eslint/parser": ^4.22.1
     bip39: ^3.0.2
     bn.js: ^4.11.8
+    buffer: ^6.0.3
     elliptic: ^6.5.3
     eslint: ^7.5
     eslint-config-prettier: ^8.3.0
@@ -581,6 +582,7 @@ __metadata:
     "@typescript-eslint/parser": ^4.22.1
     base64-js: ^1.3.0
     bech32: ^1.1.4
+    buffer: ^6.0.3
     eslint: ^7.5
     eslint-config-prettier: ^8.3.0
     eslint-import-resolver-node: ^0.3.4
@@ -840,6 +842,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^4.22.1
     "@typescript-eslint/parser": ^4.22.1
     bn.js: ^4.11.8
+    buffer: ^6.0.3
     eslint: ^7.5
     eslint-config-prettier: ^8.3.0
     eslint-import-resolver-node: ^0.3.4
@@ -1117,6 +1120,7 @@ __metadata:
     "@types/node": ^15.0.1
     "@typescript-eslint/eslint-plugin": ^4.22.1
     "@typescript-eslint/parser": ^4.22.1
+    buffer: ^6.0.3
     eslint: ^7.5
     eslint-config-prettier: ^8.3.0
     eslint-import-resolver-node: ^0.3.4
@@ -2634,6 +2638,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"buffer@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "buffer@npm:6.0.3"
+  dependencies:
+    base64-js: ^1.3.1
+    ieee754: ^1.2.1
+  checksum: a8cf6a58571dc7c43b24ab821ad4c72222d9040775f49fd143a30fad45f33ec0a8e0d572ca80d589ad4f8b4715aa012c029dc2b925dc95467f135c2d13d7abfb
+  languageName: node
+  linkType: hard
+
 "bytes@npm:3.1.0":
   version: 3.1.0
   resolution: "bytes@npm:3.1.0"
@@ -4407,7 +4421,7 @@ fsevents@~2.3.1:
   languageName: node
   linkType: hard
 
-"ieee754@npm:^1.1.13":
+"ieee754@npm:^1.1.13, ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
   checksum: 6c1cfab995ecab3b0dbb6cfb7e192686eb02f0f8e788f2d962e1fc02e2d5ab38a85e06d417221f136bd029663a77cdb920d99605d68d3730a05597dd7910426a