Skip to content

Add Account compilation tests and simplify community contracts imports #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 1, 2025
Merged

Add Account compilation tests and simplify community contracts imports #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b149e1f
Simplify `@openzeppelin/community-contracts` imports
ernestognw May 1, 2025
024981c
Add remappings to Solidity
ernestognw May 1, 2025
caa00d7
Add account compilation tests
ernestognw May 1, 2025
cd26383
Update snapshots
ernestognw May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/core/solidity/hardhat.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
const fs = require('fs');
const { task } = require('hardhat/config');
const { HardhatError } = require('hardhat/internal/core/errors');
const { ERRORS } = require('hardhat/internal/core/errors-list');
const {
TASK_COMPILE_SOLIDITY_CHECK_ERRORS,
TASK_COMPILE_SOLIDITY_LOG_COMPILATION_ERRORS,
TASK_COMPILE_SOLIDITY_MERGE_COMPILATION_JOBS,
TASK_COMPILE_GET_REMAPPINGS,
} = require('hardhat/builtin-tasks/task-names');
const SOLIDITY_VERSION = require('./src/solidity-version.json');

Expand Down Expand Up @@ -37,6 +39,21 @@ task(TASK_COMPILE_SOLIDITY_MERGE_COMPILATION_JOBS, async ({ compilationJobs }, _
return mergedChunks.flat();
});

task(TASK_COMPILE_GET_REMAPPINGS).setAction((_, __, runSuper) =>
runSuper().then(remappings =>
Object.assign(
remappings,
Object.fromEntries(
fs
.readFileSync('remappings.txt', 'utf-8')
.split('\n')
.filter(Boolean)
.map(line => line.trim().split('=')),
),
),
),
);

/**
* @type import('hardhat/config').HardhatUserConfig
*/
Expand Down
2 changes: 2 additions & 0 deletions packages/core/solidity/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@openzeppelin/community-contracts/=node_modules/@openzeppelin/community-contracts/contracts/
@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
Copy link
Member

@ericglau ericglau May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is remapping necessary for @openzeppelin/contracts-upgradeable?

Copy link
Member Author

@ernestognw ernestognw May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tbh not sure but made erc20 compilation tests fail. I think the remappings task might be overriding some default remappings (?)

cost/benefit i thought it was fine to just add the remapping to avoid the rabbit hole 😆

556 changes: 280 additions & 276 deletions packages/core/solidity/src/account.test.ts.md
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified packages/core/solidity/src/account.test.ts.snap
View file
Open in desktop
Binary file not shown.
18 changes: 11 additions & 7 deletions packages/core/solidity/src/account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { defineFunctions } from './utils/define-functions';
import { printContract } from './print';
import { defaults as commonDefaults, withCommonDefaults, type CommonOptions } from './common-options';
import { setInfo } from './set-info';
import { addSigner, signerFunctions, type SignerOptions } from './signer';
import { addSigner, signerFunctions, signers, type SignerOptions } from './signer';

