Skip to content

Commit d6f4c13

Browse files
committed
[ Audit ] read from artifacts rather than deployments
1 parent 3ae17fa commit d6f4c13

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@open-ibc/vibc-core-smart-contracts",
3-
"version": "3.0.3",
3+
"version": "3.0.4",
44
"main": "dist/index.js",
55
"bin": {
66
"verify-vibc-core-smart-contracts": "./dist/scripts/verify-contract-script.js",

specs/update.spec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
deployer: 'KEY_DEPLOYER'
144144
signature: "upgradeTo(address)"
145145
address: '{{ UCProxy }}'
146-
factoryName: "UC"
146+
factoryName: "UniversalChannelHandler"
147147
args:
148148
- '{{UC}}'
149149

src/tx.ts

+16-15
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,20 @@ import { ContractRegistry } from "./evm/schemas/contract";
1919
import { updateNoncesForSender } from "./deploy";
2020
import { fetchNonceFromSafeAddress, proposeTransaction } from "./multisig/safe";
2121

22+
export async function readAbiFromDeployedContract(
23+
existingContractOverrides: ContractRegistry,
24+
factoryName: string
25+
) {
26+
const existingContractOverride = existingContractOverrides.get(factoryName);
27+
28+
// Read from overrides first
29+
if (existingContractOverride && existingContractOverride.abi) {
30+
return existingContractOverride.abi;
31+
}
32+
33+
return readFactoryAbi(factoryName)
34+
}
35+
2236
export async function sendTx(
2337
chain: Chain,
2438
accountRegistry: AccountRegistry,
@@ -31,23 +45,10 @@ export async function sendTx(
3145
) {
3246
try {
3347
const factoryName = tx.factoryName ? tx.factoryName : tx.name;
34-
let deployedContractAbi: any;
35-
36-
const existingContractOverride = existingContractOverrides.get(factoryName);
37-
// Fetch the ABI from the existing contract if it exists; otherwise read from deployment files
38-
if (existingContractOverride && existingContractOverride.abi) {
39-
deployedContractAbi = existingContractOverride.abi;
40-
} else {
41-
const deployedContract: any = await readFromDeploymentFile(
42-
factoryName,
43-
chain
44-
);
45-
deployedContractAbi = (deployedContract && deployedContract.abi) ?? await readFactoryAbi(factoryName) ;
46-
}
4748

48-
if(!deployedContractAbi) {
49+
const deployedContractAbi = await readAbiFromDeployedContract(existingContractOverrides, factoryName)
50+
if (!deployedContractAbi) {
4951
throw new Error(`Could not find ABI for contract ${factoryName}`);
50-
5152
}
5253

5354
const account = accountRegistry.mustGet(

0 commit comments

Comments
 (0)