Skip to content

Commit a158b64

Browse files
committed
chore: using string names for scopes, added e2e tests
1 parent d03c7e3 commit a158b64

32 files changed

Lines changed: 2825 additions & 80 deletions

packages/delegation-toolkit/src/caveatBuilder/scope/erc20PeriodicScope.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import type { DeleGatorEnvironment } from '../../types';
12
import { createCaveatBuilder } from '../coreCaveatBuilder';
23
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
3-
import type { Erc20PeriodTransferBuilderConfig } from '../erc20PeriodTransferBuilder';
4-
import type { DeleGatorEnvironment } from 'src/types';
4+
import type {
5+
erc20PeriodTransfer,
6+
Erc20PeriodTransferBuilderConfig,
7+
} from '../erc20PeriodTransferBuilder';
58

69
export type Erc20PeriodicScopeConfig = {
7-
type: 'erc20-periodic';
10+
type: typeof erc20PeriodTransfer;
811
} & Erc20PeriodTransferBuilderConfig;
912

1013
/**

packages/delegation-toolkit/src/caveatBuilder/scope/erc20StreamingScope.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import type { DeleGatorEnvironment } from '../../types';
12
import { createCaveatBuilder } from '../coreCaveatBuilder';
23
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
3-
import type { Erc20StreamingBuilderConfig } from '../erc20StreamingBuilder';
4-
import type { DeleGatorEnvironment } from 'src/types';
4+
import type {
5+
erc20Streaming,
6+
Erc20StreamingBuilderConfig,
7+
} from '../erc20StreamingBuilder';
58

69
export type Erc20StreamingScopeConfig = {
7-
type: 'erc20-streaming';
10+
type: typeof erc20Streaming;
811
} & Erc20StreamingBuilderConfig;
912

1013
/**

packages/delegation-toolkit/src/caveatBuilder/scope/erc20TransferScope.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import type { DeleGatorEnvironment } from '../../types';
12
import { createCaveatBuilder } from '../coreCaveatBuilder';
23
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
3-
import type { Erc20TransferAmountBuilderConfig } from '../erc20TransferAmountBuilder';
4-
import type { DeleGatorEnvironment } from 'src/types';
4+
import type {
5+
erc20TransferAmount,
6+
Erc20TransferAmountBuilderConfig,
7+
} from '../erc20TransferAmountBuilder';
58

69
export type Erc20TransferScopeConfig = {
7-
type: 'erc20-transfer';
10+
type: typeof erc20TransferAmount;
811
} & Erc20TransferAmountBuilderConfig;
912

1013
/**

packages/delegation-toolkit/src/caveatBuilder/scope/erc721Scope.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
import type { DeleGatorEnvironment } from '../../types';
12
import { hasProperties } from '../../utils';
23
import { createCaveatBuilder } from '../coreCaveatBuilder';
34
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
4-
import type { Erc721TransferBuilderConfig } from '../erc721TransferBuilder';
5-
import type { DeleGatorEnvironment } from 'src/types';
5+
import type {
6+
erc721Transfer,
7+
Erc721TransferBuilderConfig,
8+
} from '../erc721TransferBuilder';
69

710
export type Erc721ScopeBaseConfig = {
8-
type: 'erc721';
11+
type: typeof erc721Transfer;
912
};
1013

1114
export type Erc721ScopeConfig = Erc721ScopeBaseConfig &

packages/delegation-toolkit/src/caveatBuilder/scope/functionCallScope.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import type { DeleGatorEnvironment } from '../../types';
12
import { hasProperties } from '../../utils';
23
import type { AllowedCalldataBuilderConfig } from '../allowedCalldataBuilder';
34
import type { AllowedMethodsBuilderConfig } from '../allowedMethodsBuilder';
45
import type { AllowedTargetsBuilderConfig } from '../allowedTargetsBuilder';
56
import { createCaveatBuilder } from '../coreCaveatBuilder';
67
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
78
import type { ExactCalldataBuilderConfig } from '../exactCalldataBuilder';
8-
import type { DeleGatorEnvironment } from 'src/types';
99

1010
type FunctionCallScopeBaseConfig = {
1111
type: 'functionCall';

packages/delegation-toolkit/src/caveatBuilder/scope/index.ts

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ import {
3636
} from './ownershipScope';
3737
import type { ScopeType } from './scopeTypes';
3838
import type { DeleGatorEnvironment } from '../../types';
39+
// Import caveat builder name constants
40+
import { erc20PeriodTransfer } from '../erc20PeriodTransferBuilder';
41+
import { erc20Streaming } from '../erc20StreamingBuilder';
42+
import { erc20TransferAmount } from '../erc20TransferAmountBuilder';
43+
import { erc721Transfer } from '../erc721TransferBuilder';
44+
import { nativeTokenPeriodTransfer } from '../nativeTokenPeriodTransferBuilder';
45+
import { nativeTokenStreaming } from '../nativeTokenStreamingBuilder';
46+
import { nativeTokenTransferAmount } from '../nativeTokenTransferAmountBuilder';
47+
import { ownershipTransfer } from '../ownershipTransferBuilder';
3948

4049
// Export the type for external use
4150
export type { ScopeType };
@@ -56,21 +65,21 @@ export const createCaveatBuilderFromScope = (
5665
scopeConfig: ScopeConfig,
5766
) => {
5867
switch (scopeConfig.type) {
59-
case 'erc20-transfer':
68+
case erc20TransferAmount:
6069
return createErc20TransferCaveatBuilder(environment, scopeConfig);
61-
case 'erc20-streaming':
70+
case erc20Streaming:
6271
return createErc20StreamingCaveatBuilder(environment, scopeConfig);
63-
case 'erc20-periodic':
72+
case erc20PeriodTransfer:
6473
return createErc20PeriodicCaveatBuilder(environment, scopeConfig);
65-
case 'nativeToken-transfer':
74+
case nativeTokenTransferAmount:
6675
return createNativeTokenTransferCaveatBuilder(environment, scopeConfig);
67-
case 'nativeToken-streaming':
76+
case nativeTokenStreaming:
6877
return createNativeTokenStreamingCaveatBuilder(environment, scopeConfig);
69-
case 'nativeToken-periodic':
78+
case nativeTokenPeriodTransfer:
7079
return createNativeTokenPeriodicCaveatBuilder(environment, scopeConfig);
71-
case 'erc721':
80+
case erc721Transfer:
7281
return createErc721CaveatBuilder(environment, scopeConfig);
73-
case 'ownership':
82+
case ownershipTransfer:
7483
return createOwnershipCaveatBuilder(environment, scopeConfig);
7584
case 'functionCall':
7685
return createFunctionCallCaveatBuilder(environment, scopeConfig);

packages/delegation-toolkit/src/caveatBuilder/scope/nativeTokenPeriodicScope.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import type { DeleGatorEnvironment } from '../../types';
12
import { createCaveatBuilder } from '../coreCaveatBuilder';
23
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
3-
import type { NativeTokenPeriodTransferBuilderConfig } from '../nativeTokenPeriodTransferBuilder';
4-
import type { DeleGatorEnvironment } from 'src/types';
4+
import type {
5+
nativeTokenPeriodTransfer,
6+
NativeTokenPeriodTransferBuilderConfig,
7+
} from '../nativeTokenPeriodTransferBuilder';
58

69
export type NativeTokenPeriodicScopeConfig = {
7-
type: 'nativeToken-periodic';
10+
type: typeof nativeTokenPeriodTransfer;
811
} & NativeTokenPeriodTransferBuilderConfig;
912

1013
/**

packages/delegation-toolkit/src/caveatBuilder/scope/nativeTokenStreamingScope.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import type { DeleGatorEnvironment } from '../../types';
12
import { createCaveatBuilder } from '../coreCaveatBuilder';
23
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
3-
import type { NativeTokenStreamingBuilderConfig } from '../nativeTokenStreamingBuilder';
4-
import type { DeleGatorEnvironment } from 'src/types';
4+
import type {
5+
nativeTokenStreaming,
6+
NativeTokenStreamingBuilderConfig,
7+
} from '../nativeTokenStreamingBuilder';
58

69
export type NativeTokenStreamingScopeConfig = {
7-
type: 'nativeToken-streaming';
10+
type: typeof nativeTokenStreaming;
811
} & NativeTokenStreamingBuilderConfig;
912

1013
/**

packages/delegation-toolkit/src/caveatBuilder/scope/nativeTokenTransferScope.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import type { DeleGatorEnvironment } from '../../types';
12
import { createCaveatBuilder } from '../coreCaveatBuilder';
23
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
3-
import type { NativeTokenTransferAmountBuilderConfig } from '../nativeTokenTransferAmountBuilder';
4-
import type { DeleGatorEnvironment } from 'src/types';
4+
import type {
5+
nativeTokenTransferAmount,
6+
NativeTokenTransferAmountBuilderConfig,
7+
} from '../nativeTokenTransferAmountBuilder';
58

69
export type NativeTokenTransferScopeConfig = {
7-
type: 'nativeToken-transfer';
10+
type: typeof nativeTokenTransferAmount;
811
} & NativeTokenTransferAmountBuilderConfig;
912

1013
/**

packages/delegation-toolkit/src/caveatBuilder/scope/ownershipScope.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ import type { DeleGatorEnvironment } from '../../types';
22
import { hasProperties } from '../../utils';
33
import { createCaveatBuilder } from '../coreCaveatBuilder';
44
import type { CoreCaveatBuilder } from '../coreCaveatBuilder';
5-
import type { OwnershipTransferBuilderConfig } from '../ownershipTransferBuilder';
5+
import type {
6+
ownershipTransfer,
7+
OwnershipTransferBuilderConfig,
8+
} from '../ownershipTransferBuilder';
69

710
type OwnershipScopeBaseConfig = {
8-
type: 'ownership';
11+
type: typeof ownershipTransfer;
912
};
1013

1114
export type OwnershipScopeConfig = OwnershipScopeBaseConfig &

0 commit comments

Comments
 (0)