diff --git a/.github/workflows/build-test-macos-core.yml b/.github/workflows/build-test-macos-core.yml index a8d4bdaa18..ac55b56d86 100644 --- a/.github/workflows/build-test-macos-core.yml +++ b/.github/workflows/build-test-macos-core.yml @@ -58,7 +58,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.13.0' + ref: '0.14.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-macos-wallet.yml b/.github/workflows/build-test-macos-wallet.yml index 287b030817..e23af7dbc6 100644 --- a/.github/workflows/build-test-macos-wallet.yml +++ b/.github/workflows/build-test-macos-wallet.yml @@ -58,7 +58,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.13.0' + ref: '0.14.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-ubuntu-core.yml b/.github/workflows/build-test-ubuntu-core.yml index 12f2771ae9..3afe0ed30f 100644 --- a/.github/workflows/build-test-ubuntu-core.yml +++ b/.github/workflows/build-test-ubuntu-core.yml @@ -65,7 +65,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.13.0' + ref: '0.14.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-ubuntu-wallet.yml b/.github/workflows/build-test-ubuntu-wallet.yml index a032399167..7c20031f9f 100644 --- a/.github/workflows/build-test-ubuntu-wallet.yml +++ b/.github/workflows/build-test-ubuntu-wallet.yml @@ -65,7 +65,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.13.0' + ref: '0.14.0' fetch-depth: 1 - name: Link home directory diff --git a/src/consensus/default_constants.py b/src/consensus/default_constants.py index 99c8489e01..23fa55a2ab 100644 --- a/src/consensus/default_constants.py +++ b/src/consensus/default_constants.py @@ -29,10 +29,10 @@ testnet_kwargs = { # We override this value based on the chain being run (testnet0, testnet1, mainnet, etc) "GENESIS_CHALLENGE": bytes32([0x00] * 32), "GENESIS_PRE_FARM_POOL_PUZZLE_HASH": bytes.fromhex( - "f15f4e19248642ce92515ffb05d37fc0fadc30eb95d69b8800ae78e34c0e5d0f" + "bc4fd6c394fe90c6097afbfa6ab5927743e2210ecf689dad477be8eb408745d5" ), "GENESIS_PRE_FARM_FARMER_PUZZLE_HASH": bytes.fromhex( - "0dc09d07e7cef3b57a42e08ec89a59277ef579e6833776937f601e21ec305dba" + "4ad98e66a019f11b60a8279514d13105b65588865e2a8e794b5b73d5646174f6" ), "MAX_VDF_WITNESS_SIZE": 64, # Target tx count per sec diff --git a/src/util/initial-config.yaml b/src/util/initial-config.yaml index 2ffa220a78..26b075bb6a 100644 --- a/src/util/initial-config.yaml +++ b/src/util/initial-config.yaml @@ -12,7 +12,8 @@ network_overrides: &network_overrides testnet4: GENESIS_CHALLENGE: "4b227777d4dd1fc61c6f884f48641d02b4d121d3fd328cb08b5531fcacdabf8a" # std_hash(b"4") NETWORK: 4 - + GENESIS_PRE_FARM_POOL_PUZZLE_HASH: "bc4fd6c394fe90c6097afbfa6ab5927743e2210ecf689dad477be8eb408745d5" + GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: "4ad98e66a019f11b60a8279514d13105b65588865e2a8e794b5b73d5646174f6" selected_network: &selected_network "testnet4" diff --git a/src/wallet/puzzles/prefarm/make_prefarm_ph.py b/src/wallet/puzzles/prefarm/make_prefarm_ph.py index a22544a59f..317d6d6bba 100644 --- a/src/wallet/puzzles/prefarm/make_prefarm_ph.py +++ b/src/wallet/puzzles/prefarm/make_prefarm_ph.py @@ -8,8 +8,8 @@ from src.util.condition_tools import parse_sexp_to_conditions from src.consensus.block_rewards import calculate_pool_reward, calculate_base_farmer_reward from src.util.ints import uint32 -address1 = "txch17gqxp6vnq90ypl8kzn56c2jejcva90tf6sh2dumw05nrxwggf2lskq2es5" # Gene wallet (m/12381/8444/2/59): -address2 = "txch1n4l69tm4s4ekju9uce6xaq7fym8mkzcxrrn77xngl9ej7t8nd8ks409lhk" # mariano main key +address1 = "txch1k50glwkdffp2mrqq64rsgjtxj4waphuf72stqayz4qqk6mj9hd4qp7lrek" # Gene wallet (m/12381/8444/2/51): +address2 = "txch1430mtj60hvzyuyz4t45dyxwjdjsvphhl2fgreyry362reca4zpkszhjd3e" # farmer1 key (m/12381/8444/2/51) ph1 = decode_puzzle_hash(address1) ph2 = decode_puzzle_hash(address2)