Skip to content

Commit da793c5

Browse files
elenaizaguirrepetermetz
authored andcommitted
feat(connector-xdai): remove hard dependency on keychain
Resolves #1162 Signed-off-by: Elena Izaguirre <[email protected]>
1 parent 93652a3 commit da793c5

File tree

14 files changed

+2258
-243
lines changed

14 files changed

+2258
-243
lines changed

.taprc

+3
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,11 @@ files:
8484
- ./packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/openapi/openapi-validation.test.ts
8585
- ./packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/unit/iroha-test-ledger-parameters.test.ts
8686
- ./packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/unit/postgres-test-container-parameters.test.ts
87+
- ./packages/cactus-plugin-ledger-connector-xdai/src/test/typescript/integration/deploy-contract-from-json-xdai-json-object.test.ts
8788
- ./packages/cactus-plugin-ledger-connector-xdai/src/test/typescript/integration/invoke-contract-xdai.test.ts
89+
- ./packages/cactus-plugin-ledger-connector-xdai/src/test/typescript/integration/invoke-contract-xdai-json-object.test.ts
8890
- ./packages/cactus-plugin-ledger-connector-xdai/src/test/typescript/integration/openapi/openapi-validation.test.ts
91+
- ./packages/cactus-plugin-ledger-connector-xdai/src/test/typescript/integration/openapi/openapi-validation-no-keychain.test.ts
8992
- ./packages/cactus-common/src/test/typescript/unit/servers.test.ts
9093
- ./packages/cactus-common/src/test/typescript/unit/key-converter.test.ts
9194
- ./packages/cactus-common/src/test/typescript/unit/strings/is-string.test.ts

examples/cactus-example-carbon-accounting-backend/src/main/typescript/infrastructure/carbon-accounting-app-dummy-infrastructure.ts

+4-16
Original file line numberDiff line numberDiff line change
@@ -374,14 +374,12 @@ export class CarbonAccountingAppDummyInfrastructure {
374374
this._xdaiAccount = await this.xdai.createEthTestAccount(10000000);
375375

376376
{
377-
const { contractName, bytecode, abi: contractAbi } = DaoTokenContract;
377+
const { contractName } = DaoTokenContract;
378378
this.log.info(`Deploying ${contractName}...`);
379379

380380
const res = await besuPlugin.deployContract({
381381
contractName,
382382
keychainId: keychainPlugin.getKeychainId(),
383-
bytecode,
384-
contractAbi,
385383
constructorArgs: [this.xdaiAccount.get().address],
386384
gas: 8000000,
387385
web3SigningCredential: {
@@ -405,7 +403,7 @@ export class CarbonAccountingAppDummyInfrastructure {
405403
}
406404

407405
{
408-
const { contractName, bytecode, abi: contractAbi } = GovernorContract;
406+
const { contractName } = GovernorContract;
409407
this.log.info(`Deploying ${contractName}...`);
410408

411409
const timelockAccount = await this.xdai.createEthTestAccount(2000000);
@@ -414,8 +412,6 @@ export class CarbonAccountingAppDummyInfrastructure {
414412
const res = await besuPlugin.deployContract({
415413
contractName,
416414
keychainId: keychainPlugin.getKeychainId(),
417-
bytecode,
418-
contractAbi,
419415
// address timelock_, address dclm8_, address guardian_
420416
constructorArgs: [
421417
timelockAccount.address,
@@ -444,16 +440,14 @@ export class CarbonAccountingAppDummyInfrastructure {
444440
}
445441

446442
{
447-
const { contractName, bytecode, abi: contractAbi } = TimelockContract;
443+
const { contractName } = TimelockContract;
448444
this.log.info(`Deploying ${contractName}...`);
449445

450446
const adminAccount = await this.xdai.createEthTestAccount(2000000);
451447
const delay = 7 * 60 * 60 * 24;
452448
const res = await besuPlugin.deployContract({
453449
contractName,
454450
keychainId: keychainPlugin.getKeychainId(),
455-
bytecode,
456-
contractAbi,
457451
constructorArgs: [adminAccount.address, delay],
458452
gas: 8000000,
459453
web3SigningCredential: {
@@ -477,19 +471,13 @@ export class CarbonAccountingAppDummyInfrastructure {
477471
}
478472

479473
{
480-
const {
481-
contractName,
482-
bytecode,
483-
abi: contractAbi,
484-
} = NetEmissionsTokenNetworkContract;
474+
const { contractName } = NetEmissionsTokenNetworkContract;
485475

486476
this.log.info(`Deploying ${contractName}...`);
487477
const adminAccount = await this.xdai.createEthTestAccount(2000000);
488478
const res = await besuPlugin.deployContract({
489479
contractName,
490480
keychainId: keychainPlugin.getKeychainId(),
491-
bytecode,
492-
contractAbi,
493481
constructorArgs: [adminAccount.address],
494482
gas: 8000000,
495483
web3SigningCredential: {

jest.config.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)