format address when init contract (#273)

* format address when init contract * fix contract init without address error
Conflux-Chain · Jul 18, 2024 · 472b9ba · 472b9ba
1 parent 101b586
commit 472b9ba
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-conflux-sdk",
   "description": "JavaScript Conflux Software Development Kit",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "license": "LGPL-3.0",
   "author": "[email protected]",
   "repository": "https://github.com/Conflux-Chain/js-conflux-sdk.git",

diff --git a/src/contract/index.js b/src/contract/index.js
@@ -144,7 +144,9 @@ class Contract {
     const abiTable = lodash.groupBy(abi, 'type');
     this.abi = new ContractABI(this); // XXX: Create a method named `abi` in solidity is a `Warning`.
 
-    this.address = address; // XXX: Create a method named `address` in solidity is a `ParserError`
+    if (address) {
+      this.address = (conflux && conflux.networkId) ? conflux._formatAddress(address) : address; // XXX: Create a method named `address` in solidity is a `ParserError`
+    }
 
     // constructor
     this.constructor = new ContractConstructor(lodash.first(abiTable.constructor), bytecode, this, conflux);

diff --git a/test/contract/contract.test.js b/test/contract/contract.test.js
@@ -42,13 +42,13 @@ test('Contract', async () => {
 
 test('Internal Contract', async () => {
   const adminControl = conflux.InternalContract('AdminControl');
-  expect(adminControl.address).toEqual('0x0888000000000000000000000000000000000000');
+  expect(format.hexAddress(adminControl.address)).toEqual('0x0888000000000000000000000000000000000000');
 
   const sponsorWhitelistControl = conflux.InternalContract('SponsorWhitelistControl');
-  expect(sponsorWhitelistControl.address).toEqual('0x0888000000000000000000000000000000000001');
+  expect(format.hexAddress(sponsorWhitelistControl.address)).toEqual('0x0888000000000000000000000000000000000001');
 
   const staking = conflux.InternalContract('Staking');
-  expect(staking.address).toEqual('0x0888000000000000000000000000000000000002');
+  expect(format.hexAddress(staking.address)).toEqual('0x0888000000000000000000000000000000000002');
 
   expect(() => conflux.InternalContract('xxx')).toThrow('can not find internal contract');
 });

diff --git a/test/contract/internal.test.js b/test/contract/internal.test.js
@@ -1,25 +1,27 @@
-const { Conflux } = require('../../src');
+const { Conflux, format } = require('../../src');
 
-const conflux = new Conflux();
+const conflux = new Conflux({
+  networkId: 1,
+});
 
 test('AdminControl', () => {
   const contract = conflux.InternalContract('AdminControl');
 
-  expect(contract.address).toEqual('0x0888000000000000000000000000000000000000');
+  expect(format.hexAddress(contract.address)).toEqual('0x0888000000000000000000000000000000000000');
   expect(contract.constructor).toBeDefined();
 });
 
 test('SponsorWhitelistControl', () => {
   const contract = conflux.InternalContract('SponsorWhitelistControl');
 
-  expect(contract.address).toEqual('0x0888000000000000000000000000000000000001');
+  expect(format.hexAddress(contract.address)).toEqual('0x0888000000000000000000000000000000000001');
   expect(contract.constructor).toBeDefined();
 });
 
 test('Staking', () => {
   const contract = conflux.InternalContract('Staking');
 
-  expect(contract.address).toEqual('0x0888000000000000000000000000000000000002');
+  expect(format.hexAddress(contract.address)).toEqual('0x0888000000000000000000000000000000000002');
   expect(contract.constructor).toBeDefined();
 });
 

diff --git a/test/contract/stringContractAbi.test.js b/test/contract/stringContractAbi.test.js
@@ -42,13 +42,13 @@ test('Contract', async () => {
 
 test('Internal Contract', async () => {
   const adminControl = conflux.InternalContract('AdminControl');
-  expect(adminControl.address).toEqual('0x0888000000000000000000000000000000000000');
+  expect(format.hexAddress(adminControl.address)).toEqual('0x0888000000000000000000000000000000000000');
 
   const sponsorWhitelistControl = conflux.InternalContract('SponsorWhitelistControl');
-  expect(sponsorWhitelistControl.address).toEqual('0x0888000000000000000000000000000000000001');
+  expect(format.hexAddress(sponsorWhitelistControl.address)).toEqual('0x0888000000000000000000000000000000000001');
 
   const staking = conflux.InternalContract('Staking');
-  expect(staking.address).toEqual('0x0888000000000000000000000000000000000002');
+  expect(format.hexAddress(staking.address)).toEqual('0x0888000000000000000000000000000000000002');
 
   expect(() => conflux.InternalContract('xxx')).toThrow('can not find internal contract');
 });