@@ -5,6 +5,7 @@ import { formatLines, Lines, spaceBetween } from './utils/format-lines';
55import type { Visibility , SourceUnit , ContractDefinition , FunctionDefinition , VariableDeclaration , StorageLocation , TypeDescriptions , TypeName , InheritanceSpecifier , ModifierInvocation , FunctionCall } from 'solidity-ast' ;
66import type { FileContent , ProjectPathsConfig , ResolvedFile } from 'hardhat/types' ;
77import type { ExposedConfig } from './config' ;
8+ import assert from 'assert' ;
89
910export interface SolcOutput {
1011 sources : {
@@ -105,7 +106,7 @@ function getExposedContent(ast: SourceUnit, relativizePath: (p: string) => strin
105106
106107 const clashingFunctions : Record < string , number > = { } ;
107108 for ( const fn of externalizableFunctions ) {
108- const id = getFunctionId ( fn ) ;
109+ const id = getFunctionId ( fn , c , deref ) ;
109110 clashingFunctions [ id ] ??= 0 ;
110111 clashingFunctions [ id ] += 1 ;
111112 }
@@ -121,13 +122,13 @@ function getExposedContent(ast: SourceUnit, relativizePath: (p: string) => strin
121122 [ `bytes32 public constant __hh_exposed_bytecode_marker = "hardhat-exposed";\n` ] ,
122123 spaceBetween (
123124 // slots for storage function parameters
124- ...getAllStorageArguments ( externalizableFunctions ) . map ( a => [
125+ ...getAllStorageArguments ( externalizableFunctions , c , deref ) . map ( a => [
125126 `mapping(uint256 => ${ a . storageType } ${ prefix } ${ a . storageVar } ,
126127 ] ) ,
127128 // events for internal returns
128129 ...returnedEventFunctions . map ( fn => {
129- const evName = clashingEvents [ fn . name ] === 1 ? fn . name : getFunctionNameQualified ( fn , false ) ;
130- const params = getFunctionReturnParameters ( fn , null ) ;
130+ const evName = clashingEvents [ fn . name ] === 1 ? fn . name : getFunctionNameQualified ( fn , c , deref , false ) ;
131+ const params = getFunctionReturnParameters ( fn , c , deref , null ) ;
131132 return [
132133 `event return${ prefix } ${ evName } ${ params . map ( printArgument ) . join ( ', ' ) }
133134 ]
@@ -138,24 +139,24 @@ function getExposedContent(ast: SourceUnit, relativizePath: (p: string) => strin
138139 ...externalizableVariables . map ( v => [
139140 [
140141 'function' ,
141- `${ prefix } ${ v . name } ${ getVarGetterArgs ( v ) . map ( printArgument ) . join ( ', ' ) } ,
142+ `${ prefix } ${ v . name } ${ getVarGetterArgs ( v , c , deref ) . map ( printArgument ) . join ( ', ' ) } ,
142143 'external' ,
143144 v . mutability === 'mutable' || ( v . mutability === 'immutable' && ! v . value ) ? 'view' : 'pure' ,
144145 'returns' ,
145- `(${ getVarGetterReturnType ( v ) } ,
146+ `(${ getVarGetterReturnType ( v , c , deref ) } ,
146147 '{'
147148 ] . join ( ' ' ) ,
148149 [
149- `return ${ isLibrary ? c . name + '.' : '' } ${ v . name } ${ getVarGetterArgs ( v ) . map ( a => `[${ a . name } ) . join ( '' ) } ,
150+ `return ${ isLibrary ? c . name + '.' : '' } ${ v . name } ${ getVarGetterArgs ( v , c , deref ) . map ( a => `[${ a . name } ) . join ( '' ) } ,
150151 ] ,
151152 '}' ,
152153 ] ) ,
153154 // external functions
154155 ...externalizableFunctions . map ( fn => {
155- const fnName = clashingFunctions [ getFunctionId ( fn ) ] === 1 ? fn . name : getFunctionNameQualified ( fn ) ;
156- const fnArgs = getFunctionArguments ( fn ) ;
157- const fnRets = getFunctionReturnParameters ( fn ) ;
158- const evName = isNonViewWithReturns ( fn ) && ( clashingEvents [ fn . name ] === 1 ? fn . name : getFunctionNameQualified ( fn , false ) ) ;
156+ const fnName = clashingFunctions [ getFunctionId ( fn , c , deref ) ] === 1 ? fn . name : getFunctionNameQualified ( fn , c , deref ) ;
157+ const fnArgs = getFunctionArguments ( fn , c , deref ) ;
158+ const fnRets = getFunctionReturnParameters ( fn , c , deref ) ;
159+ const evName = isNonViewWithReturns ( fn ) && ( clashingEvents [ fn . name ] === 1 ? fn . name : getFunctionNameQualified ( fn , c , deref , false ) ) ;
159160
160161 // function header
161162 const header = [
@@ -228,14 +229,14 @@ function areFunctionsFullyImplemented(contract: ContractDefinition, deref: ASTDe
228229 return abstractFunctionIds . size === 0 ;
229230}
230231
231- function getFunctionId ( fn : FunctionDefinition ) : string {
232- const storageArgs = new Set < Argument > ( getStorageArguments ( fn ) ) ;
233- const nonStorageArgs = getFunctionArguments ( fn ) . filter ( a => ! storageArgs . has ( a ) ) ;
232+ function getFunctionId ( fn : FunctionDefinition , context : ContractDefinition , deref : ASTDereferencer ) : string {
233+ const storageArgs = new Set < Argument > ( getStorageArguments ( fn , context , deref ) ) ;
234+ const nonStorageArgs = getFunctionArguments ( fn , context , deref ) . filter ( a => ! storageArgs . has ( a ) ) ;
234235 return fn . name + nonStorageArgs . map ( a => a . type ) . join ( '' ) ;
235236}
236237
237- function getFunctionNameQualified ( fn : FunctionDefinition , onlyStorage : boolean = true ) : string {
238- return fn . name + ( onlyStorage ? getStorageArguments ( fn ) : getFunctionArguments ( fn ) )
238+ function getFunctionNameQualified ( fn : FunctionDefinition , context : ContractDefinition , deref : ASTDereferencer , onlyStorage : boolean = true ) : string {
239+ return fn . name + ( onlyStorage ? getStorageArguments ( fn , context , deref ) : getFunctionArguments ( fn , context , deref ) )
239240 . map ( arg => arg . storageType ?? arg . type )
240241 . map ( type => type . replace ( / .* / , '' ) . replace ( / [ ^ 0 - 9 a - z A - Z $ _ ] + / g, '_' ) ) // sanitize
241242 . join ( '_' )
@@ -289,7 +290,7 @@ function makeConstructor(contract: ContractDefinition, deref: ASTDereferencer, i
289290 const args = [ ] ;
290291 for ( const a of constructors . get ( c . id ) ?. parameters . parameters ?? [ ] ) {
291292 const name = missingArguments . has ( a . name ) ? `${ c . name } ${ a . name } : a . name ;
292- const type = getVarType ( a , 'memory' ) ;
293+ const type = getVarType ( a , c , deref , 'memory' ) ;
293294 missingArguments . set ( name , type ) ;
294295 args . push ( name ) ;
295296 }
@@ -390,55 +391,68 @@ interface Argument {
390391
391392const printArgument = ( arg : Argument ) => `${ arg . type } ${ arg . name } ;
392393
393- function getFunctionArguments ( fnDef : FunctionDefinition ) : Argument [ ] {
394+ function getFunctionArguments ( fnDef : FunctionDefinition , context : ContractDefinition , deref : ASTDereferencer ) : Argument [ ] {
394395 return fnDef . parameters . parameters . map ( ( p , i ) => {
395396 const name = p . name || `arg${ i } ;
396397 if ( p . storageLocation === 'storage' ) {
397- const storageType = getVarType ( p , null ) ;
398+ const storageType = getVarType ( p , context , deref , null ) ;
398399 const storageVar = 'v_' + storageType . replace ( / [ ^ 0 - 9 a - z A - Z $ _ ] + / g, '_' ) ;
399400 // The argument is an index to an array in storage.
400401 return { name, type : 'uint256' , storageVar, storageType } ;
401402 } else {
402- const type = getVarType ( p , 'calldata' ) ;
403+ const type = getVarType ( p , context , deref , 'calldata' ) ;
403404 return { name, type } ;
404405 }
405406 } ) ;
406407}
407408
408- function getStorageArguments ( fn : FunctionDefinition ) : Required < Argument > [ ] {
409- return getFunctionArguments ( fn )
409+ function getStorageArguments ( fn : FunctionDefinition , context : ContractDefinition , deref : ASTDereferencer ) : Required < Argument > [ ] {
410+ return getFunctionArguments ( fn , context , deref )
410411 . filter ( ( a ) : a is Required < Argument > => ! ! ( a . storageVar && a . storageType ) ) ;
411412}
412413
413- function getAllStorageArguments ( fns : FunctionDefinition [ ] ) : Required < Argument > [ ] {
414+ function getAllStorageArguments ( fns : FunctionDefinition [ ] , context : ContractDefinition , deref : ASTDereferencer ) : Required < Argument > [ ] {
414415 return [
415416 ...new Map (
416- fns . flatMap ( getStorageArguments ) . map ( a => [ a . storageVar , a ] ) ,
417+ fns . flatMap ( fn => getStorageArguments ( fn , context , deref ) ) . map ( a => [ a . storageVar , a ] ) ,
417418 ) . values ( ) ,
418419 ] ;
419420}
420421
421- function getFunctionReturnParameters ( fnDef : FunctionDefinition , location : StorageLocation | null = 'memory' ) : Argument [ ] {
422+ function getFunctionReturnParameters ( fnDef : FunctionDefinition , context : ContractDefinition , deref : ASTDereferencer , location : StorageLocation | null = 'memory' ) : Argument [ ] {
422423 return fnDef . returnParameters . parameters . map ( ( p , i ) => {
423424 const name = p . name || `ret${ i } ;
424- const type = getVarType ( p , location ) ;
425+ const type = getVarType ( p , context , deref , location ) ;
425426 return { name, type } ;
426427 } ) ;
427428}
428429
429- function getVarType ( varDecl : VariableDeclaration , location : StorageLocation | null = varDecl . storageLocation ) : string {
430+ function getVarType ( varDecl : VariableDeclaration , context : ContractDefinition , deref : ASTDereferencer , location : StorageLocation | null = varDecl . storageLocation ) : string {
430431 if ( ! varDecl . typeName ) {
431432 throw new Error ( 'Missing type information' ) ;
432433 }
433- return getType ( varDecl . typeName , location ) ;
434+ return getType ( varDecl . typeName , context , deref , location ) ;
434435}
435436
436- function getType ( typeName : TypeName , location : StorageLocation | null ) : string {
437+ function getType ( typeName : TypeName , context : ContractDefinition , deref : ASTDereferencer , location : StorageLocation | null ) : string {
437438 const { typeString, typeIdentifier } = typeName . typeDescriptions ;
438439 if ( typeof typeString !== 'string' || typeof typeIdentifier !== 'string' ) {
439440 throw new Error ( 'Missing type information' ) ;
440441 }
441- const type = typeString . replace ( / ^ ( s t r u c t | e n u m | c o n t r a c t ) / , '' ) + ( typeIdentifier . endsWith ( '_ptr' ) && location ? ` ${ location } : '' ) ;
442+
443+ let type = typeString . replace ( / ^ ( s t r u c t | e n u m | c o n t r a c t ) / , '' ) + ( typeIdentifier . endsWith ( '_ptr' ) && location ? ` ${ location } : '' ) ;
444+
445+ const typeScopeMatch = type . match ( / ^ ( [ a - z A - Z 0 - 9 _ $ ] + ) \. / ) ;
446+ if ( typeScopeMatch ) {
447+ const [ , typeScope ] = typeScopeMatch ;
448+
449+ const isScopeImplicit = context . linearizedBaseContracts . some ( c => deref ( 'ContractDefinition' , c ) . name === typeScope ) ;
450+
451+ if ( isScopeImplicit ) {
452+ type = type . replace ( `${ typeScope } , '' ) ;
453+ }
454+ }
455+
442456 return type ;
443457}
444458
@@ -458,26 +472,26 @@ function getVariables(contract: ContractDefinition, deref: ASTDereferencer, subs
458472 return res ;
459473}
460474
461- function getVarGetterArgs ( v : VariableDeclaration ) : Argument [ ] {
475+ function getVarGetterArgs ( v : VariableDeclaration , context : ContractDefinition , deref : ASTDereferencer ) : Argument [ ] {
462476 if ( ! v . typeName ) {
463477 throw new Error ( 'missing typenName' ) ;
464478 }
465479 const types = [ ] ;
466480 for ( let t = v . typeName ; t . nodeType === 'Mapping' ; t = t . valueType ) {
467- types . push ( { name : `arg${ types . length } , type : getType ( t . keyType , 'memory' ) } )
481+ types . push ( { name : `arg${ types . length } , type : getType ( t . keyType , context , deref , 'memory' ) } )
468482 }
469483 return types ;
470484}
471485
472- function getVarGetterReturnType ( v : VariableDeclaration ) : string {
486+ function getVarGetterReturnType ( v : VariableDeclaration , context : ContractDefinition , deref : ASTDereferencer ) : string {
473487 if ( ! v . typeName ) {
474488 throw new Error ( 'missing typenName' ) ;
475489 }
476490 let t = v . typeName ;
477491 while ( t . nodeType === 'Mapping' ) {
478492 t = t . valueType ;
479493 }
480- return getType ( t , 'memory' ) ;
494+ return getType ( t , context , deref , 'memory' ) ;
481495}
482496
483497function getFunctions ( contract : ContractDefinition , deref : ASTDereferencer , subset ?: Visibility [ ] ) : FunctionDefinition [ ] {
0 commit comments