From ff02b237812a9a6f976f42d59e2d7f5d23f58278 Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Wed, 20 Dec 2023 23:33:48 -0800 Subject: [PATCH] change hardcoded whitelistaddr + change deployer acct + docs --- core/vm/contracts_with_ctx.go | 4 ++-- geth-poa/README.md | 4 ++-- geth-poa/genesis.json | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/vm/contracts_with_ctx.go b/core/vm/contracts_with_ctx.go index 773d90bcea..1af3900e9b 100644 --- a/core/vm/contracts_with_ctx.go +++ b/core/vm/contracts_with_ctx.go @@ -78,8 +78,8 @@ func (c *mint) RequiredGas(input []byte) uint64 { } // Predetermined create2 address of whitelist contract with exclusive mint/burn privileges. -// See: https://github.com/primevprotocol/contracts/blob/ecfd53d43770201da9c7a697be1fb03e5e554e4e/scripts/DeployScripts.s.sol -const whitelistCreate2Addr = "0xc5bB85F941fb8dbbed6416A8aC84A06226E0f138" +// This address assumes deployer is 0xBcA333b67fb805aB18B4Eb7aa5a0B09aB25E5ce2. +const whitelistCreate2Addr = "0xaE476470bfc00B8a0e8531133bE621e87a981ec8" func (c *mint) Run(input []byte, ctx *precompileContext) ([]byte, error) { diff --git a/geth-poa/README.md b/geth-poa/README.md index 147813b331..a92dd6167c 100644 --- a/geth-poa/README.md +++ b/geth-poa/README.md @@ -14,11 +14,11 @@ All relevant accounts are funded on sidechain genesis, you may need to fund thes ## Contract deployer -Address: `0xBe3dEF3973584FdcC1326634aF188f0d9772D57D` +Address: `0xBcA333b67fb805aB18B4Eb7aa5a0B09aB25E5ce2` Note if the relayer is emitting errors related to unexpected contract routing, try using a new deployer key pair. It's likely that the current bridge contract deployments are clashing with previous deployments. -You'd need to replace `Address` above, the allocs field of `genesis.json`, the `CONTRACT_DEPLOYER_PRIVATE_KEY` in `.env`, and the hardcoded whitelist contract addr in HypERC20.sol. +You'd need to replace `Address` above, the allocs field of `genesis.json`, the `CONTRACT_DEPLOYER_PRIVATE_KEY` in `.env`, the hardcoded whitelist contract addr in HypERC20.sol, and the hardcoded whitelist contract addr in contracts_with_ctx.go. ## Validator Accounts (also POA signers) diff --git a/geth-poa/genesis.json b/geth-poa/genesis.json index 0616dfc1d2..220725e674 100644 --- a/geth-poa/genesis.json +++ b/geth-poa/genesis.json @@ -44,6 +44,9 @@ }, "0x3fab184622dc19b6109349b94811493bf2a45362": { "balance": "10000000000000000000000000000" + }, + "0xBcA333b67fb805aB18B4Eb7aa5a0B09aB25E5ce2": { + "balance": "10000000000000000000000000000" } }, "number": "0x0",