diff --git a/README.md b/README.md index 6af4e3a..2a765fe 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ const hook = createHookPayload({ await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) ``` @@ -112,7 +112,7 @@ const clearHook = createHookPayload({ }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{Hook: {}}, { Hook: clearHook }], } as SetHookParams) ``` @@ -524,7 +524,7 @@ const hook = createHookPayload({ await setHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, hooks: [{ Hook: hook }], } as SetHookParams) diff --git a/contracts-c/toolbox/operator.c b/contracts-c/toolbox/operator.c new file mode 100644 index 0000000..d2d015d --- /dev/null +++ b/contracts-c/toolbox/operator.c @@ -0,0 +1,38 @@ + +#include +#include "hookapi.h" + +#define OP3(a, b, c) (((a) << 16) | ((b) << 8) | (c)) + +int64_t hook(uint32_t r) +{ + _g(1, 1); + + int64_t tt = otxn_type(); + uint8_t op_bytes[4]; + if (otxn_param(&op_bytes, 3, "OP", 2) != 3) + NOPE("operator.c: Missing OP parameter."); + + uint32_t op = (op_bytes[0] << 16) | (op_bytes[1] << 8) | op_bytes[2]; + + // action + switch (op) + { + case OP3('O', 'C', 'B'): + { + TRACESTR("operator.c: OCB."); + DONE("operator.c: OCB."); + } + case OP3('O', 'C', 'S'): + { + TRACESTR("operator.c: OCS."); + DONE("operator.c: OCS."); + } + default: + { + NOPE("operator.c: Unknown operation."); + } + } + + return 0; +} \ No newline at end of file diff --git a/src/libs/xrpl-helpers/fundSystem.ts b/src/libs/xrpl-helpers/fundSystem.ts index 3dbd00a..645adf0 100644 --- a/src/libs/xrpl-helpers/fundSystem.ts +++ b/src/libs/xrpl-helpers/fundSystem.ts @@ -181,7 +181,7 @@ export async function setGovernTable( } await setHooksV3({ client: client, - seed: table.seed, + wallet: table, hooks: [{ Hook: hook }], } as SetHookParams) const tx: Invoke = { diff --git a/src/libs/xrpl-helpers/setup.ts b/src/libs/xrpl-helpers/setup.ts index ea3bc31..1e41351 100644 --- a/src/libs/xrpl-helpers/setup.ts +++ b/src/libs/xrpl-helpers/setup.ts @@ -85,7 +85,7 @@ export async function teardownHook( const promises = accounts.map(async (acct: Wallet) => { await clearAllHooksV3({ client: context.client, - seed: acct.seed, + wallet: acct, } as SetHookParams) }) await Promise.all(promises) diff --git a/src/setHooks.ts b/src/setHooks.ts index c166a55..da5590c 100644 --- a/src/setHooks.ts +++ b/src/setHooks.ts @@ -1,10 +1,8 @@ import { - Wallet, calculateHookOn, hexHookParameters, SetHook, SetHookFlags, - ECDSA, } from 'xahau' import { SetHookParams, iHook } from './types' import { HookGrant, HookParameter } from 'xahau/dist/npm/models/common/xahau' @@ -68,11 +66,11 @@ export function createHookPayload(payload: SetHookPayload): iHook { return hook } -export async function setHooksV3({ client, seed, hooks }: SetHookParams) { - const HOOK_ACCOUNT = Wallet.fromSeed(seed, { algorithm: ECDSA.secp256k1 }) + +export async function setHooksV3({ client, wallet, hooks }: SetHookParams) { const tx: SetHook = { TransactionType: `SetHook`, - Account: HOOK_ACCOUNT.address, + Account: wallet.address, Hooks: hooks, } @@ -80,7 +78,7 @@ export async function setHooksV3({ client, seed, hooks }: SetHookParams) { appLogger.debug(JSON.stringify(tx, null, 2)) appLogger.debug(`\n2. Submitting transaction...`) - await appTransaction(client, tx, HOOK_ACCOUNT, { + await appTransaction(client, tx, wallet, { hardFail: true, count: 2, delayMs: 1000, @@ -89,15 +87,15 @@ export async function setHooksV3({ client, seed, hooks }: SetHookParams) { appLogger.debug(`\n3. SetHook Success...`) } -export async function clearAllHooksV3({ client, seed }: SetHookParams) { - const HOOK_ACCOUNT = Wallet.fromSeed(seed, { algorithm: ECDSA.secp256k1 }) + +export async function clearAllHooksV3({ client, wallet }: SetHookParams) { const hook = { CreateCode: '', Flags: SetHookFlags.hsfOverride | SetHookFlags.hsfNSDelete, } as iHook const tx: SetHook = { TransactionType: `SetHook`, - Account: HOOK_ACCOUNT.classicAddress, + Account: wallet.classicAddress, Hooks: [ { Hook: hook }, { Hook: hook }, @@ -116,7 +114,7 @@ export async function clearAllHooksV3({ client, seed }: SetHookParams) { appLogger.debug(JSON.stringify(tx, null, 2)) appLogger.debug(`\n2. Submitting transaction...`) - await appTransaction(client, tx, HOOK_ACCOUNT, { + await appTransaction(client, tx, wallet, { hardFail: true, count: 2, delayMs: 1000, @@ -125,11 +123,14 @@ export async function clearAllHooksV3({ client, seed }: SetHookParams) { appLogger.debug(`\n3. SetHook Success...`) } -export async function clearHookStateV3({ client, seed, hooks }: SetHookParams) { - const HOOK_ACCOUNT = Wallet.fromSeed(seed, { algorithm: ECDSA.secp256k1 }) +export async function clearHookStateV3({ + client, + wallet, + hooks, +}: SetHookParams) { const tx: SetHook = { TransactionType: `SetHook`, - Account: HOOK_ACCOUNT.classicAddress, + Account: wallet.classicAddress, Hooks: hooks, } @@ -137,7 +138,7 @@ export async function clearHookStateV3({ client, seed, hooks }: SetHookParams) { appLogger.debug(JSON.stringify(tx, null, 2)) appLogger.debug(`\n2. Submitting transaction...`) - await appTransaction(client, tx, HOOK_ACCOUNT, { + await appTransaction(client, tx, wallet, { hardFail: true, count: 2, delayMs: 1000, diff --git a/src/types.ts b/src/types.ts index ae5739d..723b0c0 100644 --- a/src/types.ts +++ b/src/types.ts @@ -19,7 +19,7 @@ export type iHook = { export type SetHookParams = { client: Client - seed: string + wallet: Wallet hooks: Hook[] flags: number | SetHookFlagsInterface } diff --git a/test/integration-c/hooks/toolbox/base.test.ts b/test/integration-c/hooks/toolbox/base.test.ts index 68d1306..d6cabff 100644 --- a/test/integration-c/hooks/toolbox/base.test.ts +++ b/test/integration-c/hooks/toolbox/base.test.ts @@ -29,14 +29,14 @@ describe('base', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/callback.test.ts b/test/integration-c/hooks/toolbox/callback.test.ts index cdb996c..9e5711c 100644 --- a/test/integration-c/hooks/toolbox/callback.test.ts +++ b/test/integration-c/hooks/toolbox/callback.test.ts @@ -47,7 +47,7 @@ describe('callback', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -76,12 +76,12 @@ describe('callback', () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.gw.seed, + wallet: testContext.gw, } as SetHookParams) await clearAllHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, } as SetHookParams) }) it('callback failure', async () => { @@ -94,7 +94,7 @@ describe('callback', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -141,12 +141,12 @@ describe('callback', () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.gw.seed, + wallet: testContext.gw, } as SetHookParams) await clearAllHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, } as SetHookParams) await accountClear( diff --git a/test/integration-c/hooks/toolbox/commonMemo.test.ts b/test/integration-c/hooks/toolbox/commonMemo.test.ts index 893dde2..1e680cf 100644 --- a/test/integration-c/hooks/toolbox/commonMemo.test.ts +++ b/test/integration-c/hooks/toolbox/commonMemo.test.ts @@ -29,14 +29,14 @@ describe('commonMemo', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/compareCondition.test.ts b/test/integration-c/hooks/toolbox/compareCondition.test.ts index 2800f92..f5b1390 100644 --- a/test/integration-c/hooks/toolbox/compareCondition.test.ts +++ b/test/integration-c/hooks/toolbox/compareCondition.test.ts @@ -34,14 +34,14 @@ describe('compareCondition', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/filterOnIO.test.ts b/test/integration-c/hooks/toolbox/filterOnIO.test.ts index c4cb734..9aa7281 100644 --- a/test/integration-c/hooks/toolbox/filterOnIO.test.ts +++ b/test/integration-c/hooks/toolbox/filterOnIO.test.ts @@ -34,14 +34,14 @@ describe('filterOnIO', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/filterOnToken.test.ts b/test/integration-c/hooks/toolbox/filterOnToken.test.ts index 69c2733..cd72887 100644 --- a/test/integration-c/hooks/toolbox/filterOnToken.test.ts +++ b/test/integration-c/hooks/toolbox/filterOnToken.test.ts @@ -41,14 +41,14 @@ describe('filterOnToken', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/filterOnXrp.test.ts b/test/integration-c/hooks/toolbox/filterOnXrp.test.ts index 8652070..8470122 100644 --- a/test/integration-c/hooks/toolbox/filterOnXrp.test.ts +++ b/test/integration-c/hooks/toolbox/filterOnXrp.test.ts @@ -34,14 +34,14 @@ describe('filterOnXrp', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/floatSubtract.test.ts b/test/integration-c/hooks/toolbox/floatSubtract.test.ts index 0e4af2d..1f348c8 100644 --- a/test/integration-c/hooks/toolbox/floatSubtract.test.ts +++ b/test/integration-c/hooks/toolbox/floatSubtract.test.ts @@ -29,14 +29,14 @@ describe('floatSubtract', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/hookOnTT.test.ts b/test/integration-c/hooks/toolbox/hookOnTT.test.ts index 89ff677..e699024 100644 --- a/test/integration-c/hooks/toolbox/hookOnTT.test.ts +++ b/test/integration-c/hooks/toolbox/hookOnTT.test.ts @@ -27,7 +27,7 @@ describe('hookOnTT', () => { afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) @@ -42,7 +42,7 @@ describe('hookOnTT', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -70,7 +70,7 @@ describe('hookOnTT', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) try { diff --git a/test/integration-c/hooks/toolbox/numbers.test.ts b/test/integration-c/hooks/toolbox/numbers.test.ts index ce13164..241ce46 100644 --- a/test/integration-c/hooks/toolbox/numbers.test.ts +++ b/test/integration-c/hooks/toolbox/numbers.test.ts @@ -33,14 +33,14 @@ describe('numbers', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/operator.test.ts b/test/integration-c/hooks/toolbox/operator.test.ts new file mode 100644 index 0000000..f1ad790 --- /dev/null +++ b/test/integration-c/hooks/toolbox/operator.test.ts @@ -0,0 +1,73 @@ +// xrpl +import { Invoke, SetHookFlags, TransactionMetadata } from 'xahau' +import { + // Testing + XrplIntegrationTestContext, + setupClient, + teardownClient, + serverUrl, + // Main + Xrpld, + SetHookParams, + ExecutionUtility, + createHookPayload, + setHooksV3, + clearAllHooksV3, + iHookParamEntry, + iHookParamName, + iHookParamValue, +} from '../../../../dist/npm/src' + +describe('operator', () => { + let testContext: XrplIntegrationTestContext + + beforeAll(async () => { + testContext = await setupClient(serverUrl) + const hook = createHookPayload({ + version: 0, + createFile: 'operator', + namespace: 'operator', + flags: SetHookFlags.hsfOverride, + hookOnArray: ['Invoke'], + }) + await setHooksV3({ + client: testContext.client, + wallet: testContext.hook1, + hooks: [{ Hook: hook }], + } as SetHookParams) + }) + afterAll(async () => { + await clearAllHooksV3({ + client: testContext.client, + wallet: testContext.hook1, + } as SetHookParams) + await teardownClient(testContext) + }) + + it('basic hook', async () => { + // INVOKE IN + const aliceWallet = testContext.alice + const hookWallet = testContext.hook1 + const tx1param1 = new iHookParamEntry( + new iHookParamName('OP'), + new iHookParamValue('OCB') + ) + const builtTx: Invoke = { + TransactionType: 'Invoke', + Account: aliceWallet.classicAddress, + Destination: hookWallet.classicAddress, + HookParameters: [tx1param1.toXrpl()], + } + const result = await Xrpld.submit(testContext.client, { + wallet: aliceWallet, + tx: builtTx, + }) + const hookExecutions = await ExecutionUtility.getHookExecutionsFromMeta( + testContext.client, + result.meta as TransactionMetadata + ) + expect(hookExecutions.executions[0].HookReturnString).toMatch( + 'operator.c: OCB.' + ) + }) +}) diff --git a/test/integration-c/hooks/toolbox/paramBasic.test.ts b/test/integration-c/hooks/toolbox/paramBasic.test.ts index 3c65b7b..5431b96 100644 --- a/test/integration-c/hooks/toolbox/paramBasic.test.ts +++ b/test/integration-c/hooks/toolbox/paramBasic.test.ts @@ -36,14 +36,14 @@ describe('paramBasic', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/random.test.ts b/test/integration-c/hooks/toolbox/random.test.ts index 5bf174d..b9ee88d 100644 --- a/test/integration-c/hooks/toolbox/random.test.ts +++ b/test/integration-c/hooks/toolbox/random.test.ts @@ -29,14 +29,14 @@ describe('random', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/stateAdvanced.test.ts b/test/integration-c/hooks/toolbox/stateAdvanced.test.ts index c9cdb5e..da94b06 100644 --- a/test/integration-c/hooks/toolbox/stateAdvanced.test.ts +++ b/test/integration-c/hooks/toolbox/stateAdvanced.test.ts @@ -76,14 +76,14 @@ describe('StateAdvanced', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/stateBasic.test.ts b/test/integration-c/hooks/toolbox/stateBasic.test.ts index 718a5ac..4be870e 100644 --- a/test/integration-c/hooks/toolbox/stateBasic.test.ts +++ b/test/integration-c/hooks/toolbox/stateBasic.test.ts @@ -38,14 +38,14 @@ describe('stateBasic', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/stateForeignBasic.test.ts b/test/integration-c/hooks/toolbox/stateForeignBasic.test.ts index 80a3d88..dca4e30 100644 --- a/test/integration-c/hooks/toolbox/stateForeignBasic.test.ts +++ b/test/integration-c/hooks/toolbox/stateForeignBasic.test.ts @@ -60,11 +60,11 @@ describe('stateForeignBasic', () => { afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook2.seed, + wallet: testContext.hook2, } as SetHookParams) await teardownClient(testContext) }) @@ -84,7 +84,7 @@ describe('stateForeignBasic', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook1 }], } as SetHookParams) @@ -115,7 +115,7 @@ describe('stateForeignBasic', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook2.seed, + wallet: testContext.hook2, hooks: [{ Hook: hook2 }], } as SetHookParams) @@ -151,7 +151,7 @@ describe('stateForeignBasic', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook1 }], } as SetHookParams) @@ -182,7 +182,7 @@ describe('stateForeignBasic', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook2.seed, + wallet: testContext.hook2, hooks: [{ Hook: hook2 }], } as SetHookParams) @@ -247,7 +247,7 @@ describe('stateForeignBasic', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook2.seed, + wallet: testContext.hook2, hooks: [{ Hook: hook1 }], } as SetHookParams) @@ -276,7 +276,7 @@ describe('stateForeignBasic', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook2 }], } as SetHookParams) @@ -340,7 +340,7 @@ describe('stateForeignBasic', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook2.seed, + wallet: testContext.hook2, hooks: [{ Hook: hook1 }], } as SetHookParams) @@ -370,7 +370,7 @@ describe('stateForeignBasic', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook2 }], } as SetHookParams) diff --git a/test/integration-c/hooks/toolbox/stateNumbers.test.ts b/test/integration-c/hooks/toolbox/stateNumbers.test.ts index 6f36841..bf0122d 100644 --- a/test/integration-c/hooks/toolbox/stateNumbers.test.ts +++ b/test/integration-c/hooks/toolbox/stateNumbers.test.ts @@ -78,7 +78,7 @@ describe('stateNumbers', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) diff --git a/test/integration-c/hooks/toolbox/tsh.test.ts b/test/integration-c/hooks/toolbox/tsh.test.ts index 052201d..454671a 100644 --- a/test/integration-c/hooks/toolbox/tsh.test.ts +++ b/test/integration-c/hooks/toolbox/tsh.test.ts @@ -56,7 +56,7 @@ describe('tsh', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.gw.seed, + wallet: testContext.gw, hooks: [{ Hook: hook }], } as SetHookParams) @@ -83,12 +83,12 @@ describe('tsh', () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.gw.seed, + wallet: testContext.gw, } as SetHookParams) await clearAllHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, } as SetHookParams) }) @@ -102,7 +102,7 @@ describe('tsh', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -125,12 +125,12 @@ describe('tsh', () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.gw.seed, + wallet: testContext.gw, } as SetHookParams) await clearAllHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, } as SetHookParams) }) it('tsh aaw', async () => { @@ -143,7 +143,7 @@ describe('tsh', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -172,12 +172,12 @@ describe('tsh', () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.gw.seed, + wallet: testContext.gw, } as SetHookParams) await clearAllHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, } as SetHookParams) }) }) diff --git a/test/integration-c/hooks/toolbox/utilSha512.test.ts b/test/integration-c/hooks/toolbox/utilSha512.test.ts index 6b7dd44..856308e 100644 --- a/test/integration-c/hooks/toolbox/utilSha512.test.ts +++ b/test/integration-c/hooks/toolbox/utilSha512.test.ts @@ -56,14 +56,14 @@ describe('utilSha512', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/toolbox/utilVerify.test.ts b/test/integration-c/hooks/toolbox/utilVerify.test.ts index b671714..cc0e631 100644 --- a/test/integration-c/hooks/toolbox/utilVerify.test.ts +++ b/test/integration-c/hooks/toolbox/utilVerify.test.ts @@ -33,7 +33,7 @@ describe('utilVerify', () => { afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, } as SetHookParams) await teardownClient(testContext) }) @@ -63,7 +63,7 @@ describe('utilVerify', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -116,7 +116,7 @@ describe('utilVerify', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.alice.seed, + wallet: testContext.alice, hooks: [{ Hook: hook }], } as SetHookParams) diff --git a/test/integration-c/hooks/txns/accountSet.test.ts b/test/integration-c/hooks/txns/accountSet.test.ts index 92de3c0..85984c6 100644 --- a/test/integration-c/hooks/txns/accountSet.test.ts +++ b/test/integration-c/hooks/txns/accountSet.test.ts @@ -39,14 +39,14 @@ describe('accountSet', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { // await clearAllHooksV3({ // client: testContext.client, - // seed: testContext.alice.seed, + // wallet: testContext.alice, // } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-c/hooks/txns/uritokenMint.test.ts b/test/integration-c/hooks/txns/uritokenMint.test.ts index 8e24fef..a48cace 100644 --- a/test/integration-c/hooks/txns/uritokenMint.test.ts +++ b/test/integration-c/hooks/txns/uritokenMint.test.ts @@ -39,7 +39,7 @@ describe('uriTokenMint', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) diff --git a/test/integration-c/setup/setHook.test.ts b/test/integration-c/setup/setHook.test.ts index fc76ebc..9776ed8 100644 --- a/test/integration-c/setup/setHook.test.ts +++ b/test/integration-c/setup/setHook.test.ts @@ -50,7 +50,7 @@ describe('SetHook - End to End', () => { } as iHook await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -106,13 +106,13 @@ describe('SetHook - End to End', () => { } as iHook await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: clearHook }], } as SetHookParams) await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) }) }) @@ -140,7 +140,7 @@ describe('SetHook - (noop|create|install', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) const hookReq: LedgerEntryRequest = { @@ -166,7 +166,7 @@ describe('SetHook - (noop|create|install', () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) }) @@ -181,7 +181,7 @@ describe('SetHook - (noop|create|install', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook1 }], } as SetHookParams) @@ -207,7 +207,7 @@ describe('SetHook - (noop|create|install', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook2.seed, + wallet: testContext.hook2, hooks: [{ Hook: hook2 }], } as SetHookParams) @@ -231,11 +231,11 @@ describe('SetHook - (noop|create|install', () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook2.seed, + wallet: testContext.hook2, } as SetHookParams) }) @@ -251,7 +251,7 @@ describe('SetHook - (noop|create|install', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook1 }], } as SetHookParams) @@ -260,7 +260,7 @@ describe('SetHook - (noop|create|install', () => { } as iHook await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook2 }], } as SetHookParams) @@ -294,7 +294,7 @@ describe('SetHook - (noop|create|install', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook1 }], } as SetHookParams) @@ -304,7 +304,7 @@ describe('SetHook - (noop|create|install', () => { } as iHook await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) try { @@ -334,7 +334,7 @@ describe('SetHook - (noop|create|install', () => { } as iHook await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -368,7 +368,7 @@ describe('SetHook - (noop|create|install', () => { } as iHook await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: clearHook }], } as SetHookParams) diff --git a/test/integration-js/hooks/toolbox/base.test.ts b/test/integration-js/hooks/toolbox/base.test.ts index f0d9f0d..3f32dd0 100644 --- a/test/integration-js/hooks/toolbox/base.test.ts +++ b/test/integration-js/hooks/toolbox/base.test.ts @@ -78,14 +78,14 @@ describe('base', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { // await clearAllHooksV3({ // client: testContext.client, - // seed: testContext.hook1.seed, + // wallet: testContext.hook1, // } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-js/hooks/toolbox/compareCondition.js.test.ts b/test/integration-js/hooks/toolbox/compareCondition.js.test.ts index ba4cdc6..570ed6b 100644 --- a/test/integration-js/hooks/toolbox/compareCondition.js.test.ts +++ b/test/integration-js/hooks/toolbox/compareCondition.js.test.ts @@ -34,14 +34,14 @@ describe('compareCondition', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-js/hooks/toolbox/hookOnTT.js.test.ts b/test/integration-js/hooks/toolbox/hookOnTT.js.test.ts index 03cb9b9..9c9dba8 100644 --- a/test/integration-js/hooks/toolbox/hookOnTT.js.test.ts +++ b/test/integration-js/hooks/toolbox/hookOnTT.js.test.ts @@ -28,7 +28,7 @@ describe('hookOnTT', () => { afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) @@ -44,7 +44,7 @@ describe('hookOnTT', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) @@ -73,7 +73,7 @@ describe('hookOnTT', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) try { diff --git a/test/integration-js/hooks/toolbox/redirect.test.ts b/test/integration-js/hooks/toolbox/redirect.test.ts index 00317c8..9248f6d 100644 --- a/test/integration-js/hooks/toolbox/redirect.test.ts +++ b/test/integration-js/hooks/toolbox/redirect.test.ts @@ -79,14 +79,14 @@ describe('base', () => { }) await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) }) afterAll(async () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) await teardownClient(testContext) }) diff --git a/test/integration-js/setup/setHook.test.ts b/test/integration-js/setup/setHook.test.ts index 76be435..b817e33 100644 --- a/test/integration-js/setup/setHook.test.ts +++ b/test/integration-js/setup/setHook.test.ts @@ -105,13 +105,13 @@ import { // } as iHook // await setHooksV3({ // client: testContext.client, -// seed: testContext.hook1.seed, +// wallet: testContext.hook1, // hooks: [{ Hook: clearHook }], // } as SetHookParams) // await clearAllHooksV3({ // client: testContext.client, -// seed: testContext.hook1.seed, +// wallet: testContext.hook1, // } as SetHookParams) // }) // }) @@ -140,7 +140,7 @@ describe('SetHook - (noop|create|install', () => { await setHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, hooks: [{ Hook: hook }], } as SetHookParams) const hookReq: LedgerEntryRequest = { @@ -166,7 +166,7 @@ describe('SetHook - (noop|create|install', () => { await clearAllHooksV3({ client: testContext.client, - seed: testContext.hook1.seed, + wallet: testContext.hook1, } as SetHookParams) }) @@ -231,11 +231,11 @@ describe('SetHook - (noop|create|install', () => { // await clearAllHooksV3({ // client: testContext.client, - // seed: testContext.hook1.seed, + // wallet: testContext.hook1, // } as SetHookParams) // await clearAllHooksV3({ // client: testContext.client, - // seed: testContext.hook2.seed, + // wallet: testContext.hook2, // } as SetHookParams) // })