From e04239861010ddeb04ee881e3babf257b5b88c7c Mon Sep 17 00:00:00 2001
From: wepsree <wepsree@pm.me>
Date: Tue, 26 Jul 2022 21:10:21 -0700
Subject: [PATCH 1/2] require buffer

---
 src/abi/coder/common.ts             | 2 +-
 src/abi/coder/dynamic.ts            | 1 +
 src/accountBlock/accountBlock.ts    | 1 +
 src/accountBlock/utils.ts           | 1 +
 src/keystore/encrypt.ts             | 1 +
 src/keystore/tools.ts               | 1 +
 src/keystore/validated.ts           | 1 +
 src/keystore/vars.ts                | 1 +
 src/utils/ed25519.ts                | 1 +
 src/utils/index.ts                  | 1 +
 src/viteAPI/index.ts                | 1 +
 src/wallet/address.ts               | 1 +
 src/wallet/hdKey.ts                 | 1 +
 src/wallet/wallet.ts                | 1 +
 test/packages/abi.js                | 1 +
 test/packages/accountBlock/utils.js | 1 +
 test/packages/utils.js              | 1 +
 webpack.config.js                   | 6 ------
 18 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/abi/coder/common.ts b/src/abi/coder/common.ts
index e2497348..3b348bc8 100644
--- a/src/abi/coder/common.ts
+++ b/src/abi/coder/common.ts
@@ -1,12 +1,12 @@
 // address bool gid number
 
 const BigNumber = require('bn.js');
+const Buffer = require('buffer/').Buffer
 
 import { unsafeInteger, integerIllegal } from '~@vite/vitejs-error';
 import { getAddressFromOriginalAddress, getOriginalAddressFromAddress } from '~@vite/vitejs-wallet/address';
 import { getOriginalTokenIdFromTokenId, getTokenIdFromOriginalTokenId, isSafeInteger } from '~@vite/vitejs-utils';
 
