From 892477efc721138842c107235ffde5590c6acd7d Mon Sep 17 00:00:00 2001 From: HFazelinia Date: Sun, 1 Oct 2023 10:18:30 +0100 Subject: [PATCH] update AbstractChain config - add function to get chain config - change addresses fields in ChainConfigs - add permit address to chain config --- package-lock.json | 28 +++--- packages/abstract-chain/lib/AbstractChain.ts | 10 +- packages/abstract-chain/lib/types.ts | 9 +- packages/abstract-chain/package.json | 2 +- .../tests/AbstractChain.spec.ts | 7 +- .../tests/AbstractUtxoChain.spec.ts | 7 +- packages/chains/cardano/lib/CardanoChain.ts | 12 +-- packages/chains/cardano/lib/types.ts | 1 - packages/chains/cardano/package.json | 4 +- .../chains/cardano/tests/CardanoChain.spec.ts | 22 ++--- packages/chains/ergo/lib/ErgoChain.ts | 16 ++-- packages/chains/ergo/package.json | 4 +- packages/chains/ergo/tests/ErgoChain.spec.ts | 92 ++++++++++++------- packages/networks/cardano-koios/package.json | 6 +- packages/networks/ergo-explorer/package.json | 6 +- packages/networks/ergo-node/package.json | 6 +- 16 files changed, 138 insertions(+), 94 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b20339..28d1e16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8395,7 +8395,7 @@ }, "packages/abstract-chain": { "name": "@rosen-chains/abstract-chain", - "version": "1.0.1", + "version": "2.0.0", "license": "GPL-3.0", "dependencies": { "@rosen-bridge/json-bigint": "^0.1.0", @@ -8421,14 +8421,14 @@ }, "packages/chains/cardano": { "name": "@rosen-chains/cardano", - "version": "1.0.1", + "version": "2.0.0", "license": "GPL-3.0", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.3.1", "@rosen-bridge/json-bigint": "^0.1.0", "@rosen-bridge/logger-interface": "^0.1.0", "@rosen-bridge/rosen-extractor": "^0.1.11", - "@rosen-chains/abstract-chain": "^1.0.1", + "@rosen-chains/abstract-chain": "^2.0.0", "bech32": "^2.0.0", "blake2b": "^2.1.3" }, @@ -8451,13 +8451,13 @@ }, "packages/chains/ergo": { "name": "@rosen-chains/ergo", - "version": "1.0.3", + "version": "2.0.0", "license": "GPL-3.0", "dependencies": { "@rosen-bridge/json-bigint": "^0.1.0", "@rosen-bridge/minimum-fee": "^0.1.13", "@rosen-bridge/rosen-extractor": "^0.1.11", - "@rosen-chains/abstract-chain": "^1.0.1", + "@rosen-chains/abstract-chain": "^2.0.0", "blakejs": "^1.2.1", "ergo-lib-wasm-nodejs": "^0.24.1" }, @@ -8479,7 +8479,7 @@ }, "packages/networks/cardano-koios": { "name": "@rosen-chains/cardano-koios-network", - "version": "1.0.1", + "version": "2.0.0", "license": "GPL-3.0", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.3.1", @@ -8487,8 +8487,8 @@ "@rosen-bridge/logger-interface": "^0.1.0", "@rosen-bridge/rosen-extractor": "^0.1.11", "@rosen-bridge/tokens": "^0.2.0", - "@rosen-chains/abstract-chain": "^1.0.1", - "@rosen-chains/cardano": "^1.0.1", + "@rosen-chains/abstract-chain": "^2.0.0", + "@rosen-chains/cardano": "^2.0.0", "@rosen-clients/cardano-koios": "^1.0.3" }, "devDependencies": { @@ -8526,15 +8526,15 @@ }, "packages/networks/ergo-explorer": { "name": "@rosen-chains/ergo-explorer-network", - "version": "1.0.3", + "version": "2.0.0", "license": "GPL-3.0", "dependencies": { "@rosen-bridge/json-bigint": "^0.1.0", "@rosen-bridge/logger-interface": "^0.1.0", "@rosen-bridge/rosen-extractor": "^0.1.11", "@rosen-bridge/tokens": "^0.2.0", - "@rosen-chains/abstract-chain": "^1.0.1", - "@rosen-chains/ergo": "^1.0.3", + "@rosen-chains/abstract-chain": "^2.0.0", + "@rosen-chains/ergo": "^2.0.0", "@rosen-clients/ergo-explorer": "^1.0.2", "ergo-lib-wasm-nodejs": "^0.24.1", "it-all": "^3.0.1" @@ -8568,15 +8568,15 @@ }, "packages/networks/ergo-node": { "name": "@rosen-chains/ergo-node-network", - "version": "1.0.3", + "version": "2.0.0", "license": "GPL-3.0", "dependencies": { "@rosen-bridge/json-bigint": "^0.1.0", "@rosen-bridge/logger-interface": "^0.1.0", "@rosen-bridge/rosen-extractor": "^0.1.11", "@rosen-bridge/tokens": "^0.2.0", - "@rosen-chains/abstract-chain": "^1.0.1", - "@rosen-chains/ergo": "^1.0.3", + "@rosen-chains/abstract-chain": "^2.0.0", + "@rosen-chains/ergo": "^2.0.0", "@rosen-clients/ergo-node": "^1.0.3", "ergo-lib-wasm-nodejs": "^0.24.1", "it-all": "^3.0.1" diff --git a/packages/abstract-chain/lib/AbstractChain.ts b/packages/abstract-chain/lib/AbstractChain.ts index cf22ff6..615a1a3 100644 --- a/packages/abstract-chain/lib/AbstractChain.ts +++ b/packages/abstract-chain/lib/AbstractChain.ts @@ -178,14 +178,14 @@ abstract class AbstractChain { * @returns an object containing the amount of each asset */ getLockAddressAssets = async (): Promise => - await this.getAddressAssets(this.configs.lockAddress); + await this.getAddressAssets(this.configs.addresses.lock); /** * gets the amount of each asset in the cold storage address * @returns an object containing the amount of each asset */ getColdAddressAssets = async (): Promise => - await this.getAddressAssets(this.configs.coldStorageAddress); + await this.getAddressAssets(this.configs.addresses.cold); /** * gets the blockchain height @@ -247,6 +247,12 @@ abstract class AbstractChain { abstract PaymentTransactionFromJson: ( jsonString: string ) => PaymentTransaction; + + /** + * returns chain config + * @assetId + */ + getChainConfigs = (): ChainConfigs => this.configs; } export default AbstractChain; diff --git a/packages/abstract-chain/lib/types.ts b/packages/abstract-chain/lib/types.ts index 5988ea9..d7f9ba3 100644 --- a/packages/abstract-chain/lib/types.ts +++ b/packages/abstract-chain/lib/types.ts @@ -4,11 +4,16 @@ interface ConfirmationConfigs { cold: number; manual: number; } + +interface AddressConfigs { + lock: string; + cold: string; + permit: string; +} interface ChainConfigs { fee: bigint; confirmations: ConfirmationConfigs; - lockAddress: string; - coldStorageAddress: string; + addresses: AddressConfigs; rwtId: string; } diff --git a/packages/abstract-chain/package.json b/packages/abstract-chain/package.json index d3de8f6..7995eab 100644 --- a/packages/abstract-chain/package.json +++ b/packages/abstract-chain/package.json @@ -1,6 +1,6 @@ { "name": "@rosen-chains/abstract-chain", - "version": "1.0.1", + "version": "2.0.0", "description": "this project contains abstract classes to implement any chain for Rosen-bridge", "main": "dist/lib/index.js", "types": "dist/lib/index.d.ts", diff --git a/packages/abstract-chain/tests/AbstractChain.spec.ts b/packages/abstract-chain/tests/AbstractChain.spec.ts index c469431..23b06f7 100644 --- a/packages/abstract-chain/tests/AbstractChain.spec.ts +++ b/packages/abstract-chain/tests/AbstractChain.spec.ts @@ -20,8 +20,11 @@ describe('AbstractChain', () => { cold: 7, manual: 8, }, - lockAddress: 'lock_addr', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'lock_addr', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: 'rwt', }; return new TestChain(network, config); diff --git a/packages/abstract-chain/tests/AbstractUtxoChain.spec.ts b/packages/abstract-chain/tests/AbstractUtxoChain.spec.ts index 5096225..d1b8c3f 100644 --- a/packages/abstract-chain/tests/AbstractUtxoChain.spec.ts +++ b/packages/abstract-chain/tests/AbstractUtxoChain.spec.ts @@ -15,8 +15,11 @@ describe('AbstractUtxoChain', () => { cold: 7, manual: 8, }, - lockAddress: 'lock_addr', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'lock_addr', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: 'rwt', }; return new TestUtxoChain(network, config); diff --git a/packages/chains/cardano/lib/CardanoChain.ts b/packages/chains/cardano/lib/CardanoChain.ts index b3e5cd9..a1cb0a2 100644 --- a/packages/chains/cardano/lib/CardanoChain.ts +++ b/packages/chains/cardano/lib/CardanoChain.ts @@ -78,7 +78,7 @@ class CardanoChain extends AbstractUtxoChain { // skip change box (last box & address equal to bank address) if ( i === tx.body().outputs().len() - 1 && - output.address().to_bech32() === this.configs.lockAddress + output.address().to_bech32() === this.configs.addresses.lock ) continue; @@ -141,11 +141,11 @@ class CardanoChain extends AbstractUtxoChain { serializedSignedTransactions.map((serializedTx) => CardanoWasm.Transaction.from_bytes(Buffer.from(serializedTx, 'hex')) ), - this.configs.lockAddress + this.configs.addresses.lock ); const coveredBoxes = await this.getCoveringBoxes( - this.configs.lockAddress, + this.configs.addresses.lock, requiredAssets, forbiddenBoxIds, trackMap @@ -216,7 +216,7 @@ class CardanoChain extends AbstractUtxoChain { ); const inputBox = CardanoWasm.TransactionInput.new(txHash, box.index); txBuilder.add_input( - CardanoWasm.Address.from_bech32(this.configs.lockAddress), + CardanoWasm.Address.from_bech32(this.configs.addresses.lock), inputBox, CardanoWasm.Value.new(orderValue) ); @@ -251,7 +251,7 @@ class CardanoChain extends AbstractUtxoChain { changeAmount.set_multiasset(changeBoxMultiAsset); this.logger.debug(`Change box amount: ${changeAmount.to_json()}`); const changeBox = CardanoWasm.TransactionOutput.new( - CardanoWasm.Address.from_bech32(this.configs.lockAddress), + CardanoWasm.Address.from_bech32(this.configs.addresses.lock), changeAmount ); txBuilder.add_output(changeBox); @@ -626,7 +626,7 @@ class CardanoChain extends AbstractUtxoChain { // check change box const changeBoxIndex = tx.body().outputs().len() - 1; const changeBox = tx.body().outputs().get(changeBoxIndex); - if (changeBox.address().to_bech32() !== this.configs.lockAddress) { + if (changeBox.address().to_bech32() !== this.configs.addresses.lock) { this.logger.debug( `Tx [${transaction.txId}] invalid: Change box address is wrong` ); diff --git a/packages/chains/cardano/lib/types.ts b/packages/chains/cardano/lib/types.ts index b63914d..798e556 100644 --- a/packages/chains/cardano/lib/types.ts +++ b/packages/chains/cardano/lib/types.ts @@ -6,7 +6,6 @@ import { BigNum } from '@emurgo/cardano-serialization-lib-nodejs'; interface CardanoConfigs extends ChainConfigs { minBoxValue: bigint; - lockAddress: string; txTtl: number; aggregatedPublicKey: string; } diff --git a/packages/chains/cardano/package.json b/packages/chains/cardano/package.json index 76f5daf..b920f49 100644 --- a/packages/chains/cardano/package.json +++ b/packages/chains/cardano/package.json @@ -1,6 +1,6 @@ { "name": "@rosen-chains/cardano", - "version": "1.0.1", + "version": "2.0.0", "description": "this project contains cardano chain for Rosen-bridge", "main": "dist/lib/index.js", "types": "dist/lib/index.d.ts", @@ -24,7 +24,7 @@ "@rosen-bridge/logger-interface": "^0.1.0", "@rosen-bridge/rosen-extractor": "^0.1.11", "@rosen-bridge/json-bigint": "^0.1.0", - "@rosen-chains/abstract-chain": "^1.0.1", + "@rosen-chains/abstract-chain": "^2.0.0", "bech32": "^2.0.0", "blake2b": "^2.1.3" }, diff --git a/packages/chains/cardano/tests/CardanoChain.spec.ts b/packages/chains/cardano/tests/CardanoChain.spec.ts index 40e32aa..973c9d2 100644 --- a/packages/chains/cardano/tests/CardanoChain.spec.ts +++ b/packages/chains/cardano/tests/CardanoChain.spec.ts @@ -33,9 +33,11 @@ describe('CardanoChain', () => { fee: 1000000n, minBoxValue: minBoxValue, txTtl: 64, - lockAddress: - 'addr1qxwkc9uhw02wvkgw9qkrw2twescuc2ss53t5yaedl0zcyen2a0y7redvgjx0t0al56q9dkyzw095eh8jw7luan2kh38qpw3xgs', - coldStorageAddress: 'cold', + addresses: { + lock: 'addr1qxwkc9uhw02wvkgw9qkrw2twescuc2ss53t5yaedl0zcyen2a0y7redvgjx0t0al56q9dkyzw095eh8jw7luan2kh38qpw3xgs', + cold: 'cold', + permit: 'permit', + }, rwtId: rwtId, confirmations: { observation: observationTxConfirmation, @@ -138,7 +140,7 @@ describe('CardanoChain', () => { ); expectedRequiredAssets.nativeToken += minBoxValue + configs.fee; expect(getCovBoxesSpy).toHaveBeenCalledWith( - configs.lockAddress, + configs.addresses.lock, expectedRequiredAssets, TestData.transaction1InputIds, new Map() @@ -599,7 +601,7 @@ describe('CardanoChain', () => { // call the function const result = testInstance.callGetTransactionsBoxMapping( transactions, - configs.lockAddress + configs.addresses.lock ); // check returned value @@ -640,7 +642,7 @@ describe('CardanoChain', () => { const trackingTokenId = 'asset1jy5q5a0vpstutq5q6d8cgdmrd4qu5yefcdnjgz'; const result = testInstance.callGetTransactionsBoxMapping( transactions, - configs.lockAddress, + configs.addresses.lock, trackingTokenId ); @@ -682,7 +684,7 @@ describe('CardanoChain', () => { const trackingTokenId = 'asset1v25eyenfzrv6me9hw4vczfprdctzy5ed3x99p0'; const result = testInstance.callGetTransactionsBoxMapping( transactions, - configs.lockAddress, + configs.addresses.lock, trackingTokenId ); @@ -1508,10 +1510,8 @@ describe('CardanoChain', () => { ); // create a new CardanoChain object with custom lock address - const newConfigs = { - ...configs, - lockAddress: 'TEST', - }; + const newConfigs = structuredClone(configs); + newConfigs.addresses.lock = 'TEST'; const cardanoChain = new CardanoChain( network, newConfigs, diff --git a/packages/chains/ergo/lib/ErgoChain.ts b/packages/chains/ergo/lib/ErgoChain.ts index 3ce6d49..7a0bbb8 100644 --- a/packages/chains/ergo/lib/ErgoChain.ts +++ b/packages/chains/ergo/lib/ErgoChain.ts @@ -142,15 +142,15 @@ class ErgoChain extends AbstractUtxoChain { serializedSignedTransactions.map((serializedTx) => Serializer.signedDeserialize(Buffer.from(serializedTx, 'hex')) ), - this.configs.lockAddress + this.configs.addresses.lock ); - (await this.getMempoolBoxMapping(this.configs.lockAddress)).forEach( + (await this.getMempoolBoxMapping(this.configs.addresses.lock)).forEach( (value, key) => trackMap.set(key, value) ); // call getCovering to get enough boxes const coveredBoxes = await this.getCoveringBoxes( - this.configs.lockAddress, + this.configs.addresses.lock, requiredAssets, forbiddenBoxIds, trackMap @@ -252,7 +252,7 @@ class ErgoChain extends AbstractUtxoChain { ) ), wasm.Contract.new( - wasm.Address.from_base58(this.configs.lockAddress).to_ergo_tree() + wasm.Address.from_base58(this.configs.addresses.lock).to_ergo_tree() ), currentHeight ); @@ -279,7 +279,7 @@ class ErgoChain extends AbstractUtxoChain { outBoxCandidates, currentHeight, wasm.BoxValue.from_i64(wasm.I64.from_str(this.configs.fee.toString())), - wasm.Address.from_base58(this.configs.lockAddress) + wasm.Address.from_base58(this.configs.addresses.lock) ); txCandidate.set_data_inputs(inData); const tx = txCandidate.build(); @@ -382,7 +382,7 @@ class ErgoChain extends AbstractUtxoChain { output.ergo_tree().to_base16_bytes() === ErgoChain.feeBoxErgoTree || (tx.output_candidates().len() - i === 2 && output.ergo_tree().to_base16_bytes() === - wasm.Address.from_base58(this.configs.lockAddress) + wasm.Address.from_base58(this.configs.addresses.lock) .to_ergo_tree() .to_base16_bytes()) ) @@ -552,7 +552,7 @@ class ErgoChain extends AbstractUtxoChain { const box = outputBoxes.get(outputBoxes.len() - 2); const boxErgoTree = box.ergo_tree().to_base16_bytes(); - const lockErgoTree = wasm.Address.from_base58(this.configs.lockAddress) + const lockErgoTree = wasm.Address.from_base58(this.configs.addresses.lock) .to_ergo_tree() .to_base16_bytes(); if (boxErgoTree === lockErgoTree) { @@ -989,7 +989,7 @@ class ErgoChain extends AbstractUtxoChain { for (let i = 0; i < tx.outputs().len(); i++) { const output = tx.outputs().get(i); const boxErgoTree = output.ergo_tree().to_base16_bytes(); - const lockErgoTree = wasm.Address.from_base58(this.configs.lockAddress) + const lockErgoTree = wasm.Address.from_base58(this.configs.addresses.lock) .to_ergo_tree() .to_base16_bytes(); diff --git a/packages/chains/ergo/package.json b/packages/chains/ergo/package.json index 4d0a8fd..b6e824d 100644 --- a/packages/chains/ergo/package.json +++ b/packages/chains/ergo/package.json @@ -1,6 +1,6 @@ { "name": "@rosen-chains/ergo", - "version": "1.0.3", + "version": "2.0.0", "description": "this project contains ergo chain for Rosen-bridge", "main": "dist/lib/index.js", "types": "dist/lib/index.d.ts", @@ -23,7 +23,7 @@ "@rosen-bridge/json-bigint": "^0.1.0", "@rosen-bridge/minimum-fee": "^0.1.13", "@rosen-bridge/rosen-extractor": "^0.1.11", - "@rosen-chains/abstract-chain": "^1.0.1", + "@rosen-chains/abstract-chain": "^2.0.0", "blakejs": "^1.2.1", "ergo-lib-wasm-nodejs": "^0.24.1" }, diff --git a/packages/chains/ergo/tests/ErgoChain.spec.ts b/packages/chains/ergo/tests/ErgoChain.spec.ts index 7609b8a..a8f8cf1 100644 --- a/packages/chains/ergo/tests/ErgoChain.spec.ts +++ b/packages/chains/ergo/tests/ErgoChain.spec.ts @@ -57,8 +57,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: 'lock_addr', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'lock_addr', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwt, minBoxValue: 1000000n, eventTxConfirmation: 18, @@ -147,9 +150,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: - 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 300000n, eventTxConfirmation: 18, @@ -277,9 +282,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: - 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 300000n, eventTxConfirmation: 18, @@ -379,9 +386,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: - 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 300000n, eventTxConfirmation: 18, @@ -501,9 +510,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: - 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 300000n, eventTxConfirmation: 18, @@ -619,9 +630,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: - 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 1000000n, eventTxConfirmation: 18, @@ -678,8 +691,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: 'lock_addr', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'lock_addr', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 1000000n, eventTxConfirmation: 18, @@ -732,8 +748,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: 'lock_addr', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'lock_addr', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 1000000n, eventTxConfirmation: 18, @@ -1314,9 +1333,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: - 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 1000000n, eventTxConfirmation: 18, @@ -1364,8 +1385,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: '9i1rTxaZpLprUkVHpY4YNyooksLuouiKqZ2v1J5nf8xFTXBCVcB', - coldStorageAddress: 'cold_addr', + addresses: { + lock: '9i1rTxaZpLprUkVHpY4YNyooksLuouiKqZ2v1J5nf8xFTXBCVcB', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 1000000n, eventTxConfirmation: 18, @@ -1413,9 +1437,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: - 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'nB3L2PD3LG4ydEj62n9aymRyPCEbkBdzaubgvCWDH2oxHxFBfAUy9GhWDvteDbbUh5qhXxnW8R46qmEiZfkej8gt4kZYvbeobZJADMrWXwFJTsZ17euEcoAp3KDk31Q26okFpgK9SKdi4', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 1000000n, eventTxConfirmation: 18, @@ -2433,9 +2459,11 @@ describe('ErgoChain', () => { cold: coldTxConfirmation, manual: manualTxConfirmation, }, - lockAddress: - 'nB3L2PD3LBtiNhDYK7XhZ8nVt6uekBXN7RcPUKgdKLXFcrJiSPxmQsUKuUkTRQ1hbvDrxEQAKYurGFbaGD1RPxU7XqQimD78j23HHMQKL1boUGsnNhCxaVNAYMcFbQNo355Af8cWkhAN6', - coldStorageAddress: 'cold_addr', + addresses: { + lock: 'nB3L2PD3LBtiNhDYK7XhZ8nVt6uekBXN7RcPUKgdKLXFcrJiSPxmQsUKuUkTRQ1hbvDrxEQAKYurGFbaGD1RPxU7XqQimD78j23HHMQKL1boUGsnNhCxaVNAYMcFbQNo355Af8cWkhAN6', + cold: 'cold_addr', + permit: 'permit_addr', + }, rwtId: rwtId, minBoxValue: 1000000n, eventTxConfirmation: 18, diff --git a/packages/networks/cardano-koios/package.json b/packages/networks/cardano-koios/package.json index 7d9fb6e..eeadf00 100644 --- a/packages/networks/cardano-koios/package.json +++ b/packages/networks/cardano-koios/package.json @@ -1,6 +1,6 @@ { "name": "@rosen-chains/cardano-koios-network", - "version": "1.0.1", + "version": "2.0.0", "description": "cardano koios network package for rosen cardano chain", "main": "dist/lib/index.js", "types": "dist/lib/index.d.ts", @@ -25,8 +25,8 @@ "@rosen-bridge/logger-interface": "^0.1.0", "@rosen-bridge/rosen-extractor": "^0.1.11", "@rosen-bridge/tokens": "^0.2.0", - "@rosen-chains/abstract-chain": "^1.0.1", - "@rosen-chains/cardano": "^1.0.1", + "@rosen-chains/abstract-chain": "^2.0.0", + "@rosen-chains/cardano": "^2.0.0", "@rosen-clients/cardano-koios": "^1.0.3" }, "devDependencies": { diff --git a/packages/networks/ergo-explorer/package.json b/packages/networks/ergo-explorer/package.json index c970813..d901849 100644 --- a/packages/networks/ergo-explorer/package.json +++ b/packages/networks/ergo-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@rosen-chains/ergo-explorer-network", - "version": "1.0.3", + "version": "2.0.0", "description": "ergo explorer network package for rosen ergo chain", "main": "dist/lib/index.js", "types": "dist/lib/index.d.ts", @@ -24,8 +24,8 @@ "@rosen-bridge/logger-interface": "^0.1.0", "@rosen-bridge/rosen-extractor": "^0.1.11", "@rosen-bridge/tokens": "^0.2.0", - "@rosen-chains/abstract-chain": "^1.0.1", - "@rosen-chains/ergo": "^1.0.3", + "@rosen-chains/abstract-chain": "^2.0.0", + "@rosen-chains/ergo": "^2.0.0", "@rosen-clients/ergo-explorer": "^1.0.2", "ergo-lib-wasm-nodejs": "^0.24.1", "it-all": "^3.0.1" diff --git a/packages/networks/ergo-node/package.json b/packages/networks/ergo-node/package.json index fc2890c..932deb1 100644 --- a/packages/networks/ergo-node/package.json +++ b/packages/networks/ergo-node/package.json @@ -1,6 +1,6 @@ { "name": "@rosen-chains/ergo-node-network", - "version": "1.0.3", + "version": "2.0.0", "description": "ergo node network package for rosen ergo chain", "main": "dist/lib/index.js", "types": "dist/lib/index.d.ts", @@ -24,8 +24,8 @@ "@rosen-bridge/logger-interface": "^0.1.0", "@rosen-bridge/rosen-extractor": "^0.1.11", "@rosen-bridge/tokens": "^0.2.0", - "@rosen-chains/abstract-chain": "^1.0.1", - "@rosen-chains/ergo": "^1.0.3", + "@rosen-chains/abstract-chain": "^2.0.0", + "@rosen-chains/ergo": "^2.0.0", "@rosen-clients/ergo-node": "^1.0.3", "ergo-lib-wasm-nodejs": "^0.24.1", "it-all": "^3.0.1"