@openzeppelin/upgrades-core 1.20.6 → 1.21.0

package/dist/validate/run.test.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ava_1 = __importDefault(require("ava"));
+const run_1 = require("./run");
+(0, ava_1.default)('getAnnotationArgs', t => {
+    const doc = ' @custom:oz-upgrades-unsafe-allow constructor selfdestruct';
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+});
+(0, ava_1.default)('getAnnotationArgs no arg', t => {
+    const doc = ' @custom:oz-upgrades-unsafe-allow';
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow'), []);
+});
+(0, ava_1.default)('getAnnotationArgs space no arg', t => {
+    const doc = ' @custom:oz-upgrades-unsafe-allow ';
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow'), []);
+});
+(0, ava_1.default)('getAnnotationArgs whitespace at end', t => {
+    const doc = ' @custom:oz-upgrades-unsafe-allow constructor ';
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow'), ['constructor']);
+});
+(0, ava_1.default)('getAnnotationArgs same type', t => {
+    const doc = ' @custom:oz-upgrades-unsafe-allow constructor\n @custom:oz-upgrades-unsafe-allow selfdestruct';
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+});
+(0, ava_1.default)('getAnnotationArgs multiline', t => {
+    const doc = ' othercomments\n @custom:oz-upgrades-unsafe-allow constructor selfdestruct\n @custom:oz-upgrades-unsafe-allow-reachable delegatecall';
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow-reachable'), ['delegatecall']);
+});
+(0, ava_1.default)('getAnnotationArgs multiline with spaces and comments', t => {
+    const doc = ' some other comments\n @custom:oz-upgrades-unsafe-allow \n   constructor    \n   selfdestruct    \n @custom:oz-upgrades-unsafe-allow-reachable  \n   delegatecall';
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow-reachable'), ['delegatecall']);
+});
+(0, ava_1.default)('getAnnotationArgs multiline multiple preceding spaces', t => {
+    const doc = ' @custom:oz-upgrades-unsafe-allow constructor selfdestruct \n         @custom:oz-upgrades-unsafe-allow-reachable delegatecall    ';
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+    t.deepEqual((0, run_1.getAnnotationArgs)(doc, 'oz-upgrades-unsafe-allow-reachable'), ['delegatecall']);
+});
+//# sourceMappingURL=run.test.js.map

package/dist/validate/run.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.test.js","sourceRoot":"","sources":["../../src/validate/run.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,+BAA0C;AAE1C,IAAA,aAAI,EAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE;IAC5B,MAAM,GAAG,GAAG,4DAA4D,CAAC;IACzE,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,0BAA0B,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;AACnG,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,0BAA0B,EAAE,CAAC,CAAC,EAAE;IACnC,MAAM,GAAG,GAAG,mCAAmC,CAAC;IAChD,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,0BAA0B,CAAC,EAAE,EAAE,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,gCAAgC,EAAE,CAAC,CAAC,EAAE;IACzC,MAAM,GAAG,GAAG,oCAAoC,CAAC;IACjD,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,0BAA0B,CAAC,EAAE,EAAE,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,qCAAqC,EAAE,CAAC,CAAC,EAAE;IAC9C,MAAM,GAAG,GAAG,gDAAgD,CAAC;IAC7D,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,0BAA0B,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;AACnF,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,6BAA6B,EAAE,CAAC,CAAC,EAAE;IACtC,MAAM,GAAG,GAAG,+FAA+F,CAAC;IAC5G,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,0BAA0B,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;AACnG,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,6BAA6B,EAAE,CAAC,CAAC,EAAE;IACtC,MAAM,GAAG,GACP,sIAAsI,CAAC;IACzI,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,0BAA0B,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IACjG,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,oCAAoC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;AAC9F,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,sDAAsD,EAAE,CAAC,CAAC,EAAE;IAC/D,MAAM,GAAG,GACP,mKAAmK,CAAC;IACtK,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,0BAA0B,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IACjG,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,oCAAoC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;AAC9F,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,uDAAuD,EAAE,CAAC,CAAC,EAAE;IAChE,MAAM,GAAG,GACP,mIAAmI,CAAC;IACtI,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,0BAA0B,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IACjG,CAAC,CAAC,SAAS,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,oCAAoC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;AAC9F,CAAC,CAAC,CAAC"}

