remove taproot activation code, update libsecp256k1 libs

This commit is contained in:
Craig Raw 2021-11-17 14:49:22 +02:00
parent 8e49247832
commit 3a061cb73a
4 changed files with 2 additions and 6 deletions

View file

@ -1134,14 +1134,10 @@ public enum ScriptType {
@Override @Override
public List<PolicyType> getAllowedPolicyTypes() { public List<PolicyType> getAllowedPolicyTypes() {
return (Network.get() == Network.MAINNET && LocalDate.now().isAfter(TAPROOT_MAINNET_ACTIVATION_DATE) || (System.getProperty(Network.BLOCK_HEIGHT_PROPERTY) != null && Integer.parseInt(System.getProperty(Network.BLOCK_HEIGHT_PROPERTY)) >= 709632)) return List.of(SINGLE);
|| Network.get() == Network.TESTNET || Network.get() == Network.REGTEST || Network.get() == Network.SIGNET ? List.of(SINGLE) : Collections.emptyList();
} }
}; };
//To avoid relying solely on a network-dependent block height >= 709632 check, use a approximate activation date. This can be removed once Taproot has activated on mainnet.
private static final LocalDate TAPROOT_MAINNET_ACTIVATION_DATE = LocalDate.of(2021, Month.NOVEMBER, 17);
private final String name; private final String name;
private final String description; private final String description;
private final String defaultDerivationPath; private final String defaultDerivationPath;

View file

@ -45,7 +45,7 @@ public class Secp256k1Context {
return true; return true;
} catch(IOException e) { } catch(IOException e) {
log.debug("Error loading libsecp256k1 library", e); log.error("Error loading libsecp256k1 library", e);
} }
return false; return false;