export const defaults: Required<AccountOptions> = {
...commonDefaults,
Expand Down Expand Up @@ -76,7 +76,7 @@ function addParents(c: ContractBuilder, opts: AccountOptions): void {
// Base
c.addParent({
name: 'Account',
path: `@openzeppelin/community-contracts/contracts/account/Account.sol`,
path: `@openzeppelin/community-contracts/account/Account.sol`,
});
c.addOverride({ name: 'Account' }, functions._validateUserOp);

Expand All @@ -97,7 +97,7 @@ function addSignatureValidation(c: ContractBuilder, opts: AccountOptions) {
case 'ERC7739':
c.addParent({
name: 'ERC7739',
path: '@openzeppelin/community-contracts/contracts/utils/cryptography/ERC7739.sol',
path: '@openzeppelin/community-contracts/utils/cryptography/ERC7739.sol',
});
break;
case 'ERC1271':
Expand Down Expand Up @@ -139,7 +139,7 @@ function addBatchedExecution(c: ContractBuilder, opts: AccountOptions): void {
if (!opts.batchedExecution || !!opts.ERC7579Modules) return;
c.addParent({
name: 'ERC7821',
path: '@openzeppelin/community-contracts/contracts/account/extensions/ERC7821.sol',
path: '@openzeppelin/community-contracts/account/extensions/ERC7821.sol',
});
c.addOverride({ name: 'ERC7821' }, functions._erc7821AuthorizedExecutor);
c.setFunctionBody(
Expand All @@ -152,12 +152,12 @@ function addERC7579Modules(c: ContractBuilder, opts: AccountOptions): void {
if (!opts.ERC7579Modules) return;
c.addParent({
name: opts.ERC7579Modules,
path: `@openzeppelin/community-contracts/contracts/account/extensions/${opts.ERC7579Modules}.sol`,
path: `@openzeppelin/community-contracts/account/extensions/${opts.ERC7579Modules}.sol`,
});
if (opts.ERC7579Modules !== 'AccountERC7579') {
c.addImportOnly({
name: 'AccountERC7579',
path: `@openzeppelin/community-contracts/contracts/account/extensions/AccountERC7579.sol`,
path: `@openzeppelin/community-contracts/account/extensions/AccountERC7579.sol`,
});
}
c.addOverride({ name: 'AccountERC7579' }, functions.isValidSignature);
Expand Down Expand Up @@ -220,7 +220,7 @@ function overrideRawSignatureValidation(c: ContractBuilder, opts: AccountOptions
if (opts.signer && opts.ERC7579Modules) {
c.addImportOnly({
name: 'AbstractSigner',
path: '@openzeppelin/community-contracts/contracts/utils/cryptography/AbstractSigner.sol',
path: '@openzeppelin/community-contracts/utils/cryptography/AbstractSigner.sol',
});
c.addOverride({ name: 'AbstractSigner' }, signerFunctions._rawSignatureValidation);
c.addOverride({ name: 'AccountERC7579' }, signerFunctions._rawSignatureValidation);
Expand All @@ -233,6 +233,10 @@ function overrideRawSignatureValidation(c: ContractBuilder, opts: AccountOptions
],
signerFunctions._rawSignatureValidation,
);
// Base override for `_rawSignatureValidation` given MultiSignerERC7913Weighted is MultiSignerERC7913
if (opts.signer === 'MultisigWeighted') {
c.addImportOnly(signers.Multisig);
}
}
}

Expand Down
24 changes: 12 additions & 12 deletions packages/core/solidity/src/erc20.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
␊
contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
Expand Down Expand Up @@ -558,7 +558,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
␊
Expand Down Expand Up @@ -590,7 +590,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
Expand Down Expand Up @@ -628,7 +628,7 @@ Generated by [AVA](https://avajs.dev).
␊
import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
␊
contract MyToken is ERC20, ERC20Bridgeable, AccessControl, ERC20Permit {␊
Expand Down Expand Up @@ -671,7 +671,7 @@ Generated by [AVA](https://avajs.dev).
import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
import {AuthorityUtils} from "@openzeppelin/contracts/access/manager/AuthorityUtils.sol";␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
␊
contract MyToken is ERC20, ERC20Bridgeable, AccessManaged, ERC20Permit {␊
Expand Down Expand Up @@ -699,7 +699,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
␊
contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
Expand Down Expand Up @@ -728,7 +728,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
␊
Expand Down Expand Up @@ -763,7 +763,7 @@ Generated by [AVA](https://avajs.dev).
␊
import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
␊
contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, AccessControl {␊
Expand Down Expand Up @@ -809,7 +809,7 @@ Generated by [AVA](https://avajs.dev).
␊
import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
␊
contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, AccessManaged {␊
Expand Down Expand Up @@ -863,7 +863,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
␊
contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
Expand Down Expand Up @@ -896,7 +896,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
␊
contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
Expand Down Expand Up @@ -934,7 +934,7 @@ Generated by [AVA](https://avajs.dev).
import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
Expand Down
Binary file modified packages/core/solidity/src/erc20.test.ts.snap
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/core/solidity/src/erc20.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ function addCrossChainBridging(
) {
const ERC20Bridgeable = {
name: 'ERC20Bridgeable',
path: `@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol`,
path: `@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol`,
};

c.addParent(ERC20Bridgeable);
Expand Down
22 changes: 13 additions & 9 deletions packages/core/solidity/src/signer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ export type SignerOptions = (typeof SignerOptions)[number];

export function addSigner(c: ContractBuilder, signer: SignerOptions): void {
if (!signer) return;
const parent = parents[signer];
const parent = signers[signer];
const name = parent.name;
c.addParent(parent);
c.addOverride({ name: parent.name }, signerFunctions._rawSignatureValidation);
c.addOverride(
{ name: name === signers.MultisigWeighted.name ? signers.Multisig.name : name },
signerFunctions._rawSignatureValidation,
);

// ERC-7702 doesn't require initialization
if (signer === 'ERC7702') return;
Expand Down Expand Up @@ -45,30 +49,30 @@ export function addSigner(c: ContractBuilder, signer: SignerOptions): void {
}
}

const parents = {
export const signers = {
ERC7702: {
name: 'SignerERC7702',
path: '@openzeppelin/community-contracts/contracts/utils/cryptography/SignerERC7702.sol',
path: '@openzeppelin/community-contracts/utils/cryptography/SignerERC7702.sol',
},
ECDSA: {
name: 'SignerECDSA',
path: '@openzeppelin/community-contracts/contracts/utils/cryptography/SignerECDSA.sol',
path: '@openzeppelin/community-contracts/utils/cryptography/SignerECDSA.sol',
},
P256: {
name: 'SignerP256',
path: '@openzeppelin/community-contracts/contracts/utils/cryptography/SignerP256.sol',
path: '@openzeppelin/community-contracts/utils/cryptography/SignerP256.sol',
},
RSA: {
name: 'SignerRSA',
path: '@openzeppelin/community-contracts/contracts/utils/cryptography/SignerRSA.sol',
path: '@openzeppelin/community-contracts/utils/cryptography/SignerRSA.sol',
},
Multisig: {
name: 'MultiSignerERC7913',
path: '@openzeppelin/community-contracts/contracts/utils/cryptography/MultiSignerERC7913.sol',
path: '@openzeppelin/community-contracts/utils/cryptography/MultiSignerERC7913.sol',
},
MultisigWeighted: {
name: 'MultiSignerERC7913Weighted',
path: '@openzeppelin/community-contracts/contracts/utils/cryptography/MultiSignerERC7913Weighted.sol',
path: '@openzeppelin/community-contracts/utils/cryptography/MultiSignerERC7913Weighted.sol',
},
};

Expand Down
12 changes: 6 additions & 6 deletions packages/core/solidity/src/stablecoin.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Custodian} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
import {ERC20Custodian} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
␊
Expand Down Expand Up @@ -366,7 +366,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Allowlist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
import {ERC20Allowlist} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
␊
Expand Down Expand Up @@ -412,7 +412,7 @@ Generated by [AVA](https://avajs.dev).
pragma solidity ^0.8.27;␊
␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Blocklist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
import {ERC20Blocklist} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
␊
Expand Down Expand Up @@ -594,10 +594,10 @@ Generated by [AVA](https://avajs.dev).
import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
import {ERC20Allowlist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Allowlist} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
import {ERC20Bridgeable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Bridgeable.sol";␊
import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
import {ERC20Custodian} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
import {ERC20Custodian} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
Expand Down
Binary file modified packages/core/solidity/src/stablecoin.test.ts.snap
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/core/solidity/src/stablecoin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function addLimitations(c: ContractBuilder, access: Access, mode: boolean | 'all
const type = mode === 'allowlist';
const ERC20Limitation = {
name: type ? 'ERC20Allowlist' : 'ERC20Blocklist',
path: `@openzeppelin/community-contracts/contracts/token/ERC20/extensions/${type ? 'ERC20Allowlist' : 'ERC20Blocklist'}.sol`,
path: `@openzeppelin/community-contracts/token/ERC20/extensions/${type ? 'ERC20Allowlist' : 'ERC20Blocklist'}.sol`,
};

c.addParent(ERC20Limitation);
Expand All @@ -86,7 +86,7 @@ function addLimitations(c: ContractBuilder, access: Access, mode: boolean | 'all
function addCustodian(c: ContractBuilder, access: Access) {
const ERC20Custodian = {
name: 'ERC20Custodian',
path: '@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol',
path: '@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol',
};

c.addParent(ERC20Custodian);
Expand Down
4 changes: 4 additions & 0 deletions packages/core/solidity/src/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ test.serial('stablecoin result compiles', async t => {
await testCompile(t, 'Stablecoin');
});

test.serial('account result compiles', async t => {
await testCompile(t, 'Account');
});

test.serial('governor result compiles', async t => {
await testCompile(t, 'Governor');
});
Expand Down
3 changes: 1 addition & 2 deletions packages/ui/src/solidity/inject-hyperlinks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ export function injectHyperlinks(code: string) {
// We are modifying HTML, so use HTML escaped chars. The pattern excludes paths that include /../ in the URL.
const contractsRegex =
/&quot;(@openzeppelin\/)(contracts-upgradeable\/|contracts\/)((?:(?!\.\.)[^/]+\/)*?[^/]*?)&quot;/g;
const communityContractsRegex =
/&quot;(@openzeppelin\/)(community-contracts\/contracts\/)((?:(?!\.\.)[^/]+\/)*?[^/]*?)&quot;/g;
const communityContractsRegex = /&quot;(@openzeppelin\/)(community-contracts\/)((?:(?!\.\.)[^/]+\/)*?[^/]*?)&quot;/g;

return code
.replace(
Expand Down
Loading