package/dist/validate-ignore-errors.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=validate-ignore-errors.test.d.ts.map

package/dist/validate-ignore-errors.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-ignore-errors.test.d.ts","sourceRoot":"","sources":["../src/validate-ignore-errors.test.ts"],"names":[],"mappings":""}

package/dist/validate-ignore-errors.test.js

@@ -0,0 +1,123 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ava_1 = __importDefault(require("ava"));
+const hardhat_1 = require("hardhat");
+const validate_1 = require("./validate");
+const src_decoder_1 = require("./src-decoder");
+const test = ava_1.default;
+test.before(async (t) => {
+    const contracts = [
+        'contracts/test/ignore-errors/SafeContract.sol:SafeContract',
+        'contracts/test/ignore-errors/SafeContractWithFreeFunctionCall.sol:SafeContractWithFreeFunctionCall',
+        'contracts/test/ignore-errors/SafeContractWithLibraryCall.sol:SafeContractWithLibraryCall',
+        'contracts/test/ignore-errors/SafeContractWithLibraryImport.sol:SafeContractWithLibraryImport',
+        'contracts/test/ignore-errors/SafeContractWithLibraryUsingFor.sol:SafeContractWithLibraryUsingFor',
+        'contracts/test/ignore-errors/SafeContractWithTransitiveLibraryCall.sol:SafeContractWithTransitiveLibraryCall',
+        'contracts/test/ignore-errors/SafeContractWithParentCall.sol:SafeContractWithParentCall',
+        'contracts/test/ignore-errors/RiskyParentContract.sol:RiskyParentContract',
+        'contracts/test/ignore-errors/UnsafeContract.sol:UnsafeContract',
+        'contracts/test/ignore-errors/UnsafeContractWithFreeFunctionCall.sol:UnsafeContractWithFreeFunctionCall',
+        'contracts/test/ignore-errors/UnsafeContractWithLibraryCall.sol:UnsafeContractWithLibraryCall',
+        'contracts/test/ignore-errors/UnsafeContractWithLibraryUsingFor.sol:UnsafeContractWithLibraryUsingFor',
+        'contracts/test/ignore-errors/UnsafeContractWithTransitiveLibraryCall.sol:UnsafeContractWithTransitiveLibraryCall',
+        'contracts/test/ignore-errors/UnsafeContractWithParentCall.sol:UnsafeContractWithParentCall',
+        'contracts/test/ignore-errors/UnsafeContractWithInheritedParent.sol:UnsafeContractWithInheritedParent',
+        'contracts/test/ignore-errors/UnsafeContractWithInheritedTransitiveParent.sol:UnsafeContractWithInheritedTransitiveParent',
+        'contracts/test/ignore-errors/UnsafeAllow.sol:UnsafeAllow',
+        'contracts/test/ignore-errors/AllowReachable.sol:AllowReachable',
+        'contracts/test/ignore-errors/UnsafeAllowReachableDifferentOpcode.sol:UnsafeAllowReachableDifferentOpcode',
+        'contracts/test/ignore-errors/UnsafeAllowParent.sol:UnsafeAllowParent',
+        'contracts/test/ignore-errors/AllowReachableParent.sol:AllowReachableParent',
+        'contracts/test/ignore-errors/UnsafeAllowReachableParentDifferentOpcode.sol:UnsafeAllowReachableParentDifferentOpcode',
+        'contracts/test/ignore-errors/AllowChildInheritedTransitive.sol:AllowChildInheritedTransitive',
+        'contracts/test/ignore-errors/AllowChild.sol:AllowChild',
+        'contracts/test/ignore-errors/AllowChildCallTransitive.sol:AllowChildCallTransitive',
+        'contracts/test/ignore-errors/AllowChildSelfReachable.sol:AllowChildSelfReachable',
+        'contracts/test/ignore-errors/SafeRecursion.sol:SafeRecursion',
+        'contracts/test/ignore-errors/UnsafeRecursion.sol:UnsafeRecursion',
+        'contracts/test/ignore-errors/Constructors.sol:UnsafeChild1',
+        'contracts/test/ignore-errors/Constructors.sol:UnsafeChild2',
+        'contracts/test/ignore-errors/Constructors.sol:UnsafeChild3',
+        'contracts/test/ignore-errors/Constructors.sol:UnsafeChild4',
+        'contracts/test/ignore-errors/Constructors.sol:AllowChild5',
+        'contracts/test/ignore-errors/Constructors.sol:AllowChild6',
+        'contracts/test/ignore-errors/Constructors.sol:UnsafeAllowChild7',
+        'contracts/test/ignore-errors/Constructors.sol:AllowReachableChild8',
+        'contracts/test/ignore-errors/Constructors.sol:UnsafeChild9',
+        // 'contracts/test/ignore-errors/Modifiers.sol:ModifierNotUsed',
+        'contracts/test/ignore-errors/Modifiers.sol:ModifierUsed',
+    ];
+    t.context.validation = {};
+    for (const contract of contracts) {
+        const buildInfo = await hardhat_1.artifacts.getBuildInfo(contract);
+        if (buildInfo === undefined) {
+            throw new Error(`Build info not found for contract ${contract}`);
+        }
+        const solcOutput = buildInfo.output;
+        const solcInput = buildInfo.input;
+        const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(solcInput, solcOutput);
+        Object.assign(t.context.validation, (0, validate_1.validate)(solcOutput, decodeSrc));
+    }
+});
+function testValid(name, kind, valid) {
+    testOverride(name, kind, {}, valid);
+}
+function testOverride(name, kind, opts, valid) {
+    const optKeys = Object.keys(opts);
+    const describeOpts = optKeys.length > 0 ? '(' + optKeys.join(', ') + ')' : '';
+    const testName = [valid ? 'accepts' : 'rejects', kind, name, describeOpts].join(' ');
+    test(testName, t => {
+        const version = (0, validate_1.getContractVersion)(t.context.validation, name);
+        const assertUpgSafe = () => (0, validate_1.assertUpgradeSafe)([t.context.validation], version, { kind, ...opts });
+        if (valid) {
+            t.notThrows(assertUpgSafe);
+        }
+        else {
+            t.throws(assertUpgSafe);
+        }
+    });
+}
+testValid('SafeContract', 'transparent', true);
+testValid('SafeContractWithFreeFunctionCall', 'transparent', true);
+testValid('SafeContractWithLibraryCall', 'transparent', true);
+testValid('SafeContractWithLibraryImport', 'transparent', true);
+testValid('SafeContractWithLibraryUsingFor', 'transparent', true);
+testValid('SafeContractWithTransitiveLibraryCall', 'transparent', true);
+testValid('SafeContractWithParentCall', 'transparent', true);
+testValid('RiskyParentContract', 'transparent', false);
+testValid('UnsafeContract', 'transparent', false);
+testValid('UnsafeContractWithFreeFunctionCall', 'transparent', false);
+testValid('UnsafeContractWithLibraryCall', 'transparent', false);
+testValid('UnsafeContractWithLibraryUsingFor', 'transparent', false);
+testValid('UnsafeContractWithTransitiveLibraryCall', 'transparent', false);
+testValid('UnsafeContractWithParentCall', 'transparent', false);
+testValid('UnsafeContractWithInheritedParent', 'transparent', false);
+testValid('UnsafeContractWithInheritedTransitiveParent', 'transparent', false);
+testValid('UnsafeAllow', 'transparent', false);
+testValid('AllowReachable', 'transparent', true);
+testValid('UnsafeAllowReachableDifferentOpcode', 'transparent', false);
+testValid('UnsafeAllowParent', 'transparent', false);
+testValid('AllowReachableParent', 'transparent', true);
+testValid('UnsafeAllowReachableParentDifferentOpcode', 'transparent', false);
+testValid('AllowChildInheritedTransitive', 'transparent', true);
+testValid('AllowChild', 'transparent', true);
+testValid('AllowChildCallTransitive', 'transparent', true);
+testValid('AllowChildSelfReachable', 'transparent', true);
+testValid('SafeRecursion', 'transparent', true);
+testValid('UnsafeRecursion', 'transparent', false);
+testValid('UnsafeChild1', 'transparent', false);
+testValid('UnsafeChild2', 'transparent', false);
+testValid('UnsafeChild3', 'transparent', false);
+testValid('UnsafeChild4', 'transparent', false);
+testValid('AllowChild5', 'transparent', true);
+testValid('AllowChild6', 'transparent', true);
+testValid('UnsafeAllowChild7', 'transparent', false);
+testValid('AllowReachableChild8', 'transparent', true);
+testValid('UnsafeChild9', 'transparent', false);
+// TODO: do not throw an error in this case
+// testValid('ModifierNotUsed', 'transparent', true);
+testValid('ModifierUsed', 'transparent', false);
+//# sourceMappingURL=validate-ignore-errors.test.js.map

