Update to support chainid swap
HF 24 chainid: 0xBEEABODE + 56 zeros