-
 export function encode(typeObj, params) {
     const Bytes_Data = getBytesData(typeObj, params);
     return encodeBytesData(typeObj, Bytes_Data);
diff --git a/src/abi/coder/dynamic.ts b/src/abi/coder/dynamic.ts
index 50187ba2..5496c5c2 100644
--- a/src/abi/coder/dynamic.ts
+++ b/src/abi/coder/dynamic.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 import { encode as commonEncode, encodeBytesData, decode as commonDecode, decodeToHexData } from './common';
 
 
diff --git a/src/accountBlock/accountBlock.ts b/src/accountBlock/accountBlock.ts
index 458f9433..885fbe8b 100644
--- a/src/accountBlock/accountBlock.ts
+++ b/src/accountBlock/accountBlock.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const BigNumber = require('bn.js');
 const blake = require('blakejs/blake2b');
 
diff --git a/src/accountBlock/utils.ts b/src/accountBlock/utils.ts
index 33472195..43e69361 100644
--- a/src/accountBlock/utils.ts
+++ b/src/accountBlock/utils.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const BigNumber = require('bn.js');
 const blake = require('blakejs/blake2b');
 
diff --git a/src/keystore/encrypt.ts b/src/keystore/encrypt.ts
index 2305bb90..1efbc461 100644
--- a/src/keystore/encrypt.ts
+++ b/src/keystore/encrypt.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const UUID = require('pure-uuid');
 
 import { checkParams, ed25519 } from '~@vite/vitejs-utils';
diff --git a/src/keystore/tools.ts b/src/keystore/tools.ts
index 00fa3b10..ec58e451 100644
--- a/src/keystore/tools.ts
+++ b/src/keystore/tools.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const scryptsy = require('scryptsy');
 
 declare const window;
diff --git a/src/keystore/validated.ts b/src/keystore/validated.ts
index bae89aa3..11412aeb 100644
--- a/src/keystore/validated.ts
+++ b/src/keystore/validated.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const UUID = require('pure-uuid');
 import { checkParams } from '~@vite/vitejs-utils';
 import { isValidAddress } from '~@vite/vitejs-wallet/address';
diff --git a/src/keystore/vars.ts b/src/keystore/vars.ts
index 70e838a0..2f435be2 100644
--- a/src/keystore/vars.ts
+++ b/src/keystore/vars.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 export const additionData = Buffer.from('vite');
 export const algorithm = 'aes-256-gcm';
 export const scryptName = 'scrypt';
diff --git a/src/utils/ed25519.ts b/src/utils/ed25519.ts
index 36a8fd10..fa6f4a31 100644
--- a/src/utils/ed25519.ts
+++ b/src/utils/ed25519.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const nacl = require('@sisi/tweetnacl-blake2b');
 import { Hex } from './type';
 import { checkParams, isHexString } from './index';
diff --git a/src/utils/index.ts b/src/utils/index.ts
index a212c39e..ea7133aa 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const bn = require('bn.js');
 import { stringify } from 'qs';
 const blake = require('blakejs/blake2b');
diff --git a/src/viteAPI/index.ts b/src/viteAPI/index.ts
index 3383b3f4..5f7ee29a 100644
--- a/src/viteAPI/index.ts
+++ b/src/viteAPI/index.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 import { Contracts } from '~@vite/vitejs-constant';
 import { checkParams, isArray, blake2bHex } from '~@vite/vitejs-utils';
 import { isValidAddress, AddressType, getOriginalAddressFromAddress } from '~@vite/vitejs-wallet/address';
diff --git a/src/wallet/address.ts b/src/wallet/address.ts
index 0e7be4d7..b0c868f8 100644
--- a/src/wallet/address.ts
+++ b/src/wallet/address.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 import { checkParams, ed25519, blake2b, isHexString } from '~@vite/vitejs-utils';
 import { addressIllegal } from '~@vite/vitejs-error';
 
diff --git a/src/wallet/hdKey.ts b/src/wallet/hdKey.ts
index 50646fd6..f9ec6a35 100644
--- a/src/wallet/hdKey.ts
+++ b/src/wallet/hdKey.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const bip39 = require('bip39');
 const hd = require('@sisi/ed25519-blake2b-hd-key');
 
diff --git a/src/wallet/wallet.ts b/src/wallet/wallet.ts
index a226edef..344f1b45 100644
--- a/src/wallet/wallet.ts
+++ b/src/wallet/wallet.ts
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const bip39 = require('bip39');
 const blake = require('blakejs/blake2b');
 
diff --git a/test/packages/abi.js b/test/packages/abi.js
index 85960176..215d6e71 100644
--- a/test/packages/abi.js
+++ b/test/packages/abi.js
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const assert = require('assert');
 
 import { type } from 'os';
diff --git a/test/packages/accountBlock/utils.js b/test/packages/accountBlock/utils.js
index a6346dd7..358dff1a 100644
--- a/test/packages/accountBlock/utils.js
+++ b/test/packages/accountBlock/utils.js
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const assert = require('assert');
 
 import { Contracts } from '../../../src/constant/index';
diff --git a/test/packages/utils.js b/test/packages/utils.js
index 3e7e1a46..7cd087cf 100644
--- a/test/packages/utils.js
+++ b/test/packages/utils.js
@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer
 const assert = require('assert');
 
 import {
diff --git a/webpack.config.js b/webpack.config.js
index 56b42c37..8c0f7069 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,17 +3,11 @@ const webpack = require('webpack');
 
 const baseDir = path.join(__dirname, './src');
 const target = process.env.build_target;
-const Buffer_Path = path.join(__dirname, './node_modules/buffer/index.js');
 
 const plugins = [
     new webpack.DefinePlugin({ 'processSilence': process.env.NODE_ENV && process.env.NODE_ENV.indexOf('test') === 0 ? 0 : 1 }),
     new webpack.IgnorePlugin({ resourceRegExp: /^\.\/wordlists\/(?!english)/, contextRegExp: /bip39\/src/ })
 ];
-if (target === 'web') {
-    plugins.push(new webpack.NormalModuleReplacementPlugin(/\/buffer\//, function (resource) {
-        resource.request = Buffer_Path;
-    }));
-}
 
 module.exports = {
     plugins,

From cd69ed88a5297c868f6f9d697bfecd9d4b2b2e35 Mon Sep 17 00:00:00 2001
From: wepsree <wepsree@pm.me>
Date: Tue, 26 Jul 2022 21:14:39 -0700
Subject: [PATCH 2/2] semicolon

---
 src/abi/coder/common.ts             | 2 +-
 src/abi/coder/dynamic.ts            | 2 +-
 src/accountBlock/accountBlock.ts    | 2 +-
 src/accountBlock/utils.ts           | 2 +-
 src/keystore/encrypt.ts             | 2 +-
 src/keystore/tools.ts               | 2 +-
 src/keystore/validated.ts           | 2 +-
 src/keystore/vars.ts                | 2 +-
 src/utils/ed25519.ts                | 2 +-
 src/utils/index.ts                  | 2 +-
 src/viteAPI/index.ts                | 2 +-
 src/wallet/address.ts               | 2 +-
 src/wallet/hdKey.ts                 | 2 +-
 src/wallet/wallet.ts                | 2 +-
 test/packages/abi.js                | 2 +-
 test/packages/accountBlock/utils.js | 2 +-
 test/packages/utils.js              | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/abi/coder/common.ts b/src/abi/coder/common.ts
index 3b348bc8..84a42c48 100644
--- a/src/abi/coder/common.ts
+++ b/src/abi/coder/common.ts
@@ -1,7 +1,7 @@
 // address bool gid number
 
 const BigNumber = require('bn.js');
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 
 import { unsafeInteger, integerIllegal } from '~@vite/vitejs-error';
 import { getAddressFromOriginalAddress, getOriginalAddressFromAddress } from '~@vite/vitejs-wallet/address';
diff --git a/src/abi/coder/dynamic.ts b/src/abi/coder/dynamic.ts
index 5496c5c2..0d26e25f 100644
--- a/src/abi/coder/dynamic.ts
+++ b/src/abi/coder/dynamic.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 import { encode as commonEncode, encodeBytesData, decode as commonDecode, decodeToHexData } from './common';
 
 
diff --git a/src/accountBlock/accountBlock.ts b/src/accountBlock/accountBlock.ts
index 885fbe8b..6c70d570 100644
--- a/src/accountBlock/accountBlock.ts
+++ b/src/accountBlock/accountBlock.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const BigNumber = require('bn.js');
 const blake = require('blakejs/blake2b');
 
diff --git a/src/accountBlock/utils.ts b/src/accountBlock/utils.ts
index 43e69361..ce741dc8 100644
--- a/src/accountBlock/utils.ts
+++ b/src/accountBlock/utils.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const BigNumber = require('bn.js');
 const blake = require('blakejs/blake2b');
 
diff --git a/src/keystore/encrypt.ts b/src/keystore/encrypt.ts
index 1efbc461..f6ab59be 100644
--- a/src/keystore/encrypt.ts
+++ b/src/keystore/encrypt.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const UUID = require('pure-uuid');
 
 import { checkParams, ed25519 } from '~@vite/vitejs-utils';
diff --git a/src/keystore/tools.ts b/src/keystore/tools.ts
index ec58e451..2c552dfe 100644
--- a/src/keystore/tools.ts
+++ b/src/keystore/tools.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const scryptsy = require('scryptsy');
 
 declare const window;
diff --git a/src/keystore/validated.ts b/src/keystore/validated.ts
index 11412aeb..e6834559 100644
--- a/src/keystore/validated.ts
+++ b/src/keystore/validated.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const UUID = require('pure-uuid');
 import { checkParams } from '~@vite/vitejs-utils';
 import { isValidAddress } from '~@vite/vitejs-wallet/address';
diff --git a/src/keystore/vars.ts b/src/keystore/vars.ts
index 2f435be2..10a13ba7 100644
--- a/src/keystore/vars.ts
+++ b/src/keystore/vars.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 export const additionData = Buffer.from('vite');
 export const algorithm = 'aes-256-gcm';
 export const scryptName = 'scrypt';
diff --git a/src/utils/ed25519.ts b/src/utils/ed25519.ts
index fa6f4a31..650e7cfe 100644
--- a/src/utils/ed25519.ts
+++ b/src/utils/ed25519.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const nacl = require('@sisi/tweetnacl-blake2b');
 import { Hex } from './type';
 import { checkParams, isHexString } from './index';
diff --git a/src/utils/index.ts b/src/utils/index.ts
index ea7133aa..37079775 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const bn = require('bn.js');
 import { stringify } from 'qs';
 const blake = require('blakejs/blake2b');
diff --git a/src/viteAPI/index.ts b/src/viteAPI/index.ts
index 5f7ee29a..32dd0bcf 100644
--- a/src/viteAPI/index.ts
+++ b/src/viteAPI/index.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 import { Contracts } from '~@vite/vitejs-constant';
 import { checkParams, isArray, blake2bHex } from '~@vite/vitejs-utils';
 import { isValidAddress, AddressType, getOriginalAddressFromAddress } from '~@vite/vitejs-wallet/address';
diff --git a/src/wallet/address.ts b/src/wallet/address.ts
index b0c868f8..4ffed7ee 100644
--- a/src/wallet/address.ts
+++ b/src/wallet/address.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 import { checkParams, ed25519, blake2b, isHexString } from '~@vite/vitejs-utils';
 import { addressIllegal } from '~@vite/vitejs-error';
 
diff --git a/src/wallet/hdKey.ts b/src/wallet/hdKey.ts
index f9ec6a35..a40c1266 100644
--- a/src/wallet/hdKey.ts
+++ b/src/wallet/hdKey.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const bip39 = require('bip39');
 const hd = require('@sisi/ed25519-blake2b-hd-key');
 
diff --git a/src/wallet/wallet.ts b/src/wallet/wallet.ts
index 344f1b45..8aede373 100644
--- a/src/wallet/wallet.ts
+++ b/src/wallet/wallet.ts
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const bip39 = require('bip39');
 const blake = require('blakejs/blake2b');
 
diff --git a/test/packages/abi.js b/test/packages/abi.js
index 215d6e71..a7d5cbe7 100644
--- a/test/packages/abi.js
+++ b/test/packages/abi.js
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const assert = require('assert');
 
 import { type } from 'os';
diff --git a/test/packages/accountBlock/utils.js b/test/packages/accountBlock/utils.js
index 358dff1a..e090e33f 100644
--- a/test/packages/accountBlock/utils.js
+++ b/test/packages/accountBlock/utils.js
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const assert = require('assert');
 
 import { Contracts } from '../../../src/constant/index';
diff --git a/test/packages/utils.js b/test/packages/utils.js
index 7cd087cf..e88f79a8 100644
--- a/test/packages/utils.js
+++ b/test/packages/utils.js
@@ -1,4 +1,4 @@
-const Buffer = require('buffer/').Buffer
+const Buffer = require('buffer/').Buffer;
 const assert = require('assert');
 
 import {