diff --git a/src/abi/coder/common.ts b/src/abi/coder/common.ts index e2497348..84a42c48 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..0d26e25f 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..6c70d570 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..ce741dc8 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..f6ab59be 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..2c552dfe 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..e6834559 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..10a13ba7 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..650e7cfe 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..37079775 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..32dd0bcf 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..4ffed7ee 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..a40c1266 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..8aede373 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..a7d5cbe7 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..e090e33f 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..e88f79a8 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,