package/dist/validate-ignore-errors.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-ignore-errors.test.js","sourceRoot":"","sources":["../src/validate-ignore-errors.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/upgrades-core",
-  "version": "1.20.6",
+  "version": "1.21.0",
   "description": "",
   "repository": "https://github.com/OpenZeppelin/openzeppelin-upgrades/tree/master/packages/core",
   "license": "MIT",
@@ -58,5 +58,5 @@
     "proper-lockfile": "^4.1.1",
     "solidity-ast": "^0.4.15"
   },
-  "gitHead": "56dd6059cc916a95378d9e5893306fbb9020f071"
+  "gitHead": "b2b7123c20d0df0362c5b7509135670b68f31705"
 }

package/src/provider.ts

@@ -106,6 +106,8 @@ export const networkNames: { [chainId in number]?: string } = Object.freeze({
   80001: 'polygon-mumbai',
   43113: 'avalanche-fuji',
   43114: 'avalanche',
+  42220: 'celo',
+  44787: 'celo-alfajores',
 });
 
 export async function isDevelopmentNetwork(provider: EthereumProvider): Promise<boolean> {

package/src/src-decoder.ts

@@ -19,7 +19,7 @@ export function solcInputOutputDecoder(solcInput: SolcInput, solcOutput: SolcOut
       if (sourcePath === undefined) {
         throw new Error(`Source file not available`);
       }
-      const content = solcInput.sources[sourcePath].content;
+      const content = solcInput.sources[sourcePath]?.content;
       const name = path.relative(basePath, sourcePath);
       if (content === undefined) {
         throw new Error(`Content for ${name} not available`);

package/src/validate/query.ts

@@ -1,5 +1,5 @@
 import { Version, getVersion } from '../version';
-import { ValidationRunData, ValidationError } from './run';
+import { ValidationRunData, ValidationError, isOpcodeError } from './run';
 import { StorageLayout } from '../storage/layout';
 import { unlinkBytecode } from '../link-refs';
 import { ValidationOptions, processExceptions } from './overrides';
@@ -143,9 +143,7 @@ export function getErrors(data: ValidationData, version: Version, opts: Validati
   const [fullContractName, runValidation] = getContractNameAndRunValidation(dataV3, version);
   const c = runValidation[fullContractName];
 
-  const errors = getUsedContractsAndLibraries(fullContractName, runValidation).flatMap(
-    name => runValidation[name].errors,
-  );
+  const errors = getAllErrors(runValidation, fullContractName);
 
   const selfAndInheritedMethods = getAllMethods(runValidation, fullContractName);
 
@@ -159,21 +157,27 @@ export function getErrors(data: ValidationData, version: Version, opts: Validati
   return processExceptions(fullContractName, errors, opts);
 }
 
+function getAllErrors(runValidation: ValidationRunData, fullContractName: string) {
+  // add self's opcode errors only, since opcode errors already include parents
+  const opcodeErrors = runValidation[fullContractName].errors.filter(error => isOpcodeError(error));
+
+  // add other errors from self and inherited contracts
+  const otherErrors = getUsedContracts(fullContractName, runValidation)
+    .flatMap(name => runValidation[name].errors)
+    .filter(error => !isOpcodeError(error));
+
+  return [...opcodeErrors, ...otherErrors];
+}
+
 function getAllMethods(runValidation: ValidationRunData, fullContractName: string): string[] {
   const c = runValidation[fullContractName];
   return c.methods.concat(...c.inherit.map(name => runValidation[name].methods));
 }
 
-function getUsedContractsAndLibraries(contractName: string, runValidation: ValidationRunData) {
+function getUsedContracts(contractName: string, runValidation: ValidationRunData) {
   const c = runValidation[contractName];
   // Add current contract and all of its parents
   const res = new Set([contractName, ...c.inherit]);
-  // Add used libraries transitively until no more are found
-  for (const c1 of res) {
-    for (const c2 of runValidation[c1].libraries) {
-      res.add(c2);
-    }
-  }
   return Array.from(res);
 }
 

package/src/validate/run.test.ts

@@ -0,0 +1,49 @@
+import test from 'ava';
+
+import { getAnnotationArgs } from './run';
+
+test('getAnnotationArgs', t => {
+  const doc = ' @custom:oz-upgrades-unsafe-allow constructor selfdestruct';
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+});
+
+test('getAnnotationArgs no arg', t => {
+  const doc = ' @custom:oz-upgrades-unsafe-allow';
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow'), []);
+});
+
+test('getAnnotationArgs space no arg', t => {
+  const doc = ' @custom:oz-upgrades-unsafe-allow ';
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow'), []);
+});
+
+test('getAnnotationArgs whitespace at end', t => {
+  const doc = ' @custom:oz-upgrades-unsafe-allow constructor ';
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow'), ['constructor']);
+});
+
+test('getAnnotationArgs same type', t => {
+  const doc = ' @custom:oz-upgrades-unsafe-allow constructor\n @custom:oz-upgrades-unsafe-allow selfdestruct';
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+});
+
+test('getAnnotationArgs multiline', t => {
+  const doc =
+    ' othercomments\n @custom:oz-upgrades-unsafe-allow constructor selfdestruct\n @custom:oz-upgrades-unsafe-allow-reachable delegatecall';
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow-reachable'), ['delegatecall']);
+});
+
+test('getAnnotationArgs multiline with spaces and comments', t => {
+  const doc =
+    ' some other comments\n @custom:oz-upgrades-unsafe-allow \n   constructor    \n   selfdestruct    \n @custom:oz-upgrades-unsafe-allow-reachable  \n   delegatecall';
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow-reachable'), ['delegatecall']);
+});
+
+test('getAnnotationArgs multiline multiple preceding spaces', t => {
+  const doc =
+    ' @custom:oz-upgrades-unsafe-allow constructor selfdestruct \n         @custom:oz-upgrades-unsafe-allow-reachable delegatecall    ';
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow'), ['constructor', 'selfdestruct']);
+  t.deepEqual(getAnnotationArgs(doc, 'oz-upgrades-unsafe-allow-reachable'), ['delegatecall']);
+});

package/src/validate/run.ts

@@ -1,6 +1,6 @@
 import { Node } from 'solidity-ast/node';
-import { isNodeType, findAll } from 'solidity-ast/utils';
-import type { ContractDefinition } from 'solidity-ast';
+import { isNodeType, findAll, ASTDereferencer } from 'solidity-ast/utils';
+import type { ContractDefinition, FunctionDefinition } from 'solidity-ast';
 
 import { SolcOutput, SolcBytecode } from '../solc-api';
 import { SrcDecoder } from '../src-decoder';
@@ -68,6 +68,26 @@ interface ValidationErrorOpcode extends ValidationErrorBase {
   kind: 'delegatecall' | 'selfdestruct';
 }
 
+interface OpcodePattern {
+  kind: 'delegatecall' | 'selfdestruct';
+  pattern: RegExp;
+}
+
+const OPCODES = {
+  delegatecall: {
+    kind: 'delegatecall',
+    pattern: /^t_function_baredelegatecall_/,
+  },
+  selfdestruct: {
+    kind: 'selfdestruct',
+    pattern: /^t_function_selfdestruct_/,
+  },
+} as const;
+
+export function isOpcodeError(error: ValidationErrorBase): error is ValidationErrorOpcode {
+  return error.kind === 'delegatecall' || error.kind === 'selfdestruct';
+}
+
 interface ValidationErrorUpgradeability extends ValidationErrorBase {
   kind: 'missing-public-upgradeto';
 }
@@ -84,34 +104,49 @@ function* execall(re: RegExp, text: string) {
   }
 }
 
-function getAllowed(node: Node): string[] {
+function getAllowed(node: Node, reachable: boolean): string[] {
   if ('documentation' in node) {
+    const tag = `oz-upgrades-unsafe-allow${reachable ? '-reachable' : ''}`;
     const doc = typeof node.documentation === 'string' ? node.documentation : node.documentation?.text ?? '';
+    return getAnnotationArgs(doc, tag);
+  } else {
+    return [];
+  }
+}
 
-    const result: string[] = [];
-    for (const { groups } of execall(
-      /^\s*(?:@(?<title>\w+)(?::(?<tag>[a-z][a-z-]*))? )?(?<args>(?:(?!^\s@\w+)[^])*)/m,
-      doc,
-    )) {
-      if (groups && groups.title === 'custom' && groups.tag === 'oz-upgrades-unsafe-allow') {
-        result.push(...groups.args.split(/\s+/));
+/**
+ * Get args from the doc string matching the given tag
+ */
+export function getAnnotationArgs(doc: string, tag: string) {
+  const result: string[] = [];
+  for (const { groups } of execall(
+    /^\s*(?:@(?<title>\w+)(?::(?<tag>[a-z][a-z-]*))? )?(?<args>(?:(?!^\s*@\w+)[^])*)/m,
+    doc,
+  )) {
+    if (groups && groups.title === 'custom' && groups.tag === tag) {
+      const trimmedArgs = groups.args.trim();
+      if (trimmedArgs.length > 0) {
+        result.push(...trimmedArgs.split(/\s+/));
       }
     }
+  }
 
-    result.forEach(arg => {
-      if (!(errorKinds as readonly string[]).includes(arg)) {
-        throw new Error(`NatSpec: oz-upgrades-unsafe-allow argument not recognized: ${arg}`);
-      }
-    });
+  result.forEach(arg => {
+    if (!(errorKinds as readonly string[]).includes(arg)) {
+      throw new Error(`NatSpec: ${tag} argument not recognized: ${arg}`);
+    }
+  });
 
-    return result;
-  } else {
-    return [];
-  }
+  return result;
+}
+
+function skipCheckReachable(error: string, node: Node): boolean {
+  return getAllowed(node, true).includes(error);
 }
 
 function skipCheck(error: string, node: Node): boolean {
-  return getAllowed(node).includes(error);
+  // skip both allow and allow-reachable errors in the lexical scope
+  return getAllowed(node, false).includes(error) || getAllowed(node, true).includes(error);
 }
 
 function getFullyQualifiedName(source: string, contractName: string) {
@@ -163,7 +198,7 @@ export function validate(solcOutput: SolcOutput, decodeSrc: SrcDecoder, solcVers
         validation[key].src = decodeSrc(contractDef);
         validation[key].errors = [
           ...getConstructorErrors(contractDef, decodeSrc),
-          ...getOpcodeErrors(contractDef, decodeSrc),
+          ...getOpcodeErrors(contractDef, deref, decodeSrc),
           ...getStateVariableErrors(contractDef, decodeSrc),
           // TODO: add linked libraries support
           // https://github.com/OpenZeppelin/openzeppelin-upgrades/issues/52
@@ -206,27 +241,151 @@ function* getConstructorErrors(contractDef: ContractDefinition, decodeSrc: SrcDe
   }
 }
 
-function* getOpcodeErrors(contractDef: ContractDefinition, decodeSrc: SrcDecoder): Generator<ValidationErrorOpcode> {
-  for (const fnCall of findAll('FunctionCall', contractDef, node => skipCheck('delegatecall', node))) {
+function* getOpcodeErrors(
+  contractDef: ContractDefinition,
+  deref: ASTDereferencer,
+  decodeSrc: SrcDecoder,
+): Generator<ValidationErrorOpcode> {
+  yield* getContractOpcodeErrors(contractDef, deref, decodeSrc, OPCODES.delegatecall, 'main');
+  yield* getContractOpcodeErrors(contractDef, deref, decodeSrc, OPCODES.selfdestruct, 'main');
+}
+
+/**
+ * Whether this node is being visited as part of a main contract, or as an inherited contract or function
+ */
+type Scope = 'main' | 'inherited';
+
+function* getContractOpcodeErrors(
+  contractDef: ContractDefinition,
+  deref: ASTDereferencer,
+  decodeSrc: SrcDecoder,
+  opcode: OpcodePattern,
+  scope: Scope,
+  visitedNodeIds = new Map<number, Scope>(),
+): Generator<ValidationErrorOpcode> {
+  if (wasVisited(contractDef.id, scope, visitedNodeIds)) {
+    // We return early here, but the errors from this node were emitted when the node was marked as visited.
+    return;
+  } else {
+    visitedNodeIds.set(contractDef.id, scope);
+  }
+
+  yield* getFunctionOpcodeErrors(contractDef, deref, decodeSrc, opcode, scope, visitedNodeIds);
+  yield* getInheritedContractOpcodeErrors(contractDef, deref, decodeSrc, opcode, visitedNodeIds);
+}
+
+function wasVisited(key: number, scope: Scope, visitedNodeIds: Map<number, Scope>) {
+  return (
+    (scope === 'inherited' && visitedNodeIds.has(key)) || // looking up an inherited contract, and it was previously checked as a main contract OR inherited contract
+    (scope === 'main' && visitedNodeIds.get(key) === 'main') // looking up a main contract, and it was previously checked as a main contract
+  );
+}
+
+function* getFunctionOpcodeErrors(
+  contractOrFunctionDef: ContractDefinition | FunctionDefinition,
+  deref: ASTDereferencer,
+  decodeSrc: SrcDecoder,
+  opcode: OpcodePattern,
+  scope: Scope,
+  visitedNodeIds: Map<number, Scope>,
+): Generator<ValidationErrorOpcode> {
+  const parentContractDef = getParentDefinition(deref, contractOrFunctionDef);
+  if (parentContractDef === undefined || !skipCheck(opcode.kind, parentContractDef)) {
+    yield* getDirectFunctionOpcodeErrors(contractOrFunctionDef, decodeSrc, opcode, scope);
+  }
+  if (parentContractDef === undefined || !skipCheckReachable(opcode.kind, parentContractDef)) {
+    yield* getReferencedFunctionOpcodeErrors(contractOrFunctionDef, deref, decodeSrc, opcode, scope, visitedNodeIds);
+  }
+}
+
+function* getDirectFunctionOpcodeErrors(
+  contractOrFunctionDef: ContractDefinition | FunctionDefinition,
+  decodeSrc: SrcDecoder,
+  opcode: OpcodePattern,
+  scope: Scope,
+) {
+  for (const fnCall of findAll(
+    'FunctionCall',
+    contractOrFunctionDef,
+    node => skipCheck(opcode.kind, node) || (scope === 'inherited' && isInternalFunction(node)),
+  )) {
     const fn = fnCall.expression;
-    if (fn.typeDescriptions.typeIdentifier?.match(/^t_function_baredelegatecall_/)) {
+    if (fn.typeDescriptions.typeIdentifier?.match(opcode.pattern)) {
       yield {
-        kind: 'delegatecall',
+        kind: opcode.kind,
         src: decodeSrc(fnCall),
       };
     }
   }
-  for (const fnCall of findAll('FunctionCall', contractDef, node => skipCheck('selfdestruct', node))) {
+}
+
+function* getReferencedFunctionOpcodeErrors(
+  contractOrFunctionDef: ContractDefinition | FunctionDefinition,
+  deref: ASTDereferencer,
+  decodeSrc: SrcDecoder,
+  opcode: OpcodePattern,
+  scope: Scope,
+  visitedNodeIds: Map<number, Scope>,
+) {
+  for (const fnCall of findAll(
+    'FunctionCall',
+    contractOrFunctionDef,
+    node => skipCheckReachable(opcode.kind, node) || (scope === 'inherited' && isInternalFunction(node)),
+  )) {
     const fn = fnCall.expression;
-    if (fn.typeDescriptions.typeIdentifier?.match(/^t_function_selfdestruct_/)) {
-      yield {
-        kind: 'selfdestruct',
-        src: decodeSrc(fnCall),
-      };
+    if ('referencedDeclaration' in fn && fn.referencedDeclaration && fn.referencedDeclaration > 0) {
+      // non-positive references refer to built-in functions
+      const referencedNode = tryDerefFunction(deref, fn.referencedDeclaration);
+      if (referencedNode !== undefined) {
+        if (!wasVisited(referencedNode.id, scope, visitedNodeIds)) {
+          visitedNodeIds.set(referencedNode.id, scope);
+          yield* getFunctionOpcodeErrors(referencedNode, deref, decodeSrc, opcode, scope, visitedNodeIds);
+        }
+      }
     }
   }
 }
 
+function tryDerefFunction(deref: ASTDereferencer, referencedDeclaration: number): FunctionDefinition | undefined {
+  try {
+    return deref(['FunctionDefinition'], referencedDeclaration);
+  } catch (e: any) {
+    if (!e.message.includes('No node with id')) {
+      throw e;
+    }
+  }
+}
+
+function* getInheritedContractOpcodeErrors(
+  contractDef: ContractDefinition,
+  deref: ASTDereferencer,
+  decodeSrc: SrcDecoder,
+  opcode: OpcodePattern,
+  visitedNodeIds: Map<number, Scope>,
+) {
+  if (!skipCheckReachable(opcode.kind, contractDef)) {
+    for (const base of contractDef.baseContracts) {
+      const referencedContract = deref('ContractDefinition', base.baseName.referencedDeclaration);
+      yield* getContractOpcodeErrors(referencedContract, deref, decodeSrc, opcode, 'inherited', visitedNodeIds);
+    }
+  }
+}
+
+function getParentDefinition(deref: ASTDereferencer, contractOrFunctionDef: ContractDefinition | FunctionDefinition) {
+  const parentNode = deref(['ContractDefinition', 'SourceUnit'], contractOrFunctionDef.scope);
+  if (parentNode.nodeType === 'ContractDefinition') {
+    return parentNode;
+  }
+}
+
+function isInternalFunction(node: Node) {
+  return (
+    node.nodeType === 'FunctionDefinition' &&
+    node.kind !== 'constructor' && // do not consider constructors as internal, because they are always called by children contracts' constructors
+    (node.visibility === 'internal' || node.visibility === 'private')
+  );
+}
+
 function* getStateVariableErrors(
   contractDef: ContractDefinition,
   decodeSrc: SrcDecoder,