Skip to content

Commit

Permalink
Merge branch 'feat/cacu-i' into 'develop'
Browse files Browse the repository at this point in the history
feat/cacu-i

See merge request papers/airgap/airgap-wallet!741
  • Loading branch information
godenzim committed Apr 4, 2024
2 parents 1931114 + d532380 commit b68e9e0
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 27 deletions.
19 changes: 12 additions & 7 deletions browserify-coinlib.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,23 @@ const modules = [
{
namespace: 'tezos',
import: '../../../node_modules/@airgap/tezos'
},
{
namespace: 'acurast',
import: '../../../node_modules/@airgap/acurast'
}
]

function browserifyModules(modules) {
const outputDir = path.join(assetsdir, `libs`)
const combinedSourceFile = 'coinlib-all.js'
const combinedSource = modules.map((module) =>
module.namespace
? `import * as ${module.namespace} from '${module.import}';\nexport { ${module.namespace} };`
: `export * from '${module.import}';`
).join('\n')
const combinedSource = modules
.map((module) =>
module.namespace
? `import * as ${module.namespace} from '${module.import}';\nexport { ${module.namespace} };`
: `export * from '${module.import}';`
)
.join('\n')

fs.mkdirSync(outputDir, { recursive: true })
fs.writeFileSync(path.join(outputDir, combinedSourceFile), combinedSource, 'utf-8')
Expand All @@ -78,5 +84,4 @@ function browserifyModules(modules) {
.pipe(fs.createWriteStream(path.join(outputDir, 'airgap-coin-lib.browserify.js')))
}


browserifyModules(modules)
browserifyModules(modules)
39 changes: 20 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,29 @@
}
},
"dependencies": {
"@airgap/aeternity": "0.13.25",
"@airgap/acurast": "0.13.26-beta.0",
"@airgap/aeternity": "0.13.26-beta.0",
"@airgap/angular-core": "0.0.44",
"@airgap/angular-ngrx": "0.0.44",
"@airgap/astar": "0.13.25",
"@airgap/astar": "0.13.26-beta.0",
"@airgap/beacon-sdk": "3.1.5-beta.0",
"@airgap/bitcoin": "0.13.25",
"@airgap/coinlib-core": "0.13.25",
"@airgap/coreum": "0.13.25",
"@airgap/cosmos": "0.13.25",
"@airgap/cosmos-core": "0.13.25",
"@airgap/crypto": "0.13.25",
"@airgap/ethereum": "0.13.25",
"@airgap/groestlcoin": "0.13.25",
"@airgap/icp": "0.13.25",
"@airgap/module-kit": "0.13.25",
"@airgap/moonbeam": "0.13.25",
"@airgap/optimism": "0.13.25",
"@airgap/polkadot": "0.13.25",
"@airgap/bitcoin": "0.13.26-beta.0",
"@airgap/coinlib-core": "0.13.26-beta.0",
"@airgap/coreum": "0.13.26-beta.0",
"@airgap/cosmos": "0.13.26-beta.0",
"@airgap/cosmos-core": "0.13.26-beta.0",
"@airgap/crypto": "0.13.26-beta.0",
"@airgap/ethereum": "0.13.26-beta.0",
"@airgap/groestlcoin": "0.13.26-beta.0",
"@airgap/icp": "0.13.26-beta.0",
"@airgap/module-kit": "0.13.26-beta.0",
"@airgap/moonbeam": "0.13.26-beta.0",
"@airgap/optimism": "0.13.26-beta.0",
"@airgap/polkadot": "0.13.26-beta.0",
"@airgap/sapling-wasm": "0.0.7",
"@airgap/serializer": "0.13.25",
"@airgap/substrate": "0.13.25",
"@airgap/tezos": "0.13.25",
"@airgap/serializer": "0.13.26-beta.0",
"@airgap/substrate": "0.13.26-beta.0",
"@airgap/tezos": "0.13.26-beta.0",
"@airgap-community/iso-rootstock": "1.0.0",
"@angular/animations": "^16.1.1",
"@angular/common": "^16.1.1",
Expand Down Expand Up @@ -131,7 +132,7 @@
"@types/ledgerhq__hw-transport-u2f": "^4.21.1",
"@types/ledgerhq__hw-transport-webusb": "^4.70.0",
"@walletconnect/client": "^1.4.1",
"@walletconnect/core": "^2.11.0",
"@walletconnect/core": "^2.11.0",
"@walletconnect/utils": "^2.11.0",
"@walletconnect/web3wallet": "^1.10.0",
"@zondax/ledger-polkadot": "^0.13.6",
Expand Down
5 changes: 4 additions & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import {
} from '@airgap/angular-core'
import { AstarModule } from '@airgap/astar'
import { BitcoinModule } from '@airgap/bitcoin'
import { AcurastModule } from '@airgap/acurast'

import {
AirGapMarketWallet,
IAirGapTransaction,
Expand Down Expand Up @@ -257,7 +259,8 @@ export class AppComponent implements AfterViewInit {
new AstarModule(),
new ICPModule(),
new CoreumModule(),
new OptimismModule()
new OptimismModule(),
new AcurastModule()
])
const v1Protocols = await this.modulesService.loadProtocols('online', [
MainProtocolSymbols.XTZ_SHIELDED,
Expand Down

0 comments on commit b68e9e0

Please sign in to comment.