Skip to content

Commit

Permalink
fix(sdk-coin-ada): bumb serialization library and fix tests
Browse files Browse the repository at this point in the history
Ticket: WIN-3256

TICKET: WIN-3256
  • Loading branch information
sreerajs authored and evanzbitgo committed Aug 30, 2024
1 parent 696a3e7 commit 16feeac
Show file tree
Hide file tree
Showing 15 changed files with 81 additions and 114 deletions.
4 changes: 2 additions & 2 deletions modules/sdk-coin-ada/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"@bitgo/sdk-core": "^28.2.0",
"@bitgo/sdk-lib-mpc": "^10.0.0",
"@bitgo/statics": "^49.2.0",
"@emurgo/cardano-serialization-lib-browser": "^11.4.0",
"@emurgo/cardano-serialization-lib-nodejs": "^11.4.0",
"@emurgo/cardano-serialization-lib-browser": "^12.0.1",
"@emurgo/cardano-serialization-lib-nodejs": "^12.0.1",
"bech32": "^2.0.0",
"bignumber.js": "^9.0.2",
"lodash": "^4.17.21",
Expand Down
8 changes: 4 additions & 4 deletions modules/sdk-coin-ada/src/lib/keyPair.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
PrivateKey,
EnterpriseAddress,
NetworkInfo,
StakeCredential,
Credential,
} from '@emurgo/cardano-serialization-lib-nodejs';
import * as nacl from 'tweetnacl';

Expand All @@ -28,13 +28,13 @@ export class KeyPair extends Ed25519KeyPair {
let enterpriseAddress;
if (format === AddressFormat.testnet) {
enterpriseAddress = EnterpriseAddress.new(
NetworkInfo.testnet().network_id(),
StakeCredential.from_keyhash(pubKey.hash())
NetworkInfo.testnet_preprod().network_id(),
Credential.from_keyhash(pubKey.hash())
);
} else if (format === AddressFormat.mainnet) {
enterpriseAddress = EnterpriseAddress.new(
NetworkInfo.mainnet().network_id(),
StakeCredential.from_keyhash(pubKey.hash())
Credential.from_keyhash(pubKey.hash())
);
}
return enterpriseAddress.to_address().to_bech32();
Expand Down
2 changes: 1 addition & 1 deletion modules/sdk-coin-ada/src/lib/stakingActivateBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class StakingActivateBuilder extends TransactionBuilder {
* @param poolHash Pool ID Hash of the pool we are going to delegate to
*/
stakingCredential(stakingPublicKey: string, poolHash: string): this {
const stakeCredential = CardanoWasm.StakeCredential.from_keyhash(
const stakeCredential = CardanoWasm.Credential.from_keyhash(
CardanoWasm.PublicKey.from_bytes(Buffer.from(stakingPublicKey, 'hex')).hash()
);
const stakeKeyRegistrationCert = CardanoWasm.Certificate.new_stake_registration(
Expand Down
2 changes: 1 addition & 1 deletion modules/sdk-coin-ada/src/lib/stakingDeactivateBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class StakingDeactivateBuilder extends TransactionBuilder {
*
*/
stakingCredential(stakingPublicKey: string): this {
const stakeCredential = CardanoWasm.StakeCredential.from_keyhash(
const stakeCredential = CardanoWasm.Credential.from_keyhash(
CardanoWasm.PublicKey.from_bytes(Buffer.from(stakingPublicKey, 'hex')).hash()
);
const stakeKeyDeregistrationCert = CardanoWasm.Certificate.new_stake_deregistration(
Expand Down
2 changes: 1 addition & 1 deletion modules/sdk-coin-ada/src/lib/transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ export class Transaction extends BaseTransaction {
const owners: string[] = [];
for (let i = 0; i < poolRegistration!.pool_params().pool_owners().len(); i++) {
const poolOwner = poolRegistration!.pool_params().pool_owners().get(i);
const ownerStakeKey = CardanoWasm.StakeCredential.from_keyhash(poolOwner);
const ownerStakeKey = CardanoWasm.Credential.from_keyhash(poolOwner);
owners.push(CardanoWasm.RewardAddress.new(networkId, ownerStakeKey).to_address().to_bech32());
}
return {
Expand Down
21 changes: 9 additions & 12 deletions modules/sdk-coin-ada/src/lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
PublicKey,
Ed25519Signature,
NetworkInfo,
StakeCredential,
Credential,
RewardAddress,
Transaction as CardanoTransaction,
} from '@emurgo/cardano-serialization-lib-nodejs';
Expand All @@ -30,8 +30,8 @@ export class Utils implements BaseUtils {
// 3. create full base address for staking
baseAddr = BaseAddress.new(
NetworkInfo.mainnet().network_id(),
StakeCredential.from_keyhash(paymentPub.hash()),
StakeCredential.from_keyhash(stakePub.hash())
Credential.from_keyhash(paymentPub.hash()),
Credential.from_keyhash(stakePub.hash())
);
return baseAddr.to_address().to_bech32();
} else if (network === AddressFormat.testnet) {
Expand All @@ -41,9 +41,9 @@ export class Utils implements BaseUtils {
const paymentPub = PublicKey.from_bytes(Buffer.from(paymentKeyPair.getKeys().pub, 'hex'));
// 3. create full base address for staking
const baseAddr = BaseAddress.new(
NetworkInfo.testnet().network_id(),
StakeCredential.from_keyhash(paymentPub.hash()),
StakeCredential.from_keyhash(stakePub.hash())
NetworkInfo.testnet_preprod().network_id(),
Credential.from_keyhash(paymentPub.hash()),
Credential.from_keyhash(stakePub.hash())
);
return baseAddr.to_address().to_bech32();
} else {
Expand All @@ -65,14 +65,11 @@ export class Utils implements BaseUtils {
const stakePub = PublicKey.from_bytes(Buffer.from(stakingPubKey, 'hex'));
let rewardAddress;
if (coinName === 'ada') {
rewardAddress = RewardAddress.new(
NetworkInfo.mainnet().network_id(),
StakeCredential.from_keyhash(stakePub.hash())
);
rewardAddress = RewardAddress.new(NetworkInfo.mainnet().network_id(), Credential.from_keyhash(stakePub.hash()));
} else {
rewardAddress = RewardAddress.new(
NetworkInfo.testnet().network_id(),
StakeCredential.from_keyhash(stakePub.hash())
NetworkInfo.testnet_preprod().network_id(),
Credential.from_keyhash(stakePub.hash())
);
}
return rewardAddress.to_address().to_bech32();
Expand Down
Loading

0 comments on commit 16feeac

Please sign in to comment.