diff --git a/hardhat.config.ts b/hardhat.config.ts index 47959594d..08bc1f1f9 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -122,6 +122,7 @@ const config: HardhatUserConfig = { // and we want all generated code to be deterministic // https://docs.soliditylang.org/en/v0.8.17/metadata.html bytecodeHash: 'none', + useLiteralContent: true, }, }, }, @@ -148,9 +149,9 @@ const config: HardhatUserConfig = { }, namedAccounts: { deployer: 0, - governor: 0, + // governor: 0, // governor: '0x00000000000000000000000000000000deadbeef', - // governor: 'privatekey://0x00000000000000000000000000000000deadbeef000000000000000000sample', + governor: 'privatekey://0xe3c1c8220c4ee4a6532d633296c3301db5397cff8a89a920da28f8bec97fcfb6', // governor: 'trezor://0x0000000000000000000000000000000000000000', }, networks: { diff --git a/test/hardhat_test/bridge/BridgeTracking.test.ts b/test/hardhat_test/bridge/BridgeTracking.test.ts index a0c934d2f..3c5f728e1 100644 --- a/test/hardhat_test/bridge/BridgeTracking.test.ts +++ b/test/hardhat_test/bridge/BridgeTracking.test.ts @@ -171,7 +171,10 @@ describe('Bridge Tracking test', () => { stakingContract.interface.encodeFunctionData('initializeV3', [profileAddress]), roninValidatorSet.interface.encodeFunctionData('initializeV3', [fastFinalityTrackingAddress]), roninValidatorSet.interface.encodeFunctionData('initializeV4', [profileAddress]), - new Profile__factory().interface.encodeFunctionData('initializeV2', [stakingContractAddress]), + new Profile__factory().interface.encodeFunctionData('initializeV2', [ + stakingContractAddress, + roninTrustedOrganizationAddress, + ]), new RoninTrustedOrganization__factory().interface.encodeFunctionData('initializeV2', [profileAddress]), ] ); diff --git a/test/hardhat_test/staking/Staking.test.ts b/test/hardhat_test/staking/Staking.test.ts index 47acc6c5d..f275a6147 100644 --- a/test/hardhat_test/staking/Staking.test.ts +++ b/test/hardhat_test/staking/Staking.test.ts @@ -19,6 +19,7 @@ import { ValidatorCandidateAddressSet, } from '../helpers/address-set-types/validator-candidate-set-type'; import { generateSamplePubkey, getLastBlockTimestamp } from '../helpers/utils'; +import { DEFAULT_ADDRESS } from '../../../src/utils'; let coinbase: SignerWithAddress; let deployer: SignerWithAddress; @@ -102,7 +103,7 @@ describe('Staking test', () => { .connect(proxyAdmin) .functionDelegateCall(logicContract.interface.encodeFunctionData('initializeV3', [profileContract.address])); - await profileContract.initializeV2(stakingContractAddr); + await profileContract.initializeV2(stakingContractAddr, DEFAULT_ADDRESS); stakingContract = Staking__factory.connect(stakingProxyContract.address, deployer); expect(validatorContractAddr.toLowerCase()).eq(